aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64
diff options
context:
space:
mode:
authorKonrad Rzeszutek <konrad@darnok.org>2007-07-17 04:03:56 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 10:23:04 -0700
commit1c978b935e81da9434342f0bc8263c6cfe1214ce (patch)
tree5455b42f7853317be7cafbdb42fae0f591990805 /arch/x86_64
parent2a41de48b81e61fbe260ae5031ebcb6f935f35fb (diff)
downloadlinux-2.6.34-ux500-1c978b935e81da9434342f0bc8263c6cfe1214ce.tar.gz
Inhibit NMI watchdog when Alt-SysRq-T operation is underway
On large memory configuration with not so fast CPUs the NMI watchdog is triggered when memory addresses are being gathered and printed. The code paths for Alt-SysRq-t are sprinkled with touch_nmi_watchdog in various places but not in this routine (or in the loop that utilizes this function). The patch has been tested for regression on large CPU+memory configuration (128 logical CPUs + 224 GB) and 1,2,4,16-CPU sockets with various memory sizes (1,2,4,6,20). Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/traps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 6963b64a76c..74cbeb2e99a 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -330,6 +330,7 @@ static int print_trace_stack(void *data, char *name)
static void print_trace_address(void *data, unsigned long addr)
{
+ touch_nmi_watchdog();
printk_address(addr);
}