diff --git a/[refs] b/[refs] index e6d9e2f3ef2c..9793970e91df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80b16c192e469541263d6bfd9177662ceb632ecc +refs/heads/master: 601e625587bf92c9f370d74a15c4e43bc6468f9f diff --git a/trunk/arch/i386/kernel/traps.c b/trunk/arch/i386/kernel/traps.c index 3e7753c78b9b..e6b5309e70f3 100644 --- a/trunk/arch/i386/kernel/traps.c +++ b/trunk/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 = {