summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/nmi_64.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-04-19 21:19:55 +0400
committerIngo Molnar <mingo@elte.hu>2008-04-19 21:19:55 +0400
commit5deb45e39b946901ae028ccd3a1d0b35fa387475 (patch)
treea29b8d4cffbd1183158d8d77b869181eaa934ff8 /arch/x86/kernel/nmi_64.c
parent4bd01600b214275a80a69b44393d7e81d43c2faa (diff)
downloadlinux-5deb45e39b946901ae028ccd3a1d0b35fa387475.tar.xz
ftrace: add notrace annotations for NMI routines
This annotates NMI functions with notrace. Some tracers may be able to live with this, but some cannot. The safest is to turn it off, it's not particularly interesting anyway. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/nmi_64.c')
-rw-r--r--arch/x86/kernel/nmi_64.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index 11f9130ac513..5a29ded994fa 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -313,7 +313,8 @@ void touch_nmi_watchdog(void)
}
EXPORT_SYMBOL(touch_nmi_watchdog);
-int __kprobes nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
+notrace __kprobes int
+nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
{
int sum;
int touched = 0;
@@ -384,7 +385,8 @@ int __kprobes nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
static unsigned ignore_nmis;
-asmlinkage __kprobes void do_nmi(struct pt_regs * regs, long error_code)
+asmlinkage notrace __kprobes void
+do_nmi(struct pt_regs *regs, long error_code)
{
nmi_enter();
add_pda(__nmi_count,1);