aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 06:14:06 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-13 06:24:31 -0400
commitd1dedb52acd98bd5e13e1ff4c4d045d58bbd16fe (patch)
tree02b305e743a8160e87cf10258b868bd507dfbfb2
parentffd71da4e3f323b7673b061e6f7e0d0c12dc2b49 (diff)
panic, smp: provide smp_send_stop() wrapper on UP too
Impact: cleanup, no code changed Remove an ugly #ifdef CONFIG_SMP from panic(), by providing an smp_send_stop() wrapper on UP too. LKML-Reference: <49B91A7E.76E4.0078.0@novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/smp.h4
-rw-r--r--kernel/panic.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 2d3bcb6b37ff..a69db820eed6 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -38,7 +38,7 @@ int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
38/* 38/*
39 * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc. 39 * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc.
40 * (defined in asm header): 40 * (defined in asm header):
41 */ 41 */
42 42
43/* 43/*
44 * stops all CPUs but the current one: 44 * stops all CPUs but the current one:
@@ -122,6 +122,8 @@ extern unsigned int setup_max_cpus;
122 122
123#else /* !SMP */ 123#else /* !SMP */
124 124
125static inline void smp_send_stop(void) { }
126
125/* 127/*
126 * These macros fold the SMP functionality into a single CPU system 128 * These macros fold the SMP functionality into a single CPU system
127 */ 129 */
diff --git a/kernel/panic.c b/kernel/panic.c
index 57fb005de546..ca75e819d0ea 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -85,14 +85,12 @@ NORET_TYPE void panic(const char * fmt, ...)
85 */ 85 */
86 crash_kexec(NULL); 86 crash_kexec(NULL);
87 87
88#ifdef CONFIG_SMP
89 /* 88 /*
90 * Note smp_send_stop is the usual smp shutdown function, which 89 * Note smp_send_stop is the usual smp shutdown function, which
91 * unfortunately means it may not be hardened to work in a panic 90 * unfortunately means it may not be hardened to work in a panic
92 * situation. 91 * situation.
93 */ 92 */
94 smp_send_stop(); 93 smp_send_stop();
95#endif
96 94
97 atomic_notifier_call_chain(&panic_notifier_list, 0, buf); 95 atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
98 96