[PATCH] ppc64: Remove redundant abs_to_phys() macro

[~andy/linux] / include / asm-ppc64 / machdep.h

diff --git a/include/asm-ppc64/machdep.h b/include/asm-ppc64/machdep.h
index 5d3cd9d042e29bb0e88a540b4550d3e992d5551e..f0ef06375947bbb86b634338a215575a3fb143c9 100644 (file)
--- a/include/asm-ppc64/machdep.h
+++ b/include/asm-ppc64/machdep.h
@@ -53,10 +53,8 @@ struct machdep_calls {
        long            (*hpte_insert)(unsigned long hpte_group,
                                       unsigned long va,
                                       unsigned long prpn,
-                                      int secondary, 
-                                      unsigned long hpteflags, 
-                                      int bolted,
-                                      int large);
+                                      unsigned long vflags,
+                                      unsigned long rflags);
        long            (*hpte_remove)(unsigned long hpte_group);
        void            (*flush_hash_range)(unsigned long context,
                                            unsigned long number,
@@ -76,6 +74,7 @@ struct machdep_calls {
        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);
 
        int             (*probe)(int platform);
        void            (*setup_arch)(void);
@@ -85,6 +84,7 @@ struct machdep_calls {
 
        void            (*init_IRQ)(void);
        int             (*get_irq)(struct pt_regs *);
+       void            (*cpu_irq_down)(int secondary);
 
        /* PCI stuff */
        void            (*pcibios_fixup)(void);
@@ -138,8 +138,13 @@ struct machdep_calls {
                                                unsigned long size,
                                                pgprot_t vma_prot);
 
+       /* Idle loop for this platform, leave empty for default idle loop */
+       int             (*idle_loop)(void);
 };
 
+extern int default_idle(void);
+extern int native_idle(void);
+
 extern struct machdep_calls ppc_md;
 extern char cmd_line[COMMAND_LINE_SIZE];