4 files changed, 16 insertions, 15 deletions

diff --git a/arch/powerpc/platforms/cell/beat_htab.c b/arch/powerpc/platforms/cell/beat_htab.c
index 0f6f83988b3d..246e1d8b3af3 100644
--- a/arch/powerpc/platforms/cell/beat_htab.c
+++ b/arch/powerpc/platforms/cell/beat_htab.c
@@ -90,7 +90,7 @@ static inline unsigned int beat_read_mask(unsigned hpte_group)
 static long beat_lpar_hpte_insert(unsigned long hpte_group,
                                   unsigned long vpn, unsigned long pa,
                                   unsigned long rflags, unsigned long vflags,
-                                  int psize, int ssize)
+                                  int psize, int apsize, int ssize)
 {
         unsigned long lpar_rc;
         u64 hpte_v, hpte_r, slot;
@@ -103,9 +103,9 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
                         "rflags=%lx, vflags=%lx, psize=%d)\n",
                 hpte_group, va, pa, rflags, vflags, psize);
 
-        hpte_v = hpte_encode_v(vpn, psize, MMU_SEGSIZE_256M) |
+        hpte_v = hpte_encode_v(vpn, psize, apsize, MMU_SEGSIZE_256M) |
                 vflags | HPTE_V_VALID;
-        hpte_r = hpte_encode_r(pa, psize) | rflags;
+        hpte_r = hpte_encode_r(pa, psize, apsize) | rflags;
 
         if (!(vflags & HPTE_V_BOLTED))
                 DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
@@ -191,7 +191,7 @@ static long beat_lpar_hpte_updatepp(unsigned long slot,
         u64 dummy0, dummy1;
         unsigned long want_v;
 
-        want_v = hpte_encode_v(vpn, psize, MMU_SEGSIZE_256M);
+        want_v = hpte_encode_avpn(vpn, psize, MMU_SEGSIZE_256M);
 
         DBG_LOW("    update: "
                 "avpnv=%016lx, slot=%016lx, psize: %d, newpp %016lx ... ",
@@ -228,7 +228,7 @@ static long beat_lpar_hpte_find(unsigned long vpn, int psize)
         unsigned long want_v, hpte_v;
 
         hash = hpt_hash(vpn, mmu_psize_defs[psize].shift, MMU_SEGSIZE_256M);
-        want_v = hpte_encode_v(vpn, psize, MMU_SEGSIZE_256M);
+        want_v = hpte_encode_avpn(vpn, psize, MMU_SEGSIZE_256M);
 
         for (j = 0; j < 2; j++) {
                 slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
@@ -283,7 +283,7 @@ static void beat_lpar_hpte_invalidate(unsigned long slot, unsigned long vpn,
 
         DBG_LOW("    inval : slot=%lx, va=%016lx, psize: %d, local: %d\n",
                 slot, va, psize, local);
-        want_v = hpte_encode_v(vpn, psize, MMU_SEGSIZE_256M);
+        want_v = hpte_encode_avpn(vpn, psize, MMU_SEGSIZE_256M);
 
         raw_spin_lock_irqsave(&beat_htab_lock, flags);
         dummy1 = beat_lpar_hpte_getword0(slot);
@@ -314,7 +314,7 @@ void __init hpte_init_beat(void)
 static long beat_lpar_hpte_insert_v3(unsigned long hpte_group,
                                   unsigned long vpn, unsigned long pa,
                                   unsigned long rflags, unsigned long vflags,
-                                  int psize, int ssize)
+                                  int psize, int apsize, int ssize)
 {
         unsigned long lpar_rc;
         u64 hpte_v, hpte_r, slot;
@@ -327,9 +327,9 @@ static long beat_lpar_hpte_insert_v3(unsigned long hpte_group,
                         "rflags=%lx, vflags=%lx, psize=%d)\n",
                 hpte_group, vpn, pa, rflags, vflags, psize);
 
-        hpte_v = hpte_encode_v(vpn, psize, MMU_SEGSIZE_256M) |
+        hpte_v = hpte_encode_v(vpn, psize, apsize, MMU_SEGSIZE_256M) |
                 vflags | HPTE_V_VALID;
-        hpte_r = hpte_encode_r(pa, psize) | rflags;
+        hpte_r = hpte_encode_r(pa, psize, apsize) | rflags;
 
         if (!(vflags & HPTE_V_BOLTED))
                 DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
@@ -372,8 +372,8 @@ static long beat_lpar_hpte_updatepp_v3(unsigned long slot,
         unsigned long want_v;
         unsigned long pss;
 
-        want_v = hpte_encode_v(vpn, psize, MMU_SEGSIZE_256M);
-        pss = (psize == MMU_PAGE_4K) ? -1UL : mmu_psize_defs[psize].penc;
+        want_v = hpte_encode_avpn(vpn, psize, MMU_SEGSIZE_256M);
+        pss = (psize == MMU_PAGE_4K) ? -1UL : mmu_psize_defs[psize].penc[psize];
 
         DBG_LOW("    update: "
                 "avpnv=%016lx, slot=%016lx, psize: %d, newpp %016lx ... ",
@@ -402,8 +402,8 @@ static void beat_lpar_hpte_invalidate_v3(unsigned long slot, unsigned long vpn,
 
         DBG_LOW("    inval : slot=%lx, vpn=%016lx, psize: %d, local: %d\n",
                 slot, vpn, psize, local);
-        want_v = hpte_encode_v(vpn, psize, MMU_SEGSIZE_256M);
-        pss = (psize == MMU_PAGE_4K) ? -1UL : mmu_psize_defs[psize].penc;
+        want_v = hpte_encode_avpn(vpn, psize, MMU_SEGSIZE_256M);
+        pss = (psize == MMU_PAGE_4K) ? -1UL : mmu_psize_defs[psize].penc[psize];
 
         lpar_rc = beat_invalidate_htab_entry3(0, slot, want_v, pss);
 
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
index 59c1a1694104..348a27b12512 100644
--- a/arch/powerpc/platforms/cell/pmu.c
+++ b/arch/powerpc/platforms/cell/pmu.c
@@ -382,7 +382,7 @@ static int __init cbe_init_pm_irq(void)
         unsigned int irq;
         int rc, node;
 
-        for_each_node(node) {
+        for_each_online_node(node) {
                 irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI |
                                                (node << IIC_IRQ_NODE_SHIFT));
                 if (irq == NO_IRQ) {
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index d43d2d0b90e3..90986923a53a 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -351,7 +351,7 @@ static unsigned long spufs_get_unmapped_area(struct file *file,
 
         /* Else, try to obtain a 64K pages slice */
         return slice_get_unmapped_area(addr, len, flags,
-                                       MMU_PAGE_64K, 1, 0);
+                                       MMU_PAGE_64K, 1);
 }
 #endif /* CONFIG_SPU_FS_64K_LS */
 
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 3f3bb4cdbbec..35f77a42bedf 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -99,6 +99,7 @@ spufs_new_inode(struct super_block *sb, umode_t mode)
         if (!inode)
                 goto out;
 
+        inode->i_ino = get_next_ino();
         inode->i_mode = mode;
         inode->i_uid = current_fsuid();
         inode->i_gid = current_fsgid();