lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.33' into perf/core

Browse Source 
Merge reason:
	__percpu annotations need the corresponding sparse address
space definition upstream.

Conflicts:
	tools/perf/util/probe-event.c (trivial)
This commit is contained in:
Frederic Weisbecker
2010-02-27 16:18:46 +01:00
parent 1dd2980d99 60b341b778
commit 018cbffe68
696 changed files with 10855 additions and 6150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/util/event.c
View File

@@ -442,10 +442,10 @@ void thread__find_addr_map(struct thread *self,
al->thread = self;
al->addr = addr;
if (cpumode & PERF_RECORD_MISC_KERNEL) {
if (cpumode == PERF_RECORD_MISC_KERNEL) {
al->level = 'k';
mg = &session->kmaps;
} else if (cpumode & PERF_RECORD_MISC_USER)
} else if (cpumode == PERF_RECORD_MISC_USER)
al->level = '.';
else {
al->level = 'H';