Merge commit 'v2.6.33' into perf/core

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

Conflicts:
	tools/perf/util/probe-event.c (trivial)

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 9eb7005bc6d6..705ec63548b4 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -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';