diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-06-02 00:55:31 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-06-02 00:55:31 +0200 |
| commit | 40b46a7d2938589a5abab132a7824fd17ae18f62 (patch) | |
| tree | 2bdf9d2449b6f3437675f1398698e170aebb37cb /arch/x86/include | |
| parent | x86, x32, ptrace: Remove PTRACE_ARCH_PRCTL for x32 (diff) | |
| parent | ftrace/x86: Do not change stacks in DEBUG when calling lockdep (diff) | |
| download | linux-40b46a7d2938589a5abab132a7824fd17ae18f62.tar.xz linux-40b46a7d2938589a5abab132a7824fd17ae18f62.zip | |
Merge remote-tracking branch 'rostedt/tip/perf/urgent-2' into x86-urgent-for-linus
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h index 18d9005d9e4f..b0767bc08740 100644 --- a/arch/x86/include/asm/ftrace.h +++ b/arch/x86/include/asm/ftrace.h @@ -34,7 +34,7 @@ #ifndef __ASSEMBLY__ extern void mcount(void); -extern int modifying_ftrace_code; +extern atomic_t modifying_ftrace_code; static inline unsigned long ftrace_call_adjust(unsigned long addr) { |