powerpc: Merge in 64-bit powermac support.

This brings in a lot of changes from arch/ppc64/kernel/pmac_*.c to
arch/powerpc/platforms/powermac/*.c and makes various minor tweaks
elsewhere.  On the powermac we now initialize ppc_md by copying
the whole pmac_md structure into it, which required some changes in
the ordering of initializations of individual fields of it.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 58017d18db70..0eca17df239e 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -430,7 +430,6 @@ void __init pmac_pic_init(void)
 
                 printk(KERN_INFO "PowerMac using OpenPIC irq controller at 0x%08x\n",
                        (unsigned int)irqctrler->addrs[0].address);
-                ppc_md.get_irq = mpic_get_irq;
                 pmac_call_feature(PMAC_FTR_ENABLE_MPIC, irqctrler, 0, 0);
 
                 prom_get_irq_senses(senses, 0, 128);
@@ -483,6 +482,7 @@ void __init pmac_pic_init(void)
          * a Grand Central nor an OHare, then it's an Heathrow
          * (or Paddington).
          */
+        ppc_md.get_irq = pmac_get_irq;
         if (find_devices("gc"))
                 level_mask[0] = GC_LEVEL_MASK;
         else if (find_devices("ohare")) {