summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-07-03 20:39:40 +0200
committerIngo Molnar <mingo@elte.hu>2011-07-03 20:39:40 +0200
commit729aa21ab85b5d24f3c2b1e581d71c2333f46628 (patch)
tree3cf0760e7ddae58d04d2307c9d92240a0ba7c2d8 /arch/x86/include/asm
parent29dfc4fd7e792854b30d771d4e299fbdd2adb763 (diff)
parenta2bbe75089d5eb9a3a46d50dd5c215e213790288 (diff)
Merge branch 'perf/stacktrace' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/perf_event.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index d9d4dae305f6..094fb30817ab 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -152,6 +152,11 @@ extern unsigned long perf_misc_flags(struct pt_regs *regs);
(regs)->bp = caller_frame_pointer(); \
(regs)->cs = __KERNEL_CS; \
regs->flags = 0; \
+ asm volatile( \
+ _ASM_MOV "%%"_ASM_SP ", %0\n" \
+ : "=m" ((regs)->sp) \
+ :: "memory" \
+ ); \
}
#else