1 files changed, 7 insertions, 5 deletions

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index c011abb8b600..5348b820788c 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -27,6 +27,9 @@ struct device_node;
 struct iommu_table;
 struct rtc_time;
 struct file;
+#ifdef CONFIG_KEXEC
+struct kimage;
+#endif
 
 #ifdef CONFIG_SMP
 struct smp_ops_t {
@@ -131,7 +134,7 @@ struct machdep_calls {
         void            (*nvram_sync)(void);
 
         /* Exception handlers */
-        void            (*system_reset_exception)(struct pt_regs *regs);
+        int             (*system_reset_exception)(struct pt_regs *regs);
         int             (*machine_check_exception)(struct pt_regs *regs);
 
         /* Motherboard/chipset features. This is a kind of general purpose
@@ -207,19 +210,19 @@ struct machdep_calls {
 
         /* this is for modules, since _machine can be a define -- Cort */
         int ppc_machine;
+#endif /* CONFIG_PPC32 */
 
-#ifdef CONFIG_KEXEC
         /* Called to shutdown machine specific hardware not already controlled
          * by other drivers.
-         * XXX Should we move this one out of kexec scope?
          */
         void (*machine_shutdown)(void);
 
+#ifdef CONFIG_KEXEC
         /* Called to do the minimal shutdown needed to run a kexec'd kernel
          * to run successfully.
          * XXX Should we move this one out of kexec scope?
          */
-        void (*machine_crash_shutdown)(void);
+        void (*machine_crash_shutdown)(struct pt_regs *regs);
 
         /* Called to do what every setup is needed on image and the
          * reboot code buffer. Returns 0 on success.
@@ -237,7 +240,6 @@ struct machdep_calls {
          */
         void (*machine_kexec)(struct kimage *image);
 #endif /* CONFIG_KEXEC */
-#endif /* CONFIG_PPC32 */
 };
 
 extern void default_idle(void);