diff options
author | Kirill Korotaev <dev@sw.ru> | 2007-02-10 04:46:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:34 -0500 |
commit | cefc8be82403cfc4325e7b9b063f77dc0f34e19e (patch) | |
tree | d360f54c14860550b37f86b44757ecef749db1c0 /arch/x86_64/mm/fault.c | |
parent | c530cba649692512070e8c0131ba3eccade09269 (diff) |
[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>
Diffstat (limited to 'arch/x86_64/mm/fault.c')
-rw-r--r-- | arch/x86_64/mm/fault.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index a65fc6f1dcaf..49e8cf2e06f8 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c | |||
@@ -69,27 +69,6 @@ static inline int notify_page_fault(enum die_val val, const char *str, | |||
69 | return atomic_notifier_call_chain(¬ify_page_fault_chain, val, &args); | 69 | return atomic_notifier_call_chain(¬ify_page_fault_chain, val, &args); |
70 | } | 70 | } |
71 | 71 | ||
72 | void bust_spinlocks(int yes) | ||
73 | { | ||
74 | int loglevel_save = console_loglevel; | ||
75 | if (yes) { | ||
76 | oops_in_progress = 1; | ||
77 | } else { | ||
78 | #ifdef CONFIG_VT | ||
79 | unblank_screen(); | ||
80 | #endif | ||
81 | oops_in_progress = 0; | ||
82 | /* | ||
83 | * OK, the message is on the console. Now we call printk() | ||
84 | * without oops_in_progress set so that printk will give klogd | ||
85 | * a poke. Hold onto your hats... | ||
86 | */ | ||
87 | console_loglevel = 15; /* NMI oopser may have shut the console up */ | ||
88 | printk(" "); | ||
89 | console_loglevel = loglevel_save; | ||
90 | } | ||
91 | } | ||
92 | |||
93 | /* Sometimes the CPU reports invalid exceptions on prefetch. | 72 | /* Sometimes the CPU reports invalid exceptions on prefetch. |
94 | Check that here and ignore. | 73 | Check that here and ignore. |
95 | Opcode checker based on code by Richard Brunner */ | 74 | Opcode checker based on code by Richard Brunner */ |