From a88e8af52d1b8b957a8d41c1a84b58a4fa8f823d Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 12 Jun 2008 19:14:34 +1000
Subject: [PATCH] --- yaml --- r: 101695 b: refs/heads/master c:
 aee10c6145199f872bc51f811b115a4b686b2426 h: refs/heads/master i:   101693:
 ada20f82e518c216e38a024778978e0860e30408   101691:
 3681fd82c5d3f897a3d81421bd0beb642c6d5b05   101687:
 f53758a5bda36945a589fad3998cc76e7db151ed   101679:
 b41bba5af2acf17688f4a40c7d68b2eea0afa8fa   101663:
 5db0e9a47de391c12ad7b132cb1bed41120d4c42   101631:
 ce916a446606795c26acc08595a6684a08a0c97b v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-powerpc/kexec.h | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c38662f47e1e..3c59e7ff59d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41743a4e34f0777f51c1cf0675b91508ba143050
+refs/heads/master: aee10c6145199f872bc51f811b115a4b686b2426
diff --git a/trunk/include/asm-powerpc/kexec.h b/trunk/include/asm-powerpc/kexec.h
index 701857bc8e24..acdcdc66f1b6 100644
--- a/trunk/include/asm-powerpc/kexec.h
+++ b/trunk/include/asm-powerpc/kexec.h
@@ -34,6 +34,8 @@
 #ifndef __ASSEMBLY__
 #include <linux/cpumask.h>
 
+typedef void (*crash_shutdown_t)(void);
+
 #ifdef CONFIG_KEXEC
 
 #ifdef __powerpc64__
@@ -123,7 +125,6 @@ struct pt_regs;
 extern void default_machine_kexec(struct kimage *image);
 extern int default_machine_kexec_prepare(struct kimage *image);
 extern void default_machine_crash_shutdown(struct pt_regs *regs);
-typedef void (*crash_shutdown_t)(void);
 extern int crash_shutdown_register(crash_shutdown_t handler);
 extern int crash_shutdown_unregister(crash_shutdown_t handler);
 
@@ -143,6 +144,16 @@ static inline int overlaps_crashkernel(unsigned long start, unsigned long size)
 
 static inline void reserve_crashkernel(void) { ; }
 
+static inline int crash_shutdown_register(crash_shutdown_t handler)
+{
+	return 0;
+}
+
+static inline int crash_shutdown_unregister(crash_shutdown_t handler)
+{
+	return 0;
+}
+
 #endif /* CONFIG_KEXEC */
 #endif /* ! __ASSEMBLY__ */
 #endif /* __KERNEL__ */