X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fpanic.c;h=d2db3e2209e0e20ae64f8c1537a09a048e95edfe;hb=c31fbb1ad890b11f037c16496e53f28877c12722;hp=9b8dcfd1ca931e6f728c79655e4edead123a0f11;hpb=aa43f77939c97bf9d3580c6a5e71a5a40290e451;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/panic.c b/kernel/panic.c
index 9b8dcfd1ca9..d2db3e2209e 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -21,6 +21,7 @@
 #include <linux/debug_locks.h>
 
 int panic_on_oops;
+int panic_on_unrecovered_nmi;
 int tainted;
 static int pause_on_oops;
 static int pause_on_oops_flag;
@@ -173,7 +174,7 @@ const char *print_tainted(void)
 
 void add_taint(unsigned flag)
 {
-	debug_locks_off(); /* can't trust the integrity of the kernel anymore */
+	debug_locks = 0; /* can't trust the integrity of the kernel anymore */
 	tainted |= flag;
 }
 EXPORT_SYMBOL(add_taint);