From 4b5b08b3cf4e4d89e662e483ea048842fc3d2178 Mon Sep 17 00:00:00 2001 From: Manfred Spraul Date: Wed, 20 Aug 2008 15:39:59 +0200 Subject: [PATCH] --- yaml --- r: 109867 b: refs/heads/master c: 3d431a742728e6b619ce57a030a92d228c13d1d2 h: refs/heads/master i: 109865: 1666b1757b915ce71096d7c9943d42533c8c8bb0 109863: 690e50837edf17d16e6188ee8b3a2b7896d3eeca v: v3 --- [refs] | 2 +- trunk/arch/avr32/kernel/traps.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fe2ebe1d69b8..fbd1e1769fcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73d4393d1df4ff3892b040396f101ede94e9e846 +refs/heads/master: 3d431a742728e6b619ce57a030a92d228c13d1d2 diff --git a/trunk/arch/avr32/kernel/traps.c b/trunk/arch/avr32/kernel/traps.c index b835c4c01368..0d987373bc01 100644 --- a/trunk/arch/avr32/kernel/traps.c +++ b/trunk/arch/avr32/kernel/traps.c @@ -116,15 +116,15 @@ asmlinkage void do_nmi(unsigned long ecr, struct pt_regs *regs) switch (ret) { case NOTIFY_OK: case NOTIFY_STOP: - return; + break; case NOTIFY_BAD: die("Fatal Non-Maskable Interrupt", regs, SIGINT); default: + printk(KERN_ALERT "Got NMI, but nobody cared. Disabling...\n"); + nmi_disable(); break; } - - printk(KERN_ALERT "Got NMI, but nobody cared. Disabling...\n"); - nmi_disable(); + nmi_exit(); } asmlinkage void do_critical_exception(unsigned long ecr, struct pt_regs *regs)