openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

panic: clean up kernel/panic.c 

Impact: cleanup, no code changed

Clean up kernel/panic.c some more and make it more consistent.

LKML-Reference: <49B91A7E.76E4.0078.0@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-03-13 11:14:06 +01:00
parent d1dedb52ac
commit c95dbf27e2
1 changed files with 61 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
kernel/panic.c
View File

@ -8,19 +8,19 @@
* This function is used through-out the kernel (including mm and fs) * This function is used through-out the kernel (including mm and fs)
* to indicate a major problem. * to indicate a major problem.
*/ */
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/reboot.h>
#include <linux/notifier.h>
#include <linux/init.h>
#include <linux/sysrq.h>
#include <linux/interrupt.h>
#include <linux/nmi.h>
#include <linux/kexec.h>
#include <linux/debug_locks.h> #include <linux/debug_locks.h>
#include <linux/random.h> #include <linux/interrupt.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/notifier.h>
#include <linux/module.h>
#include <linux/random.h>
#include <linux/reboot.h>
#include <linux/delay.h>
#include <linux/kexec.h>
#include <linux/sched.h>
#include <linux/sysrq.h>
#include <linux/init.h>
#include <linux/nmi.h>
#include <linux/dmi.h> #include <linux/dmi.h>
int panic_on_oops; int panic_on_oops;
@ -52,19 +52,15 @@ EXPORT_SYMBOL(panic_blink);
* *
* This function never returns. * This function never returns.
*/ */
NORET_TYPE void panic(const char * fmt, ...) NORET_TYPE void panic(const char * fmt, ...)
{ {
long i;
static char buf[1024]; static char buf[1024];
va_list args; va_list args;
#if defined(CONFIG_S390) long i;
unsigned long caller = (unsigned long) __builtin_return_address(0);
#endif
/* /*
* It's possible to come here directly from a panic-assertion and not * It's possible to come here directly from a panic-assertion and
* have preempt disabled. Some functions called from here want * not have preempt disabled. Some functions called from here want
* preempt to be disabled. No point enabling it later though... * preempt to be disabled. No point enabling it later though...
*/ */
preempt_disable(); preempt_disable();
@ -100,16 +96,18 @@ NORET_TYPE void panic(const char * fmt, ...)
if (panic_timeout > 0) { if (panic_timeout > 0) {
/* /*
* Delay timeout seconds before rebooting the machine. * Delay timeout seconds before rebooting the machine.
* We can't use the "normal" timers since we just panicked.. * We can't use the "normal" timers since we just panicked.
*/ */
printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout); printk(KERN_EMERG "Rebooting in %d seconds..", panic_timeout);
for (i = 0; i < panic_timeout*1000; ) { for (i = 0; i < panic_timeout*1000; ) {
touch_nmi_watchdog(); touch_nmi_watchdog();
i += panic_blink(i); i += panic_blink(i);
mdelay(1); mdelay(1);
i++; i++;
} }
/* This will not be a clean reboot, with everything /*
* This will not be a clean reboot, with everything
* shutting down. But if there is a chance of * shutting down. But if there is a chance of
* rebooting the system it will be rebooted. * rebooting the system it will be rebooted.
*/ */
@ -124,10 +122,15 @@ NORET_TYPE void panic(const char * fmt, ...)
} }
#endif #endif
#if defined(CONFIG_S390) #if defined(CONFIG_S390)
{
unsigned long caller;
caller = (unsigned long)__builtin_return_address(0);
disabled_wait(caller); disabled_wait(caller);
}
#endif #endif
local_irq_enable(); local_irq_enable();
for (i = 0;;) { for (i = 0; ; ) {
touch_softlockup_watchdog(); touch_softlockup_watchdog();
i += panic_blink(i); i += panic_blink(i);
mdelay(1); mdelay(1);
@ -193,7 +196,8 @@ const char *print_tainted(void)
*s = 0; *s = 0;
} else } else
snprintf(buf, sizeof(buf), "Not tainted"); snprintf(buf, sizeof(buf), "Not tainted");
return(buf);
return buf;
} }
int test_taint(unsigned flag) int test_taint(unsigned flag)
@ -209,7 +213,8 @@ unsigned long get_taint(void)
void add_taint(unsigned flag) void add_taint(unsigned flag)
{ {
debug_locks = 0; /* can't trust the integrity of the kernel anymore */ /* can't trust the integrity of the kernel anymore: */
debug_locks = 0;
set_bit(flag, &tainted_mask); set_bit(flag, &tainted_mask);
} }
EXPORT_SYMBOL(add_taint); EXPORT_SYMBOL(add_taint);
@ -264,8 +269,8 @@ static void do_oops_enter_exit(void)
} }
/* /*
* Return true if the calling CPU is allowed to print oops-related info. This * Return true if the calling CPU is allowed to print oops-related info.
* is a bit racy.. * This is a bit racy..
*/ */
int oops_may_print(void) int oops_may_print(void)
{ {
@ -274,20 +279,22 @@ int oops_may_print(void)
/* /*
* Called when the architecture enters its oops handler, before it prints * Called when the architecture enters its oops handler, before it prints
* anything. If this is the first CPU to oops, and it's oopsing the first time * anything. If this is the first CPU to oops, and it's oopsing the first
* then let it proceed. * time then let it proceed.
* *
* This is all enabled by the pause_on_oops kernel boot option. We do all this * This is all enabled by the pause_on_oops kernel boot option. We do all
* to ensure that oopses don't scroll off the screen. It has the side-effect * this to ensure that oopses don't scroll off the screen. It has the
* of preventing later-oopsing CPUs from mucking up the display, too. * side-effect of preventing later-oopsing CPUs from mucking up the display,
* too.
* *
* It turns out that the CPU which is allowed to print ends up pausing for the * It turns out that the CPU which is allowed to print ends up pausing for
* right duration, whereas all the other CPUs pause for twice as long: once in * the right duration, whereas all the other CPUs pause for twice as long:
* oops_enter(), once in oops_exit(). * once in oops_enter(), once in oops_exit().
*/ */
void oops_enter(void) void oops_enter(void)
{ {
debug_locks_off(); /* can't trust the integrity of the kernel anymore */ /* can't trust the integrity of the kernel anymore: */
debug_locks_off();
do_oops_enter_exit(); do_oops_enter_exit();
} }