aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/ftrace.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-02-06 01:45:16 -0500
committerSteven Rostedt <srostedt@redhat.com>2009-02-07 20:03:33 -0500
commita81bd80a0b0a405dc0483e2c428332d69da2c79f (patch)
tree8543662a0ad8199bde641c1fd4a42929d684ffaf /arch/x86/kernel/ftrace.c
parent9a5fd902273d01170fd033691bd70b142baa7309 (diff)
ring-buffer: use generic version of in_nmi
Impact: clean up Now that a generic in_nmi is available, this patch removes the special code in the ring_buffer and implements the in_nmi generic version instead. With this change, I was also able to rename the "arch_ftrace_nmi_enter" back to "ftrace_nmi_enter" and remove the code from the ring buffer. Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
-rw-r--r--arch/x86/kernel/ftrace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 918073c6681b..d74d75e0952d 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -113,7 +113,7 @@ static void ftrace_mod_code(void)
113 MCOUNT_INSN_SIZE); 113 MCOUNT_INSN_SIZE);
114} 114}
115 115
116void arch_ftrace_nmi_enter(void) 116void ftrace_nmi_enter(void)
117{ 117{
118 atomic_inc(&nmi_running); 118 atomic_inc(&nmi_running);
119 /* Must have nmi_running seen before reading write flag */ 119 /* Must have nmi_running seen before reading write flag */
@@ -124,7 +124,7 @@ void arch_ftrace_nmi_enter(void)
124 } 124 }
125} 125}
126 126
127void arch_ftrace_nmi_exit(void) 127void ftrace_nmi_exit(void)
128{ 128{
129 /* Finish all executions before clearing nmi_running */ 129 /* Finish all executions before clearing nmi_running */
130 smp_wmb(); 130 smp_wmb();