From 962a3258e7cbed407c8e28f327f76f1e06dca41d Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Sat, 11 Feb 2006 17:56:01 -0800
Subject: [PATCH] --- yaml --- r: 20217 b: refs/heads/master c:
 a386fba2516b5404864647906219ced57bf2f2b7 h: refs/heads/master i:   20215:
 733025e577af3882883d197c8bad579007c2cbfd v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/s390/kernel/machine_kexec.c | 5 +++--
 trunk/include/asm-s390/smp.h           | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f0ad728e0fe8..87d4617dd967 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5238da45f345898a8bfcd14e53b0431fcee36a04
+refs/heads/master: a386fba2516b5404864647906219ced57bf2f2b7
diff --git a/trunk/arch/s390/kernel/machine_kexec.c b/trunk/arch/s390/kernel/machine_kexec.c
index f0ed5c642c74..bad81b5832db 100644
--- a/trunk/arch/s390/kernel/machine_kexec.c
+++ b/trunk/arch/s390/kernel/machine_kexec.c
@@ -12,15 +12,16 @@
  * on the S390 architecture.
  */
 
-#include <asm/cio.h>
-#include <asm/setup.h>
 #include <linux/device.h>
 #include <linux/mm.h>
 #include <linux/kexec.h>
 #include <linux/delay.h>
+#include <asm/cio.h>
+#include <asm/setup.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <asm/system.h>
+#include <asm/smp.h>
 
 static void kexec_halt_all_cpus(void *);
 
diff --git a/trunk/include/asm-s390/smp.h b/trunk/include/asm-s390/smp.h
index a2ae7628bbaa..9c6e9c300eb9 100644
--- a/trunk/include/asm-s390/smp.h
+++ b/trunk/include/asm-s390/smp.h
@@ -101,6 +101,7 @@ smp_call_function_on(void (*func) (void *info), void *info,
 	func(info);
 	return 0;
 }
+#define smp_cpu_not_running(cpu)	1
 #define smp_get_cpu(cpu) ({ 0; })
 #define smp_put_cpu(cpu) ({ 0; })
 #endif