diff --git a/[refs] b/[refs] index 508e13bf677b..fef7cae02d89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd80a8142efa3468c2cd9fb52845f334c3220d54 +refs/heads/master: ffd71da4e3f323b7673b061e6f7e0d0c12dc2b49 diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c index 32fe4eff1b89..57fb005de546 100644 --- a/trunk/kernel/panic.c +++ b/trunk/kernel/panic.c @@ -77,7 +77,6 @@ NORET_TYPE void panic(const char * fmt, ...) #ifdef CONFIG_DEBUG_BUGVERBOSE dump_stack(); #endif - bust_spinlocks(0); /* * If we have crashed and we have a crash kernel loaded let it handle @@ -136,6 +135,7 @@ NORET_TYPE void panic(const char * fmt, ...) mdelay(1); i++; } + bust_spinlocks(0); } EXPORT_SYMBOL(panic);