[PATCH] Consolidate bust_spinlocks()
Part of long forgotten patch http://groups.google.com/group/fa.linux.kernel/msg/e98e941ce1cf29f6?dmode=source Since then, m32r grabbed two copies. Leave s390 copy because of important absence of CONFIG_VT, but remove references to non-existent timerlist_lock. ia64 also loses timerlist_lock. Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Andi Kleen <ak@muc.de> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
c530cba649
commit
cefc8be824
@@ -24,8 +24,6 @@
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/kdebug.h>
|
||||
|
||||
extern spinlock_t timerlist_lock;
|
||||
|
||||
fpswa_interface_t *fpswa_interface;
|
||||
EXPORT_SYMBOL(fpswa_interface);
|
||||
|
||||
@@ -53,34 +51,6 @@ trap_init (void)
|
||||
fpswa_interface = __va(ia64_boot_param->fpswa);
|
||||
}
|
||||
|
||||
/*
|
||||
* Unlock any spinlocks which will prevent us from getting the message out (timerlist_lock
|
||||
* is acquired through the console unblank code)
|
||||
*/
|
||||
void
|
||||
bust_spinlocks (int yes)
|
||||
{
|
||||
int loglevel_save = console_loglevel;
|
||||
|
||||
if (yes) {
|
||||
oops_in_progress = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_VT
|
||||
unblank_screen();
|
||||
#endif
|
||||
oops_in_progress = 0;
|
||||
/*
|
||||
* OK, the message is on the console. Now we call printk() without
|
||||
* oops_in_progress set so that printk will give klogd a poke. Hold onto
|
||||
* your hats...
|
||||
*/
|
||||
console_loglevel = 15; /* NMI oopser may have shut the console up */
|
||||
printk(" ");
|
||||
console_loglevel = loglevel_save;
|
||||
}
|
||||
|
||||
void
|
||||
die (const char *str, struct pt_regs *regs, long err)
|
||||
{
|
||||
|
Reference in New Issue
Block a user