Update of /cvsroot/linux-vax/kernel-2.5/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv5627/kernel
Modified Files:
panic.c
Log Message:
Merge with 2.5.68
Index: panic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/kernel/panic.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- panic.c 21 Jul 2003 23:52:05 -0000 1.7
+++ panic.c 27 Aug 2003 23:47:23 -0000 1.8
@@ -20,6 +20,8 @@
asmlinkage void sys_sync(void); /* it's really int */
int panic_timeout;
+int panic_on_oops;
+int tainted;
struct notifier_block *panic_notifier_list;
@@ -28,7 +30,6 @@
panic_timeout = simple_strtoul(str, NULL, 0);
return 1;
}
-
__setup("panic=", panic_setup);
/**
@@ -51,7 +52,7 @@
bust_spinlocks(1);
va_start(args, fmt);
- vsprintf(buf, fmt, args);
+ vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
printk(KERN_EMERG "Kernel panic: %s\n",buf);
if (in_interrupt())
@@ -126,5 +127,3 @@
snprintf(buf, sizeof(buf), "Not tainted");
return(buf);
}
-
-int tainted = 0;
|
