[PATCH] x86: don't initialise cpu_possible_map to all ones

[pandora-kernel.git] / include / asm-powerpc / machdep.h

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index fa03864..5348b82 100644 (file)
--- 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 {
@@ -82,7 +85,6 @@ struct machdep_calls {
        void            (*iommu_dev_setup)(struct pci_dev *dev);
        void            (*iommu_bus_setup)(struct pci_bus *bus);
        void            (*irq_bus_setup)(struct pci_bus *bus);
-       int             (*set_dabr)(unsigned long dabr);
 #endif
 
        int             (*probe)(int platform);
@@ -94,7 +96,9 @@ struct machdep_calls {
 
        void            (*init_IRQ)(void);
        int             (*get_irq)(struct pt_regs *);
-       void            (*cpu_irq_down)(int secondary);
+#ifdef CONFIG_KEXEC
+       void            (*kexec_cpu_down)(int crash_shutdown, int secondary);
+#endif
 
        /* PCI stuff */
        /* Called after scanning the bus, before allocating resources */
@@ -130,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
@@ -158,6 +162,9 @@ struct machdep_calls {
           platform, called once per cpu. */
        void            (*enable_pmcs)(void);
 
+       /* Set DABR for this platform, leave empty for default implemenation */
+       int             (*set_dabr)(unsigned long dabr);
+
 #ifdef CONFIG_PPC32    /* XXX for now */
        /* A general init function, called by ppc_init in init/main.c.
           May be NULL. */
@@ -203,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.
@@ -233,7 +240,6 @@ struct machdep_calls {
         */
        void (*machine_kexec)(struct kimage *image);
 #endif /* CONFIG_KEXEC */
-#endif /* CONFIG_PPC32 */
 };
 
 extern void default_idle(void);