From 98bb9e2119b58ec765704118121c8da3b25f49b9 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Mar 2009 11:14:06 +0100
Subject: [PATCH] --- yaml --- r: 140434 b: refs/heads/master c:
 d1dedb52acd98bd5e13e1ff4c4d045d58bbd16fe h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/smp.h | 4 +++-
 trunk/kernel/panic.c      | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fef7cae02d89..d02ff3ae2a89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffd71da4e3f323b7673b061e6f7e0d0c12dc2b49
+refs/heads/master: d1dedb52acd98bd5e13e1ff4c4d045d58bbd16fe
diff --git a/trunk/include/linux/smp.h b/trunk/include/linux/smp.h
index 2d3bcb6b37ff..a69db820eed6 100644
--- a/trunk/include/linux/smp.h
+++ b/trunk/include/linux/smp.h
@@ -38,7 +38,7 @@ int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
 /*
  * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc.
  * (defined in asm header):
- */ 
+ */
 
 /*
  * stops all CPUs but the current one:
@@ -122,6 +122,8 @@ extern unsigned int setup_max_cpus;
 
 #else /* !SMP */
 
+static inline void smp_send_stop(void) { }
+
 /*
  *	These macros fold the SMP functionality into a single CPU system
  */
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index 57fb005de546..ca75e819d0ea 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -85,14 +85,12 @@ NORET_TYPE void panic(const char * fmt, ...)
 	 */
 	crash_kexec(NULL);
 
-#ifdef CONFIG_SMP
 	/*
 	 * Note smp_send_stop is the usual smp shutdown function, which
 	 * unfortunately means it may not be hardened to work in a panic
 	 * situation.
 	 */
 	smp_send_stop();
-#endif
 
 	atomic_notifier_call_chain(&panic_notifier_list, 0, buf);