git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
nmi_32.c
diff --git
a/arch/x86/kernel/nmi_32.c
b/arch/x86/kernel/nmi_32.c
index
662e63e
..
84160f7
100644
(file)
--- a/
arch/x86/kernel/nmi_32.c
+++ b/
arch/x86/kernel/nmi_32.c
@@
-316,7
+316,8
@@
EXPORT_SYMBOL(touch_nmi_watchdog);
extern void die_nmi(struct pt_regs *, const char *msg);
-__kprobes int nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
+notrace __kprobes int
+nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
{
/*