diff options
Diffstat (limited to 'arch/m32r')
-rw-r--r-- | arch/m32r/mm/fault-nommu.c | 26 | ||||
-rw-r--r-- | arch/m32r/mm/fault.c | 26 |
2 files changed, 0 insertions, 52 deletions
diff --git a/arch/m32r/mm/fault-nommu.c b/arch/m32r/mm/fault-nommu.c index 0a09cc01212b..9880abac3f54 100644 --- a/arch/m32r/mm/fault-nommu.c +++ b/arch/m32r/mm/fault-nommu.c | |||
@@ -44,32 +44,6 @@ unsigned int tlb_entry_d_dat[NR_CPUS]; | |||
44 | #define tlb_entry_d tlb_entry_d_dat[smp_processor_id()] | 44 | #define tlb_entry_d tlb_entry_d_dat[smp_processor_id()] |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | /* | ||
48 | * Unlock any spinlocks which will prevent us from getting the | ||
49 | * message out | ||
50 | */ | ||
51 | void bust_spinlocks(int yes) | ||
52 | { | ||
53 | int loglevel_save = console_loglevel; | ||
54 | |||
55 | if (yes) { | ||
56 | oops_in_progress = 1; | ||
57 | return; | ||
58 | } | ||
59 | #ifdef CONFIG_VT | ||
60 | unblank_screen(); | ||
61 | #endif | ||
62 | oops_in_progress = 0; | ||
63 | /* | ||
64 | * OK, the message is on the console. Now we call printk() | ||
65 | * without oops_in_progress set so that printk will give klogd | ||
66 | * a poke. Hold onto your hats... | ||
67 | */ | ||
68 | console_loglevel = 15; /* NMI oopser may have shut the console up */ | ||
69 | printk(" "); | ||
70 | console_loglevel = loglevel_save; | ||
71 | } | ||
72 | |||
73 | void do_BUG(const char *file, int line) | 47 | void do_BUG(const char *file, int line) |
74 | { | 48 | { |
75 | bust_spinlocks(1); | 49 | bust_spinlocks(1); |
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index fc7ccdf829e2..037d58e82fb5 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c | |||
@@ -49,32 +49,6 @@ unsigned int tlb_entry_d_dat[NR_CPUS]; | |||
49 | 49 | ||
50 | extern void init_tlb(void); | 50 | extern void init_tlb(void); |
51 | 51 | ||
52 | /* | ||
53 | * Unlock any spinlocks which will prevent us from getting the | ||
54 | * message out | ||
55 | */ | ||
56 | void bust_spinlocks(int yes) | ||
57 | { | ||
58 | int loglevel_save = console_loglevel; | ||
59 | |||
60 | if (yes) { | ||
61 | oops_in_progress = 1; | ||
62 | return; | ||
63 | } | ||
64 | #ifdef CONFIG_VT | ||
65 | unblank_screen(); | ||
66 | #endif | ||
67 | oops_in_progress = 0; | ||
68 | /* | ||
69 | * OK, the message is on the console. Now we call printk() | ||
70 | * without oops_in_progress set so that printk will give klogd | ||
71 | * a poke. Hold onto your hats... | ||
72 | */ | ||
73 | console_loglevel = 15; /* NMI oopser may have shut the console up */ | ||
74 | printk(" "); | ||
75 | console_loglevel = loglevel_save; | ||
76 | } | ||
77 | |||
78 | /*======================================================================* | 52 | /*======================================================================* |
79 | * do_page_fault() | 53 | * do_page_fault() |
80 | *======================================================================* | 54 | *======================================================================* |