git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
kernel
/
panic.c
diff --git
a/kernel/panic.c
b/kernel/panic.c
index
b3abe97
..
3f93784
100644
(file)
--- a/
kernel/panic.c
+++ b/
kernel/panic.c
@@
-16,7
+16,6
@@
#include <linux/notifier.h>
#include <linux/init.h>
#include <linux/sysrq.h>
#include <linux/notifier.h>
#include <linux/init.h>
#include <linux/sysrq.h>
-#include <linux/syscalls.h>
#include <linux/interrupt.h>
#include <linux/nmi.h>
#include <linux/interrupt.h>
#include <linux/nmi.h>
@@
-37,6
+36,15
@@
static int __init panic_setup(char *str)
}
__setup("panic=", panic_setup);
}
__setup("panic=", panic_setup);
+static long no_blink(long time)
+{
+ return 0;
+}
+
+/* Returns how long it waited in ms */
+long (*panic_blink)(long time);
+EXPORT_SYMBOL(panic_blink);
+
/**
* panic - halt the system
* @fmt: The text string to print
/**
* panic - halt the system
* @fmt: The text string to print
@@
-49,6
+57,7
@@
__setup("panic=", panic_setup);
NORET_TYPE void panic(const char * fmt, ...)
{
NORET_TYPE void panic(const char * fmt, ...)
{
+ long i;
static char buf[1024];
va_list args;
#if defined(CONFIG_ARCH_S390)
static char buf[1024];
va_list args;
#if defined(CONFIG_ARCH_S390)
@@
-66,19
+75,23
@@
NORET_TYPE void panic(const char * fmt, ...)
smp_send_stop();
#endif
smp_send_stop();
#endif
- notifier_call_chain(&panic_notifier_list, 0, buf);
+ notifier_call_chain(&panic_notifier_list, 0, buf);
+
+ if (!panic_blink)
+ panic_blink = no_blink;
if (panic_timeout > 0)
{
if (panic_timeout > 0)
{
- int i;
/*
* Delay timeout seconds before rebooting the machine.
* We can't use the "normal" timers since we just panicked..
*/
printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
/*
* Delay timeout seconds before rebooting the machine.
* We can't use the "normal" timers since we just panicked..
*/
printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
- for (i = 0; i < panic_timeout
; i++
) {
+ for (i = 0; i < panic_timeout
*1000;
) {
touch_nmi_watchdog();
touch_nmi_watchdog();
- mdelay(1000);
+ i += panic_blink(i);
+ mdelay(1);
+ i++;
}
/*
* Should we run the reboot notifier. For the moment Im
}
/*
* Should we run the reboot notifier. For the moment Im
@@
-99,8
+112,11
@@
NORET_TYPE void panic(const char * fmt, ...)
disabled_wait(caller);
#endif
local_irq_enable();
disabled_wait(caller);
#endif
local_irq_enable();
- for (;;)
- ;
+ for (i = 0;;) {
+ i += panic_blink(i);
+ mdelay(1);
+ i++;
+ }
}
EXPORT_SYMBOL(panic);
}
EXPORT_SYMBOL(panic);
@@
-111,6
+127,9
@@
EXPORT_SYMBOL(panic);
* 'P' - Proprietary module has been loaded.
* 'F' - Module has been forcibly loaded.
* 'S' - SMP with CPUs not designed for SMP.
* 'P' - Proprietary module has been loaded.
* 'F' - Module has been forcibly loaded.
* 'S' - SMP with CPUs not designed for SMP.
+ * 'R' - User forced a module unload.
+ * 'M' - Machine had a machine check experience.
+ * 'B' - System has hit bad_page.
*
* The string is overwritten by the next call to print_taint().
*/
*
* The string is overwritten by the next call to print_taint().
*/
@@
-119,12
+138,21
@@
const char *print_tainted(void)
{
static char buf[20];
if (tainted) {
{
static char buf[20];
if (tainted) {
- snprintf(buf, sizeof(buf), "Tainted: %c%c%c",
+ snprintf(buf, sizeof(buf), "Tainted: %c%c%c
%c%c%c
",
tainted & TAINT_PROPRIETARY_MODULE ? 'P' : 'G',
tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
tainted & TAINT_PROPRIETARY_MODULE ? 'P' : 'G',
tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
- tainted & TAINT_UNSAFE_SMP ? 'S' : ' ');
+ tainted & TAINT_UNSAFE_SMP ? 'S' : ' ',
+ tainted & TAINT_FORCED_RMMOD ? 'R' : ' ',
+ tainted & TAINT_MACHINE_CHECK ? 'M' : ' ',
+ tainted & TAINT_BAD_PAGE ? 'B' : ' ');
}
else
snprintf(buf, sizeof(buf), "Not tainted");
return(buf);
}
}
else
snprintf(buf, sizeof(buf), "Not tainted");
return(buf);
}
+
+void add_taint(unsigned flag)
+{
+ tainted |= flag;
+}
+EXPORT_SYMBOL(add_taint);