2 files changed, 12 insertions, 4 deletions

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 004b6e162b96..c8c1dfc22c93 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -215,8 +215,11 @@ struct perf_counter_mmap_page {
         __u32   data_head;              /* head in the data section */
 };
 
+#define PERF_EVENT_MISC_CPUMODE_MASK    (3 << 0)
+#define PERF_EVENT_MISC_CPUMODE_UNKNOWN (0 << 0)
 #define PERF_EVENT_MISC_KERNEL          (1 << 0)
-#define PERF_EVENT_MISC_USER            (1 << 1)
+#define PERF_EVENT_MISC_USER            (2 << 0)
+#define PERF_EVENT_MISC_HYPERVISOR      (3 << 0)
 #define PERF_EVENT_MISC_OVERFLOW        (1 << 2)
 
 struct perf_event_header {
@@ -596,6 +599,12 @@ extern int sysctl_perf_counter_mlock;
 
 extern void perf_counter_init(void);
 
+#ifndef perf_misc_flags
+#define perf_misc_flags(regs)   (user_mode(regs) ? PERF_EVENT_MISC_USER : \
+                                 PERF_EVENT_MISC_KERNEL)
+#define perf_instruction_pointer(regs)  instruction_pointer(regs)
+#endif
+
 #else
 static inline void
 perf_counter_task_sched_in(struct task_struct *task, int cpu)           { }
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 728a595399b0..57840a94b163 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -2042,11 +2042,10 @@ static void perf_counter_output(struct perf_counter *counter,
         header.size = sizeof(header);
 
         header.misc = PERF_EVENT_MISC_OVERFLOW;
-        header.misc |= user_mode(regs) ?
-                PERF_EVENT_MISC_USER : PERF_EVENT_MISC_KERNEL;
+        header.misc |= perf_misc_flags(regs);
 
         if (record_type & PERF_RECORD_IP) {
-                ip = instruction_pointer(regs);
+                ip = perf_instruction_pointer(regs);
                 header.type |= PERF_RECORD_IP;
                 header.size += sizeof(ip);
         }