summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonrad Rzeszutek <konrad@darnok.org>2007-07-21 15:37:29 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 04:49:14 +0400
commit601e625587bf92c9f370d74a15c4e43bc6468f9f (patch)
treecd104b552007dec5e958ff9e29f8ec6a6e7ac6a2
parent80b16c192e469541263d6bfd9177662ceb632ecc (diff)
downloadlinux-601e625587bf92c9f370d74a15c4e43bc6468f9f.tar.xz
i386: touch_nmi_watchdog() in print_trace_address()
Prevent NMI watchdog triggering during long sysrq-T outputs. Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/i386/kernel/traps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 3e7753c78b9b..e6b5309e70f3 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -211,6 +211,7 @@ static void print_trace_address(void *data, unsigned long addr)
{
printk("%s [<%08lx>] ", (char *)data, addr);
print_symbol("%s\n", addr);
+ touch_nmi_watchdog();
}
static struct stacktrace_ops print_trace_ops = {