5 files changed, 9 insertions, 16 deletions

diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 792d3ce8112e..65c585b8b00d 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -310,7 +310,7 @@ static int pmu_set_cpu_speed(int low_speed)
                 _set_L3CR(save_l3cr);
 
         /* Restore userland MMU context */
-        set_context(current->active_mm->context.id, current->active_mm->pgd);
+        switch_mmu_context(NULL, current->active_mm);
 
 #ifdef DEBUG_FREQ
         printk(KERN_DEBUG "HID1, after: %x\n", mfspr(SPRN_HID1));
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index bcf50d7056e9..54b7b76ed4f0 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -729,7 +729,7 @@ static void __init setup_bandit(struct pci_controller *hose,
 static int __init setup_uninorth(struct pci_controller *hose,
                                  struct resource *addr)
 {
-        ppc_pci_flags |= PPC_PCI_REASSIGN_ALL_BUS;
+        ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
         has_uninorth = 1;
         hose->ops = &macrisc_pci_ops;
         hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000);
@@ -996,7 +996,7 @@ void __init pmac_pci_init(void)
         struct device_node *np, *root;
         struct device_node *ht = NULL;
 
-        ppc_pci_flags = PPC_PCI_CAN_SKIP_ISA_ALIGN;
+        ppc_pci_set_flags(PPC_PCI_CAN_SKIP_ISA_ALIGN);
 
         root = of_find_node_by_path("/");
         if (root == NULL) {
@@ -1055,7 +1055,7 @@ void __init pmac_pci_init(void)
          * some offset between bus number and domains for now when we
          * assign all busses should help for now
          */
-        if (ppc_pci_flags & PPC_PCI_REASSIGN_ALL_BUS)
+        if (ppc_pci_has_flag(PPC_PCI_REASSIGN_ALL_BUS))
                 pcibios_assign_bus_offset = 0x10;
 #endif
 }
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 82c14d203d8b..9b78f5300c24 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -60,7 +60,6 @@
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
-#include <asm/kexec.h>
 #include <asm/pci-bridge.h>
 #include <asm/ohare.h>
 #include <asm/mediabay.h>
@@ -310,9 +309,7 @@ static void __init pmac_setup_arch(void)
         }
 
         /* See if newworld or oldworld */
-        for (ic = NULL; (ic = of_find_all_nodes(ic)) != NULL; )
-                if (of_get_property(ic, "interrupt-controller", NULL))
-                        break;
+        ic = of_find_node_with_property(NULL, "interrupt-controller");
         if (ic) {
                 pmac_newworld = 1;
                 of_node_put(ic);
@@ -740,11 +737,6 @@ define_machine(powermac) {
         .pci_probe_mode         = pmac_pci_probe_mode,
         .power_save             = power4_idle,
         .enable_pmcs            = power4_enable_pmcs,
-#ifdef CONFIG_KEXEC
-        .machine_kexec          = default_machine_kexec,
-        .machine_kexec_prepare  = default_machine_kexec_prepare,
-        .machine_crash_shutdown = default_machine_crash_shutdown,
-#endif
 #endif /* CONFIG_PPC64 */
 #ifdef CONFIG_PPC32
         .pcibios_enable_device_hook = pmac_pci_enable_device_hook,
diff --git a/arch/powerpc/platforms/powermac/sleep.S b/arch/powerpc/platforms/powermac/sleep.S
index adee28da353f..1c2802fabd57 100644
--- a/arch/powerpc/platforms/powermac/sleep.S
+++ b/arch/powerpc/platforms/powermac/sleep.S
@@ -17,6 +17,7 @@
 #include <asm/cache.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
+#include <asm/mmu.h>
 
 #define MAGIC   0x4c617273      /* 'Lars' */
 
@@ -323,7 +324,7 @@ grackle_wake_up:
         lwz     r4,SL_IBAT3+4(r1)
         mtibatl 3,r4
 
-BEGIN_FTR_SECTION
+BEGIN_MMU_FTR_SECTION
         li      r4,0
         mtspr   SPRN_DBAT4U,r4
         mtspr   SPRN_DBAT4L,r4
@@ -341,7 +342,7 @@ BEGIN_FTR_SECTION
         mtspr   SPRN_IBAT6L,r4
         mtspr   SPRN_IBAT7U,r4
         mtspr   SPRN_IBAT7L,r4
-END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS)
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
 
         /* Flush all TLBs */
         lis     r4,0x1000
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 40f72c2a4699..6b0711c15eca 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -739,7 +739,7 @@ static void __init smp_core99_setup(int ncpus)
 
                 /* XXX should get this from reg properties */
                 for (i = 1; i < ncpus; ++i)
-                        smp_hw_index[i] = i;
+                        set_hard_smp_processor_id(i, i);
         }
 #endif