Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

[safe/jmp/linux-2.6] / arch / x86 / kernel / cpu / perf_event.c

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index fd4db0d..c775860 100644 (file)
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1717,7 +1717,11 @@ void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int ski
         */
        regs->bp = rewind_frame_pointer(skip + 1);
        regs->cs = __KERNEL_CS;
-       local_save_flags(regs->flags);
+       /*
+        * We abuse bit 3 to pass exact information, see perf_misc_flags
+        * and the comment with PERF_EFLAGS_EXACT.
+        */
+       regs->flags = 0;
 }
 
 unsigned long perf_instruction_pointer(struct pt_regs *regs)