Merge branch 'for-2.6.23' into merge

4 files changed, 17 insertions, 13 deletions

diff --git a/arch/powerpc/platforms/iseries/call_hpt.h b/arch/powerpc/platforms/iseries/call_hpt.h
index a843b0f87b72..8d95fe4b554e 100644
--- a/arch/powerpc/platforms/iseries/call_hpt.h
+++ b/arch/powerpc/platforms/iseries/call_hpt.h
@@ -76,24 +76,25 @@ static inline u64 HvCallHpt_invalidateSetSwBitsGet(u32 hpteIndex, u8 bitson,
         return compressedStatus;
 }
 
-static inline u64 HvCallHpt_findValid(hpte_t *hpte, u64 vpn)
+static inline u64 HvCallHpt_findValid(struct hash_pte *hpte, u64 vpn)
 {
         return HvCall3Ret16(HvCallHptFindValid, hpte, vpn, 0, 0);
 }
 
-static inline u64 HvCallHpt_findNextValid(hpte_t *hpte, u32 hpteIndex,
+static inline u64 HvCallHpt_findNextValid(struct hash_pte *hpte, u32 hpteIndex,
                 u8 bitson, u8 bitsoff)
 {
         return HvCall3Ret16(HvCallHptFindNextValid, hpte, hpteIndex,
                         bitson, bitsoff);
 }
 
-static inline void HvCallHpt_get(hpte_t *hpte, u32 hpteIndex)
+static inline void HvCallHpt_get(struct hash_pte *hpte, u32 hpteIndex)
 {
         HvCall2Ret16(HvCallHptGet, hpte, hpteIndex, 0);
 }
 
-static inline void HvCallHpt_addValidate(u32 hpteIndex, u32 hBit, hpte_t *hpte)
+static inline void HvCallHpt_addValidate(u32 hpteIndex, u32 hBit,
+                                         struct hash_pte *hpte)
 {
         HvCall4(HvCallHptAddValidate, hpteIndex, hBit, hpte->v, hpte->r);
 }
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
index ed44dfceaa45..b4e2c7a038e1 100644
--- a/arch/powerpc/platforms/iseries/htab.c
+++ b/arch/powerpc/platforms/iseries/htab.c
@@ -44,7 +44,7 @@ long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
                          unsigned long vflags, int psize)
 {
         long slot;
-        hpte_t lhpte;
+        struct hash_pte lhpte;
         int secondary = 0;
 
         BUG_ON(psize != MMU_PAGE_4K);
@@ -99,7 +99,7 @@ long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
 
 static unsigned long iSeries_hpte_getword0(unsigned long slot)
 {
-        hpte_t hpte;
+        struct hash_pte hpte;
 
         HvCallHpt_get(&hpte, slot);
         return hpte.v;
@@ -144,7 +144,7 @@ static long iSeries_hpte_remove(unsigned long hpte_group)
 static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
                                   unsigned long va, int psize, int local)
 {
-        hpte_t hpte;
+        struct hash_pte hpte;
         unsigned long want_v;
 
         iSeries_hlock(slot);
@@ -176,7 +176,7 @@ static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
  */
 static long iSeries_hpte_find(unsigned long vpn)
 {
-        hpte_t hpte;
+        struct hash_pte hpte;
         long slot;
 
         /*
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 9c974227155e..da87162000f0 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -742,6 +742,11 @@ void __init iSeries_pcibios_init(void)
         /* Install IO hooks */
         ppc_pci_io = iseries_pci_io;
 
+        /* iSeries has no IO space in the common sense, it needs to set
+         * the IO base to 0
+         */
+        pci_io_base = 0;
+
         if (root == NULL) {
                 printk(KERN_CRIT "iSeries_pcibios_init: can't find root "
                                 "of device tree\n");
@@ -763,7 +768,7 @@ void __init iSeries_pcibios_init(void)
                 if (phb == NULL)
                         continue;
 
-                phb->pci_mem_offset = phb->local_number = bus;
+                phb->pci_mem_offset = bus;
                 phb->first_busno = bus;
                 phb->last_busno = bus;
                 phb->ops = &iSeries_pci_ops;
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 7f5dcee814d4..13a8b1908ded 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -79,8 +79,6 @@ extern void iSeries_pci_final_fixup(void);
 static void iSeries_pci_final_fixup(void) { }
 #endif
 
-extern unsigned long iSeries_recal_tb;
-extern unsigned long iSeries_recal_titan;
 
 struct MemoryBlock {
         unsigned long absStart;
@@ -292,8 +290,8 @@ static void __init iSeries_init_early(void)
 {
         DBG(" -> iSeries_init_early()\n");
 
-        iSeries_recal_tb = get_tb();
-        iSeries_recal_titan = HvCallXm_loadTod();
+        /* Snapshot the timebase, for use in later recalibration */
+        iSeries_time_init_early();
 
         /*
          * Initialize the DMA/TCE management