From: Konrad Rzeszutek Date: Tue, 17 Jul 2007 11:03:56 +0000 (-0700) Subject: Inhibit NMI watchdog when Alt-SysRq-T operation is underway X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1c978b935e81da9434342f0bc8263c6cfe1214ce;p=deliverable%2Flinux.git 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c index 6963b64a76ca..74cbeb2e99a6 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); }