1 files changed, 8 insertions, 4 deletions

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 42ce570812c1..c4231973edd3 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -34,19 +34,19 @@ struct machdep_calls {
         char            *name;
 #ifdef CONFIG_PPC64
         void            (*hpte_invalidate)(unsigned long slot,
-                                           unsigned long va,
+                                           unsigned long vpn,
                                            int psize, int ssize,
                                            int local);
         long            (*hpte_updatepp)(unsigned long slot, 
                                          unsigned long newpp, 
-                                         unsigned long va,
+                                         unsigned long vpn,
                                          int psize, int ssize,
                                          int local);
         void            (*hpte_updateboltedpp)(unsigned long newpp, 
                                                unsigned long ea,
                                                int psize, int ssize);
         long            (*hpte_insert)(unsigned long hpte_group,
-                                       unsigned long va,
+                                       unsigned long vpn,
                                        unsigned long prpn,
                                        unsigned long rflags,
                                        unsigned long vflags,
@@ -180,7 +180,8 @@ struct machdep_calls {
         void            (*enable_pmcs)(void);
 
         /* Set DABR for this platform, leave empty for default implemenation */
-        int             (*set_dabr)(unsigned long dabr);
+        int             (*set_dabr)(unsigned long dabr,
+                                    unsigned long dabrx);
 
 #ifdef CONFIG_PPC32     /* XXX for now */
         /* A general init function, called by ppc_init in init/main.c.
@@ -214,6 +215,9 @@ struct machdep_calls {
         /* Called after scan and before resource survey */
         void (*pcibios_fixup_phb)(struct pci_controller *hose);
 
+        /* Called during PCI resource reassignment */
+        resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type);
+
         /* Called to shutdown machine specific hardware not already controlled
          * by other drivers.
          */