Merge commit 'v2.6.26-rc9' into sched/devel

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

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 6968f43..54ed64d 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -68,6 +68,8 @@ struct machdep_calls {
                                       unsigned long vflags,
                                       int psize, int ssize);
        long            (*hpte_remove)(unsigned long hpte_group);
+       void            (*hpte_removebolted)(unsigned long ea,
+                                            int psize, int ssize);
        void            (*flush_hash_range)(unsigned long number, int local);
 
        /* special for kexec, to be called in real mode, linar mapping is
@@ -196,14 +198,18 @@ struct machdep_calls {
           May be NULL. */
        void            (*init)(void);
 
-       void            (*setup_io_mappings)(void);
-
-       void            (*early_serial_map)(void);
        void            (*kgdb_map_scc)(void);
 
        /*
         * optional PCI "hooks"
         */
+       /* Called in indirect_* to avoid touching devices */
+       int (*pci_exclude_device)(struct pci_controller *, unsigned char, unsigned char);
+
+       /* Called at then very end of pcibios_init() */
+       void (*pcibios_after_init)(void);
+
+#endif /* CONFIG_PPC32 */
 
        /* Called after PPC generic resource fixup to perform
           machine specific fixups */
@@ -212,18 +218,9 @@ struct machdep_calls {
        /* Called for each PCI bus in the system when it's probed */
        void (*pcibios_fixup_bus)(struct pci_bus *);
 
-       /* Called when pci_enable_device() is called (initial=0) or
-        * when a device with no assigned resource is found (initial=1).
-        * Returns 0 to allow assignment/enabling of the device. */
-       int  (*pcibios_enable_device_hook)(struct pci_dev *, int initial);
-
-       /* Called in indirect_* to avoid touching devices */
-       int (*pci_exclude_device)(struct pci_controller *, unsigned char, unsigned char);
-
-       /* Called at then very end of pcibios_init() */
-       void (*pcibios_after_init)(void);
-
-#endif /* CONFIG_PPC32 */
+       /* Called when pci_enable_device() is called. Returns 0 to
+        * allow assignment/enabling of the device. */
+       int  (*pcibios_enable_device_hook)(struct pci_dev *);
 
        /* Called to shutdown machine specific hardware not already controlled
         * by other drivers.
@@ -253,6 +250,16 @@ struct machdep_calls {
         */
        void (*machine_kexec)(struct kimage *image);
 #endif /* CONFIG_KEXEC */
+
+#ifdef CONFIG_SUSPEND
+       /* These are called to disable and enable, respectively, IRQs when
+        * entering a suspend state.  If NULL, then the generic versions
+        * will be called.  The generic versions disable/enable the
+        * decrementer along with interrupts.
+        */
+       void (*suspend_disable_irqs)(void);
+       void (*suspend_enable_irqs)(void);
+#endif
 };
 
 extern void power4_idle(void);
@@ -326,5 +333,31 @@ static inline void log_error(char *buf, unsigned int err_type, int fatal)
                ppc_md.log_error(buf, err_type, fatal);
 }
 
+#define __define_machine_initcall(mach,level,fn,id) \
+       static int __init __machine_initcall_##mach##_##fn(void) { \
+               if (machine_is(mach)) return fn(); \
+               return 0; \
+       } \
+       __define_initcall(level,__machine_initcall_##mach##_##fn,id);
+
+#define machine_core_initcall(mach,fn)         __define_machine_initcall(mach,"1",fn,1)
+#define machine_core_initcall_sync(mach,fn)    __define_machine_initcall(mach,"1s",fn,1s)
+#define machine_postcore_initcall(mach,fn)     __define_machine_initcall(mach,"2",fn,2)
+#define machine_postcore_initcall_sync(mach,fn)        __define_machine_initcall(mach,"2s",fn,2s)
+#define machine_arch_initcall(mach,fn)         __define_machine_initcall(mach,"3",fn,3)
+#define machine_arch_initcall_sync(mach,fn)    __define_machine_initcall(mach,"3s",fn,3s)
+#define machine_subsys_initcall(mach,fn)       __define_machine_initcall(mach,"4",fn,4)
+#define machine_subsys_initcall_sync(mach,fn)  __define_machine_initcall(mach,"4s",fn,4s)
+#define machine_fs_initcall(mach,fn)           __define_machine_initcall(mach,"5",fn,5)
+#define machine_fs_initcall_sync(mach,fn)      __define_machine_initcall(mach,"5s",fn,5s)
+#define machine_rootfs_initcall(mach,fn)       __define_machine_initcall(mach,"rootfs",fn,rootfs)
+#define machine_device_initcall(mach,fn)       __define_machine_initcall(mach,"6",fn,6)
+#define machine_device_initcall_sync(mach,fn)  __define_machine_initcall(mach,"6s",fn,6s)
+#define machine_late_initcall(mach,fn)         __define_machine_initcall(mach,"7",fn,7)
+#define machine_late_initcall_sync(mach,fn)    __define_machine_initcall(mach,"7s",fn,7s)
+
+void generic_suspend_disable_irqs(void);
+void generic_suspend_enable_irqs(void);
+
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_MACHDEP_H */