Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / powerpc / platforms / powermac / setup.c

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 31a9da7..b9200fb 100644 (file)
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -23,6 +23,7 @@
  * bootup setup stuff..
  */
 
  * bootup setup stuff..
  */
 

+#include <linux/config.h>

 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/sched.h>


@@ -457,7 +458,7 @@ static int pmac_pm_finish(suspend_state_t state)
        printk(KERN_DEBUG "%s(%d)\n", __FUNCTION__, state);
 
        /* Restore userland MMU context */
        printk(KERN_DEBUG "%s(%d)\n", __FUNCTION__, state);
 
        /* Restore userland MMU context */

-       set_context(current->active_mm->context.id, current->active_mm->pgd);
+       set_context(current->active_mm->context, current->active_mm->pgd);

 
        return 0;
 }
 
        return 0;
 }


@@ -599,6 +600,13 @@ pmac_halt(void)
  */
 static void __init pmac_init_early(void)
 {
  */
 static void __init pmac_init_early(void)
 {

+#ifdef CONFIG_PPC64
+       /* Initialize hash table, from now on, we can take hash faults
+        * and call ioremap
+        */
+       hpte_init_native();
+#endif
+

        /* Enable early btext debug if requested */
        if (strstr(cmd_line, "btextdbg")) {
                udbg_adb_init_early();
        /* Enable early btext debug if requested */
        if (strstr(cmd_line, "btextdbg")) {
                udbg_adb_init_early();


@@ -613,6 +621,9 @@ static void __init pmac_init_early(void)
        udbg_adb_init(!!strstr(cmd_line, "btextdbg"));
 
 #ifdef CONFIG_PPC64
        udbg_adb_init(!!strstr(cmd_line, "btextdbg"));
 
 #ifdef CONFIG_PPC64

+       /* Setup interrupt mapping options */
+       ppc64_interrupt_controller = IC_OPEN_PIC;
+

        iommu_init_early_dart();
 #endif
 }
        iommu_init_early_dart();
 #endif
 }


@@ -672,8 +683,6 @@ static int __init pmac_probe(void)
         * part of the cacheable linar mapping
         */
        alloc_dart_table();
         * part of the cacheable linar mapping
         */
        alloc_dart_table();

-
-       hpte_init_native();

 #endif
 
 #ifdef CONFIG_PPC32
 #endif
 
 #ifdef CONFIG_PPC32