linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-powerpc / machdep.h

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index c17c137..5348b82 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -9,6 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
@@ -46,7 +47,6 @@ struct smp_ops_t {
 #endif
 
 struct machdep_calls {
-       char            *name;
 #ifdef CONFIG_PPC64
        void            (*hpte_invalidate)(unsigned long slot,
                                           unsigned long va,
@@ -81,15 +81,13 @@ struct machdep_calls {
        void            (*tce_free)(struct iommu_table *tbl,
                                    long index,
                                    long npages);
-       unsigned long   (*tce_get)(struct iommu_table *tbl,
-                                   long index);
        void            (*tce_flush)(struct iommu_table *tbl);
        void            (*iommu_dev_setup)(struct pci_dev *dev);
        void            (*iommu_bus_setup)(struct pci_bus *bus);
        void            (*irq_bus_setup)(struct pci_bus *bus);
-#endif /* CONFIG_PPC64 */
+#endif
 
-       int             (*probe)(void);
+       int             (*probe)(int platform);
        void            (*setup_arch)(void);
        void            (*init_early)(void);
        /* Optional, may be NULL. */
@@ -97,7 +95,7 @@ struct machdep_calls {
        void            (*show_percpuinfo)(struct seq_file *m, int i);
 
        void            (*init_IRQ)(void);
-       unsigned int    (*get_irq)(struct pt_regs *);
+       int             (*get_irq)(struct pt_regs *);
 #ifdef CONFIG_KEXEC
        void            (*kexec_cpu_down)(int crash_shutdown, int secondary);
 #endif
@@ -160,12 +158,6 @@ struct machdep_calls {
        /* Idle loop for this platform, leave empty for default idle loop */
        void            (*idle_loop)(void);
 
-       /*
-        * Function for waiting for work with reduced power in idle loop;
-        * called with interrupts disabled.
-        */
-       void            (*power_save)(void);
-
        /* Function to enable performance monitor counters for this
           platform, called once per cpu. */
        void            (*enable_pmcs)(void);
@@ -178,6 +170,13 @@ struct machdep_calls {
           May be NULL. */
        void            (*init)(void);
 
+       void            (*idle)(void);
+       void            (*power_save)(void);
+
+       void            (*heartbeat)(void);
+       unsigned long   heartbeat_reset;
+       unsigned long   heartbeat_count;
+
        void            (*setup_io_mappings)(void);
 
        void            (*early_serial_map)(void);
@@ -209,6 +208,8 @@ struct machdep_calls {
        /* Called at then very end of pcibios_init() */
        void (*pcibios_after_init)(void);
 
+       /* this is for modules, since _machine can be a define -- Cort */
+       int ppc_machine;
 #endif /* CONFIG_PPC32 */
 
        /* Called to shutdown machine specific hardware not already controlled
@@ -239,40 +240,12 @@ struct machdep_calls {
         */
        void (*machine_kexec)(struct kimage *image);
 #endif /* CONFIG_KEXEC */
-
-#ifdef CONFIG_PCI_MSI
-       int (*enable_msi)(struct pci_dev *pdev);
-       void (*disable_msi)(struct pci_dev *pdev);
-#endif /* CONFIG_PCI_MSI */
 };
 
-extern void power4_idle(void);
-extern void ppc6xx_idle(void);
+extern void default_idle(void);
+extern void native_idle(void);
 
-/*
- * ppc_md contains a copy of the machine description structure for the
- * current platform. machine_id contains the initial address where the
- * description was found during boot.
- */
 extern struct machdep_calls ppc_md;
-extern struct machdep_calls *machine_id;
-
-#define __machine_desc __attribute__ ((__section__ (".machine.desc")))
-
-#define define_machine(name)                                   \
-       extern struct machdep_calls mach_##name;                \
-       EXPORT_SYMBOL(mach_##name);                             \
-       struct machdep_calls mach_##name __machine_desc =
-
-#define machine_is(name) \
-       ({ \
-               extern struct machdep_calls mach_##name \
-                       __attribute__((weak));           \
-               machine_id == &mach_##name; \
-       })
-
-extern void probe_machine(void);
-
 extern char cmd_line[COMMAND_LINE_SIZE];
 
 #ifdef CONFIG_PPC_PMAC