git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: fix typos "couter" -> "counter"
[safe/jmp/linux-2.6]
/
kernel
/
panic.c
diff --git
a/kernel/panic.c
b/kernel/panic.c
index
984b3ec
..
96b45d0
100644
(file)
--- a/
kernel/panic.c
+++ b/
kernel/panic.c
@@
-90,6
+90,8
@@
NORET_TYPE void panic(const char * fmt, ...)
atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
+ bust_spinlocks(0);
+
if (!panic_blink)
panic_blink = no_blink;
if (!panic_blink)
panic_blink = no_blink;
@@
-136,7
+138,6
@@
NORET_TYPE void panic(const char * fmt, ...)
mdelay(1);
i++;
}
mdelay(1);
i++;
}
- bust_spinlocks(0);
}
EXPORT_SYMBOL(panic);
}
EXPORT_SYMBOL(panic);
@@
-177,7
+178,7
@@
static const struct tnt tnts[] = {
* 'W' - Taint on warning.
* 'C' - modules from drivers/staging are loaded.
*
* 'W' - Taint on warning.
* 'C' - modules from drivers/staging are loaded.
*
- * The string is overwritten by the next call to print_taint().
+ * The string is overwritten by the next call to print_taint
ed
().
*/
const char *print_tainted(void)
{
*/
const char *print_tainted(void)
{
@@
-301,6
+302,7
@@
int oops_may_print(void)
*/
void oops_enter(void)
{
*/
void oops_enter(void)
{
+ tracing_off();
/* can't trust the integrity of the kernel anymore: */
debug_locks_off();
do_oops_enter_exit();
/* can't trust the integrity of the kernel anymore: */
debug_locks_off();
do_oops_enter_exit();