Commit cefc8be8 authored by Kirill Korotaev's avatar Kirill Korotaev Committed by Linus Torvalds
Browse files

[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: default avatarAlexey Dobriyan <adobriyan@openvz.org>
Acked-by: default avatarMartin 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c530cba6

arch/i386/mm/fault.c

+0 −26
Original line number Diff line number Diff line
@@ -59,32 +59,6 @@ static inline int notify_page_fault(enum die_val val, const char *str, 
	return atomic_notifier_call_chain(&notify_page_fault_chain, val, &args);

}



/*

 * Unlock any spinlocks which will prevent us from getting the

 * message out 

 */

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;

}



/*

 * Return EIP plus the CS segment base.  The segment limit is also

 * adjusted, clamped to the kernel/user address space (whichever is

arch/ia64/kernel/traps.c

+0 −30
Original line number Diff line number Diff line
@@ -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)

{

arch/m32r/mm/fault-nommu.c

+0 −26
Original line number Diff line number Diff line
@@ -44,32 +44,6 @@ unsigned int tlb_entry_d_dat[NR_CPUS]; 
#define tlb_entry_d tlb_entry_d_dat[smp_processor_id()]

#endif



/*

 * Unlock any spinlocks which will prevent us from getting the

 * message out

 */

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 do_BUG(const char *file, int line)

{

	bust_spinlocks(1);

arch/m32r/mm/fault.c

+0 −26
Original line number Diff line number Diff line
@@ -49,32 +49,6 @@ unsigned int tlb_entry_d_dat[NR_CPUS]; 


extern void init_tlb(void);



/*

 * Unlock any spinlocks which will prevent us from getting the

 * message out

 */

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;

}



/*======================================================================*

 * do_page_fault()

 *======================================================================*

arch/s390/mm/fault.c

+1 −3
Original line number Diff line number Diff line
@@ -83,12 +83,10 @@ static inline int notify_page_fault(enum die_val val, const char *str, 
}

#endif



extern spinlock_t timerlist_lock;



/*

 * Unlock any spinlocks which will prevent us from getting the

 * message out (timerlist_lock is acquired through the

 * console unblank code)

 * message out.

 */

void bust_spinlocks(int yes)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE