4 files changed, 13 insertions, 11 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 214f3b088edf..1fb80baebc87 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -303,7 +303,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_name               = "601",
                 .cpu_features           = CPU_FTRS_PPC601,
                 .cpu_user_features      = COMMON_USER | PPC_FEATURE_601_INSTR |
-                        PPC_FEATURE_UNIFIED_CACHE,
+                        PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
         },
@@ -724,7 +724,8 @@ struct cpu_spec	cpu_specs[] = {
                 .pvr_value              = 0x00201400,
                 .cpu_name               = "403GCX",
                 .cpu_features           = CPU_FTRS_40X,
-                .cpu_user_features      = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
+                .cpu_user_features      = PPC_FEATURE_32 |
+                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB,
                 .icache_bsize           = 16,
                 .dcache_bsize           = 16,
         },
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 55b5860ed3c9..5e9206715f09 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -477,8 +477,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
         if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp))
                 local = 1;
 
-        __hash_page(address, pte_val(pte) & (_PAGE_USER|_PAGE_RW), vsid, ptep,
-                    0x300, local);
+        __hash_page(address, 0, vsid, ptep, 0x300, local);
         local_irq_restore(flags);
 #endif
 #endif
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
index c00b8e9e2b3c..b3c6c3374ca6 100644
--- a/arch/powerpc/platforms/iseries/htab.c
+++ b/arch/powerpc/platforms/iseries/htab.c
@@ -68,7 +68,7 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
         }
 
         if (slot < 0) {         /* MSB set means secondary group */
-                vflags |= HPTE_V_VALID;
+                vflags |= HPTE_V_SECONDARY;
                 secondary = 1;
                 slot &= 0x7fffffffffffffff;
         }
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index da0cb165dfc6..50f5dd787900 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -669,7 +669,7 @@ static int pmac_check_legacy_ioport(unsigned int baseport)
 
 static int __init pmac_declare_of_platform_devices(void)
 {
-        struct device_node *np;
+        struct device_node *np, *npp;
 
         np = find_devices("uni-n");
         if (np) {
@@ -687,14 +687,16 @@ static int __init pmac_declare_of_platform_devices(void)
         if (np)
                 of_platform_device_create(np, "platinum", NULL);
 
-        np = find_devices("u3");
-        if (np) {
-                for (np = np->child; np != NULL; np = np->sibling)
+        npp = of_find_node_by_name(NULL, "u3");
+        if (npp) {
+                for (np = NULL; (np = of_get_next_child(npp, np)) != NULL;) {
                         if (strncmp(np->name, "i2c", 3) == 0) {
-                                of_platform_device_create(np, "u3-i2c",
-                                                          NULL);
+                                of_platform_device_create(np, "u3-i2c", NULL);
+                                of_node_put(np);
                                 break;
                         }
+                }
+                of_node_put(npp);
         }
         np = of_find_node_by_type(NULL, "smu");
         if (np) {