326 files changed, 9620 insertions, 4313 deletions

diff --git a/arch/alpha/include/asm/errno.h b/arch/alpha/include/asm/errno.h
index 69e2655249d2..98099bda9370 100644
--- a/arch/alpha/include/asm/errno.h
+++ b/arch/alpha/include/asm/errno.h
@@ -120,4 +120,6 @@
 #define EOWNERDEAD      136     /* Owner died */
 #define ENOTRECOVERABLE 137     /* State not recoverable */
 
+#define ERFKILL         138     /* Operation not possible due to RF-kill */
+
 #endif
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 442b87476f97..93bb4247b7ed 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -536,7 +536,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
         return err;
 }
 
-static inline void restart_syscall(struct pt_regs *regs)
+static inline void setup_syscall_restart(struct pt_regs *regs)
 {
         regs->ARM_r0 = regs->ARM_ORIG_r0;
         regs->ARM_pc -= thumb_mode(regs) ? 2 : 4;
@@ -571,7 +571,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
                         }
                         /* fallthrough */
                 case -ERESTARTNOINTR:
-                        restart_syscall(regs);
+                        setup_syscall_restart(regs);
                 }
         }
 
@@ -695,7 +695,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
                 if (regs->ARM_r0 == -ERESTARTNOHAND ||
                     regs->ARM_r0 == -ERESTARTSYS ||
                     regs->ARM_r0 == -ERESTARTNOINTR) {
-                        restart_syscall(regs);
+                        setup_syscall_restart(regs);
                 }
         }
         single_step_set(current);
diff --git a/arch/arm/mach-pxa/tosa-bt.c b/arch/arm/mach-pxa/tosa-bt.c
index fb0294bd4310..c31e601eb49c 100644
--- a/arch/arm/mach-pxa/tosa-bt.c
+++ b/arch/arm/mach-pxa/tosa-bt.c
@@ -35,21 +35,25 @@ static void tosa_bt_off(struct tosa_bt_data *data)
         gpio_set_value(data->gpio_reset, 0);
 }
 
-static int tosa_bt_toggle_radio(void *data, enum rfkill_state state)
+static int tosa_bt_set_block(void *data, bool blocked)
 {
-        pr_info("BT_RADIO going: %s\n",
-                        state == RFKILL_STATE_ON ? "on" : "off");
+        pr_info("BT_RADIO going: %s\n", blocked ? "off" : "on");
 
-        if (state == RFKILL_STATE_ON) {
+        if (!blocked) {
                 pr_info("TOSA_BT: going ON\n");
                 tosa_bt_on(data);
         } else {
                 pr_info("TOSA_BT: going OFF\n");
                 tosa_bt_off(data);
         }
+
         return 0;
 }
 
+static const struct rfkill_ops tosa_bt_rfkill_ops = {
+        .set_block = tosa_bt_set_block,
+};
+
 static int tosa_bt_probe(struct platform_device *dev)
 {
         int rc;
@@ -70,18 +74,14 @@ static int tosa_bt_probe(struct platform_device *dev)
         if (rc)
                 goto err_pwr_dir;
 
-        rfk = rfkill_allocate(&dev->dev, RFKILL_TYPE_BLUETOOTH);
+        rfk = rfkill_alloc("tosa-bt", &dev->dev, RFKILL_TYPE_BLUETOOTH,
+                           &tosa_bt_rfkill_ops, data);
         if (!rfk) {
                 rc = -ENOMEM;
                 goto err_rfk_alloc;
         }
 
-        rfk->name = "tosa-bt";
-        rfk->toggle_radio = tosa_bt_toggle_radio;
-        rfk->data = data;
-#ifdef CONFIG_RFKILL_LEDS
-        rfk->led_trigger.name = "tosa-bt";
-#endif
+        rfkill_set_led_trigger_name(rfk, "tosa-bt");
 
         rc = rfkill_register(rfk);
         if (rc)
@@ -92,9 +92,7 @@ static int tosa_bt_probe(struct platform_device *dev)
         return 0;
 
 err_rfkill:
-        if (rfk)
-                rfkill_free(rfk);
-        rfk = NULL;
+        rfkill_destroy(rfk);
 err_rfk_alloc:
         tosa_bt_off(data);
 err_pwr_dir:
@@ -113,8 +111,10 @@ static int __devexit tosa_bt_remove(struct platform_device *dev)
 
         platform_set_drvdata(dev, NULL);
 
-        if (rfk)
+        if (rfk) {
                 rfkill_unregister(rfk);
+                rfkill_destroy(rfk);
+        }
         rfk = NULL;
 
         tosa_bt_off(data);
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 168267a5dfb3..117ad5920e53 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -31,7 +31,6 @@
 #include <linux/input.h>
 #include <linux/gpio.h>
 #include <linux/pda_power.h>
-#include <linux/rfkill.h>
 #include <linux/spi/spi.h>
 
 #include <asm/setup.h>
diff --git a/arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h b/arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h
new file mode 100644
index 000000000000..36a85f5000c8
--- /dev/null
+++ b/arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h
@@ -0,0 +1,50 @@
+/* arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C - USB2.0 Highspeed/OtG device PHY registers
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+/* Note, this is a seperate header file as some of the clock framework
+ * needs to touch this if the clk_48m is used as the USB OHCI or other
+ * peripheral source.
+*/
+
+#ifndef __PLAT_S3C64XX_REGS_USB_HSOTG_PHY_H
+#define __PLAT_S3C64XX_REGS_USB_HSOTG_PHY_H __FILE__
+
+/* S3C64XX_PA_USB_HSPHY */
+
+#define S3C_HSOTG_PHYREG(x)     ((x) + S3C_VA_USB_HSPHY)
+
+#define S3C_PHYPWR                              S3C_HSOTG_PHYREG(0x00)
+#define SRC_PHYPWR_OTG_DISABLE                  (1 << 4)
+#define SRC_PHYPWR_ANALOG_POWERDOWN             (1 << 3)
+#define SRC_PHYPWR_FORCE_SUSPEND                (1 << 1)
+
+#define S3C_PHYCLK                              S3C_HSOTG_PHYREG(0x04)
+#define S3C_PHYCLK_MODE_USB11                   (1 << 6)
+#define S3C_PHYCLK_EXT_OSC                      (1 << 5)
+#define S3C_PHYCLK_CLK_FORCE                    (1 << 4)
+#define S3C_PHYCLK_ID_PULL                      (1 << 2)
+#define S3C_PHYCLK_CLKSEL_MASK                  (0x3 << 0)
+#define S3C_PHYCLK_CLKSEL_SHIFT                 (0)
+#define S3C_PHYCLK_CLKSEL_48M                   (0x0 << 0)
+#define S3C_PHYCLK_CLKSEL_12M                   (0x2 << 0)
+#define S3C_PHYCLK_CLKSEL_24M                   (0x3 << 0)
+
+#define S3C_RSTCON                              S3C_HSOTG_PHYREG(0x08)
+#define S3C_RSTCON_PHYCLK                       (1 << 2)
+#define S3C_RSTCON_HCLK                         (1 << 2)
+#define S3C_RSTCON_PHY                          (1 << 0)
+
+#define S3C_PHYTUNE                             S3C_HSOTG_PHYREG(0x20)
+
+#endif /* __PLAT_S3C64XX_REGS_USB_HSOTG_PHY_H */
diff --git a/arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h b/arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h
new file mode 100644
index 000000000000..8d18d9d4d148
--- /dev/null
+++ b/arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h
@@ -0,0 +1,377 @@
+/* arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C - USB2.0 Highspeed/OtG device block registers
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __PLAT_S3C64XX_REGS_USB_HSOTG_H
+#define __PLAT_S3C64XX_REGS_USB_HSOTG_H __FILE__
+
+#define S3C_HSOTG_REG(x) (x)
+
+#define S3C_GOTGCTL                             S3C_HSOTG_REG(0x000)
+#define S3C_GOTGCTL_BSESVLD                     (1 << 19)
+#define S3C_GOTGCTL_ASESVLD                     (1 << 18)
+#define S3C_GOTGCTL_DBNC_SHORT                  (1 << 17)
+#define S3C_GOTGCTL_CONID_B                     (1 << 16)
+#define S3C_GOTGCTL_DEVHNPEN                    (1 << 11)
+#define S3C_GOTGCTL_HSSETHNPEN                  (1 << 10)
+#define S3C_GOTGCTL_HNPREQ                      (1 << 9)
+#define S3C_GOTGCTL_HSTNEGSCS                   (1 << 8)
+#define S3C_GOTGCTL_SESREQ                      (1 << 1)
+#define S3C_GOTGCTL_SESREQSCS                   (1 << 0)
+
+#define S3C_GOTGINT                             S3C_HSOTG_REG(0x004)
+#define S3C_GOTGINT_DbnceDone                   (1 << 19)
+#define S3C_GOTGINT_ADevTOUTChg                 (1 << 18)
+#define S3C_GOTGINT_HstNegDet                   (1 << 17)
+#define S3C_GOTGINT_HstnegSucStsChng            (1 << 9)
+#define S3C_GOTGINT_SesReqSucStsChng            (1 << 8)
+#define S3C_GOTGINT_SesEndDet                   (1 << 2)
+
+#define S3C_GAHBCFG                             S3C_HSOTG_REG(0x008)
+#define S3C_GAHBCFG_PTxFEmpLvl                  (1 << 8)
+#define S3C_GAHBCFG_NPTxFEmpLvl                 (1 << 7)
+#define S3C_GAHBCFG_DMAEn                       (1 << 5)
+#define S3C_GAHBCFG_HBstLen_MASK                (0xf << 1)
+#define S3C_GAHBCFG_HBstLen_SHIFT               (1)
+#define S3C_GAHBCFG_HBstLen_Single              (0x0 << 1)
+#define S3C_GAHBCFG_HBstLen_Incr                (0x1 << 1)
+#define S3C_GAHBCFG_HBstLen_Incr4               (0x3 << 1)
+#define S3C_GAHBCFG_HBstLen_Incr8               (0x5 << 1)
+#define S3C_GAHBCFG_HBstLen_Incr16              (0x7 << 1)
+#define S3C_GAHBCFG_GlblIntrEn                  (1 << 0)
+
+#define S3C_GUSBCFG                             S3C_HSOTG_REG(0x00C)
+#define S3C_GUSBCFG_PHYLPClkSel                 (1 << 15)
+#define S3C_GUSBCFG_HNPCap                      (1 << 9)
+#define S3C_GUSBCFG_SRPCap                      (1 << 8)
+#define S3C_GUSBCFG_PHYIf16                     (1 << 3)
+#define S3C_GUSBCFG_TOutCal_MASK                (0x7 << 0)
+#define S3C_GUSBCFG_TOutCal_SHIFT               (0)
+#define S3C_GUSBCFG_TOutCal_LIMIT               (0x7)
+#define S3C_GUSBCFG_TOutCal(_x)                 ((_x) << 0)
+
+#define S3C_GRSTCTL                             S3C_HSOTG_REG(0x010)
+
+#define S3C_GRSTCTL_AHBIdle                     (1 << 31)
+#define S3C_GRSTCTL_DMAReq                      (1 << 30)
+#define S3C_GRSTCTL_TxFNum_MASK                 (0x1f << 6)
+#define S3C_GRSTCTL_TxFNum_SHIFT                (6)
+#define S3C_GRSTCTL_TxFNum_LIMIT                (0x1f)
+#define S3C_GRSTCTL_TxFNum(_x)                  ((_x) << 6)
+#define S3C_GRSTCTL_TxFFlsh                     (1 << 5)
+#define S3C_GRSTCTL_RxFFlsh                     (1 << 4)
+#define S3C_GRSTCTL_INTknQFlsh                  (1 << 3)
+#define S3C_GRSTCTL_FrmCntrRst                  (1 << 2)
+#define S3C_GRSTCTL_HSftRst                     (1 << 1)
+#define S3C_GRSTCTL_CSftRst                     (1 << 0)
+
+#define S3C_GINTSTS                             S3C_HSOTG_REG(0x014)
+#define S3C_GINTMSK                             S3C_HSOTG_REG(0x018)
+
+#define S3C_GINTSTS_WkUpInt                     (1 << 31)
+#define S3C_GINTSTS_SessReqInt                  (1 << 30)
+#define S3C_GINTSTS_DisconnInt                  (1 << 29)
+#define S3C_GINTSTS_ConIDStsChng                (1 << 28)
+#define S3C_GINTSTS_PTxFEmp                     (1 << 26)
+#define S3C_GINTSTS_HChInt                      (1 << 25)
+#define S3C_GINTSTS_PrtInt                      (1 << 24)
+#define S3C_GINTSTS_FetSusp                     (1 << 22)
+#define S3C_GINTSTS_incompIP                    (1 << 21)
+#define S3C_GINTSTS_IncomplSOIN                 (1 << 20)
+#define S3C_GINTSTS_OEPInt                      (1 << 19)
+#define S3C_GINTSTS_IEPInt                      (1 << 18)
+#define S3C_GINTSTS_EPMis                       (1 << 17)
+#define S3C_GINTSTS_EOPF                        (1 << 15)
+#define S3C_GINTSTS_ISOutDrop                   (1 << 14)
+#define S3C_GINTSTS_EnumDone                    (1 << 13)
+#define S3C_GINTSTS_USBRst                      (1 << 12)
+#define S3C_GINTSTS_USBSusp                     (1 << 11)
+#define S3C_GINTSTS_ErlySusp                    (1 << 10)
+#define S3C_GINTSTS_GOUTNakEff                  (1 << 7)
+#define S3C_GINTSTS_GINNakEff                   (1 << 6)
+#define S3C_GINTSTS_NPTxFEmp                    (1 << 5)
+#define S3C_GINTSTS_RxFLvl                      (1 << 4)
+#define S3C_GINTSTS_SOF                         (1 << 3)
+#define S3C_GINTSTS_OTGInt                      (1 << 2)
+#define S3C_GINTSTS_ModeMis                     (1 << 1)
+#define S3C_GINTSTS_CurMod_Host                 (1 << 0)
+
+#define S3C_GRXSTSR                             S3C_HSOTG_REG(0x01C)
+#define S3C_GRXSTSP                             S3C_HSOTG_REG(0x020)
+
+#define S3C_GRXSTS_FN_MASK                      (0x7f << 25)
+#define S3C_GRXSTS_FN_SHIFT                     (25)
+
+#define S3C_GRXSTS_PktSts_MASK                  (0xf << 17)
+#define S3C_GRXSTS_PktSts_SHIFT                 (17)
+#define S3C_GRXSTS_PktSts_GlobalOutNAK          (0x1 << 17)
+#define S3C_GRXSTS_PktSts_OutRX                 (0x2 << 17)
+#define S3C_GRXSTS_PktSts_OutDone               (0x3 << 17)
+#define S3C_GRXSTS_PktSts_SetupDone             (0x4 << 17)
+#define S3C_GRXSTS_PktSts_SetupRX               (0x6 << 17)
+
+#define S3C_GRXSTS_DPID_MASK                    (0x3 << 15)
+#define S3C_GRXSTS_DPID_SHIFT                   (15)
+#define S3C_GRXSTS_ByteCnt_MASK                 (0x7ff << 4)
+#define S3C_GRXSTS_ByteCnt_SHIFT                (4)
+#define S3C_GRXSTS_EPNum_MASK                   (0xf << 0)
+#define S3C_GRXSTS_EPNum_SHIFT                  (0)
+
+#define S3C_GRXFSIZ                             S3C_HSOTG_REG(0x024)
+
+#define S3C_GNPTXFSIZ                           S3C_HSOTG_REG(0x028)
+
+#define S3C_GNPTXFSIZ_NPTxFDep_MASK             (0xffff << 16)
+#define S3C_GNPTXFSIZ_NPTxFDep_SHIFT            (16)
+#define S3C_GNPTXFSIZ_NPTxFDep_LIMIT            (0xffff)
+#define S3C_GNPTXFSIZ_NPTxFDep(_x)              ((_x) << 16)
+#define S3C_GNPTXFSIZ_NPTxFStAddr_MASK          (0xffff << 0)
+#define S3C_GNPTXFSIZ_NPTxFStAddr_SHIFT         (0)
+#define S3C_GNPTXFSIZ_NPTxFStAddr_LIMIT         (0xffff)
+#define S3C_GNPTXFSIZ_NPTxFStAddr(_x)           ((_x) << 0)
+
+#define S3C_GNPTXSTS                            S3C_HSOTG_REG(0x02C)
+
+#define S3C_GNPTXSTS_NPtxQTop_MASK              (0x7f << 24)
+#define S3C_GNPTXSTS_NPtxQTop_SHIFT             (24)
+
+#define S3C_GNPTXSTS_NPTxQSpcAvail_MASK         (0xff << 16)
+#define S3C_GNPTXSTS_NPTxQSpcAvail_SHIFT        (16)
+#define S3C_GNPTXSTS_NPTxQSpcAvail_GET(_v)      (((_v) >> 16) & 0xff)
+
+#define S3C_GNPTXSTS_NPTxFSpcAvail_MASK         (0xffff << 0)
+#define S3C_GNPTXSTS_NPTxFSpcAvail_SHIFT        (0)
+#define S3C_GNPTXSTS_NPTxFSpcAvail_GET(_v)      (((_v) >> 0) & 0xffff)
+
+
+#define S3C_HPTXFSIZ                            S3C_HSOTG_REG(0x100)
+
+#define S3C_DPTXFSIZn(_a)                       S3C_HSOTG_REG(0x104 + (((_a) - 1) * 4))
+
+#define S3C_DPTXFSIZn_DPTxFSize_MASK            (0xffff << 16)
+#define S3C_DPTXFSIZn_DPTxFSize_SHIFT           (16)
+#define S3C_DPTXFSIZn_DPTxFSize_GET(_v)         (((_v) >> 16) & 0xffff)
+#define S3C_DPTXFSIZn_DPTxFSize_LIMIT           (0xffff)
+#define S3C_DPTXFSIZn_DPTxFSize(_x)             ((_x) << 16)
+
+#define S3C_DPTXFSIZn_DPTxFStAddr_MASK          (0xffff << 0)
+#define S3C_DPTXFSIZn_DPTxFStAddr_SHIFT         (0)
+
+/* Device mode registers */
+#define S3C_DCFG                                S3C_HSOTG_REG(0x800)
+
+#define S3C_DCFG_EPMisCnt_MASK                  (0x1f << 18)
+#define S3C_DCFG_EPMisCnt_SHIFT                 (18)
+#define S3C_DCFG_EPMisCnt_LIMIT                 (0x1f)
+#define S3C_DCFG_EPMisCnt(_x)                   ((_x) << 18)
+
+#define S3C_DCFG_PerFrInt_MASK                  (0x3 << 11)
+#define S3C_DCFG_PerFrInt_SHIFT                 (11)
+#define S3C_DCFG_PerFrInt_LIMIT                 (0x3)
+#define S3C_DCFG_PerFrInt(_x)                   ((_x) << 11)
+
+#define S3C_DCFG_DevAddr_MASK                   (0x7f << 4)
+#define S3C_DCFG_DevAddr_SHIFT                  (4)
+#define S3C_DCFG_DevAddr_LIMIT                  (0x7f)
+#define S3C_DCFG_DevAddr(_x)                    ((_x) << 4)
+
+#define S3C_DCFG_NZStsOUTHShk                   (1 << 2)
+
+#define S3C_DCFG_DevSpd_MASK                    (0x3 << 0)
+#define S3C_DCFG_DevSpd_SHIFT                   (0)
+#define S3C_DCFG_DevSpd_HS                      (0x0 << 0)
+#define S3C_DCFG_DevSpd_FS                      (0x1 << 0)
+#define S3C_DCFG_DevSpd_LS                      (0x2 << 0)
+#define S3C_DCFG_DevSpd_FS48                    (0x3 << 0)
+
+#define S3C_DCTL                                S3C_HSOTG_REG(0x804)
+
+#define S3C_DCTL_PWROnPrgDone                   (1 << 11)
+#define S3C_DCTL_CGOUTNak                       (1 << 10)
+#define S3C_DCTL_SGOUTNak                       (1 << 9)
+#define S3C_DCTL_CGNPInNAK                      (1 << 8)
+#define S3C_DCTL_SGNPInNAK                      (1 << 7)
+#define S3C_DCTL_TstCtl_MASK                    (0x7 << 4)
+#define S3C_DCTL_TstCtl_SHIFT                   (4)
+#define S3C_DCTL_GOUTNakSts                     (1 << 3)
+#define S3C_DCTL_GNPINNakSts                    (1 << 2)
+#define S3C_DCTL_SftDiscon                      (1 << 1)
+#define S3C_DCTL_RmtWkUpSig                     (1 << 0)
+
+#define S3C_DSTS                                S3C_HSOTG_REG(0x808)
+
+#define S3C_DSTS_SOFFN_MASK                     (0x3fff << 8)
+#define S3C_DSTS_SOFFN_SHIFT                    (8)
+#define S3C_DSTS_SOFFN_LIMIT                    (0x3fff)
+#define S3C_DSTS_SOFFN(_x)                      ((_x) << 8)
+#define S3C_DSTS_ErraticErr                     (1 << 3)
+#define S3C_DSTS_EnumSpd_MASK                   (0x3 << 1)
+#define S3C_DSTS_EnumSpd_SHIFT                  (1)
+#define S3C_DSTS_EnumSpd_HS                     (0x0 << 1)
+#define S3C_DSTS_EnumSpd_FS                     (0x1 << 1)
+#define S3C_DSTS_EnumSpd_LS                     (0x2 << 1)
+#define S3C_DSTS_EnumSpd_FS48                   (0x3 << 1)
+
+#define S3C_DSTS_SuspSts                        (1 << 0)
+
+#define S3C_DIEPMSK                             S3C_HSOTG_REG(0x810)
+
+#define S3C_DIEPMSK_INEPNakEffMsk               (1 << 6)
+#define S3C_DIEPMSK_INTknEPMisMsk               (1 << 5)
+#define S3C_DIEPMSK_INTknTXFEmpMsk              (1 << 4)
+#define S3C_DIEPMSK_TimeOUTMsk                  (1 << 3)
+#define S3C_DIEPMSK_AHBErrMsk                   (1 << 2)
+#define S3C_DIEPMSK_EPDisbldMsk                 (1 << 1)
+#define S3C_DIEPMSK_XferComplMsk                (1 << 0)
+
+#define S3C_DOEPMSK                             S3C_HSOTG_REG(0x814)
+
+#define S3C_DOEPMSK_Back2BackSetup              (1 << 6)
+#define S3C_DOEPMSK_OUTTknEPdisMsk              (1 << 4)
+#define S3C_DOEPMSK_SetupMsk                    (1 << 3)
+#define S3C_DOEPMSK_AHBErrMsk                   (1 << 2)
+#define S3C_DOEPMSK_EPDisbldMsk                 (1 << 1)
+#define S3C_DOEPMSK_XferComplMsk                (1 << 0)
+
+#define S3C_DAINT                               S3C_HSOTG_REG(0x818)
+#define S3C_DAINTMSK                            S3C_HSOTG_REG(0x81C)
+
+#define S3C_DAINT_OutEP_SHIFT                   (16)
+#define S3C_DAINT_OutEP(x)                      (1 << ((x) + 16))
+#define S3C_DAINT_InEP(x)                       (1 << (x))
+
+#define S3C_DTKNQR1                             S3C_HSOTG_REG(0x820)
+#define S3C_DTKNQR2                             S3C_HSOTG_REG(0x824)
+#define S3C_DTKNQR3                             S3C_HSOTG_REG(0x830)
+#define S3C_DTKNQR4                             S3C_HSOTG_REG(0x834)
+
+#define S3C_DVBUSDIS                            S3C_HSOTG_REG(0x828)
+#define S3C_DVBUSPULSE                          S3C_HSOTG_REG(0x82C)
+
+#define S3C_DIEPCTL0                            S3C_HSOTG_REG(0x900)
+#define S3C_DOEPCTL0                            S3C_HSOTG_REG(0xB00)
+#define S3C_DIEPCTL(_a)                         S3C_HSOTG_REG(0x900 + ((_a) * 0x20))
+#define S3C_DOEPCTL(_a)                         S3C_HSOTG_REG(0xB00 + ((_a) * 0x20))
+
+/* EP0 specialness:
+ * bits[29..28] - reserved (no SetD0PID, SetD1PID)
+ * bits[25..22] - should always be zero, this isn't a periodic endpoint
+ * bits[10..0] - MPS setting differenct for EP0
+*/
+#define S3C_D0EPCTL_MPS_MASK                    (0x3 << 0)
+#define S3C_D0EPCTL_MPS_SHIFT                   (0)
+#define S3C_D0EPCTL_MPS_64                      (0x0 << 0)
+#define S3C_D0EPCTL_MPS_32                      (0x1 << 0)
+#define S3C_D0EPCTL_MPS_16                      (0x2 << 0)
+#define S3C_D0EPCTL_MPS_8                       (0x3 << 0)
+
+#define S3C_DxEPCTL_EPEna                       (1 << 31)
+#define S3C_DxEPCTL_EPDis                       (1 << 30)
+#define S3C_DxEPCTL_SetD1PID                    (1 << 29)
+#define S3C_DxEPCTL_SetOddFr                    (1 << 29)
+#define S3C_DxEPCTL_SetD0PID                    (1 << 28)
+#define S3C_DxEPCTL_SetEvenFr                   (1 << 28)
+#define S3C_DxEPCTL_SNAK                        (1 << 27)
+#define S3C_DxEPCTL_CNAK                        (1 << 26)
+#define S3C_DxEPCTL_TxFNum_MASK                 (0xf << 22)
+#define S3C_DxEPCTL_TxFNum_SHIFT                (22)
+#define S3C_DxEPCTL_TxFNum_LIMIT                (0xf)
+#define S3C_DxEPCTL_TxFNum(_x)                  ((_x) << 22)
+
+#define S3C_DxEPCTL_Stall                       (1 << 21)
+#define S3C_DxEPCTL_Snp                         (1 << 20)
+#define S3C_DxEPCTL_EPType_MASK                 (0x3 << 18)
+#define S3C_DxEPCTL_EPType_SHIFT                (18)
+#define S3C_DxEPCTL_EPType_Control              (0x0 << 18)
+#define S3C_DxEPCTL_EPType_Iso                  (0x1 << 18)
+#define S3C_DxEPCTL_EPType_Bulk                 (0x2 << 18)
+#define S3C_DxEPCTL_EPType_Intterupt            (0x3 << 18)
+
+#define S3C_DxEPCTL_NAKsts                      (1 << 17)
+#define S3C_DxEPCTL_DPID                        (1 << 16)
+#define S3C_DxEPCTL_EOFrNum                     (1 << 16)
+#define S3C_DxEPCTL_USBActEp                    (1 << 15)
+#define S3C_DxEPCTL_NextEp_MASK                 (0xf << 11)
+#define S3C_DxEPCTL_NextEp_SHIFT                (11)
+#define S3C_DxEPCTL_NextEp_LIMIT                (0xf)
+#define S3C_DxEPCTL_NextEp(_x)                  ((_x) << 11)
+
+#define S3C_DxEPCTL_MPS_MASK                    (0x7ff << 0)
+#define S3C_DxEPCTL_MPS_SHIFT                   (0)
+#define S3C_DxEPCTL_MPS_LIMIT                   (0x7ff)
+#define S3C_DxEPCTL_MPS(_x)                     ((_x) << 0)
+
+#define S3C_DIEPINT(_a)                         S3C_HSOTG_REG(0x908 + ((_a) * 0x20))
+#define S3C_DOEPINT(_a)                         S3C_HSOTG_REG(0xB08 + ((_a) * 0x20))
+
+#define S3C_DxEPINT_INEPNakEff                  (1 << 6)
+#define S3C_DxEPINT_Back2BackSetup              (1 << 6)
+#define S3C_DxEPINT_INTknEPMis                  (1 << 5)
+#define S3C_DxEPINT_INTknTXFEmp                 (1 << 4)
+#define S3C_DxEPINT_OUTTknEPdis                 (1 << 4)
+#define S3C_DxEPINT_Timeout                     (1 << 3)
+#define S3C_DxEPINT_Setup                       (1 << 3)
+#define S3C_DxEPINT_AHBErr                      (1 << 2)
+#define S3C_DxEPINT_EPDisbld                    (1 << 1)
+#define S3C_DxEPINT_XferCompl                   (1 << 0)
+
+#define S3C_DIEPTSIZ0                           S3C_HSOTG_REG(0x910)
+
+#define S3C_DIEPTSIZ0_PktCnt_MASK               (0x3 << 19)
+#define S3C_DIEPTSIZ0_PktCnt_SHIFT              (19)
+#define S3C_DIEPTSIZ0_PktCnt_LIMIT              (0x3)
+#define S3C_DIEPTSIZ0_PktCnt(_x)                ((_x) << 19)
+
+#define S3C_DIEPTSIZ0_XferSize_MASK             (0x7f << 0)
+#define S3C_DIEPTSIZ0_XferSize_SHIFT            (0)
+#define S3C_DIEPTSIZ0_XferSize_LIMIT            (0x7f)
+#define S3C_DIEPTSIZ0_XferSize(_x)              ((_x) << 0)
+
+
+#define DOEPTSIZ0                               S3C_HSOTG_REG(0xB10)
+#define S3C_DOEPTSIZ0_SUPCnt_MASK               (0x3 << 29)
+#define S3C_DOEPTSIZ0_SUPCnt_SHIFT              (29)
+#define S3C_DOEPTSIZ0_SUPCnt_LIMIT              (0x3)
+#define S3C_DOEPTSIZ0_SUPCnt(_x)                ((_x) << 29)
+
+#define S3C_DOEPTSIZ0_PktCnt                    (1 << 19)
+#define S3C_DOEPTSIZ0_XferSize_MASK             (0x7f << 0)
+#define S3C_DOEPTSIZ0_XferSize_SHIFT            (0)
+
+#define S3C_DIEPTSIZ(_a)                        S3C_HSOTG_REG(0x910 + ((_a) * 0x20))
+#define S3C_DOEPTSIZ(_a)                        S3C_HSOTG_REG(0xB10 + ((_a) * 0x20))
+
+#define S3C_DxEPTSIZ_MC_MASK                    (0x3 << 29)
+#define S3C_DxEPTSIZ_MC_SHIFT                   (29)
+#define S3C_DxEPTSIZ_MC_LIMIT                   (0x3)
+#define S3C_DxEPTSIZ_MC(_x)                     ((_x) << 29)
+
+#define S3C_DxEPTSIZ_PktCnt_MASK                (0x3ff << 19)
+#define S3C_DxEPTSIZ_PktCnt_SHIFT               (19)
+#define S3C_DxEPTSIZ_PktCnt_GET(_v)             (((_v) >> 19) & 0x3ff)
+#define S3C_DxEPTSIZ_PktCnt_LIMIT               (0x3ff)
+#define S3C_DxEPTSIZ_PktCnt(_x)                 ((_x) << 19)
+
+#define S3C_DxEPTSIZ_XferSize_MASK              (0x7ffff << 0)
+#define S3C_DxEPTSIZ_XferSize_SHIFT             (0)
+#define S3C_DxEPTSIZ_XferSize_GET(_v)           (((_v) >> 0) & 0x7ffff)
+#define S3C_DxEPTSIZ_XferSize_LIMIT             (0x7ffff)
+#define S3C_DxEPTSIZ_XferSize(_x)               ((_x) << 0)
+
+
+#define S3C_DIEPDMA(_a)                         S3C_HSOTG_REG(0x914 + ((_a) * 0x20))
+#define S3C_DOEPDMA(_a)                         S3C_HSOTG_REG(0xB14 + ((_a) * 0x20))
+
+#define S3C_EPFIFO(_a)                          S3C_HSOTG_REG(0x1000 + ((_a) * 0x1000))
+
+#endif /* __PLAT_S3C64XX_REGS_USB_HSOTG_H */
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 803d7be0938f..27227561bad6 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -212,7 +212,7 @@ out:
         return err;
 }
 
-static inline void restart_syscall(struct pt_regs *regs)
+static inline void setup_syscall_restart(struct pt_regs *regs)
 {
         if (regs->r12 == -ERESTART_RESTARTBLOCK)
                 regs->r8 = __NR_restart_syscall;
@@ -296,7 +296,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)
                         }
                         /* fall through */
                 case -ERESTARTNOINTR:
-                        restart_syscall(regs);
+                        setup_syscall_restart(regs);
                 }
         }
 
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index a60cfe757914..8ea0d942cdea 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -6,59 +6,65 @@
 mainmenu "Blackfin Kernel Configuration"
 
 config MMU
-        bool
-        default n
+        def_bool n
 
 config FPU
-        bool
-        default n
+        def_bool n
 
 config RWSEM_GENERIC_SPINLOCK
-        bool
-        default y
+        def_bool y
 
 config RWSEM_XCHGADD_ALGORITHM
-        bool
-        default n
+        def_bool n
 
 config BLACKFIN
-        bool
-        default y
+        def_bool y
+        select HAVE_FUNCTION_GRAPH_TRACER
+        select HAVE_FUNCTION_TRACER
         select HAVE_IDE
+        select HAVE_KERNEL_GZIP
+        select HAVE_KERNEL_BZIP2
+        select HAVE_KERNEL_LZMA
         select HAVE_OPROFILE
         select ARCH_WANT_OPTIONAL_GPIOLIB
 
+config GENERIC_BUG
+        def_bool y
+        depends on BUG
+
 config ZONE_DMA
-        bool
-        default y
+        def_bool y
 
 config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
+        def_bool y
 
 config GENERIC_HWEIGHT
-        bool
-        default y
+        def_bool y
 
 config GENERIC_HARDIRQS
-        bool
-        default y
+        def_bool y
 
 config GENERIC_IRQ_PROBE
-        bool
-        default y
+        def_bool y
 
 config GENERIC_GPIO
-        bool
-        default y
+        def_bool y
 
 config FORCE_MAX_ZONEORDER
         int
         default "14"
 
 config GENERIC_CALIBRATE_DELAY
-        bool
-        default y
+        def_bool y
+
+config LOCKDEP_SUPPORT
+        def_bool y
+
+config STACKTRACE_SUPPORT
+        def_bool y
+
+config TRACE_IRQFLAGS_SUPPORT
+        def_bool y
 
 source "init/Kconfig"
 
@@ -408,12 +414,12 @@ comment "Clock/PLL Setup"
 
 config CLKIN_HZ
         int "Frequency of the crystal on the board in Hz"
+        default "10000000" if BFIN532_IP0X
         default "11059200" if BFIN533_STAMP
+        default "24576000" if PNAV10
+        default "25000000" # most people use this
         default "27000000" if BFIN533_EZKIT
-        default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS || BLACKSTAMP || BFIN526_EZBRD || BFIN538_EZKIT || BFIN518F-EZBRD)
         default "30000000" if BFIN561_EZKIT
-        default "24576000" if PNAV10
-        default "10000000" if BFIN532_IP0X
         help
           The frequency of CLKIN crystal oscillator on the board in Hz.
           Warning: This value should match the crystal on the board. Otherwise,
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index d54c8283825c..6f9533c3d752 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -137,7 +137,7 @@ archclean:
 
 INSTALL_PATH ?= /tftpboot
 boot := arch/$(ARCH)/boot
-BOOT_TARGETS = vmImage
+BOOT_TARGETS = vmImage vmImage.bz2 vmImage.gz vmImage.lzma
 PHONY += $(BOOT_TARGETS) install
 KBUILD_IMAGE := $(boot)/vmImage
 
@@ -150,7 +150,10 @@ install:
         $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
 
 define archhelp
-  echo  '* vmImage         - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage)'
+  echo  '* vmImage         - Alias to selected kernel format (vmImage.gz by default)'
+  echo  '  vmImage.bz2     - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)'
+  echo  '* vmImage.gz      - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)'
+  echo  '  vmImage.lzma    - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)'
   echo  '  install         - Install kernel using'
   echo  '                     (your) ~/bin/$(CROSS_COMPILE)installkernel or'
   echo  '                     (distribution) PATH: $(CROSS_COMPILE)installkernel or'
diff --git a/arch/blackfin/boot/.gitignore b/arch/blackfin/boot/.gitignore
index 3ae03994b88d..229e50808677 100644
--- a/arch/blackfin/boot/.gitignore
+++ b/arch/blackfin/boot/.gitignore
@@ -1 +1,2 @@
-+vmImage
+vmImage*
+vmlinux*
diff --git a/arch/blackfin/boot/Makefile b/arch/blackfin/boot/Makefile
index e028d13481a9..3ab6f23561dd 100644
--- a/arch/blackfin/boot/Makefile
+++ b/arch/blackfin/boot/Makefile
@@ -8,24 +8,41 @@
 
 MKIMAGE := $(srctree)/scripts/mkuboot.sh
 
-targets := vmImage
-extra-y += vmlinux.bin vmlinux.gz
+targets := vmImage vmImage.bz2 vmImage.gz vmImage.lzma
+extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \
-                   -C gzip -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \
+                   -C $(2) -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \
                    -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \
                    -d $< $@
 
 $(obj)/vmlinux.bin: vmlinux FORCE
         $(call if_changed,objcopy)
 
-$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
         $(call if_changed,gzip)
 
-$(obj)/vmImage: $(obj)/vmlinux.gz
-        $(call if_changed,uimage)
-        @$(kecho) 'Kernel: $@ is ready'
+$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
+        $(call if_changed,bzip2)
+
+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
+        $(call if_changed,lzma)
+
+$(obj)/vmImage.bz2: $(obj)/vmlinux.bin.bz2
+        $(call if_changed,uimage,bzip2)
+
+$(obj)/vmImage.gz: $(obj)/vmlinux.bin.gz
+        $(call if_changed,uimage,gzip)
+
+$(obj)/vmImage.lzma: $(obj)/vmlinux.bin.lzma
+        $(call if_changed,uimage,lzma)
+
+suffix-$(CONFIG_KERNEL_GZIP)  := gz
+suffix-$(CONFIG_KERNEL_BZIP2) := bz2
+suffix-$(CONFIG_KERNEL_LZMA)  := lzma
+$(obj)/vmImage: $(obj)/vmImage.$(suffix-y)
+        @ln -sf $(notdir $<) $@
 
 install:
         sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h
index 7bbf44e4ddf9..b1d92f13ef96 100644
--- a/arch/blackfin/include/asm/atomic.h
+++ b/arch/blackfin/include/asm/atomic.h
@@ -90,7 +90,7 @@ static inline int atomic_test_mask(int mask, atomic_t *v)
 
 static inline void atomic_add(int i, atomic_t *v)
 {
-        long flags;
+        unsigned long flags;
 
         local_irq_save_hw(flags);
         v->counter += i;
@@ -99,7 +99,7 @@ static inline void atomic_add(int i, atomic_t *v)
 
 static inline void atomic_sub(int i, atomic_t *v)
 {
-        long flags;
+        unsigned long flags;
 
         local_irq_save_hw(flags);
         v->counter -= i;
@@ -110,7 +110,7 @@ static inline void atomic_sub(int i, atomic_t *v)
 static inline int atomic_add_return(int i, atomic_t *v)
 {
         int __temp = 0;
-        long flags;
+        unsigned long flags;
 
         local_irq_save_hw(flags);
         v->counter += i;
@@ -124,7 +124,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
 static inline int atomic_sub_return(int i, atomic_t *v)
 {
         int __temp = 0;
-        long flags;
+        unsigned long flags;
 
         local_irq_save_hw(flags);
         v->counter -= i;
@@ -136,7 +136,7 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 
 static inline void atomic_inc(volatile atomic_t *v)
 {
-        long flags;
+        unsigned long flags;
 
         local_irq_save_hw(flags);
         v->counter++;
@@ -145,7 +145,7 @@ static inline void atomic_inc(volatile atomic_t *v)
 
 static inline void atomic_dec(volatile atomic_t *v)
 {
-        long flags;
+        unsigned long flags;
 
         local_irq_save_hw(flags);
         v->counter--;
@@ -154,7 +154,7 @@ static inline void atomic_dec(volatile atomic_t *v)
 
 static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
 {
-        long flags;
+        unsigned long flags;
 
         local_irq_save_hw(flags);
         v->counter &= ~mask;
@@ -163,7 +163,7 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
 
 static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
 {
-        long flags;
+        unsigned long flags;
 
         local_irq_save_hw(flags);
         v->counter |= mask;
diff --git a/arch/blackfin/include/asm/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h
index daffc0684e75..e39277ea43e8 100644
--- a/arch/blackfin/include/asm/bfin-global.h
+++ b/arch/blackfin/include/asm/bfin-global.h
@@ -31,7 +31,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <asm-generic/sections.h>
+#include <asm/sections.h>
 #include <asm/ptrace.h>
 #include <asm/user.h>
 #include <linux/linkage.h>
@@ -99,15 +99,6 @@ extern const char bfin_board_name[];
 extern unsigned long bfin_sic_iwr[];
 extern unsigned vr_wakeup;
 extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */
-extern unsigned long _ramstart, _ramend, _rambase;
-extern unsigned long memory_start, memory_end, physical_mem_end;
-extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],
-        _ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _sbss_b_l1[], _ebss_b_l1[],
-        _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[],
-        _ebss_l2[], _l2_lma_start[];
-
-/* only used when MTD_UCLINUX */
-extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size;
 
 #ifdef CONFIG_BFIN_ICACHE_LOCK
 extern void cache_grab_lock(int way);
diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h
index 21b036eadab1..75fee2f7d9f2 100644
--- a/arch/blackfin/include/asm/bitops.h
+++ b/arch/blackfin/include/asm/bitops.h
@@ -109,7 +109,8 @@ static inline void clear_bit(int nr, volatile unsigned long *addr)
 
 static inline void change_bit(int nr, volatile unsigned long *addr)
 {
-        int mask, flags;
+        int mask;
+        unsigned long flags;
         unsigned long *ADDR = (unsigned long *)addr;
 
         ADDR += nr >> 5;
diff --git a/arch/blackfin/include/asm/bug.h b/arch/blackfin/include/asm/bug.h
index 6d3e11b1fc57..655e49540e41 100644
--- a/arch/blackfin/include/asm/bug.h
+++ b/arch/blackfin/include/asm/bug.h
@@ -2,13 +2,58 @@
 #define _BLACKFIN_BUG_H
 
 #ifdef CONFIG_BUG
-#define HAVE_ARCH_BUG
 
-#define BUG() do { \
-        dump_bfin_trace_buffer(); \
-        printk(KERN_EMERG "BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
-        panic("BUG!"); \
-} while (0)
+#define BFIN_BUG_OPCODE 0xefcd
+
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+
+#define _BUG_OR_WARN(flags)                                             \
+        asm volatile(                                                   \
+                "1:     .hword  %0\n"                                   \
+                "       .section __bug_table,\"a\",@progbits\n"         \
+                "2:     .long   1b\n"                                   \
+                "       .long   %1\n"                                   \
+                "       .short  %2\n"                                   \
+                "       .short  %3\n"                                   \
+                "       .org    2b + %4\n"                              \
+                "       .previous"                                      \
+                :                                                       \
+                : "i"(BFIN_BUG_OPCODE), "i"(__FILE__),                  \
+                  "i"(__LINE__), "i"(flags),                            \
+                  "i"(sizeof(struct bug_entry)))
+
+#else
+
+#define _BUG_OR_WARN(flags)                                             \
+        asm volatile(                                                   \
+                "1:     .hword  %0\n"                                   \
+                "       .section __bug_table,\"a\",@progbits\n"         \
+                "2:     .long   1b\n"                                   \
+                "       .short  %1\n"                                   \
+                "       .org    2b + %2\n"                              \
+                "       .previous"                                      \
+                :                                                       \
+                : "i"(BFIN_BUG_OPCODE), "i"(flags),                     \
+                  "i"(sizeof(struct bug_entry)))
+
+#endif /* CONFIG_DEBUG_BUGVERBOSE */
+
+#define BUG()                                                           \
+        do {                                                            \
+                _BUG_OR_WARN(0);                                        \
+                for (;;);                                               \
+        } while (0)
+
+#define WARN_ON(condition)                                                      \
+        ({                                                              \
+                int __ret_warn_on = !!(condition);                      \
+                if (unlikely(__ret_warn_on))                            \
+                        _BUG_OR_WARN(BUGFLAG_WARNING);                  \
+                unlikely(__ret_warn_on);                                \
+        })
+
+#define HAVE_ARCH_BUG
+#define HAVE_ARCH_WARN_ON
 
 #endif
 
diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
index 86637814cf25..2ef669ed9222 100644
--- a/arch/blackfin/include/asm/cache.h
+++ b/arch/blackfin/include/asm/cache.h
@@ -34,9 +34,13 @@
 #define L1_CACHE_SHIFT_MAX      5
 
 #if defined(CONFIG_SMP) && \
-    !defined(CONFIG_BFIN_CACHE_COHERENT) && \
-    defined(CONFIG_BFIN_DCACHE)
-#define __ARCH_SYNC_CORE_DCACHE
+    !defined(CONFIG_BFIN_CACHE_COHERENT)
+# if defined(CONFIG_BFIN_ICACHE)
+# define __ARCH_SYNC_CORE_ICACHE
+# endif
+# if defined(CONFIG_BFIN_DCACHE)
+# define __ARCH_SYNC_CORE_DCACHE
+# endif
 #ifndef __ASSEMBLY__
 asmlinkage void __raw_smp_mark_barrier_asm(void);
 asmlinkage void __raw_smp_check_barrier_asm(void);
@@ -51,6 +55,7 @@ static inline void smp_check_barrier(void)
 }
 
 void resync_core_dcache(void);
+void resync_core_icache(void);
 #endif
 #endif
 
diff --git a/arch/blackfin/include/asm/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h
index 94697f0f6f40..5c17dee53b5d 100644
--- a/arch/blackfin/include/asm/cacheflush.h
+++ b/arch/blackfin/include/asm/cacheflush.h
@@ -37,6 +37,7 @@ extern void blackfin_dcache_flush_range(unsigned long start_address, unsigned lo
 extern void blackfin_dcache_invalidate_range(unsigned long start_address, unsigned long end_address);
 extern void blackfin_dflush_page(void *page);
 extern void blackfin_invalidate_entire_dcache(void);
+extern void blackfin_invalidate_entire_icache(void);
 
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
@@ -97,7 +98,7 @@ do { memcpy(dst, src, len);						\
 extern unsigned long reserved_mem_dcache_on;
 extern unsigned long reserved_mem_icache_on;
 
-static inline int bfin_addr_dcachable(unsigned long addr)
+static inline int bfin_addr_dcacheable(unsigned long addr)
 {
 #ifdef CONFIG_BFIN_DCACHE
         if (addr < (_ramend - DMA_UNCACHED_REGION))
diff --git a/arch/blackfin/include/asm/cpu.h b/arch/blackfin/include/asm/cpu.h
index c2594ef877f6..565b8136855e 100644
--- a/arch/blackfin/include/asm/cpu.h
+++ b/arch/blackfin/include/asm/cpu.h
@@ -34,6 +34,7 @@ struct blackfin_cpudata {
         unsigned int dmemctl;
         unsigned long loops_per_jiffy;
         unsigned long dcache_invld_count;
+        unsigned long icache_invld_count;
 };
 
 DECLARE_PER_CPU(struct blackfin_cpudata, cpu_data);
diff --git a/arch/blackfin/include/asm/ftrace.h b/arch/blackfin/include/asm/ftrace.h
index 40a8c178f10d..8643680f0f78 100644
--- a/arch/blackfin/include/asm/ftrace.h
+++ b/arch/blackfin/include/asm/ftrace.h
@@ -1 +1,13 @@
-/* empty */
+/*
+ * Blackfin ftrace code
+ *
+ * Copyright 2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __ASM_BFIN_FTRACE_H__
+#define __ASM_BFIN_FTRACE_H__
+
+#define MCOUNT_INSN_SIZE        8 /* sizeof mcount call: LINK + CALL */
+
+#endif
diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h
index 51d0bf5e2899..bbe1c3726b69 100644
--- a/arch/blackfin/include/asm/ipipe.h
+++ b/arch/blackfin/include/asm/ipipe.h
@@ -35,10 +35,10 @@
 #include <asm/atomic.h>
 #include <asm/traps.h>
 
-#define IPIPE_ARCH_STRING     "1.9-01"
+#define IPIPE_ARCH_STRING     "1.10-00"
 #define IPIPE_MAJOR_NUMBER    1
-#define IPIPE_MINOR_NUMBER    9
-#define IPIPE_PATCH_NUMBER    1
+#define IPIPE_MINOR_NUMBER    10
+#define IPIPE_PATCH_NUMBER    0
 
 #ifdef CONFIG_SMP
 #error "I-pipe/blackfin: SMP not implemented"
@@ -54,10 +54,11 @@ do {						\
 
 #define task_hijacked(p)                                                \
         ({                                                              \
-                int __x__ = ipipe_current_domain != ipipe_root_domain;  \
-                /* We would need to clear the SYNC flag for the root domain */ \
-                /* over the current processor in SMP mode. */           \
-                local_irq_enable_hw(); __x__;                           \
+                int __x__ = __ipipe_root_domain_p;                      \
+                __clear_bit(IPIPE_SYNC_FLAG, &ipipe_root_cpudom_var(status)); \
+                if (__x__)                                              \
+                        local_irq_enable_hw();                          \
+                !__x__;                                                 \
         })
 
 struct ipipe_domain;
@@ -179,23 +180,24 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul)
 
 #define __ipipe_run_isr(ipd, irq)                                       \
         do {                                                            \
-                if (ipd == ipipe_root_domain) {                         \
+                if (!__ipipe_pipeline_head_p(ipd))                      \
                         local_irq_enable_hw();                          \
-                        if (ipipe_virtual_irq_p(irq))                   \
+                if (ipd == ipipe_root_domain) {                         \
+                        if (unlikely(ipipe_virtual_irq_p(irq))) {       \
+                                irq_enter();                            \
                                 ipd->irqs[irq].handler(irq, ipd->irqs[irq].cookie); \
-                        else                                            \
+                                irq_exit();                             \
+                        } else                                          \
                                 ipd->irqs[irq].handler(irq, &__raw_get_cpu_var(__ipipe_tick_regs)); \
-                        local_irq_disable_hw();                         \
                 } else {                                                \
                         __clear_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \
-                        local_irq_enable_nohead(ipd);                   \
                         ipd->irqs[irq].handler(irq, ipd->irqs[irq].cookie); \
                         /* Attempt to exit the outer interrupt level before \
                          * starting the deferred IRQ processing. */     \
-                        local_irq_disable_nohead(ipd);                  \
                         __ipipe_run_irqtail();                          \
                         __set_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \
                 }                                                       \
+                local_irq_disable_hw();                                 \
         } while (0)
 
 #define __ipipe_syscall_watched_p(p, sc)        \
diff --git a/arch/blackfin/include/asm/irq.h b/arch/blackfin/include/asm/irq.h
index 7645e85a5f6f..400bdd52ce87 100644
--- a/arch/blackfin/include/asm/irq.h
+++ b/arch/blackfin/include/asm/irq.h
@@ -17,270 +17,17 @@
 #ifndef _BFIN_IRQ_H_
 #define _BFIN_IRQ_H_
 
-/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h>*/
-#include <mach/irq.h>
-#include <asm/pda.h>
-#include <asm/processor.h>
-
-#ifdef CONFIG_SMP
-/* Forward decl needed due to cdef inter dependencies */
-static inline uint32_t __pure bfin_dspid(void);
-# define blackfin_core_id() (bfin_dspid() & 0xff)
-# define bfin_irq_flags cpu_pda[blackfin_core_id()].imask
-#else
-extern unsigned long bfin_irq_flags;
-#endif
-
-#ifdef CONFIG_IPIPE
-
-#include <linux/ipipe_trace.h>
+#include <linux/irqflags.h>
 
-void __ipipe_unstall_root(void);
-
-void __ipipe_restore_root(unsigned long flags);
-
-#ifdef CONFIG_DEBUG_HWERR
-# define __all_masked_irq_flags 0x3f
-# define __save_and_cli_hw(x) \
-        __asm__ __volatile__( \
-                "cli %0;" \
-                "sti %1;" \
-                : "=&d"(x) \
-                : "d" (0x3F) \
-        )
-#else
-# define __all_masked_irq_flags 0x1f
-# define __save_and_cli_hw(x) \
-        __asm__ __volatile__( \
-                "cli %0;" \
-                : "=&d"(x) \
-        )
-#endif
-
-#define irqs_enabled_from_flags_hw(x)   ((x) != __all_masked_irq_flags)
-#define raw_irqs_disabled_flags(flags)  (!irqs_enabled_from_flags_hw(flags))
-#define local_test_iflag_hw(x)          irqs_enabled_from_flags_hw(x)
-
-#define local_save_flags(x)                                      \
-        do {                                                     \
-                (x) = __ipipe_test_root() ?                      \
-                        __all_masked_irq_flags : bfin_irq_flags; \
-                barrier();                                       \
-        } while (0)
-
-#define local_irq_save(x)                                        \
-        do {                                                     \
-                (x) = __ipipe_test_and_stall_root() ?            \
-                        __all_masked_irq_flags : bfin_irq_flags; \
-                barrier();                                       \
-        } while (0)
-
-static inline void local_irq_restore(unsigned long x)
-{
-        barrier();
-        __ipipe_restore_root(x == __all_masked_irq_flags);
-}
-
-#define local_irq_disable()                     \
-        do {                                    \
-                __ipipe_stall_root();           \
-                barrier();                      \
-        } while (0)
-
-static inline void local_irq_enable(void)
-{
-        barrier();
-        __ipipe_unstall_root();
-}
-
-#define irqs_disabled()         __ipipe_test_root()
-
-#define local_save_flags_hw(x) \
-        __asm__ __volatile__( \
-                "cli %0;" \
-                "sti %0;" \
-                : "=d"(x) \
-        )
-
-#define irqs_disabled_hw()                              \
-        ({                                              \
-                unsigned long flags;                    \
-                local_save_flags_hw(flags);             \
-                !irqs_enabled_from_flags_hw(flags);     \
-        })
-
-static inline unsigned long raw_mangle_irq_bits(int virt, unsigned long real)
-{
-        /* Merge virtual and real interrupt mask bits into a single
-           32bit word. */
-        return (real & ~(1 << 31)) | ((virt != 0) << 31);
-}
-
-static inline int raw_demangle_irq_bits(unsigned long *x)
-{
-        int virt = (*x & (1 << 31)) != 0;
-        *x &= ~(1L << 31);
-        return virt;
-}
-
-#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
-
-#define local_irq_disable_hw()                                          \
-        do {                                                            \
-                int _tmp_dummy;                                         \
-                if (!irqs_disabled_hw())                                \
-                        ipipe_trace_begin(0x80000000);                  \
-                __asm__ __volatile__ ("cli %0;" : "=d" (_tmp_dummy) : );        \
-        } while (0)
-
-#define local_irq_enable_hw()                                           \
-        do {                                                            \
-                if (irqs_disabled_hw())                                 \
-                        ipipe_trace_end(0x80000000);                    \
-                __asm__ __volatile__ ("sti %0;" : : "d"(bfin_irq_flags));       \
-        } while (0)
-
-#define local_irq_save_hw(x)                            \
-        do {                                            \
-                __save_and_cli_hw(x);                   \
-                if (local_test_iflag_hw(x))             \
-                        ipipe_trace_begin(0x80000001);  \
-        } while (0)
-
-#define local_irq_restore_hw(x)                         \
-        do {                                            \
-                if (local_test_iflag_hw(x)) {           \
-                        ipipe_trace_end(0x80000001);    \
-                        local_irq_enable_hw_notrace();  \
-                }                                       \
-        } while (0)
-
-#define local_irq_disable_hw_notrace()                                  \
-        do {                                                            \
-                int _tmp_dummy;                                         \
-                __asm__ __volatile__ ("cli %0;" : "=d" (_tmp_dummy) : );        \
-        } while (0)
-
-#define local_irq_enable_hw_notrace() \
-        __asm__ __volatile__( \
-                "sti %0;" \
-                : \
-                : "d"(bfin_irq_flags) \
-        )
-
-#define local_irq_save_hw_notrace(x) __save_and_cli_hw(x)
-
-#define local_irq_restore_hw_notrace(x)                 \
-        do {                                            \
-                if (local_test_iflag_hw(x))             \
-                        local_irq_enable_hw_notrace();  \
-        } while (0)
-
-#else /* CONFIG_IPIPE_TRACE_IRQSOFF */
-
-#define local_irq_enable_hw() \
-        __asm__ __volatile__( \
-                "sti %0;" \
-                : \
-                : "d"(bfin_irq_flags) \
-        )
-
-#define local_irq_disable_hw()                  \
-        do {                                    \
-                int _tmp_dummy;                 \
-                __asm__ __volatile__ (          \
-                        "cli %0;"               \
-                        : "=d" (_tmp_dummy));   \
-        } while (0)
-
-#define local_irq_restore_hw(x) \
-        do { \
-                if (irqs_enabled_from_flags_hw(x)) \
-                        local_irq_enable_hw(); \
-        } while (0)
-
-#define local_irq_save_hw(x)            __save_and_cli_hw(x)
-
-#define local_irq_disable_hw_notrace()  local_irq_disable_hw()
-#define local_irq_enable_hw_notrace()   local_irq_enable_hw()
-#define local_irq_save_hw_notrace(x)    local_irq_save_hw(x)
-#define local_irq_restore_hw_notrace(x) local_irq_restore_hw(x)
-
-#endif  /* CONFIG_IPIPE_TRACE_IRQSOFF */
-
-#else /* !CONFIG_IPIPE */
-
-/*
- * Interrupt configuring macros.
- */
-#define local_irq_disable() \
-        do { \
-                int __tmp_dummy; \
-                __asm__ __volatile__( \
-                        "cli %0;" \
-                        : "=d" (__tmp_dummy) \
-                ); \
-        } while (0)
-
-#define local_irq_enable() \
-        __asm__ __volatile__( \
-                "sti %0;" \
-                : \
-                : "d" (bfin_irq_flags) \
-        )
-
-#ifdef CONFIG_DEBUG_HWERR
-# define __save_and_cli(x) \
-        __asm__ __volatile__( \
-                "cli %0;" \
-                "sti %1;" \
-                : "=&d" (x) \
-                : "d" (0x3F) \
-        )
-#else
-# define __save_and_cli(x) \
-        __asm__ __volatile__( \
-                "cli %0;" \
-                : "=&d" (x) \
-        )
-#endif
-
-#define local_save_flags(x) \
-        __asm__ __volatile__( \
-                "cli %0;" \
-                "sti %0;" \
-                : "=d" (x) \
-        )
-
-#ifdef CONFIG_DEBUG_HWERR
-#define irqs_enabled_from_flags(x) (((x) & ~0x3f) != 0)
-#else
-#define irqs_enabled_from_flags(x) ((x) != 0x1f)
-#endif
-
-#define local_irq_restore(x) \
-        do { \
-                if (irqs_enabled_from_flags(x)) \
-                        local_irq_enable(); \
-        } while (0)
-
-/* For spinlocks etc */
-#define local_irq_save(x) __save_and_cli(x)
-
-#define irqs_disabled()                         \
-({                                              \
-        unsigned long flags;                    \
-        local_save_flags(flags);                \
-        !irqs_enabled_from_flags(flags);        \
-})
-
-#define local_irq_save_hw(x)            local_irq_save(x)
-#define local_irq_restore_hw(x)         local_irq_restore(x)
-#define local_irq_enable_hw()           local_irq_enable()
-#define local_irq_disable_hw()          local_irq_disable()
-#define irqs_disabled_hw()              irqs_disabled()
+/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h> */
+#include <mach/irq.h>
 
-#endif /* !CONFIG_IPIPE */
+/* Xenomai IPIPE helpers */
+#define local_irq_restore_hw(x) local_irq_restore(x)
+#define local_irq_save_hw(x)    local_irq_save(x)
+#define local_irq_enable_hw(x)  local_irq_enable(x)
+#define local_irq_disable_hw(x) local_irq_disable(x)
+#define irqs_disabled_hw(x)     irqs_disabled(x)
 
 #if ANOMALY_05000244 && defined(CONFIG_BFIN_ICACHE)
 # define NOP_PAD_ANOMALY_05000244 "nop; nop;"
diff --git a/arch/blackfin/include/asm/irqflags.h b/arch/blackfin/include/asm/irqflags.h
new file mode 100644
index 000000000000..139cba4651b1
--- /dev/null
+++ b/arch/blackfin/include/asm/irqflags.h
@@ -0,0 +1,63 @@
+/*
+ * interface to Blackfin CEC
+ *
+ * Copyright 2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __ASM_BFIN_IRQFLAGS_H__
+#define __ASM_BFIN_IRQFLAGS_H__
+
+#ifdef CONFIG_SMP
+# include <asm/pda.h>
+# include <asm/processor.h>
+/* Forward decl needed due to cdef inter dependencies */
+static inline uint32_t __pure bfin_dspid(void);
+# define blackfin_core_id() (bfin_dspid() & 0xff)
+# define bfin_irq_flags cpu_pda[blackfin_core_id()].imask
+#else
+extern unsigned long bfin_irq_flags;
+#endif
+
+static inline void bfin_sti(unsigned long flags)
+{
+        asm volatile("sti %0;" : : "d" (flags));
+}
+
+static inline unsigned long bfin_cli(void)
+{
+        unsigned long flags;
+        asm volatile("cli %0;" : "=d" (flags));
+        return flags;
+}
+
+static inline void raw_local_irq_disable(void)
+{
+        bfin_cli();
+}
+static inline void raw_local_irq_enable(void)
+{
+        bfin_sti(bfin_irq_flags);
+}
+
+#define raw_local_save_flags(flags) do { (flags) = bfin_read_IMASK(); } while (0)
+
+#define raw_irqs_disabled_flags(flags) (((flags) & ~0x3f) == 0)
+
+static inline void raw_local_irq_restore(unsigned long flags)
+{
+        if (!raw_irqs_disabled_flags(flags))
+                raw_local_irq_enable();
+}
+
+static inline unsigned long __raw_local_irq_save(void)
+{
+        unsigned long flags = bfin_cli();
+#ifdef CONFIG_DEBUG_HWERR
+        bfin_sti(0x3f);
+#endif
+        return flags;
+}
+#define raw_local_irq_save(flags) do { (flags) = __raw_local_irq_save(); } while (0)
+
+#endif
diff --git a/arch/blackfin/include/asm/mutex-dec.h b/arch/blackfin/include/asm/mutex-dec.h
deleted file mode 100644
index 0134151656af..000000000000
--- a/arch/blackfin/include/asm/mutex-dec.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * include/asm-generic/mutex-dec.h
- *
- * Generic implementation of the mutex fastpath, based on atomic
- * decrement/increment.
- */
-#ifndef _ASM_GENERIC_MUTEX_DEC_H
-#define _ASM_GENERIC_MUTEX_DEC_H
-
-/**
- *  __mutex_fastpath_lock - try to take the lock by moving the count
- *                          from 1 to a 0 value
- *  @count: pointer of type atomic_t
- *  @fail_fn: function to call if the original value was not 1
- *
- * Change the count from 1 to a value lower than 1, and call <fail_fn> if
- * it wasn't 1 originally. This function MUST leave the value lower than
- * 1 even when the "1" assertion wasn't true.
- */
-static inline void
-__mutex_fastpath_lock(atomic_t *count, fastcall void (*fail_fn)(atomic_t *))
-{
-        if (unlikely(atomic_dec_return(count) < 0))
-                fail_fn(count);
-        else
-                smp_mb();
-}
-
-/**
- *  __mutex_fastpath_lock_retval - try to take the lock by moving the count
- *                                 from 1 to a 0 value
- *  @count: pointer of type atomic_t
- *  @fail_fn: function to call if the original value was not 1
- *
- * Change the count from 1 to a value lower than 1, and call <fail_fn> if
- * it wasn't 1 originally. This function returns 0 if the fastpath succeeds,
- * or anything the slow path function returns.
- */
-static inline int
-__mutex_fastpath_lock_retval(atomic_t *count, fastcall int (*fail_fn)(atomic_t *))
-{
-        if (unlikely(atomic_dec_return(count) < 0))
-                return fail_fn(count);
-        else {
-                smp_mb();
-                return 0;
-        }
-}
-
-/**
- *  __mutex_fastpath_unlock - try to promote the count from 0 to 1
- *  @count: pointer of type atomic_t
- *  @fail_fn: function to call if the original value was not 0
- *
- * Try to promote the count from 0 to 1. If it wasn't 0, call <fail_fn>.
- * In the failure case, this function is allowed to either set the value to
- * 1, or to set it to a value lower than 1.
- *
- * If the implementation sets it to a value of lower than 1, then the
- * __mutex_slowpath_needs_to_unlock() macro needs to return 1, it needs
- * to return 0 otherwise.
- */
-static inline void
-__mutex_fastpath_unlock(atomic_t *count, fastcall void (*fail_fn)(atomic_t *))
-{
-        smp_mb();
-        if (unlikely(atomic_inc_return(count) <= 0))
-                fail_fn(count);
-}
-
-#define __mutex_slowpath_needs_to_unlock()              1
-
-/**
- * __mutex_fastpath_trylock - try to acquire the mutex, without waiting
- *
- *  @count: pointer of type atomic_t
- *  @fail_fn: fallback function
- *
- * Change the count from 1 to a value lower than 1, and return 0 (failure)
- * if it wasn't 1 originally, or return 1 (success) otherwise. This function
- * MUST leave the value lower than 1 even when the "1" assertion wasn't true.
- * Additionally, if the value was < 0 originally, this function must not leave
- * it to 0 on failure.
- *
- * If the architecture has no effective trylock variant, it should call the
- * <fail_fn> spinlock-based trylock variant unconditionally.
- */
-static inline int
-__mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
-{
-        /*
-         * We have two variants here. The cmpxchg based one is the best one
-         * because it never induce a false contention state.  It is included
-         * here because architectures using the inc/dec algorithms over the
-         * xchg ones are much more likely to support cmpxchg natively.
-         *
-         * If not we fall back to the spinlock based variant - that is
-         * just as efficient (and simpler) as a 'destructive' probing of
-         * the mutex state would be.
-         */
-#ifdef __HAVE_ARCH_CMPXCHG
-        if (likely(atomic_cmpxchg(count, 1, 0) == 1)) {
-                smp_mb();
-                return 1;
-        }
-        return 0;
-#else
-        return fail_fn(count);
-#endif
-}
-
-#endif
diff --git a/arch/blackfin/include/asm/sections.h b/arch/blackfin/include/asm/sections.h
index 1443c3353a8c..e7fd0ecd73f7 100644
--- a/arch/blackfin/include/asm/sections.h
+++ b/arch/blackfin/include/asm/sections.h
@@ -4,4 +4,15 @@
 /* nothing to see, move along */
 #include <asm-generic/sections.h>
 
+/* only used when MTD_UCLINUX */
+extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size;
+
+extern unsigned long _ramstart, _ramend, _rambase;
+extern unsigned long memory_start, memory_end, physical_mem_end;
+
+extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],
+        _ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _sbss_b_l1[], _ebss_b_l1[],
+        _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[],
+        _ebss_l2[], _l2_lma_start[];
+
 #endif
diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h
index a4c8254bec55..294dbda24164 100644
--- a/arch/blackfin/include/asm/system.h
+++ b/arch/blackfin/include/asm/system.h
@@ -35,10 +35,10 @@
 #define _BLACKFIN_SYSTEM_H
 
 #include <linux/linkage.h>
-#include <linux/compiler.h>
+#include <linux/irqflags.h>
 #include <mach/anomaly.h>
+#include <asm/cache.h>
 #include <asm/pda.h>
-#include <asm/processor.h>
 #include <asm/irq.h>
 
 /*
diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h
index cf5066d3efd2..da35133c171d 100644
--- a/arch/blackfin/include/asm/unistd.h
+++ b/arch/blackfin/include/asm/unistd.h
@@ -380,8 +380,9 @@
 #define __NR_inotify_init1      365
 #define __NR_preadv             366
 #define __NR_pwritev            367
+#define __NR_rt_tgsigqueueinfo  368
 
-#define __NR_syscall            368
+#define __NR_syscall            369
 #define NR_syscalls             __NR_syscall
 
 /* Old optional stuff no one actually uses */
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile
index fd4d4328a0f2..3731088e181b 100644
--- a/arch/blackfin/kernel/Makefile
+++ b/arch/blackfin/kernel/Makefile
@@ -15,6 +15,10 @@ else
     obj-y += time.o
 endif
 
+obj-$(CONFIG_FUNCTION_TRACER)        += ftrace-entry.o
+obj-$(CONFIG_FUNCTION_GRAPH_TRACER)  += ftrace.o
+CFLAGS_REMOVE_ftrace.o = -pg
+
 obj-$(CONFIG_IPIPE)                  += ipipe.o
 obj-$(CONFIG_IPIPE_TRACE_MCOUNT)     += mcount.o
 obj-$(CONFIG_BFIN_GPTIMERS)          += gptimers.o
@@ -23,6 +27,7 @@ obj-$(CONFIG_MODULES)                += module.o
 obj-$(CONFIG_KGDB)                   += kgdb.o
 obj-$(CONFIG_KGDB_TESTS)             += kgdb_test.o
 obj-$(CONFIG_EARLY_PRINTK)           += early_printk.o
+obj-$(CONFIG_STACKTRACE)             += stacktrace.o
 
 # the kgdb test puts code into L2 and without linker
 # relaxation, we need to force long calls to/from it
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 763ed84ba459..e0bf8cc06907 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -453,10 +453,10 @@ void *dma_memcpy(void *pdst, const void *psrc, size_t size)
         unsigned long src = (unsigned long)psrc;
         size_t bulk, rest;
 
-        if (bfin_addr_dcachable(src))
+        if (bfin_addr_dcacheable(src))
                 blackfin_dcache_flush_range(src, src + size);
 
-        if (bfin_addr_dcachable(dst))
+        if (bfin_addr_dcacheable(dst))
                 blackfin_dcache_invalidate_range(dst, dst + size);
 
         bulk = size & ~0xffff;
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c
index 53e893ff708a..aa05e638fb7c 100644
--- a/arch/blackfin/kernel/bfin_ksyms.c
+++ b/arch/blackfin/kernel/bfin_ksyms.c
@@ -103,3 +103,8 @@ EXPORT_SYMBOL(__raw_smp_mark_barrier_asm);
 EXPORT_SYMBOL(__raw_smp_check_barrier_asm);
 #endif
 #endif
+
+#ifdef CONFIG_FUNCTION_TRACER
+extern void _mcount(void);
+EXPORT_SYMBOL(_mcount);
+#endif
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
index 87463ce87f5a..784923e52a9a 100644
--- a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
@@ -151,7 +151,7 @@ static noinline int dcplb_miss(unsigned int cpu)
 
         d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;
 #ifdef CONFIG_BFIN_DCACHE
-        if (bfin_addr_dcachable(addr)) {
+        if (bfin_addr_dcacheable(addr)) {
                 d_data |= CPLB_L1_CHBL | ANOMALY_05000158_WORKAROUND;
 #ifdef CONFIG_BFIN_WT
                 d_data |= CPLB_L1_AOW | CPLB_WT;
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbmgr.c b/arch/blackfin/kernel/cplb-nompu/cplbmgr.c
index 8cbb47c7b663..12b030842fdb 100644
--- a/arch/blackfin/kernel/cplb-nompu/cplbmgr.c
+++ b/arch/blackfin/kernel/cplb-nompu/cplbmgr.c
@@ -28,6 +28,7 @@
 #include <asm/cplbinit.h>
 #include <asm/cplb.h>
 #include <asm/mmu_context.h>
+#include <asm/traps.h>
 
 /*
  * WARNING
@@ -100,28 +101,6 @@ static inline void write_icplb_data(int cpu, int idx, unsigned long data,
 #endif
 }
 
-/*
- * Given the contents of the status register, return the index of the
- * CPLB that caused the fault.
- */
-static inline int faulting_cplb_index(int status)
-{
-        int signbits = __builtin_bfin_norm_fr1x32(status & 0xFFFF);
-        return 30 - signbits;
-}
-
-/*
- * Given the contents of the status register and the DCPLB_DATA contents,
- * return true if a write access should be permitted.
- */
-static inline int write_permitted(int status, unsigned long data)
-{
-        if (status & FAULT_USERSUPV)
-                return !!(data & CPLB_SUPV_WR);
-        else
-                return !!(data & CPLB_USER_WR);
-}
-
 /* Counters to implement round-robin replacement.  */
 static int icplb_rr_index[NR_CPUS] PDT_ATTR;
 static int dcplb_rr_index[NR_CPUS] PDT_ATTR;
@@ -245,43 +224,16 @@ MGR_ATTR static int dcplb_miss(int cpu)
         return CPLB_RELOADED;
 }
 
-MGR_ATTR static noinline int dcplb_protection_fault(int cpu)
-{
-        int status = bfin_read_DCPLB_STATUS();
-
-        nr_dcplb_prot[cpu]++;
-
-        if (likely(status & FAULT_RW)) {
-                int idx = faulting_cplb_index(status);
-                unsigned long regaddr = DCPLB_DATA0 + idx * 4;
-                unsigned long data = bfin_read32(regaddr);
-
-                /* Check if fault is to dirty a clean page */
-                if (!(data & CPLB_WT) && !(data & CPLB_DIRTY) &&
-                    write_permitted(status, data)) {
-
-                        dcplb_tbl[cpu][idx].data = data;
-                        bfin_write32(regaddr, data);
-                        return CPLB_RELOADED;
-                }
-        }
-
-        return CPLB_PROT_VIOL;
-}
-
 MGR_ATTR int cplb_hdr(int seqstat, struct pt_regs *regs)
 {
         int cause = seqstat & 0x3f;
         unsigned int cpu = smp_processor_id();
         switch (cause) {
-        case 0x2C:
+        case VEC_CPLB_I_M:
                 return icplb_miss(cpu);
-        case 0x26:
+        case VEC_CPLB_M:
                 return dcplb_miss(cpu);
         default:
-                if (unlikely(cause == 0x23))
-                        return dcplb_protection_fault(cpu);
-
                 return CPLB_UNKNOWN_ERR;
         }
 }
diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
index 3302719173ca..2ab56811841c 100644
--- a/arch/blackfin/kernel/early_printk.c
+++ b/arch/blackfin/kernel/early_printk.c
@@ -202,11 +202,15 @@ asmlinkage void __init init_early_exception_vectors(void)
 asmlinkage void __init early_trap_c(struct pt_regs *fp, void *retaddr)
 {
         /* This can happen before the uart is initialized, so initialize
-         * the UART now
+         * the UART now (but only if we are running on the processor we think
+         * we are compiled for - otherwise we write to MMRs that don't exist,
+         * and cause other problems. Nothing comes out the UART, but it does
+         * end up in the __buf_log.
          */
-        if (likely(early_console == NULL))
+        if (likely(early_console == NULL) && CPUID == bfin_cpuid())
                 setup_early_printk(DEFAULT_EARLY_PORT);
 
+        printk(KERN_EMERG "Early panic\n");
         dump_bfin_mem(fp);
         show_regs(fp);
         dump_bfin_trace_buffer();
diff --git a/arch/blackfin/kernel/ftrace-entry.S b/arch/blackfin/kernel/ftrace-entry.S
new file mode 100644
index 000000000000..6980b7a0615d
--- /dev/null
+++ b/arch/blackfin/kernel/ftrace-entry.S
@@ -0,0 +1,140 @@
+/*
+ * mcount and friends -- ftrace stuff
+ *
+ * Copyright (C) 2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/linkage.h>
+#include <asm/ftrace.h>
+
+.text
+
+/* GCC will have called us before setting up the function prologue, so we
+ * can clobber the normal scratch registers, but we need to make sure to
+ * save/restore the registers used for argument passing (R0-R2) in case
+ * the profiled function is using them.  With data registers, R3 is the
+ * only one we can blow away.  With pointer registers, we have P0-P2.
+ *
+ * Upon entry, the RETS will point to the top of the current profiled
+ * function.  And since GCC setup the frame for us, the previous function
+ * will be waiting there.  mmmm pie.
+ */
+ENTRY(__mcount)
+        /* save third function arg early so we can do testing below */
+        [--sp] = r2;
+
+        /* load the function pointer to the tracer */
+        p0.l = _ftrace_trace_function;
+        p0.h = _ftrace_trace_function;
+        r3 = [p0];
+
+        /* optional micro optimization: don't call the stub tracer */
+        r2.l = _ftrace_stub;
+        r2.h = _ftrace_stub;
+        cc = r2 == r3;
+        if ! cc jump .Ldo_trace;
+
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+        /* if the ftrace_graph_return function pointer is not set to
+         * the ftrace_stub entry, call prepare_ftrace_return().
+         */
+        p0.l = _ftrace_graph_return;
+        p0.h = _ftrace_graph_return;
+        r3 = [p0];
+        cc = r2 == r3;
+        if ! cc jump _ftrace_graph_caller;
+
+        /* similarly, if the ftrace_graph_entry function pointer is not
+         * set to the ftrace_graph_entry_stub entry, ...
+         */
+        p0.l = _ftrace_graph_entry;
+        p0.h = _ftrace_graph_entry;
+        r2.l = _ftrace_graph_entry_stub;
+        r2.h = _ftrace_graph_entry_stub;
+        r3 = [p0];
+        cc = r2 == r3;
+        if ! cc jump _ftrace_graph_caller;
+#endif
+
+        r2 = [sp++];
+        rts;
+
+.Ldo_trace:
+
+        /* save first/second function arg and the return register */
+        [--sp] = r0;
+        [--sp] = r1;
+        [--sp] = rets;
+
+        /* setup the tracer function */
+        p0 = r3;
+
+        /* tracer(ulong frompc, ulong selfpc):
+         *  frompc: the pc that did the call to ...
+         *  selfpc: ... this location
+         * the selfpc itself will need adjusting for the mcount call
+         */
+        r1 = rets;
+        r0 = [fp + 4];
+        r1 += -MCOUNT_INSN_SIZE;
+
+        /* call the tracer */
+        call (p0);
+
+        /* restore state and get out of dodge */
+.Lfinish_trace:
+        rets = [sp++];
+        r1 = [sp++];
+        r0 = [sp++];
+        r2 = [sp++];
+
+.globl _ftrace_stub
+_ftrace_stub:
+        rts;
+ENDPROC(__mcount)
+
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+/* The prepare_ftrace_return() function is similar to the trace function
+ * except it takes a pointer to the location of the frompc.  This is so
+ * the prepare_ftrace_return() can hijack it temporarily for probing
+ * purposes.
+ */
+ENTRY(_ftrace_graph_caller)
+        /* save first/second function arg and the return register */
+        [--sp] = r0;
+        [--sp] = r1;
+        [--sp] = rets;
+
+        r0 = fp;
+        r1 = rets;
+        r0 += 4;
+        r1 += -MCOUNT_INSN_SIZE;
+        call _prepare_ftrace_return;
+
+        jump .Lfinish_trace;
+ENDPROC(_ftrace_graph_caller)
+
+/* Undo the rewrite caused by ftrace_graph_caller().  The common function
+ * ftrace_return_to_handler() will return the original rets so we can
+ * restore it and be on our way.
+ */
+ENTRY(_return_to_handler)
+        /* make sure original return values are saved */
+        [--sp] = p0;
+        [--sp] = r0;
+        [--sp] = r1;
+
+        /* get original return address */
+        call _ftrace_return_to_handler;
+        rets = r0;
+
+        /* anomaly 05000371 - make sure we have at least three instructions
+         * between rets setting and the return
+         */
+        r1 = [sp++];
+        r0 = [sp++];
+        p0 = [sp++];
+        rts;
+ENDPROC(_return_to_handler)
+#endif
diff --git a/arch/blackfin/kernel/ftrace.c b/arch/blackfin/kernel/ftrace.c
new file mode 100644
index 000000000000..905bfc40a00b
--- /dev/null
+++ b/arch/blackfin/kernel/ftrace.c
@@ -0,0 +1,42 @@
+/*
+ * ftrace graph code
+ *
+ * Copyright (C) 2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/ftrace.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <asm/atomic.h>
+
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+
+/*
+ * Hook the return address and push it in the stack of return addrs
+ * in current thread info.
+ */
+void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
+{
+        struct ftrace_graph_ent trace;
+        unsigned long return_hooker = (unsigned long)&return_to_handler;
+
+        if (unlikely(atomic_read(&current->tracing_graph_pause)))
+                return;
+
+        if (ftrace_push_return_trace(*parent, self_addr, &trace.depth) == -EBUSY)
+                return;
+
+        trace.func = self_addr;
+
+        /* Only trace if the calling function expects to */
+        if (!ftrace_graph_entry(&trace)) {
+                current->curr_ret_stack--;
+                return;
+        }
+
+        /* all is well in the world !  hijack RETS ... */
+        *parent = return_hooker;
+}
+
+#endif
diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c
index 5fc424803a17..d8cde1fc5cb9 100644
--- a/arch/blackfin/kernel/ipipe.c
+++ b/arch/blackfin/kernel/ipipe.c
@@ -99,7 +99,7 @@ void __ipipe_handle_irq(unsigned irq, struct pt_regs *regs)
          * interrupt.
          */
         m_ack = (regs == NULL || irq == IRQ_SYSTMR || irq == IRQ_CORETMR);
-        this_domain = ipipe_current_domain;
+        this_domain = __ipipe_current_domain;
 
         if (unlikely(test_bit(IPIPE_STICKY_FLAG, &this_domain->irqs[irq].control)))
                 head = &this_domain->p_link;
@@ -212,7 +212,9 @@ void __ipipe_unstall_root_raw(void)
 
 int __ipipe_syscall_root(struct pt_regs *regs)
 {
+        struct ipipe_percpu_domain_data *p;
         unsigned long flags;
+        int ret;
 
         /*
          * We need to run the IRQ tail hook whenever we don't
@@ -231,29 +233,31 @@ int __ipipe_syscall_root(struct pt_regs *regs)
         /*
          * This routine either returns:
          * 0 -- if the syscall is to be passed to Linux;
-         * 1 -- if the syscall should not be passed to Linux, and no
+         * >0 -- if the syscall should not be passed to Linux, and no
          * tail work should be performed;
-         * -1 -- if the syscall should not be passed to Linux but the
+         * <0 -- if the syscall should not be passed to Linux but the
          * tail work has to be performed (for handling signals etc).
          */
 
-        if (__ipipe_event_monitored_p(IPIPE_EVENT_SYSCALL) &&
-            __ipipe_dispatch_event(IPIPE_EVENT_SYSCALL, regs) > 0) {
-                if (ipipe_root_domain_p && !in_atomic()) {
-                        /*
-                         * Sync pending VIRQs before _TIF_NEED_RESCHED
-                         * is tested.
-                         */
-                        local_irq_save_hw(flags);
-                        if ((ipipe_root_cpudom_var(irqpend_himask) & IPIPE_IRQMASK_VIRT) != 0)
-                                __ipipe_sync_pipeline(IPIPE_IRQMASK_VIRT);
-                        local_irq_restore_hw(flags);
-                        return -1;
-                }
+        if (!__ipipe_event_monitored_p(IPIPE_EVENT_SYSCALL))
+                return 0;
+
+        ret = __ipipe_dispatch_event(IPIPE_EVENT_SYSCALL, regs);
+
+        local_irq_save_hw(flags);
+
+        if (!__ipipe_root_domain_p) {
+                local_irq_restore_hw(flags);
                 return 1;
         }
 
-        return 0;
+        p = ipipe_root_cpudom_ptr();
+        if ((p->irqpend_himask & IPIPE_IRQMASK_VIRT) != 0)
+                __ipipe_sync_pipeline(IPIPE_IRQMASK_VIRT);
+
+        local_irq_restore_hw(flags);
+
+        return -ret;
 }
 
 unsigned long ipipe_critical_enter(void (*syncfn) (void))
@@ -329,9 +333,7 @@ asmlinkage void __ipipe_sync_root(void)
 
 void ___ipipe_sync_pipeline(unsigned long syncmask)
 {
-        struct ipipe_domain *ipd = ipipe_current_domain;
-
-        if (ipd == ipipe_root_domain) {
+        if (__ipipe_root_domain_p) {
                 if (test_bit(IPIPE_SYNCDEFER_FLAG, &ipipe_root_cpudom_var(status)))
                         return;
         }
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 80447f99c2b5..6454babdfaff 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -1098,7 +1098,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                         CPUID, bfin_cpuid());
 
         seq_printf(m, "model name\t: ADSP-%s %lu(MHz CCLK) %lu(MHz SCLK) (%s)\n"
-                "stepping\t: %d\n",
+                "stepping\t: %d ",
                 cpu, cclk/1000000, sclk/1000000,
 #ifdef CONFIG_MPU
                 "mpu on",
@@ -1107,7 +1107,16 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 #endif
                 revid);
 
-        seq_printf(m, "cpu MHz\t\t: %lu.%03lu/%lu.%03lu\n",
+        if (bfin_revid() != bfin_compiled_revid()) {
+                if (bfin_compiled_revid() == -1)
+                        seq_printf(m, "(Compiled for Rev none)");
+                else if (bfin_compiled_revid() == 0xffff)
+                        seq_printf(m, "(Compiled for Rev any)");
+                else
+                        seq_printf(m, "(Compiled for Rev %d)", bfin_compiled_revid());
+        }
+
+        seq_printf(m, "\ncpu MHz\t\t: %lu.%03lu/%lu.%03lu\n",
                 cclk/1000000, cclk%1000000,
                 sclk/1000000, sclk%1000000);
         seq_printf(m, "bogomips\t: %lu.%02lu\n"
@@ -1172,6 +1181,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 #ifdef __ARCH_SYNC_CORE_DCACHE
         seq_printf(m, "SMP Dcache Flushes\t: %lu\n\n", cpudata->dcache_invld_count);
 #endif
+#ifdef __ARCH_SYNC_CORE_ICACHE
+        seq_printf(m, "SMP Icache Flushes\t: %lu\n\n", cpudata->icache_invld_count);
+#endif
 #ifdef CONFIG_BFIN_ICACHE_LOCK
         switch ((cpudata->imemctl >> 3) & WAYALL_L) {
         case WAY0_L:
diff --git a/arch/blackfin/kernel/stacktrace.c b/arch/blackfin/kernel/stacktrace.c
new file mode 100644
index 000000000000..30301e1eace5
--- /dev/null
+++ b/arch/blackfin/kernel/stacktrace.c
@@ -0,0 +1,53 @@
+/*
+ * Blackfin stacktrace code (mostly copied from avr32)
+ *
+ * Copyright 2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/sched.h>
+#include <linux/stacktrace.h>
+#include <linux/thread_info.h>
+#include <linux/module.h>
+
+register unsigned long current_frame_pointer asm("FP");
+
+struct stackframe {
+        unsigned long fp;
+        unsigned long rets;
+};
+
+/*
+ * Save stack-backtrace addresses into a stack_trace buffer.
+ */
+void save_stack_trace(struct stack_trace *trace)
+{
+        unsigned long low, high;
+        unsigned long fp;
+        struct stackframe *frame;
+        int skip = trace->skip;
+
+        low = (unsigned long)task_stack_page(current);
+        high = low + THREAD_SIZE;
+        fp = current_frame_pointer;
+
+        while (fp >= low && fp <= (high - sizeof(*frame))) {
+                frame = (struct stackframe *)fp;
+
+                if (skip) {
+                        skip--;
+                } else {
+                        trace->entries[trace->nr_entries++] = frame->rets;
+                        if (trace->nr_entries >= trace->max_entries)
+                                break;
+                }
+
+                /*
+                 * The next frame must be at a higher address than the
+                 * current frame.
+                 */
+                low = fp + sizeof(*frame);
+                fp = frame->fp;
+        }
+}
+EXPORT_SYMBOL_GPL(save_stack_trace);
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index aa76dfb0226e..d279552fe9b0 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -27,6 +27,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/bug.h>
 #include <linux/uaccess.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
@@ -238,6 +239,11 @@ asmlinkage void double_fault_c(struct pt_regs *fp)
 
 }
 
+static int kernel_mode_regs(struct pt_regs *regs)
+{
+        return regs->ipend & 0xffc0;
+}
+
 asmlinkage void trap_c(struct pt_regs *fp)
 {
 #ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
@@ -246,6 +252,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
 #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
         unsigned int cpu = smp_processor_id();
 #endif
+        const char *strerror = NULL;
         int sig = 0;
         siginfo_t info;
         unsigned long trapnr = fp->seqstat & SEQSTAT_EXCAUSE;
@@ -259,27 +266,10 @@ asmlinkage void trap_c(struct pt_regs *fp)
          * double faults if the stack has become corrupt
          */
 
-        /* If the fault was caused by a kernel thread, or interrupt handler
-         * we will kernel panic, so the system reboots.
-         * If KGDB is enabled, don't set this for kernel breakpoints
-        */
-
-        /* TODO: check to see if we are in some sort of deferred HWERR
-         * that we should be able to recover from, not kernel panic
-         */
-        if ((bfin_read_IPEND() & 0xFFC0) && (trapnr != VEC_STEP)
-#ifdef CONFIG_KGDB
-                && (trapnr != VEC_EXCPT02)
+#ifndef CONFIG_KGDB
+        /* IPEND is skipped if KGDB isn't enabled (see entry code) */
+        fp->ipend = bfin_read_IPEND();
 #endif
-        ){
-                console_verbose();
-                oops_in_progress = 1;
-        } else if (current) {
-                if (current->mm == NULL) {
-                        console_verbose();
-                        oops_in_progress = 1;
-                }
-        }
 
         /* trap_c() will be called for exceptions. During exceptions
          * processing, the pc value should be set with retx value.
@@ -307,15 +297,15 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 sig = SIGTRAP;
                 CHK_DEBUGGER_TRAP_MAYBE();
                 /* Check if this is a breakpoint in kernel space */
-                if (fp->ipend & 0xffc0)
-                        return;
+                if (kernel_mode_regs(fp))
+                        goto traps_done;
                 else
                         break;
         /* 0x03 - User Defined, userspace stack overflow */
         case VEC_EXCPT03:
                 info.si_code = SEGV_STACKFLOW;
                 sig = SIGSEGV;
-                verbose_printk(KERN_NOTICE EXC_0x03(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x03(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x02 - KGDB initial connection and break signal trap */
@@ -324,7 +314,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 info.si_code = TRAP_ILLTRAP;
                 sig = SIGTRAP;
                 CHK_DEBUGGER_TRAP();
-                return;
+                goto traps_done;
 #endif
         /* 0x04 - User Defined */
         /* 0x05 - User Defined */
@@ -344,7 +334,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
         case VEC_EXCPT04 ... VEC_EXCPT15:
                 info.si_code = ILL_ILLPARAOP;
                 sig = SIGILL;
-                verbose_printk(KERN_NOTICE EXC_0x04(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x04(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x10 HW Single step, handled here */
@@ -353,15 +343,15 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 sig = SIGTRAP;
                 CHK_DEBUGGER_TRAP_MAYBE();
                 /* Check if this is a single step in kernel space */
-                if (fp->ipend & 0xffc0)
-                        return;
+                if (kernel_mode_regs(fp))
+                        goto traps_done;
                 else
                         break;
         /* 0x11 - Trace Buffer Full, handled here */
         case VEC_OVFLOW:
                 info.si_code = TRAP_TRACEFLOW;
                 sig = SIGTRAP;
-                verbose_printk(KERN_NOTICE EXC_0x11(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x11(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x12 - Reserved, Caught by default */
@@ -381,37 +371,54 @@ asmlinkage void trap_c(struct pt_regs *fp)
         /* 0x20 - Reserved, Caught by default */
         /* 0x21 - Undefined Instruction, handled here */
         case VEC_UNDEF_I:
+#ifdef CONFIG_BUG
+                if (kernel_mode_regs(fp)) {
+                        switch (report_bug(fp->pc, fp)) {
+                        case BUG_TRAP_TYPE_NONE:
+                                break;
+                        case BUG_TRAP_TYPE_WARN:
+                                dump_bfin_trace_buffer();
+                                fp->pc += 2;
+                                goto traps_done;
+                        case BUG_TRAP_TYPE_BUG:
+                                /* call to panic() will dump trace, and it is
+                                 * off at this point, so it won't be clobbered
+                                 */
+                                panic("BUG()");
+                        }
+                }
+#endif
                 info.si_code = ILL_ILLOPC;
                 sig = SIGILL;
-                verbose_printk(KERN_NOTICE EXC_0x21(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x21(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x22 - Illegal Instruction Combination, handled here */
         case VEC_ILGAL_I:
                 info.si_code = ILL_ILLPARAOP;
                 sig = SIGILL;
-                verbose_printk(KERN_NOTICE EXC_0x22(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x22(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x23 - Data CPLB protection violation, handled here */
         case VEC_CPLB_VL:
                 info.si_code = ILL_CPLB_VI;
                 sig = SIGBUS;
-                verbose_printk(KERN_NOTICE EXC_0x23(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x23(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x24 - Data access misaligned, handled here */
         case VEC_MISALI_D:
                 info.si_code = BUS_ADRALN;
                 sig = SIGBUS;
-                verbose_printk(KERN_NOTICE EXC_0x24(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x24(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x25 - Unrecoverable Event, handled here */
         case VEC_UNCOV:
                 info.si_code = ILL_ILLEXCPT;
                 sig = SIGILL;
-                verbose_printk(KERN_NOTICE EXC_0x25(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x25(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x26 - Data CPLB Miss, normal case is handled in _cplb_hdr,
@@ -419,7 +426,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
         case VEC_CPLB_M:
                 info.si_code = BUS_ADRALN;
                 sig = SIGBUS;
-                verbose_printk(KERN_NOTICE EXC_0x26(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x26(KERN_NOTICE);
                 break;
         /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */
         case VEC_CPLB_MHIT:
@@ -427,10 +434,10 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 sig = SIGSEGV;
 #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
                 if (cpu_pda[cpu].dcplb_fault_addr < FIXED_CODE_START)
-                        verbose_printk(KERN_NOTICE "NULL pointer access\n");
+                        strerror = KERN_NOTICE "NULL pointer access\n";
                 else
 #endif
-                        verbose_printk(KERN_NOTICE EXC_0x27(KERN_NOTICE));
+                        strerror = KERN_NOTICE EXC_0x27(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x28 - Emulation Watchpoint, handled here */
@@ -440,8 +447,8 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 pr_debug(EXC_0x28(KERN_DEBUG));
                 CHK_DEBUGGER_TRAP_MAYBE();
                 /* Check if this is a watchpoint in kernel space */
-                if (fp->ipend & 0xffc0)
-                        return;
+                if (kernel_mode_regs(fp))
+                        goto traps_done;
                 else
                         break;
 #ifdef CONFIG_BF535
@@ -449,7 +456,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
         case VEC_ISTRU_VL:      /* ADSP-BF535 only (MH) */
                 info.si_code = BUS_OPFETCH;
                 sig = SIGBUS;
-                verbose_printk(KERN_NOTICE "BF535: VEC_ISTRU_VL\n");
+                strerror = KERN_NOTICE "BF535: VEC_ISTRU_VL\n";
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
 #else
@@ -459,21 +466,21 @@ asmlinkage void trap_c(struct pt_regs *fp)
         case VEC_MISALI_I:
                 info.si_code = BUS_ADRALN;
                 sig = SIGBUS;
-                verbose_printk(KERN_NOTICE EXC_0x2A(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x2A(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x2B - Instruction CPLB protection violation, handled here */
         case VEC_CPLB_I_VL:
                 info.si_code = ILL_CPLB_VI;
                 sig = SIGBUS;
-                verbose_printk(KERN_NOTICE EXC_0x2B(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x2B(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x2C - Instruction CPLB miss, handled in _cplb_hdr */
         case VEC_CPLB_I_M:
                 info.si_code = ILL_CPLB_MISS;
                 sig = SIGBUS;
-                verbose_printk(KERN_NOTICE EXC_0x2C(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x2C(KERN_NOTICE);
                 break;
         /* 0x2D - Instruction CPLB Multiple Hits, handled here */
         case VEC_CPLB_I_MHIT:
@@ -481,17 +488,17 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 sig = SIGSEGV;
 #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
                 if (cpu_pda[cpu].icplb_fault_addr < FIXED_CODE_START)
-                        verbose_printk(KERN_NOTICE "Jump to NULL address\n");
+                        strerror = KERN_NOTICE "Jump to NULL address\n";
                 else
 #endif
-                        verbose_printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE));
+                        strerror = KERN_NOTICE EXC_0x2D(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x2E - Illegal use of Supervisor Resource, handled here */
         case VEC_ILL_RES:
                 info.si_code = ILL_PRVOPC;
                 sig = SIGILL;
-                verbose_printk(KERN_NOTICE EXC_0x2E(KERN_NOTICE));
+                strerror = KERN_NOTICE EXC_0x2E(KERN_NOTICE);
                 CHK_DEBUGGER_TRAP_MAYBE();
                 break;
         /* 0x2F - Reserved, Caught by default */
@@ -519,17 +526,17 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 case (SEQSTAT_HWERRCAUSE_SYSTEM_MMR):
                         info.si_code = BUS_ADRALN;
                         sig = SIGBUS;
-                        verbose_printk(KERN_NOTICE HWC_x2(KERN_NOTICE));
+                        strerror = KERN_NOTICE HWC_x2(KERN_NOTICE);
                         break;
                 /* External Memory Addressing Error */
                 case (SEQSTAT_HWERRCAUSE_EXTERN_ADDR):
                         info.si_code = BUS_ADRERR;
                         sig = SIGBUS;
-                        verbose_printk(KERN_NOTICE HWC_x3(KERN_NOTICE));
+                        strerror = KERN_NOTICE HWC_x3(KERN_NOTICE);
                         break;
                 /* Performance Monitor Overflow */
                 case (SEQSTAT_HWERRCAUSE_PERF_FLOW):
-                        verbose_printk(KERN_NOTICE HWC_x12(KERN_NOTICE));
+                        strerror = KERN_NOTICE HWC_x12(KERN_NOTICE);
                         break;
                 /* RAISE 5 instruction */
                 case (SEQSTAT_HWERRCAUSE_RAISE_5):
@@ -546,7 +553,6 @@ asmlinkage void trap_c(struct pt_regs *fp)
          * if we get here we hit a reserved one, so panic
          */
         default:
-                oops_in_progress = 1;
                 info.si_code = ILL_ILLPARAOP;
                 sig = SIGILL;
                 verbose_printk(KERN_EMERG "Caught Unhandled Exception, code = %08lx\n",
@@ -557,6 +563,16 @@ asmlinkage void trap_c(struct pt_regs *fp)
 
         BUG_ON(sig == 0);
 
+        /* If the fault was caused by a kernel thread, or interrupt handler
+         * we will kernel panic, so the system reboots.
+         */
+        if (kernel_mode_regs(fp) || (current && !current->mm)) {
+                console_verbose();
+                oops_in_progress = 1;
+                if (strerror)
+                        verbose_printk(strerror);
+        }
+
         if (sig != SIGTRAP) {
                 dump_bfin_process(fp);
                 dump_bfin_mem(fp);
@@ -606,8 +622,8 @@ asmlinkage void trap_c(struct pt_regs *fp)
         if (ANOMALY_05000461 && trapnr == VEC_HWERR && !access_ok(VERIFY_READ, fp->pc, 8))
                 fp->pc = SAFE_USER_INSTRUCTION;
 
+ traps_done:
         trace_buffer_restore(j);
-        return;
 }
 
 /* Typical exception handling routines  */
@@ -792,6 +808,18 @@ void dump_bfin_trace_buffer(void)
 }
 EXPORT_SYMBOL(dump_bfin_trace_buffer);
 
+#ifdef CONFIG_BUG
+int is_valid_bugaddr(unsigned long addr)
+{
+        unsigned short opcode;
+
+        if (!get_instruction(&opcode, (unsigned short *)addr))
+                return 0;
+
+        return opcode == BFIN_BUG_OPCODE;
+}
+#endif
+
 /*
  * Checks to see if the address pointed to is either a
  * 16-bit CALL instruction, or a 32-bit CALL instruction
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index 8b67167cb4f4..6ac307ca0d80 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -54,6 +54,7 @@ SECTIONS
                 SCHED_TEXT
 #endif
                 LOCK_TEXT
+                IRQENTRY_TEXT
                 KPROBES_TEXT
                 *(.text.*)
                 *(.fixup)
@@ -166,6 +167,20 @@ SECTIONS
         }
         PERCPU(4)
         SECURITY_INIT
+
+        /* we have to discard exit text and such at runtime, not link time, to
+         * handle embedded cross-section references (alt instructions, bug
+         * table, eh_frame, etc...)
+         */
+        .exit.text :
+        {
+                EXIT_TEXT
+        }
+        .exit.data :
+        {
+                EXIT_DATA
+        }
+
         .init.ramfs :
         {
                 . = ALIGN(4);
@@ -264,8 +279,6 @@ SECTIONS
 
         /DISCARD/ :
         {
-                EXIT_TEXT
-                EXIT_DATA
                 *(.exitcall.exit)
         }
 }
diff --git a/arch/blackfin/lib/checksum.c b/arch/blackfin/lib/checksum.c
index 762a7f02970a..cd605e7d8518 100644
--- a/arch/blackfin/lib/checksum.c
+++ b/arch/blackfin/lib/checksum.c
@@ -116,6 +116,7 @@ __sum16 ip_compute_csum(const void *buff, int len)
 {
         return (__force __sum16)~do_csum(buff, len);
 }
+EXPORT_SYMBOL(ip_compute_csum);
 
 /*
  * copy from fs while checksumming, otherwise like csum_partial
@@ -130,6 +131,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
         memcpy(dst, (__force void *)src, len);
         return csum_partial(dst, len, sum);
 }
+EXPORT_SYMBOL(csum_partial_copy_from_user);
 
 /*
  * copy from ds while checksumming, otherwise like csum_partial
diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c
index 62bba09bcce6..1382f0382359 100644
--- a/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -246,7 +246,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
                 .bus_num = 0, /* Framework bus number */
-                .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/
+                .chip_select = 2, /* On BF518F-EZBRD it's SPI0_SSEL2 */
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
                 .mode = SPI_MODE_3,
@@ -369,6 +369,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI0,
                 .end   = CH_SPI0,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI0,
+                .end   = IRQ_SPI0,
                 .flags = IORESOURCE_IRQ,
         },
 };
@@ -399,6 +404,11 @@ static struct resource bfin_spi1_resource[] = {
         [1] = {
                 .start = CH_SPI1,
                 .end   = CH_SPI1,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI1,
+                .end   = IRQ_SPI1,
                 .flags = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 6d6f9effa0bb..1eaf27ff722e 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -664,6 +664,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index 1435c5d38cd5..9f9c0005dcf1 100644
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -467,6 +467,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 147edd1eb1ad..3e5b7db6b065 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -723,6 +723,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c
index 895f213ea454..38cf8ffd6d74 100644
--- a/arch/blackfin/mach-bf533/boards/H8606.c
+++ b/arch/blackfin/mach-bf533/boards/H8606.c
@@ -266,6 +266,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c
index 0765872a8ada..9ecdc361fa6d 100644
--- a/arch/blackfin/mach-bf533/boards/blackstamp.c
+++ b/arch/blackfin/mach-bf533/boards/blackstamp.c
@@ -162,6 +162,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index a727e538fa28..1443e92d8b62 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -160,6 +160,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 842f1c9c2393..89a5ec4ca048 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -196,6 +196,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index e19c565ade16..a68ade8a3ca2 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -299,6 +299,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 4fee19673127..2a87d1cfcd06 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -182,8 +182,13 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
-        }
+        },
 };
 
 /* SPI controller data */
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c
index 3c159819e555..399f81da7b93 100644
--- a/arch/blackfin/mach-bf537/boards/minotaur.c
+++ b/arch/blackfin/mach-bf537/boards/minotaur.c
@@ -184,6 +184,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 26707ce39f29..838240f151f5 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -398,8 +398,13 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
-        }
+        },
 };
 
 /* SPI controller data */
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index dfb5036f8a6b..ff7228caa7da 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -1345,7 +1345,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 #if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
         {
                 I2C_BOARD_INFO("pmic-adp5520", 0x32),
-                .irq = IRQ_PF7,
+                .irq = IRQ_PG0,
                 .platform_data = (void *)&adp5520_pdev_data,
         },
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index 280574591201..e523e6e610d0 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -182,6 +182,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c b/arch/blackfin/mach-bf538/boards/ezkit.c
index e37cb9378884..57695b4c3c09 100644
--- a/arch/blackfin/mach-bf538/boards/ezkit.c
+++ b/arch/blackfin/mach-bf538/boards/ezkit.c
@@ -352,6 +352,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI0,
                 .end   = CH_SPI0,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI0,
+                .end   = IRQ_SPI0,
                 .flags = IORESOURCE_IRQ,
         }
 };
@@ -366,6 +371,11 @@ static struct resource bfin_spi1_resource[] = {
         [1] = {
                 .start = CH_SPI1,
                 .end   = CH_SPI1,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI1,
+                .end   = IRQ_SPI1,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index f53ad682530b..f5a3c30a41bd 100644
--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -612,6 +612,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI0,
                 .end   = CH_SPI0,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI0,
+                .end   = IRQ_SPI0,
                 .flags = IORESOURCE_IRQ,
         }
 };
@@ -626,6 +631,11 @@ static struct resource bfin_spi1_resource[] = {
         [1] = {
                 .start = CH_SPI1,
                 .end   = CH_SPI1,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI1,
+                .end   = IRQ_SPI1,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index add5a17452ce..805a57b5e650 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -396,6 +396,8 @@ static struct platform_device bfin_sir3_device = {
 #endif
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#include <linux/smsc911x.h>
+
 static struct resource smsc911x_resources[] = {
         {
                 .name = "smsc911x-memory",
@@ -409,11 +411,22 @@ static struct resource smsc911x_resources[] = {
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
         },
 };
+
+static struct smsc911x_platform_config smsc911x_config = {
+        .flags = SMSC911X_USE_32BIT,
+        .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .phy_interface = PHY_INTERFACE_MODE_MII,
+};
+
 static struct platform_device smsc911x_device = {
         .name = "smsc911x",
         .id = 0,
         .num_resources = ARRAY_SIZE(smsc911x_resources),
         .resource = smsc911x_resources,
+        .dev = {
+                .platform_data = &smsc911x_config,
+        },
 };
 #endif
 
@@ -741,6 +754,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI0,
                 .end   = CH_SPI0,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI0,
+                .end   = IRQ_SPI0,
                 .flags = IORESOURCE_IRQ,
         }
 };
@@ -755,6 +773,11 @@ static struct resource bfin_spi1_resource[] = {
         [1] = {
                 .start = CH_SPI1,
                 .end   = CH_SPI1,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI1,
+                .end   = IRQ_SPI1,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index 0dd9685e5d53..0c9d72c5f5ba 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -177,8 +177,13 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
-        }
+        },
 };
 
 /* SPI controller data */
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 0e2178a1aec5..b5ef7ff7b7bd 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -304,6 +304,11 @@ static struct resource bfin_spi0_resource[] = {
         [1] = {
                 .start = CH_SPI,
                 .end   = CH_SPI,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = IRQ_SPI,
+                .end   = IRQ_SPI,
                 .flags = IORESOURCE_IRQ,
         }
 };
diff --git a/arch/blackfin/mach-common/cache-c.c b/arch/blackfin/mach-common/cache-c.c
index e6ab1f815123..b59ce3cb3807 100644
--- a/arch/blackfin/mach-common/cache-c.c
+++ b/arch/blackfin/mach-common/cache-c.c
@@ -16,9 +16,21 @@
 void blackfin_invalidate_entire_dcache(void)
 {
         u32 dmem = bfin_read_DMEM_CONTROL();
-        SSYNC();
         bfin_write_DMEM_CONTROL(dmem & ~0xc);
         SSYNC();
         bfin_write_DMEM_CONTROL(dmem);
         SSYNC();
 }
+
+/* Invalidate the Entire Instruction cache by
+ * clearing IMC bit
+ */
+void blackfin_invalidate_entire_icache(void)
+{
+        u32 imem = bfin_read_IMEM_CONTROL();
+        bfin_write_IMEM_CONTROL(imem & ~0x4);
+        SSYNC();
+        bfin_write_IMEM_CONTROL(imem);
+        SSYNC();
+}
+
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index da0558ad1b1a..31fa313e81cf 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -42,6 +42,7 @@
 #include <asm/thread_info.h>  /* TIF_NEED_RESCHED */
 #include <asm/asm-offsets.h>
 #include <asm/trace.h>
+#include <asm/traps.h>
 
 #include <asm/context.S>
 
@@ -84,13 +85,15 @@ ENTRY(_ex_workaround_261)
         if !cc jump _bfin_return_from_exception;
         /* fall through */
         R7 = P4;
-        R6 = 0x26;      /* Data CPLB Miss */
+        R6 = VEC_CPLB_M;        /* Data CPLB Miss */
         cc = R6 == R7;
         if cc jump _ex_dcplb_miss (BP);
-        R6 = 0x23;      /* Data CPLB Miss */
+#ifdef CONFIG_MPU
+        R6 = VEC_CPLB_VL;       /* Data CPLB Violation */
         cc = R6 == R7;
         if cc jump _ex_dcplb_viol (BP);
-        /* Handle 0x23 Data CPLB Protection Violation
+#endif
+        /* Handle Data CPLB Protection Violation
          * and Data CPLB Multiple Hits - Linux Trap Zero
          */
         jump _ex_trap_c;
@@ -270,7 +273,7 @@ ENTRY(_bfin_return_from_exception)
         r6.l = lo(SEQSTAT_EXCAUSE);
         r6.h = hi(SEQSTAT_EXCAUSE);
         r7 = r7 & r6;
-        r6 = 0x25;
+        r6 = VEC_UNCOV;
         CC = R7 == R6;
         if CC JUMP _double_fault;
 #endif
@@ -1605,6 +1608,7 @@ ENTRY(_sys_call_table)
         .long _sys_inotify_init1        /* 365 */
         .long _sys_preadv
         .long _sys_pwritev
+        .long _sys_rt_tgsigqueueinfo
 
         .rept NR_syscalls-(.-_sys_call_table)/4
         .long _sys_ni_syscall
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index 3b8ebaee77f2..61840059dfac 100644
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -144,7 +144,7 @@ static void ipi_call_function(unsigned int cpu, struct ipi_message *msg)
 
 static irqreturn_t ipi_handler(int irq, void *dev_instance)
 {
-        struct ipi_message *msg, *mg;
+        struct ipi_message *msg;
         struct ipi_message_queue *msg_queue;
         unsigned int cpu = smp_processor_id();
 
@@ -154,7 +154,8 @@ static irqreturn_t ipi_handler(int irq, void *dev_instance)
         msg_queue->count++;
 
         spin_lock(&msg_queue->lock);
-        list_for_each_entry_safe(msg, mg, &msg_queue->head, list) {
+        while (!list_empty(&msg_queue->head)) {
+                msg = list_entry(msg_queue->head.next, typeof(*msg), list);
                 list_del(&msg->list);
                 switch (msg->type) {
                 case BFIN_IPI_RESCHEDULE:
@@ -221,7 +222,7 @@ int smp_call_function(void (*func)(void *info), void *info, int wait)
         for_each_cpu_mask(cpu, callmap) {
                 msg_queue = &per_cpu(ipi_msg_queue, cpu);
                 spin_lock_irqsave(&msg_queue->lock, flags);
-                list_add(&msg->list, &msg_queue->head);
+                list_add_tail(&msg->list, &msg_queue->head);
                 spin_unlock_irqrestore(&msg_queue->lock, flags);
                 platform_send_ipi_cpu(cpu);
         }
@@ -261,7 +262,7 @@ int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
 
         msg_queue = &per_cpu(ipi_msg_queue, cpu);
         spin_lock_irqsave(&msg_queue->lock, flags);
-        list_add(&msg->list, &msg_queue->head);
+        list_add_tail(&msg->list, &msg_queue->head);
         spin_unlock_irqrestore(&msg_queue->lock, flags);
         platform_send_ipi_cpu(cpu);
 
@@ -292,7 +293,7 @@ void smp_send_reschedule(int cpu)
 
         msg_queue = &per_cpu(ipi_msg_queue, cpu);
         spin_lock_irqsave(&msg_queue->lock, flags);
-        list_add(&msg->list, &msg_queue->head);
+        list_add_tail(&msg->list, &msg_queue->head);
         spin_unlock_irqrestore(&msg_queue->lock, flags);
         platform_send_ipi_cpu(cpu);
 
@@ -320,7 +321,7 @@ void smp_send_stop(void)
         for_each_cpu_mask(cpu, callmap) {
                 msg_queue = &per_cpu(ipi_msg_queue, cpu);
                 spin_lock_irqsave(&msg_queue->lock, flags);
-                list_add(&msg->list, &msg_queue->head);
+                list_add_tail(&msg->list, &msg_queue->head);
                 spin_unlock_irqrestore(&msg_queue->lock, flags);
                 platform_send_ipi_cpu(cpu);
         }
@@ -468,6 +469,17 @@ void smp_icache_flush_range_others(unsigned long start, unsigned long end)
 }
 EXPORT_SYMBOL_GPL(smp_icache_flush_range_others);
 
+#ifdef __ARCH_SYNC_CORE_ICACHE
+void resync_core_icache(void)
+{
+        unsigned int cpu = get_cpu();
+        blackfin_invalidate_entire_icache();
+        ++per_cpu(cpu_data, cpu).icache_invld_count;
+        put_cpu();
+}
+EXPORT_SYMBOL(resync_core_icache);
+#endif
+
 #ifdef __ARCH_SYNC_CORE_DCACHE
 unsigned long barrier_mask __attribute__ ((__section__(".l2.bss")));
 
diff --git a/arch/ia64/mm/extable.c b/arch/ia64/mm/extable.c
index e95d5ad9285d..c99a41e29fe8 100644
--- a/arch/ia64/mm/extable.c
+++ b/arch/ia64/mm/extable.c
@@ -8,7 +8,7 @@
 #include <linux/sort.h>
 
 #include <asm/uaccess.h>
-#include <asm/module.h>
+#include <linux/module.h>
 
 static int cmp_ex(const void *a, const void *b)
 {
@@ -55,7 +55,7 @@ void sort_extable (struct exception_table_entry *start,
 
 static inline unsigned long ex_to_addr(const struct exception_table_entry *x)
 {
-        return (unsigned long)&x->insn + x->insn;
+        return (unsigned long)&x->addr + x->addr;
 }
 
 #ifdef CONFIG_MODULES
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 783da855a2e3..d6d35b2e5fe8 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -963,7 +963,7 @@ CONFIG_EEPROM_LEGACY=y
 CONFIG_SENSORS_PCF8574=y
 # CONFIG_PCF8575 is not set
 CONFIG_SENSORS_PCF8591=y
-CONFIG_SENSORS_MAX6875=y
+CONFIG_EEPROM_MAX6875=y
 # CONFIG_SENSORS_TSL2550 is not set
 CONFIG_I2C_DEBUG_CORE=y
 CONFIG_I2C_DEBUG_ALGO=y
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig
index 8426d3b9501c..fadb351d249b 100644
--- a/arch/mips/configs/mtx1_defconfig
+++ b/arch/mips/configs/mtx1_defconfig
@@ -1849,7 +1849,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCA9539=m
 CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_MAX6875=m
+CONFIG_EEPROM_MAX6875=m
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
diff --git a/arch/mips/include/asm/errno.h b/arch/mips/include/asm/errno.h
index 3c0d840e4577..a0efc73819e4 100644
--- a/arch/mips/include/asm/errno.h
+++ b/arch/mips/include/asm/errno.h
@@ -119,6 +119,8 @@
 #define EOWNERDEAD      165     /* Owner died */
 #define ENOTRECOVERABLE 166     /* State not recoverable */
 
+#define ERFKILL         167     /* Operation not possible due to RF-kill */
+
 #define EDQUOT          1133    /* Quota exceeded */
 
 #ifdef __KERNEL__
diff --git a/arch/mips/sni/eisa.c b/arch/mips/sni/eisa.c
index 7396cd719900..6827feb4de96 100644
--- a/arch/mips/sni/eisa.c
+++ b/arch/mips/sni/eisa.c
@@ -38,7 +38,7 @@ int __init sni_eisa_root_init(void)
         if (!r)
                 return r;
 
-        eisa_root_dev.dev.driver_data = &eisa_bus_root;
+        dev_set_drvdata(&eisa_root_dev.dev, &eisa_bus_root);
 
         if (eisa_root_register(&eisa_bus_root)) {
                 /* A real bridge may have been registered before
diff --git a/arch/parisc/include/asm/errno.h b/arch/parisc/include/asm/errno.h
index e2f3ddc796be..9992abdd782d 100644
--- a/arch/parisc/include/asm/errno.h
+++ b/arch/parisc/include/asm/errno.h
@@ -120,5 +120,6 @@
 #define EOWNERDEAD      254     /* Owner died */
 #define ENOTRECOVERABLE 255     /* State not recoverable */
 
+#define ERFKILL         256     /* Operation not possible due to RF-kill */
 
 #endif
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cdc9a6ff4be8..9fb344d5a86a 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -42,6 +42,10 @@ config GENERIC_HARDIRQS
         bool
         default y
 
+config GENERIC_HARDIRQS_NO__DO_IRQ
+        bool
+        default y
+
 config HAVE_SETUP_PER_CPU_AREA
         def_bool PPC64
 
@@ -89,10 +93,6 @@ config GENERIC_HWEIGHT
         bool
         default y
 
-config GENERIC_CALIBRATE_DELAY
-        bool
-        default y
-
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
@@ -125,6 +125,7 @@ config PPC
         select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_OPROFILE
         select HAVE_SYSCALL_WRAPPERS if PPC64
+        select GENERIC_ATOMIC64 if PPC32
 
 config EARLY_PRINTK
         bool
@@ -296,9 +297,19 @@ config IOMMU_VMERGE
 config IOMMU_HELPER
         def_bool PPC64
 
+config SWIOTLB
+        bool "SWIOTLB support"
+        default n
+        select IOMMU_HELPER
+        ---help---
+          Support for IO bounce buffering for systems without an IOMMU.
+          This allows us to DMA to the full physical address space on
+          platforms where the size of a physical address is larger
+          than the bus address.  Not all platforms support this.
+
 config PPC_NEED_DMA_SYNC_OPS
         def_bool y
-        depends on NOT_COHERENT_CACHE
+        depends on (NOT_COHERENT_CACHE || SWIOTLB)
 
 config HOTPLUG_CPU
         bool "Support for enabling/disabling CPUs"
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index a1098e23221f..d79a902d155a 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -41,6 +41,19 @@ config HCALL_STATS
           This option will add a small amount of overhead to all hypervisor
           calls.
 
+config PPC_EMULATED_STATS
+        bool "Emulated instructions tracking"
+        depends on DEBUG_FS
+        help
+          Adds code to keep track of the number of instructions that are
+          emulated by the in-kernel emulator. Counters for the various classes
+          of emulated instructions are available under
+          powerpc/emulated_instructions/ in the root of the debugfs file
+          system. Optionally (controlled by
+          powerpc/emulated_instructions/do_warn in debugfs), rate-limited
+          warnings can be printed to the console when instructions are
+          emulated.
+
 config CODE_PATCHING_SELFTEST
         bool "Run self-tests of the code-patching code."
         depends on DEBUG_KERNEL
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 551fc58c05cf..bc35f4e2b81c 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -142,6 +142,7 @@ head-$(CONFIG_FSL_BOOKE)	:= arch/powerpc/kernel/head_fsl_booke.o
 
 head-$(CONFIG_PPC64)            += arch/powerpc/kernel/entry_64.o
 head-$(CONFIG_PPC_FPU)          += arch/powerpc/kernel/fpu.o
+head-$(CONFIG_ALTIVEC)          += arch/powerpc/kernel/vector.o
 
 core-y                          += arch/powerpc/kernel/ \
                                    arch/powerpc/mm/ \
diff --git a/arch/powerpc/boot/dts/gef_ppc9a.dts b/arch/powerpc/boot/dts/gef_ppc9a.dts
index 53a7a6255909..910944edd886 100644
--- a/arch/powerpc/boot/dts/gef_ppc9a.dts
+++ b/arch/powerpc/boot/dts/gef_ppc9a.dts
@@ -164,9 +164,21 @@
                 device_type = "soc";
                 compatible = "fsl,mpc8641-soc", "simple-bus";
                 ranges = <0x0 0xfef00000 0x00100000>;
-                reg = <0xfef00000 0x100000>;    // CCSRBAR 1M
                 bus-frequency = <33333333>;
 
+                mcm-law@0 {
+                        compatible = "fsl,mcm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                mcm@1000 {
+                        compatible = "fsl,mpc8641-mcm", "fsl,mcm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 i2c1: i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
diff --git a/arch/powerpc/boot/dts/gef_sbc310.dts b/arch/powerpc/boot/dts/gef_sbc310.dts
index 1569117e5ddc..0f4c9ec2c3a6 100644
--- a/arch/powerpc/boot/dts/gef_sbc310.dts
+++ b/arch/powerpc/boot/dts/gef_sbc310.dts
@@ -163,9 +163,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xfef00000 0x00100000>;
-                reg = <0xfef00000 0x100000>;    // CCSRBAR 1M
                 bus-frequency = <33333333>;
 
+                mcm-law@0 {
+                        compatible = "fsl,mcm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                mcm@1000 {
+                        compatible = "fsl,mpc8641-mcm", "fsl,mcm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 i2c1: i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts
index 6582dbd36da7..217f8aa66725 100644
--- a/arch/powerpc/boot/dts/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/gef_sbc610.dts
@@ -128,9 +128,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xfef00000 0x00100000>;
-                reg = <0xfef00000 0x100000>;    // CCSRBAR 1M
                 bus-frequency = <33333333>;
 
+                mcm-law@0 {
+                        compatible = "fsl,mcm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                mcm@1000 {
+                        compatible = "fsl,mpc8641-mcm", "fsl,mcm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 i2c1: i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
diff --git a/arch/powerpc/boot/dts/ksi8560.dts b/arch/powerpc/boot/dts/ksi8560.dts
index c9cfd374bffb..bdb7fc0fa332 100644
--- a/arch/powerpc/boot/dts/ksi8560.dts
+++ b/arch/powerpc/boot/dts/ksi8560.dts
@@ -56,6 +56,19 @@
                 ranges = <0x00000000 0xfdf00000 0x00100000>;
                 bus-frequency = <0>;                            /* Fixed by bootwrapper */
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8560-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8540-memory-controller";
                         reg = <0x2000 0x1000>;
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 57c595bf1071..436c9c671dd9 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -249,6 +249,8 @@
                 reg = <0xe0100000 0x480>;
                 brg-frequency = <0>;
                 bus-frequency = <198000000>;
+                fsl,qe-num-riscs = <1>;
+                fsl,qe-num-snums = <28>;
 
                 muram@10000 {
                         #address-cells = <1>;
@@ -369,7 +371,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x11 AD17 */
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 4319bd70a580..9a0952f74b81 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -221,6 +221,8 @@
                 reg = <0xe0100000 0x480>;
                 brg-frequency = <0>;
                 bus-frequency = <198000000>;
+                fsl,qe-num-riscs = <1>;
+                fsl,qe-num-snums = <28>;
 
                 muram@10000 {
                         #address-cells = <1>;
@@ -327,7 +329,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x10 AD16 (USB) */
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 1ae38f0ddef8..e3eeaeda9187 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -278,7 +278,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x10 - SATA */
@@ -301,7 +300,6 @@
         };
 
         pci1: pci@e0008600 {
-                cell-index = <2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x0E - MiniPCI Slot */
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 662abe1fb804..eb732115f016 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -227,7 +227,6 @@
         };
 
         pci0: pci@e0008600 {
-                cell-index = <2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x0F - PCI Slot */
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index d9f0a2325fa4..a2553a6f9009 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -286,7 +286,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
@@ -348,7 +347,6 @@
         };
 
         pci1: pci@e0008600 {
-                cell-index = <2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 6e34f170fa62..39ff4c829caf 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -289,6 +289,8 @@
                 reg = <0xe0100000 0x480>;
                 brg-frequency = <0>;
                 bus-frequency = <396000000>;
+                fsl,qe-num-riscs = <2>;
+                fsl,qe-num-snums = <28>;
 
                 muram@10000 {
                         #address-cells = <1>;
@@ -410,7 +412,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index 37b789510d68..6315d6fcc58a 100644
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -198,6 +198,8 @@
                         clock-frequency = <0>;
                         bus-frequency = <0>;
                         brg-frequency = <0>;
+                        fsl,qe-num-riscs = <2>;
+                        fsl,qe-num-snums = <28>;
 
                         muram@10000 {
                                 #address-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index 963708017e6c..67bb372c9451 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -383,7 +383,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <0>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
index 651ff2f9db2d..a955a577db81 100644
--- a/arch/powerpc/boot/dts/mpc8378_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -367,7 +367,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <0>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index d6f208b8297a..d266ddbfc28d 100644
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -397,7 +397,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <0>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
index b31c5041350b..e781ad2f1f8a 100644
--- a/arch/powerpc/boot/dts/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -51,9 +51,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xffe00000 0x100000>;
-                reg = <0xffe00000 0x1000>;
                 bus-frequency = <0>;            // Filled out by uboot.
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <12>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8536-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8536-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -321,7 +333,6 @@
         };
 
         pci0: pci@ffe08000 {
-                cell-index = <0>;
                 compatible = "fsl,mpc8540-pci";
                 device_type = "pci";
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
@@ -346,7 +357,6 @@
         };
 
         pci1: pcie@ffe09000 {
-                cell-index = <1>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -383,7 +393,6 @@
         };
 
         pci2: pcie@ffe0a000 {
-                cell-index = <2>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -420,7 +429,6 @@
         };
 
         pci3: pcie@ffe0b000 {
-                cell-index = <3>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index ddd67be10b03..9dc292962a9a 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -55,9 +55,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x100000>;    // CCSRBAR 1M
                 bus-frequency = <0>;
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8540-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,8540-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -258,7 +270,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index e45097f44fbd..9a3ad311aedf 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -55,9 +55,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x1000>;      // CCSRBAR 1M
                 bus-frequency = <0>;
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8541-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,8541-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -272,7 +284,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 interrupt-map-mask = <0x1f800 0x0 0x0 0x7>;
                 interrupt-map = <
 
@@ -344,7 +355,6 @@
         };
 
         pci1: pci@e0009000 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 7c6932be0197..98e94b465662 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -57,9 +57,21 @@
                 compatible = "simple-bus";
 
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x1000>;      // CCSRBAR 1M
                 bus-frequency = <0>;            // Filled out by uboot.
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8544-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,8544-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -274,7 +286,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 compatible = "fsl,mpc8540-pci";
                 device_type = "pci";
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
@@ -306,7 +317,6 @@
         };
 
         pci1: pcie@e0009000 {
-                cell-index = <1>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -343,7 +353,6 @@
         };
 
         pci2: pcie@e000a000 {
-                cell-index = <2>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -380,7 +389,6 @@
         };
 
         pci3: pcie@e000b000 {
-                cell-index = <3>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index 804e90353293..475be1433fe1 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -60,9 +60,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x1000>;      // CCSRBAR
                 bus-frequency = <0>;
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8548-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,8548-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -328,7 +340,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                         /* IDSEL 0x4 (PCIX Slot 2) */
@@ -478,7 +489,6 @@
         };
 
         pci1: pci@e0009000 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
@@ -503,7 +513,6 @@
         };
 
         pci2: pcie@e000a000 {
-                cell-index = <2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 9484f0729b10..065b2f093de2 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -55,9 +55,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x1000>;      // CCSRBAR 1M
                 bus-frequency = <0>;
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8555-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,8555-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -272,7 +284,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 interrupt-map-mask = <0x1f800 0x0 0x0 0x7>;
                 interrupt-map = <
 
@@ -344,7 +355,6 @@
         };
 
         pci1: pci@e0009000 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index cc2acf87d02f..a5bb1ec70a5a 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -55,9 +55,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x200>;
                 bus-frequency = <330000000>;
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8560-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,8540-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -291,7 +303,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 9d52e3b25047..00c2bbda7013 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -26,6 +26,7 @@
                 serial1 = &serial1;
                 pci0 = &pci0;
                 pci1 = &pci1;
+                rapidio0 = &rio0;
         };
 
         cpus {
@@ -62,9 +63,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x1000>;
                 bus-frequency = <0>;
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8568-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,8568-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -275,6 +288,22 @@
                         device_type = "open-pic";
                 };
 
+                msi@41600 {
+                        compatible = "fsl,mpc8568-msi", "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 par_io@e0100 {
                         reg = <0xe0100 0x100>;
                         device_type = "par_io";
@@ -349,6 +378,8 @@
                 reg = <0xe0080000 0x480>;
                 brg-frequency = <0>;
                 bus-frequency = <396000000>;
+                fsl,qe-num-riscs = <2>;
+                fsl,qe-num-snums = <28>;
 
                 muram@10000 {
                         #address-cells = <1>;
@@ -459,7 +490,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                         /* IDSEL 0x12 AD18 */
@@ -490,7 +520,6 @@
 
         /* PCI Express */
         pci1: pcie@e000a000 {
-                cell-index = <2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
@@ -526,4 +555,20 @@
                                   0x0 0x800000>;
                 };
         };
+
+        rio0: rapidio@e00c00000 {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                compatible = "fsl,mpc8568-rapidio", "fsl,rapidio-delta";
+                reg = <0xe00c0000 0x20000>;
+                ranges = <0x0 0x0 0xc0000000 0x0 0x20000000>;
+                interrupts = <48 2 /* error     */
+                              49 2 /* bell_outb */
+                              50 2 /* bell_inb  */
+                              53 2 /* msg1_tx   */
+                              54 2 /* msg1_rx   */
+                              55 2 /* msg2_tx   */
+                              56 2 /* msg2_rx   */>;
+                interrupt-parent = <&mpic>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts
new file mode 100644
index 000000000000..39c2927503cf
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -0,0 +1,583 @@
+/*
+ * MPC8569E MDS Device Tree Source
+ *
+ * Copyright (C) 2009 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "MPC8569EMDS";
+        compatible = "fsl,MPC8569EMDS";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                serial0 = &serial0;
+                serial1 = &serial1;
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+                pci1 = &pci1;
+                rapidio0 = &rio0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8569@0 {
+                        device_type = "cpu";
+                        reg = <0x0>;
+                        d-cache-line-size = <32>;       // 32 bytes
+                        i-cache-line-size = <32>;       // 32 bytes
+                        d-cache-size = <0x8000>;                // L1, 32K
+                        i-cache-size = <0x8000>;                // L1, 32K
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+        };
+
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8569-elbc", "fsl,elbc", "simple-bus";
+                reg = <0xe0005000 0x1000>;
+                interrupts = <19 2>;
+                interrupt-parent = <&mpic>;
+
+                ranges = <0x0 0x0 0xfe000000 0x02000000
+                          0x1 0x0 0xf8000000 0x00008000
+                          0x2 0x0 0xf0000000 0x04000000
+                          0x3 0x0 0xfc000000 0x00008000
+                          0x4 0x0 0xf8008000 0x00008000
+                          0x5 0x0 0xf8010000 0x00008000>;
+
+                nor@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x02000000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                bcsr@1,0 {
+                        compatible = "fsl,mpc8569mds-bcsr";
+                        reg = <1 0 0x8000>;
+                };
+
+                nand@3,0 {
+                        compatible = "fsl,mpc8569-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <3 0 0x8000>;
+                };
+
+                pib@4,0 {
+                        compatible = "fsl,mpc8569mds-pib";
+                        reg = <4 0 0x8000>;
+                };
+
+                pib@5,0 {
+                        compatible = "fsl,mpc8569mds-pib";
+                        reg = <5 0 0x8000>;
+                };
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "fsl,mpc8569-immr", "simple-bus";
+                ranges = <0x0 0xe0000000 0x100000>;
+                bus-frequency = <0>;
+
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8569-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                memory-controller@2000 {
+                        compatible = "fsl,mpc8569-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <0x68>;
+                        };
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                L2: l2-cache-controller@20000 {
+                        compatible = "fsl,mpc8569-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>; // 32 bytes
+                        cache-size = <0x80000>; // L2, 512K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8569-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8569-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8569-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8569-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8569-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                sdhci@2e000 {
+                        compatible = "fsl,mpc8569-esdhc", "fsl,esdhc";
+                        reg = <0x2e000 0x1000>;
+                        interrupts = <72 0x8>;
+                        interrupt-parent = <&mpic>;
+                        /* Filled in by U-Boot */
+                        clock-frequency = <0>;
+                        status = "disabled";
+                };
+
+                crypto@30000 {
+                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
+                                "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2 58 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xbfe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+
+                msi@41600 {
+                        compatible = "fsl,mpc8568-msi", "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {
+                        compatible = "fsl,mpc8569-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+
+                par_io@e0100 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0xe0100 0x100>;
+                        ranges = <0x0 0xe0100 0x100>;
+                        device_type = "par_io";
+                        num-ports = <7>;
+
+                        qe_pio_e: gpio-controller@80 {
+                                #gpio-cells = <2>;
+                                compatible = "fsl,mpc8569-qe-pario-bank",
+                                             "fsl,mpc8323-qe-pario-bank";
+                                reg = <0x80 0x18>;
+                                gpio-controller;
+                        };
+
+                        pio1: ucc_pin@01 {
+                                pio-map = <
+                        /* port  pin  dir  open_drain  assignment  has_irq */
+                                        0x2  0x1f 0x1  0x0  0x1  0x0    /* QE_MUX_MDC */
+                                        0x2  0x1e 0x3  0x0  0x2  0x0    /* QE_MUX_MDIO */
+                                        0x2  0x0b 0x2  0x0  0x1  0x0    /* CLK12*/
+                                        0x0  0x0  0x1  0x0  0x3  0x0    /* ENET1_TXD0_SER1_TXD0 */
+                                        0x0  0x1  0x1  0x0  0x3  0x0    /* ENET1_TXD1_SER1_TXD1 */
+                                        0x0  0x2  0x1  0x0  0x1  0x0    /* ENET1_TXD2_SER1_TXD2 */
+                                        0x0  0x3  0x1  0x0  0x2  0x0    /* ENET1_TXD3_SER1_TXD3 */
+                                        0x0  0x6  0x2  0x0  0x3  0x0    /* ENET1_RXD0_SER1_RXD0 */
+                                        0x0  0x7  0x2  0x0  0x1  0x0    /* ENET1_RXD1_SER1_RXD1 */
+                                        0x0  0x8  0x2  0x0  0x2  0x0    /* ENET1_RXD2_SER1_RXD2 */
+                                        0x0  0x9  0x2  0x0  0x2  0x0    /* ENET1_RXD3_SER1_RXD3 */
+                                        0x0  0x4  0x1  0x0  0x2  0x0    /* ENET1_TX_EN_SER1_RTS_B */
+                                        0x0  0xc  0x2  0x0  0x3  0x0    /* ENET1_RX_DV_SER1_CTS_B */
+                                        0x2  0x8  0x2  0x0  0x1  0x0    /* ENET1_GRXCLK */
+                                        0x2  0x14 0x1  0x0  0x2  0x0>;  /* ENET1_GTXCLK */
+                        };
+
+                        pio2: ucc_pin@02 {
+                                pio-map = <
+                        /* port  pin  dir  open_drain  assignment  has_irq */
+                                        0x2  0x1f 0x1  0x0  0x1  0x0    /* QE_MUX_MDC */
+                                        0x2  0x1e 0x3  0x0  0x2  0x0    /* QE_MUX_MDIO */
+                                        0x2  0x10 0x2  0x0  0x3  0x0    /* CLK17 */
+                                        0x0  0xe  0x1  0x0  0x2  0x0    /* ENET2_TXD0_SER2_TXD0 */
+                                        0x0  0xf  0x1  0x0  0x2  0x0    /* ENET2_TXD1_SER2_TXD1 */
+                                        0x0  0x10 0x1  0x0  0x1  0x0    /* ENET2_TXD2_SER2_TXD2 */
+                                        0x0  0x11 0x1  0x0  0x1  0x0    /* ENET2_TXD3_SER2_TXD3 */
+                                        0x0  0x14 0x2  0x0  0x2  0x0    /* ENET2_RXD0_SER2_RXD0 */
+                                        0x0  0x15 0x2  0x0  0x1  0x0    /* ENET2_RXD1_SER2_RXD1 */
+                                        0x0  0x16 0x2  0x0  0x1  0x0    /* ENET2_RXD2_SER2_RXD2 */
+                                        0x0  0x17 0x2  0x0  0x1  0x0    /* ENET2_RXD3_SER2_RXD3 */
+                                        0x0  0x12 0x1  0x0  0x2  0x0    /* ENET2_TX_EN_SER2_RTS_B */
+                                        0x0  0x1a 0x2  0x0  0x3  0x0    /* ENET2_RX_DV_SER2_CTS_B */
+                                        0x2  0x3  0x2  0x0  0x1  0x0    /* ENET2_GRXCLK */
+                                        0x2  0x2 0x1  0x0  0x2  0x0>;   /* ENET2_GTXCLK */
+                        };
+
+                        pio3: ucc_pin@03 {
+                                pio-map = <
+                        /* port  pin  dir  open_drain  assignment  has_irq */
+                                        0x2  0x1f 0x1  0x0  0x1  0x0    /* QE_MUX_MDC */
+                                        0x2  0x1e 0x3  0x0  0x2  0x0    /* QE_MUX_MDIO */
+                                        0x2  0x0b 0x2  0x0  0x1  0x0    /* CLK12*/
+                                        0x0  0x1d 0x1  0x0  0x2  0x0    /* ENET3_TXD0_SER3_TXD0 */
+                                        0x0  0x1e 0x1  0x0  0x3  0x0    /* ENET3_TXD1_SER3_TXD1 */
+                                        0x0  0x1f 0x1  0x0  0x2  0x0    /* ENET3_TXD2_SER3_TXD2 */
+                                        0x1  0x0  0x1  0x0  0x3  0x0    /* ENET3_TXD3_SER3_TXD3 */
+                                        0x1  0x3  0x2  0x0  0x3  0x0    /* ENET3_RXD0_SER3_RXD0 */
+                                        0x1  0x4  0x2  0x0  0x1  0x0    /* ENET3_RXD1_SER3_RXD1 */
+                                        0x1  0x5  0x2  0x0  0x2  0x0    /* ENET3_RXD2_SER3_RXD2 */
+                                        0x1  0x6  0x2  0x0  0x3  0x0    /* ENET3_RXD3_SER3_RXD3 */
+                                        0x1  0x1  0x1  0x0  0x1  0x0    /* ENET3_TX_EN_SER3_RTS_B */
+                                        0x1  0x9  0x2  0x0  0x3  0x0    /* ENET3_RX_DV_SER3_CTS_B */
+                                        0x2  0x9  0x2  0x0  0x2  0x0    /* ENET3_GRXCLK */
+                                        0x2  0x19 0x1  0x0  0x2  0x0>;  /* ENET3_GTXCLK */
+                        };
+
+                        pio4: ucc_pin@04 {
+                                pio-map = <
+                        /* port  pin  dir  open_drain  assignment  has_irq */
+                                        0x2  0x1f 0x1  0x0  0x1  0x0    /* QE_MUX_MDC */
+                                        0x2  0x1e 0x3  0x0  0x2  0x0    /* QE_MUX_MDIO */
+                                        0x2  0x10 0x2  0x0  0x3  0x0    /* CLK17 */
+                                        0x1  0xc  0x1  0x0  0x2  0x0    /* ENET4_TXD0_SER4_TXD0 */
+                                        0x1  0xd  0x1  0x0  0x2  0x0    /* ENET4_TXD1_SER4_TXD1 */
+                                        0x1  0xe  0x1  0x0  0x1  0x0    /* ENET4_TXD2_SER4_TXD2 */
+                                        0x1  0xf  0x1  0x0  0x2  0x0    /* ENET4_TXD3_SER4_TXD3 */
+                                        0x1  0x12 0x2  0x0  0x2  0x0    /* ENET4_RXD0_SER4_RXD0 */
+                                        0x1  0x13 0x2  0x0  0x1  0x0    /* ENET4_RXD1_SER4_RXD1 */
+                                        0x1  0x14 0x2  0x0  0x1  0x0    /* ENET4_RXD2_SER4_RXD2 */
+                                        0x1  0x15 0x2  0x0  0x2  0x0    /* ENET4_RXD3_SER4_RXD3 */
+                                        0x1  0x10 0x1  0x0  0x2  0x0    /* ENET4_TX_EN_SER4_RTS_B */
+                                        0x1  0x18 0x2  0x0  0x3  0x0    /* ENET4_RX_DV_SER4_CTS_B */
+                                        0x2  0x11 0x2  0x0  0x2  0x0    /* ENET4_GRXCLK */
+                                        0x2  0x18 0x1  0x0  0x2  0x0>;  /* ENET4_GTXCLK */
+                        };
+                };
+        };
+
+        qe@e0080000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "qe";
+                compatible = "fsl,qe";
+                ranges = <0x0 0xe0080000 0x40000>;
+                reg = <0xe0080000 0x480>;
+                brg-frequency = <0>;
+                bus-frequency = <0>;
+                fsl,qe-num-riscs = <4>;
+                fsl,qe-num-snums = <46>;
+
+                qeic: interrupt-controller@80 {
+                        interrupt-controller;
+                        compatible = "fsl,qe-ic";
+                        #address-cells = <0>;
+                        #interrupt-cells = <1>;
+                        reg = <0x80 0x80>;
+                        interrupts = <46 2 46 2>; //high:30 low:30
+                        interrupt-parent = <&mpic>;
+                };
+
+                spi@4c0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc8569-qe-spi", "fsl,spi";
+                        reg = <0x4c0 0x40>;
+                        cell-index = <0>;
+                        interrupts = <2>;
+                        interrupt-parent = <&qeic>;
+                        gpios = <&qe_pio_e 30 0>;
+                        mode = "cpu-qe";
+
+                        serial-flash@0 {
+                                compatible = "stm,m25p40";
+                                reg = <0>;
+                                spi-max-frequency = <25000000>;
+                        };
+                };
+
+                spi@500 {
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
+                        reg = <0x500 0x40>;
+                        interrupts = <1>;
+                        interrupt-parent = <&qeic>;
+                        mode = "cpu";
+                };
+
+                enet0: ucc@2000 {
+                        device_type = "network";
+                        compatible = "ucc_geth";
+                        cell-index = <1>;
+                        reg = <0x2000 0x200>;
+                        interrupts = <32>;
+                        interrupt-parent = <&qeic>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk12";
+                        pio-handle = <&pio1>;
+                        phy-handle = <&qe_phy0>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                mdio@2120 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x2120 0x18>;
+                        compatible = "fsl,ucc-mdio";
+
+                        qe_phy0: ethernet-phy@07 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <1 1>;
+                                reg = <0x7>;
+                                device_type = "ethernet-phy";
+                        };
+                        qe_phy1: ethernet-phy@01 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <2 1>;
+                                reg = <0x1>;
+                                device_type = "ethernet-phy";
+                        };
+                        qe_phy2: ethernet-phy@02 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <3 1>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                        qe_phy3: ethernet-phy@03 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <4 1>;
+                                reg = <0x3>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                enet2: ucc@2200 {
+                        device_type = "network";
+                        compatible = "ucc_geth";
+                        cell-index = <3>;
+                        reg = <0x2200 0x200>;
+                        interrupts = <34>;
+                        interrupt-parent = <&qeic>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk12";
+                        pio-handle = <&pio3>;
+                        phy-handle = <&qe_phy2>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                enet1: ucc@3000 {
+                        device_type = "network";
+                        compatible = "ucc_geth";
+                        cell-index = <2>;
+                        reg = <0x3000 0x200>;
+                        interrupts = <33>;
+                        interrupt-parent = <&qeic>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk17";
+                        pio-handle = <&pio2>;
+                        phy-handle = <&qe_phy1>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                enet3: ucc@3200 {
+                        device_type = "network";
+                        compatible = "ucc_geth";
+                        cell-index = <4>;
+                        reg = <0x3200 0x200>;
+                        interrupts = <35>;
+                        interrupt-parent = <&qeic>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk17";
+                        pio-handle = <&pio4>;
+                        phy-handle = <&qe_phy3>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                muram@10000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
+                        ranges = <0x0 0x10000 0x20000>;
+
+                        data-only@0 {
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
+                                reg = <0x0 0x20000>;
+                        };
+                };
+
+        };
+
+        /* PCI Express */
+        pci1: pcie@e000a000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe000a000 0x1000>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 (PEX) */
+                        00000 0x0 0x0 0x1 &mpic 0x0 0x1
+                        00000 0x0 0x0 0x2 &mpic 0x1 0x1
+                        00000 0x0 0x0 0x3 &mpic 0x2 0x1
+                        00000 0x0 0x0 0x4 &mpic 0x3 0x1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <26 2>;
+                bus-range = <0 255>;
+                ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x1000000 0x0 0x00000000 0xe2800000 0x0 0x00800000>;
+                clock-frequency = <33333333>;
+                pcie@0 {
+                        reg = <0x0 0x0 0x0 0x0 0x0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x2000000 0x0 0xa0000000
+                                  0x2000000 0x0 0xa0000000
+                                  0x0 0x10000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x800000>;
+                };
+        };
+
+        rio0: rapidio@e00c00000 {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                compatible = "fsl,mpc8569-rapidio", "fsl,rapidio-delta";
+                reg = <0xe00c0000 0x20000>;
+                ranges = <0x0 0x0 0xc0000000 0x0 0x20000000>;
+                interrupts = <48 2 /* error     */
+                              49 2 /* bell_outb */
+                              50 2 /* bell_inb  */
+                              53 2 /* msg1_tx   */
+                              54 2 /* msg1_rx   */
+                              55 2 /* msg2_tx   */
+                              56 2 /* msg2_rx   */>;
+                interrupt-parent = <&mpic>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index 6e79a4169088..cafc1285c140 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -182,9 +182,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0 0xffe00000 0x100000>;
-                reg = <0 0xffe00000 0 0x1000>;  // CCSRBAR & soc regs, remove once parse code for immrbase fixed
                 bus-frequency = <0>;            // Filled out by uboot.
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <12>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8572-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8572-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -514,7 +526,6 @@
         };
 
         pci0: pcie@ffe08000 {
-                cell-index = <0>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -724,7 +735,6 @@
         };
 
         pci1: pcie@ffe09000 {
-                cell-index = <1>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -761,7 +771,6 @@
         };
 
         pci2: pcie@ffe0a000 {
-                cell-index = <2>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8572ds_36b.dts b/arch/powerpc/boot/dts/mpc8572ds_36b.dts
index dbd81a764742..f6365db3b97d 100644
--- a/arch/powerpc/boot/dts/mpc8572ds_36b.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds_36b.dts
@@ -182,9 +182,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xf 0xffe00000 0x100000>;
-                reg = <0xf 0xffe00000 0 0x1000>;        // CCSRBAR & soc regs, remove once parse code for immrbase fixed
                 bus-frequency = <0>;            // Filled out by uboot.
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <12>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8572-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8572-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -514,7 +526,6 @@
         };
 
         pci0: pcie@fffe08000 {
-                cell-index = <0>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -522,7 +533,7 @@
                 #address-cells = <3>;
                 reg = <0xf 0xffe08000 0 0x1000>;
                 bus-range = <0 255>;
-                ranges = <0x2000000 0x0 0xc0000000 0xc 0x00000000 0x0 0x20000000
+                ranges = <0x2000000 0x0 0xe0000000 0xc 0x00000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x00010000>;
                 clock-frequency = <33333333>;
                 interrupt-parent = <&mpic>;
@@ -649,8 +660,8 @@
                         #size-cells = <2>;
                         #address-cells = <3>;
                         device_type = "pci";
-                        ranges = <0x2000000 0x0 0xc0000000
-                                  0x2000000 0x0 0xc0000000
+                        ranges = <0x2000000 0x0 0xe0000000
+                                  0x2000000 0x0 0xe0000000
                                   0x0 0x20000000
 
                                   0x1000000 0x0 0x0
@@ -660,8 +671,8 @@
                                 reg = <0x0 0x0 0x0 0x0 0x0>;
                                 #size-cells = <2>;
                                 #address-cells = <3>;
-                                ranges = <0x2000000 0x0 0xc0000000
-                                          0x2000000 0x0 0xc0000000
+                                ranges = <0x2000000 0x0 0xe0000000
+                                          0x2000000 0x0 0xe0000000
                                           0x0 0x20000000
 
                                           0x1000000 0x0 0x0
@@ -724,7 +735,6 @@
         };
 
         pci1: pcie@fffe09000 {
-                cell-index = <1>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -732,7 +742,7 @@
                 #address-cells = <3>;
                 reg = <0xf 0xffe09000 0 0x1000>;
                 bus-range = <0 255>;
-                ranges = <0x2000000 0x0 0xc0000000 0xc 0x20000000 0x0 0x20000000
+                ranges = <0x2000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x00010000>;
                 clock-frequency = <33333333>;
                 interrupt-parent = <&mpic>;
@@ -750,8 +760,8 @@
                         #size-cells = <2>;
                         #address-cells = <3>;
                         device_type = "pci";
-                        ranges = <0x2000000 0x0 0xc0000000
-                                  0x2000000 0x0 0xc0000000
+                        ranges = <0x2000000 0x0 0xe0000000
+                                  0x2000000 0x0 0xe0000000
                                   0x0 0x20000000
 
                                   0x1000000 0x0 0x0
@@ -761,7 +771,6 @@
         };
 
         pci2: pcie@fffe0a000 {
-                cell-index = <2>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -769,7 +778,7 @@
                 #address-cells = <3>;
                 reg = <0xf 0xffe0a000 0 0x1000>;
                 bus-range = <0 255>;
-                ranges = <0x2000000 0x0 0xc0000000 0xc 0x40000000 0x0 0x20000000
+                ranges = <0x2000000 0x0 0xe0000000 0xc 0x40000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0xf 0xffc20000 0x0 0x00010000>;
                 clock-frequency = <33333333>;
                 interrupt-parent = <&mpic>;
@@ -787,8 +796,8 @@
                         #size-cells = <2>;
                         #address-cells = <3>;
                         device_type = "pci";
-                        ranges = <0x2000000 0x0 0xc0000000
-                                  0x2000000 0x0 0xc0000000
+                        ranges = <0x2000000 0x0 0xe0000000
+                                  0x2000000 0x0 0xe0000000
                                   0x0 0x20000000
 
                                   0x1000000 0x0 0x0
diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts
index 2bc0c7189653..5bd1011fde96 100644
--- a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts
@@ -59,9 +59,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xffe00000 0x100000>;
-                reg = <0xffe00000 0x1000>;      // CCSRBAR & soc regs, remove once parse code for immrbase fixed
                 bus-frequency = <0>;            // Filled out by uboot.
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <12>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8572-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8572-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -238,7 +250,6 @@
         };
 
         pci0: pcie@ffe08000 {
-                cell-index = <0>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -448,7 +459,6 @@
         };
 
         pci1: pcie@ffe09000 {
-                cell-index = <1>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts
index 159cb3a875f0..0efc3456e297 100644
--- a/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts
@@ -58,7 +58,6 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x0 0xffe00000 0x100000>;
-                reg = <0xffe00000 0x1000>;      // CCSRBAR & soc regs, remove once parse code for immrbase fixed
                 bus-frequency = <0>;            // Filled out by uboot.
 
                 L2: l2-cache-controller@20000 {
@@ -196,7 +195,6 @@
         };
 
         pci2: pcie@ffe0a000 {
-                cell-index = <2>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index 1bd3ebe11437..cfc2c60d1f5f 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -112,9 +112,21 @@
                 device_type = "soc";
                 compatible = "fsl,mpc8610-immr", "simple-bus";
                 ranges = <0x0 0xe0000000 0x00100000>;
-                reg = <0xe0000000 0x1000>;
                 bus-frequency = <0>;
 
+                mcm-law@0 {
+                        compatible = "fsl,mcm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                mcm@1000 {
+                        compatible = "fsl,mpc8610-mcm", "fsl,mcm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -316,7 +328,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 compatible = "fsl,mpc8610-pci";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -346,7 +357,6 @@
         };
 
         pci1: pcie@e000a000 {
-                cell-index = <1>;
                 compatible = "fsl,mpc8641-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index d72beb192460..848320e4d3c4 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -114,9 +114,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x00000000 0xffe00000 0x00100000>;
-                reg = <0xffe00000 0x00001000>;  // CCSRBAR
                 bus-frequency = <0>;
 
+                mcm-law@0 {
+                        compatible = "fsl,mcm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                mcm@1000 {
+                        compatible = "fsl,mpc8641-mcm", "fsl,mcm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -357,7 +369,6 @@
         };
 
         pci0: pcie@ffe08000 {
-                cell-index = <0>;
                 compatible = "fsl,mpc8641-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -566,7 +577,6 @@
         };
 
         pci1: pcie@ffe09000 {
-                cell-index = <1>;
                 compatible = "fsl,mpc8641-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts
new file mode 100644
index 000000000000..8be8e701e1d3
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts
@@ -0,0 +1,609 @@
+/*
+ * MPC8641 HPCN Device Tree Source
+ *
+ * Copyright 2008-2009 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "MPC8641HPCN";
+        compatible = "fsl,mpc8641hpcn";
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8641@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;       // 32 bytes
+                        i-cache-line-size = <32>;       // 32 bytes
+                        d-cache-size = <32768>;         // L1, 32K
+                        i-cache-size = <32768>;         // L1, 32K
+                        timebase-frequency = <0>;       // 33 MHz, from uboot
+                        bus-frequency = <0>;            // From uboot
+                        clock-frequency = <0>;          // From uboot
+                };
+                PowerPC,8641@1 {
+                        device_type = "cpu";
+                        reg = <1>;
+                        d-cache-line-size = <32>;       // 32 bytes
+                        i-cache-line-size = <32>;       // 32 bytes
+                        d-cache-size = <32768>;         // L1, 32K
+                        i-cache-size = <32768>;         // L1, 32K
+                        timebase-frequency = <0>;       // 33 MHz, from uboot
+                        bus-frequency = <0>;            // From uboot
+                        clock-frequency = <0>;          // From uboot
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x0 0x00000000 0x0 0x40000000>;  // 1G at 0x0
+        };
+
+        localbus@fffe05000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8641-localbus", "simple-bus";
+                reg = <0x0f 0xffe05000 0x0 0x1000>;
+                interrupts = <19 2>;
+                interrupt-parent = <&mpic>;
+
+                ranges = <0 0 0xf 0xef800000 0x00800000
+                          2 0 0xf 0xffdf8000 0x00008000
+                          3 0 0xf 0xffdf0000 0x00008000>;
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x00800000>;
+                        bank-width = <2>;
+                        device-width = <2>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        partition@0 {
+                                label = "kernel";
+                                reg = <0x00000000 0x00300000>;
+                        };
+                        partition@300000 {
+                                label = "firmware b";
+                                reg = <0x00300000 0x00100000>;
+                                read-only;
+                        };
+                        partition@400000 {
+                                label = "fs";
+                                reg = <0x00400000 0x00300000>;
+                        };
+                        partition@700000 {
+                                label = "firmware a";
+                                reg = <0x00700000 0x00100000>;
+                                read-only;
+                        };
+                };
+        };
+
+        soc8641@fffe00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "simple-bus";
+                ranges = <0x00000000 0x0f 0xffe00000 0x00100000>;
+                bus-frequency = <0>;
+
+                mcm-law@0 {
+                        compatible = "fsl,mcm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                mcm@1000 {
+                        compatible = "fsl,mpc8641-mcm", "fsl,mcm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8641-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi0>;
+                        phy-handle = <&phy0>;
+                        phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-mdio";
+                                reg = <0x520 0x20>;
+
+                                phy0: ethernet-phy@0 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <0>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy1: ethernet-phy@1 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <1>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy2: ethernet-phy@2 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <2>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy3: ethernet-phy@3 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <3>;
+                                        device_type = "ethernet-phy";
+                                };
+                                tbi0: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
+                };
+
+                enet1: ethernet@25000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        ranges = <0x0 0x25000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <35 2 36 2 40 2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi1>;
+                        phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi1: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
+                };
+
+                enet2: ethernet@26000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <2>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x26000 0x1000>;
+                        ranges = <0x0 0x26000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <31 2 32 2 33 2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi2>;
+                        phy-handle = <&phy2>;
+                        phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi2: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
+                };
+
+                enet3: ethernet@27000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <3>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x27000 0x1000>;
+                        ranges = <0x0 0x27000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <37 2 38 2 39 2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi3>;
+                        phy-handle = <&phy3>;
+                        phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi3: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <28 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+
+                global-utilities@e0000 {
+                        compatible = "fsl,mpc8641-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+        };
+
+        pci0: pcie@fffe08000 {
+                cell-index = <0>;
+                compatible = "fsl,mpc8641-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0x0f 0xffe08000 0x0 0x1000>;
+                bus-range = <0x0 0xff>;
+                ranges = <0x02000000 0x0 0xe0000000 0x0c 0x00000000 0x0 0x20000000
+                          0x01000000 0x0 0x00000000 0x0f 0xffc00000 0x0 0x00010000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <24 2>;
+                interrupt-map-mask = <0xff00 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x11 func 0 - PCI slot 1 */
+                        0x8800 0 0 1 &mpic 2 1
+                        0x8800 0 0 2 &mpic 3 1
+                        0x8800 0 0 3 &mpic 4 1
+                        0x8800 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x11 func 1 - PCI slot 1 */
+                        0x8900 0 0 1 &mpic 2 1
+                        0x8900 0 0 2 &mpic 3 1
+                        0x8900 0 0 3 &mpic 4 1
+                        0x8900 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x11 func 2 - PCI slot 1 */
+                        0x8a00 0 0 1 &mpic 2 1
+                        0x8a00 0 0 2 &mpic 3 1
+                        0x8a00 0 0 3 &mpic 4 1
+                        0x8a00 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x11 func 3 - PCI slot 1 */
+                        0x8b00 0 0 1 &mpic 2 1
+                        0x8b00 0 0 2 &mpic 3 1
+                        0x8b00 0 0 3 &mpic 4 1
+                        0x8b00 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x11 func 4 - PCI slot 1 */
+                        0x8c00 0 0 1 &mpic 2 1
+                        0x8c00 0 0 2 &mpic 3 1
+                        0x8c00 0 0 3 &mpic 4 1
+                        0x8c00 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x11 func 5 - PCI slot 1 */
+                        0x8d00 0 0 1 &mpic 2 1
+                        0x8d00 0 0 2 &mpic 3 1
+                        0x8d00 0 0 3 &mpic 4 1
+                        0x8d00 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x11 func 6 - PCI slot 1 */
+                        0x8e00 0 0 1 &mpic 2 1
+                        0x8e00 0 0 2 &mpic 3 1
+                        0x8e00 0 0 3 &mpic 4 1
+                        0x8e00 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x11 func 7 - PCI slot 1 */
+                        0x8f00 0 0 1 &mpic 2 1
+                        0x8f00 0 0 2 &mpic 3 1
+                        0x8f00 0 0 3 &mpic 4 1
+                        0x8f00 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x12 func 0 - PCI slot 2 */
+                        0x9000 0 0 1 &mpic 3 1
+                        0x9000 0 0 2 &mpic 4 1
+                        0x9000 0 0 3 &mpic 1 1
+                        0x9000 0 0 4 &mpic 2 1
+
+                        /* IDSEL 0x12 func 1 - PCI slot 2 */
+                        0x9100 0 0 1 &mpic 3 1
+                        0x9100 0 0 2 &mpic 4 1
+                        0x9100 0 0 3 &mpic 1 1
+                        0x9100 0 0 4 &mpic 2 1
+
+                        /* IDSEL 0x12 func 2 - PCI slot 2 */
+                        0x9200 0 0 1 &mpic 3 1
+                        0x9200 0 0 2 &mpic 4 1
+                        0x9200 0 0 3 &mpic 1 1
+                        0x9200 0 0 4 &mpic 2 1
+
+                        /* IDSEL 0x12 func 3 - PCI slot 2 */
+                        0x9300 0 0 1 &mpic 3 1
+                        0x9300 0 0 2 &mpic 4 1
+                        0x9300 0 0 3 &mpic 1 1
+                        0x9300 0 0 4 &mpic 2 1
+
+                        /* IDSEL 0x12 func 4 - PCI slot 2 */
+                        0x9400 0 0 1 &mpic 3 1
+                        0x9400 0 0 2 &mpic 4 1
+                        0x9400 0 0 3 &mpic 1 1
+                        0x9400 0 0 4 &mpic 2 1
+
+                        /* IDSEL 0x12 func 5 - PCI slot 2 */
+                        0x9500 0 0 1 &mpic 3 1
+                        0x9500 0 0 2 &mpic 4 1
+                        0x9500 0 0 3 &mpic 1 1
+                        0x9500 0 0 4 &mpic 2 1
+
+                        /* IDSEL 0x12 func 6 - PCI slot 2 */
+                        0x9600 0 0 1 &mpic 3 1
+                        0x9600 0 0 2 &mpic 4 1
+                        0x9600 0 0 3 &mpic 1 1
+                        0x9600 0 0 4 &mpic 2 1
+
+                        /* IDSEL 0x12 func 7 - PCI slot 2 */
+                        0x9700 0 0 1 &mpic 3 1
+                        0x9700 0 0 2 &mpic 4 1
+                        0x9700 0 0 3 &mpic 1 1
+                        0x9700 0 0 4 &mpic 2 1
+
+                        // IDSEL 0x1c  USB
+                        0xe000 0 0 1 &i8259 12 2
+                        0xe100 0 0 2 &i8259 9 2
+                        0xe200 0 0 3 &i8259 10 2
+                        0xe300 0 0 4 &i8259 11 2
+
+                        // IDSEL 0x1d  Audio
+                        0xe800 0 0 1 &i8259 6 2
+
+                        // IDSEL 0x1e Legacy
+                        0xf000 0 0 1 &i8259 7 2
+                        0xf100 0 0 1 &i8259 7 2
+
+                        // IDSEL 0x1f IDE/SATA
+                        0xf800 0 0 1 &i8259 14 2
+                        0xf900 0 0 1 &i8259 5 2
+                        >;
+
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0x0 0xe0000000
+                                  0x02000000 0x0 0xe0000000
+                                  0x0 0x20000000
+
+                                  0x01000000 0x0 0x00000000
+                                  0x01000000 0x0 0x00000000
+                                  0x0 0x00010000>;
+                        uli1575@0 {
+                                reg = <0 0 0 0 0>;
+                                #size-cells = <2>;
+                                #address-cells = <3>;
+                                ranges = <0x02000000 0x0 0xe0000000
+                                          0x02000000 0x0 0xe0000000
+                                          0x0 0x20000000
+                                          0x01000000 0x0 0x00000000
+                                          0x01000000 0x0 0x00000000
+                                          0x0 0x00010000>;
+                                isa@1e {
+                                        device_type = "isa";
+                                        #interrupt-cells = <2>;
+                                        #size-cells = <1>;
+                                        #address-cells = <2>;
+                                        reg = <0xf000 0 0 0 0>;
+                                        ranges = <1 0 0x01000000 0 0
+                                                  0x00001000>;
+                                        interrupt-parent = <&i8259>;
+
+                                        i8259: interrupt-controller@20 {
+                                                reg = <1 0x20 2
+                                                       1 0xa0 2
+                                                       1 0x4d0 2>;
+                                                interrupt-controller;
+                                                device_type = "interrupt-controller";
+                                                #address-cells = <0>;
+                                                #interrupt-cells = <2>;
+                                                compatible = "chrp,iic";
+                                                interrupts = <9 2>;
+                                                interrupt-parent = <&mpic>;
+                                        };
+
+                                        i8042@60 {
+                                                #size-cells = <0>;
+                                                #address-cells = <1>;
+                                                reg = <1 0x60 1 1 0x64 1>;
+                                                interrupts = <1 3 12 3>;
+                                                interrupt-parent =
+                                                        <&i8259>;
+
+                                                keyboard@0 {
+                                                        reg = <0>;
+                                                        compatible = "pnpPNP,303";
+                                                };
+
+                                                mouse@1 {
+                                                        reg = <1>;
+                                                        compatible = "pnpPNP,f03";
+                                                };
+                                        };
+
+                                        rtc@70 {
+                                                compatible =
+                                                        "pnpPNP,b00";
+                                                reg = <1 0x70 2>;
+                                        };
+
+                                        gpio@400 {
+                                                reg = <1 0x400 0x80>;
+                                        };
+                                };
+                        };
+                };
+
+        };
+
+        pci1: pcie@fffe09000 {
+                cell-index = <1>;
+                compatible = "fsl,mpc8641-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0x0f 0xffe09000 0x0 0x1000>;
+                bus-range = <0x0 0xff>;
+                ranges = <0x02000000 0x0 0xe0000000 0x0c 0x20000000 0x0 0x20000000
+                          0x01000000 0x0 0x00000000 0x0f 0xffc10000 0x0 0x00010000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <25 2>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0x0000 0 0 1 &mpic 4 1
+                        0x0000 0 0 2 &mpic 5 1
+                        0x0000 0 0 3 &mpic 6 1
+                        0x0000 0 0 4 &mpic 7 1
+                        >;
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0x0 0xe0000000
+                                  0x02000000 0x0 0xe0000000
+                                  0x0 0x20000000
+
+                                  0x01000000 0x0 0x00000000
+                                  0x01000000 0x0 0x00000000
+                                  0x0 0x00010000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/p2020ds.dts b/arch/powerpc/boot/dts/p2020ds.dts
new file mode 100644
index 000000000000..11019142813c
--- /dev/null
+++ b/arch/powerpc/boot/dts/p2020ds.dts
@@ -0,0 +1,704 @@
+/*
+ * P2020 DS Device Tree Source
+ *
+ * Copyright 2009 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+/ {
+        model = "fsl,P2020";
+        compatible = "fsl,P2020DS";
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+                pci2 = &pci2;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,P2020@0 {
+                        device_type = "cpu";
+                        reg = <0x0>;
+                        next-level-cache = <&L2>;
+                };
+
+                PowerPC,P2020@1 {
+                        device_type = "cpu";
+                        reg = <0x1>;
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+        };
+
+        localbus@ffe05000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,elbc", "simple-bus";
+                reg = <0 0xffe05000 0 0x1000>;
+                interrupts = <19 2>;
+                interrupt-parent = <&mpic>;
+
+                ranges = <0x0 0x0 0x0 0xe8000000 0x08000000
+                          0x1 0x0 0x0 0xe0000000 0x08000000
+                          0x2 0x0 0x0 0xffa00000 0x00040000
+                          0x3 0x0 0x0 0xffdf0000 0x00008000
+                          0x4 0x0 0x0 0xffa40000 0x00040000
+                          0x5 0x0 0x0 0xffa80000 0x00040000
+                          0x6 0x0 0x0 0xffac0000 0x00040000>;
+
+                nor@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x8000000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+
+                        ramdisk@0 {
+                                reg = <0x0 0x03000000>;
+                                read-only;
+                        };
+
+                        diagnostic@3000000 {
+                                reg = <0x03000000 0x00e00000>;
+                                read-only;
+                        };
+
+                        dink@3e00000 {
+                                reg = <0x03e00000 0x00200000>;
+                                read-only;
+                        };
+
+                        kernel@4000000 {
+                                reg = <0x04000000 0x00400000>;
+                                read-only;
+                        };
+
+                        jffs2@4400000 {
+                                reg = <0x04400000 0x03b00000>;
+                        };
+
+                        dtb@7f00000 {
+                                reg = <0x07f00000 0x00080000>;
+                                read-only;
+                        };
+
+                        u-boot@7f80000 {
+                                reg = <0x07f80000 0x00080000>;
+                                read-only;
+                        };
+                };
+
+                nand@2,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,elbc-fcm-nand";
+                        reg = <0x2 0x0 0x40000>;
+
+                        u-boot@0 {
+                                reg = <0x0 0x02000000>;
+                                read-only;
+                        };
+
+                        jffs2@2000000 {
+                                reg = <0x02000000 0x10000000>;
+                        };
+
+                        ramdisk@12000000 {
+                                reg = <0x12000000 0x08000000>;
+                                read-only;
+                        };
+
+                        kernel@1a000000 {
+                                reg = <0x1a000000 0x04000000>;
+                        };
+
+                        dtb@1e000000 {
+                                reg = <0x1e000000 0x01000000>;
+                                read-only;
+                        };
+
+                        empty@1f000000 {
+                                reg = <0x1f000000 0x21000000>;
+                        };
+                };
+
+                nand@4,0 {
+                        compatible = "fsl,elbc-fcm-nand";
+                        reg = <0x4 0x0 0x40000>;
+                };
+
+                nand@5,0 {
+                        compatible = "fsl,elbc-fcm-nand";
+                        reg = <0x5 0x0 0x40000>;
+                };
+
+                nand@6,0 {
+                        compatible = "fsl,elbc-fcm-nand";
+                        reg = <0x6 0x0 0x40000>;
+                };
+        };
+
+        soc@ffe00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "fsl,p2020-immr", "simple-bus";
+                ranges = <0x0 0 0xffe00000 0x100000>;
+                bus-frequency = <0>;            // Filled out by uboot.
+
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <12>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,p2020-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                memory-controller@2000 {
+                        compatible = "fsl,p2020-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                spi@7000 {
+                        compatible = "fsl,espi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <59 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                dma@c300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,eloplus-dma";
+                        reg = <0xc300 0x4>;
+                        ranges = <0x0 0xc100 0x200>;
+                        cell-index = <1>;
+                        dma-channel@0 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <76 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <77 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <78 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <79 2>;
+                        };
+                };
+
+                gpio: gpio-controller@f000 {
+                        #gpio-cells = <2>;
+                        compatible = "fsl,mpc8572-gpio";
+                        reg = <0xf000 0x100>;
+                        interrupts = <47 0x2>;
+                        interrupt-parent = <&mpic>;
+                        gpio-controller;
+                };
+
+                L2: l2-cache-controller@20000 {
+                        compatible = "fsl,p2020-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>; // 32 bytes
+                        cache-size = <0x80000>; // L2, 512k
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                usb@22000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl-usb2-dr";
+                        reg = <0x22000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <28 0x2>;
+                        phy_type = "ulpi";
+                };
+
+                enet0: ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi0>;
+                        phy-handle = <&phy0>;
+                        phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-mdio";
+                                reg = <0x520 0x20>;
+
+                                phy0: ethernet-phy@0 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <3 1>;
+                                        reg = <0x0>;
+                                };
+                                phy1: ethernet-phy@1 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <3 1>;
+                                        reg = <0x1>;
+                                };
+                                phy2: ethernet-phy@2 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <3 1>;
+                                        reg = <0x2>;
+                                };
+                                tbi0: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
+                };
+
+                enet1: ethernet@25000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        ranges = <0x0 0x25000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <35 2 36 2 40 2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi1>;
+                        phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi1: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
+                };
+
+                enet2: ethernet@26000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <2>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x26000 0x1000>;
+                        ranges = <0x0 0x26000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <31 2 32 2 33 2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi2>;
+                        phy-handle = <&phy2>;
+                        phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi2: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
+                };
+
+                sdhci@2e000 {
+                        compatible = "fsl,p2020-esdhc", "fsl,esdhc";
+                        reg = <0x2e000 0x1000>;
+                        interrupts = <72 0x2>;
+                        interrupt-parent = <&mpic>;
+                        /* Filled in by U-Boot */
+                        clock-frequency = <0>;
+                };
+
+                crypto@30000 {
+                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
+                                     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2 58 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xbfe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+
+                msi@41600 {
+                        compatible = "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {        //global utilities block
+                        compatible = "fsl,p2020-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+        };
+
+        pci0: pcie@ffe08000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0 0xffe08000 0 0x1000>;
+                bus-range = <0 255>;
+                ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <24 2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x8 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x9 0x1
+                        0000 0x0 0x0 0x3 &mpic 0xa 0x1
+                        0000 0x0 0x0 0x4 &mpic 0xb 0x1
+                        >;
+                pcie@0 {
+                        reg = <0x0 0x0 0x0 0x0 0x0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x2000000 0x0 0x80000000
+                                  0x2000000 0x0 0x80000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x10000>;
+                };
+        };
+
+        pci1: pcie@ffe09000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0 0xffe09000 0 0x1000>;
+                bus-range = <0 255>;
+                ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <25 2>;
+                interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                        // IDSEL 0x11 func 0 - PCI slot 1
+                        0x8800 0x0 0x0 0x1 &i8259 0x9 0x2
+                        0x8800 0x0 0x0 0x2 &i8259 0xa 0x2
+
+                        // IDSEL 0x11 func 1 - PCI slot 1
+                        0x8900 0x0 0x0 0x1 &i8259 0x9 0x2
+                        0x8900 0x0 0x0 0x2 &i8259 0xa 0x2
+
+                        // IDSEL 0x11 func 2 - PCI slot 1
+                        0x8a00 0x0 0x0 0x1 &i8259 0x9 0x2
+                        0x8a00 0x0 0x0 0x2 &i8259 0xa 0x2
+
+                        // IDSEL 0x11 func 3 - PCI slot 1
+                        0x8b00 0x0 0x0 0x1 &i8259 0x9 0x2
+                        0x8b00 0x0 0x0 0x2 &i8259 0xa 0x2
+
+                        // IDSEL 0x11 func 4 - PCI slot 1
+                        0x8c00 0x0 0x0 0x1 &i8259 0x9 0x2
+                        0x8c00 0x0 0x0 0x2 &i8259 0xa 0x2
+
+                        // IDSEL 0x11 func 5 - PCI slot 1
+                        0x8d00 0x0 0x0 0x1 &i8259 0x9 0x2
+                        0x8d00 0x0 0x0 0x2 &i8259 0xa 0x2
+
+                        // IDSEL 0x11 func 6 - PCI slot 1
+                        0x8e00 0x0 0x0 0x1 &i8259 0x9 0x2
+                        0x8e00 0x0 0x0 0x2 &i8259 0xa 0x2
+
+                        // IDSEL 0x11 func 7 - PCI slot 1
+                        0x8f00 0x0 0x0 0x1 &i8259 0x9 0x2
+                        0x8f00 0x0 0x0 0x2 &i8259 0xa 0x2
+
+                        // IDSEL 0x1d  Audio
+                        0xe800 0x0 0x0 0x1 &i8259 0x6 0x2
+
+                        // IDSEL 0x1e Legacy
+                        0xf000 0x0 0x0 0x1 &i8259 0x7 0x2
+                        0xf100 0x0 0x0 0x1 &i8259 0x7 0x2
+
+                        // IDSEL 0x1f IDE/SATA
+                        0xf800 0x0 0x0 0x1 &i8259 0xe 0x2
+                        0xf900 0x0 0x0 0x1 &i8259 0x5 0x2
+                        >;
+
+                pcie@0 {
+                        reg = <0x0 0x0 0x0 0x0 0x0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x2000000 0x0 0xa0000000
+                                  0x2000000 0x0 0xa0000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x10000>;
+                        uli1575@0 {
+                                reg = <0x0 0x0 0x0 0x0 0x0>;
+                                #size-cells = <2>;
+                                #address-cells = <3>;
+                                ranges = <0x2000000 0x0 0xa0000000
+                                          0x2000000 0x0 0xa0000000
+                                          0x0 0x20000000
+
+                                          0x1000000 0x0 0x0
+                                          0x1000000 0x0 0x0
+                                          0x0 0x10000>;
+                                isa@1e {
+                                        device_type = "isa";
+                                        #interrupt-cells = <2>;
+                                        #size-cells = <1>;
+                                        #address-cells = <2>;
+                                        reg = <0xf000 0x0 0x0 0x0 0x0>;
+                                        ranges = <0x1 0x0 0x1000000 0x0 0x0
+                                                  0x1000>;
+                                        interrupt-parent = <&i8259>;
+
+                                        i8259: interrupt-controller@20 {
+                                                reg = <0x1 0x20 0x2
+                                                       0x1 0xa0 0x2
+                                                       0x1 0x4d0 0x2>;
+                                                interrupt-controller;
+                                                device_type = "interrupt-controller";
+                                                #address-cells = <0>;
+                                                #interrupt-cells = <2>;
+                                                compatible = "chrp,iic";
+                                                interrupts = <4 1>;
+                                                interrupt-parent = <&mpic>;
+                                        };
+
+                                        i8042@60 {
+                                                #size-cells = <0>;
+                                                #address-cells = <1>;
+                                                reg = <0x1 0x60 0x1 0x1 0x64 0x1>;
+                                                interrupts = <1 3 12 3>;
+                                                interrupt-parent =
+                                                        <&i8259>;
+
+                                                keyboard@0 {
+                                                        reg = <0x0>;
+                                                        compatible = "pnpPNP,303";
+                                                };
+
+                                                mouse@1 {
+                                                        reg = <0x1>;
+                                                        compatible = "pnpPNP,f03";
+                                                };
+                                        };
+
+                                        rtc@70 {
+                                                compatible = "pnpPNP,b00";
+                                                reg = <0x1 0x70 0x2>;
+                                        };
+
+                                        gpio@400 {
+                                                reg = <0x1 0x400 0x80>;
+                                        };
+                                };
+                        };
+                };
+
+        };
+
+        pci2: pcie@ffe0a000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0 0xffe0a000 0 0x1000>;
+                bus-range = <0 255>;
+                ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <26 2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x0 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x1 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x2 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x3 0x1
+                        >;
+                pcie@0 {
+                        reg = <0x0 0x0 0x0 0x0 0x0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x2000000 0x0 0xc0000000
+                                  0x2000000 0x0 0xc0000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x10000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
index a36dbbc48694..5fb6f6684b0e 100644
--- a/arch/powerpc/boot/dts/sbc8349.dts
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -278,7 +278,6 @@
         };
 
         pci0: pci@e0008500 {
-                cell-index = <1>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
index b1f1416ac998..9eefe00ed253 100644
--- a/arch/powerpc/boot/dts/sbc8548.dts
+++ b/arch/powerpc/boot/dts/sbc8548.dts
@@ -151,10 +151,22 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0x00000000 0xe0000000 0x00100000>;
-                reg = <0xe0000000 0x00001000>;  // CCSRBAR
                 bus-frequency = <0>;
                 compatible = "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8548-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8548-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -350,7 +362,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                         /* IDSEL 0x01 (PCI-X slot) @66MHz */
@@ -380,7 +391,6 @@
         };
 
         pci2: pcie@e000a000 {
-                cell-index = <2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/sbc8560.dts b/arch/powerpc/boot/dts/sbc8560.dts
index c4564b81e473..239d57a55cf4 100644
--- a/arch/powerpc/boot/dts/sbc8560.dts
+++ b/arch/powerpc/boot/dts/sbc8560.dts
@@ -57,9 +57,21 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0x0 0xff700000 0x00100000>;
-                reg = <0xff700000 0x00100000>;
                 clock-frequency = <0>;
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8560-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8560-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -296,7 +308,6 @@
         };
 
         pci0: pci@ff708000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/sbc8641d.dts b/arch/powerpc/boot/dts/sbc8641d.dts
index e3e914e78caa..ee5538feb455 100644
--- a/arch/powerpc/boot/dts/sbc8641d.dts
+++ b/arch/powerpc/boot/dts/sbc8641d.dts
@@ -126,9 +126,21 @@
                 device_type = "soc";
                 compatible = "simple-bus";
                 ranges = <0x00000000 0xf8000000 0x00100000>;
-                reg = <0xf8000000 0x00001000>;  // CCSRBAR
                 bus-frequency = <0>;
 
+                mcm-law@0 {
+                        compatible = "fsl,mcm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                mcm@1000 {
+                        compatible = "fsl,mpc8641-mcm", "fsl,mcm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -371,7 +383,6 @@
         };
 
         pci0: pcie@f8008000 {
-                cell-index = <0>;
                 compatible = "fsl,mpc8641-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -410,7 +421,6 @@
         };
 
         pci1: pcie@f8009000 {
-                cell-index = <1>;
                 compatible = "fsl,mpc8641-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 43cc68bd3192..739dd0da2416 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -199,6 +199,28 @@
                                         };
                                 };
 
+                                ndfc@3,0 {
+                                        compatible = "ibm,ndfc";
+                                        reg = <0x00000003 0x00000000 0x00002000>;
+                                        ccr = <0x00001000>;
+                                        bank-settings = <0x80002222>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+
+                                        nand {
+                                                #address-cells = <1>;
+                                                #size-cells = <1>;
+
+                                                partition@0 {
+                                                        label = "u-boot";
+                                                        reg = <0x00000000 0x00084000>;
+                                                };
+                                                partition@84000 {
+                                                        label = "user";
+                                                        reg = <0x00000000 0x01f7c000>;
+                                                };
+                                        };
+                                };
                         };
 
                         UART0: serial@ef600300 {
diff --git a/arch/powerpc/boot/dts/socrates.dts b/arch/powerpc/boot/dts/socrates.dts
index 7a6ae75a1e57..feb4ef6bd144 100644
--- a/arch/powerpc/boot/dts/socrates.dts
+++ b/arch/powerpc/boot/dts/socrates.dts
@@ -55,10 +55,22 @@
                 device_type = "soc";
 
                 ranges = <0x00000000 0xe0000000 0x00100000>;
-                reg = <0xe0000000 0x00001000>;  // CCSRBAR 1M
                 bus-frequency = <0>;            // Filled in by U-Boot
                 compatible = "fsl,mpc8544-immr", "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8544-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8544-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -314,7 +326,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts
index ea6b15152de3..b670d03fbcd9 100644
--- a/arch/powerpc/boot/dts/stx_gp3_8560.dts
+++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -52,10 +52,22 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0 0xfdf00000 0x100000>;
-                reg = <0xfdf00000 0x1000>;
                 bus-frequency = <0>;
                 compatible = "fsl,mpc8560-immr", "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8560-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8540-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -251,7 +263,6 @@
         };
 
         pci0: pci@fdf08000 {
-                cell-index = <0>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
index b6f1fc6eb960..71347537b83e 100644
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -54,10 +54,22 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x200>;
                 bus-frequency = <0>;
                 compatible = "fsl,mpc8540-immr", "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8540-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8540-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -266,7 +278,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
index fa6a3d54a8a5..b30f63753d41 100644
--- a/arch/powerpc/boot/dts/tqm8541.dts
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -53,10 +53,22 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x200>;
                 bus-frequency = <0>;
                 compatible = "fsl,mpc8541-immr", "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8541-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8540-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -288,7 +300,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 00f7ed7a2455..61f25e15fd66 100644
--- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@ -55,10 +55,22 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0x0 0xa0000000 0x100000>;
-                reg = <0xa0000000 0x1000>;      // CCSRBAR
                 bus-frequency = <0>;
                 compatible = "fsl,mpc8548-immr", "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8548-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8548-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -419,7 +431,6 @@
         };
 
         pci0: pci@a0008000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
@@ -441,7 +452,6 @@
         };
 
         pci1: pcie@a000a000 {
-                cell-index = <2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                         /* IDSEL 0x0 (PEX) */
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts
index 673e4a778ac8..025759c7c955 100644
--- a/arch/powerpc/boot/dts/tqm8548.dts
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@ -55,10 +55,22 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x1000>;      // CCSRBAR
                 bus-frequency = <0>;
                 compatible = "fsl,mpc8548-immr", "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <10>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8548-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8548-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -419,7 +431,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
@@ -441,7 +452,6 @@
         };
 
         pci1: pcie@e000a000 {
-                cell-index = <2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                         /* IDSEL 0x0 (PEX) */
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
index 6a99f1eef7ad..95e287381836 100644
--- a/arch/powerpc/boot/dts/tqm8555.dts
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -53,10 +53,22 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x200>;
                 bus-frequency = <0>;
                 compatible = "fsl,mpc8555-immr", "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8555-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8540-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -288,7 +300,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index b6c2d71defd3..ff70580a8f4c 100644
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -55,10 +55,22 @@
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0x0 0xe0000000 0x100000>;
-                reg = <0xe0000000 0x200>;
                 bus-frequency = <0>;
                 compatible = "fsl,mpc8560-immr", "simple-bus";
 
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <8>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,mpc8560-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
                 memory-controller@2000 {
                         compatible = "fsl,mpc8540-memory-controller";
                         reg = <0x2000 0x1000>;
@@ -359,7 +371,6 @@
         };
 
         pci0: pci@e0008000 {
-                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/virtex440-ml510.dts b/arch/powerpc/boot/dts/virtex440-ml510.dts
new file mode 100644
index 000000000000..81a8dc2c6365
--- /dev/null
+++ b/arch/powerpc/boot/dts/virtex440-ml510.dts
@@ -0,0 +1,465 @@
+/*
+ * Xilinx ML510 Reference Design support
+ *
+ * This DTS file was created for the ml510_bsb1_pcores_ppc440 reference design.
+ * The reference design contains a bug which prevent PCI DMA from working
+ * properly.  A description of the bug is given in the plbv46_pci section. It
+ * needs to be fixed by the user until Xilinx updates their reference design.
+ *
+ * Copyright 2009, Roderick Colenbrander
+ */
+
+/dts-v1/;
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "xlnx,ml510-ref-design", "xlnx,virtex440";
+        dcr-parent = <&ppc440_0>;
+        DDR2_SDRAM_DIMM0: memory@0 {
+                device_type = "memory";
+                reg = < 0x0 0x20000000 >;
+        } ;
+        alias {
+                ethernet0 = &Hard_Ethernet_MAC;
+                serial0 = &RS232_Uart_1;
+        } ;
+        chosen {
+                bootargs = "console=ttyS0 root=/dev/ram";
+                linux,stdout-path = "/plb@0/serial@83e00000";
+        } ;
+        cpus {
+                #address-cells = <1>;
+                #cpus = <0x1>;
+                #size-cells = <0>;
+                ppc440_0: cpu@0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clock-frequency = <300000000>;
+                        compatible = "PowerPC,440", "ibm,ppc440";
+                        d-cache-line-size = <0x20>;
+                        d-cache-size = <0x8000>;
+                        dcr-access-method = "native";
+                        dcr-controller ;
+                        device_type = "cpu";
+                        i-cache-line-size = <0x20>;
+                        i-cache-size = <0x8000>;
+                        model = "PowerPC,440";
+                        reg = <0>;
+                        timebase-frequency = <300000000>;
+                        xlnx,apu-control = <0x2000>;
+                        xlnx,apu-udi-0 = <0x0>;
+                        xlnx,apu-udi-1 = <0x0>;
+                        xlnx,apu-udi-10 = <0x0>;
+                        xlnx,apu-udi-11 = <0x0>;
+                        xlnx,apu-udi-12 = <0x0>;
+                        xlnx,apu-udi-13 = <0x0>;
+                        xlnx,apu-udi-14 = <0x0>;
+                        xlnx,apu-udi-15 = <0x0>;
+                        xlnx,apu-udi-2 = <0x0>;
+                        xlnx,apu-udi-3 = <0x0>;
+                        xlnx,apu-udi-4 = <0x0>;
+                        xlnx,apu-udi-5 = <0x0>;
+                        xlnx,apu-udi-6 = <0x0>;
+                        xlnx,apu-udi-7 = <0x0>;
+                        xlnx,apu-udi-8 = <0x0>;
+                        xlnx,apu-udi-9 = <0x0>;
+                        xlnx,dcr-autolock-enable = <0x1>;
+                        xlnx,dcu-rd-ld-cache-plb-prio = <0x0>;
+                        xlnx,dcu-rd-noncache-plb-prio = <0x0>;
+                        xlnx,dcu-rd-touch-plb-prio = <0x0>;
+                        xlnx,dcu-rd-urgent-plb-prio = <0x0>;
+                        xlnx,dcu-wr-flush-plb-prio = <0x0>;
+                        xlnx,dcu-wr-store-plb-prio = <0x0>;
+                        xlnx,dcu-wr-urgent-plb-prio = <0x0>;
+                        xlnx,dma0-control = <0x0>;
+                        xlnx,dma0-plb-prio = <0x0>;
+                        xlnx,dma0-rxchannelctrl = <0x1010000>;
+                        xlnx,dma0-rxirqtimer = <0x3ff>;
+                        xlnx,dma0-txchannelctrl = <0x1010000>;
+                        xlnx,dma0-txirqtimer = <0x3ff>;
+                        xlnx,dma1-control = <0x0>;
+                        xlnx,dma1-plb-prio = <0x0>;
+                        xlnx,dma1-rxchannelctrl = <0x1010000>;
+                        xlnx,dma1-rxirqtimer = <0x3ff>;
+                        xlnx,dma1-txchannelctrl = <0x1010000>;
+                        xlnx,dma1-txirqtimer = <0x3ff>;
+                        xlnx,dma2-control = <0x0>;
+                        xlnx,dma2-plb-prio = <0x0>;
+                        xlnx,dma2-rxchannelctrl = <0x1010000>;
+                        xlnx,dma2-rxirqtimer = <0x3ff>;
+                        xlnx,dma2-txchannelctrl = <0x1010000>;
+                        xlnx,dma2-txirqtimer = <0x3ff>;
+                        xlnx,dma3-control = <0x0>;
+                        xlnx,dma3-plb-prio = <0x0>;
+                        xlnx,dma3-rxchannelctrl = <0x1010000>;
+                        xlnx,dma3-rxirqtimer = <0x3ff>;
+                        xlnx,dma3-txchannelctrl = <0x1010000>;
+                        xlnx,dma3-txirqtimer = <0x3ff>;
+                        xlnx,endian-reset = <0x0>;
+                        xlnx,generate-plb-timespecs = <0x1>;
+                        xlnx,icu-rd-fetch-plb-prio = <0x0>;
+                        xlnx,icu-rd-spec-plb-prio = <0x0>;
+                        xlnx,icu-rd-touch-plb-prio = <0x0>;
+                        xlnx,interconnect-imask = <0xffffffff>;
+                        xlnx,mplb-allow-lock-xfer = <0x1>;
+                        xlnx,mplb-arb-mode = <0x0>;
+                        xlnx,mplb-awidth = <0x20>;
+                        xlnx,mplb-counter = <0x500>;
+                        xlnx,mplb-dwidth = <0x80>;
+                        xlnx,mplb-max-burst = <0x8>;
+                        xlnx,mplb-native-dwidth = <0x80>;
+                        xlnx,mplb-p2p = <0x0>;
+                        xlnx,mplb-prio-dcur = <0x2>;
+                        xlnx,mplb-prio-dcuw = <0x3>;
+                        xlnx,mplb-prio-icu = <0x4>;
+                        xlnx,mplb-prio-splb0 = <0x1>;
+                        xlnx,mplb-prio-splb1 = <0x0>;
+                        xlnx,mplb-read-pipe-enable = <0x1>;
+                        xlnx,mplb-sync-tattribute = <0x0>;
+                        xlnx,mplb-wdog-enable = <0x1>;
+                        xlnx,mplb-write-pipe-enable = <0x1>;
+                        xlnx,mplb-write-post-enable = <0x1>;
+                        xlnx,num-dma = <0x0>;
+                        xlnx,pir = <0xf>;
+                        xlnx,ppc440mc-addr-base = <0x0>;
+                        xlnx,ppc440mc-addr-high = <0x1fffffff>;
+                        xlnx,ppc440mc-arb-mode = <0x0>;
+                        xlnx,ppc440mc-bank-conflict-mask = <0x1800000>;
+                        xlnx,ppc440mc-control = <0xf810008f>;
+                        xlnx,ppc440mc-max-burst = <0x8>;
+                        xlnx,ppc440mc-prio-dcur = <0x2>;
+                        xlnx,ppc440mc-prio-dcuw = <0x3>;
+                        xlnx,ppc440mc-prio-icu = <0x4>;
+                        xlnx,ppc440mc-prio-splb0 = <0x1>;
+                        xlnx,ppc440mc-prio-splb1 = <0x0>;
+                        xlnx,ppc440mc-row-conflict-mask = <0x7ffe00>;
+                        xlnx,ppcdm-asyncmode = <0x0>;
+                        xlnx,ppcds-asyncmode = <0x0>;
+                        xlnx,user-reset = <0x0>;
+                } ;
+        } ;
+        plb_v46_0: plb@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "xlnx,plb-v46-1.03.a", "simple-bus";
+                ranges ;
+                FLASH: flash@fc000000 {
+                        bank-width = <2>;
+                        compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
+                        reg = < 0xfc000000 0x2000000 >;
+                        xlnx,family = "virtex5";
+                        xlnx,include-datawidth-matching-0 = <0x1>;
+                        xlnx,include-datawidth-matching-1 = <0x0>;
+                        xlnx,include-datawidth-matching-2 = <0x0>;
+                        xlnx,include-datawidth-matching-3 = <0x0>;
+                        xlnx,include-negedge-ioregs = <0x0>;
+                        xlnx,include-plb-ipif = <0x1>;
+                        xlnx,include-wrbuf = <0x1>;
+                        xlnx,max-mem-width = <0x10>;
+                        xlnx,mch-native-dwidth = <0x20>;
+                        xlnx,mch-plb-clk-period-ps = <0x2710>;
+                        xlnx,mch-splb-awidth = <0x20>;
+                        xlnx,mch0-accessbuf-depth = <0x10>;
+                        xlnx,mch0-protocol = <0x0>;
+                        xlnx,mch0-rddatabuf-depth = <0x10>;
+                        xlnx,mch1-accessbuf-depth = <0x10>;
+                        xlnx,mch1-protocol = <0x0>;
+                        xlnx,mch1-rddatabuf-depth = <0x10>;
+                        xlnx,mch2-accessbuf-depth = <0x10>;
+                        xlnx,mch2-protocol = <0x0>;
+                        xlnx,mch2-rddatabuf-depth = <0x10>;
+                        xlnx,mch3-accessbuf-depth = <0x10>;
+                        xlnx,mch3-protocol = <0x0>;
+                        xlnx,mch3-rddatabuf-depth = <0x10>;
+                        xlnx,mem0-width = <0x10>;
+                        xlnx,mem1-width = <0x20>;
+                        xlnx,mem2-width = <0x20>;
+                        xlnx,mem3-width = <0x20>;
+                        xlnx,num-banks-mem = <0x1>;
+                        xlnx,num-channels = <0x2>;
+                        xlnx,priority-mode = <0x0>;
+                        xlnx,synch-mem-0 = <0x0>;
+                        xlnx,synch-mem-1 = <0x0>;
+                        xlnx,synch-mem-2 = <0x0>;
+                        xlnx,synch-mem-3 = <0x0>;
+                        xlnx,synch-pipedelay-0 = <0x2>;
+                        xlnx,synch-pipedelay-1 = <0x2>;
+                        xlnx,synch-pipedelay-2 = <0x2>;
+                        xlnx,synch-pipedelay-3 = <0x2>;
+                        xlnx,tavdv-ps-mem-0 = <0x1adb0>;
+                        xlnx,tavdv-ps-mem-1 = <0x3a98>;
+                        xlnx,tavdv-ps-mem-2 = <0x3a98>;
+                        xlnx,tavdv-ps-mem-3 = <0x3a98>;
+                        xlnx,tcedv-ps-mem-0 = <0x1adb0>;
+                        xlnx,tcedv-ps-mem-1 = <0x3a98>;
+                        xlnx,tcedv-ps-mem-2 = <0x3a98>;
+                        xlnx,tcedv-ps-mem-3 = <0x3a98>;
+                        xlnx,thzce-ps-mem-0 = <0x88b8>;
+                        xlnx,thzce-ps-mem-1 = <0x1b58>;
+                        xlnx,thzce-ps-mem-2 = <0x1b58>;
+                        xlnx,thzce-ps-mem-3 = <0x1b58>;
+                        xlnx,thzoe-ps-mem-0 = <0x1b58>;
+                        xlnx,thzoe-ps-mem-1 = <0x1b58>;
+                        xlnx,thzoe-ps-mem-2 = <0x1b58>;
+                        xlnx,thzoe-ps-mem-3 = <0x1b58>;
+                        xlnx,tlzwe-ps-mem-0 = <0x88b8>;
+                        xlnx,tlzwe-ps-mem-1 = <0x0>;
+                        xlnx,tlzwe-ps-mem-2 = <0x0>;
+                        xlnx,tlzwe-ps-mem-3 = <0x0>;
+                        xlnx,twc-ps-mem-0 = <0x1adb0>;
+                        xlnx,twc-ps-mem-1 = <0x3a98>;
+                        xlnx,twc-ps-mem-2 = <0x3a98>;
+                        xlnx,twc-ps-mem-3 = <0x3a98>;
+                        xlnx,twp-ps-mem-0 = <0x11170>;
+                        xlnx,twp-ps-mem-1 = <0x2ee0>;
+                        xlnx,twp-ps-mem-2 = <0x2ee0>;
+                        xlnx,twp-ps-mem-3 = <0x2ee0>;
+                        xlnx,xcl0-linesize = <0x4>;
+                        xlnx,xcl0-writexfer = <0x1>;
+                        xlnx,xcl1-linesize = <0x4>;
+                        xlnx,xcl1-writexfer = <0x1>;
+                        xlnx,xcl2-linesize = <0x4>;
+                        xlnx,xcl2-writexfer = <0x1>;
+                        xlnx,xcl3-linesize = <0x4>;
+                        xlnx,xcl3-writexfer = <0x1>;
+                } ;
+                Hard_Ethernet_MAC: xps-ll-temac@81c00000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "xlnx,compound";
+                        ethernet@81c00000 {
+                                compatible = "xlnx,xps-ll-temac-1.01.b";
+                                device_type = "network";
+                                interrupt-parent = <&xps_intc_0>;
+                                interrupts = < 8 2 >;
+                                llink-connected = <&Hard_Ethernet_MAC_fifo>;
+                                local-mac-address = [ 02 00 00 00 00 00 ];
+                                reg = < 0x81c00000 0x40 >;
+                                xlnx,bus2core-clk-ratio = <0x1>;
+                                xlnx,phy-type = <0x3>;
+                                xlnx,phyaddr = <0x1>;
+                                xlnx,rxcsum = <0x0>;
+                                xlnx,rxfifo = <0x8000>;
+                                xlnx,temac-type = <0x0>;
+                                xlnx,txcsum = <0x0>;
+                                xlnx,txfifo = <0x8000>;
+                        } ;
+                } ;
+                Hard_Ethernet_MAC_fifo: xps-ll-fifo@81a00000 {
+                        compatible = "xlnx,xps-ll-fifo-1.01.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 6 2 >;
+                        reg = < 0x81a00000 0x10000 >;
+                        xlnx,family = "virtex5";
+                } ;
+                IIC_EEPROM: i2c@81600000 {
+                        compatible = "xlnx,xps-iic-2.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 9 2 >;
+                        reg = < 0x81600000 0x10000 >;
+                        xlnx,clk-freq = <0x5f5e100>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpo-width = <0x1>;
+                        xlnx,iic-freq = <0x186a0>;
+                        xlnx,scl-inertial-delay = <0x5>;
+                        xlnx,sda-inertial-delay = <0x5>;
+                        xlnx,ten-bit-adr = <0x0>;
+                } ;
+                LCD_OPTIONAL: gpio@81420000 {
+                        compatible = "xlnx,xps-gpio-1.00.a";
+                        reg = < 0x81420000 0x10000 >;
+                        xlnx,all-inputs = <0x0>;
+                        xlnx,all-inputs-2 = <0x0>;
+                        xlnx,dout-default = <0x0>;
+                        xlnx,dout-default-2 = <0x0>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpio-width = <0xb>;
+                        xlnx,interrupt-present = <0x0>;
+                        xlnx,is-bidir = <0x1>;
+                        xlnx,is-bidir-2 = <0x1>;
+                        xlnx,is-dual = <0x0>;
+                        xlnx,tri-default = <0xffffffff>;
+                        xlnx,tri-default-2 = <0xffffffff>;
+                } ;
+                LEDs_4Bit: gpio@81400000 {
+                        compatible = "xlnx,xps-gpio-1.00.a";
+                        reg = < 0x81400000 0x10000 >;
+                        xlnx,all-inputs = <0x0>;
+                        xlnx,all-inputs-2 = <0x0>;
+                        xlnx,dout-default = <0x0>;
+                        xlnx,dout-default-2 = <0x0>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpio-width = <0x4>;
+                        xlnx,interrupt-present = <0x0>;
+                        xlnx,is-bidir = <0x1>;
+                        xlnx,is-bidir-2 = <0x1>;
+                        xlnx,is-dual = <0x0>;
+                        xlnx,tri-default = <0xffffffff>;
+                        xlnx,tri-default-2 = <0xffffffff>;
+                } ;
+                RS232_Uart_1: serial@83e00000 {
+                        clock-frequency = <100000000>;
+                        compatible = "xlnx,xps-uart16550-2.00.b", "ns16550";
+                        current-speed = <9600>;
+                        device_type = "serial";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 11 2 >;
+                        reg = < 0x83e00000 0x10000 >;
+                        reg-offset = <0x1003>;
+                        reg-shift = <2>;
+                        xlnx,family = "virtex5";
+                        xlnx,has-external-rclk = <0x0>;
+                        xlnx,has-external-xin = <0x0>;
+                        xlnx,is-a-16550 = <0x1>;
+                } ;
+                SPI_EEPROM: xps-spi@feff8000 {
+                        compatible = "xlnx,xps-spi-2.00.b";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 10 2 >;
+                        reg = < 0xfeff8000 0x80 >;
+                        xlnx,family = "virtex5";
+                        xlnx,fifo-exist = <0x1>;
+                        xlnx,num-ss-bits = <0x1>;
+                        xlnx,num-transfer-bits = <0x8>;
+                        xlnx,sck-ratio = <0x80>;
+                } ;
+                SysACE_CompactFlash: sysace@83600000 {
+                        compatible = "xlnx,xps-sysace-1.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 7 2 >;
+                        reg = < 0x83600000 0x10000 >;
+                        xlnx,family = "virtex5";
+                        xlnx,mem-width = <0x10>;
+                } ;
+                plbv46_pci_0: plbv46-pci@85e00000 {
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "xlnx,plbv46-pci-1.03.a";
+                        device_type = "pci";
+                        reg = < 0x85e00000 0x10000 >;
+
+                        /*
+                         * The default ML510 BSB has C_IPIFBAR2PCIBAR_0 set to
+                         * 0 which means that a read/write to the memory mapped
+                         * i/o region (which starts at 0xa0000000) for pci
+                         * bar 0 on the plb side translates to 0.
+                         * It is important to set this value to 0xa0000000, so
+                         * that inbound and outbound pci transactions work
+                         * properly including DMA.
+                         */
+                        ranges = <0x02000000 0 0xa0000000 0xa0000000 0 0x20000000
+                                  0x01000000 0 0x00000000 0xf0000000 0 0x00010000>;
+
+                        #interrupt-cells = <1>;
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
+                        interrupt-map = <
+                                /* IRQ mapping for pci slots and ALI M1533
+                                 * periperhals. In total there are 5 interrupt
+                                 * lines connected to a xps_intc controller.
+                                 * Four of them are PCI IRQ A, B, C, D and
+                                 * which correspond to respectively xpx_intc
+                                 * 5, 4, 3 and 2.  The fifth interrupt line is
+                                 * connected to the south bridge and this one
+                                 * uses irq 1 and is active high instead of
+                                 * active low.
+                                 *
+                                 * The M1533 contains various peripherals
+                                 * including AC97 audio, a modem, USB, IDE and
+                                 * some power management stuff. The modem
+                                 * isn't connected on the ML510 and the power
+                                 * management core also isn't used.
+                                 */
+
+                                /* IDSEL 0x16 / dev=6, bus=0 / PCI slot 3 */
+                                0x3000 0 0 1 &xps_intc_0 3 2
+                                0x3000 0 0 2 &xps_intc_0 2 2
+                                0x3000 0 0 3 &xps_intc_0 5 2
+                                0x3000 0 0 4 &xps_intc_0 4 2
+
+                                /* IDSEL 0x13 / dev=3, bus=1 / PCI slot 4 */
+                                /*
+                                0x11800 0 0 1 &xps_intc_0 5 0 2
+                                0x11800 0 0 2 &xps_intc_0 4 0 2
+                                0x11800 0 0 3 &xps_intc_0 3 0 2
+                                0x11800 0 0 4 &xps_intc_0 2 0 2
+                                */
+
+                                /* According to the datasheet + schematic
+                                 * ABCD [FPGA] of slot 5 is mapped to DABC.
+                                 * Testing showed that at least A maps to B,
+                                 * the mapping of the other pins is a guess
+                                 * and for that reason the lines have been
+                                 * commented out.
+                                 */
+                                /* IDSEL 0x15 / dev=5, bus=0 / PCI slot 5 */
+                                0x2800 0 0 1 &xps_intc_0 4 2
+                                /*
+                                0x2800 0 0 2 &xps_intc_0 3 2
+                                0x2800 0 0 3 &xps_intc_0 2 2
+                                0x2800 0 0 4 &xps_intc_0 5 2
+                                */
+
+                                /* IDSEL 0x12 / dev=2, bus=1 / PCI slot 6 */
+                                /*
+                                0x11000 0 0 1 &xps_intc_0 4 0 2
+                                0x11000 0 0 2 &xps_intc_0 3 0 2
+                                0x11000 0 0 3 &xps_intc_0 2 0 2
+                                0x11000 0 0 4 &xps_intc_0 5 0 2
+                                */
+
+                                /* IDSEL 0x11 / dev=1, bus=0 / AC97 audio */
+                                0x0800 0 0 1 &i8259 7 2
+
+                                /* IDSEL 0x1b / dev=11, bus=0 / IDE */
+                                0x5800 0 0 1 &i8259 14 2
+
+                                /* IDSEL 0x1f / dev 15, bus=0 / 2x USB 1.1 */
+                                0x7800 0 0 1 &i8259 7 2
+                        >;
+                        ali_m1533 {
+                                #size-cells = <1>;
+                                #address-cells = <2>;
+                                i8259: interrupt-controller@20 {
+                                        reg = <1 0x20 2
+                                                        1 0xa0 2
+                                                        1 0x4d0 2>;
+                                        interrupt-controller;
+                                        device_type = "interrupt-controller";
+                                        #address-cells = <0>;
+                                        #interrupt-cells = <2>;
+                                        compatible = "chrp,iic";
+
+                                        /* south bridge irq is active high */
+                                        interrupts = <1 3>;
+                                        interrupt-parent = <&xps_intc_0>;
+                                };
+                        };
+                } ;
+                xps_bram_if_cntlr_1: xps-bram-if-cntlr@ffff0000 {
+                        compatible = "xlnx,xps-bram-if-cntlr-1.00.a";
+                        reg = < 0xffff0000 0x10000 >;
+                        xlnx,family = "virtex5";
+                } ;
+                xps_intc_0: interrupt-controller@81800000 {
+                        #interrupt-cells = <0x2>;
+                        compatible = "xlnx,xps-intc-1.00.a";
+                        interrupt-controller ;
+                        reg = < 0x81800000 0x10000 >;
+                        xlnx,num-intr-inputs = <0xc>;
+                } ;
+                xps_tft_0: tft@86e00000 {
+                        compatible = "xlnx,xps-tft-1.00.a";
+                        reg = < 0x86e00000 0x10000 >;
+                        xlnx,dcr-splb-slave-if = <0x1>;
+                        xlnx,default-tft-base-addr = <0x0>;
+                        xlnx,family = "virtex5";
+                        xlnx,i2c-slave-addr = <0x76>;
+                        xlnx,mplb-awidth = <0x20>;
+                        xlnx,mplb-dwidth = <0x80>;
+                        xlnx,mplb-native-dwidth = <0x40>;
+                        xlnx,mplb-smallest-slave = <0x20>;
+                        xlnx,tft-interface = <0x1>;
+                } ;
+        } ;
+}  ;
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
index 7e183ff9a317..01bfb56bbe80 100644
--- a/arch/powerpc/boot/dts/warp.dts
+++ b/arch/powerpc/boot/dts/warp.dts
@@ -1,7 +1,7 @@
 /*
  * Device Tree Source for PIKA Warp
  *
- * Copyright (c) 2008 PIKA Technologies
+ * Copyright (c) 2008-2009 PIKA Technologies
  *   Sean MacLennan <smaclennan@pikatech.com>
  *
  * This file is licensed under the terms of the GNU General Public
@@ -158,7 +158,7 @@
 
                                         partition@0 {
                                                 label = "splash";
-                                                reg = <0x00000000 0x00020000>;
+                                                reg = <0x00000000 0x00010000>;
                                         };
                                         partition@300000 {
                                                 label = "fpga";
@@ -244,28 +244,27 @@
                         };
 
                         GPIO0: gpio@ef600b00 {
-                                compatible = "ibm,gpio-440ep";
+                                compatible = "ibm,ppc4xx-gpio";
                                 reg = <0xef600b00 0x00000048>;
                                 #gpio-cells = <2>;
                                 gpio-controller;
                         };
 
                         GPIO1: gpio@ef600c00 {
-                                compatible = "ibm,gpio-440ep";
+                                compatible = "ibm,ppc4xx-gpio";
                                 reg = <0xef600c00 0x00000048>;
                                 #gpio-cells = <2>;
                                 gpio-controller;
+                        };
 
-                                led@31 {
-                                        compatible = "linux,gpio-led";
-                                        linux,name = ":green:";
-                                        gpios = <&GPIO1 31 0>;
-                                };              
-        
-                                led@30 {        
-                                        compatible = "linux,gpio-led";
-                                        linux,name = ":red:";
-                                        gpios = <&GPIO1 30 0>;
+                        power-leds {
+                                compatible = "gpio-leds";
+                                green {
+                                        gpios = <&GPIO1 0 0>;
+                                        default-state = "on";
+                                };
+                                red {
+                                        gpios = <&GPIO1 1 0>;
                                 };
                         };
 
diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh
index 51b2387bdba0..98312d169c85 100644
--- a/arch/powerpc/boot/install.sh
+++ b/arch/powerpc/boot/install.sh
@@ -18,6 +18,9 @@
 #   $5 and more - kernel boot files; zImage*, uImage, cuImage.*, etc.
 #
 
+# Bail with error code if anything goes wrong
+set -e
+
 # User may have a custom install script
 
 if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig
index a32ec8d323a0..173a5bb77ca1 100644
--- a/arch/powerpc/configs/40x/acadia_defconfig
+++ b/arch/powerpc/configs/40x/acadia_defconfig
@@ -252,7 +252,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig
index 4e9d85f39da0..e9b8495cde0c 100644
--- a/arch/powerpc/configs/40x/ep405_defconfig
+++ b/arch/powerpc/configs/40x/ep405_defconfig
@@ -254,7 +254,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig
index 9917a09bad3a..865725effe93 100644
--- a/arch/powerpc/configs/40x/kilauea_defconfig
+++ b/arch/powerpc/configs/40x/kilauea_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29-rc2
-# Tue Jan 20 08:17:52 2009
+# Linux kernel version: 2.6.30-rc7
+# Wed Jun  3 10:18:16 2009
 #
 # CONFIG_PPC64 is not set
 
@@ -27,6 +27,7 @@ CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 CONFIG_IRQ_PER_CPU=y
 CONFIG_STACKTRACE_SUPPORT=y
@@ -49,10 +50,12 @@ CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
+CONFIG_DTC=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_PPC_DCR_NATIVE=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_DCR=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -67,9 +70,19 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_GROUP_SCHED=y
@@ -84,22 +97,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_STRIP_GENERATED=y
 CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -109,10 +124,12 @@ CONFIG_AIO=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -120,6 +137,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
+# CONFIG_SLOW_WORK is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -132,7 +150,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 CONFIG_LBD=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -148,11 +165,6 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_FREEZER is not set
 CONFIG_PPC4xx_PCI_EXPRESS=y
 
@@ -170,7 +182,7 @@ CONFIG_KILAUEA=y
 # CONFIG_MAKALU is not set
 # CONFIG_WALNUT is not set
 # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-# CONFIG_PPC40x_SIMPLE is not set
+CONFIG_PPC40x_SIMPLE=y
 CONFIG_405EX=y
 # CONFIG_IPIC is not set
 # CONFIG_MPIC is not set
@@ -228,9 +240,12 @@ CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_UNEVICTABLE_LRU=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC_16K_PAGES is not set
 # CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
@@ -252,9 +267,10 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HAS_RAPIDIO is not set
@@ -272,14 +288,12 @@ CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_TASK_SIZE=0xc0000000
-CONFIG_CONSISTENT_START=0xff100000
 CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_NET=y
 
 #
 # Networking options
 #
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -329,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_DCB is not set
 
@@ -341,7 +356,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
 # CONFIG_WIRELESS is not set
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
@@ -445,7 +459,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 # LPDDR flash memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_QINFO_PROBE is not set
 
 #
 # UBI - Unsorted block images
@@ -498,6 +511,7 @@ CONFIG_HAVE_IDE=y
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
+CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -512,6 +526,8 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_IBM_NEW_EMAC=y
@@ -540,7 +556,6 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
-# CONFIG_IWLWIFI_LEDS is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -678,6 +693,7 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_STAGING is not set
 
@@ -706,6 +722,11 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_FUSE_FS is not set
 
 #
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
@@ -749,6 +770,7 @@ CONFIG_CRAMFS=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_NILFS2_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@@ -760,7 +782,6 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -776,6 +797,7 @@ CONFIG_SUNRPC=y
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 # CONFIG_DLM is not set
+# CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
@@ -790,11 +812,12 @@ CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
-CONFIG_PLIST=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_HAVE_LMB=y
+CONFIG_NLATTR=y
 
 #
 # Kernel hacking
@@ -812,6 +835,9 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -841,9 +867,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_TRACING_SUPPORT=y
 
 #
 # Tracers
@@ -851,17 +880,21 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_EVENT_TRACER is not set
 # CONFIG_BOOT_TRACER is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 # CONFIG_STACK_TRACER is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_PRINT_STACK_DEPTH=64
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PPC_EMULATED_STATS is not set
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 # CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -892,10 +925,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_TEST is not set
@@ -964,6 +999,7 @@ CONFIG_CRYPTO_DES=y
 # Compression
 #
 # CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
 
 #
@@ -972,5 +1008,6 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_PPC4XX is not set
 # CONFIG_PPC_CLOCK is not set
 # CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig
index 58bf2ac2e0dd..146747547873 100644
--- a/arch/powerpc/configs/40x/makalu_defconfig
+++ b/arch/powerpc/configs/40x/makalu_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29-rc2
-# Tue Jan 20 08:17:53 2009
+# Linux kernel version: 2.6.30-rc7
+# Wed Jun  3 09:11:02 2009
 #
 # CONFIG_PPC64 is not set
 
@@ -27,6 +27,7 @@ CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 CONFIG_IRQ_PER_CPU=y
 CONFIG_STACKTRACE_SUPPORT=y
@@ -49,10 +50,12 @@ CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
+CONFIG_DTC=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_PPC_DCR_NATIVE=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_DCR=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -67,9 +70,19 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_GROUP_SCHED=y
@@ -84,22 +97,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_STRIP_GENERATED=y
 CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -109,10 +124,12 @@ CONFIG_AIO=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -120,6 +137,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
+# CONFIG_SLOW_WORK is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -132,7 +150,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 CONFIG_LBD=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -148,11 +165,6 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_FREEZER is not set
 CONFIG_PPC4xx_PCI_EXPRESS=y
 
@@ -170,7 +182,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
 CONFIG_MAKALU=y
 # CONFIG_WALNUT is not set
 # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-# CONFIG_PPC40x_SIMPLE is not set
+CONFIG_PPC40x_SIMPLE=y
 CONFIG_405EX=y
 # CONFIG_IPIC is not set
 # CONFIG_MPIC is not set
@@ -228,9 +240,12 @@ CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_UNEVICTABLE_LRU=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC_16K_PAGES is not set
 # CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
@@ -252,9 +267,10 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HAS_RAPIDIO is not set
@@ -272,14 +288,12 @@ CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_TASK_SIZE=0xc0000000
-CONFIG_CONSISTENT_START=0xff100000
 CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_NET=y
 
 #
 # Networking options
 #
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -329,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_DCB is not set
 
@@ -341,7 +356,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
 # CONFIG_WIRELESS is not set
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
@@ -445,7 +459,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 # LPDDR flash memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_QINFO_PROBE is not set
 
 #
 # UBI - Unsorted block images
@@ -498,6 +511,7 @@ CONFIG_HAVE_IDE=y
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
+CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -512,6 +526,8 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_IBM_NEW_EMAC=y
@@ -540,7 +556,6 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
-# CONFIG_IWLWIFI_LEDS is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -678,6 +693,7 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_STAGING is not set
 
@@ -706,6 +722,11 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_FUSE_FS is not set
 
 #
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
@@ -749,6 +770,7 @@ CONFIG_CRAMFS=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_NILFS2_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@@ -760,7 +782,6 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -776,6 +797,7 @@ CONFIG_SUNRPC=y
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 # CONFIG_DLM is not set
+# CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
@@ -790,11 +812,12 @@ CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
-CONFIG_PLIST=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_HAVE_LMB=y
+CONFIG_NLATTR=y
 
 #
 # Kernel hacking
@@ -812,6 +835,9 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -841,9 +867,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_TRACING_SUPPORT=y
 
 #
 # Tracers
@@ -851,17 +880,21 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_EVENT_TRACER is not set
 # CONFIG_BOOT_TRACER is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 # CONFIG_STACK_TRACER is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_PRINT_STACK_DEPTH=64
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PPC_EMULATED_STATS is not set
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 # CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -892,10 +925,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_TEST is not set
@@ -964,6 +999,7 @@ CONFIG_CRYPTO_DES=y
 # Compression
 #
 # CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
 
 #
@@ -972,5 +1008,6 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_PPC4XX is not set
 # CONFIG_PPC_CLOCK is not set
 # CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig
index f5698f962e58..416e79ac0711 100644
--- a/arch/powerpc/configs/40x/virtex_defconfig
+++ b/arch/powerpc/configs/40x/virtex_defconfig
@@ -258,7 +258,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig
index 1d72b0ac3f25..f7fd32c09424 100644
--- a/arch/powerpc/configs/44x/arches_defconfig
+++ b/arch/powerpc/configs/44x/arches_defconfig
@@ -258,7 +258,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig
index 959bdc43a491..e57f1e4c1795 100644
--- a/arch/powerpc/configs/44x/bamboo_defconfig
+++ b/arch/powerpc/configs/44x/bamboo_defconfig
@@ -262,7 +262,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig
index f9a08ee49b96..5e85412eb9fa 100644
--- a/arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/arch/powerpc/configs/44x/canyonlands_defconfig
@@ -262,7 +262,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
@@ -716,7 +716,7 @@ CONFIG_SSB_POSSIBLE=y
 #
 # Multimedia drivers
 #
-CONFIG_DAB=y
+# CONFIG_DAB is not set
 # CONFIG_USB_DABUSB is not set
 
 #
@@ -725,7 +725,7 @@ CONFIG_DAB=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig
index be64aa644d15..b652f7dcab5a 100644
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_defconfig
@@ -261,7 +261,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig
index f67250b24ec5..c23a4ef13e45 100644
--- a/arch/powerpc/configs/44x/katmai_defconfig
+++ b/arch/powerpc/configs/44x/katmai_defconfig
@@ -256,7 +256,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig
index 9348c12bd7a6..b25fad1343dc 100644
--- a/arch/powerpc/configs/44x/rainier_defconfig
+++ b/arch/powerpc/configs/44x/rainier_defconfig
@@ -260,7 +260,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/44x/redwood_defconfig b/arch/powerpc/configs/44x/redwood_defconfig
index e665433762ba..ed31d4f17b5a 100644
--- a/arch/powerpc/configs/44x/redwood_defconfig
+++ b/arch/powerpc/configs/44x/redwood_defconfig
@@ -265,7 +265,7 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEASPM is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index 70d5c3fa3283..e14e89a5e06b 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@ -262,7 +262,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig
index a921fe3c3711..6400aae04dda 100644
--- a/arch/powerpc/configs/44x/sequoia_defconfig
+++ b/arch/powerpc/configs/44x/sequoia_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29-rc2
-# Tue Jan 20 08:22:45 2009
+# Linux kernel version: 2.6.29
+# Tue Apr  7 17:04:52 2009
 #
 # CONFIG_PPC64 is not set
 
@@ -57,6 +57,7 @@ CONFIG_GENERIC_BUG=y
 CONFIG_PPC_DCR_NATIVE=y
 # CONFIG_PPC_DCR_MMIO is not set
 CONFIG_PPC_DCR=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
@@ -74,6 +75,15 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_GROUP_SCHED=y
@@ -88,8 +98,12 @@ CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
@@ -99,10 +113,8 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -112,10 +124,12 @@ CONFIG_AIO=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -123,6 +137,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
+# CONFIG_SLOW_WORK is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -135,7 +150,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 CONFIG_LBD=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -151,11 +165,6 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_FREEZER is not set
 # CONFIG_PPC4xx_PCI_EXPRESS is not set
 
@@ -176,6 +185,7 @@ CONFIG_SEQUOIA=y
 # CONFIG_ARCHES is not set
 # CONFIG_CANYONLANDS is not set
 # CONFIG_GLACIER is not set
+# CONFIG_REDWOOD is not set
 # CONFIG_YOSEMITE is not set
 # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
 CONFIG_PPC44x_SIMPLE=y
@@ -238,9 +248,13 @@ CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_UNEVICTABLE_LRU=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_STDBINUTILS=y
 CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC_16K_PAGES is not set
 # CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_PROC_DEVICETREE=y
 CONFIG_CMDLINE_BOOL=y
@@ -262,9 +276,10 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HAS_RAPIDIO is not set
@@ -278,18 +293,16 @@ CONFIG_PCI_LEGACY=y
 # Default settings for advanced configuration options are used
 #
 CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_LOWMEM_CAM_NUM=3
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_TASK_SIZE=0xc0000000
-CONFIG_CONSISTENT_START=0xff100000
-CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_NET=y
 
 #
 # Networking options
 #
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -339,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_DCB is not set
 
@@ -351,7 +365,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
 # CONFIG_WIRELESS is not set
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
@@ -448,14 +461,23 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_MTD_NAND_ECC_SMC=y
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_NAND_NDFC=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_FSL_ELBC is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
 # LPDDR flash memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_QINFO_PROBE is not set
 
 #
 # UBI - Unsorted block images
@@ -483,12 +505,16 @@ CONFIG_BLK_DEV_RAM_SIZE=35000
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
-# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_HP_ILO is not set
 # CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -515,6 +541,7 @@ CONFIG_HAVE_IDE=y
 # CONFIG_I2O is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
+CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -529,6 +556,8 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 CONFIG_IBM_NEW_EMAC=y
@@ -568,6 +597,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
 # CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
 # CONFIG_JME is not set
 CONFIG_NETDEV_10000=y
 # CONFIG_CHELSIO_T1 is not set
@@ -577,6 +607,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
 # CONFIG_IXGBE is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_NIU is not set
@@ -586,6 +617,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
 # CONFIG_BNX2X is not set
 # CONFIG_QLGE is not set
 # CONFIG_SFC is not set
+# CONFIG_BE2NET is not set
 # CONFIG_TR is not set
 
 #
@@ -593,7 +625,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
-# CONFIG_IWLWIFI_LEDS is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -734,7 +765,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 #
 
 #
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 # CONFIG_USB_GADGET is not set
 
@@ -750,6 +781,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_STAGING is not set
 
@@ -778,6 +810,11 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_FUSE_FS is not set
 
 #
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
@@ -842,7 +879,6 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -858,6 +894,7 @@ CONFIG_SUNRPC=y
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 # CONFIG_DLM is not set
+# CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
@@ -873,11 +910,12 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_PLIST=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_HAVE_LMB=y
+CONFIG_NLATTR=y
 
 #
 # Kernel hacking
@@ -924,9 +962,12 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_TRACING_SUPPORT=y
 
 #
 # Tracers
@@ -934,17 +975,20 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_EVENT_TRACER is not set
 # CONFIG_BOOT_TRACER is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 # CONFIG_STACK_TRACER is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_PRINT_STACK_DEPTH=64
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 # CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -952,20 +996,7 @@ CONFIG_PRINT_STACK_DEPTH=64
 # CONFIG_IRQSTACKS is not set
 # CONFIG_VIRQ_DEBUG is not set
 # CONFIG_BDI_SWITCH is not set
-CONFIG_PPC_EARLY_DEBUG=y
-# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-CONFIG_PPC_EARLY_DEBUG_44x=y
-# CONFIG_PPC_EARLY_DEBUG_40x is not set
-# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
-CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
+# CONFIG_PPC_EARLY_DEBUG is not set
 
 #
 # Security options
@@ -988,10 +1019,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_TEST is not set
@@ -1060,6 +1093,7 @@ CONFIG_CRYPTO_DES=y
 # Compression
 #
 # CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
 
 #
@@ -1068,5 +1102,6 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_PPC4XX is not set
 # CONFIG_PPC_CLOCK is not set
 # CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 826700872d26..ef32cc4f82eb 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -260,7 +260,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig
index 1bf0a63614b1..2518b8568c70 100644
--- a/arch/powerpc/configs/44x/virtex5_defconfig
+++ b/arch/powerpc/configs/44x/virtex5_defconfig
@@ -263,7 +263,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCCARD is not set
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 7d044dfd9236..12dc7c409616 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -1808,7 +1808,7 @@ CONFIG_PCF8575=m
 CONFIG_SENSORS_PCA9539=m
 CONFIG_SENSORS_PCF8591=m
 # CONFIG_TPS65010 is not set
-CONFIG_SENSORS_MAX6875=m
+CONFIG_EEPROM_MAX6875=m
 CONFIG_SENSORS_TSL2550=m
 CONFIG_MCU_MPC8349EMITX=m
 # CONFIG_I2C_DEBUG_CORE is not set
diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
index b7d2d07b6f96..4012483b1899 100644
--- a/arch/powerpc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
@@ -470,6 +470,9 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
 
 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
 
+#else  /* __powerpc64__ */
+#include <asm-generic/atomic64.h>
+
 #endif /* __powerpc64__ */
 
 #include <asm-generic/atomic-long.h>
diff --git a/arch/powerpc/include/asm/cpm2.h b/arch/powerpc/include/asm/cpm2.h
index 0f5e8ff59a85..990ff191da8b 100644
--- a/arch/powerpc/include/asm/cpm2.h
+++ b/arch/powerpc/include/asm/cpm2.h
@@ -14,10 +14,6 @@
 #include <asm/cpm.h>
 #include <sysdev/fsl_soc.h>
 
-#ifdef CONFIG_PPC_85xx
-#define CPM_MAP_ADDR (get_immrbase() + 0x80000)
-#endif
-
 /* CPM Command register.
 */
 #define CPM_CR_RST      ((uint)0x80000000)
diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
index cb448d68452c..3d9e887c3c0c 100644
--- a/arch/powerpc/include/asm/dma-mapping.h
+++ b/arch/powerpc/include/asm/dma-mapping.h
@@ -15,9 +15,18 @@
 #include <linux/scatterlist.h>
 #include <linux/dma-attrs.h>
 #include <asm/io.h>
+#include <asm/swiotlb.h>
 
 #define DMA_ERROR_CODE          (~(dma_addr_t)0x0)
 
+/* Some dma direct funcs must be visible for use in other dma_ops */
+extern void *dma_direct_alloc_coherent(struct device *dev, size_t size,
+                                       dma_addr_t *dma_handle, gfp_t flag);
+extern void dma_direct_free_coherent(struct device *dev, size_t size,
+                                     void *vaddr, dma_addr_t dma_handle);
+
+extern unsigned long get_dma_direct_offset(struct device *dev);
+
 #ifdef CONFIG_NOT_COHERENT_CACHE
 /*
  * DMA-consistent mapping functions for PowerPCs that don't support
@@ -78,6 +87,8 @@ struct dma_mapping_ops {
                                 dma_addr_t dma_address, size_t size,
                                 enum dma_data_direction direction,
                                 struct dma_attrs *attrs);
+        int             (*addr_needs_map)(struct device *dev, dma_addr_t addr,
+                                size_t size);
 #ifdef CONFIG_PPC_NEED_DMA_SYNC_OPS
         void            (*sync_single_range_for_cpu)(struct device *hwdev,
                                 dma_addr_t dma_handle, unsigned long offset,
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
index d6b4a12cdeff..014a624f4c8e 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -256,11 +256,11 @@ do {								\
  * even if we have an executable stack.
  */
 # define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \
-                (exec_stk != EXSTACK_DISABLE_X) : 0)
+                (exec_stk == EXSTACK_DEFAULT) : 0)
 #else 
 # define SET_PERSONALITY(ex) \
   set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
-# define elf_read_implies_exec(ex, exec_stk) (exec_stk != EXSTACK_DISABLE_X)
+# define elf_read_implies_exec(ex, exec_stk) (exec_stk == EXSTACK_DEFAULT)
 #endif /* __powerpc64__ */
 
 extern int dcache_bsize;
diff --git a/arch/powerpc/include/asm/emulated_ops.h b/arch/powerpc/include/asm/emulated_ops.h
new file mode 100644
index 000000000000..9154e8526732
--- /dev/null
+++ b/arch/powerpc/include/asm/emulated_ops.h
@@ -0,0 +1,73 @@
+/*
+ *  Copyright 2007 Sony Corporation
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _ASM_POWERPC_EMULATED_OPS_H
+#define _ASM_POWERPC_EMULATED_OPS_H
+
+#include <asm/atomic.h>
+
+
+#ifdef CONFIG_PPC_EMULATED_STATS
+
+struct ppc_emulated_entry {
+        const char *name;
+        atomic_t val;
+};
+
+extern struct ppc_emulated {
+#ifdef CONFIG_ALTIVEC
+        struct ppc_emulated_entry altivec;
+#endif
+        struct ppc_emulated_entry dcba;
+        struct ppc_emulated_entry dcbz;
+        struct ppc_emulated_entry fp_pair;
+        struct ppc_emulated_entry isel;
+        struct ppc_emulated_entry mcrxr;
+        struct ppc_emulated_entry mfpvr;
+        struct ppc_emulated_entry multiple;
+        struct ppc_emulated_entry popcntb;
+        struct ppc_emulated_entry spe;
+        struct ppc_emulated_entry string;
+        struct ppc_emulated_entry unaligned;
+#ifdef CONFIG_MATH_EMULATION
+        struct ppc_emulated_entry math;
+#elif defined(CONFIG_8XX_MINIMAL_FPEMU)
+        struct ppc_emulated_entry 8xx;
+#endif
+#ifdef CONFIG_VSX
+        struct ppc_emulated_entry vsx;
+#endif
+} ppc_emulated;
+
+extern u32 ppc_warn_emulated;
+
+extern void ppc_warn_emulated_print(const char *type);
+
+#define PPC_WARN_EMULATED(type)                                          \
+        do {                                                             \
+                atomic_inc(&ppc_emulated.type.val);                      \
+                if (ppc_warn_emulated)                                   \
+                        ppc_warn_emulated_print(ppc_emulated.type.name); \
+        } while (0)
+
+#else /* !CONFIG_PPC_EMULATED_STATS */
+
+#define PPC_WARN_EMULATED(type) do { } while (0)
+
+#endif /* !CONFIG_PPC_EMULATED_STATS */
+
+#endif /* _ASM_POWERPC_EMULATED_OPS_H */
diff --git a/arch/powerpc/include/asm/feature-fixups.h b/arch/powerpc/include/asm/feature-fixups.h
index e4094a5cb05b..cbd4dfa4bce2 100644
--- a/arch/powerpc/include/asm/feature-fixups.h
+++ b/arch/powerpc/include/asm/feature-fixups.h
@@ -8,8 +8,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#ifdef __ASSEMBLY__
-
 /*
  * Feature section common macros
  *
@@ -23,10 +21,12 @@
 /* 64 bits kernel, 32 bits code (ie. vdso32) */
 #define FTR_ENTRY_LONG          .llong
 #define FTR_ENTRY_OFFSET        .long 0xffffffff; .long
+#elif defined(CONFIG_PPC64)
+#define FTR_ENTRY_LONG          .llong
+#define FTR_ENTRY_OFFSET        .llong
 #else
-/* 64 bit kernel 64 bit code, or 32 bit kernel 32 bit code */
-#define FTR_ENTRY_LONG          PPC_LONG
-#define FTR_ENTRY_OFFSET        PPC_LONG
+#define FTR_ENTRY_LONG          .long
+#define FTR_ENTRY_OFFSET        .long
 #endif
 
 #define START_FTR_SECTION(label)        label##1:
@@ -141,6 +141,21 @@ label##5:					       	\
 #define ALT_FW_FTR_SECTION_END_IFCLR(msk)       \
         ALT_FW_FTR_SECTION_END_NESTED_IFCLR(msk, 97)
 
+#ifndef __ASSEMBLY__
+
+#define ASM_MMU_FTR_IF(section_if, section_else, msk, val)      \
+        stringify_in_c(BEGIN_MMU_FTR_SECTION)                   \
+        section_if "; "                                         \
+        stringify_in_c(MMU_FTR_SECTION_ELSE)                    \
+        section_else "; "                                       \
+        stringify_in_c(ALT_MMU_FTR_SECTION_END((msk), (val)))
+
+#define ASM_MMU_FTR_IFSET(section_if, section_else, msk)        \
+        ASM_MMU_FTR_IF(section_if, section_else, (msk), (msk))
+
+#define ASM_MMU_FTR_IFCLR(section_if, section_else, msk)        \
+        ASM_MMU_FTR_IF(section_if, section_else, (msk), 0)
+
 #endif /* __ASSEMBLY__ */
 
 /* LWSYNC feature sections */
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 53512374e1c9..b7f8f4a87cc0 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -80,7 +80,7 @@ static inline void local_irq_disable(void)
         __asm__ __volatile__("wrteei 0": : :"memory");
 #else
         unsigned long msr;
-        __asm__ __volatile__("": : :"memory");
+
         msr = mfmsr();
         SET_MSR_EE(msr & ~MSR_EE);
 #endif
@@ -92,7 +92,7 @@ static inline void local_irq_enable(void)
         __asm__ __volatile__("wrteei 1": : :"memory");
 #else
         unsigned long msr;
-        __asm__ __volatile__("": : :"memory");
+
         msr = mfmsr();
         SET_MSR_EE(msr | MSR_EE);
 #endif
@@ -108,7 +108,6 @@ static inline void local_irq_save_ptr(unsigned long *flags)
 #else
         SET_MSR_EE(msr & ~MSR_EE);
 #endif
-        __asm__ __volatile__("": : :"memory");
 }
 
 #define local_save_flags(flags) ((flags) = mfmsr())
diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
index 7464c0daddd1..7ead7c16fb7c 100644
--- a/arch/powerpc/include/asm/iommu.h
+++ b/arch/powerpc/include/asm/iommu.h
@@ -35,6 +35,16 @@
 #define IOMMU_PAGE_MASK       (~((1 << IOMMU_PAGE_SHIFT) - 1))
 #define IOMMU_PAGE_ALIGN(addr) _ALIGN_UP(addr, IOMMU_PAGE_SIZE)
 
+/* Cell page table entries */
+#define CBE_IOPTE_PP_W          0x8000000000000000ul /* protection: write */
+#define CBE_IOPTE_PP_R          0x4000000000000000ul /* protection: read */
+#define CBE_IOPTE_M             0x2000000000000000ul /* coherency required */
+#define CBE_IOPTE_SO_R          0x1000000000000000ul /* ordering: writes */
+#define CBE_IOPTE_SO_RW         0x1800000000000000ul /* ordering: r & w */
+#define CBE_IOPTE_RPN_Mask      0x07fffffffffff000ul /* RPN */
+#define CBE_IOPTE_H             0x0000000000000800ul /* cache hint */
+#define CBE_IOPTE_IOID_Mask     0x00000000000007fful /* ioid */
+
 /* Boot time flags */
 extern int iommu_is_off;
 extern int iommu_force_on;
diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index d2a65e8ca6ae..f78f65c38f05 100644
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -20,6 +20,11 @@
 #define _ASM_POWERPC_LPPACA_H
 #ifdef __KERNEL__
 
+/* These definitions relate to hypervisors that only exist when using
+ * a server type processor
+ */
+#ifdef CONFIG_PPC_BOOK3S
+
 //=============================================================================
 //
 //      This control block contains the data that is shared between the
@@ -158,5 +163,6 @@ struct slb_shadow {
 
 extern struct slb_shadow slb_shadow[];
 
+#endif /* CONFIG_PPC_BOOK3S */
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_LPPACA_H */
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 0efdb1dfdc5f..11d1fc3a8962 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -110,6 +110,10 @@ struct machdep_calls {
         void            (*show_percpuinfo)(struct seq_file *m, int i);
 
         void            (*init_IRQ)(void);
+
+        /* Return an irq, or NO_IRQ to indicate there are none pending.
+         * If for some reason there is no irq, but the interrupt
+         * shouldn't be counted as spurious, return NO_IRQ_IGNORE. */
         unsigned int    (*get_irq)(void);
 #ifdef CONFIG_KEXEC
         void            (*kexec_cpu_down)(int crash_shutdown, int secondary);
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index cbf154387091..fb57ded592f9 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -52,6 +52,11 @@
  */
 #define MMU_FTR_NEED_DTLB_SW_LRU        ASM_CONST(0x00200000)
 
+/* This indicates that the processor uses the ISA 2.06 server tlbie
+ * mnemonics
+ */
+#define MMU_FTR_TLBIE_206               ASM_CONST(0x00400000)
+
 #ifndef __ASSEMBLY__
 #include <asm/cputable.h>
 
@@ -69,10 +74,10 @@ extern void early_init_mmu_secondary(void);
 #endif /* !__ASSEMBLY__ */
 
 
-#ifdef CONFIG_PPC64
+#if defined(CONFIG_PPC_STD_MMU_64)
 /* 64-bit classic hash table MMU */
 #  include <asm/mmu-hash64.h>
-#elif defined(CONFIG_PPC_STD_MMU)
+#elif defined(CONFIG_PPC_STD_MMU_32)
 /* 32-bit classic hash table MMU */
 #  include <asm/mmu-hash32.h>
 #elif defined(CONFIG_40x)
diff --git a/arch/powerpc/include/asm/mpc86xx.h b/arch/powerpc/include/asm/mpc86xx.h
deleted file mode 100644
index 15f650f987e7..000000000000
--- a/arch/powerpc/include/asm/mpc86xx.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * MPC86xx definitions
- *
- * Author: Jeff Brown
- *
- * Copyright 2004 Freescale Semiconductor, Inc
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#ifdef __KERNEL__
-#ifndef __ASM_POWERPC_MPC86xx_H__
-#define __ASM_POWERPC_MPC86xx_H__
-
-#include <asm/mmu.h>
-
-#ifdef CONFIG_PPC_86xx
-
-#define CPU0_BOOT_RELEASE 0x01000000
-#define CPU1_BOOT_RELEASE 0x02000000
-#define CPU_ALL_RELEASED (CPU0_BOOT_RELEASE | CPU1_BOOT_RELEASE)
-#define MCM_PORT_CONFIG_OFFSET 0x1010
-
-/* Offset from CCSRBAR */
-#define MPC86xx_MCM_OFFSET      (0x00000)
-#define MPC86xx_MCM_SIZE        (0x02000)
-
-#endif /* CONFIG_PPC_86xx */
-#endif /* __ASM_POWERPC_MPC86xx_H__ */
-#endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 6ef055723019..c8a3cbfe02ff 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -43,6 +43,7 @@ struct task_struct;
  * processor.
  */
 struct paca_struct {
+#ifdef CONFIG_PPC_BOOK3S
         /*
          * Because hw_cpu_id, unlike other paca fields, is accessed
          * routinely from other CPUs (from the IRQ code), we stick to
@@ -51,7 +52,7 @@ struct paca_struct {
          */
 
         struct lppaca *lppaca_ptr;      /* Pointer to LpPaca for PLIC */
-
+#endif /* CONFIG_PPC_BOOK3S */
         /*
          * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c 
          * load lock_token and paca_index with a single lwz
@@ -64,13 +65,16 @@ struct paca_struct {
         u64 kernel_toc;                 /* Kernel TOC address */
         u64 kernelbase;                 /* Base address of kernel */
         u64 kernel_msr;                 /* MSR while running in kernel */
+#ifdef CONFIG_PPC_STD_MMU_64
         u64 stab_real;                  /* Absolute address of segment table */
         u64 stab_addr;                  /* Virtual address of segment table */
+#endif /* CONFIG_PPC_STD_MMU_64 */
         void *emergency_sp;             /* pointer to emergency stack */
         u64 data_offset;                /* per cpu data offset */
         s16 hw_cpu_id;                  /* Physical processor number */
         u8 cpu_start;                   /* At startup, processor spins until */
                                         /* this becomes non-zero. */
+#ifdef CONFIG_PPC_STD_MMU_64
         struct slb_shadow *slb_shadow_ptr;
 
         /*
@@ -81,11 +85,13 @@ struct paca_struct {
         u64 exmc[10];           /* used for machine checks */
         u64 exslb[10];          /* used for SLB/segment table misses
                                  * on the linear mapping */
-
-        mm_context_t context;
+        /* SLB related definitions */
         u16 vmalloc_sllp;
         u16 slb_cache_ptr;
         u16 slb_cache[SLB_CACHE_ENTRIES];
+#endif /* CONFIG_PPC_STD_MMU_64 */
+
+        mm_context_t context;
 
         /*
          * then miscellaneous read-write fields
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
index 32cbf16f10ea..4940662ee87e 100644
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
@@ -231,6 +231,11 @@ extern void copy_user_page(void *to, void *from, unsigned long vaddr,
                 struct page *p);
 extern int page_is_ram(unsigned long pfn);
 
+#ifdef CONFIG_PPC_SMLPAR
+void arch_free_page(struct page *page, int order);
+#define HAVE_ARCH_FREE_PAGE
+#endif
+
 struct vm_area_struct;
 
 typedef struct page *pgtable_t;
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 84007afabdb5..4c61fa0b8d75 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -86,17 +86,12 @@ struct pci_controller {
         void *io_base_alloc;
 #endif
         resource_size_t io_base_phys;
-#ifndef CONFIG_PPC64
         resource_size_t pci_io_size;
-#endif
 
         /* Some machines (PReP) have a non 1:1 mapping of
          * the PCI memory space in the CPU bus space
          */
         resource_size_t pci_mem_offset;
-#ifdef CONFIG_PPC64
-        unsigned long pci_io_size;
-#endif
 
         /* Some machines have a special region to forward the ISA
          * "memory" cycles such as VGA memory regions. Left to 0
@@ -140,10 +135,12 @@ struct pci_controller {
         struct resource io_resource;
         struct resource mem_resources[3];
         int global_number;              /* PCI domain number */
+
+        resource_size_t dma_window_base_cur;
+        resource_size_t dma_window_size;
+
 #ifdef CONFIG_PPC64
         unsigned long buid;
-        unsigned long dma_window_base_cur;
-        unsigned long dma_window_size;
 
         void *private_data;
 #endif  /* CONFIG_PPC64 */
@@ -185,7 +182,6 @@ extern int early_find_capability(struct pci_controller *hose, int bus,
 extern void setup_indirect_pci(struct pci_controller* hose,
                                resource_size_t cfg_addr,
                                resource_size_t cfg_data, u32 flags);
-extern void setup_grackle(struct pci_controller *hose);
 #else   /* CONFIG_PPC64 */
 
 /*
@@ -221,6 +217,7 @@ struct pci_dn {
 #define PCI_DN(dn)      ((struct pci_dn *) (dn)->data)
 
 extern struct device_node *fetch_dev_dn(struct pci_dev *dev);
+extern void * update_dn_pci_info(struct device_node *dn, void *data);
 
 /* Get a device_node from a pci_dev.  This code must be fast except
  * in the case where the sysdata is incorrect and needs to be fixed
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
index c40db05f21e0..8cd083c61503 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
@@ -31,9 +31,11 @@
 #error TASK_SIZE_USER64 exceeds pagetable range
 #endif
 
+#ifdef CONFIG_PPC_STD_MMU_64
 #if TASK_SIZE_USER64 > (1UL << (USER_ESID_BITS + SID_SHIFT))
 #error TASK_SIZE_USER64 exceeds user VSID range
 #endif
+#endif
 
 /*
  * Define the address range of the vmalloc VM area.
@@ -199,8 +201,11 @@ static inline unsigned long pte_update(struct mm_struct *mm,
         if (!huge)
                 assert_pte_locked(mm, addr);
 
+#ifdef CONFIG_PPC_STD_MMU_64
         if (old & _PAGE_HASHPTE)
                 hpte_need_flush(mm, addr, ptep, old, huge);
+#endif
+
         return old;
 }
 
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 640ccbbc0977..b74f16d45cb4 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -25,6 +25,7 @@
 #define PPC_INST_LSWI                   0x7c0004aa
 #define PPC_INST_LSWX                   0x7c00042a
 #define PPC_INST_LWSYNC                 0x7c2004ac
+#define PPC_INST_LXVD2X                 0x7c000698
 #define PPC_INST_MCRXR                  0x7c000400
 #define PPC_INST_MCRXR_MASK             0xfc0007fe
 #define PPC_INST_MFSPR_PVR              0x7c1f42a6
@@ -43,14 +44,18 @@
 
 #define PPC_INST_STSWI                  0x7c0005aa
 #define PPC_INST_STSWX                  0x7c00052a
+#define PPC_INST_STXVD2X                0x7c000798
+#define PPC_INST_TLBIE                  0x7c000264
 #define PPC_INST_TLBILX                 0x7c000024
 #define PPC_INST_WAIT                   0x7c00007c
 
 /* macros to insert fields into opcodes */
-#define __PPC_RA(a)     ((a & 0x1f) << 16)
-#define __PPC_RB(b)     ((b & 0x1f) << 11)
-#define __PPC_T_TLB(t)  ((t & 0x3) << 21)
-#define __PPC_WC(w)     ((w & 0x3) << 21)
+#define __PPC_RA(a)     (((a) & 0x1f) << 16)
+#define __PPC_RB(b)     (((b) & 0x1f) << 11)
+#define __PPC_RS(s)     (((s) & 0x1f) << 21)
+#define __PPC_XS(s)     ((((s) & 0x1f) << 21) | (((s) & 0x20) >> 5))
+#define __PPC_T_TLB(t)  (((t) & 0x3) << 21)
+#define __PPC_WC(w)     (((w) & 0x3) << 21)
 
 /* Deal with instructions that older assemblers aren't aware of */
 #define PPC_DCBAL(a, b)         stringify_in_c(.long PPC_INST_DCBAL | \
@@ -69,5 +74,17 @@
 #define PPC_TLBILX_VA(a, b)     PPC_TLBILX(3, a, b)
 #define PPC_WAIT(w)             stringify_in_c(.long PPC_INST_WAIT | \
                                         __PPC_WC(w))
+#define PPC_TLBIE(lp,a)         stringify_in_c(.long PPC_INST_TLBIE | \
+                                               __PPC_RB(a) | __PPC_RS(lp))
+
+/*
+ * Define what the VSX XX1 form instructions will look like, then add
+ * the 128 bit load store instructions based on that.
+ */
+#define VSX_XX1(s, a, b)        (__PPC_XS(s) | __PPC_RA(a) | __PPC_RB(b))
+#define STXVD2X(s, a, b)        stringify_in_c(.long PPC_INST_STXVD2X | \
+                                               VSX_XX1((s), (a), (b)))
+#define LXVD2X(s, a, b)         stringify_in_c(.long PPC_INST_LXVD2X | \
+                                               VSX_XX1((s), (a), (b)))
 
 #endif /* _ASM_POWERPC_PPC_OPCODE_H */
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 384d90c9c272..f9729529c20d 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -76,16 +76,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_PURR);					\
                                 REST_10GPRS(22, base)
 #endif
 
-/*
- * Define what the VSX XX1 form instructions will look like, then add
- * the 128 bit load store instructions based on that.
- */
-#define VSX_XX1(xs, ra, rb)     (((xs) & 0x1f) << 21 | ((ra) << 16) |  \
-                                 ((rb) << 11) | (((xs) >> 5)))
-
-#define STXVD2X(xs, ra, rb)     .long (0x7c000798 | VSX_XX1((xs), (ra), (rb)))
-#define LXVD2X(xs, ra, rb)      .long (0x7c000698 | VSX_XX1((xs), (ra), (rb)))
-
 #define SAVE_2GPRS(n, base)     SAVE_GPR(n, base); SAVE_GPR(n+1, base)
 #define SAVE_4GPRS(n, base)     SAVE_2GPRS(n, base); SAVE_2GPRS(n+2, base)
 #define SAVE_8GPRS(n, base)     SAVE_4GPRS(n, base); SAVE_4GPRS(n+4, base)
diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h
index cdb6fd814de8..7f065e178ec4 100644
--- a/arch/powerpc/include/asm/ps3.h
+++ b/arch/powerpc/include/asm/ps3.h
@@ -53,6 +53,13 @@ enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void);
 extern u64 ps3_os_area_get_rtc_diff(void);
 extern void ps3_os_area_set_rtc_diff(u64 rtc_diff);
 
+struct ps3_os_area_flash_ops {
+        ssize_t (*read)(void *buf, size_t count, loff_t pos);
+        ssize_t (*write)(const void *buf, size_t count, loff_t pos);
+};
+
+extern void ps3_os_area_flash_register(const struct ps3_os_area_flash_ops *ops);
+
 /* dma routines */
 
 enum ps3_dma_page_size {
@@ -418,15 +425,15 @@ static inline struct ps3_system_bus_driver *
  * @data: Data to set
  */
 
-static inline void ps3_system_bus_set_driver_data(
+static inline void ps3_system_bus_set_drvdata(
         struct ps3_system_bus_device *dev, void *data)
 {
-        dev->core.driver_data = data;
+        dev_set_drvdata(&dev->core, data);
 }
-static inline void *ps3_system_bus_get_driver_data(
+static inline void *ps3_system_bus_get_drvdata(
         struct ps3_system_bus_device *dev)
 {
-        return dev->core.driver_data;
+        return dev_get_drvdata(&dev->core);
 }
 
 /* These two need global scope for get_dma_ops(). */
@@ -520,7 +527,4 @@ void ps3_sync_irq(int node);
 u32 ps3_get_hw_thread_id(int cpu);
 u64 ps3_get_spe_id(void *arg);
 
-/* mutex synchronizing GPU accesses and video mode changes */
-extern struct mutex ps3_gpu_mutex;
-
 #endif
diff --git a/arch/powerpc/include/asm/ps3gpu.h b/arch/powerpc/include/asm/ps3gpu.h
new file mode 100644
index 000000000000..b2b89591907c
--- /dev/null
+++ b/arch/powerpc/include/asm/ps3gpu.h
@@ -0,0 +1,86 @@
+/*
+ *  PS3 GPU declarations.
+ *
+ *  Copyright 2009 Sony Corporation
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _ASM_POWERPC_PS3GPU_H
+#define _ASM_POWERPC_PS3GPU_H
+
+#include <linux/mutex.h>
+
+#include <asm/lv1call.h>
+
+
+#define L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_SYNC    0x101
+#define L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP    0x102
+
+#define L1GPU_CONTEXT_ATTRIBUTE_FB_SETUP        0x600
+#define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT         0x601
+#define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT_SYNC    0x602
+#define L1GPU_CONTEXT_ATTRIBUTE_FB_CLOSE        0x603
+
+#define L1GPU_FB_BLIT_WAIT_FOR_COMPLETION       (1ULL << 32)
+
+#define L1GPU_DISPLAY_SYNC_HSYNC                1
+#define L1GPU_DISPLAY_SYNC_VSYNC                2
+
+
+/* mutex synchronizing GPU accesses and video mode changes */
+extern struct mutex ps3_gpu_mutex;
+
+
+static inline int lv1_gpu_display_sync(u64 context_handle, u64 head,
+                                       u64 ddr_offset)
+{
+        return lv1_gpu_context_attribute(context_handle,
+                                         L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_SYNC,
+                                         head, ddr_offset, 0, 0);
+}
+
+static inline int lv1_gpu_display_flip(u64 context_handle, u64 head,
+                                       u64 ddr_offset)
+{
+        return lv1_gpu_context_attribute(context_handle,
+                                         L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP,
+                                         head, ddr_offset, 0, 0);
+}
+
+static inline int lv1_gpu_fb_setup(u64 context_handle, u64 xdr_lpar,
+                                   u64 xdr_size, u64 ioif_offset)
+{
+        return lv1_gpu_context_attribute(context_handle,
+                                         L1GPU_CONTEXT_ATTRIBUTE_FB_SETUP,
+                                         xdr_lpar, xdr_size, ioif_offset, 0);
+}
+
+static inline int lv1_gpu_fb_blit(u64 context_handle, u64 ddr_offset,
+                                  u64 ioif_offset, u64 sync_width, u64 pitch)
+{
+        return lv1_gpu_context_attribute(context_handle,
+                                         L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT,
+                                         ddr_offset, ioif_offset, sync_width,
+                                         pitch);
+}
+
+static inline int lv1_gpu_fb_close(u64 context_handle)
+{
+        return lv1_gpu_context_attribute(context_handle,
+                                         L1GPU_CONTEXT_ATTRIBUTE_FB_CLOSE, 0,
+                                         0, 0, 0);
+}
+
+#endif /* _ASM_POWERPC_PS3GPU_H */
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index c9c678fb2538..8c341490cfc5 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -135,7 +135,9 @@ do {									      \
  * These are defined as per linux/ptrace.h, which see.
  */
 #define arch_has_single_step()  (1)
+#define arch_has_block_step()   (!cpu_has_feature(CPU_FTR_601))
 extern void user_enable_single_step(struct task_struct *);
+extern void user_enable_block_step(struct task_struct *);
 extern void user_disable_single_step(struct task_struct *);
 
 #endif /* __ASSEMBLY__ */
@@ -288,4 +290,6 @@ extern void user_disable_single_step(struct task_struct *);
 #define PPC_PTRACE_PEEKUSR_3264  0x91
 #define PPC_PTRACE_POKEUSR_3264  0x90
 
+#define PTRACE_SINGLEBLOCK      0x100   /* resume execution until next branch */
+
 #endif /* _ASM_POWERPC_PTRACE_H */
diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h
index 2701753d9937..157c5ca581c8 100644
--- a/arch/powerpc/include/asm/qe.h
+++ b/arch/powerpc/include/asm/qe.h
@@ -22,7 +22,7 @@
 #include <asm/cpm.h>
 #include <asm/immap_qe.h>
 
-#define QE_NUM_OF_SNUM  28
+#define QE_NUM_OF_SNUM  256     /* There are 256 serial number in QE */
 #define QE_NUM_OF_BRGS  16
 #define QE_NUM_OF_PORTS 1024
 
@@ -152,6 +152,9 @@ unsigned int qe_get_brg_clk(void);
 int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier);
 int qe_get_snum(void);
 void qe_put_snum(u8 snum);
+unsigned int qe_get_num_of_risc(void);
+unsigned int qe_get_num_of_snums(void);
+
 /* we actually use cpm_muram implementation, define this for convenience */
 #define qe_muram_init cpm_muram_init
 #define qe_muram_alloc cpm_muram_alloc
@@ -231,12 +234,16 @@ struct qe_bd {
 #define QE_ALIGNMENT_OF_PRAM    64
 
 /* RISC allocation */
-enum qe_risc_allocation {
-        QE_RISC_ALLOCATION_RISC1 = 1,   /* RISC 1 */
-        QE_RISC_ALLOCATION_RISC2 = 2,   /* RISC 2 */
-        QE_RISC_ALLOCATION_RISC1_AND_RISC2 = 3  /* Dynamically choose
-                                                   RISC 1 or RISC 2 */
-};
+#define QE_RISC_ALLOCATION_RISC1        0x1  /* RISC 1 */
+#define QE_RISC_ALLOCATION_RISC2        0x2  /* RISC 2 */
+#define QE_RISC_ALLOCATION_RISC3        0x4  /* RISC 3 */
+#define QE_RISC_ALLOCATION_RISC4        0x8  /* RISC 4 */
+#define QE_RISC_ALLOCATION_RISC1_AND_RISC2      (QE_RISC_ALLOCATION_RISC1 | \
+                                                 QE_RISC_ALLOCATION_RISC2)
+#define QE_RISC_ALLOCATION_FOUR_RISCS   (QE_RISC_ALLOCATION_RISC1 | \
+                                         QE_RISC_ALLOCATION_RISC2 | \
+                                         QE_RISC_ALLOCATION_RISC3 | \
+                                         QE_RISC_ALLOCATION_RISC4)
 
 /* QE extended filtering Table Lookup Key Size */
 enum qe_fltr_tbl_lookup_key_size {
@@ -668,6 +675,8 @@ struct ucc_slow_pram {
 #define UCC_GETH_UPSMR_RMM      0x00001000
 #define UCC_GETH_UPSMR_CAM      0x00000400
 #define UCC_GETH_UPSMR_BRO      0x00000200
+#define UCC_GETH_UPSMR_SMM      0x00000080
+#define UCC_GETH_UPSMR_SGMM     0x00000020
 
 /* UCC Transmit On Demand Register (UTODR) */
 #define UCC_SLOW_TOD    0x8000
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index fb359b0a6937..a3c28e46947c 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -745,11 +745,11 @@
                         asm volatile("mfmsr %0" : "=r" (rval)); rval;})
 #ifdef CONFIG_PPC64
 #define __mtmsrd(v, l)  asm volatile("mtmsrd %0," __stringify(l) \
-                                     : : "r" (v))
+                                     : : "r" (v) : "memory")
 #define mtmsrd(v)       __mtmsrd((v), 0)
 #define mtmsr(v)        mtmsrd(v)
 #else
-#define mtmsr(v)        asm volatile("mtmsr %0" : : "r" (v))
+#define mtmsr(v)        asm volatile("mtmsr %0" : : "r" (v) : "memory")
 #endif
 
 #define mfspr(rn)       ({unsigned long rval; \
diff --git a/arch/powerpc/include/asm/scatterlist.h b/arch/powerpc/include/asm/scatterlist.h
index fcf7d55afe45..912bf597870f 100644
--- a/arch/powerpc/include/asm/scatterlist.h
+++ b/arch/powerpc/include/asm/scatterlist.h
@@ -21,7 +21,7 @@ struct scatterlist {
         unsigned int offset;
         unsigned int length;
 
-        /* For TCE support */
+        /* For TCE or SWIOTLB support */
         dma_addr_t dma_address;
         u32 dma_length;
 };
@@ -34,11 +34,7 @@ struct scatterlist {
  * is 0.
  */
 #define sg_dma_address(sg)      ((sg)->dma_address)
-#ifdef __powerpc64__
 #define sg_dma_len(sg)          ((sg)->dma_length)
-#else
-#define sg_dma_len(sg)          ((sg)->length)
-#endif
 
 #ifdef __powerpc64__
 #define ISA_DMA_THRESHOLD       (~0UL)
diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h
new file mode 100644
index 000000000000..30891d6e2bc1
--- /dev/null
+++ b/arch/powerpc/include/asm/swiotlb.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2009 Becky Bruce, Freescale Semiconductor
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#ifndef __ASM_SWIOTLB_H
+#define __ASM_SWIOTLB_H
+
+#include <linux/swiotlb.h>
+
+extern struct dma_mapping_ops swiotlb_dma_ops;
+extern struct dma_mapping_ops swiotlb_pci_dma_ops;
+
+int swiotlb_arch_address_needs_mapping(struct device *, dma_addr_t,
+                                       size_t size);
+
+static inline void dma_mark_clean(void *addr, size_t size) {}
+
+extern unsigned int ppc_swiotlb_enable;
+int __init swiotlb_setup_bus_notifier(void);
+
+#endif /* __ASM_SWIOTLB_H */
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index a0b92de51c7e..370600ca2765 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -325,3 +325,4 @@ SYSCALL(inotify_init1)
 SYSCALL_SPU(perf_counter_open)
 COMPAT_SYS_SPU(preadv)
 COMPAT_SYS_SPU(pwritev)
+COMPAT_SYS(rt_tgsigqueueinfo)
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
index 2b2420a49884..bb8e006a47c6 100644
--- a/arch/powerpc/include/asm/system.h
+++ b/arch/powerpc/include/asm/system.h
@@ -211,7 +211,7 @@ extern struct task_struct *_switch(struct thread_struct *prev,
 
 extern unsigned int rtas_data;
 extern int mem_init_done;       /* set on boot once kmalloc can be called */
-extern int init_bootmem_done;   /* set on !NUMA once bootmem is available */
+extern int init_bootmem_done;   /* set once bootmem is available */
 extern phys_addr_t memory_limit;
 extern unsigned long klimit;
 
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index 4badac2d11d1..cef080bfc607 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -344,10 +344,11 @@
 #define __NR_perf_counter_open  319
 #define __NR_preadv             320
 #define __NR_pwritev            321
+#define __NR_rt_tgsigqueueinfo  322
 
 #ifdef __KERNEL__
 
-#define __NR_syscalls           322
+#define __NR_syscalls           323
 
 #define __NR__exit __NR_exit
 #define NR_syscalls     __NR_syscalls
diff --git a/arch/powerpc/include/asm/xilinx_pci.h b/arch/powerpc/include/asm/xilinx_pci.h
new file mode 100644
index 000000000000..7a8275caf6af
--- /dev/null
+++ b/arch/powerpc/include/asm/xilinx_pci.h
@@ -0,0 +1,21 @@
+/*
+ * Xilinx pci external definitions
+ *
+ * Copyright 2009 Roderick Colenbrander
+ * Copyright 2009 Secret Lab Technologies Ltd.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef INCLUDE_XILINX_PCI
+#define INCLUDE_XILINX_PCI
+
+#ifdef CONFIG_XILINX_PCI
+extern void __init xilinx_pci_init(void);
+#else
+static inline void __init xilinx_pci_init(void) { return; }
+#endif
+
+#endif /* INCLUDE_XILINX_PCI */
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index a2c683403c2b..612b0c4dc26d 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -36,7 +36,7 @@ obj-$(CONFIG_PPC64)		+= setup_64.o sys_ppc32.o \
                                    firmware.o nvram_64.o
 obj64-$(CONFIG_RELOCATABLE)     += reloc_64.o
 obj-$(CONFIG_PPC64)             += vdso64/
-obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
+obj-$(CONFIG_ALTIVEC)           += vecemu.o
 obj-$(CONFIG_PPC_970_NAP)       += idle_power4.o
 obj-$(CONFIG_PPC_OF)            += of_device.o of_platform.o prom_parse.o
 obj-$(CONFIG_PPC_CLOCK)         += clock.o
@@ -82,6 +82,7 @@ obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
 obj-$(CONFIG_PPC_UDBG_16550)    += legacy_serial.o udbg_16550.o
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
+obj-$(CONFIG_SWIOTLB)           += dma-swiotlb.o
 
 pci64-$(CONFIG_PPC64)           += pci_dn.o isa-bridge.o
 obj-$(CONFIG_PCI)               += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
@@ -111,6 +112,7 @@ obj-y				+= ppc_save_regs.o
 endif
 
 extra-$(CONFIG_PPC_FPU)         += fpu.o
+extra-$(CONFIG_ALTIVEC)         += vector.o
 extra-$(CONFIG_PPC64)           += entry_64.o
 
 extra-y                         += systbl_chk.i
@@ -123,6 +125,7 @@ PHONY += systbl_chk
 systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
         $(call cmd,systbl_chk)
 
+ifeq ($(CONFIG_PPC_OF_BOOT_TRAMPOLINE),y)
 $(obj)/built-in.o:              prom_init_check
 
 quiet_cmd_prom_init_check = CALL    $<
@@ -131,5 +134,6 @@ quiet_cmd_prom_init_check = CALL    $<
 PHONY += prom_init_check
 prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o
         $(call cmd,prom_init_check)
+endif
 
 clean-files := vmlinux.lds
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index 5ffcfaa77d6a..a5b632e52fae 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -24,6 +24,7 @@
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/cputable.h>
+#include <asm/emulated_ops.h>
 
 struct aligninfo {
         unsigned char len;
@@ -730,8 +731,10 @@ int fix_alignment(struct pt_regs *regs)
         areg = dsisr & 0x1f;            /* register to update */
 
 #ifdef CONFIG_SPE
-        if ((instr >> 26) == 0x4)
+        if ((instr >> 26) == 0x4) {
+                PPC_WARN_EMULATED(spe);
                 return emulate_spe(regs, reg, instr);
+        }
 #endif
 
         instr = (dsisr >> 10) & 0x7f;
@@ -783,23 +786,28 @@ int fix_alignment(struct pt_regs *regs)
                         flags |= SPLT;
                         nb = 8;
                 }
+                PPC_WARN_EMULATED(vsx);
                 return emulate_vsx(addr, reg, areg, regs, flags, nb);
         }
 #endif
         /* A size of 0 indicates an instruction we don't support, with
          * the exception of DCBZ which is handled as a special case here
          */
-        if (instr == DCBZ)
+        if (instr == DCBZ) {
+                PPC_WARN_EMULATED(dcbz);
                 return emulate_dcbz(regs, addr);
+        }
         if (unlikely(nb == 0))
                 return 0;
 
         /* Load/Store Multiple instructions are handled in their own
          * function
          */
-        if (flags & M)
+        if (flags & M) {
+                PPC_WARN_EMULATED(multiple);
                 return emulate_multiple(regs, addr, reg, nb,
                                         flags, instr, swiz);
+        }
 
         /* Verify the address of the operand */
         if (unlikely(user_mode(regs) &&
@@ -816,8 +824,12 @@ int fix_alignment(struct pt_regs *regs)
         }
 
         /* Special case for 16-byte FP loads and stores */
-        if (nb == 16)
+        if (nb == 16) {
+                PPC_WARN_EMULATED(fp_pair);
                 return emulate_fp_pair(addr, reg, flags);
+        }
+
+        PPC_WARN_EMULATED(unaligned);
 
         /* If we are loading, get the data from user space, else
          * get it from register values
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index e981d1ce1914..561b64652311 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -122,8 +122,6 @@ int main(void)
         DEFINE(PACAKSAVE, offsetof(struct paca_struct, kstack));
         DEFINE(PACACURRENT, offsetof(struct paca_struct, __current));
         DEFINE(PACASAVEDMSR, offsetof(struct paca_struct, saved_msr));
-        DEFINE(PACASTABREAL, offsetof(struct paca_struct, stab_real));
-        DEFINE(PACASTABVIRT, offsetof(struct paca_struct, stab_addr));
         DEFINE(PACASTABRR, offsetof(struct paca_struct, stab_rr));
         DEFINE(PACAR1, offsetof(struct paca_struct, saved_r1));
         DEFINE(PACATOC, offsetof(struct paca_struct, kernel_toc));
@@ -132,35 +130,30 @@ int main(void)
         DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled));
         DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled));
         DEFINE(PACAPERFPEND, offsetof(struct paca_struct, perf_counter_pending));
-        DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
-        DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
         DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id));
-        DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));
 #ifdef CONFIG_PPC_MM_SLICES
         DEFINE(PACALOWSLICESPSIZE, offsetof(struct paca_struct,
                                             context.low_slices_psize));
         DEFINE(PACAHIGHSLICEPSIZE, offsetof(struct paca_struct,
                                             context.high_slices_psize));
         DEFINE(MMUPSIZEDEFSIZE, sizeof(struct mmu_psize_def));
+#endif /* CONFIG_PPC_MM_SLICES */
+#ifdef CONFIG_PPC_STD_MMU_64
+        DEFINE(PACASTABREAL, offsetof(struct paca_struct, stab_real));
+        DEFINE(PACASTABVIRT, offsetof(struct paca_struct, stab_addr));
+        DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
+        DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
+        DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));
+#ifdef CONFIG_PPC_MM_SLICES
         DEFINE(MMUPSIZESLLP, offsetof(struct mmu_psize_def, sllp));
 #else
         DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, context.sllp));
-
 #endif /* CONFIG_PPC_MM_SLICES */
         DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));
         DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));
         DEFINE(PACA_EXSLB, offsetof(struct paca_struct, exslb));
-        DEFINE(PACAEMERGSP, offsetof(struct paca_struct, emergency_sp));
         DEFINE(PACALPPACAPTR, offsetof(struct paca_struct, lppaca_ptr));
-        DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
-        DEFINE(PACA_STARTPURR, offsetof(struct paca_struct, startpurr));
-        DEFINE(PACA_STARTSPURR, offsetof(struct paca_struct, startspurr));
-        DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time));
-        DEFINE(PACA_SYSTEM_TIME, offsetof(struct paca_struct, system_time));
         DEFINE(PACA_SLBSHADOWPTR, offsetof(struct paca_struct, slb_shadow_ptr));
-        DEFINE(PACA_DATA_OFFSET, offsetof(struct paca_struct, data_offset));
-        DEFINE(PACA_TRAP_SAVE, offsetof(struct paca_struct, trap_save));
-
         DEFINE(SLBSHADOW_STACKVSID,
                offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid));
         DEFINE(SLBSHADOW_STACKESID,
@@ -170,6 +163,15 @@ int main(void)
         DEFINE(LPPACAANYINT, offsetof(struct lppaca, int_dword.any_int));
         DEFINE(LPPACADECRINT, offsetof(struct lppaca, int_dword.fields.decr_int));
         DEFINE(SLBSHADOW_SAVEAREA, offsetof(struct slb_shadow, save_area));
+#endif /* CONFIG_PPC_STD_MMU_64 */
+        DEFINE(PACAEMERGSP, offsetof(struct paca_struct, emergency_sp));
+        DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
+        DEFINE(PACA_STARTPURR, offsetof(struct paca_struct, startpurr));
+        DEFINE(PACA_STARTSPURR, offsetof(struct paca_struct, startspurr));
+        DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time));
+        DEFINE(PACA_SYSTEM_TIME, offsetof(struct paca_struct, system_time));
+        DEFINE(PACA_DATA_OFFSET, offsetof(struct paca_struct, data_offset));
+        DEFINE(PACA_TRAP_SAVE, offsetof(struct paca_struct, trap_save));
 #endif /* CONFIG_PPC64 */
 
         /* RTAS */
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 3e33fb933d99..4a24a2fc4574 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -427,7 +427,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER7 (architected)",
                 .cpu_features           = CPU_FTRS_POWER7,
                 .cpu_user_features      = COMMON_USER_POWER7,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTR_HPTE_TABLE |
+                        MMU_FTR_TLBIE_206,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .machine_check          = machine_check_generic,
@@ -441,7 +442,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER7 (raw)",
                 .cpu_features           = CPU_FTRS_POWER7,
                 .cpu_user_features      = COMMON_USER_POWER7,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTR_HPTE_TABLE |
+                        MMU_FTR_TLBIE_206,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
new file mode 100644
index 000000000000..68ccf11e4f19
--- /dev/null
+++ b/arch/powerpc/kernel/dma-swiotlb.c
@@ -0,0 +1,163 @@
+/*
+ * Contains routines needed to support swiotlb for ppc.
+ *
+ * Copyright (C) 2009 Becky Bruce, Freescale Semiconductor
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include <linux/dma-mapping.h>
+#include <linux/pfn.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/pci.h>
+
+#include <asm/machdep.h>
+#include <asm/swiotlb.h>
+#include <asm/dma.h>
+#include <asm/abs_addr.h>
+
+int swiotlb __read_mostly;
+unsigned int ppc_swiotlb_enable;
+
+void *swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t addr)
+{
+        unsigned long pfn = PFN_DOWN(swiotlb_bus_to_phys(hwdev, addr));
+        void *pageaddr = page_address(pfn_to_page(pfn));
+
+        if (pageaddr != NULL)
+                return pageaddr + (addr % PAGE_SIZE);
+        return NULL;
+}
+
+dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)
+{
+        return paddr + get_dma_direct_offset(hwdev);
+}
+
+phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)
+
+{
+        return baddr - get_dma_direct_offset(hwdev);
+}
+
+/*
+ * Determine if an address needs bounce buffering via swiotlb.
+ * Going forward I expect the swiotlb code to generalize on using
+ * a dma_ops->addr_needs_map, and this function will move from here to the
+ * generic swiotlb code.
+ */
+int
+swiotlb_arch_address_needs_mapping(struct device *hwdev, dma_addr_t addr,
+                                   size_t size)
+{
+        struct dma_mapping_ops *dma_ops = get_dma_ops(hwdev);
+
+        BUG_ON(!dma_ops);
+        return dma_ops->addr_needs_map(hwdev, addr, size);
+}
+
+/*
+ * Determine if an address is reachable by a pci device, or if we must bounce.
+ */
+static int
+swiotlb_pci_addr_needs_map(struct device *hwdev, dma_addr_t addr, size_t size)
+{
+        u64 mask = dma_get_mask(hwdev);
+        dma_addr_t max;
+        struct pci_controller *hose;
+        struct pci_dev *pdev = to_pci_dev(hwdev);
+
+        hose = pci_bus_to_host(pdev->bus);
+        max = hose->dma_window_base_cur + hose->dma_window_size;
+
+        /* check that we're within mapped pci window space */
+        if ((addr + size > max) | (addr < hose->dma_window_base_cur))
+                return 1;
+
+        return !is_buffer_dma_capable(mask, addr, size);
+}
+
+static int
+swiotlb_addr_needs_map(struct device *hwdev, dma_addr_t addr, size_t size)
+{
+        return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size);
+}
+
+
+/*
+ * At the moment, all platforms that use this code only require
+ * swiotlb to be used if we're operating on HIGHMEM.  Since
+ * we don't ever call anything other than map_sg, unmap_sg,
+ * map_page, and unmap_page on highmem, use normal dma_ops
+ * for everything else.
+ */
+struct dma_mapping_ops swiotlb_dma_ops = {
+        .alloc_coherent = dma_direct_alloc_coherent,
+        .free_coherent = dma_direct_free_coherent,
+        .map_sg = swiotlb_map_sg_attrs,
+        .unmap_sg = swiotlb_unmap_sg_attrs,
+        .dma_supported = swiotlb_dma_supported,
+        .map_page = swiotlb_map_page,
+        .unmap_page = swiotlb_unmap_page,
+        .addr_needs_map = swiotlb_addr_needs_map,
+        .sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,
+        .sync_single_range_for_device = swiotlb_sync_single_range_for_device,
+        .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
+        .sync_sg_for_device = swiotlb_sync_sg_for_device
+};
+
+struct dma_mapping_ops swiotlb_pci_dma_ops = {
+        .alloc_coherent = dma_direct_alloc_coherent,
+        .free_coherent = dma_direct_free_coherent,
+        .map_sg = swiotlb_map_sg_attrs,
+        .unmap_sg = swiotlb_unmap_sg_attrs,
+        .dma_supported = swiotlb_dma_supported,
+        .map_page = swiotlb_map_page,
+        .unmap_page = swiotlb_unmap_page,
+        .addr_needs_map = swiotlb_pci_addr_needs_map,
+        .sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,
+        .sync_single_range_for_device = swiotlb_sync_single_range_for_device,
+        .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
+        .sync_sg_for_device = swiotlb_sync_sg_for_device
+};
+
+static int ppc_swiotlb_bus_notify(struct notifier_block *nb,
+                                  unsigned long action, void *data)
+{
+        struct device *dev = data;
+
+        /* We are only intereted in device addition */
+        if (action != BUS_NOTIFY_ADD_DEVICE)
+                return 0;
+
+        /* May need to bounce if the device can't address all of DRAM */
+        if (dma_get_mask(dev) < lmb_end_of_DRAM())
+                set_dma_ops(dev, &swiotlb_dma_ops);
+
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block ppc_swiotlb_plat_bus_notifier = {
+        .notifier_call = ppc_swiotlb_bus_notify,
+        .priority = 0,
+};
+
+static struct notifier_block ppc_swiotlb_of_bus_notifier = {
+        .notifier_call = ppc_swiotlb_bus_notify,
+        .priority = 0,
+};
+
+int __init swiotlb_setup_bus_notifier(void)
+{
+        bus_register_notifier(&platform_bus_type,
+                              &ppc_swiotlb_plat_bus_notifier);
+        bus_register_notifier(&of_platform_bus_type,
+                              &ppc_swiotlb_of_bus_notifier);
+
+        return 0;
+}
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 6b02793dc75b..20a60d661ba8 100644
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -19,7 +19,7 @@
  * default the offset is PCI_DRAM_OFFSET.
  */
 
-static unsigned long get_dma_direct_offset(struct device *dev)
+unsigned long get_dma_direct_offset(struct device *dev)
 {
         if (dev)
                 return (unsigned long)dev->archdata.dma_data;
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
new file mode 100644
index 000000000000..eb898112e577
--- /dev/null
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -0,0 +1,978 @@
+/*
+ * This file contains the 64-bit "server" PowerPC variant
+ * of the low level exception handling including exception
+ * vectors, exception return, part of the slb and stab
+ * handling and other fixed offset specific things.
+ *
+ * This file is meant to be #included from head_64.S due to
+ * position dependant assembly.
+ *
+ * Most of this originates from head_64.S and thus has the same
+ * copyright history.
+ *
+ */
+
+/*
+ * We layout physical memory as follows:
+ * 0x0000 - 0x00ff : Secondary processor spin code
+ * 0x0100 - 0x2fff : pSeries Interrupt prologs
+ * 0x3000 - 0x5fff : interrupt support, iSeries and common interrupt prologs
+ * 0x6000 - 0x6fff : Initial (CPU0) segment table
+ * 0x7000 - 0x7fff : FWNMI data area
+ * 0x8000 -        : Early init and support code
+ */
+
+
+/*
+ *   SPRG Usage
+ *
+ *   Register   Definition
+ *
+ *   SPRG0      reserved for hypervisor
+ *   SPRG1      temp - used to save gpr
+ *   SPRG2      temp - used to save gpr
+ *   SPRG3      virt addr of paca
+ */
+
+/*
+ * This is the start of the interrupt handlers for pSeries
+ * This code runs with relocation off.
+ * Code from here to __end_interrupts gets copied down to real
+ * address 0x100 when we are running a relocatable kernel.
+ * Therefore any relative branches in this section must only
+ * branch to labels in this section.
+ */
+        . = 0x100
+        .globl __start_interrupts
+__start_interrupts:
+
+        STD_EXCEPTION_PSERIES(0x100, system_reset)
+
+        . = 0x200
+_machine_check_pSeries:
+        HMT_MEDIUM
+        mtspr   SPRN_SPRG1,r13          /* save r13 */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
+
+        . = 0x300
+        .globl data_access_pSeries
+data_access_pSeries:
+        HMT_MEDIUM
+        mtspr   SPRN_SPRG1,r13
+BEGIN_FTR_SECTION
+        mtspr   SPRN_SPRG2,r12
+        mfspr   r13,SPRN_DAR
+        mfspr   r12,SPRN_DSISR
+        srdi    r13,r13,60
+        rlwimi  r13,r12,16,0x20
+        mfcr    r12
+        cmpwi   r13,0x2c
+        beq     do_stab_bolted_pSeries
+        mtcrf   0x80,r12
+        mfspr   r12,SPRN_SPRG2
+END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common)
+
+        . = 0x380
+        .globl data_access_slb_pSeries
+data_access_slb_pSeries:
+        HMT_MEDIUM
+        mtspr   SPRN_SPRG1,r13
+        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
+        std     r3,PACA_EXSLB+EX_R3(r13)
+        mfspr   r3,SPRN_DAR
+        std     r9,PACA_EXSLB+EX_R9(r13)        /* save r9 - r12 */
+        mfcr    r9
+#ifdef __DISABLED__
+        /* Keep that around for when we re-implement dynamic VSIDs */
+        cmpdi   r3,0
+        bge     slb_miss_user_pseries
+#endif /* __DISABLED__ */
+        std     r10,PACA_EXSLB+EX_R10(r13)
+        std     r11,PACA_EXSLB+EX_R11(r13)
+        std     r12,PACA_EXSLB+EX_R12(r13)
+        mfspr   r10,SPRN_SPRG1
+        std     r10,PACA_EXSLB+EX_R13(r13)
+        mfspr   r12,SPRN_SRR1           /* and SRR1 */
+#ifndef CONFIG_RELOCATABLE
+        b       .slb_miss_realmode
+#else
+        /*
+         * We can't just use a direct branch to .slb_miss_realmode
+         * because the distance from here to there depends on where
+         * the kernel ends up being put.
+         */
+        mfctr   r11
+        ld      r10,PACAKBASE(r13)
+        LOAD_HANDLER(r10, .slb_miss_realmode)
+        mtctr   r10
+        bctr
+#endif
+
+        STD_EXCEPTION_PSERIES(0x400, instruction_access)
+
+        . = 0x480
+        .globl instruction_access_slb_pSeries
+instruction_access_slb_pSeries:
+        HMT_MEDIUM
+        mtspr   SPRN_SPRG1,r13
+        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
+        std     r3,PACA_EXSLB+EX_R3(r13)
+        mfspr   r3,SPRN_SRR0            /* SRR0 is faulting address */
+        std     r9,PACA_EXSLB+EX_R9(r13)        /* save r9 - r12 */
+        mfcr    r9
+#ifdef __DISABLED__
+        /* Keep that around for when we re-implement dynamic VSIDs */
+        cmpdi   r3,0
+        bge     slb_miss_user_pseries
+#endif /* __DISABLED__ */
+        std     r10,PACA_EXSLB+EX_R10(r13)
+        std     r11,PACA_EXSLB+EX_R11(r13)
+        std     r12,PACA_EXSLB+EX_R12(r13)
+        mfspr   r10,SPRN_SPRG1
+        std     r10,PACA_EXSLB+EX_R13(r13)
+        mfspr   r12,SPRN_SRR1           /* and SRR1 */
+#ifndef CONFIG_RELOCATABLE
+        b       .slb_miss_realmode
+#else
+        mfctr   r11
+        ld      r10,PACAKBASE(r13)
+        LOAD_HANDLER(r10, .slb_miss_realmode)
+        mtctr   r10
+        bctr
+#endif
+
+        MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt)
+        STD_EXCEPTION_PSERIES(0x600, alignment)
+        STD_EXCEPTION_PSERIES(0x700, program_check)
+        STD_EXCEPTION_PSERIES(0x800, fp_unavailable)
+        MASKABLE_EXCEPTION_PSERIES(0x900, decrementer)
+        STD_EXCEPTION_PSERIES(0xa00, trap_0a)
+        STD_EXCEPTION_PSERIES(0xb00, trap_0b)
+
+        . = 0xc00
+        .globl  system_call_pSeries
+system_call_pSeries:
+        HMT_MEDIUM
+BEGIN_FTR_SECTION
+        cmpdi   r0,0x1ebe
+        beq-    1f
+END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
+        mr      r9,r13
+        mfspr   r13,SPRN_SPRG3
+        mfspr   r11,SPRN_SRR0
+        ld      r12,PACAKBASE(r13)
+        ld      r10,PACAKMSR(r13)
+        LOAD_HANDLER(r12, system_call_entry)
+        mtspr   SPRN_SRR0,r12
+        mfspr   r12,SPRN_SRR1
+        mtspr   SPRN_SRR1,r10
+        rfid
+        b       .       /* prevent speculative execution */
+
+/* Fast LE/BE switch system call */
+1:      mfspr   r12,SPRN_SRR1
+        xori    r12,r12,MSR_LE
+        mtspr   SPRN_SRR1,r12
+        rfid            /* return to userspace */
+        b       .
+
+        STD_EXCEPTION_PSERIES(0xd00, single_step)
+        STD_EXCEPTION_PSERIES(0xe00, trap_0e)
+
+        /* We need to deal with the Altivec unavailable exception
+         * here which is at 0xf20, thus in the middle of the
+         * prolog code of the PerformanceMonitor one. A little
+         * trickery is thus necessary
+         */
+        . = 0xf00
+        b       performance_monitor_pSeries
+
+        . = 0xf20
+        b       altivec_unavailable_pSeries
+
+        . = 0xf40
+        b       vsx_unavailable_pSeries
+
+#ifdef CONFIG_CBE_RAS
+        HSTD_EXCEPTION_PSERIES(0x1200, cbe_system_error)
+#endif /* CONFIG_CBE_RAS */
+        STD_EXCEPTION_PSERIES(0x1300, instruction_breakpoint)
+#ifdef CONFIG_CBE_RAS
+        HSTD_EXCEPTION_PSERIES(0x1600, cbe_maintenance)
+#endif /* CONFIG_CBE_RAS */
+        STD_EXCEPTION_PSERIES(0x1700, altivec_assist)
+#ifdef CONFIG_CBE_RAS
+        HSTD_EXCEPTION_PSERIES(0x1800, cbe_thermal)
+#endif /* CONFIG_CBE_RAS */
+
+        . = 0x3000
+
+/*** pSeries interrupt support ***/
+
+        /* moved from 0xf00 */
+        STD_EXCEPTION_PSERIES(., performance_monitor)
+        STD_EXCEPTION_PSERIES(., altivec_unavailable)
+        STD_EXCEPTION_PSERIES(., vsx_unavailable)
+
+/*
+ * An interrupt came in while soft-disabled; clear EE in SRR1,
+ * clear paca->hard_enabled and return.
+ */
+masked_interrupt:
+        stb     r10,PACAHARDIRQEN(r13)
+        mtcrf   0x80,r9
+        ld      r9,PACA_EXGEN+EX_R9(r13)
+        mfspr   r10,SPRN_SRR1
+        rldicl  r10,r10,48,1            /* clear MSR_EE */
+        rotldi  r10,r10,16
+        mtspr   SPRN_SRR1,r10
+        ld      r10,PACA_EXGEN+EX_R10(r13)
+        mfspr   r13,SPRN_SPRG1
+        rfid
+        b       .
+
+        .align  7
+do_stab_bolted_pSeries:
+        mtcrf   0x80,r12
+        mfspr   r12,SPRN_SPRG2
+        EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted)
+
+#ifdef CONFIG_PPC_PSERIES
+/*
+ * Vectors for the FWNMI option.  Share common code.
+ */
+        .globl system_reset_fwnmi
+      .align 7
+system_reset_fwnmi:
+        HMT_MEDIUM
+        mtspr   SPRN_SPRG1,r13          /* save r13 */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
+
+        .globl machine_check_fwnmi
+      .align 7
+machine_check_fwnmi:
+        HMT_MEDIUM
+        mtspr   SPRN_SPRG1,r13          /* save r13 */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
+
+#endif /* CONFIG_PPC_PSERIES */
+
+#ifdef __DISABLED__
+/*
+ * This is used for when the SLB miss handler has to go virtual,
+ * which doesn't happen for now anymore but will once we re-implement
+ * dynamic VSIDs for shared page tables
+ */
+slb_miss_user_pseries:
+        std     r10,PACA_EXGEN+EX_R10(r13)
+        std     r11,PACA_EXGEN+EX_R11(r13)
+        std     r12,PACA_EXGEN+EX_R12(r13)
+        mfspr   r10,SPRG1
+        ld      r11,PACA_EXSLB+EX_R9(r13)
+        ld      r12,PACA_EXSLB+EX_R3(r13)
+        std     r10,PACA_EXGEN+EX_R13(r13)
+        std     r11,PACA_EXGEN+EX_R9(r13)
+        std     r12,PACA_EXGEN+EX_R3(r13)
+        clrrdi  r12,r13,32
+        mfmsr   r10
+        mfspr   r11,SRR0                        /* save SRR0 */
+        ori     r12,r12,slb_miss_user_common@l  /* virt addr of handler */
+        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI
+        mtspr   SRR0,r12
+        mfspr   r12,SRR1                        /* and SRR1 */
+        mtspr   SRR1,r10
+        rfid
+        b       .                               /* prevent spec. execution */
+#endif /* __DISABLED__ */
+
+        .align  7
+        .globl  __end_interrupts
+__end_interrupts:
+
+/*
+ * Code from here down to __end_handlers is invoked from the
+ * exception prologs above.  Because the prologs assemble the
+ * addresses of these handlers using the LOAD_HANDLER macro,
+ * which uses an addi instruction, these handlers must be in
+ * the first 32k of the kernel image.
+ */
+
+/*** Common interrupt handlers ***/
+
+        STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception)
+
+        /*
+         * Machine check is different because we use a different
+         * save area: PACA_EXMC instead of PACA_EXGEN.
+         */
+        .align  7
+        .globl machine_check_common
+machine_check_common:
+        EXCEPTION_PROLOG_COMMON(0x200, PACA_EXMC)
+        FINISH_NAP
+        DISABLE_INTS
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .machine_check_exception
+        b       .ret_from_except
+
+        STD_EXCEPTION_COMMON_LITE(0x900, decrementer, .timer_interrupt)
+        STD_EXCEPTION_COMMON(0xa00, trap_0a, .unknown_exception)
+        STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception)
+        STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception)
+        STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception)
+        STD_EXCEPTION_COMMON_IDLE(0xf00, performance_monitor, .performance_monitor_exception)
+        STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception)
+#ifdef CONFIG_ALTIVEC
+        STD_EXCEPTION_COMMON(0x1700, altivec_assist, .altivec_assist_exception)
+#else
+        STD_EXCEPTION_COMMON(0x1700, altivec_assist, .unknown_exception)
+#endif
+#ifdef CONFIG_CBE_RAS
+        STD_EXCEPTION_COMMON(0x1200, cbe_system_error, .cbe_system_error_exception)
+        STD_EXCEPTION_COMMON(0x1600, cbe_maintenance, .cbe_maintenance_exception)
+        STD_EXCEPTION_COMMON(0x1800, cbe_thermal, .cbe_thermal_exception)
+#endif /* CONFIG_CBE_RAS */
+
+        .align  7
+system_call_entry:
+        b       system_call_common
+
+/*
+ * Here we have detected that the kernel stack pointer is bad.
+ * R9 contains the saved CR, r13 points to the paca,
+ * r10 contains the (bad) kernel stack pointer,
+ * r11 and r12 contain the saved SRR0 and SRR1.
+ * We switch to using an emergency stack, save the registers there,
+ * and call kernel_bad_stack(), which panics.
+ */
+bad_stack:
+        ld      r1,PACAEMERGSP(r13)
+        subi    r1,r1,64+INT_FRAME_SIZE
+        std     r9,_CCR(r1)
+        std     r10,GPR1(r1)
+        std     r11,_NIP(r1)
+        std     r12,_MSR(r1)
+        mfspr   r11,SPRN_DAR
+        mfspr   r12,SPRN_DSISR
+        std     r11,_DAR(r1)
+        std     r12,_DSISR(r1)
+        mflr    r10
+        mfctr   r11
+        mfxer   r12
+        std     r10,_LINK(r1)
+        std     r11,_CTR(r1)
+        std     r12,_XER(r1)
+        SAVE_GPR(0,r1)
+        SAVE_GPR(2,r1)
+        SAVE_4GPRS(3,r1)
+        SAVE_2GPRS(7,r1)
+        SAVE_10GPRS(12,r1)
+        SAVE_10GPRS(22,r1)
+        lhz     r12,PACA_TRAP_SAVE(r13)
+        std     r12,_TRAP(r1)
+        addi    r11,r1,INT_FRAME_SIZE
+        std     r11,0(r1)
+        li      r12,0
+        std     r12,0(r11)
+        ld      r2,PACATOC(r13)
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .kernel_bad_stack
+        b       1b
+
+/*
+ * Here r13 points to the paca, r9 contains the saved CR,
+ * SRR0 and SRR1 are saved in r11 and r12,
+ * r9 - r13 are saved in paca->exgen.
+ */
+        .align  7
+        .globl data_access_common
+data_access_common:
+        mfspr   r10,SPRN_DAR
+        std     r10,PACA_EXGEN+EX_DAR(r13)
+        mfspr   r10,SPRN_DSISR
+        stw     r10,PACA_EXGEN+EX_DSISR(r13)
+        EXCEPTION_PROLOG_COMMON(0x300, PACA_EXGEN)
+        ld      r3,PACA_EXGEN+EX_DAR(r13)
+        lwz     r4,PACA_EXGEN+EX_DSISR(r13)
+        li      r5,0x300
+        b       .do_hash_page           /* Try to handle as hpte fault */
+
+        .align  7
+        .globl instruction_access_common
+instruction_access_common:
+        EXCEPTION_PROLOG_COMMON(0x400, PACA_EXGEN)
+        ld      r3,_NIP(r1)
+        andis.  r4,r12,0x5820
+        li      r5,0x400
+        b       .do_hash_page           /* Try to handle as hpte fault */
+
+/*
+ * Here is the common SLB miss user that is used when going to virtual
+ * mode for SLB misses, that is currently not used
+ */
+#ifdef __DISABLED__
+        .align  7
+        .globl  slb_miss_user_common
+slb_miss_user_common:
+        mflr    r10
+        std     r3,PACA_EXGEN+EX_DAR(r13)
+        stw     r9,PACA_EXGEN+EX_CCR(r13)
+        std     r10,PACA_EXGEN+EX_LR(r13)
+        std     r11,PACA_EXGEN+EX_SRR0(r13)
+        bl      .slb_allocate_user
+
+        ld      r10,PACA_EXGEN+EX_LR(r13)
+        ld      r3,PACA_EXGEN+EX_R3(r13)
+        lwz     r9,PACA_EXGEN+EX_CCR(r13)
+        ld      r11,PACA_EXGEN+EX_SRR0(r13)
+        mtlr    r10
+        beq-    slb_miss_fault
+
+        andi.   r10,r12,MSR_RI          /* check for unrecoverable exception */
+        beq-    unrecov_user_slb
+        mfmsr   r10
+
+.machine push
+.machine "power4"
+        mtcrf   0x80,r9
+.machine pop
+
+        clrrdi  r10,r10,2               /* clear RI before setting SRR0/1 */
+        mtmsrd  r10,1
+
+        mtspr   SRR0,r11
+        mtspr   SRR1,r12
+
+        ld      r9,PACA_EXGEN+EX_R9(r13)
+        ld      r10,PACA_EXGEN+EX_R10(r13)
+        ld      r11,PACA_EXGEN+EX_R11(r13)
+        ld      r12,PACA_EXGEN+EX_R12(r13)
+        ld      r13,PACA_EXGEN+EX_R13(r13)
+        rfid
+        b       .
+
+slb_miss_fault:
+        EXCEPTION_PROLOG_COMMON(0x380, PACA_EXGEN)
+        ld      r4,PACA_EXGEN+EX_DAR(r13)
+        li      r5,0
+        std     r4,_DAR(r1)
+        std     r5,_DSISR(r1)
+        b       handle_page_fault
+
+unrecov_user_slb:
+        EXCEPTION_PROLOG_COMMON(0x4200, PACA_EXGEN)
+        DISABLE_INTS
+        bl      .save_nvgprs
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .unrecoverable_exception
+        b       1b
+
+#endif /* __DISABLED__ */
+
+
+/*
+ * r13 points to the PACA, r9 contains the saved CR,
+ * r12 contain the saved SRR1, SRR0 is still ready for return
+ * r3 has the faulting address
+ * r9 - r13 are saved in paca->exslb.
+ * r3 is saved in paca->slb_r3
+ * We assume we aren't going to take any exceptions during this procedure.
+ */
+_GLOBAL(slb_miss_realmode)
+        mflr    r10
+#ifdef CONFIG_RELOCATABLE
+        mtctr   r11
+#endif
+
+        stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
+        std     r10,PACA_EXSLB+EX_LR(r13)       /* save LR */
+
+        bl      .slb_allocate_realmode
+
+        /* All done -- return from exception. */
+
+        ld      r10,PACA_EXSLB+EX_LR(r13)
+        ld      r3,PACA_EXSLB+EX_R3(r13)
+        lwz     r9,PACA_EXSLB+EX_CCR(r13)       /* get saved CR */
+#ifdef CONFIG_PPC_ISERIES
+BEGIN_FW_FTR_SECTION
+        ld      r11,PACALPPACAPTR(r13)
+        ld      r11,LPPACASRR0(r11)             /* get SRR0 value */
+END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
+#endif /* CONFIG_PPC_ISERIES */
+
+        mtlr    r10
+
+        andi.   r10,r12,MSR_RI  /* check for unrecoverable exception */
+        beq-    2f
+
+.machine        push
+.machine        "power4"
+        mtcrf   0x80,r9
+        mtcrf   0x01,r9         /* slb_allocate uses cr0 and cr7 */
+.machine        pop
+
+#ifdef CONFIG_PPC_ISERIES
+BEGIN_FW_FTR_SECTION
+        mtspr   SPRN_SRR0,r11
+        mtspr   SPRN_SRR1,r12
+END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
+#endif /* CONFIG_PPC_ISERIES */
+        ld      r9,PACA_EXSLB+EX_R9(r13)
+        ld      r10,PACA_EXSLB+EX_R10(r13)
+        ld      r11,PACA_EXSLB+EX_R11(r13)
+        ld      r12,PACA_EXSLB+EX_R12(r13)
+        ld      r13,PACA_EXSLB+EX_R13(r13)
+        rfid
+        b       .       /* prevent speculative execution */
+
+2:
+#ifdef CONFIG_PPC_ISERIES
+BEGIN_FW_FTR_SECTION
+        b       unrecov_slb
+END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
+#endif /* CONFIG_PPC_ISERIES */
+        mfspr   r11,SPRN_SRR0
+        ld      r10,PACAKBASE(r13)
+        LOAD_HANDLER(r10,unrecov_slb)
+        mtspr   SPRN_SRR0,r10
+        ld      r10,PACAKMSR(r13)
+        mtspr   SPRN_SRR1,r10
+        rfid
+        b       .
+
+unrecov_slb:
+        EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
+        DISABLE_INTS
+        bl      .save_nvgprs
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .unrecoverable_exception
+        b       1b
+
+        .align  7
+        .globl hardware_interrupt_common
+        .globl hardware_interrupt_entry
+hardware_interrupt_common:
+        EXCEPTION_PROLOG_COMMON(0x500, PACA_EXGEN)
+        FINISH_NAP
+hardware_interrupt_entry:
+        DISABLE_INTS
+BEGIN_FTR_SECTION
+        bl      .ppc64_runlatch_on
+END_FTR_SECTION_IFSET(CPU_FTR_CTRL)
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .do_IRQ
+        b       .ret_from_except_lite
+
+#ifdef CONFIG_PPC_970_NAP
+power4_fixup_nap:
+        andc    r9,r9,r10
+        std     r9,TI_LOCAL_FLAGS(r11)
+        ld      r10,_LINK(r1)           /* make idle task do the */
+        std     r10,_NIP(r1)            /* equivalent of a blr */
+        blr
+#endif
+
+        .align  7
+        .globl alignment_common
+alignment_common:
+        mfspr   r10,SPRN_DAR
+        std     r10,PACA_EXGEN+EX_DAR(r13)
+        mfspr   r10,SPRN_DSISR
+        stw     r10,PACA_EXGEN+EX_DSISR(r13)
+        EXCEPTION_PROLOG_COMMON(0x600, PACA_EXGEN)
+        ld      r3,PACA_EXGEN+EX_DAR(r13)
+        lwz     r4,PACA_EXGEN+EX_DSISR(r13)
+        std     r3,_DAR(r1)
+        std     r4,_DSISR(r1)
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        ENABLE_INTS
+        bl      .alignment_exception
+        b       .ret_from_except
+
+        .align  7
+        .globl program_check_common
+program_check_common:
+        EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        ENABLE_INTS
+        bl      .program_check_exception
+        b       .ret_from_except
+
+        .align  7
+        .globl fp_unavailable_common
+fp_unavailable_common:
+        EXCEPTION_PROLOG_COMMON(0x800, PACA_EXGEN)
+        bne     1f                      /* if from user, just load it up */
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        ENABLE_INTS
+        bl      .kernel_fp_unavailable_exception
+        BUG_OPCODE
+1:      bl      .load_up_fpu
+        b       fast_exception_return
+
+        .align  7
+        .globl altivec_unavailable_common
+altivec_unavailable_common:
+        EXCEPTION_PROLOG_COMMON(0xf20, PACA_EXGEN)
+#ifdef CONFIG_ALTIVEC
+BEGIN_FTR_SECTION
+        beq     1f
+        bl      .load_up_altivec
+        b       fast_exception_return
+1:
+END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
+#endif
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        ENABLE_INTS
+        bl      .altivec_unavailable_exception
+        b       .ret_from_except
+
+        .align  7
+        .globl vsx_unavailable_common
+vsx_unavailable_common:
+        EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)
+#ifdef CONFIG_VSX
+BEGIN_FTR_SECTION
+        bne     .load_up_vsx
+1:
+END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        ENABLE_INTS
+        bl      .vsx_unavailable_exception
+        b       .ret_from_except
+
+        .align  7
+        .globl  __end_handlers
+__end_handlers:
+
+/*
+ * Return from an exception with minimal checks.
+ * The caller is assumed to have done EXCEPTION_PROLOG_COMMON.
+ * If interrupts have been enabled, or anything has been
+ * done that might have changed the scheduling status of
+ * any task or sent any task a signal, you should use
+ * ret_from_except or ret_from_except_lite instead of this.
+ */
+fast_exc_return_irq:                    /* restores irq state too */
+        ld      r3,SOFTE(r1)
+        TRACE_AND_RESTORE_IRQ(r3);
+        ld      r12,_MSR(r1)
+        rldicl  r4,r12,49,63            /* get MSR_EE to LSB */
+        stb     r4,PACAHARDIRQEN(r13)   /* restore paca->hard_enabled */
+        b       1f
+
+        .globl  fast_exception_return
+fast_exception_return:
+        ld      r12,_MSR(r1)
+1:      ld      r11,_NIP(r1)
+        andi.   r3,r12,MSR_RI           /* check if RI is set */
+        beq-    unrecov_fer
+
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+        andi.   r3,r12,MSR_PR
+        beq     2f
+        ACCOUNT_CPU_USER_EXIT(r3, r4)
+2:
+#endif
+
+        ld      r3,_CCR(r1)
+        ld      r4,_LINK(r1)
+        ld      r5,_CTR(r1)
+        ld      r6,_XER(r1)
+        mtcr    r3
+        mtlr    r4
+        mtctr   r5
+        mtxer   r6
+        REST_GPR(0, r1)
+        REST_8GPRS(2, r1)
+
+        mfmsr   r10
+        rldicl  r10,r10,48,1            /* clear EE */
+        rldicr  r10,r10,16,61           /* clear RI (LE is 0 already) */
+        mtmsrd  r10,1
+
+        mtspr   SPRN_SRR1,r12
+        mtspr   SPRN_SRR0,r11
+        REST_4GPRS(10, r1)
+        ld      r1,GPR1(r1)
+        rfid
+        b       .       /* prevent speculative execution */
+
+unrecov_fer:
+        bl      .save_nvgprs
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .unrecoverable_exception
+        b       1b
+
+
+/*
+ * Hash table stuff
+ */
+        .align  7
+_STATIC(do_hash_page)
+        std     r3,_DAR(r1)
+        std     r4,_DSISR(r1)
+
+        andis.  r0,r4,0xa450            /* weird error? */
+        bne-    handle_page_fault       /* if not, try to insert a HPTE */
+BEGIN_FTR_SECTION
+        andis.  r0,r4,0x0020            /* Is it a segment table fault? */
+        bne-    do_ste_alloc            /* If so handle it */
+END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
+
+        /*
+         * On iSeries, we soft-disable interrupts here, then
+         * hard-enable interrupts so that the hash_page code can spin on
+         * the hash_table_lock without problems on a shared processor.
+         */
+        DISABLE_INTS
+
+        /*
+         * Currently, trace_hardirqs_off() will be called by DISABLE_INTS
+         * and will clobber volatile registers when irq tracing is enabled
+         * so we need to reload them. It may be possible to be smarter here
+         * and move the irq tracing elsewhere but let's keep it simple for
+         * now
+         */
+#ifdef CONFIG_TRACE_IRQFLAGS
+        ld      r3,_DAR(r1)
+        ld      r4,_DSISR(r1)
+        ld      r5,_TRAP(r1)
+        ld      r12,_MSR(r1)
+        clrrdi  r5,r5,4
+#endif /* CONFIG_TRACE_IRQFLAGS */
+        /*
+         * We need to set the _PAGE_USER bit if MSR_PR is set or if we are
+         * accessing a userspace segment (even from the kernel). We assume
+         * kernel addresses always have the high bit set.
+         */
+        rlwinm  r4,r4,32-25+9,31-9,31-9 /* DSISR_STORE -> _PAGE_RW */
+        rotldi  r0,r3,15                /* Move high bit into MSR_PR posn */
+        orc     r0,r12,r0               /* MSR_PR | ~high_bit */
+        rlwimi  r4,r0,32-13,30,30       /* becomes _PAGE_USER access bit */
+        ori     r4,r4,1                 /* add _PAGE_PRESENT */
+        rlwimi  r4,r5,22+2,31-2,31-2    /* Set _PAGE_EXEC if trap is 0x400 */
+
+        /*
+         * r3 contains the faulting address
+         * r4 contains the required access permissions
+         * r5 contains the trap number
+         *
+         * at return r3 = 0 for success
+         */
+        bl      .hash_page              /* build HPTE if possible */
+        cmpdi   r3,0                    /* see if hash_page succeeded */
+
+BEGIN_FW_FTR_SECTION
+        /*
+         * If we had interrupts soft-enabled at the point where the
+         * DSI/ISI occurred, and an interrupt came in during hash_page,
+         * handle it now.
+         * We jump to ret_from_except_lite rather than fast_exception_return
+         * because ret_from_except_lite will check for and handle pending
+         * interrupts if necessary.
+         */
+        beq     13f
+END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
+
+BEGIN_FW_FTR_SECTION
+        /*
+         * Here we have interrupts hard-disabled, so it is sufficient
+         * to restore paca->{soft,hard}_enable and get out.
+         */
+        beq     fast_exc_return_irq     /* Return from exception on success */
+END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
+
+        /* For a hash failure, we don't bother re-enabling interrupts */
+        ble-    12f
+
+        /*
+         * hash_page couldn't handle it, set soft interrupt enable back
+         * to what it was before the trap.  Note that .raw_local_irq_restore
+         * handles any interrupts pending at this point.
+         */
+        ld      r3,SOFTE(r1)
+        TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)
+        bl      .raw_local_irq_restore
+        b       11f
+
+/* Here we have a page fault that hash_page can't handle. */
+handle_page_fault:
+        ENABLE_INTS
+11:     ld      r4,_DAR(r1)
+        ld      r5,_DSISR(r1)
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .do_page_fault
+        cmpdi   r3,0
+        beq+    13f
+        bl      .save_nvgprs
+        mr      r5,r3
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        lwz     r4,_DAR(r1)
+        bl      .bad_page_fault
+        b       .ret_from_except
+
+13:     b       .ret_from_except_lite
+
+/* We have a page fault that hash_page could handle but HV refused
+ * the PTE insertion
+ */
+12:     bl      .save_nvgprs
+        mr      r5,r3
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        ld      r4,_DAR(r1)
+        bl      .low_hash_fault
+        b       .ret_from_except
+
+        /* here we have a segment miss */
+do_ste_alloc:
+        bl      .ste_allocate           /* try to insert stab entry */
+        cmpdi   r3,0
+        bne-    handle_page_fault
+        b       fast_exception_return
+
+/*
+ * r13 points to the PACA, r9 contains the saved CR,
+ * r11 and r12 contain the saved SRR0 and SRR1.
+ * r9 - r13 are saved in paca->exslb.
+ * We assume we aren't going to take any exceptions during this procedure.
+ * We assume (DAR >> 60) == 0xc.
+ */
+        .align  7
+_GLOBAL(do_stab_bolted)
+        stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
+        std     r11,PACA_EXSLB+EX_SRR0(r13)     /* save SRR0 in exc. frame */
+
+        /* Hash to the primary group */
+        ld      r10,PACASTABVIRT(r13)
+        mfspr   r11,SPRN_DAR
+        srdi    r11,r11,28
+        rldimi  r10,r11,7,52    /* r10 = first ste of the group */
+
+        /* Calculate VSID */
+        /* This is a kernel address, so protovsid = ESID */
+        ASM_VSID_SCRAMBLE(r11, r9, 256M)
+        rldic   r9,r11,12,16    /* r9 = vsid << 12 */
+
+        /* Search the primary group for a free entry */
+1:      ld      r11,0(r10)      /* Test valid bit of the current ste    */
+        andi.   r11,r11,0x80
+        beq     2f
+        addi    r10,r10,16
+        andi.   r11,r10,0x70
+        bne     1b
+
+        /* Stick for only searching the primary group for now.          */
+        /* At least for now, we use a very simple random castout scheme */
+        /* Use the TB as a random number ;  OR in 1 to avoid entry 0    */
+        mftb    r11
+        rldic   r11,r11,4,57    /* r11 = (r11 << 4) & 0x70 */
+        ori     r11,r11,0x10
+
+        /* r10 currently points to an ste one past the group of interest */
+        /* make it point to the randomly selected entry                 */
+        subi    r10,r10,128
+        or      r10,r10,r11     /* r10 is the entry to invalidate       */
+
+        isync                   /* mark the entry invalid               */
+        ld      r11,0(r10)
+        rldicl  r11,r11,56,1    /* clear the valid bit */
+        rotldi  r11,r11,8
+        std     r11,0(r10)
+        sync
+
+        clrrdi  r11,r11,28      /* Get the esid part of the ste         */
+        slbie   r11
+
+2:      std     r9,8(r10)       /* Store the vsid part of the ste       */
+        eieio
+
+        mfspr   r11,SPRN_DAR            /* Get the new esid                     */
+        clrrdi  r11,r11,28      /* Permits a full 32b of ESID           */
+        ori     r11,r11,0x90    /* Turn on valid and kp                 */
+        std     r11,0(r10)      /* Put new entry back into the stab     */
+
+        sync
+
+        /* All done -- return from exception. */
+        lwz     r9,PACA_EXSLB+EX_CCR(r13)       /* get saved CR */
+        ld      r11,PACA_EXSLB+EX_SRR0(r13)     /* get saved SRR0 */
+
+        andi.   r10,r12,MSR_RI
+        beq-    unrecov_slb
+
+        mtcrf   0x80,r9                 /* restore CR */
+
+        mfmsr   r10
+        clrrdi  r10,r10,2
+        mtmsrd  r10,1
+
+        mtspr   SPRN_SRR0,r11
+        mtspr   SPRN_SRR1,r12
+        ld      r9,PACA_EXSLB+EX_R9(r13)
+        ld      r10,PACA_EXSLB+EX_R10(r13)
+        ld      r11,PACA_EXSLB+EX_R11(r13)
+        ld      r12,PACA_EXSLB+EX_R12(r13)
+        ld      r13,PACA_EXSLB+EX_R13(r13)
+        rfid
+        b       .       /* prevent speculative execution */
+
+/*
+ * Space for CPU0's segment table.
+ *
+ * On iSeries, the hypervisor must fill in at least one entry before
+ * we get control (with relocate on).  The address is given to the hv
+ * as a page number (see xLparMap below), so this must be at a
+ * fixed address (the linker can't compute (u64)&initial_stab >>
+ * PAGE_SHIFT).
+ */
+        . = STAB0_OFFSET        /* 0x6000 */
+        .globl initial_stab
+initial_stab:
+        .space  4096
+
+#ifdef CONFIG_PPC_PSERIES
+/*
+ * Data area reserved for FWNMI option.
+ * This address (0x7000) is fixed by the RPA.
+ */
+        .= 0x7000
+        .globl fwnmi_data_area
+fwnmi_data_area:
+#endif /* CONFIG_PPC_PSERIES */
+
+        /* iSeries does not use the FWNMI stuff, so it is safe to put
+         * this here, even if we later allow kernels that will boot on
+         * both pSeries and iSeries */
+#ifdef CONFIG_PPC_ISERIES
+        . = LPARMAP_PHYS
+        .globl xLparMap
+xLparMap:
+        .quad   HvEsidsToMap            /* xNumberEsids */
+        .quad   HvRangesToMap           /* xNumberRanges */
+        .quad   STAB0_PAGE              /* xSegmentTableOffs */
+        .zero   40                      /* xRsvd */
+        /* xEsids (HvEsidsToMap entries of 2 quads) */
+        .quad   PAGE_OFFSET_ESID        /* xKernelEsid */
+        .quad   PAGE_OFFSET_VSID        /* xKernelVsid */
+        .quad   VMALLOC_START_ESID      /* xKernelEsid */
+        .quad   VMALLOC_START_VSID      /* xKernelVsid */
+        /* xRanges (HvRangesToMap entries of 3 quads) */
+        .quad   HvPagesToMap            /* xPages */
+        .quad   0                       /* xOffset */
+        .quad   PAGE_OFFSET_VSID << (SID_SHIFT - HW_PAGE_SHIFT) /* xVPN */
+
+#endif /* CONFIG_PPC_ISERIES */
+
+#ifdef CONFIG_PPC_PSERIES
+        . = 0x8000
+#endif /* CONFIG_PPC_PSERIES */
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 2d182f119d1d..1b12696cca06 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -23,25 +23,14 @@
 #include <asm/code-patching.h>
 #include <asm/ftrace.h>
 
-#ifdef CONFIG_PPC32
-# define GET_ADDR(addr) addr
-#else
-/* PowerPC64's functions are data that points to the functions */
-# define GET_ADDR(addr) (*(unsigned long *)addr)
-#endif
 
 #ifdef CONFIG_DYNAMIC_FTRACE
-static unsigned int ftrace_nop_replace(void)
-{
-        return PPC_INST_NOP;
-}
-
 static unsigned int
 ftrace_call_replace(unsigned long ip, unsigned long addr, int link)
 {
         unsigned int op;
 
-        addr = GET_ADDR(addr);
+        addr = ppc_function_entry((void *)addr);
 
         /* if (link) set op to 'bl' else 'b' */
         op = create_branch((unsigned int *)ip, addr, link ? 1 : 0);
@@ -49,14 +38,6 @@ ftrace_call_replace(unsigned long ip, unsigned long addr, int link)
         return op;
 }
 
-#ifdef CONFIG_PPC64
-# define _ASM_ALIGN     " .align 3 "
-# define _ASM_PTR       " .llong "
-#else
-# define _ASM_ALIGN     " .align 2 "
-# define _ASM_PTR       " .long "
-#endif
-
 static int
 ftrace_modify_code(unsigned long ip, unsigned int old, unsigned int new)
 {
@@ -197,7 +178,7 @@ __ftrace_make_nop(struct module *mod,
         ptr = ((unsigned long)jmp[0] << 32) + jmp[1];
 
         /* This should match what was called */
-        if (ptr != GET_ADDR(addr)) {
+        if (ptr != ppc_function_entry((void *)addr)) {
                 printk(KERN_ERR "addr does not match %lx\n", ptr);
                 return -EINVAL;
         }
@@ -328,7 +309,7 @@ int ftrace_make_nop(struct module *mod,
         if (test_24bit_addr(ip, addr)) {
                 /* within range */
                 old = ftrace_call_replace(ip, addr, 1);
-                new = ftrace_nop_replace();
+                new = PPC_INST_NOP;
                 return ftrace_modify_code(ip, old, new);
         }
 
@@ -466,7 +447,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
          */
         if (test_24bit_addr(ip, addr)) {
                 /* within range */
-                old = ftrace_nop_replace();
+                old = PPC_INST_NOP;
                 new = ftrace_call_replace(ip, addr, 1);
                 return ftrace_modify_code(ip, old, new);
         }
@@ -570,7 +551,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
                 return_hooker = (unsigned long)&mod_return_to_handler;
 #endif
 
-        return_hooker = GET_ADDR(return_hooker);
+        return_hooker = ppc_function_entry((void *)return_hooker);
 
         /*
          * Protect against fault, even if it shouldn't
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index c01467f952d3..48469463f89e 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -733,9 +733,11 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)
 AltiVecUnavailable:
         EXCEPTION_PROLOG
 #ifdef CONFIG_ALTIVEC
-        bne     load_up_altivec         /* if from user, just load it up */
+        beq     1f
+        bl      load_up_altivec         /* if from user, just load it up */
+        b       fast_exception_return
 #endif /* CONFIG_ALTIVEC */
-        addi    r3,r1,STACK_FRAME_OVERHEAD
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD
         EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception)
 
 PerformanceMonitor:
@@ -743,101 +745,6 @@ PerformanceMonitor:
         addi    r3,r1,STACK_FRAME_OVERHEAD
         EXC_XFER_STD(0xf00, performance_monitor_exception)
 
-#ifdef CONFIG_ALTIVEC
-/* Note that the AltiVec support is closely modeled after the FP
- * support.  Changes to one are likely to be applicable to the
- * other!  */
-load_up_altivec:
-/*
- * Disable AltiVec for the task which had AltiVec previously,
- * and save its AltiVec registers in its thread_struct.
- * Enables AltiVec for use in the kernel on return.
- * On SMP we know the AltiVec units are free, since we give it up every
- * switch.  -- Kumar
- */
-        mfmsr   r5
-        oris    r5,r5,MSR_VEC@h
-        MTMSRD(r5)                      /* enable use of AltiVec now */
-        isync
-/*
- * For SMP, we don't do lazy AltiVec switching because it just gets too
- * horrendously complex, especially when a task switches from one CPU
- * to another.  Instead we call giveup_altivec in switch_to.
- */
-#ifndef CONFIG_SMP
-        tophys(r6,0)
-        addis   r3,r6,last_task_used_altivec@ha
-        lwz     r4,last_task_used_altivec@l(r3)
-        cmpwi   0,r4,0
-        beq     1f
-        add     r4,r4,r6
-        addi    r4,r4,THREAD    /* want THREAD of last_task_used_altivec */
-        SAVE_32VRS(0,r10,r4)
-        mfvscr  vr0
-        li      r10,THREAD_VSCR
-        stvx    vr0,r10,r4
-        lwz     r5,PT_REGS(r4)
-        add     r5,r5,r6
-        lwz     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-        lis     r10,MSR_VEC@h
-        andc    r4,r4,r10       /* disable altivec for previous task */
-        stw     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-1:
-#endif /* CONFIG_SMP */
-        /* enable use of AltiVec after return */
-        oris    r9,r9,MSR_VEC@h
-        mfspr   r5,SPRN_SPRG3           /* current task's THREAD (phys) */
-        li      r4,1
-        li      r10,THREAD_VSCR
-        stw     r4,THREAD_USED_VR(r5)
-        lvx     vr0,r10,r5
-        mtvscr  vr0
-        REST_32VRS(0,r10,r5)
-#ifndef CONFIG_SMP
-        subi    r4,r5,THREAD
-        sub     r4,r4,r6
-        stw     r4,last_task_used_altivec@l(r3)
-#endif /* CONFIG_SMP */
-        /* restore registers and return */
-        /* we haven't used ctr or xer or lr */
-        b       fast_exception_return
-
-/*
- * giveup_altivec(tsk)
- * Disable AltiVec for the task given as the argument,
- * and save the AltiVec registers in its thread_struct.
- * Enables AltiVec for use in the kernel on return.
- */
-
-        .globl  giveup_altivec
-giveup_altivec:
-        mfmsr   r5
-        oris    r5,r5,MSR_VEC@h
-        SYNC
-        MTMSRD(r5)                      /* enable use of AltiVec now */
-        isync
-        cmpwi   0,r3,0
-        beqlr-                          /* if no previous owner, done */
-        addi    r3,r3,THREAD            /* want THREAD of task */
-        lwz     r5,PT_REGS(r3)
-        cmpwi   0,r5,0
-        SAVE_32VRS(0, r4, r3)
-        mfvscr  vr0
-        li      r4,THREAD_VSCR
-        stvx    vr0,r4,r3
-        beq     1f
-        lwz     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-        lis     r3,MSR_VEC@h
-        andc    r4,r4,r3                /* disable AltiVec for previous task */
-        stw     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-1:
-#ifndef CONFIG_SMP
-        li      r5,0
-        lis     r4,last_task_used_altivec@ha
-        stw     r5,last_task_used_altivec@l(r4)
-#endif /* CONFIG_SMP */
-        blr
-#endif /* CONFIG_ALTIVEC */
 
 /*
  * This code is jumped to from the startup code to copy
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 50ef505b8fb6..012505ebd9f9 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -12,8 +12,9 @@
  *  Adapted for 64bit PowerPC by Dave Engebretsen, Peter Bergner, and
  *    Mike Corrigan {engebret|bergner|mikejc}@us.ibm.com
  *
- *  This file contains the low-level support and setup for the
- *  PowerPC-64 platform, including trap and interrupt dispatch.
+ *  This file contains the entry point for the 64-bit kernel along
+ *  with some early initialization code common to all 64-bit powerpc
+ *  variants.
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -38,36 +39,25 @@
 #include <asm/exception.h>
 #include <asm/irqflags.h>
 
-/*
- * We layout physical memory as follows:
- * 0x0000 - 0x00ff : Secondary processor spin code
- * 0x0100 - 0x2fff : pSeries Interrupt prologs
- * 0x3000 - 0x5fff : interrupt support, iSeries and common interrupt prologs
- * 0x6000 - 0x6fff : Initial (CPU0) segment table
- * 0x7000 - 0x7fff : FWNMI data area
- * 0x8000 -        : Early init and support code
- */
-
-/*
- *   SPRG Usage
- *
- *   Register   Definition
- *
- *   SPRG0      reserved for hypervisor
- *   SPRG1      temp - used to save gpr
- *   SPRG2      temp - used to save gpr
- *   SPRG3      virt addr of paca
+/* The physical memory is layed out such that the secondary processor
+ * spin code sits at 0x0000...0x00ff. On server, the vectors follow
+ * using the layout described in exceptions-64s.S
  */
 
 /*
  * Entering into this code we make the following assumptions:
- *  For pSeries:
+ *
+ *  For pSeries or server processors:
  *   1. The MMU is off & open firmware is running in real mode.
  *   2. The kernel is entered at __start
  *
  *  For iSeries:
  *   1. The MMU is on (as it always is for iSeries)
  *   2. The kernel is entered at system_reset_iSeries
+ *
+ *  For Book3E processors:
+ *   1. The MMU is on running in AS0 in a state defined in ePAPR
+ *   2. The kernel is entered at __start
  */
 
         .text
@@ -166,1065 +156,14 @@ exception_marker:
         .text
 
 /*
- * This is the start of the interrupt handlers for pSeries
- * This code runs with relocation off.
- * Code from here to __end_interrupts gets copied down to real
- * address 0x100 when we are running a relocatable kernel.
- * Therefore any relative branches in this section must only
- * branch to labels in this section.
- */
-        . = 0x100
-        .globl __start_interrupts
-__start_interrupts:
-
-        STD_EXCEPTION_PSERIES(0x100, system_reset)
-
-        . = 0x200
-_machine_check_pSeries:
-        HMT_MEDIUM
-        mtspr   SPRN_SPRG1,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
-
-        . = 0x300
-        .globl data_access_pSeries
-data_access_pSeries:
-        HMT_MEDIUM
-        mtspr   SPRN_SPRG1,r13
-BEGIN_FTR_SECTION
-        mtspr   SPRN_SPRG2,r12
-        mfspr   r13,SPRN_DAR
-        mfspr   r12,SPRN_DSISR
-        srdi    r13,r13,60
-        rlwimi  r13,r12,16,0x20
-        mfcr    r12
-        cmpwi   r13,0x2c
-        beq     do_stab_bolted_pSeries
-        mtcrf   0x80,r12
-        mfspr   r12,SPRN_SPRG2
-END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common)
-
-        . = 0x380
-        .globl data_access_slb_pSeries
-data_access_slb_pSeries:
-        HMT_MEDIUM
-        mtspr   SPRN_SPRG1,r13
-        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
-        std     r3,PACA_EXSLB+EX_R3(r13)
-        mfspr   r3,SPRN_DAR
-        std     r9,PACA_EXSLB+EX_R9(r13)        /* save r9 - r12 */
-        mfcr    r9
-#ifdef __DISABLED__
-        /* Keep that around for when we re-implement dynamic VSIDs */
-        cmpdi   r3,0
-        bge     slb_miss_user_pseries
-#endif /* __DISABLED__ */
-        std     r10,PACA_EXSLB+EX_R10(r13)
-        std     r11,PACA_EXSLB+EX_R11(r13)
-        std     r12,PACA_EXSLB+EX_R12(r13)
-        mfspr   r10,SPRN_SPRG1
-        std     r10,PACA_EXSLB+EX_R13(r13)
-        mfspr   r12,SPRN_SRR1           /* and SRR1 */
-#ifndef CONFIG_RELOCATABLE
-        b       .slb_miss_realmode
-#else
-        /*
-         * We can't just use a direct branch to .slb_miss_realmode
-         * because the distance from here to there depends on where
-         * the kernel ends up being put.
-         */
-        mfctr   r11
-        ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
-        mtctr   r10
-        bctr
-#endif
-
-        STD_EXCEPTION_PSERIES(0x400, instruction_access)
-
-        . = 0x480
-        .globl instruction_access_slb_pSeries
-instruction_access_slb_pSeries:
-        HMT_MEDIUM
-        mtspr   SPRN_SPRG1,r13
-        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
-        std     r3,PACA_EXSLB+EX_R3(r13)
-        mfspr   r3,SPRN_SRR0            /* SRR0 is faulting address */
-        std     r9,PACA_EXSLB+EX_R9(r13)        /* save r9 - r12 */
-        mfcr    r9
-#ifdef __DISABLED__
-        /* Keep that around for when we re-implement dynamic VSIDs */
-        cmpdi   r3,0
-        bge     slb_miss_user_pseries
-#endif /* __DISABLED__ */
-        std     r10,PACA_EXSLB+EX_R10(r13)
-        std     r11,PACA_EXSLB+EX_R11(r13)
-        std     r12,PACA_EXSLB+EX_R12(r13)
-        mfspr   r10,SPRN_SPRG1
-        std     r10,PACA_EXSLB+EX_R13(r13)
-        mfspr   r12,SPRN_SRR1           /* and SRR1 */
-#ifndef CONFIG_RELOCATABLE
-        b       .slb_miss_realmode
-#else
-        mfctr   r11
-        ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
-        mtctr   r10
-        bctr
-#endif
-
-        MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt)
-        STD_EXCEPTION_PSERIES(0x600, alignment)
-        STD_EXCEPTION_PSERIES(0x700, program_check)
-        STD_EXCEPTION_PSERIES(0x800, fp_unavailable)
-        MASKABLE_EXCEPTION_PSERIES(0x900, decrementer)
-        STD_EXCEPTION_PSERIES(0xa00, trap_0a)
-        STD_EXCEPTION_PSERIES(0xb00, trap_0b)
-
-        . = 0xc00
-        .globl  system_call_pSeries
-system_call_pSeries:
-        HMT_MEDIUM
-BEGIN_FTR_SECTION
-        cmpdi   r0,0x1ebe
-        beq-    1f
-END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
-        mr      r9,r13
-        mfspr   r13,SPRN_SPRG3
-        mfspr   r11,SPRN_SRR0
-        ld      r12,PACAKBASE(r13)
-        ld      r10,PACAKMSR(r13)
-        LOAD_HANDLER(r12, system_call_entry)
-        mtspr   SPRN_SRR0,r12
-        mfspr   r12,SPRN_SRR1
-        mtspr   SPRN_SRR1,r10
-        rfid
-        b       .       /* prevent speculative execution */
-
-/* Fast LE/BE switch system call */
-1:      mfspr   r12,SPRN_SRR1
-        xori    r12,r12,MSR_LE
-        mtspr   SPRN_SRR1,r12
-        rfid            /* return to userspace */
-        b       .
-
-        STD_EXCEPTION_PSERIES(0xd00, single_step)
-        STD_EXCEPTION_PSERIES(0xe00, trap_0e)
-
-        /* We need to deal with the Altivec unavailable exception
-         * here which is at 0xf20, thus in the middle of the
-         * prolog code of the PerformanceMonitor one. A little
-         * trickery is thus necessary
-         */
-        . = 0xf00
-        b       performance_monitor_pSeries
-
-        . = 0xf20
-        b       altivec_unavailable_pSeries
-
-        . = 0xf40
-        b       vsx_unavailable_pSeries
-
-#ifdef CONFIG_CBE_RAS
-        HSTD_EXCEPTION_PSERIES(0x1200, cbe_system_error)
-#endif /* CONFIG_CBE_RAS */
-        STD_EXCEPTION_PSERIES(0x1300, instruction_breakpoint)
-#ifdef CONFIG_CBE_RAS
-        HSTD_EXCEPTION_PSERIES(0x1600, cbe_maintenance)
-#endif /* CONFIG_CBE_RAS */
-        STD_EXCEPTION_PSERIES(0x1700, altivec_assist)
-#ifdef CONFIG_CBE_RAS
-        HSTD_EXCEPTION_PSERIES(0x1800, cbe_thermal)
-#endif /* CONFIG_CBE_RAS */
-
-        . = 0x3000
-
-/*** pSeries interrupt support ***/
-
-        /* moved from 0xf00 */
-        STD_EXCEPTION_PSERIES(., performance_monitor)
-        STD_EXCEPTION_PSERIES(., altivec_unavailable)
-        STD_EXCEPTION_PSERIES(., vsx_unavailable)
-
-/*
- * An interrupt came in while soft-disabled; clear EE in SRR1,
- * clear paca->hard_enabled and return.
- */
-masked_interrupt:
-        stb     r10,PACAHARDIRQEN(r13)
-        mtcrf   0x80,r9
-        ld      r9,PACA_EXGEN+EX_R9(r13)
-        mfspr   r10,SPRN_SRR1
-        rldicl  r10,r10,48,1            /* clear MSR_EE */
-        rotldi  r10,r10,16
-        mtspr   SPRN_SRR1,r10
-        ld      r10,PACA_EXGEN+EX_R10(r13)
-        mfspr   r13,SPRN_SPRG1
-        rfid
-        b       .
-
-        .align  7
-do_stab_bolted_pSeries:
-        mtcrf   0x80,r12
-        mfspr   r12,SPRN_SPRG2
-        EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted)
-
-#ifdef CONFIG_PPC_PSERIES
-/*
- * Vectors for the FWNMI option.  Share common code.
- */
-        .globl system_reset_fwnmi
-      .align 7
-system_reset_fwnmi:
-        HMT_MEDIUM
-        mtspr   SPRN_SPRG1,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
-
-        .globl machine_check_fwnmi
-      .align 7
-machine_check_fwnmi:
-        HMT_MEDIUM
-        mtspr   SPRN_SPRG1,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
-
-#endif /* CONFIG_PPC_PSERIES */
-
-#ifdef __DISABLED__
-/*
- * This is used for when the SLB miss handler has to go virtual,
- * which doesn't happen for now anymore but will once we re-implement
- * dynamic VSIDs for shared page tables
- */
-slb_miss_user_pseries:
-        std     r10,PACA_EXGEN+EX_R10(r13)
-        std     r11,PACA_EXGEN+EX_R11(r13)
-        std     r12,PACA_EXGEN+EX_R12(r13)
-        mfspr   r10,SPRG1
-        ld      r11,PACA_EXSLB+EX_R9(r13)
-        ld      r12,PACA_EXSLB+EX_R3(r13)
-        std     r10,PACA_EXGEN+EX_R13(r13)
-        std     r11,PACA_EXGEN+EX_R9(r13)
-        std     r12,PACA_EXGEN+EX_R3(r13)
-        clrrdi  r12,r13,32
-        mfmsr   r10
-        mfspr   r11,SRR0                        /* save SRR0 */
-        ori     r12,r12,slb_miss_user_common@l  /* virt addr of handler */
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI
-        mtspr   SRR0,r12
-        mfspr   r12,SRR1                        /* and SRR1 */
-        mtspr   SRR1,r10
-        rfid
-        b       .                               /* prevent spec. execution */
-#endif /* __DISABLED__ */
-
-        .align  7
-        .globl  __end_interrupts
-__end_interrupts:
-
-/*
- * Code from here down to __end_handlers is invoked from the
- * exception prologs above.  Because the prologs assemble the
- * addresses of these handlers using the LOAD_HANDLER macro,
- * which uses an addi instruction, these handlers must be in
- * the first 32k of the kernel image.
- */
-
-/*** Common interrupt handlers ***/
-
-        STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception)
-
-        /*
-         * Machine check is different because we use a different
-         * save area: PACA_EXMC instead of PACA_EXGEN.
-         */
-        .align  7
-        .globl machine_check_common
-machine_check_common:
-        EXCEPTION_PROLOG_COMMON(0x200, PACA_EXMC)
-        FINISH_NAP
-        DISABLE_INTS
-        bl      .save_nvgprs
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .machine_check_exception
-        b       .ret_from_except
-
-        STD_EXCEPTION_COMMON_LITE(0x900, decrementer, .timer_interrupt)
-        STD_EXCEPTION_COMMON(0xa00, trap_0a, .unknown_exception)
-        STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception)
-        STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception)
-        STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception)
-        STD_EXCEPTION_COMMON_IDLE(0xf00, performance_monitor, .performance_monitor_exception)
-        STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception)
-#ifdef CONFIG_ALTIVEC
-        STD_EXCEPTION_COMMON(0x1700, altivec_assist, .altivec_assist_exception)
-#else
-        STD_EXCEPTION_COMMON(0x1700, altivec_assist, .unknown_exception)
-#endif
-#ifdef CONFIG_CBE_RAS
-        STD_EXCEPTION_COMMON(0x1200, cbe_system_error, .cbe_system_error_exception)
-        STD_EXCEPTION_COMMON(0x1600, cbe_maintenance, .cbe_maintenance_exception)
-        STD_EXCEPTION_COMMON(0x1800, cbe_thermal, .cbe_thermal_exception)
-#endif /* CONFIG_CBE_RAS */
-
-        .align  7
-system_call_entry:
-        b       system_call_common
-
-/*
- * Here we have detected that the kernel stack pointer is bad.
- * R9 contains the saved CR, r13 points to the paca,
- * r10 contains the (bad) kernel stack pointer,
- * r11 and r12 contain the saved SRR0 and SRR1.
- * We switch to using an emergency stack, save the registers there,
- * and call kernel_bad_stack(), which panics.
- */
-bad_stack:
-        ld      r1,PACAEMERGSP(r13)
-        subi    r1,r1,64+INT_FRAME_SIZE
-        std     r9,_CCR(r1)
-        std     r10,GPR1(r1)
-        std     r11,_NIP(r1)
-        std     r12,_MSR(r1)
-        mfspr   r11,SPRN_DAR
-        mfspr   r12,SPRN_DSISR
-        std     r11,_DAR(r1)
-        std     r12,_DSISR(r1)
-        mflr    r10
-        mfctr   r11
-        mfxer   r12
-        std     r10,_LINK(r1)
-        std     r11,_CTR(r1)
-        std     r12,_XER(r1)
-        SAVE_GPR(0,r1)
-        SAVE_GPR(2,r1)
-        SAVE_4GPRS(3,r1)
-        SAVE_2GPRS(7,r1)
-        SAVE_10GPRS(12,r1)
-        SAVE_10GPRS(22,r1)
-        lhz     r12,PACA_TRAP_SAVE(r13)
-        std     r12,_TRAP(r1)
-        addi    r11,r1,INT_FRAME_SIZE
-        std     r11,0(r1)
-        li      r12,0
-        std     r12,0(r11)
-        ld      r2,PACATOC(r13)
-1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .kernel_bad_stack
-        b       1b
-
-/*
- * Here r13 points to the paca, r9 contains the saved CR,
- * SRR0 and SRR1 are saved in r11 and r12,
- * r9 - r13 are saved in paca->exgen.
- */
-        .align  7
-        .globl data_access_common
-data_access_common:
-        mfspr   r10,SPRN_DAR
-        std     r10,PACA_EXGEN+EX_DAR(r13)
-        mfspr   r10,SPRN_DSISR
-        stw     r10,PACA_EXGEN+EX_DSISR(r13)
-        EXCEPTION_PROLOG_COMMON(0x300, PACA_EXGEN)
-        ld      r3,PACA_EXGEN+EX_DAR(r13)
-        lwz     r4,PACA_EXGEN+EX_DSISR(r13)
-        li      r5,0x300
-        b       .do_hash_page           /* Try to handle as hpte fault */
-
-        .align  7
-        .globl instruction_access_common
-instruction_access_common:
-        EXCEPTION_PROLOG_COMMON(0x400, PACA_EXGEN)
-        ld      r3,_NIP(r1)
-        andis.  r4,r12,0x5820
-        li      r5,0x400
-        b       .do_hash_page           /* Try to handle as hpte fault */
-
-/*
- * Here is the common SLB miss user that is used when going to virtual
- * mode for SLB misses, that is currently not used
- */
-#ifdef __DISABLED__
-        .align  7
-        .globl  slb_miss_user_common
-slb_miss_user_common:
-        mflr    r10
-        std     r3,PACA_EXGEN+EX_DAR(r13)
-        stw     r9,PACA_EXGEN+EX_CCR(r13)
-        std     r10,PACA_EXGEN+EX_LR(r13)
-        std     r11,PACA_EXGEN+EX_SRR0(r13)
-        bl      .slb_allocate_user
-
-        ld      r10,PACA_EXGEN+EX_LR(r13)
-        ld      r3,PACA_EXGEN+EX_R3(r13)
-        lwz     r9,PACA_EXGEN+EX_CCR(r13)
-        ld      r11,PACA_EXGEN+EX_SRR0(r13)
-        mtlr    r10
-        beq-    slb_miss_fault
-
-        andi.   r10,r12,MSR_RI          /* check for unrecoverable exception */
-        beq-    unrecov_user_slb
-        mfmsr   r10
-
-.machine push
-.machine "power4"
-        mtcrf   0x80,r9
-.machine pop
-
-        clrrdi  r10,r10,2               /* clear RI before setting SRR0/1 */
-        mtmsrd  r10,1
-
-        mtspr   SRR0,r11
-        mtspr   SRR1,r12
-
-        ld      r9,PACA_EXGEN+EX_R9(r13)
-        ld      r10,PACA_EXGEN+EX_R10(r13)
-        ld      r11,PACA_EXGEN+EX_R11(r13)
-        ld      r12,PACA_EXGEN+EX_R12(r13)
-        ld      r13,PACA_EXGEN+EX_R13(r13)
-        rfid
-        b       .
-
-slb_miss_fault:
-        EXCEPTION_PROLOG_COMMON(0x380, PACA_EXGEN)
-        ld      r4,PACA_EXGEN+EX_DAR(r13)
-        li      r5,0
-        std     r4,_DAR(r1)
-        std     r5,_DSISR(r1)
-        b       handle_page_fault
-
-unrecov_user_slb:
-        EXCEPTION_PROLOG_COMMON(0x4200, PACA_EXGEN)
-        DISABLE_INTS
-        bl      .save_nvgprs
-1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unrecoverable_exception
-        b       1b
-
-#endif /* __DISABLED__ */
-
-
-/*
- * r13 points to the PACA, r9 contains the saved CR,
- * r12 contain the saved SRR1, SRR0 is still ready for return
- * r3 has the faulting address
- * r9 - r13 are saved in paca->exslb.
- * r3 is saved in paca->slb_r3
- * We assume we aren't going to take any exceptions during this procedure.
- */
-_GLOBAL(slb_miss_realmode)
-        mflr    r10
-#ifdef CONFIG_RELOCATABLE
-        mtctr   r11
-#endif
-
-        stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
-        std     r10,PACA_EXSLB+EX_LR(r13)       /* save LR */
-
-        bl      .slb_allocate_realmode
-
-        /* All done -- return from exception. */
-
-        ld      r10,PACA_EXSLB+EX_LR(r13)
-        ld      r3,PACA_EXSLB+EX_R3(r13)
-        lwz     r9,PACA_EXSLB+EX_CCR(r13)       /* get saved CR */
-#ifdef CONFIG_PPC_ISERIES
-BEGIN_FW_FTR_SECTION
-        ld      r11,PACALPPACAPTR(r13)
-        ld      r11,LPPACASRR0(r11)             /* get SRR0 value */
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-#endif /* CONFIG_PPC_ISERIES */
-
-        mtlr    r10
-
-        andi.   r10,r12,MSR_RI  /* check for unrecoverable exception */
-        beq-    2f
-
-.machine        push
-.machine        "power4"
-        mtcrf   0x80,r9
-        mtcrf   0x01,r9         /* slb_allocate uses cr0 and cr7 */
-.machine        pop
-
-#ifdef CONFIG_PPC_ISERIES
-BEGIN_FW_FTR_SECTION
-        mtspr   SPRN_SRR0,r11
-        mtspr   SPRN_SRR1,r12
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-#endif /* CONFIG_PPC_ISERIES */
-        ld      r9,PACA_EXSLB+EX_R9(r13)
-        ld      r10,PACA_EXSLB+EX_R10(r13)
-        ld      r11,PACA_EXSLB+EX_R11(r13)
-        ld      r12,PACA_EXSLB+EX_R12(r13)
-        ld      r13,PACA_EXSLB+EX_R13(r13)
-        rfid
-        b       .       /* prevent speculative execution */
-
-2:
-#ifdef CONFIG_PPC_ISERIES
-BEGIN_FW_FTR_SECTION
-        b       unrecov_slb
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-#endif /* CONFIG_PPC_ISERIES */
-        mfspr   r11,SPRN_SRR0
-        ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10,unrecov_slb)
-        mtspr   SPRN_SRR0,r10
-        ld      r10,PACAKMSR(r13)
-        mtspr   SPRN_SRR1,r10
-        rfid
-        b       .
-
-unrecov_slb:
-        EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
-        DISABLE_INTS
-        bl      .save_nvgprs
-1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unrecoverable_exception
-        b       1b
-
-        .align  7
-        .globl hardware_interrupt_common
-        .globl hardware_interrupt_entry
-hardware_interrupt_common:
-        EXCEPTION_PROLOG_COMMON(0x500, PACA_EXGEN)
-        FINISH_NAP
-hardware_interrupt_entry:
-        DISABLE_INTS
-BEGIN_FTR_SECTION
-        bl      .ppc64_runlatch_on
-END_FTR_SECTION_IFSET(CPU_FTR_CTRL)
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_IRQ
-        b       .ret_from_except_lite
-
-#ifdef CONFIG_PPC_970_NAP
-power4_fixup_nap:
-        andc    r9,r9,r10
-        std     r9,TI_LOCAL_FLAGS(r11)
-        ld      r10,_LINK(r1)           /* make idle task do the */
-        std     r10,_NIP(r1)            /* equivalent of a blr */
-        blr
-#endif
-
-        .align  7
-        .globl alignment_common
-alignment_common:
-        mfspr   r10,SPRN_DAR
-        std     r10,PACA_EXGEN+EX_DAR(r13)
-        mfspr   r10,SPRN_DSISR
-        stw     r10,PACA_EXGEN+EX_DSISR(r13)
-        EXCEPTION_PROLOG_COMMON(0x600, PACA_EXGEN)
-        ld      r3,PACA_EXGEN+EX_DAR(r13)
-        lwz     r4,PACA_EXGEN+EX_DSISR(r13)
-        std     r3,_DAR(r1)
-        std     r4,_DSISR(r1)
-        bl      .save_nvgprs
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        ENABLE_INTS
-        bl      .alignment_exception
-        b       .ret_from_except
-
-        .align  7
-        .globl program_check_common
-program_check_common:
-        EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)
-        bl      .save_nvgprs
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        ENABLE_INTS
-        bl      .program_check_exception
-        b       .ret_from_except
-
-        .align  7
-        .globl fp_unavailable_common
-fp_unavailable_common:
-        EXCEPTION_PROLOG_COMMON(0x800, PACA_EXGEN)
-        bne     1f                      /* if from user, just load it up */
-        bl      .save_nvgprs
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        ENABLE_INTS
-        bl      .kernel_fp_unavailable_exception
-        BUG_OPCODE
-1:      bl      .load_up_fpu
-        b       fast_exception_return
-
-        .align  7
-        .globl altivec_unavailable_common
-altivec_unavailable_common:
-        EXCEPTION_PROLOG_COMMON(0xf20, PACA_EXGEN)
-#ifdef CONFIG_ALTIVEC
-BEGIN_FTR_SECTION
-        beq     1f
-        bl      .load_up_altivec
-        b       fast_exception_return
-1:
-END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
-#endif
-        bl      .save_nvgprs
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        ENABLE_INTS
-        bl      .altivec_unavailable_exception
-        b       .ret_from_except
-
-        .align  7
-        .globl vsx_unavailable_common
-vsx_unavailable_common:
-        EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)
-#ifdef CONFIG_VSX
-BEGIN_FTR_SECTION
-        bne     .load_up_vsx
-1:
-END_FTR_SECTION_IFSET(CPU_FTR_VSX)
-#endif
-        bl      .save_nvgprs
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        ENABLE_INTS
-        bl      .vsx_unavailable_exception
-        b       .ret_from_except
-
-        .align  7
-        .globl  __end_handlers
-__end_handlers:
-
-/*
- * Return from an exception with minimal checks.
- * The caller is assumed to have done EXCEPTION_PROLOG_COMMON.
- * If interrupts have been enabled, or anything has been
- * done that might have changed the scheduling status of
- * any task or sent any task a signal, you should use
- * ret_from_except or ret_from_except_lite instead of this.
+ * On server, we include the exception vectors code here as it
+ * relies on absolute addressing which is only possible within
+ * this compilation unit
  */
-fast_exc_return_irq:                    /* restores irq state too */
-        ld      r3,SOFTE(r1)
-        TRACE_AND_RESTORE_IRQ(r3);
-        ld      r12,_MSR(r1)
-        rldicl  r4,r12,49,63            /* get MSR_EE to LSB */
-        stb     r4,PACAHARDIRQEN(r13)   /* restore paca->hard_enabled */
-        b       1f
-
-        .globl  fast_exception_return
-fast_exception_return:
-        ld      r12,_MSR(r1)
-1:      ld      r11,_NIP(r1)
-        andi.   r3,r12,MSR_RI           /* check if RI is set */
-        beq-    unrecov_fer
-
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-        andi.   r3,r12,MSR_PR
-        beq     2f
-        ACCOUNT_CPU_USER_EXIT(r3, r4)
-2:
+#ifdef CONFIG_PPC_BOOK3S
+#include "exceptions-64s.S"
 #endif
 
-        ld      r3,_CCR(r1)
-        ld      r4,_LINK(r1)
-        ld      r5,_CTR(r1)
-        ld      r6,_XER(r1)
-        mtcr    r3
-        mtlr    r4
-        mtctr   r5
-        mtxer   r6
-        REST_GPR(0, r1)
-        REST_8GPRS(2, r1)
-
-        mfmsr   r10
-        rldicl  r10,r10,48,1            /* clear EE */
-        rldicr  r10,r10,16,61           /* clear RI (LE is 0 already) */
-        mtmsrd  r10,1
-
-        mtspr   SPRN_SRR1,r12
-        mtspr   SPRN_SRR0,r11
-        REST_4GPRS(10, r1)
-        ld      r1,GPR1(r1)
-        rfid
-        b       .       /* prevent speculative execution */
-
-unrecov_fer:
-        bl      .save_nvgprs
-1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unrecoverable_exception
-        b       1b
-
-#ifdef CONFIG_ALTIVEC
-/*
- * load_up_altivec(unused, unused, tsk)
- * Disable VMX for the task which had it previously,
- * and save its vector registers in its thread_struct.
- * Enables the VMX for use in the kernel on return.
- * On SMP we know the VMX is free, since we give it up every
- * switch (ie, no lazy save of the vector registers).
- * On entry: r13 == 'current' && last_task_used_altivec != 'current'
- */
-_STATIC(load_up_altivec)
-        mfmsr   r5                      /* grab the current MSR */
-        oris    r5,r5,MSR_VEC@h
-        mtmsrd  r5                      /* enable use of VMX now */
-        isync
-
-/*
- * For SMP, we don't do lazy VMX switching because it just gets too
- * horrendously complex, especially when a task switches from one CPU
- * to another.  Instead we call giveup_altvec in switch_to.
- * VRSAVE isn't dealt with here, that is done in the normal context
- * switch code. Note that we could rely on vrsave value to eventually
- * avoid saving all of the VREGs here...
- */
-#ifndef CONFIG_SMP
-        ld      r3,last_task_used_altivec@got(r2)
-        ld      r4,0(r3)
-        cmpdi   0,r4,0
-        beq     1f
-        /* Save VMX state to last_task_used_altivec's THREAD struct */
-        addi    r4,r4,THREAD
-        SAVE_32VRS(0,r5,r4)
-        mfvscr  vr0
-        li      r10,THREAD_VSCR
-        stvx    vr0,r10,r4
-        /* Disable VMX for last_task_used_altivec */
-        ld      r5,PT_REGS(r4)
-        ld      r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-        lis     r6,MSR_VEC@h
-        andc    r4,r4,r6
-        std     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-1:
-#endif /* CONFIG_SMP */
-        /* Hack: if we get an altivec unavailable trap with VRSAVE
-         * set to all zeros, we assume this is a broken application
-         * that fails to set it properly, and thus we switch it to
-         * all 1's
-         */
-        mfspr   r4,SPRN_VRSAVE
-        cmpdi   0,r4,0
-        bne+    1f
-        li      r4,-1
-        mtspr   SPRN_VRSAVE,r4
-1:
-        /* enable use of VMX after return */
-        ld      r4,PACACURRENT(r13)
-        addi    r5,r4,THREAD            /* Get THREAD */
-        oris    r12,r12,MSR_VEC@h
-        std     r12,_MSR(r1)
-        li      r4,1
-        li      r10,THREAD_VSCR
-        stw     r4,THREAD_USED_VR(r5)
-        lvx     vr0,r10,r5
-        mtvscr  vr0
-        REST_32VRS(0,r4,r5)
-#ifndef CONFIG_SMP
-        /* Update last_task_used_math to 'current' */
-        subi    r4,r5,THREAD            /* Back to 'current' */
-        std     r4,0(r3)
-#endif /* CONFIG_SMP */
-        /* restore registers and return */
-        blr
-#endif /* CONFIG_ALTIVEC */
-
-#ifdef CONFIG_VSX
-/*
- * load_up_vsx(unused, unused, tsk)
- * Disable VSX for the task which had it previously,
- * and save its vector registers in its thread_struct.
- * Reuse the fp and vsx saves, but first check to see if they have
- * been saved already.
- * On entry: r13 == 'current' && last_task_used_vsx != 'current'
- */
-_STATIC(load_up_vsx)
-/* Load FP and VSX registers if they haven't been done yet */
-        andi.   r5,r12,MSR_FP
-        beql+   load_up_fpu             /* skip if already loaded */
-        andis.  r5,r12,MSR_VEC@h
-        beql+   load_up_altivec         /* skip if already loaded */
-
-#ifndef CONFIG_SMP
-        ld      r3,last_task_used_vsx@got(r2)
-        ld      r4,0(r3)
-        cmpdi   0,r4,0
-        beq     1f
-        /* Disable VSX for last_task_used_vsx */
-        addi    r4,r4,THREAD
-        ld      r5,PT_REGS(r4)
-        ld      r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-        lis     r6,MSR_VSX@h
-        andc    r6,r4,r6
-        std     r6,_MSR-STACK_FRAME_OVERHEAD(r5)
-1:
-#endif /* CONFIG_SMP */
-        ld      r4,PACACURRENT(r13)
-        addi    r4,r4,THREAD            /* Get THREAD */
-        li      r6,1
-        stw     r6,THREAD_USED_VSR(r4) /* ... also set thread used vsr */
-        /* enable use of VSX after return */
-        oris    r12,r12,MSR_VSX@h
-        std     r12,_MSR(r1)
-#ifndef CONFIG_SMP
-        /* Update last_task_used_math to 'current' */
-        ld      r4,PACACURRENT(r13)
-        std     r4,0(r3)
-#endif /* CONFIG_SMP */
-        b       fast_exception_return
-#endif /* CONFIG_VSX */
-
-/*
- * Hash table stuff
- */
-        .align  7
-_STATIC(do_hash_page)
-        std     r3,_DAR(r1)
-        std     r4,_DSISR(r1)
-
-        andis.  r0,r4,0xa450            /* weird error? */
-        bne-    handle_page_fault       /* if not, try to insert a HPTE */
-BEGIN_FTR_SECTION
-        andis.  r0,r4,0x0020            /* Is it a segment table fault? */
-        bne-    do_ste_alloc            /* If so handle it */
-END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
-
-        /*
-         * On iSeries, we soft-disable interrupts here, then
-         * hard-enable interrupts so that the hash_page code can spin on
-         * the hash_table_lock without problems on a shared processor.
-         */
-        DISABLE_INTS
-
-        /*
-         * Currently, trace_hardirqs_off() will be called by DISABLE_INTS
-         * and will clobber volatile registers when irq tracing is enabled
-         * so we need to reload them. It may be possible to be smarter here
-         * and move the irq tracing elsewhere but let's keep it simple for
-         * now
-         */
-#ifdef CONFIG_TRACE_IRQFLAGS
-        ld      r3,_DAR(r1)
-        ld      r4,_DSISR(r1)
-        ld      r5,_TRAP(r1)
-        ld      r12,_MSR(r1)
-        clrrdi  r5,r5,4
-#endif /* CONFIG_TRACE_IRQFLAGS */
-        /*
-         * We need to set the _PAGE_USER bit if MSR_PR is set or if we are
-         * accessing a userspace segment (even from the kernel). We assume
-         * kernel addresses always have the high bit set.
-         */
-        rlwinm  r4,r4,32-25+9,31-9,31-9 /* DSISR_STORE -> _PAGE_RW */
-        rotldi  r0,r3,15                /* Move high bit into MSR_PR posn */
-        orc     r0,r12,r0               /* MSR_PR | ~high_bit */
-        rlwimi  r4,r0,32-13,30,30       /* becomes _PAGE_USER access bit */
-        ori     r4,r4,1                 /* add _PAGE_PRESENT */
-        rlwimi  r4,r5,22+2,31-2,31-2    /* Set _PAGE_EXEC if trap is 0x400 */
-
-        /*
-         * r3 contains the faulting address
-         * r4 contains the required access permissions
-         * r5 contains the trap number
-         *
-         * at return r3 = 0 for success
-         */
-        bl      .hash_page              /* build HPTE if possible */
-        cmpdi   r3,0                    /* see if hash_page succeeded */
-
-BEGIN_FW_FTR_SECTION
-        /*
-         * If we had interrupts soft-enabled at the point where the
-         * DSI/ISI occurred, and an interrupt came in during hash_page,
-         * handle it now.
-         * We jump to ret_from_except_lite rather than fast_exception_return
-         * because ret_from_except_lite will check for and handle pending
-         * interrupts if necessary.
-         */
-        beq     13f
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-
-BEGIN_FW_FTR_SECTION
-        /*
-         * Here we have interrupts hard-disabled, so it is sufficient
-         * to restore paca->{soft,hard}_enable and get out.
-         */
-        beq     fast_exc_return_irq     /* Return from exception on success */
-END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
-
-        /* For a hash failure, we don't bother re-enabling interrupts */
-        ble-    12f
-
-        /*
-         * hash_page couldn't handle it, set soft interrupt enable back
-         * to what it was before the trap.  Note that .raw_local_irq_restore
-         * handles any interrupts pending at this point.
-         */
-        ld      r3,SOFTE(r1)
-        TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)
-        bl      .raw_local_irq_restore
-        b       11f
-
-/* Here we have a page fault that hash_page can't handle. */
-handle_page_fault:
-        ENABLE_INTS
-11:     ld      r4,_DAR(r1)
-        ld      r5,_DSISR(r1)
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_page_fault
-        cmpdi   r3,0
-        beq+    13f
-        bl      .save_nvgprs
-        mr      r5,r3
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        lwz     r4,_DAR(r1)
-        bl      .bad_page_fault
-        b       .ret_from_except
-
-13:     b       .ret_from_except_lite
-
-/* We have a page fault that hash_page could handle but HV refused
- * the PTE insertion
- */
-12:     bl      .save_nvgprs
-        mr      r5,r3
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        ld      r4,_DAR(r1)
-        bl      .low_hash_fault
-        b       .ret_from_except
-
-        /* here we have a segment miss */
-do_ste_alloc:
-        bl      .ste_allocate           /* try to insert stab entry */
-        cmpdi   r3,0
-        bne-    handle_page_fault
-        b       fast_exception_return
-
-/*
- * r13 points to the PACA, r9 contains the saved CR,
- * r11 and r12 contain the saved SRR0 and SRR1.
- * r9 - r13 are saved in paca->exslb.
- * We assume we aren't going to take any exceptions during this procedure.
- * We assume (DAR >> 60) == 0xc.
- */
-        .align  7
-_GLOBAL(do_stab_bolted)
-        stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
-        std     r11,PACA_EXSLB+EX_SRR0(r13)     /* save SRR0 in exc. frame */
-
-        /* Hash to the primary group */
-        ld      r10,PACASTABVIRT(r13)
-        mfspr   r11,SPRN_DAR
-        srdi    r11,r11,28
-        rldimi  r10,r11,7,52    /* r10 = first ste of the group */
-
-        /* Calculate VSID */
-        /* This is a kernel address, so protovsid = ESID */
-        ASM_VSID_SCRAMBLE(r11, r9, 256M)
-        rldic   r9,r11,12,16    /* r9 = vsid << 12 */
-
-        /* Search the primary group for a free entry */
-1:      ld      r11,0(r10)      /* Test valid bit of the current ste    */
-        andi.   r11,r11,0x80
-        beq     2f
-        addi    r10,r10,16
-        andi.   r11,r10,0x70
-        bne     1b
-
-        /* Stick for only searching the primary group for now.          */
-        /* At least for now, we use a very simple random castout scheme */
-        /* Use the TB as a random number ;  OR in 1 to avoid entry 0    */
-        mftb    r11
-        rldic   r11,r11,4,57    /* r11 = (r11 << 4) & 0x70 */
-        ori     r11,r11,0x10
-
-        /* r10 currently points to an ste one past the group of interest */
-        /* make it point to the randomly selected entry                 */
-        subi    r10,r10,128
-        or      r10,r10,r11     /* r10 is the entry to invalidate       */
-
-        isync                   /* mark the entry invalid               */
-        ld      r11,0(r10)
-        rldicl  r11,r11,56,1    /* clear the valid bit */
-        rotldi  r11,r11,8
-        std     r11,0(r10)
-        sync
-
-        clrrdi  r11,r11,28      /* Get the esid part of the ste         */
-        slbie   r11
-
-2:      std     r9,8(r10)       /* Store the vsid part of the ste       */
-        eieio
-
-        mfspr   r11,SPRN_DAR            /* Get the new esid                     */
-        clrrdi  r11,r11,28      /* Permits a full 32b of ESID           */
-        ori     r11,r11,0x90    /* Turn on valid and kp                 */
-        std     r11,0(r10)      /* Put new entry back into the stab     */
-
-        sync
-
-        /* All done -- return from exception. */
-        lwz     r9,PACA_EXSLB+EX_CCR(r13)       /* get saved CR */
-        ld      r11,PACA_EXSLB+EX_SRR0(r13)     /* get saved SRR0 */
-
-        andi.   r10,r12,MSR_RI
-        beq-    unrecov_slb
-
-        mtcrf   0x80,r9                 /* restore CR */
-
-        mfmsr   r10
-        clrrdi  r10,r10,2
-        mtmsrd  r10,1
-
-        mtspr   SPRN_SRR0,r11
-        mtspr   SPRN_SRR1,r12
-        ld      r9,PACA_EXSLB+EX_R9(r13)
-        ld      r10,PACA_EXSLB+EX_R10(r13)
-        ld      r11,PACA_EXSLB+EX_R11(r13)
-        ld      r12,PACA_EXSLB+EX_R12(r13)
-        ld      r13,PACA_EXSLB+EX_R13(r13)
-        rfid
-        b       .       /* prevent speculative execution */
-
-/*
- * Space for CPU0's segment table.
- *
- * On iSeries, the hypervisor must fill in at least one entry before
- * we get control (with relocate on).  The address is given to the hv
- * as a page number (see xLparMap below), so this must be at a
- * fixed address (the linker can't compute (u64)&initial_stab >>
- * PAGE_SHIFT).
- */
-        . = STAB0_OFFSET        /* 0x6000 */
-        .globl initial_stab
-initial_stab:
-        .space  4096
-
-#ifdef CONFIG_PPC_PSERIES
-/*
- * Data area reserved for FWNMI option.
- * This address (0x7000) is fixed by the RPA.
- */
-        .= 0x7000
-        .globl fwnmi_data_area
-fwnmi_data_area:
-#endif /* CONFIG_PPC_PSERIES */
-
-        /* iSeries does not use the FWNMI stuff, so it is safe to put
-         * this here, even if we later allow kernels that will boot on
-         * both pSeries and iSeries */
-#ifdef CONFIG_PPC_ISERIES
-        . = LPARMAP_PHYS
-        .globl xLparMap
-xLparMap:
-        .quad   HvEsidsToMap            /* xNumberEsids */
-        .quad   HvRangesToMap           /* xNumberRanges */
-        .quad   STAB0_PAGE              /* xSegmentTableOffs */
-        .zero   40                      /* xRsvd */
-        /* xEsids (HvEsidsToMap entries of 2 quads) */
-        .quad   PAGE_OFFSET_ESID        /* xKernelEsid */
-        .quad   PAGE_OFFSET_VSID        /* xKernelVsid */
-        .quad   VMALLOC_START_ESID      /* xKernelEsid */
-        .quad   VMALLOC_START_VSID      /* xKernelVsid */
-        /* xRanges (HvRangesToMap entries of 3 quads) */
-        .quad   HvPagesToMap            /* xPages */
-        .quad   0                       /* xOffset */
-        .quad   PAGE_OFFSET_VSID << (SID_SHIFT - HW_PAGE_SHIFT) /* xVPN */
-
-#endif /* CONFIG_PPC_ISERIES */
-
-#ifdef CONFIG_PPC_PSERIES
-        . = 0x8000
-#endif /* CONFIG_PPC_PSERIES */
 
 /*
  * On pSeries and most other platforms, secondary processors spin
diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h
index 95f39f1e68d4..5f9febc8d143 100644
--- a/arch/powerpc/kernel/head_booke.h
+++ b/arch/powerpc/kernel/head_booke.h
@@ -256,7 +256,7 @@ label:
          * off DE in the DSRR1 value and clearing the debug status.           \
          */                                                                   \
         mfspr   r10,SPRN_DBSR;          /* check single-step/branch taken */  \
-        andis.  r10,r10,DBSR_IC@h;                                            \
+        andis.  r10,r10,(DBSR_IC|DBSR_BT)@h;                                  \
         beq+    2f;                                                           \
                                                                               \
         lis     r10,KERNELBASE@h;       /* check if exception in vectors */   \
@@ -271,7 +271,7 @@ label:
                                                                               \
         /* here it looks like we got an inappropriate debug exception. */     \
 1:      rlwinm  r9,r9,0,~MSR_DE;        /* clear DE in the CDRR1 value */     \
-        lis     r10,DBSR_IC@h;          /* clear the IC event */              \
+        lis     r10,(DBSR_IC|DBSR_BT)@h;        /* clear the IC event */      \
         mtspr   SPRN_DBSR,r10;                                                \
         /* restore state and get out */                                       \
         lwz     r10,_CCR(r11);                                                \
@@ -309,7 +309,7 @@ label:
          * off DE in the CSRR1 value and clearing the debug status.           \
          */                                                                   \
         mfspr   r10,SPRN_DBSR;          /* check single-step/branch taken */  \
-        andis.  r10,r10,DBSR_IC@h;                                            \
+        andis.  r10,r10,(DBSR_IC|DBSR_BT)@h;                                  \
         beq+    2f;                                                           \
                                                                               \
         lis     r10,KERNELBASE@h;       /* check if exception in vectors */   \
@@ -317,14 +317,14 @@ label:
         cmplw   r12,r10;                                                      \
         blt+    2f;                     /* addr below exception vectors */    \
                                                                               \
-        lis     r10,DebugCrit@h;                                                      \
+        lis     r10,DebugCrit@h;                                              \
         ori     r10,r10,DebugCrit@l;                                          \
         cmplw   r12,r10;                                                      \
         bgt+    2f;                     /* addr above exception vectors */    \
                                                                               \
         /* here it looks like we got an inappropriate debug exception. */     \
 1:      rlwinm  r9,r9,0,~MSR_DE;        /* clear DE in the CSRR1 value */     \
-        lis     r10,DBSR_IC@h;          /* clear the IC event */              \
+        lis     r10,(DBSR_IC|DBSR_BT)@h;        /* clear the IC event */      \
         mtspr   SPRN_DBSR,r10;                                                \
         /* restore state and get out */                                       \
         lwz     r10,_CCR(r11);                                                \
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 844d3f882a15..f7f376ea7b17 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -118,6 +118,7 @@ notrace void raw_local_irq_restore(unsigned long en)
         if (!en)
                 return;
 
+#ifdef CONFIG_PPC_STD_MMU_64
         if (firmware_has_feature(FW_FEATURE_ISERIES)) {
                 /*
                  * Do we need to disable preemption here?  Not really: in the
@@ -135,6 +136,7 @@ notrace void raw_local_irq_restore(unsigned long en)
                 if (local_paca->lppaca_ptr->int_dword.any_int)
                         iseries_handle_interrupts();
         }
+#endif /* CONFIG_PPC_STD_MMU_64 */
 
         if (test_perf_counter_pending()) {
                 clear_perf_counter_pending();
@@ -254,77 +256,84 @@ void fixup_irqs(cpumask_t map)
 }
 #endif
 
-void do_IRQ(struct pt_regs *regs)
-{
-        struct pt_regs *old_regs = set_irq_regs(regs);
-        unsigned int irq;
 #ifdef CONFIG_IRQSTACKS
+static inline void handle_one_irq(unsigned int irq)
+{
         struct thread_info *curtp, *irqtp;
-#endif
+        unsigned long saved_sp_limit;
+        struct irq_desc *desc;
 
-        irq_enter();
+        /* Switch to the irq stack to handle this */
+        curtp = current_thread_info();
+        irqtp = hardirq_ctx[smp_processor_id()];
+
+        if (curtp == irqtp) {
+                /* We're already on the irq stack, just handle it */
+                generic_handle_irq(irq);
+                return;
+        }
+
+        desc = irq_desc + irq;
+        saved_sp_limit = current->thread.ksp_limit;
+
+        irqtp->task = curtp->task;
+        irqtp->flags = 0;
+
+        /* Copy the softirq bits in preempt_count so that the
+         * softirq checks work in the hardirq context. */
+        irqtp->preempt_count = (irqtp->preempt_count & ~SOFTIRQ_MASK) |
+                               (curtp->preempt_count & SOFTIRQ_MASK);
+
+        current->thread.ksp_limit = (unsigned long)irqtp +
+                _ALIGN_UP(sizeof(struct thread_info), 16);
+
+        call_handle_irq(irq, desc, irqtp, desc->handle_irq);
+        current->thread.ksp_limit = saved_sp_limit;
+        irqtp->task = NULL;
+
+        /* Set any flag that may have been set on the
+         * alternate stack
+         */
+        if (irqtp->flags)
+                set_bits(irqtp->flags, &curtp->flags);
+}
+#else
+static inline void handle_one_irq(unsigned int irq)
+{
+        generic_handle_irq(irq);
+}
+#endif
 
+static inline void check_stack_overflow(void)
+{
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
-        /* Debugging check for stack overflow: is there less than 2KB free? */
-        {
-                long sp;
+        long sp;
 
-                sp = __get_SP() & (THREAD_SIZE-1);
+        sp = __get_SP() & (THREAD_SIZE-1);
 
-                if (unlikely(sp < (sizeof(struct thread_info) + 2048))) {
-                        printk("do_IRQ: stack overflow: %ld\n",
-                                sp - sizeof(struct thread_info));
-                        dump_stack();
-                }
+        /* check for stack overflow: is there less than 2KB free? */
+        if (unlikely(sp < (sizeof(struct thread_info) + 2048))) {
+                printk("do_IRQ: stack overflow: %ld\n",
+                        sp - sizeof(struct thread_info));
+                dump_stack();
         }
 #endif
+}
 
-        /*
-         * Every platform is required to implement ppc_md.get_irq.
-         * This function will either return an irq number or NO_IRQ to
-         * indicate there are no more pending.
-         * The value NO_IRQ_IGNORE is for buggy hardware and means that this
-         * IRQ has already been handled. -- Tom
-         */
-        irq = ppc_md.get_irq();
+void do_IRQ(struct pt_regs *regs)
+{
+        struct pt_regs *old_regs = set_irq_regs(regs);
+        unsigned int irq;
 
-        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {
-#ifdef CONFIG_IRQSTACKS
-                /* Switch to the irq stack to handle this */
-                curtp = current_thread_info();
-                irqtp = hardirq_ctx[smp_processor_id()];
-                if (curtp != irqtp) {
-                        struct irq_desc *desc = irq_desc + irq;
-                        void *handler = desc->handle_irq;
-                        unsigned long saved_sp_limit = current->thread.ksp_limit;
-                        if (handler == NULL)
-                                handler = &__do_IRQ;
-                        irqtp->task = curtp->task;
-                        irqtp->flags = 0;
-
-                        /* Copy the softirq bits in preempt_count so that the
-                         * softirq checks work in the hardirq context.
-                         */
-                        irqtp->preempt_count =
-                                (irqtp->preempt_count & ~SOFTIRQ_MASK) |
-                                (curtp->preempt_count & SOFTIRQ_MASK);
+        irq_enter();
 
-                        current->thread.ksp_limit = (unsigned long)irqtp +
-                                _ALIGN_UP(sizeof(struct thread_info), 16);
-                        call_handle_irq(irq, desc, irqtp, handler);
-                        current->thread.ksp_limit = saved_sp_limit;
-                        irqtp->task = NULL;
+        check_stack_overflow();
 
+        irq = ppc_md.get_irq();
 
-                        /* Set any flag that may have been set on the
-                         * alternate stack
-                         */
-                        if (irqtp->flags)
-                                set_bits(irqtp->flags, &curtp->flags);
-                } else
-#endif
-                        generic_handle_irq(irq);
-        } else if (irq != NO_IRQ_IGNORE)
+        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE)
+                handle_one_irq(irq);
+        else if (irq != NO_IRQ_IGNORE)
                 /* That's not SMP safe ... but who cares ? */
                 ppc_spurious_interrupts++;
 
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 78b3f7840ade..2419cc706ff1 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -169,6 +169,9 @@ struct hvcall_ppp_data {
         u8      unallocated_weight;
         u16     active_procs_in_pool;
         u16     active_system_procs;
+        u16     phys_platform_procs;
+        u32     max_proc_cap_avail;
+        u32     entitled_proc_cap_avail;
 };
 
 /*
@@ -190,13 +193,18 @@ struct hvcall_ppp_data {
  *            XX - Unallocated Variable Processor Capacity Weight.
  *              XXXX - Active processors in Physical Processor Pool.
  *                  XXXX  - Processors active on platform.
+ *  R8 (QQQQRRRRRRSSSSSS). if ibm,partition-performance-parameters-level >= 1
+ *      XXXX - Physical platform procs allocated to virtualization.
+ *          XXXXXX - Max procs capacity % available to the partitions pool.
+ *                XXXXXX - Entitled procs capacity % available to the
+ *                         partitions pool.
  */
 static unsigned int h_get_ppp(struct hvcall_ppp_data *ppp_data)
 {
         unsigned long rc;
-        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
 
-        rc = plpar_hcall(H_GET_PPP, retbuf);
+        rc = plpar_hcall9(H_GET_PPP, retbuf);
 
         ppp_data->entitlement = retbuf[0];
         ppp_data->unallocated_entitlement = retbuf[1];
@@ -210,6 +218,10 @@ static unsigned int h_get_ppp(struct hvcall_ppp_data *ppp_data)
         ppp_data->active_procs_in_pool = (retbuf[3] >> 2 * 8) & 0xffff;
         ppp_data->active_system_procs = retbuf[3] & 0xffff;
 
+        ppp_data->phys_platform_procs = retbuf[4] >> 6 * 8;
+        ppp_data->max_proc_cap_avail = (retbuf[4] >> 3 * 8) & 0xffffff;
+        ppp_data->entitled_proc_cap_avail = retbuf[4] & 0xffffff;
+
         return rc;
 }
 
@@ -234,6 +246,8 @@ static unsigned h_pic(unsigned long *pool_idle_time,
 static void parse_ppp_data(struct seq_file *m)
 {
         struct hvcall_ppp_data ppp_data;
+        struct device_node *root;
+        const int *perf_level;
         int rc;
 
         rc = h_get_ppp(&ppp_data);
@@ -267,6 +281,28 @@ static void parse_ppp_data(struct seq_file *m)
         seq_printf(m, "capped=%d\n", ppp_data.capped);
         seq_printf(m, "unallocated_capacity=%lld\n",
                    ppp_data.unallocated_entitlement);
+
+        /* The last bits of information returned from h_get_ppp are only
+         * valid if the ibm,partition-performance-parameters-level
+         * property is >= 1.
+         */
+        root = of_find_node_by_path("/");
+        if (root) {
+                perf_level = of_get_property(root,
+                                "ibm,partition-performance-parameters-level",
+                                             NULL);
+                if (perf_level && (*perf_level >= 1)) {
+                        seq_printf(m,
+                            "physical_procs_allocated_to_virtualization=%d\n",
+                                   ppp_data.phys_platform_procs);
+                        seq_printf(m, "max_proc_capacity_available=%d\n",
+                                   ppp_data.max_proc_cap_avail);
+                        seq_printf(m, "entitled_proc_capacity_available=%d\n",
+                                   ppp_data.entitled_proc_cap_avail);
+                }
+
+                of_node_put(root);
+        }
 }
 
 /**
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index b9530b2395a2..a5cf9c1356a6 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -457,98 +457,6 @@ _GLOBAL(disable_kernel_fp)
         isync
         blr
 
-#ifdef CONFIG_ALTIVEC
-
-#if 0 /* this has no callers for now */
-/*
- * disable_kernel_altivec()
- * Disable the VMX.
- */
-_GLOBAL(disable_kernel_altivec)
-        mfmsr   r3
-        rldicl  r0,r3,(63-MSR_VEC_LG),1
-        rldicl  r3,r0,(MSR_VEC_LG+1),0
-        mtmsrd  r3                      /* disable use of VMX now */
-        isync
-        blr
-#endif /* 0 */
-
-/*
- * giveup_altivec(tsk)
- * Disable VMX for the task given as the argument,
- * and save the vector registers in its thread_struct.
- * Enables the VMX for use in the kernel on return.
- */
-_GLOBAL(giveup_altivec)
-        mfmsr   r5
-        oris    r5,r5,MSR_VEC@h
-        mtmsrd  r5                      /* enable use of VMX now */
-        isync
-        cmpdi   0,r3,0
-        beqlr-                          /* if no previous owner, done */
-        addi    r3,r3,THREAD            /* want THREAD of task */
-        ld      r5,PT_REGS(r3)
-        cmpdi   0,r5,0
-        SAVE_32VRS(0,r4,r3)
-        mfvscr  vr0
-        li      r4,THREAD_VSCR
-        stvx    vr0,r4,r3
-        beq     1f
-        ld      r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-#ifdef CONFIG_VSX
-BEGIN_FTR_SECTION
-        lis     r3,(MSR_VEC|MSR_VSX)@h
-FTR_SECTION_ELSE
-        lis     r3,MSR_VEC@h
-ALT_FTR_SECTION_END_IFSET(CPU_FTR_VSX)
-#else
-        lis     r3,MSR_VEC@h
-#endif
-        andc    r4,r4,r3                /* disable FP for previous task */
-        std     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-1:
-#ifndef CONFIG_SMP
-        li      r5,0
-        ld      r4,last_task_used_altivec@got(r2)
-        std     r5,0(r4)
-#endif /* CONFIG_SMP */
-        blr
-
-#endif /* CONFIG_ALTIVEC */
-
-#ifdef CONFIG_VSX
-/*
- * __giveup_vsx(tsk)
- * Disable VSX for the task given as the argument.
- * Does NOT save vsx registers.
- * Enables the VSX for use in the kernel on return.
- */
-_GLOBAL(__giveup_vsx)
-        mfmsr   r5
-        oris    r5,r5,MSR_VSX@h
-        mtmsrd  r5                      /* enable use of VSX now */
-        isync
-
-        cmpdi   0,r3,0
-        beqlr-                          /* if no previous owner, done */
-        addi    r3,r3,THREAD            /* want THREAD of task */
-        ld      r5,PT_REGS(r3)
-        cmpdi   0,r5,0
-        beq     1f
-        ld      r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-        lis     r3,MSR_VSX@h
-        andc    r4,r4,r3                /* disable VSX for previous task */
-        std     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
-1:
-#ifndef CONFIG_SMP
-        li      r5,0
-        ld      r4,last_task_used_vsx@got(r2)
-        std     r5,0(r4)
-#endif /* CONFIG_SMP */
-        blr
-
-#endif /* CONFIG_VSX */
-
 /* kexec_wait(phys_cpu)
  *
  * wait for the flag to change, indicating this kernel is going away but
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index c744b327bcab..e9962c7f8a09 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -18,6 +18,8 @@
  * field correctly */
 extern unsigned long __toc_start;
 
+#ifdef CONFIG_PPC_BOOK3S
+
 /*
  * The structure which the hypervisor knows about - this structure
  * should not cross a page boundary.  The vpa_init/register_vpa call
@@ -41,6 +43,10 @@ struct lppaca lppaca[] = {
         },
 };
 
+#endif /* CONFIG_PPC_BOOK3S */
+
+#ifdef CONFIG_PPC_STD_MMU_64
+
 /*
  * 3 persistent SLBs are registered here.  The buffer will be zero
  * initially, hence will all be invaild until we actually write them.
@@ -52,6 +58,8 @@ struct slb_shadow slb_shadow[] __cacheline_aligned = {
         },
 };
 
+#endif /* CONFIG_PPC_STD_MMU_64 */
+
 /* The Paca is an array with one entry per processor.  Each contains an
  * lppaca, which contains the information shared between the
  * hypervisor and Linux.
@@ -77,15 +85,19 @@ void __init initialise_pacas(void)
         for (cpu = 0; cpu < NR_CPUS; cpu++) {
                 struct paca_struct *new_paca = &paca[cpu];
 
+#ifdef CONFIG_PPC_BOOK3S
                 new_paca->lppaca_ptr = &lppaca[cpu];
+#endif
                 new_paca->lock_token = 0x8000;
                 new_paca->paca_index = cpu;
                 new_paca->kernel_toc = kernel_toc;
                 new_paca->kernelbase = (unsigned long) _stext;
                 new_paca->kernel_msr = MSR_KERNEL;
                 new_paca->hw_cpu_id = 0xffff;
-                new_paca->slb_shadow_ptr = &slb_shadow[cpu];
                 new_paca->__current = &init_task;
+#ifdef CONFIG_PPC_STD_MMU_64
+                new_paca->slb_shadow_ptr = &slb_shadow[cpu];
+#endif /* CONFIG_PPC_STD_MMU_64 */
 
         }
 }
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 4fee63cb53ff..5a56e97c5ac0 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1505,7 +1505,7 @@ void __init pcibios_resource_survey(void)
  * rest of the code later, for now, keep it as-is as our main
  * resource allocation function doesn't deal with sub-trees yet.
  */
-void __devinit pcibios_claim_one_bus(struct pci_bus *bus)
+void pcibios_claim_one_bus(struct pci_bus *bus)
 {
         struct pci_dev *dev;
         struct pci_bus *child_bus;
@@ -1533,7 +1533,6 @@ void __devinit pcibios_claim_one_bus(struct pci_bus *bus)
         list_for_each_entry(child_bus, &bus->children, node)
                 pcibios_claim_one_bus(child_bus);
 }
-EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);
 
 
 /* pcibios_finish_adding_to_bus
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index d473634e39e3..3ae1c666ff92 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -33,7 +33,6 @@ int pcibios_assign_bus_offset = 1;
 
 void pcibios_make_OF_bus_map(void);
 
-static void fixup_broken_pcnet32(struct pci_dev* dev);
 static void fixup_cpc710_pci64(struct pci_dev* dev);
 #ifdef CONFIG_PPC_OF
 static u8* pci_to_OF_bus_map;
@@ -72,16 +71,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MOTOROLA, PCI_ANY_ID, fixup_hide_host_res
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, fixup_hide_host_resource_fsl); 
 
 static void
-fixup_broken_pcnet32(struct pci_dev* dev)
-{
-        if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
-                dev->vendor = PCI_VENDOR_ID_AMD;
-                pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID,                     fixup_broken_pcnet32);
-
-static void
 fixup_cpc710_pci64(struct pci_dev* dev)
 {
         /* Hide the PCI64 BARs from the kernel as their content doesn't
@@ -447,14 +436,6 @@ static int __init pcibios_init(void)
 
 subsys_initcall(pcibios_init);
 
-/* the next one is stolen from the alpha port... */
-void __init
-pcibios_update_irq(struct pci_dev *dev, int irq)
-{
-        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
-        /* XXX FIXME - update OF device tree node interrupt property */
-}
-
 static struct pci_controller*
 pci_bus_to_hose(int bus)
 {
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 96edb6f8babb..9e8902fa14c7 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -43,16 +43,6 @@ unsigned long pci_probe_only = 1;
 unsigned long pci_io_base = ISA_IO_BASE;
 EXPORT_SYMBOL(pci_io_base);
 
-static void fixup_broken_pcnet32(struct pci_dev* dev)
-{
-        if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
-                dev->vendor = PCI_VENDOR_ID_AMD;
-                pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32);
-
-
 static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
 {
         const u32 *prop;
@@ -430,6 +420,9 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
          * so flushing the hash table is the only sane way to make sure
          * that no hash entries are covering that removed bridge area
          * while still allowing other busses overlapping those pages
+         *
+         * Note: If we ever support P2P hotplug on Book3E, we'll have
+         * to do an appropriate TLB flush here too
          */
         if (bus->self) {
                 struct resource *res = bus->resource[0];
@@ -437,8 +430,10 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
                 pr_debug("IO unmapping for PCI-PCI bridge %s\n",
                          pci_name(bus->self));
 
+#ifdef CONFIG_PPC_STD_MMU_64
                 __flush_hash_table_range(&init_mm, res->start + _IO_BASE,
                                          res->end + _IO_BASE + 1);
+#endif
                 return 0;
         }
 
@@ -511,7 +506,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
         pr_debug("IO mapping for PHB %s\n", hose->dn->full_name);
         pr_debug("  phys=0x%016llx, virt=0x%p (alloc=0x%p)\n",
                  hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
-        pr_debug("  size=0x%016lx (alloc=0x%016lx)\n",
+        pr_debug("  size=0x%016llx (alloc=0x%016lx)\n",
                  hose->pci_io_size, size_page);
 
         /* Establish the mapping */
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index 1c67de52e3ce..d5e36e5dc7c2 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -27,7 +27,6 @@
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/ppc-pci.h>
 #include <asm/firmware.h>
 
@@ -35,7 +34,7 @@
  * Traverse_func that inits the PCI fields of the device node.
  * NOTE: this *must* be done before read/write config to the device.
  */
-static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
+void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
 {
         struct pci_controller *phb = data;
         const int *type =
@@ -184,29 +183,6 @@ struct device_node *fetch_dev_dn(struct pci_dev *dev)
 }
 EXPORT_SYMBOL(fetch_dev_dn);
 
-static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
-{
-        struct device_node *np = node;
-        struct pci_dn *pci = NULL;
-        int err = NOTIFY_OK;
-
-        switch (action) {
-        case PSERIES_RECONFIG_ADD:
-                pci = np->parent->data;
-                if (pci)
-                        update_dn_pci_info(np, pci->phb);
-                break;
-        default:
-                err = NOTIFY_DONE;
-                break;
-        }
-        return err;
-}
-
-static struct notifier_block pci_dn_reconfig_nb = {
-        .notifier_call = pci_dn_reconfig_notifier,
-};
-
 /** 
  * pci_devs_phb_init - Initialize phbs and pci devs under them.
  * 
@@ -223,6 +199,4 @@ void __init pci_devs_phb_init(void)
         /* This must be done first so the device nodes have valid pci info! */
         list_for_each_entry_safe(phb, tmp, &hose_list, list_node)
                 pci_devs_phb_init_dynamic(phb);
-
-        pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb);
 }
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 7b44a33f03c2..3e7135bbe40f 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -650,7 +650,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
         p->thread.ksp_limit = (unsigned long)task_stack_page(p) +
                                 _ALIGN_UP(sizeof(struct thread_info), 16);
 
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_STD_MMU_64
         if (cpu_has_feature(CPU_FTR_SLB)) {
                 unsigned long sp_vsid;
                 unsigned long llp = mmu_psize_defs[mmu_linear_psize].sllp;
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index ce01ff2474da..d4405b95bfaa 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -585,7 +585,7 @@ static void __init check_cpu_pa_features(unsigned long node)
                       ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
 }
 
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_STD_MMU_64
 static void __init check_cpu_slb_size(unsigned long node)
 {
         u32 *slb_size_ptr;
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 3635be61f899..9fa2c7dcd05a 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -704,15 +704,34 @@ void user_enable_single_step(struct task_struct *task)
 
         if (regs != NULL) {
 #if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
+                task->thread.dbcr0 &= ~DBCR0_BT;
                 task->thread.dbcr0 |= DBCR0_IDM | DBCR0_IC;
                 regs->msr |= MSR_DE;
 #else
+                regs->msr &= ~MSR_BE;
                 regs->msr |= MSR_SE;
 #endif
         }
         set_tsk_thread_flag(task, TIF_SINGLESTEP);
 }
 
+void user_enable_block_step(struct task_struct *task)
+{
+        struct pt_regs *regs = task->thread.regs;
+
+        if (regs != NULL) {
+#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
+                task->thread.dbcr0 &= ~DBCR0_IC;
+                task->thread.dbcr0 = DBCR0_IDM | DBCR0_BT;
+                regs->msr |= MSR_DE;
+#else
+                regs->msr &= ~MSR_SE;
+                regs->msr |= MSR_BE;
+#endif
+        }
+        set_tsk_thread_flag(task, TIF_SINGLESTEP);
+}
+
 void user_disable_single_step(struct task_struct *task)
 {
         struct pt_regs *regs = task->thread.regs;
@@ -726,10 +745,10 @@ void user_disable_single_step(struct task_struct *task)
 
         if (regs != NULL) {
 #if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
-                task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_IDM);
+                task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT | DBCR0_IDM);
                 regs->msr &= ~MSR_DE;
 #else
-                regs->msr &= ~MSR_SE;
+                regs->msr &= ~(MSR_SE | MSR_BE);
 #endif
         }
         clear_tsk_thread_flag(task, TIF_SINGLESTEP);
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 8869001ab5d7..54e66da8f743 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -93,10 +93,7 @@ static int rtas_pci_read_config(struct pci_bus *bus,
 {
         struct device_node *busdn, *dn;
 
-        if (bus->self)
-                busdn = pci_device_to_OF_node(bus->self);
-        else
-                busdn = bus->sysdata;   /* must be a phb */
+        busdn = pci_bus_to_OF_node(bus);
 
         /* Search only direct children of the bus */
         for (dn = busdn->child; dn; dn = dn->sibling) {
@@ -140,10 +137,7 @@ static int rtas_pci_write_config(struct pci_bus *bus,
 {
         struct device_node *busdn, *dn;
 
-        if (bus->self)
-                busdn = pci_device_to_OF_node(bus->self);
-        else
-                busdn = bus->sysdata;   /* must be a phb */
+        busdn = pci_bus_to_OF_node(bus);
 
         /* Search only direct children of the bus */
         for (dn = busdn->child; dn; dn = dn->sibling) {
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 9e1ca745d8f0..1d154248cf40 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -39,6 +39,7 @@
 #include <asm/serial.h>
 #include <asm/udbg.h>
 #include <asm/mmu_context.h>
+#include <asm/swiotlb.h>
 
 #include "setup.h"
 
@@ -332,6 +333,11 @@ void __init setup_arch(char **cmdline_p)
                 ppc_md.setup_arch();
         if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
 
+#ifdef CONFIG_SWIOTLB
+        if (ppc_swiotlb_enable)
+                swiotlb_init();
+#endif
+
         paging_init();
 
         /* Initialize the MMU context management stuff */
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index c410c606955d..1f6816003ebe 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -61,6 +61,7 @@
 #include <asm/xmon.h>
 #include <asm/udbg.h>
 #include <asm/kexec.h>
+#include <asm/swiotlb.h>
 
 #include "setup.h"
 
@@ -417,12 +418,14 @@ void __init setup_system(void)
         if (ppc64_caches.iline_size != 0x80)
                 printk("ppc64_caches.icache_line_size = 0x%x\n",
                        ppc64_caches.iline_size);
+#ifdef CONFIG_PPC_STD_MMU_64
         if (htab_address)
                 printk("htab_address                  = 0x%p\n", htab_address);
         printk("htab_hash_mask                = 0x%lx\n", htab_hash_mask);
+#endif /* CONFIG_PPC_STD_MMU_64 */
         if (PHYSICAL_START > 0)
-                printk("physical_start                = 0x%lx\n",
-                       PHYSICAL_START);
+                printk("physical_start                = 0x%llx\n",
+                       (unsigned long long)PHYSICAL_START);
         printk("-----------------------------------------------------\n");
 
         DBG(" <- setup_system()\n");
@@ -511,8 +514,9 @@ void __init setup_arch(char **cmdline_p)
         irqstack_early_init();
         emergency_stack_init();
 
+#ifdef CONFIG_PPC_STD_MMU_64
         stabs_alloc();
-
+#endif
         /* set up the bootmem stuff with available memory */
         do_init_bootmem();
         sparse_init();
@@ -524,6 +528,11 @@ void __init setup_arch(char **cmdline_p)
         if (ppc_md.setup_arch)
                 ppc_md.setup_arch();
 
+#ifdef CONFIG_SWIOTLB
+        if (ppc_swiotlb_enable)
+                swiotlb_init();
+#endif
+
         paging_init();
         ppc64_boot_msg(0x15, "Setup Done");
 }
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 48571ac56fb7..15391c2ab013 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -52,6 +52,7 @@
 #include <linux/jiffies.h>
 #include <linux/posix-timers.h>
 #include <linux/irq.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/processor.h>
@@ -109,7 +110,7 @@ static void decrementer_set_mode(enum clock_event_mode mode,
 static struct clock_event_device decrementer_clockevent = {
        .name           = "decrementer",
        .rating         = 200,
-       .shift          = 16,
+       .shift          = 0,     /* To be filled in */
        .mult           = 0,     /* To be filled in */
        .irq            = 0,
        .set_next_event = decrementer_set_next_event,
@@ -843,6 +844,22 @@ static void decrementer_set_mode(enum clock_event_mode mode,
                 decrementer_set_next_event(DECREMENTER_MAX, dev);
 }
 
+static void __init setup_clockevent_multiplier(unsigned long hz)
+{
+        u64 mult, shift = 32;
+
+        while (1) {
+                mult = div_sc(hz, NSEC_PER_SEC, shift);
+                if (mult && (mult >> 32UL) == 0UL)
+                        break;
+
+                shift--;
+        }
+
+        decrementer_clockevent.shift = shift;
+        decrementer_clockevent.mult = mult;
+}
+
 static void register_decrementer_clockevent(int cpu)
 {
         struct clock_event_device *dec = &per_cpu(decrementers, cpu).event;
@@ -860,8 +877,7 @@ static void __init init_decrementer_clockevent(void)
 {
         int cpu = smp_processor_id();
 
-        decrementer_clockevent.mult = div_sc(ppc_tb_freq, NSEC_PER_SEC,
-                                             decrementer_clockevent.shift);
+        setup_clockevent_multiplier(ppc_tb_freq);
         decrementer_clockevent.max_delta_ns =
                 clockevent_delta2ns(DECREMENTER_MAX, &decrementer_clockevent);
         decrementer_clockevent.min_delta_ns =
@@ -1128,6 +1144,15 @@ void div128_by_32(u64 dividend_high, u64 dividend_low,
 
 }
 
+/* We don't need to calibrate delay, we use the CPU timebase for that */
+void calibrate_delay(void)
+{
+        /* Some generic code (such as spinlock debug) use loops_per_jiffy
+         * as the number of __delay(1) in a jiffy, so make it so
+         */
+        loops_per_jiffy = tb_ticks_per_jiffy;
+}
+
 static int __init rtc_init(void)
 {
         struct platform_device *pdev;
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 678fbff0d206..6f0ae1a9bfae 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -33,7 +33,9 @@
 #include <linux/backlight.h>
 #include <linux/bug.h>
 #include <linux/kdebug.h>
+#include <linux/debugfs.h>
 
+#include <asm/emulated_ops.h>
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -757,36 +759,44 @@ static int emulate_instruction(struct pt_regs *regs)
 
         /* Emulate the mfspr rD, PVR. */
         if ((instword & PPC_INST_MFSPR_PVR_MASK) == PPC_INST_MFSPR_PVR) {
+                PPC_WARN_EMULATED(mfpvr);
                 rd = (instword >> 21) & 0x1f;
                 regs->gpr[rd] = mfspr(SPRN_PVR);
                 return 0;
         }
 
         /* Emulating the dcba insn is just a no-op.  */
-        if ((instword & PPC_INST_DCBA_MASK) == PPC_INST_DCBA)
+        if ((instword & PPC_INST_DCBA_MASK) == PPC_INST_DCBA) {
+                PPC_WARN_EMULATED(dcba);
                 return 0;
+        }
 
         /* Emulate the mcrxr insn.  */
         if ((instword & PPC_INST_MCRXR_MASK) == PPC_INST_MCRXR) {
                 int shift = (instword >> 21) & 0x1c;
                 unsigned long msk = 0xf0000000UL >> shift;
 
+                PPC_WARN_EMULATED(mcrxr);
                 regs->ccr = (regs->ccr & ~msk) | ((regs->xer >> shift) & msk);
                 regs->xer &= ~0xf0000000UL;
                 return 0;
         }
 
         /* Emulate load/store string insn. */
-        if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING)
+        if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) {
+                PPC_WARN_EMULATED(string);
                 return emulate_string_inst(regs, instword);
+        }
 
         /* Emulate the popcntb (Population Count Bytes) instruction. */
         if ((instword & PPC_INST_POPCNTB_MASK) == PPC_INST_POPCNTB) {
+                PPC_WARN_EMULATED(popcntb);
                 return emulate_popcntb_inst(regs, instword);
         }
 
         /* Emulate isel (Integer Select) instruction */
         if ((instword & PPC_INST_ISEL_MASK) == PPC_INST_ISEL) {
+                PPC_WARN_EMULATED(isel);
                 return emulate_isel(regs, instword);
         }
 
@@ -984,6 +994,8 @@ void SoftwareEmulation(struct pt_regs *regs)
 
 #ifdef CONFIG_MATH_EMULATION
         errcode = do_mathemu(regs);
+        if (errcode >= 0)
+                PPC_WARN_EMULATED(math);
 
         switch (errcode) {
         case 0:
@@ -1005,6 +1017,9 @@ void SoftwareEmulation(struct pt_regs *regs)
 
 #elif defined(CONFIG_8XX_MINIMAL_FPEMU)
         errcode = Soft_emulate_8xx(regs);
+        if (errcode >= 0)
+                PPC_WARN_EMULATED(8xx);
+
         switch (errcode) {
         case 0:
                 emulate_single_step(regs);
@@ -1026,7 +1041,34 @@ void SoftwareEmulation(struct pt_regs *regs)
 
 void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status)
 {
-        if (debug_status & DBSR_IC) {   /* instruction completion */
+        /* Hack alert: On BookE, Branch Taken stops on the branch itself, while
+         * on server, it stops on the target of the branch. In order to simulate
+         * the server behaviour, we thus restart right away with a single step
+         * instead of stopping here when hitting a BT
+         */
+        if (debug_status & DBSR_BT) {
+                regs->msr &= ~MSR_DE;
+
+                /* Disable BT */
+                mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) & ~DBCR0_BT);
+                /* Clear the BT event */
+                mtspr(SPRN_DBSR, DBSR_BT);
+
+                /* Do the single step trick only when coming from userspace */
+                if (user_mode(regs)) {
+                        current->thread.dbcr0 &= ~DBCR0_BT;
+                        current->thread.dbcr0 |= DBCR0_IDM | DBCR0_IC;
+                        regs->msr |= MSR_DE;
+                        return;
+                }
+
+                if (notify_die(DIE_SSTEP, "block_step", regs, 5,
+                               5, SIGTRAP) == NOTIFY_STOP) {
+                        return;
+                }
+                if (debugger_sstep(regs))
+                        return;
+        } else if (debug_status & DBSR_IC) {    /* Instruction complete */
                 regs->msr &= ~MSR_DE;
 
                 /* Disable instruction completion */
@@ -1042,9 +1084,8 @@ void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status)
                 if (debugger_sstep(regs))
                         return;
 
-                if (user_mode(regs)) {
-                        current->thread.dbcr0 &= ~DBCR0_IC;
-                }
+                if (user_mode(regs))
+                        current->thread.dbcr0 &= ~(DBCR0_IC);
 
                 _exception(SIGTRAP, regs, TRAP_TRACE, regs->nip);
         } else if (debug_status & (DBSR_DAC1R | DBSR_DAC1W)) {
@@ -1088,6 +1129,7 @@ void altivec_assist_exception(struct pt_regs *regs)
 
         flush_altivec_to_thread(current);
 
+        PPC_WARN_EMULATED(altivec);
         err = emulate_altivec(regs);
         if (err == 0) {
                 regs->nip += 4;         /* skip emulated instruction */
@@ -1286,3 +1328,79 @@ void kernel_bad_stack(struct pt_regs *regs)
 void __init trap_init(void)
 {
 }
+
+
+#ifdef CONFIG_PPC_EMULATED_STATS
+
+#define WARN_EMULATED_SETUP(type)       .type = { .name = #type }
+
+struct ppc_emulated ppc_emulated = {
+#ifdef CONFIG_ALTIVEC
+        WARN_EMULATED_SETUP(altivec),
+#endif
+        WARN_EMULATED_SETUP(dcba),
+        WARN_EMULATED_SETUP(dcbz),
+        WARN_EMULATED_SETUP(fp_pair),
+        WARN_EMULATED_SETUP(isel),
+        WARN_EMULATED_SETUP(mcrxr),
+        WARN_EMULATED_SETUP(mfpvr),
+        WARN_EMULATED_SETUP(multiple),
+        WARN_EMULATED_SETUP(popcntb),
+        WARN_EMULATED_SETUP(spe),
+        WARN_EMULATED_SETUP(string),
+        WARN_EMULATED_SETUP(unaligned),
+#ifdef CONFIG_MATH_EMULATION
+        WARN_EMULATED_SETUP(math),
+#elif defined(CONFIG_8XX_MINIMAL_FPEMU)
+        WARN_EMULATED_SETUP(8xx),
+#endif
+#ifdef CONFIG_VSX
+        WARN_EMULATED_SETUP(vsx),
+#endif
+};
+
+u32 ppc_warn_emulated;
+
+void ppc_warn_emulated_print(const char *type)
+{
+        if (printk_ratelimit())
+                pr_warning("%s used emulated %s instruction\n", current->comm,
+                           type);
+}
+
+static int __init ppc_warn_emulated_init(void)
+{
+        struct dentry *dir, *d;
+        unsigned int i;
+        struct ppc_emulated_entry *entries = (void *)&ppc_emulated;
+
+        if (!powerpc_debugfs_root)
+                return -ENODEV;
+
+        dir = debugfs_create_dir("emulated_instructions",
+                                 powerpc_debugfs_root);
+        if (!dir)
+                return -ENOMEM;
+
+        d = debugfs_create_u32("do_warn", S_IRUGO | S_IWUSR, dir,
+                               &ppc_warn_emulated);
+        if (!d)
+                goto fail;
+
+        for (i = 0; i < sizeof(ppc_emulated)/sizeof(*entries); i++) {
+                d = debugfs_create_u32(entries[i].name, S_IRUGO | S_IWUSR, dir,
+                                       (u32 *)&entries[i].val.counter);
+                if (!d)
+                        goto fail;
+        }
+
+        return 0;
+
+fail:
+        debugfs_remove_recursive(dir);
+        return -ENOMEM;
+}
+
+device_initcall(ppc_warn_emulated_init);
+
+#endif /* CONFIG_PPC_EMULATED_STATS */
diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S
index 49ac3d6e1399..ef36cbbc5882 100644
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
@@ -1,5 +1,215 @@
+#include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/reg.h>
+#include <asm/asm-offsets.h>
+#include <asm/cputable.h>
+#include <asm/thread_info.h>
+#include <asm/page.h>
+
+/*
+ * load_up_altivec(unused, unused, tsk)
+ * Disable VMX for the task which had it previously,
+ * and save its vector registers in its thread_struct.
+ * Enables the VMX for use in the kernel on return.
+ * On SMP we know the VMX is free, since we give it up every
+ * switch (ie, no lazy save of the vector registers).
+ */
+_GLOBAL(load_up_altivec)
+        mfmsr   r5                      /* grab the current MSR */
+        oris    r5,r5,MSR_VEC@h
+        MTMSRD(r5)                      /* enable use of AltiVec now */
+        isync
+
+/*
+ * For SMP, we don't do lazy VMX switching because it just gets too
+ * horrendously complex, especially when a task switches from one CPU
+ * to another.  Instead we call giveup_altvec in switch_to.
+ * VRSAVE isn't dealt with here, that is done in the normal context
+ * switch code. Note that we could rely on vrsave value to eventually
+ * avoid saving all of the VREGs here...
+ */
+#ifndef CONFIG_SMP
+        LOAD_REG_ADDRBASE(r3, last_task_used_altivec)
+        toreal(r3)
+        PPC_LL  r4,ADDROFF(last_task_used_altivec)(r3)
+        PPC_LCMPI       0,r4,0
+        beq     1f
+
+        /* Save VMX state to last_task_used_altivec's THREAD struct */
+        toreal(r4)
+        addi    r4,r4,THREAD
+        SAVE_32VRS(0,r5,r4)
+        mfvscr  vr0
+        li      r10,THREAD_VSCR
+        stvx    vr0,r10,r4
+        /* Disable VMX for last_task_used_altivec */
+        PPC_LL  r5,PT_REGS(r4)
+        toreal(r5)
+        PPC_LL  r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+        lis     r10,MSR_VEC@h
+        andc    r4,r4,r10
+        PPC_STL r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+1:
+#endif /* CONFIG_SMP */
+
+        /* Hack: if we get an altivec unavailable trap with VRSAVE
+         * set to all zeros, we assume this is a broken application
+         * that fails to set it properly, and thus we switch it to
+         * all 1's
+         */
+        mfspr   r4,SPRN_VRSAVE
+        cmpdi   0,r4,0
+        bne+    1f
+        li      r4,-1
+        mtspr   SPRN_VRSAVE,r4
+1:
+        /* enable use of VMX after return */
+#ifdef CONFIG_PPC32
+        mfspr   r5,SPRN_SPRG3           /* current task's THREAD (phys) */
+        oris    r9,r9,MSR_VEC@h
+#else
+        ld      r4,PACACURRENT(r13)
+        addi    r5,r4,THREAD            /* Get THREAD */
+        oris    r12,r12,MSR_VEC@h
+        std     r12,_MSR(r1)
+#endif
+        li      r4,1
+        li      r10,THREAD_VSCR
+        stw     r4,THREAD_USED_VR(r5)
+        lvx     vr0,r10,r5
+        mtvscr  vr0
+        REST_32VRS(0,r4,r5)
+#ifndef CONFIG_SMP
+        /* Update last_task_used_math to 'current' */
+        subi    r4,r5,THREAD            /* Back to 'current' */
+        fromreal(r4)
+        PPC_STL r4,ADDROFF(last_task_used_math)(r3)
+#endif /* CONFIG_SMP */
+        /* restore registers and return */
+        blr
+
+/*
+ * giveup_altivec(tsk)
+ * Disable VMX for the task given as the argument,
+ * and save the vector registers in its thread_struct.
+ * Enables the VMX for use in the kernel on return.
+ */
+_GLOBAL(giveup_altivec)
+        mfmsr   r5
+        oris    r5,r5,MSR_VEC@h
+        SYNC
+        MTMSRD(r5)                      /* enable use of VMX now */
+        isync
+        PPC_LCMPI       0,r3,0
+        beqlr-                          /* if no previous owner, done */
+        addi    r3,r3,THREAD            /* want THREAD of task */
+        PPC_LL  r5,PT_REGS(r3)
+        PPC_LCMPI       0,r5,0
+        SAVE_32VRS(0,r4,r3)
+        mfvscr  vr0
+        li      r4,THREAD_VSCR
+        stvx    vr0,r4,r3
+        beq     1f
+        PPC_LL  r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+#ifdef CONFIG_VSX
+BEGIN_FTR_SECTION
+        lis     r3,(MSR_VEC|MSR_VSX)@h
+FTR_SECTION_ELSE
+        lis     r3,MSR_VEC@h
+ALT_FTR_SECTION_END_IFSET(CPU_FTR_VSX)
+#else
+        lis     r3,MSR_VEC@h
+#endif
+        andc    r4,r4,r3                /* disable FP for previous task */
+        PPC_STL r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+1:
+#ifndef CONFIG_SMP
+        li      r5,0
+        LOAD_REG_ADDRBASE(r4,last_task_used_altivec)
+        PPC_STL r5,ADDROFF(last_task_used_altivec)(r4)
+#endif /* CONFIG_SMP */
+        blr
+
+#ifdef CONFIG_VSX
+
+#ifdef CONFIG_PPC32
+#error This asm code isn't ready for 32-bit kernels
+#endif
+
+/*
+ * load_up_vsx(unused, unused, tsk)
+ * Disable VSX for the task which had it previously,
+ * and save its vector registers in its thread_struct.
+ * Reuse the fp and vsx saves, but first check to see if they have
+ * been saved already.
+ */
+_GLOBAL(load_up_vsx)
+/* Load FP and VSX registers if they haven't been done yet */
+        andi.   r5,r12,MSR_FP
+        beql+   load_up_fpu             /* skip if already loaded */
+        andis.  r5,r12,MSR_VEC@h
+        beql+   load_up_altivec         /* skip if already loaded */
+
+#ifndef CONFIG_SMP
+        ld      r3,last_task_used_vsx@got(r2)
+        ld      r4,0(r3)
+        cmpdi   0,r4,0
+        beq     1f
+        /* Disable VSX for last_task_used_vsx */
+        addi    r4,r4,THREAD
+        ld      r5,PT_REGS(r4)
+        ld      r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+        lis     r6,MSR_VSX@h
+        andc    r6,r4,r6
+        std     r6,_MSR-STACK_FRAME_OVERHEAD(r5)
+1:
+#endif /* CONFIG_SMP */
+        ld      r4,PACACURRENT(r13)
+        addi    r4,r4,THREAD            /* Get THREAD */
+        li      r6,1
+        stw     r6,THREAD_USED_VSR(r4) /* ... also set thread used vsr */
+        /* enable use of VSX after return */
+        oris    r12,r12,MSR_VSX@h
+        std     r12,_MSR(r1)
+#ifndef CONFIG_SMP
+        /* Update last_task_used_math to 'current' */
+        ld      r4,PACACURRENT(r13)
+        std     r4,0(r3)
+#endif /* CONFIG_SMP */
+        b       fast_exception_return
+
+/*
+ * __giveup_vsx(tsk)
+ * Disable VSX for the task given as the argument.
+ * Does NOT save vsx registers.
+ * Enables the VSX for use in the kernel on return.
+ */
+_GLOBAL(__giveup_vsx)
+        mfmsr   r5
+        oris    r5,r5,MSR_VSX@h
+        mtmsrd  r5                      /* enable use of VSX now */
+        isync
+
+        cmpdi   0,r3,0
+        beqlr-                          /* if no previous owner, done */
+        addi    r3,r3,THREAD            /* want THREAD of task */
+        ld      r5,PT_REGS(r3)
+        cmpdi   0,r5,0
+        beq     1f
+        ld      r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+        lis     r3,MSR_VSX@h
+        andc    r4,r4,r3                /* disable VSX for previous task */
+        std     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+1:
+#ifndef CONFIG_SMP
+        li      r5,0
+        ld      r4,last_task_used_vsx@got(r2)
+        std     r5,0(r4)
+#endif /* CONFIG_SMP */
+        blr
+
+#endif /* CONFIG_VSX */
+
 
 /*
  * The routines below are in assembler so we can closely control the
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index b746f4ca4209..c4bcf072cb3c 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -11,10 +11,11 @@ obj-y				:= fault.o mem.o pgtable.o gup.o \
                                    pgtable_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_PPC_MMU_NOHASH)    += mmu_context_nohash.o tlb_nohash.o \
                                    tlb_nohash_low.o
-hash-$(CONFIG_PPC_NATIVE)       := hash_native_64.o
-obj-$(CONFIG_PPC64)             += hash_utils_64.o \
+obj-$(CONFIG_PPC64)             += mmap_64.o
+hash64-$(CONFIG_PPC_NATIVE)     := hash_native_64.o
+obj-$(CONFIG_PPC_STD_MMU_64)    += hash_utils_64.o \
                                    slb_low.o slb.o stab.o \
-                                   mmap_64.o $(hash-y)
+                                   mmap_64.o $(hash64-y)
 obj-$(CONFIG_PPC_STD_MMU_32)    += ppc_mmu_32.o
 obj-$(CONFIG_PPC_STD_MMU)       += hash_low_$(CONFIG_WORD_SIZE).o \
                                    tlb_hash$(CONFIG_WORD_SIZE).o \
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 34e5c0b219b9..056d23a1b105 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -27,6 +27,7 @@
 #include <asm/cputable.h>
 #include <asm/udbg.h>
 #include <asm/kexec.h>
+#include <asm/ppc-opcode.h>
 
 #ifdef DEBUG_LOW
 #define DBG_LOW(fmt...) udbg_printf(fmt)
@@ -49,14 +50,21 @@ static inline void __tlbie(unsigned long va, int psize, int ssize)
         case MMU_PAGE_4K:
                 va &= ~0xffful;
                 va |= ssize << 8;
-                asm volatile("tlbie %0,0" : : "r" (va) : "memory");
+                asm volatile(ASM_MMU_FTR_IFCLR("tlbie %0,0", PPC_TLBIE(%1,%0),
+                                               %2)
+                             : : "r" (va), "r"(0), "i" (MMU_FTR_TLBIE_206)
+                             : "memory");
                 break;
         default:
                 penc = mmu_psize_defs[psize].penc;
                 va &= ~((1ul << mmu_psize_defs[psize].shift) - 1);
                 va |= penc << 12;
                 va |= ssize << 8;
-                asm volatile("tlbie %0,1" : : "r" (va) : "memory");
+                va |= 1; /* L */
+                asm volatile(ASM_MMU_FTR_IFCLR("tlbie %0,1", PPC_TLBIE(%1,%0),
+                                               %2)
+                             : : "r" (va), "r"(0), "i" (MMU_FTR_TLBIE_206)
+                             : "memory");
                 break;
         }
 }
@@ -80,6 +88,7 @@ static inline void __tlbiel(unsigned long va, int psize, int ssize)
                 va &= ~((1ul << mmu_psize_defs[psize].shift) - 1);
                 va |= penc << 12;
                 va |= ssize << 8;
+                va |= 1; /* L */
                 asm volatile(".long 0x7c000224 | (%0 << 11) | (1 << 21)"
                              : : "r"(va) : "memory");
                 break;
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 3e6a6543f53a..68a821add28d 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -66,6 +66,7 @@
 
 #include "mmu_decl.h"
 
+#ifdef CONFIG_PPC_STD_MMU_64
 #if PGTABLE_RANGE > USER_VSID_RANGE
 #warning Limited user VSID range means pagetable space is wasted
 #endif
@@ -73,6 +74,7 @@
 #if (TASK_SIZE_USER64 < PGTABLE_RANGE) && (TASK_SIZE_USER64 < USER_VSID_RANGE)
 #warning TASK_SIZE is smaller than it needs to be.
 #endif
+#endif /* CONFIG_PPC_STD_MMU_64 */
 
 phys_addr_t memstart_addr = ~0;
 phys_addr_t kernstart_addr;
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
index 030d0005b4d2..8343986809c0 100644
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -46,7 +46,7 @@ static unsigned int next_context, nr_free_contexts;
 static unsigned long *context_map;
 static unsigned long *stale_map[NR_CPUS];
 static struct mm_struct **context_mm;
-static spinlock_t context_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(context_lock);
 
 #define CTX_MAP_SIZE    \
         (sizeof(unsigned long) * (last_context / BITS_PER_LONG + 1))
@@ -73,7 +73,6 @@ static unsigned int steal_context_smp(unsigned int id)
         struct mm_struct *mm;
         unsigned int cpu, max;
 
- again:
         max = last_context - first_context;
 
         /* Attempt to free next_context first and then loop until we manage */
@@ -108,7 +107,9 @@ static unsigned int steal_context_smp(unsigned int id)
         spin_unlock(&context_lock);
         cpu_relax();
         spin_lock(&context_lock);
-        goto again;
+
+        /* This will cause the caller to try again */
+        return MMU_NO_CONTEXT;
 }
 #endif  /* CONFIG_SMP */
 
@@ -194,6 +195,8 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next)
                 WARN_ON(prev->context.active < 1);
                 prev->context.active--;
         }
+
+ again:
 #endif /* CONFIG_SMP */
 
         /* If we already have a valid assigned context, skip all that */
@@ -212,7 +215,8 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next)
 #ifdef CONFIG_SMP
                 if (num_online_cpus() > 1) {
                         id = steal_context_smp(id);
-                        goto stolen;
+                        if (id == MMU_NO_CONTEXT)
+                                goto again;
                 }
 #endif /* CONFIG_SMP */
                 id = steal_context_up(id);
@@ -272,6 +276,7 @@ int init_new_context(struct task_struct *t, struct mm_struct *mm)
  */
 void destroy_context(struct mm_struct *mm)
 {
+        unsigned long flags;
         unsigned int id;
 
         if (mm->context.id == MMU_NO_CONTEXT)
@@ -279,18 +284,18 @@ void destroy_context(struct mm_struct *mm)
 
         WARN_ON(mm->context.active != 0);
 
-        spin_lock(&context_lock);
+        spin_lock_irqsave(&context_lock, flags);
         id = mm->context.id;
         if (id != MMU_NO_CONTEXT) {
                 __clear_bit(id, context_map);
                 mm->context.id = MMU_NO_CONTEXT;
 #ifdef DEBUG_MAP_CONSISTENCY
                 mm->context.active = 0;
-                context_mm[id] = NULL;
 #endif
+                context_mm[id] = NULL;
                 nr_free_contexts++;
         }
-        spin_unlock(&context_lock);
+        spin_unlock_irqrestore(&context_lock, flags);
 }
 
 #ifdef CONFIG_SMP
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 9047145095aa..b037d95eeadc 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -981,6 +981,8 @@ void __init do_init_bootmem(void)
                 mark_reserved_regions_for_nid(nid);
                 sparse_memory_present_with_active_regions(nid);
         }
+
+        init_bootmem_done = 1;
 }
 
 void __init paging_init(void)
diff --git a/arch/powerpc/oprofile/op_model_fsl_emb.c b/arch/powerpc/oprofile/op_model_fsl_emb.c
index 91596f6ba1f4..62312abffa28 100644
--- a/arch/powerpc/oprofile/op_model_fsl_emb.c
+++ b/arch/powerpc/oprofile/op_model_fsl_emb.c
@@ -228,20 +228,6 @@ static void pmc_stop_ctrs(void)
         mtpmr(PMRN_PMGC0, pmgc0);
 }
 
-static void dump_pmcs(void)
-{
-        printk("pmgc0: %x\n", mfpmr(PMRN_PMGC0));
-        printk("pmc\t\tpmlca\t\tpmlcb\n");
-        printk("%8x\t%8x\t%8x\n", mfpmr(PMRN_PMC0),
-                        mfpmr(PMRN_PMLCA0), mfpmr(PMRN_PMLCB0));
-        printk("%8x\t%8x\t%8x\n", mfpmr(PMRN_PMC1),
-                        mfpmr(PMRN_PMLCA1), mfpmr(PMRN_PMLCB1));
-        printk("%8x\t%8x\t%8x\n", mfpmr(PMRN_PMC2),
-                        mfpmr(PMRN_PMLCA2), mfpmr(PMRN_PMLCB2));
-        printk("%8x\t%8x\t%8x\n", mfpmr(PMRN_PMC3),
-                        mfpmr(PMRN_PMLCA3), mfpmr(PMRN_PMLCB3));
-}
-
 static int fsl_emb_cpu_setup(struct op_counter_config *ctr)
 {
         int i;
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index f39c953d5353..a6e43cb6f825 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -45,6 +45,7 @@ config KILAUEA
         depends on 40x
         default n
         select 405EX
+        select PPC40x_SIMPLE
         select PPC4xx_PCI_EXPRESS
         help
           This option enables support for the AMCC PPC405EX evaluation board.
@@ -56,6 +57,7 @@ config MAKALU
         select 405EX
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select PPC40x_SIMPLE
         help
           This option enables support for the AMCC PPC405EX board.
 
diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile
index 9bab76a652a6..56e89004c468 100644
--- a/arch/powerpc/platforms/40x/Makefile
+++ b/arch/powerpc/platforms/40x/Makefile
@@ -1,6 +1,4 @@
-obj-$(CONFIG_KILAUEA)                           += kilauea.o
 obj-$(CONFIG_HCU4)                              += hcu4.o
-obj-$(CONFIG_MAKALU)                            += makalu.o
 obj-$(CONFIG_WALNUT)                            += walnut.o
 obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)       += virtex.o
 obj-$(CONFIG_EP405)                             += ep405.o
diff --git a/arch/powerpc/platforms/40x/kilauea.c b/arch/powerpc/platforms/40x/kilauea.c
deleted file mode 100644
index fd7d934dac8b..000000000000
--- a/arch/powerpc/platforms/40x/kilauea.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Kilauea board specific routines
- *
- * Copyright 2007-2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
- *
- * Based on the Walnut code by
- * Josh Boyer <jwboyer@linux.vnet.ibm.com>
- * Copyright 2007 IBM Corporation
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/init.h>
-#include <linux/of_platform.h>
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id kilauea_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init kilauea_device_probe(void)
-{
-        of_platform_bus_probe(NULL, kilauea_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(kilauea, kilauea_device_probe);
-
-static int __init kilauea_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,kilauea"))
-                return 0;
-
-        ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
-
-        return 1;
-}
-
-define_machine(kilauea) {
-        .name                           = "Kilauea",
-        .probe                          = kilauea_probe,
-        .progress                       = udbg_progress,
-        .init_IRQ                       = uic_init_tree,
-        .get_irq                        = uic_get_irq,
-        .restart                        = ppc4xx_reset_system,
-        .calibrate_decr                 = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/40x/makalu.c b/arch/powerpc/platforms/40x/makalu.c
deleted file mode 100644
index a6a1d6017b71..000000000000
--- a/arch/powerpc/platforms/40x/makalu.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Makalu board specific routines
- *
- * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
- *
- * Based on the Walnut code by
- * Josh Boyer <jwboyer@linux.vnet.ibm.com>
- * Copyright 2007 IBM Corporation
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/init.h>
-#include <linux/of_platform.h>
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id makalu_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init makalu_device_probe(void)
-{
-        of_platform_bus_probe(NULL, makalu_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(makalu, makalu_device_probe);
-
-static int __init makalu_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,makalu"))
-                return 0;
-
-        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-
-        return 1;
-}
-
-define_machine(makalu) {
-        .name                           = "Makalu",
-        .probe                          = makalu_probe,
-        .progress                       = udbg_progress,
-        .init_IRQ                       = uic_init_tree,
-        .get_irq                        = uic_get_irq,
-        .restart                        = ppc4xx_reset_system,
-        .calibrate_decr                 = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index f40ac9b8f99f..5fd5a5974001 100644
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -51,7 +51,10 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
  * board.c file for it rather than adding it to this list.
  */
 static char *board[] __initdata = {
-        "amcc,acadia"
+        "amcc,acadia",
+        "amcc,haleakala",
+        "amcc,kilauea",
+        "amcc,makalu"
 };
 
 static int __init ppc40x_probe(void)
diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c
index fc7fb001276c..d0fc6866b00c 100644
--- a/arch/powerpc/platforms/40x/virtex.c
+++ b/arch/powerpc/platforms/40x/virtex.c
@@ -14,6 +14,7 @@
 #include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/xilinx_intc.h>
+#include <asm/xilinx_pci.h>
 #include <asm/ppc4xx.h>
 
 static struct of_device_id xilinx_of_bus_ids[] __initdata = {
@@ -47,6 +48,7 @@ static int __init virtex_probe(void)
 define_machine(virtex) {
         .name                   = "Xilinx Virtex",
         .probe                  = virtex_probe,
+        .setup_arch             = xilinx_pci_init,
         .init_IRQ               = xilinx_intc_init_tree,
         .get_irq                = xilinx_intc_get_irq,
         .restart                = ppc4xx_reset_system,
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 0d83a6a0397d..90e3192611a4 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -156,7 +156,7 @@ config YOSEMITE
 #         This option enables support for the IBM PPC440GX evaluation board.
 
 config XILINX_VIRTEX440_GENERIC_BOARD
-        bool "Generic Xilinx Virtex 440 board"
+        bool "Generic Xilinx Virtex 5 FXT board support"
         depends on 44x
         default n
         select XILINX_VIRTEX_5_FXT
@@ -171,6 +171,17 @@ config XILINX_VIRTEX440_GENERIC_BOARD
           Most Virtex 5 designs should use this unless it needs to do some
           special configuration at board probe time.
 
+config XILINX_ML510
+        bool "Xilinx ML510 extra support"
+        depends on XILINX_VIRTEX440_GENERIC_BOARD
+        select PPC_PCI_CHOICE
+        select XILINX_PCI if PCI
+        select PPC_INDIRECT_PCI if PCI
+        select PPC_I8259 if PCI
+        help
+          This option enables extra support for features on the Xilinx ML510
+          board.  The ML510 has a PCI bus with ALI south bridge.
+
 config PPC44x_SIMPLE
         bool "Simple PowerPC 44x board support"
         depends on 44x
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 01f51daace13..ee6185aeaa3b 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -4,3 +4,4 @@ obj-$(CONFIG_EBONY)	+= ebony.o
 obj-$(CONFIG_SAM440EP)  += sam440ep.o
 obj-$(CONFIG_WARP)      += warp.o
 obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
+obj-$(CONFIG_XILINX_ML510) += virtex_ml510.o
diff --git a/arch/powerpc/platforms/44x/virtex.c b/arch/powerpc/platforms/44x/virtex.c
index 68637faf70ae..cf96ccaa760c 100644
--- a/arch/powerpc/platforms/44x/virtex.c
+++ b/arch/powerpc/platforms/44x/virtex.c
@@ -16,6 +16,7 @@
 #include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/xilinx_intc.h>
+#include <asm/xilinx_pci.h>
 #include <asm/reg.h>
 #include <asm/ppc4xx.h>
 #include "44x.h"
@@ -53,6 +54,7 @@ static int __init virtex_probe(void)
 define_machine(virtex) {
         .name                   = "Xilinx Virtex440",
         .probe                  = virtex_probe,
+        .setup_arch             = xilinx_pci_init,
         .init_IRQ               = xilinx_intc_init_tree,
         .get_irq                = xilinx_intc_get_irq,
         .calibrate_decr         = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/44x/virtex_ml510.c b/arch/powerpc/platforms/44x/virtex_ml510.c
new file mode 100644
index 000000000000..ba4a6e388a46
--- /dev/null
+++ b/arch/powerpc/platforms/44x/virtex_ml510.c
@@ -0,0 +1,29 @@
+#include <asm/i8259.h>
+#include <linux/pci.h>
+#include "44x.h"
+
+/**
+ * ml510_ail_quirk
+ */
+static void __devinit ml510_ali_quirk(struct pci_dev *dev)
+{
+        /* Enable the IDE controller */
+        pci_write_config_byte(dev, 0x58, 0x4c);
+        /* Assign irq 14 to the primary ide channel */
+        pci_write_config_byte(dev, 0x44, 0x0d);
+        /* Assign irq 15 to the secondary ide channel */
+        pci_write_config_byte(dev, 0x75, 0x0f);
+        /* Set the ide controller in native mode */
+        pci_write_config_byte(dev, 0x09, 0xff);
+
+        /* INTB = disabled, INTA = disabled */
+        pci_write_config_byte(dev, 0x48, 0x00);
+        /* INTD = disabled, INTC = disabled */
+        pci_write_config_byte(dev, 0x4a, 0x00);
+        /* Audio = INT7, Modem = disabled. */
+        pci_write_config_byte(dev, 0x4b, 0x60);
+        /* USB = INT7 */
+        pci_write_config_byte(dev, 0x74, 0x06);
+}
+DECLARE_PCI_FIXUP_EARLY(0x10b9, 0x1533, ml510_ali_quirk);
+
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 960edf89be51..c5118802a281 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -1,7 +1,7 @@
 /*
  * PIKA Warp(tm) board specific routines
  *
- * Copyright (c) 2008 PIKA Technologies
+ * Copyright (c) 2008-2009 PIKA Technologies
  *   Sean MacLennan <smaclennan@pikatech.com>
  *
  * This program is free software; you can redistribute  it and/or modify it
@@ -15,6 +15,7 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/of_gpio.h>
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -23,6 +24,7 @@
 #include <asm/uic.h>
 #include <asm/ppc4xx.h>
 
+
 static __initdata struct of_device_id warp_of_bus[] = {
         { .compatible = "ibm,plb4", },
         { .compatible = "ibm,opb", },
@@ -55,6 +57,8 @@ define_machine(warp) {
 };
 
 
+static u32 post_info;
+
 /* I am not sure this is the best place for this... */
 static int __init warp_post_info(void)
 {
@@ -77,21 +81,21 @@ static int __init warp_post_info(void)
 
         iounmap(fpga);
 
-        if (post1 || post2)
+        if (post1 || post2) {
                 printk(KERN_INFO "Warp POST %08x %08x\n", post1, post2);
-        else
+                post_info = 1;
+        } else
                 printk(KERN_INFO "Warp POST OK\n");
 
         return 0;
 }
-machine_late_initcall(warp, warp_post_info);
 
 
 #ifdef CONFIG_SENSORS_AD7414
 
 static LIST_HEAD(dtm_shutdown_list);
 static void __iomem *dtm_fpga;
-static void __iomem *gpio_base;
+static unsigned green_led, red_led;
 
 
 struct dtm_shutdown {
@@ -134,14 +138,17 @@ int pika_dtm_unregister_shutdown(void (*func)(void *arg), void *arg)
 static irqreturn_t temp_isr(int irq, void *context)
 {
         struct dtm_shutdown *shutdown;
+        int value = 1;
 
         local_irq_disable();
 
+        gpio_set_value(green_led, 0);
+
         /* Run through the shutdown list. */
         list_for_each_entry(shutdown, &dtm_shutdown_list, list)
                 shutdown->func(shutdown->arg);
 
-        printk(KERN_EMERG "\n\nCritical Temperature Shutdown\n");
+        printk(KERN_EMERG "\n\nCritical Temperature Shutdown\n\n");
 
         while (1) {
                 if (dtm_fpga) {
@@ -149,52 +156,34 @@ static irqreturn_t temp_isr(int irq, void *context)
                         out_be32(dtm_fpga + 0x14, reset);
                 }
 
-                if (gpio_base) {
-                        unsigned leds = in_be32(gpio_base);
-
-                        /* green off, red toggle */
-                        leds &= ~0x80000000;
-                        leds ^=  0x40000000;
-
-                        out_be32(gpio_base, leds);
-                }
-
+                gpio_set_value(red_led, value);
+                value ^= 1;
                 mdelay(500);
         }
 }
 
 static int pika_setup_leds(void)
 {
-        struct device_node *np;
-        const u32 *gpios;
-        int len;
+        struct device_node *np, *child;
 
-        np = of_find_compatible_node(NULL, NULL, "linux,gpio-led");
+        np = of_find_compatible_node(NULL, NULL, "gpio-leds");
         if (!np) {
-                printk(KERN_ERR __FILE__ ": Unable to find gpio-led\n");
-                return -ENOENT;
-        }
-
-        gpios = of_get_property(np, "gpios", &len);
-        of_node_put(np);
-        if (!gpios || len < 4) {
-                printk(KERN_ERR __FILE__
-                       ": Unable to get gpios property (%d)\n", len);
+                printk(KERN_ERR __FILE__ ": Unable to find leds\n");
                 return -ENOENT;
         }
 
-        np = of_find_node_by_phandle(gpios[0]);
-        if (!np) {
-                printk(KERN_ERR __FILE__ ": Unable to find gpio\n");
-                return -ENOENT;
-        }
+        for_each_child_of_node(np, child)
+                if (strcmp(child->name, "green") == 0) {
+                        green_led = of_get_gpio(child, 0);
+                        /* Turn back on the green LED */
+                        gpio_set_value(green_led, 1);
+                } else if (strcmp(child->name, "red") == 0) {
+                        red_led = of_get_gpio(child, 0);
+                        /* Set based on post */
+                        gpio_set_value(red_led, post_info);
+                }
 
-        gpio_base = of_iomap(np, 0);
         of_node_put(np);
-        if (!gpio_base) {
-                printk(KERN_ERR __FILE__ ": Unable to map gpio");
-                return -ENOMEM;
-        }
 
         return 0;
 }
@@ -270,10 +259,10 @@ static int pika_dtm_thread(void __iomem *fpga)
         }
 
 found_it:
-        i2c_put_adapter(adap);
-
         pika_setup_critical_temp(client);
 
+        i2c_put_adapter(adap);
+
         printk(KERN_INFO "PIKA DTM thread running.\n");
 
         while (!kthread_should_stop()) {
@@ -311,6 +300,9 @@ static int __init pika_dtm_start(void)
         if (dtm_fpga == NULL)
                 return -ENOENT;
 
+        /* Must get post info before thread starts. */
+        warp_post_info();
+
         dtm_thread = kthread_run(pika_dtm_thread, dtm_fpga, "pika-dtm");
         if (IS_ERR(dtm_thread)) {
                 iounmap(dtm_fpga);
@@ -333,6 +325,8 @@ int pika_dtm_unregister_shutdown(void (*func)(void *arg), void *arg)
         return 0;
 }
 
+machine_late_initcall(warp, warp_post_info);
+
 #endif
 
 EXPORT_SYMBOL(pika_dtm_register_shutdown);
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index a2068faef6ea..bcc69e1f77c1 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -34,7 +34,7 @@
 static int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                             int len, u32 * val)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
             | (((bus->number - hose->first_busno) & 0xff) << 16)
             | (hose->global_number << 24);
@@ -49,7 +49,7 @@ static int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
 static int rtas_write_config(struct pci_bus *bus, unsigned int devfn,
                              int offset, int len, u32 val)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
             | (((bus->number - hose->first_busno) & 0xff) << 16)
             | (hose->global_number << 24);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index 87ff522f28b5..dd43114e9684 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -107,7 +107,7 @@ static int
 mpc52xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
                                 int offset, int len, u32 *val)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         u32 value;
 
         if (ppc_md.pci_exclude_device)
@@ -164,7 +164,7 @@ static int
 mpc52xx_pci_write_config(struct pci_bus *bus, unsigned int devfn,
                                 int offset, int len, u32 val)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         u32 value, mask;
 
         if (ppc_md.pci_exclude_device)
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 0eb6d7f62241..51fcae41f08a 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
 #include <linux/mdio-bitbang.h>
+#include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>
@@ -115,7 +116,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
         struct mii_bus *bus;
         struct resource res;
         struct device_node *node;
-        int ret, i;
+        int ret;
 
         node = of_get_parent(ofdev->node);
         of_node_put(node);
@@ -130,17 +131,13 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
         if (!bus)
                 return -ENOMEM;
 
-        bus->phy_mask = 0;
         bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
 
-        for (i = 0; i < PHY_MAX_ADDR; i++)
-                bus->irq[i] = -1;
-
         bus->name = "ep8248e-mdio-bitbang";
         bus->parent = &ofdev->dev;
         snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
-        return mdiobus_register(bus);
+        return of_mdiobus_register(bus, ofdev->node);
 }
 
 static int ep8248e_mdio_remove(struct of_device *ofdev)
diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h
index 984db42cc8e7..6cf0f97486e2 100644
--- a/arch/powerpc/platforms/82xx/pq2ads.h
+++ b/arch/powerpc/platforms/82xx/pq2ads.h
@@ -24,10 +24,6 @@
 
 #include <linux/seq_file.h>
 
-/* Backword-compatibility stuff for the drivers */
-#define CPM_MAP_ADDR            ((uint)0xf0000000)
-#define CPM_IRQ_OFFSET 0
-
 /* The ADS8260 has 16, 32-bit wide control/status registers, accessed
  * only on word boundaries.
  * Not all are used (yet), or are interesting to us (yet).
@@ -44,14 +40,5 @@
 #define BCSR3_FETHIEN2          ((uint)0x10000000)      /* 0 == enable*/
 #define BCSR3_FETH2_RST         ((uint)0x80000000)      /* 0 == reset */
 
-/* cpm serial driver works with constants below */
-
-#define SIU_INT_SMC1            ((uint)0x04+CPM_IRQ_OFFSET)
-#define SIU_INT_SMC2            ((uint)0x05+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC1            ((uint)0x28+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC2            ((uint)0x29+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC3            ((uint)0x2a+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC4            ((uint)0x2b+CPM_IRQ_OFFSET)
-
 #endif /* __MACH_ADS8260_DEFS */
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 7f066adc068c..43d385cedcd7 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -34,6 +34,7 @@ config MPC85xx_MDS
         bool "Freescale MPC85xx MDS"
         select DEFAULT_UIMAGE
         select PHYLIB
+        select HAS_RAPIDIO
         help
           This option enables support for the MPC85xx MDS board
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index de66de7a9ca2..53d5851a6c97 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -163,7 +163,8 @@ static void __init mpc85xx_ds_setup_arch(void)
 #ifdef CONFIG_PCI
         for_each_node_by_type(np, "pci") {
                 if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
-                    of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                    of_device_is_compatible(np, "fsl,mpc8548-pcie") ||
+                    of_device_is_compatible(np, "fsl,p2020-pcie")) {
                         struct resource rsrc;
                         of_address_to_resource(np, 0, &rsrc);
                         if ((rsrc.start & 0xfffff) == primary_phb_addr)
@@ -195,9 +196,9 @@ static int __init mpc8544_ds_probe(void)
                 primary_phb_addr = 0xb000;
 #endif
                 return 1;
-        } else {
-                return 0;
         }
+
+        return 0;
 }
 
 static struct of_device_id __initdata mpc85xxds_ids[] = {
@@ -214,6 +215,7 @@ static int __init mpc85xxds_publish_devices(void)
 }
 machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices);
 machine_device_initcall(mpc8572_ds, mpc85xxds_publish_devices);
+machine_device_initcall(p2020_ds, mpc85xxds_publish_devices);
 
 /*
  * Called very early, device-tree isn't unflattened
@@ -227,9 +229,26 @@ static int __init mpc8572_ds_probe(void)
                 primary_phb_addr = 0x8000;
 #endif
                 return 1;
-        } else {
-                return 0;
         }
+
+        return 0;
+}
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init p2020_ds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "fsl,P2020DS")) {
+#ifdef CONFIG_PCI
+                primary_phb_addr = 0x9000;
+#endif
+                return 1;
+        }
+
+        return 0;
 }
 
 define_machine(mpc8544_ds) {
@@ -259,3 +278,17 @@ define_machine(mpc8572_ds) {
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
 };
+
+define_machine(p2020_ds) {
+        .name                   = "P2020 DS",
+        .probe                  = p2020_ds_probe,
+        .setup_arch             = mpc85xx_ds_setup_arch,
+        .init_IRQ               = mpc85xx_ds_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 7dd029034aec..b2c0a4319973 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -206,23 +206,24 @@ static void __init mpc85xx_mds_setup_arch(void)
         }
 
         if (bcsr_regs) {
+                if (machine_is(mpc8568_mds)) {
 #define BCSR_UCC1_GETH_EN       (0x1 << 7)
 #define BCSR_UCC2_GETH_EN       (0x1 << 7)
 #define BCSR_UCC1_MODE_MSK      (0x3 << 4)
 #define BCSR_UCC2_MODE_MSK      (0x3 << 0)
 
-                /* Turn off UCC1 & UCC2 */
-                clrbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
-                clrbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
+                        /* Turn off UCC1 & UCC2 */
+                        clrbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
+                        clrbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
 
-                /* Mode is RGMII, all bits clear */
-                clrbits8(&bcsr_regs[11], BCSR_UCC1_MODE_MSK |
-                                         BCSR_UCC2_MODE_MSK);
-
-                /* Turn UCC1 & UCC2 on */
-                setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
-                setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
+                        /* Mode is RGMII, all bits clear */
+                        clrbits8(&bcsr_regs[11], BCSR_UCC1_MODE_MSK |
+                                                 BCSR_UCC2_MODE_MSK);
 
+                        /* Turn UCC1 & UCC2 on */
+                        setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
+                        setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
+                }
                 iounmap(bcsr_regs);
         }
 #endif  /* CONFIG_QUICC_ENGINE */
@@ -257,7 +258,8 @@ static int __init board_fixups(void)
 
         return 0;
 }
-machine_arch_initcall(mpc85xx_mds, board_fixups);
+machine_arch_initcall(mpc8568_mds, board_fixups);
+machine_arch_initcall(mpc8569_mds, board_fixups);
 
 static struct of_device_id mpc85xx_ids[] = {
         { .type = "soc", },
@@ -276,7 +278,8 @@ static int __init mpc85xx_publish_devices(void)
 
         return 0;
 }
-machine_device_initcall(mpc85xx_mds, mpc85xx_publish_devices);
+machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices);
+machine_device_initcall(mpc8569_mds, mpc85xx_publish_devices);
 
 static void __init mpc85xx_mds_pic_init(void)
 {
@@ -321,8 +324,8 @@ static int __init mpc85xx_mds_probe(void)
         return of_flat_dt_is_compatible(root, "MPC85xxMDS");
 }
 
-define_machine(mpc85xx_mds) {
-        .name           = "MPC85xx MDS",
+define_machine(mpc8568_mds) {
+        .name           = "MPC8568 MDS",
         .probe          = mpc85xx_mds_probe,
         .setup_arch     = mpc85xx_mds_setup_arch,
         .init_IRQ       = mpc85xx_mds_pic_init,
@@ -334,3 +337,24 @@ define_machine(mpc85xx_mds) {
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #endif
 };
+
+static int __init mpc8569_mds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,MPC8569EMDS");
+}
+
+define_machine(mpc8569_mds) {
+        .name           = "MPC8569 MDS",
+        .probe          = mpc8569_mds_probe,
+        .setup_arch     = mpc85xx_mds_setup_arch,
+        .init_IRQ       = mpc85xx_mds_pic_init,
+        .get_irq        = mpic_get_irq,
+        .restart        = fsl_rstcr_restart,
+        .calibrate_decr = generic_calibrate_decr,
+        .progress       = udbg_progress,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+};
diff --git a/arch/powerpc/platforms/86xx/gef_ppc9a.c b/arch/powerpc/platforms/86xx/gef_ppc9a.c
index d79104669cdc..2efa052975e6 100644
--- a/arch/powerpc/platforms/86xx/gef_ppc9a.c
+++ b/arch/powerpc/platforms/86xx/gef_ppc9a.c
@@ -28,7 +28,6 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc86xx.h>
 #include <asm/prom.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c
index af14f852d747..90754e752bd8 100644
--- a/arch/powerpc/platforms/86xx/gef_sbc310.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc310.c
@@ -28,7 +28,6 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc86xx.h>
 #include <asm/prom.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index ea2360639652..72b31a6010a0 100644
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -28,7 +28,6 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc86xx.h>
 #include <asm/prom.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 3f49a6f893a3..51eec0cd5519 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -28,7 +28,6 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc86xx.h>
 #include <asm/prom.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index c4ec49b5f7f8..7e9e83c04a8a 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -24,7 +24,6 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc86xx.h>
 #include <asm/prom.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index 014e26cda08d..d84bbb508ee7 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -20,7 +20,6 @@
 #include <asm/pgtable.h>
 #include <asm/pci-bridge.h>
 #include <asm/mpic.h>
-#include <asm/mpc86xx.h>
 #include <asm/cacheflush.h>
 
 #include <sysdev/fsl_soc.h>
@@ -30,6 +29,11 @@
 extern void __secondary_start_mpc86xx(void);
 extern unsigned long __secondary_hold_acknowledge;
 
+#define MCM_PORT_CONFIG_OFFSET  0x10
+
+/* Offset from CCSRBAR */
+#define MPC86xx_MCM_OFFSET      (0x1000)
+#define MPC86xx_MCM_SIZE        (0x1000)
 
 static void __init
 smp_86xx_release_core(int nr)
@@ -48,6 +52,8 @@ smp_86xx_release_core(int nr)
         pcr = in_be32(mcm_vaddr + (MCM_PORT_CONFIG_OFFSET >> 2));
         pcr |= 1 << (nr + 24);
         out_be32(mcm_vaddr + (MCM_PORT_CONFIG_OFFSET >> 2), pcr);
+
+        iounmap(mcm_vaddr);
 }
 
 
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index 2886a36fc085..51c8f331b671 100644
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -25,7 +25,6 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc86xx.h>
 #include <asm/prom.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/platforms/8xx/mpc885ads.h b/arch/powerpc/platforms/8xx/mpc885ads.h
index a5076668bad6..19412f76fa3b 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads.h
+++ b/arch/powerpc/platforms/8xx/mpc885ads.h
@@ -17,10 +17,6 @@
 
 #include <sysdev/fsl_soc.h>
 
-#define MPC8xx_CPM_OFFSET       (0x9c0)
-#define CPM_MAP_ADDR            (get_immrbase() + MPC8xx_CPM_OFFSET)
-#define CPM_IRQ_OFFSET          16     // for compability with cpm_uart driver
-
 /* Bits of interest in the BCSRs.
  */
 #define BCSR1_ETHEN             ((uint)0x20000000)
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index e3e87078d03f..04a8061045c4 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -329,4 +329,8 @@ config MCU_MPC8349EMITX
           also register MCU GPIOs with the generic GPIO API, so you'll able
           to use MCU pins as GPIOs.
 
+config XILINX_PCI
+        bool "Xilinx PCI host bridge support"
+        depends on PCI && XILINX_VIRTEX
+
 endmenu
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 732ee93a8e98..cca6b4fc719a 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -10,7 +10,6 @@ menu "Processor support"
 choice
         prompt "Processor Type"
         depends on PPC32
-        default 6xx
         help
           There are five families of 32 bit PowerPC chips supported.
           The most common ones are the desktop and server CPUs (601, 603,
@@ -22,7 +21,7 @@ choice
 
           If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
 
-config 6xx
+config PPC_BOOK3S
         bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
         select PPC_FPU
 
@@ -58,13 +57,11 @@ config E200
 
 endchoice
 
-# Until we have a choice of exclusive CPU types on 64-bit, we always
-# use PPC_BOOK3S. On 32-bit, this is equivalent to 6xx which is
-# "classic" MMU
-
 config PPC_BOOK3S
-       def_bool y
-       depends on PPC64 || 6xx
+        default y
+        depends on PPC64
+        select PPC_FPU
+
 
 config POWER4_ONLY
         bool "Optimize for POWER4"
@@ -75,6 +72,10 @@ config POWER4_ONLY
           The resulting binary will not work on POWER3 or RS64 processors
           when compiled with binutils 2.15 or later.
 
+config 6xx
+        def_bool y
+        depends on PPC32 && PPC_BOOK3S
+
 config POWER3
         bool
         depends on PPC64 && PPC_BOOK3S
@@ -203,9 +204,8 @@ config SPE
           If in doubt, say Y here.
 
 config PPC_STD_MMU
-        bool
-        depends on 6xx || PPC64
-        default y
+        def_bool y
+        depends on PPC_BOOK3S
 
 config PPC_STD_MMU_32
         def_bool y
@@ -263,8 +263,8 @@ config SMP
           If you don't know what to do here, say N.
 
 config NR_CPUS
-        int "Maximum number of CPUs (2-1024)"
-        range 2 1024
+        int "Maximum number of CPUs (2-8192)"
+        range 2 8192
         depends on SMP
         default "32" if PPC64
         default "4"
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 0ce45c2b42f8..c71498dbf211 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -329,7 +329,7 @@ static struct irq_host_ops msic_host_ops = {
 
 static int axon_msi_shutdown(struct of_device *device)
 {
-        struct axon_msic *msic = device->dev.platform_data;
+        struct axon_msic *msic = dev_get_drvdata(&device->dev);
         u32 tmp;
 
         pr_debug("axon_msi: disabling %s\n",
@@ -416,7 +416,7 @@ static int axon_msi_probe(struct of_device *device,
         msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG)
                                 & MSIC_FIFO_SIZE_MASK;
 
-        device->dev.platform_data = msic;
+        dev_set_drvdata(&device->dev, msic);
 
         ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs;
         ppc_md.teardown_msi_irqs = axon_msi_teardown_msi_irqs;
diff --git a/arch/powerpc/platforms/cell/celleb_pci.c b/arch/powerpc/platforms/cell/celleb_pci.c
index f39a3b2a1667..00eaaa71630f 100644
--- a/arch/powerpc/platforms/cell/celleb_pci.c
+++ b/arch/powerpc/platforms/cell/celleb_pci.c
@@ -162,8 +162,7 @@ static int celleb_fake_pci_read_config(struct pci_bus *bus,
                 unsigned int devfn, int where, int size, u32 *val)
 {
         char *config;
-        struct device_node *node;
-        struct pci_controller *hose;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         unsigned int devno = devfn >> 3;
         unsigned int fn = devfn & 0x7;
 
@@ -171,8 +170,6 @@ static int celleb_fake_pci_read_config(struct pci_bus *bus,
         BUG_ON(where % size);
 
         pr_debug("    fake read: bus=0x%x, ", bus->number);
-        node = (struct device_node *)bus->sysdata;
-        hose = pci_find_hose_for_OF_device(node);
         config = get_fake_config_start(hose, devno, fn);
 
         pr_debug("devno=0x%x, where=0x%x, size=0x%x, ", devno, where, size);
@@ -192,8 +189,7 @@ static int celleb_fake_pci_write_config(struct pci_bus *bus,
                 unsigned int devfn, int where, int size, u32 val)
 {
         char *config;
-        struct device_node *node;
-        struct pci_controller *hose;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         struct celleb_pci_resource *res;
         unsigned int devno = devfn >> 3;
         unsigned int fn = devfn & 0x7;
@@ -201,8 +197,6 @@ static int celleb_fake_pci_write_config(struct pci_bus *bus,
         /* allignment check */
         BUG_ON(where % size);
 
-        node = (struct device_node *)bus->sysdata;
-        hose = pci_find_hose_for_OF_device(node);
         config = get_fake_config_start(hose, devno, fn);
 
         if (!config)
diff --git a/arch/powerpc/platforms/cell/celleb_scc_epci.c b/arch/powerpc/platforms/cell/celleb_scc_epci.c
index 48ec88a38a12..05b0db3ef638 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_epci.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_epci.c
@@ -134,15 +134,11 @@ static int celleb_epci_read_config(struct pci_bus *bus,
 {
         PCI_IO_ADDR epci_base;
         PCI_IO_ADDR addr;
-        struct device_node *node;
-        struct pci_controller *hose;
+        struct pci_controller *hose = pci_bus_to_host(bus);
 
         /* allignment check */
         BUG_ON(where % size);
 
-        node = (struct device_node *)bus->sysdata;
-        hose = pci_find_hose_for_OF_device(node);
-
         if (!celleb_epci_get_epci_cfg(hose))
                 return PCIBIOS_DEVICE_NOT_FOUND;
 
@@ -198,16 +194,11 @@ static int celleb_epci_write_config(struct pci_bus *bus,
 {
         PCI_IO_ADDR epci_base;
         PCI_IO_ADDR addr;
-        struct device_node *node;
-        struct pci_controller *hose;
+        struct pci_controller *hose = pci_bus_to_host(bus);
 
         /* allignment check */
         BUG_ON(where % size);
 
-        node = (struct device_node *)bus->sysdata;
-        hose = pci_find_hose_for_OF_device(node);
-
-
         if (!celleb_epci_get_epci_cfg(hose))
                 return PCIBIOS_DEVICE_NOT_FOUND;
 
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index 3e7e0f1568ef..7fca09f990ba 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -366,11 +366,7 @@ static void config_write_pciex_rc(unsigned int __iomem *base, uint32_t where,
 static int scc_pciex_read_config(struct pci_bus *bus, unsigned int devfn,
                                  int where, int size, unsigned int *val)
 {
-        struct device_node *dn;
-        struct pci_controller *phb;
-
-        dn = bus->sysdata;
-        phb = pci_find_hose_for_OF_device(dn);
+        struct pci_controller *phb = pci_bus_to_host(bus);
 
         if (bus->number == phb->first_busno && PCI_SLOT(devfn) != 1) {
                 *val = ~0;
@@ -389,11 +385,7 @@ static int scc_pciex_read_config(struct pci_bus *bus, unsigned int devfn,
 static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
                                   int where, int size, unsigned int val)
 {
-        struct device_node *dn;
-        struct pci_controller *phb;
-
-        dn = bus->sysdata;
-        phb = pci_find_hose_for_OF_device(dn);
+        struct pci_controller *phb = pci_bus_to_host(bus);
 
         if (bus->number == phb->first_busno && PCI_SLOT(devfn) != 1)
                 return PCIBIOS_DEVICE_NOT_FOUND;
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index bed4690de394..5b34fc211f35 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -100,16 +100,6 @@
 #define IOSTE_PS_1M             0x0000000000000005ul /*   - 1MB  */
 #define IOSTE_PS_16M            0x0000000000000007ul /*   - 16MB */
 
-/* Page table entries */
-#define IOPTE_PP_W              0x8000000000000000ul /* protection: write */
-#define IOPTE_PP_R              0x4000000000000000ul /* protection: read */
-#define IOPTE_M                 0x2000000000000000ul /* coherency required */
-#define IOPTE_SO_R              0x1000000000000000ul /* ordering: writes */
-#define IOPTE_SO_RW             0x1800000000000000ul /* ordering: r & w */
-#define IOPTE_RPN_Mask          0x07fffffffffff000ul /* RPN */
-#define IOPTE_H                 0x0000000000000800ul /* cache hint */
-#define IOPTE_IOID_Mask         0x00000000000007fful /* ioid */
-
 
 /* IOMMU sizing */
 #define IO_SEGMENT_SHIFT        28
@@ -193,19 +183,21 @@ static int tce_build_cell(struct iommu_table *tbl, long index, long npages,
          */
         const unsigned long prot = 0xc48;
         base_pte =
-                ((prot << (52 + 4 * direction)) & (IOPTE_PP_W | IOPTE_PP_R))
-                | IOPTE_M | IOPTE_SO_RW | (window->ioid & IOPTE_IOID_Mask);
+                ((prot << (52 + 4 * direction)) &
+                 (CBE_IOPTE_PP_W | CBE_IOPTE_PP_R)) |
+                CBE_IOPTE_M | CBE_IOPTE_SO_RW |
+                (window->ioid & CBE_IOPTE_IOID_Mask);
 #else
-        base_pte = IOPTE_PP_W | IOPTE_PP_R | IOPTE_M | IOPTE_SO_RW |
-                (window->ioid & IOPTE_IOID_Mask);
+        base_pte = CBE_IOPTE_PP_W | CBE_IOPTE_PP_R | CBE_IOPTE_M |
+                CBE_IOPTE_SO_RW | (window->ioid & CBE_IOPTE_IOID_Mask);
 #endif
         if (unlikely(dma_get_attr(DMA_ATTR_WEAK_ORDERING, attrs)))
-                base_pte &= ~IOPTE_SO_RW;
+                base_pte &= ~CBE_IOPTE_SO_RW;
 
         io_pte = (unsigned long *)tbl->it_base + (index - tbl->it_offset);
 
         for (i = 0; i < npages; i++, uaddr += IOMMU_PAGE_SIZE)
-                io_pte[i] = base_pte | (__pa(uaddr) & IOPTE_RPN_Mask);
+                io_pte[i] = base_pte | (__pa(uaddr) & CBE_IOPTE_RPN_Mask);
 
         mb();
 
@@ -231,8 +223,9 @@ static void tce_free_cell(struct iommu_table *tbl, long index, long npages)
 #else
         /* spider bridge does PCI reads after freeing - insert a mapping
          * to a scratch page instead of an invalid entry */
-        pte = IOPTE_PP_R | IOPTE_M | IOPTE_SO_RW | __pa(window->iommu->pad_page)
-                | (window->ioid & IOPTE_IOID_Mask);
+        pte = CBE_IOPTE_PP_R | CBE_IOPTE_M | CBE_IOPTE_SO_RW |
+                __pa(window->iommu->pad_page) |
+                (window->ioid & CBE_IOPTE_IOID_Mask);
 #endif
 
         io_pte = (unsigned long *)tbl->it_base + (index - tbl->it_offset);
@@ -1001,7 +994,7 @@ static void insert_16M_pte(unsigned long addr, unsigned long *ptab,
         pr_debug("iommu: addr %lx ptab %p segment %lx offset %lx\n",
                   addr, ptab, segment, offset);
 
-        ptab[offset] = base_pte | (__pa(addr) & IOPTE_RPN_Mask);
+        ptab[offset] = base_pte | (__pa(addr) & CBE_IOPTE_RPN_Mask);
 }
 
 static void cell_iommu_setup_fixed_ptab(struct cbe_iommu *iommu,
@@ -1016,14 +1009,14 @@ static void cell_iommu_setup_fixed_ptab(struct cbe_iommu *iommu,
 
         pr_debug("iommu: mapping 0x%lx pages from 0x%lx\n", fsize, fbase);
 
-        base_pte = IOPTE_PP_W | IOPTE_PP_R | IOPTE_M
-                    | (cell_iommu_get_ioid(np) & IOPTE_IOID_Mask);
+        base_pte = CBE_IOPTE_PP_W | CBE_IOPTE_PP_R | CBE_IOPTE_M |
+                (cell_iommu_get_ioid(np) & CBE_IOPTE_IOID_Mask);
 
         if (iommu_fixed_is_weak)
                 pr_info("IOMMU: Using weak ordering for fixed mapping\n");
         else {
                 pr_info("IOMMU: Using strong ordering for fixed mapping\n");
-                base_pte |= IOPTE_SO_RW;
+                base_pte |= CBE_IOPTE_SO_RW;
         }
 
         for (uaddr = 0; uaddr < fsize; uaddr += (1 << 24)) {
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 706eb5c7e2ee..24b30b6909c4 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -631,10 +631,6 @@ long spufs_create(struct nameidata *nd, unsigned int flags, mode_t mode,
         if (IS_ERR(dentry))
                 goto out_dir;
 
-        ret = -EEXIST;
-        if (dentry->d_inode)
-                goto out_dput;
-
         mode &= ~current_umask();
 
         if (flags & SPU_CREATE_GANG)
@@ -648,8 +644,6 @@ long spufs_create(struct nameidata *nd, unsigned int flags, mode_t mode,
                 fsnotify_mkdir(nd->path.dentry->d_inode, dentry);
         return ret;
 
-out_dput:
-        dput(dentry);
 out_dir:
         mutex_unlock(&nd->path.dentry->d_inode->i_mutex);
 out:
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index f6b0c519d5a2..8f67a394b2d0 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -34,7 +34,7 @@ int gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off,
                            int len, u32 *val)
 {
         volatile void __iomem *cfg_data;
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
 
         if (bus->number > 7)
                 return PCIBIOS_DEVICE_NOT_FOUND;
@@ -61,7 +61,7 @@ int gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off,
                             int len, u32 val)
 {
         volatile void __iomem *cfg_data;
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
 
         if (bus->number > 7)
                 return PCIBIOS_DEVICE_NOT_FOUND;
@@ -96,7 +96,7 @@ static struct pci_ops gg2_pci_ops =
 int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                      int len, u32 *val)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
                 | (((bus->number - hose->first_busno) & 0xff) << 16)
                 | (hose->global_number << 24);
@@ -111,7 +111,7 @@ int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
 int rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
                       int len, u32 val)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
                 | (((bus->number - hose->first_busno) & 0xff) << 16)
                 | (hose->global_number << 24);
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c
index 65a35f38e062..fd23a1d4b39d 100644
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
@@ -51,13 +51,20 @@ u8 uli_pirq_to_irq[8] = {
         ULI_8259_NONE,          /* PIRQH */
 };
 
+static inline bool is_quirk_valid(void)
+{
+        return (machine_is(mpc86xx_hpcn) ||
+                machine_is(mpc8544_ds) ||
+                machine_is(p2020_ds) ||
+                machine_is(mpc8572_ds));
+}
+
 /* Bridge */
 static void __devinit early_uli5249(struct pci_dev *dev)
 {
         unsigned char temp;
 
-        if (!machine_is(mpc86xx_hpcn) && !machine_is(mpc8544_ds) &&
-                        !machine_is(mpc8572_ds))
+        if (!is_quirk_valid())
                 return;
 
         pci_write_config_word(dev, PCI_COMMAND, PCI_COMMAND_IO |
@@ -80,8 +87,7 @@ static void __devinit quirk_uli1575(struct pci_dev *dev)
 {
         int i;
 
-        if (!machine_is(mpc86xx_hpcn) && !machine_is(mpc8544_ds) &&
-                        !machine_is(mpc8572_ds))
+        if (!is_quirk_valid())
                 return;
 
         /*
@@ -149,8 +155,7 @@ static void __devinit quirk_final_uli1575(struct pci_dev *dev)
          * IRQ 14: Edge
          * IRQ 15: Edge
          */
-        if (!machine_is(mpc86xx_hpcn) && !machine_is(mpc8544_ds) &&
-                        !machine_is(mpc8572_ds))
+        if (!is_quirk_valid())
                 return;
 
         outb(0xfa, 0x4d0);
@@ -176,8 +181,7 @@ static void __devinit quirk_uli5288(struct pci_dev *dev)
         unsigned char c;
         unsigned int d;
 
-        if (!machine_is(mpc86xx_hpcn) && !machine_is(mpc8544_ds) &&
-                        !machine_is(mpc8572_ds))
+        if (!is_quirk_valid())
                 return;
 
         /* read/write lock */
@@ -201,8 +205,7 @@ static void __devinit quirk_uli5229(struct pci_dev *dev)
 {
         unsigned short temp;
 
-        if (!machine_is(mpc86xx_hpcn) && !machine_is(mpc8544_ds) &&
-                        !machine_is(mpc8572_ds))
+        if (!is_quirk_valid())
                 return;
 
         pci_write_config_word(dev, PCI_COMMAND, PCI_COMMAND_INTX_DISABLE |
@@ -270,7 +273,6 @@ static void __devinit hpcd_quirk_uli1575(struct pci_dev *dev)
 static void __devinit hpcd_quirk_uli5288(struct pci_dev *dev)
 {
         unsigned char c;
-        unsigned short temp;
 
         if (!machine_is(mpc86xx_hpcd))
                 return;
diff --git a/arch/powerpc/platforms/iseries/dt.c b/arch/powerpc/platforms/iseries/dt.c
index 4543c4bc3a56..c5a87a72057b 100644
--- a/arch/powerpc/platforms/iseries/dt.c
+++ b/arch/powerpc/platforms/iseries/dt.c
@@ -204,7 +204,8 @@ static void __init dt_prop_u32(struct iseries_flat_dt *dt, const char *name,
         dt_prop(dt, name, &data, sizeof(u32));
 }
 
-static void __init dt_prop_u64(struct iseries_flat_dt *dt, const char *name,
+static void __init __maybe_unused dt_prop_u64(struct iseries_flat_dt *dt,
+                                              const char *name,
                 u64 data)
 {
         dt_prop(dt, name, &data, sizeof(u64));
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index 40219823d9b0..6c1e1011959e 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -177,7 +177,7 @@ static struct iommu_table *iommu_table_find(struct iommu_table * tbl)
 static void pci_dma_dev_setup_iseries(struct pci_dev *pdev)
 {
         struct iommu_table *tbl;
-        struct device_node *dn = pdev->sysdata;
+        struct device_node *dn = pci_device_to_OF_node(pdev);
         struct pci_dn *pdn = PCI_DN(dn);
         const u32 *lsn = of_get_property(dn, "linux,logical-slot-number", NULL);
 
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 3689c2413d24..fef4d5150517 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -267,7 +267,8 @@ static struct pending_event *new_pending_event(void)
         return ev;
 }
 
-static int signal_vsp_instruction(struct vsp_cmd_data *vsp_cmd)
+static int __maybe_unused
+signal_vsp_instruction(struct vsp_cmd_data *vsp_cmd)
 {
         struct pending_event *ev = new_pending_event();
         int rc;
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 21cddc30220b..175aac8ca7e5 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -318,6 +318,7 @@ static void __init iomm_table_allocate_entry(struct pci_dev *dev, int bar_num)
 {
         struct resource *bar_res = &dev->resource[bar_num];
         long bar_size = pci_resource_len(dev, bar_num);
+        struct device_node *dn = pci_device_to_OF_node(dev);
 
         /*
          * No space to allocate, quick exit, skip Allocation.
@@ -335,9 +336,9 @@ static void __init iomm_table_allocate_entry(struct pci_dev *dev, int bar_num)
          * Allocate the number of table entries needed for BAR.
          */
         while (bar_size > 0 ) {
-                iomm_table[current_iomm_table_entry] = dev->sysdata;
+                iomm_table[current_iomm_table_entry] = dn;
                 ds_addr_table[current_iomm_table_entry] =
-                        iseries_ds_addr(dev->sysdata) | (bar_num << 24);
+                        iseries_ds_addr(dn) | (bar_num << 24);
                 bar_size -= IOMM_TABLE_ENTRY_SIZE;
                 ++current_iomm_table_entry;
         }
@@ -410,7 +411,7 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev)
         struct device_node *node;
         int i;
 
-        node = find_device_node(bus, pdev->devfn);
+        node = pci_device_to_OF_node(pdev);
         pr_debug("PCI: iSeries %s, pdev %p, node %p\n",
                  pci_name(pdev), pdev, node);
         if (!node) {
@@ -441,7 +442,6 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev)
                 }
         }
 
-        pdev->sysdata = node;
         allocate_device_bars(pdev);
         iseries_device_information(pdev, bus, *sub_bus);
 }
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 75cc165d5bee..3bf546797cbb 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -29,7 +29,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/phy.h>
-#include <linux/platform_device.h>
+#include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
 #define DELAY 1
@@ -39,6 +39,7 @@ static void __iomem *gpio_regs;
 struct gpio_priv {
         int mdc_pin;
         int mdio_pin;
+        int mdio_irqs[PHY_MAX_ADDR];
 };
 
 #define MDC_PIN(bus)    (((struct gpio_priv *)bus->priv)->mdc_pin)
@@ -218,12 +219,11 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
                                      const struct of_device_id *match)
 {
         struct device *dev = &ofdev->dev;
-        struct device_node *phy_dn, *np = ofdev->node;
+        struct device_node *np = ofdev->node;
         struct mii_bus *new_bus;
         struct gpio_priv *priv;
         const unsigned int *prop;
         int err;
-        int i;
 
         err = -ENOMEM;
         priv = kzalloc(sizeof(struct gpio_priv), GFP_KERNEL);
@@ -244,27 +244,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", *prop);
         new_bus->priv = priv;
 
-        new_bus->phy_mask = 0;
-
-        new_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
-
-        if (!new_bus->irq)
-                goto out_free_bus;
-
-        for (i = 0; i < PHY_MAX_ADDR; i++)
-                new_bus->irq[i] = NO_IRQ;
-
-        for (phy_dn = of_get_next_child(np, NULL);
-             phy_dn != NULL;
-             phy_dn = of_get_next_child(np, phy_dn)) {
-                const unsigned int *ip, *regp;
-
-                ip = of_get_property(phy_dn, "interrupts", NULL);
-                regp = of_get_property(phy_dn, "reg", NULL);
-                if (!ip || !regp || *regp >= PHY_MAX_ADDR)
-                        continue;
-                new_bus->irq[*regp] = irq_create_mapping(NULL, *ip);
-        }
+        new_bus->irq = priv->mdio_irqs;
 
         prop = of_get_property(np, "mdc-pin", NULL);
         priv->mdc_pin = *prop;
@@ -275,7 +255,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         new_bus->parent = dev;
         dev_set_drvdata(dev, new_bus);
 
-        err = mdiobus_register(new_bus);
+        err = of_mdiobus_register(new_bus, np);
 
         if (err != 0) {
                 printk(KERN_ERR "%s: Cannot register as MDIO bus, err %d\n",
@@ -286,8 +266,6 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
         return 0;
 
 out_free_irq:
-        kfree(new_bus->irq);
-out_free_bus:
         kfree(new_bus);
 out_free_priv:
         kfree(priv);
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 7039d8f1d3ba..dce736349107 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -221,7 +221,7 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id)
                         continue;
                 irq += __ilog2(bits);
                 spin_unlock_irqrestore(&pmac_pic_lock, flags);
-                __do_IRQ(irq);
+                generic_handle_irq(irq);
                 spin_lock_irqsave(&pmac_pic_lock, flags);
                 rc = IRQ_HANDLED;
         }
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 45936c9ed0ec..86f69a4eb49b 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -655,7 +655,7 @@ static int __init pmac_probe(void)
 /* Move that to pci.c */
 static int pmac_pci_probe_mode(struct pci_bus *bus)
 {
-        struct device_node *node = bus->sysdata;
+        struct device_node *node = pci_bus_to_OF_node(bus);
 
         /* We need to use normal PCI probing for the AGP bus,
          * since the device for the AGP bridge isn't in the tree.
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 9a2b6d948610..846eb8b57fd1 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -24,6 +24,7 @@
 #include <linux/lmb.h>
 
 #include <asm/firmware.h>
+#include <asm/iommu.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/lv1call.h>
@@ -605,9 +606,8 @@ static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
                                        r->ioid,
                                        iopte_flag);
                 if (result) {
-                        printk(KERN_WARNING "%s:%d: lv1_map_device_dma_region "
-                                "failed: %s\n", __func__, __LINE__,
-                                ps3_result(result));
+                        pr_warning("%s:%d: lv1_put_iopte failed: %s\n",
+                                   __func__, __LINE__, ps3_result(result));
                         goto fail_map;
                 }
                 DBG("%s: pg=%d bus=%#lx, lpar=%#lx, ioid=%#x\n", __func__,
@@ -1001,7 +1001,8 @@ static int dma_sb_region_create_linear(struct ps3_dma_region *r)
                 if (len > r->len)
                         len = r->len;
                 result = dma_sb_map_area(r, virt_addr, len, &tmp,
-                        IOPTE_PP_W | IOPTE_PP_R | IOPTE_SO_RW | IOPTE_M);
+                        CBE_IOPTE_PP_W | CBE_IOPTE_PP_R | CBE_IOPTE_SO_RW |
+                        CBE_IOPTE_M);
                 BUG_ON(result);
         }
 
@@ -1014,7 +1015,8 @@ static int dma_sb_region_create_linear(struct ps3_dma_region *r)
                 else
                         len -= map.rm.size - r->offset;
                 result = dma_sb_map_area(r, virt_addr, len, &tmp,
-                        IOPTE_PP_W | IOPTE_PP_R | IOPTE_SO_RW | IOPTE_M);
+                        CBE_IOPTE_PP_W | CBE_IOPTE_PP_R | CBE_IOPTE_SO_RW |
+                        CBE_IOPTE_M);
                 BUG_ON(result);
         }
 
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index cf1cd0f8c18f..d6487a9c8019 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -226,6 +226,44 @@ static struct property property_av_multi_out = {
         .value = &saved_params.av_multi_out,
 };
 
+
+static DEFINE_MUTEX(os_area_flash_mutex);
+
+static const struct ps3_os_area_flash_ops *os_area_flash_ops;
+
+void ps3_os_area_flash_register(const struct ps3_os_area_flash_ops *ops)
+{
+        mutex_lock(&os_area_flash_mutex);
+        os_area_flash_ops = ops;
+        mutex_unlock(&os_area_flash_mutex);
+}
+EXPORT_SYMBOL_GPL(ps3_os_area_flash_register);
+
+static ssize_t os_area_flash_read(void *buf, size_t count, loff_t pos)
+{
+        ssize_t res = -ENODEV;
+
+        mutex_lock(&os_area_flash_mutex);
+        if (os_area_flash_ops)
+                res = os_area_flash_ops->read(buf, count, pos);
+        mutex_unlock(&os_area_flash_mutex);
+
+        return res;
+}
+
+static ssize_t os_area_flash_write(const void *buf, size_t count, loff_t pos)
+{
+        ssize_t res = -ENODEV;
+
+        mutex_lock(&os_area_flash_mutex);
+        if (os_area_flash_ops)
+                res = os_area_flash_ops->write(buf, count, pos);
+        mutex_unlock(&os_area_flash_mutex);
+
+        return res;
+}
+
+
 /**
  * os_area_set_property - Add or overwrite a saved_params value to the device tree.
  *
@@ -352,12 +390,12 @@ static int db_verify(const struct os_area_db *db)
         if (memcmp(db->magic_num, OS_AREA_DB_MAGIC_NUM,
                 sizeof(db->magic_num))) {
                 pr_debug("%s:%d magic_num failed\n", __func__, __LINE__);
-                return -1;
+                return -EINVAL;
         }
 
         if (db->version != 1) {
                 pr_debug("%s:%d version failed\n", __func__, __LINE__);
-                return -1;
+                return -EINVAL;
         }
 
         return 0;
@@ -578,59 +616,48 @@ static void os_area_db_init(struct os_area_db *db)
  *
  */
 
-static void __maybe_unused update_flash_db(void)
+static int update_flash_db(void)
 {
-        int result;
-        int file;
-        off_t offset;
+        const unsigned int buf_len = 8 * OS_AREA_SEGMENT_SIZE;
+        struct os_area_header *header;
         ssize_t count;
-        static const unsigned int buf_len = 8 * OS_AREA_SEGMENT_SIZE;
-        const struct os_area_header *header;
+        int error;
+        loff_t pos;
         struct os_area_db* db;
 
         /* Read in header and db from flash. */
 
-        file = sys_open("/dev/ps3flash", O_RDWR, 0);
-
-        if (file < 0) {
-                pr_debug("%s:%d sys_open failed\n", __func__, __LINE__);
-                goto fail_open;
-        }
-
         header = kmalloc(buf_len, GFP_KERNEL);
-
         if (!header) {
-                pr_debug("%s:%d kmalloc failed\n", __func__, __LINE__);
-                goto fail_malloc;
+                pr_debug("%s: kmalloc failed\n", __func__);
+                return -ENOMEM;
         }
 
-        offset = sys_lseek(file, 0, SEEK_SET);
-
-        if (offset != 0) {
-                pr_debug("%s:%d sys_lseek failed\n", __func__, __LINE__);
-                goto fail_header_seek;
+        count = os_area_flash_read(header, buf_len, 0);
+        if (count < 0) {
+                pr_debug("%s: os_area_flash_read failed %zd\n", __func__,
+                         count);
+                error = count;
+                goto fail;
         }
 
-        count = sys_read(file, (char __user *)header, buf_len);
-
-        result = count < OS_AREA_SEGMENT_SIZE || verify_header(header)
-                || count < header->db_area_offset * OS_AREA_SEGMENT_SIZE;
-
-        if (result) {
-                pr_debug("%s:%d verify_header failed\n", __func__, __LINE__);
+        pos = header->db_area_offset * OS_AREA_SEGMENT_SIZE;
+        if (count < OS_AREA_SEGMENT_SIZE || verify_header(header) ||
+            count < pos) {
+                pr_debug("%s: verify_header failed\n", __func__);
                 dump_header(header);
-                goto fail_header;
+                error = -EINVAL;
+                goto fail;
         }
 
         /* Now got a good db offset and some maybe good db data. */
 
-        db = (void*)header + header->db_area_offset * OS_AREA_SEGMENT_SIZE;
+        db = (void *)header + pos;
 
-        result = db_verify(db);
-
-        if (result) {
-                printk(KERN_NOTICE "%s:%d: Verify of flash database failed, "
-                        "formatting.\n", __func__, __LINE__);
+        error = db_verify(db);
+        if (error) {
+                pr_notice("%s: Verify of flash database failed, formatting.\n",
+                          __func__);
                 dump_db(db);
                 os_area_db_init(db);
         }
@@ -639,29 +666,16 @@ static void __maybe_unused update_flash_db(void)
 
         db_set_64(db, &os_area_db_id_rtc_diff, saved_params.rtc_diff);
 
-        offset = sys_lseek(file, header->db_area_offset * OS_AREA_SEGMENT_SIZE,
-                SEEK_SET);
-
-        if (offset != header->db_area_offset * OS_AREA_SEGMENT_SIZE) {
-                pr_debug("%s:%d sys_lseek failed\n", __func__, __LINE__);
-                goto fail_db_seek;
-        }
-
-        count = sys_write(file, (const char __user *)db,
-                sizeof(struct os_area_db));
-
+        count = os_area_flash_write(db, sizeof(struct os_area_db), pos);
         if (count < sizeof(struct os_area_db)) {
-                pr_debug("%s:%d sys_write failed\n", __func__, __LINE__);
+                pr_debug("%s: os_area_flash_write failed %zd\n", __func__,
+                         count);
+                error = count < 0 ? count : -EIO;
         }
 
-fail_db_seek:
-fail_header:
-fail_header_seek:
+fail:
         kfree(header);
-fail_malloc:
-        sys_close(file);
-fail_open:
-        return;
+        return error;
 }
 
 /**
@@ -674,11 +688,11 @@ fail_open:
 static void os_area_queue_work_handler(struct work_struct *work)
 {
         struct device_node *node;
+        int error;
 
         pr_debug(" -> %s:%d\n", __func__, __LINE__);
 
         node = of_find_node_by_path("/");
-
         if (node) {
                 os_area_set_property(node, &property_rtc_diff);
                 of_node_put(node);
@@ -686,12 +700,10 @@ static void os_area_queue_work_handler(struct work_struct *work)
                 pr_debug("%s:%d of_find_node_by_path failed\n",
                         __func__, __LINE__);
 
-#if defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
-        update_flash_db();
-#else
-        printk(KERN_WARNING "%s:%d: No flash rom driver configured.\n",
-                __func__, __LINE__);
-#endif
+        error = update_flash_db();
+        if (error)
+                pr_warning("%s: Could not update FLASH ROM\n", __func__);
+
         pr_debug(" <- %s:%d\n", __func__, __LINE__);
 }
 
@@ -808,7 +820,7 @@ u64 ps3_os_area_get_rtc_diff(void)
 {
         return saved_params.rtc_diff;
 }
-EXPORT_SYMBOL(ps3_os_area_get_rtc_diff);
+EXPORT_SYMBOL_GPL(ps3_os_area_get_rtc_diff);
 
 /**
  * ps3_os_area_set_rtc_diff - Set the rtc diff value.
@@ -824,7 +836,7 @@ void ps3_os_area_set_rtc_diff(u64 rtc_diff)
                 os_area_queue_work();
         }
 }
-EXPORT_SYMBOL(ps3_os_area_set_rtc_diff);
+EXPORT_SYMBOL_GPL(ps3_os_area_set_rtc_diff);
 
 /**
  * ps3_os_area_get_av_multi_out - Returns the default video mode.
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 136aa0637d9c..9a196a88eda7 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -232,14 +232,4 @@ int ps3_repository_read_spu_resource_id(unsigned int res_index,
 int ps3_repository_read_vuart_av_port(unsigned int *port);
 int ps3_repository_read_vuart_sysmgr_port(unsigned int *port);
 
-/* Page table entries */
-#define IOPTE_PP_W              0x8000000000000000ul /* protection: write */
-#define IOPTE_PP_R              0x4000000000000000ul /* protection: read */
-#define IOPTE_M                 0x2000000000000000ul /* coherency required */
-#define IOPTE_SO_R              0x1000000000000000ul /* ordering: writes */
-#define IOPTE_SO_RW             0x1800000000000000ul /* ordering: r & w */
-#define IOPTE_RPN_Mask          0x07fffffffffff000ul /* RPN */
-#define IOPTE_H                 0x0000000000000800ul /* cache hint */
-#define IOPTE_IOID_Mask         0x00000000000007fful /* ioid */
-
 #endif
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 1a7b5ae0c83e..149bea2ce583 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -32,6 +32,7 @@
 #include <asm/udbg.h>
 #include <asm/prom.h>
 #include <asm/lv1call.h>
+#include <asm/ps3gpu.h>
 
 #include "platform.h"
 
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index a0927a3bacb7..f6e04bcc70ef 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -32,12 +32,6 @@
 #define DBG pr_debug
 #endif
 
-static irqreturn_t ipi_function_handler(int irq, void *msg)
-{
-        smp_message_recv((int)(long)msg);
-        return IRQ_HANDLED;
-}
-
 /**
   * ps3_ipi_virqs - a per cpu array of virqs for ipi use
   */
@@ -45,13 +39,6 @@ static irqreturn_t ipi_function_handler(int irq, void *msg)
 #define MSG_COUNT 4
 static DEFINE_PER_CPU(unsigned int, ps3_ipi_virqs[MSG_COUNT]);
 
-static const char *names[MSG_COUNT] = {
-        "ipi call",
-        "ipi reschedule",
-        "ipi migrate",
-        "ipi debug brk"
-};
-
 static void do_message_pass(int target, int msg)
 {
         int result;
@@ -119,8 +106,7 @@ static void __init ps3_smp_setup_cpu(int cpu)
                 DBG("%s:%d: (%d, %d) => virq %u\n",
                         __func__, __LINE__, cpu, i, virqs[i]);
 
-                result = request_irq(virqs[i], ipi_function_handler,
-                        IRQF_DISABLED, names[i], (void*)(long)i);
+                result = smp_request_message_ipi(virqs[i], i);
 
                 if (result)
                         virqs[i] = NO_IRQ;
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 9a73d0238639..9fead0faf38b 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -27,6 +27,7 @@
 #include <asm/udbg.h>
 #include <asm/lv1call.h>
 #include <asm/firmware.h>
+#include <asm/iommu.h>
 
 #include "platform.h"
 
@@ -531,7 +532,8 @@ static void * ps3_alloc_coherent(struct device *_dev, size_t size,
         }
 
         result = ps3_dma_map(dev->d_region, virt_addr, size, dma_handle,
-                             IOPTE_PP_W | IOPTE_PP_R | IOPTE_SO_RW | IOPTE_M);
+                             CBE_IOPTE_PP_W | CBE_IOPTE_PP_R |
+                             CBE_IOPTE_SO_RW | CBE_IOPTE_M);
 
         if (result) {
                 pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
@@ -575,7 +577,8 @@ static dma_addr_t ps3_sb_map_page(struct device *_dev, struct page *page,
 
         result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,
                              &bus_addr,
-                             IOPTE_PP_R | IOPTE_PP_W | IOPTE_SO_RW | IOPTE_M);
+                             CBE_IOPTE_PP_R | CBE_IOPTE_PP_W |
+                             CBE_IOPTE_SO_RW | CBE_IOPTE_M);
 
         if (result) {
                 pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
@@ -596,16 +599,16 @@ static dma_addr_t ps3_ioc0_map_page(struct device *_dev, struct page *page,
         u64 iopte_flag;
         void *ptr = page_address(page) + offset;
 
-        iopte_flag = IOPTE_M;
+        iopte_flag = CBE_IOPTE_M;
         switch (direction) {
         case DMA_BIDIRECTIONAL:
-                iopte_flag |= IOPTE_PP_R | IOPTE_PP_W | IOPTE_SO_RW;
+                iopte_flag |= CBE_IOPTE_PP_R | CBE_IOPTE_PP_W | CBE_IOPTE_SO_RW;
                 break;
         case DMA_TO_DEVICE:
-                iopte_flag |= IOPTE_PP_R | IOPTE_SO_R;
+                iopte_flag |= CBE_IOPTE_PP_R | CBE_IOPTE_SO_R;
                 break;
         case DMA_FROM_DEVICE:
-                iopte_flag |= IOPTE_PP_W | IOPTE_SO_RW;
+                iopte_flag |= CBE_IOPTE_PP_W | CBE_IOPTE_SO_RW;
                 break;
         default:
                 /* not happned */
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 3ee01b4f4257..661c8e02bcba 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -388,7 +388,7 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus)
 
                 while (pci->phb->dma_window_size * children > 0x80000000ul)
                         pci->phb->dma_window_size >>= 1;
-                pr_debug("No ISA/IDE, window size is 0x%lx\n",
+                pr_debug("No ISA/IDE, window size is 0x%llx\n",
                          pci->phb->dma_window_size);
                 pci->phb->dma_window_base_cur = 0;
 
@@ -414,7 +414,7 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus)
         while (pci->phb->dma_window_size * children > 0x70000000ul)
                 pci->phb->dma_window_size >>= 1;
 
-        pr_debug("ISA/IDE, window size is 0x%lx\n", pci->phb->dma_window_size);
+        pr_debug("ISA/IDE, window size is 0x%llx\n", pci->phb->dma_window_size);
 }
 
 
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 52a80e5840e8..e3139fa5e556 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -609,3 +609,55 @@ void __init hpte_init_lpar(void)
         ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
         ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
 }
+
+#ifdef CONFIG_PPC_SMLPAR
+#define CMO_FREE_HINT_DEFAULT 1
+static int cmo_free_hint_flag = CMO_FREE_HINT_DEFAULT;
+
+static int __init cmo_free_hint(char *str)
+{
+        char *parm;
+        parm = strstrip(str);
+
+        if (strcasecmp(parm, "no") == 0 || strcasecmp(parm, "off") == 0) {
+                printk(KERN_INFO "cmo_free_hint: CMO free page hinting is not active.\n");
+                cmo_free_hint_flag = 0;
+                return 1;
+        }
+
+        cmo_free_hint_flag = 1;
+        printk(KERN_INFO "cmo_free_hint: CMO free page hinting is active.\n");
+
+        if (strcasecmp(parm, "yes") == 0 || strcasecmp(parm, "on") == 0)
+                return 1;
+
+        return 0;
+}
+
+__setup("cmo_free_hint=", cmo_free_hint);
+
+static void pSeries_set_page_state(struct page *page, int order,
+                                   unsigned long state)
+{
+        int i, j;
+        unsigned long cmo_page_sz, addr;
+
+        cmo_page_sz = cmo_get_page_size();
+        addr = __pa((unsigned long)page_address(page));
+
+        for (i = 0; i < (1 << order); i++, addr += PAGE_SIZE) {
+                for (j = 0; j < PAGE_SIZE; j += cmo_page_sz)
+                        plpar_hcall_norets(H_PAGE_INIT, state, addr + j, 0);
+        }
+}
+
+void arch_free_page(struct page *page, int order)
+{
+        if (!cmo_free_hint_flag || !firmware_has_feature(FW_FEATURE_CMO))
+                return;
+
+        pSeries_set_page_state(page, order, H_PAGE_SET_UNUSED);
+}
+EXPORT_SYMBOL(arch_free_page);
+
+#endif
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index afad9f5ac0ac..b3cbac855924 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -19,7 +19,7 @@
 #include <linux/vmalloc.h>
 #include <linux/spinlock.h>
 #include <linux/cpu.h>
-#include <linux/delay.h>
+#include <linux/workqueue.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -387,36 +387,51 @@ static void do_event_scan(void)
         } while(error == 0);
 }
 
-static void do_event_scan_all_cpus(long delay)
+static void rtas_event_scan(struct work_struct *w);
+DECLARE_DELAYED_WORK(event_scan_work, rtas_event_scan);
+
+/*
+ * Delay should be at least one second since some machines have problems if
+ * we call event-scan too quickly.
+ */
+static unsigned long event_scan_delay = 1*HZ;
+static int first_pass = 1;
+
+static void rtas_event_scan(struct work_struct *w)
 {
-        int cpu;
+        unsigned int cpu;
+
+        do_event_scan();
 
         get_online_cpus();
-        cpu = first_cpu(cpu_online_map);
-        for (;;) {
-                set_cpus_allowed(current, cpumask_of_cpu(cpu));
-                do_event_scan();
-                set_cpus_allowed(current, CPU_MASK_ALL);
-
-                /* Drop hotplug lock, and sleep for the specified delay */
-                put_online_cpus();
-                msleep_interruptible(delay);
-                get_online_cpus();
-
-                cpu = next_cpu(cpu, cpu_online_map);
-                if (cpu == NR_CPUS)
-                        break;
+
+        cpu = next_cpu(smp_processor_id(), cpu_online_map);
+        if (cpu == NR_CPUS) {
+                cpu = first_cpu(cpu_online_map);
+
+                if (first_pass) {
+                        first_pass = 0;
+                        event_scan_delay = 30*HZ/rtas_event_scan_rate;
+
+                        if (surveillance_timeout != -1) {
+                                pr_debug("rtasd: enabling surveillance\n");
+                                enable_surveillance(surveillance_timeout);
+                                pr_debug("rtasd: surveillance enabled\n");
+                        }
+                }
         }
+
+        schedule_delayed_work_on(cpu, &event_scan_work,
+                __round_jiffies_relative(event_scan_delay, cpu));
+
         put_online_cpus();
 }
 
-static int rtasd(void *unused)
+static void start_event_scan(void)
 {
         unsigned int err_type;
         int rc;
 
-        daemonize("rtasd");
-
         printk(KERN_DEBUG "RTAS daemon started\n");
         pr_debug("rtasd: will sleep for %d milliseconds\n",
                  (30000 / rtas_event_scan_rate));
@@ -434,22 +449,8 @@ static int rtasd(void *unused)
                 }
         }
 
-        /* First pass. */
-        do_event_scan_all_cpus(1000);
-
-        if (surveillance_timeout != -1) {
-                pr_debug("rtasd: enabling surveillance\n");
-                enable_surveillance(surveillance_timeout);
-                pr_debug("rtasd: surveillance enabled\n");
-        }
-
-        /* Delay should be at least one second since some
-         * machines have problems if we call event-scan too
-         * quickly. */
-        for (;;)
-                do_event_scan_all_cpus(30000/rtas_event_scan_rate);
-
-        return -EINVAL;
+        schedule_delayed_work_on(first_cpu(cpu_online_map), &event_scan_work,
+                                 event_scan_delay);
 }
 
 static int __init rtas_init(void)
@@ -487,8 +488,7 @@ static int __init rtas_init(void)
         if (!entry)
                 printk(KERN_ERR "Failed to create error_log proc entry\n");
 
-        if (kernel_thread(rtasd, NULL, CLONE_FS) < 0)
-                printk(KERN_ERR "Failed to start RTAS daemon\n");
+        start_event_scan();
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index ec341707e41b..8d75ea21296f 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -63,6 +63,7 @@
 #include <asm/smp.h>
 #include <asm/firmware.h>
 #include <asm/eeh.h>
+#include <asm/pSeries_reconfig.h>
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
@@ -254,6 +255,29 @@ static void __init pseries_discover_pic(void)
                " interrupt-controller\n");
 }
 
+static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
+{
+        struct device_node *np = node;
+        struct pci_dn *pci = NULL;
+        int err = NOTIFY_OK;
+
+        switch (action) {
+        case PSERIES_RECONFIG_ADD:
+                pci = np->parent->data;
+                if (pci)
+                        update_dn_pci_info(np, pci->phb);
+                break;
+        default:
+                err = NOTIFY_DONE;
+                break;
+        }
+        return err;
+}
+
+static struct notifier_block pci_dn_reconfig_nb = {
+        .notifier_call = pci_dn_reconfig_notifier,
+};
+
 static void __init pSeries_setup_arch(void)
 {
         /* Discover PIC type and setup ppc_md accordingly */
@@ -271,6 +295,7 @@ static void __init pSeries_setup_arch(void)
         /* Find and initialize PCI host bridges */
         init_pci_config_tokens();
         find_and_init_phbs();
+        pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb);
         eeh_init();
 
         pSeries_nvram_init();
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index b33b28a6fe12..2d1c87dd5d14 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_IPIC)		+= ipic.o
 obj-$(CONFIG_4xx)               += uic.o
 obj-$(CONFIG_4xx_SOC)           += ppc4xx_soc.o
 obj-$(CONFIG_XILINX_VIRTEX)     += xilinx_intc.o
+obj-$(CONFIG_XILINX_PCI)        += xilinx_pci.o
 obj-$(CONFIG_OF_RTC)            += of_rtc.o
 ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_4xx)               += ppc4xx_pci.o
diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c
index fd969f0e3121..eb5927212fab 100644
--- a/arch/powerpc/sysdev/cpm2.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -61,7 +61,7 @@ EXPORT_SYMBOL(cpm2_immr);
 void __init cpm2_reset(void)
 {
 #ifdef CONFIG_PPC_85xx
-        cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);
+        cpm2_immr = ioremap(get_immrbase() + 0x80000, CPM_MAP_SIZE);
 #else
         cpm2_immr = ioremap(get_immrbase(), CPM_MAP_SIZE);
 #endif
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index f25ce818d40a..da38a1ff97bb 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -113,8 +113,13 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,
                                   struct msi_msg *msg)
 {
         struct fsl_msi *msi_data = fsl_msi;
+        struct pci_controller *hose = pci_bus_to_host(pdev->bus);
+        u32 base = 0;
 
-        msg->address_lo = msi_data->msi_addr_lo;
+        pci_bus_read_config_dword(hose->bus,
+                PCI_DEVFN(0, 0), PCI_BASE_ADDRESS_0, &base);
+
+        msg->address_lo = msi_data->msi_addr_lo + base;
         msg->address_hi = msi_data->msi_addr_hi;
         msg->data = hwirq;
 
@@ -271,7 +276,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
         msi->irqhost->host_data = msi;
 
         msi->msi_addr_hi = 0x0;
-        msi->msi_addr_lo = res.start + features->msiir_offset;
+        msi->msi_addr_lo = features->msiir_offset + (res.start & 0xfffff);
 
         rc = fsl_msi_init_allocator(msi);
         if (rc) {
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 78021d8afc53..ae88b1448018 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -23,6 +23,8 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <linux/lmb.h>
+#include <linux/log2.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -96,7 +98,13 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
                                   struct resource *rsrc)
 {
         struct ccsr_pci __iomem *pci;
-        int i, j, n;
+        int i, j, n, mem_log, win_idx = 2;
+        u64 mem, sz, paddr_hi = 0;
+        u64 paddr_lo = ULLONG_MAX;
+        u32 pcicsrbar = 0, pcicsrbar_sz;
+        u32 piwar = PIWAR_EN | PIWAR_PF | PIWAR_TGI_LOCAL |
+                        PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;
+        char *name = hose->dn->full_name;
 
         pr_debug("PCI memory map start 0x%016llx, size 0x%016llx\n",
                     (u64)rsrc->start, (u64)rsrc->end - (u64)rsrc->start + 1);
@@ -117,6 +125,9 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
                 if (!(hose->mem_resources[i].flags & IORESOURCE_MEM))
                         continue;
 
+                paddr_lo = min(paddr_lo, (u64)hose->mem_resources[i].start);
+                paddr_hi = max(paddr_hi, (u64)hose->mem_resources[i].end);
+
                 n = setup_one_atmu(pci, j, &hose->mem_resources[i],
                                    hose->pci_mem_offset);
 
@@ -147,10 +158,105 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
                 }
         }
 
-        /* Setup 2G inbound Memory Window @ 1 */
-        out_be32(&pci->piw[2].pitar, 0x00000000);
-        out_be32(&pci->piw[2].piwbar,0x00000000);
-        out_be32(&pci->piw[2].piwar, PIWAR_2G);
+        /* convert to pci address space */
+        paddr_hi -= hose->pci_mem_offset;
+        paddr_lo -= hose->pci_mem_offset;
+
+        if (paddr_hi == paddr_lo) {
+                pr_err("%s: No outbound window space\n", name);
+                return ;
+        }
+
+        if (paddr_lo == 0) {
+                pr_err("%s: No space for inbound window\n", name);
+                return ;
+        }
+
+        /* setup PCSRBAR/PEXCSRBAR */
+        early_write_config_dword(hose, 0, 0, PCI_BASE_ADDRESS_0, 0xffffffff);
+        early_read_config_dword(hose, 0, 0, PCI_BASE_ADDRESS_0, &pcicsrbar_sz);
+        pcicsrbar_sz = ~pcicsrbar_sz + 1;
+
+        if (paddr_hi < (0x100000000ull - pcicsrbar_sz) ||
+                (paddr_lo > 0x100000000ull))
+                pcicsrbar = 0x100000000ull - pcicsrbar_sz;
+        else
+                pcicsrbar = (paddr_lo - pcicsrbar_sz) & -pcicsrbar_sz;
+        early_write_config_dword(hose, 0, 0, PCI_BASE_ADDRESS_0, pcicsrbar);
+
+        paddr_lo = min(paddr_lo, (u64)pcicsrbar);
+
+        pr_info("%s: PCICSRBAR @ 0x%x\n", name, pcicsrbar);
+
+        /* Setup inbound mem window */
+        mem = lmb_end_of_DRAM();
+        sz = min(mem, paddr_lo);
+        mem_log = __ilog2_u64(sz);
+
+        /* PCIe can overmap inbound & outbound since RX & TX are separated */
+        if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) {
+                /* Size window to exact size if power-of-two or one size up */
+                if ((1ull << mem_log) != mem) {
+                        if ((1ull << mem_log) > mem)
+                                pr_info("%s: Setting PCI inbound window "
+                                        "greater than memory size\n", name);
+                        mem_log++;
+                }
+
+                piwar |= (mem_log - 1);
+
+                /* Setup inbound memory window */
+                out_be32(&pci->piw[win_idx].pitar,  0x00000000);
+                out_be32(&pci->piw[win_idx].piwbar, 0x00000000);
+                out_be32(&pci->piw[win_idx].piwar,  piwar);
+                win_idx--;
+
+                hose->dma_window_base_cur = 0x00000000;
+                hose->dma_window_size = (resource_size_t)sz;
+        } else {
+                u64 paddr = 0;
+
+                /* Setup inbound memory window */
+                out_be32(&pci->piw[win_idx].pitar,  paddr >> 12);
+                out_be32(&pci->piw[win_idx].piwbar, paddr >> 12);
+                out_be32(&pci->piw[win_idx].piwar,  (piwar | (mem_log - 1)));
+                win_idx--;
+
+                paddr += 1ull << mem_log;
+                sz -= 1ull << mem_log;
+
+                if (sz) {
+                        mem_log = __ilog2_u64(sz);
+                        piwar |= (mem_log - 1);
+
+                        out_be32(&pci->piw[win_idx].pitar,  paddr >> 12);
+                        out_be32(&pci->piw[win_idx].piwbar, paddr >> 12);
+                        out_be32(&pci->piw[win_idx].piwar,  piwar);
+                        win_idx--;
+
+                        paddr += 1ull << mem_log;
+                }
+
+                hose->dma_window_base_cur = 0x00000000;
+                hose->dma_window_size = (resource_size_t)paddr;
+        }
+
+        if (hose->dma_window_size < mem) {
+#ifndef CONFIG_SWIOTLB
+                pr_err("%s: ERROR: Memory size exceeds PCI ATMU ability to "
+                        "map - enable CONFIG_SWIOTLB to avoid dma errors.\n",
+                         name);
+#endif
+                /* adjusting outbound windows could reclaim space in mem map */
+                if (paddr_hi < 0xffffffffull)
+                        pr_warning("%s: WARNING: Outbound window cfg leaves "
+                                "gaps in memory map. Adjusting the memory map "
+                                "could reduce unnecessary bounce buffering.\n",
+                                name);
+
+                pr_info("%s: DMA window size is 0x%llx\n", name,
+                        (u64)hose->dma_window_size);
+        }
 
         iounmap(pci);
 }
@@ -176,19 +282,9 @@ static void __init setup_pci_cmd(struct pci_controller *hose)
         }
 }
 
-static void __init setup_pci_pcsrbar(struct pci_controller *hose)
-{
-#ifdef CONFIG_PCI_MSI
-        phys_addr_t immr_base;
-
-        immr_base = get_immrbase();
-        early_write_config_dword(hose, 0, 0, PCI_BASE_ADDRESS_0, immr_base);
-#endif
-}
-
 void fsl_pcibios_fixup_bus(struct pci_bus *bus)
 {
-        struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         int i;
 
         if ((bus->parent == hose->bus) &&
@@ -269,8 +365,6 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
         /* Setup PEX window registers */
         setup_pci_atmu(hose, &rsrc);
 
-        /* Setup PEXCSRBAR */
-        setup_pci_pcsrbar(hose);
         return 0;
 }
 
@@ -281,6 +375,8 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8543, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8547E, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8545E, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8545, quirk_fsl_pcie_header);
+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8569E, quirk_fsl_pcie_header);
+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8569, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8568E, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8568, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8567E, quirk_fsl_pcie_header);
@@ -296,6 +392,8 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8536, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);
+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020E, quirk_fsl_pcie_header);
+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020, quirk_fsl_pcie_header);
 #endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */
 
 #if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)
@@ -324,7 +422,7 @@ struct mpc83xx_pcie_priv {
 
 static int mpc83xx_pcie_exclude_device(struct pci_bus *bus, unsigned int devfn)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
 
         if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK)
                 return PCIBIOS_DEVICE_NOT_FOUND;
@@ -350,7 +448,7 @@ static int mpc83xx_pcie_exclude_device(struct pci_bus *bus, unsigned int devfn)
 static void __iomem *mpc83xx_pcie_remap_cfg(struct pci_bus *bus,
                                             unsigned int devfn, int offset)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         struct mpc83xx_pcie_priv *pcie = hose->dn->data;
         u8 bus_no = bus->number - hose->first_busno;
         u32 dev_base = bus_no << 24 | devfn << 16;
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h
index 13f30c2a61e7..a9d8bbebed80 100644
--- a/arch/powerpc/sysdev/fsl_pci.h
+++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -16,7 +16,11 @@
 
 #define PCIE_LTSSM      0x0404          /* PCIE Link Training and Status */
 #define PCIE_LTSSM_L0   0x16            /* L0 state */
-#define PIWAR_2G        0xa0f5501e      /* Enable, Prefetch, Local Mem, Snoop R/W, 2G */
+#define PIWAR_EN                0x80000000      /* Enable */
+#define PIWAR_PF                0x20000000      /* prefetch */
+#define PIWAR_TGI_LOCAL         0x00f00000      /* target - local memory */
+#define PIWAR_READ_SNOOP        0x00050000
+#define PIWAR_WRITE_SNOOP       0x00005000
 
 /* PCI/PCI Express outbound window reg */
 struct pci_outbound_window_regs {
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index abdb124e1e2f..39db9d1155d2 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -1026,8 +1026,7 @@ int fsl_rio_setup(struct of_device *dev)
                 return -EFAULT;
         }
         dev_info(&dev->dev, "Of-device full name %s\n", dev->node->full_name);
-        dev_info(&dev->dev, "Regs start 0x%08x size 0x%08x\n",  regs.start,
-                                                regs.end - regs.start + 1);
+        dev_info(&dev->dev, "Regs: %pR\n", &regs);
 
         dt_range = of_get_property(dev->node, "ranges", &rlen);
         if (!dt_range) {
@@ -1077,8 +1076,9 @@ int fsl_rio_setup(struct of_device *dev)
 
         INIT_LIST_HEAD(&port->dbells);
         port->iores.start = law_start;
-        port->iores.end = law_start + law_size;
+        port->iores.end = law_start + law_size - 1;
         port->iores.flags = IORESOURCE_MEM;
+        port->iores.name = "rio_io_win";
 
         priv->bellirq = irq_of_parse_and_map(dev->node, 2);
         priv->txirq = irq_of_parse_and_map(dev->node, 3);
@@ -1156,14 +1156,15 @@ int fsl_rio_setup(struct of_device *dev)
                 out_be32((priv->regs_win + RIO_ISR_AACR), RIO_ISR_AACR_AA);
 
         /* Configure maintenance transaction window */
-        out_be32(&priv->maint_atmu_regs->rowbar, 0x000c0000);
-        out_be32(&priv->maint_atmu_regs->rowar, 0x80077015);
+        out_be32(&priv->maint_atmu_regs->rowbar, law_start >> 12);
+        out_be32(&priv->maint_atmu_regs->rowar, 0x80077015);    /* 4M */
 
         priv->maint_win = ioremap(law_start, RIO_MAINT_WIN_SIZE);
 
         /* Configure outbound doorbell window */
-        out_be32(&priv->dbell_atmu_regs->rowbar, 0x000c0400);
-        out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b);
+        out_be32(&priv->dbell_atmu_regs->rowbar,
+                        (law_start + RIO_MAINT_WIN_SIZE) >> 12);
+        out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b);    /* 4k */
         fsl_rio_doorbell_init(port);
 
         return 0;
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 5c64ccd402e2..95dbc643c4fc 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -379,16 +379,10 @@ static int __init setup_rstcr(void)
         struct device_node *np;
         np = of_find_node_by_name(NULL, "global-utilities");
         if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) {
-                const u32 *prop = of_get_property(np, "reg", NULL);
-                if (prop) {
-                        /* map reset control register
-                         * 0xE00B0 is offset of reset control register
-                         */
-                        rstcr = ioremap(get_immrbase() + *prop + 0xB0, 0xff);
-                        if (!rstcr)
-                                printk (KERN_EMERG "Error: reset control "
-                                                "register not mapped!\n");
-                }
+                rstcr = of_iomap(np, 0) + 0xb0;
+                if (!rstcr)
+                        printk (KERN_EMERG "Error: reset control register "
+                                        "not mapped!\n");
         } else
                 printk (KERN_INFO "rstcr compatible register does not exist!\n");
         if (np)
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index 7fd49c97501a..7ed809676642 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -24,7 +24,7 @@ static int
 indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                      int len, u32 *val)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         volatile void __iomem *cfg_data;
         u8 cfg_type = 0;
         u32 bus_no, reg;
@@ -82,7 +82,7 @@ static int
 indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
                       int len, u32 val)
 {
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         volatile void __iomem *cfg_data;
         u8 cfg_type = 0;
         u32 bus_no, reg;
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 352d8c3ef526..9c3af5045495 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -613,23 +613,23 @@ static int irq_choose_cpu(unsigned int virt_irq)
 #define mpic_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
 
 /* Find an mpic associated with a given linux interrupt */
-static struct mpic *mpic_find(unsigned int irq, unsigned int *is_ipi)
+static struct mpic *mpic_find(unsigned int irq)
 {
-        unsigned int src = mpic_irq_to_hw(irq);
-        struct mpic *mpic;
-
         if (irq < NUM_ISA_INTERRUPTS)
                 return NULL;
 
-        mpic = irq_desc[irq].chip_data;
+        return irq_desc[irq].chip_data;
+}
 
-        if (is_ipi)
-                *is_ipi = (src >= mpic->ipi_vecs[0] &&
-                           src <= mpic->ipi_vecs[3]);
+/* Determine if the linux irq is an IPI */
+static unsigned int mpic_is_ipi(struct mpic *mpic, unsigned int irq)
+{
+        unsigned int src = mpic_irq_to_hw(irq);
 
-        return mpic;
+        return (src >= mpic->ipi_vecs[0] && src <= mpic->ipi_vecs[3]);
 }
 
+
 /* Convert a cpu mask from logical to physical cpu numbers. */
 static inline u32 mpic_physmask(u32 cpumask)
 {
@@ -1383,8 +1383,7 @@ void __init mpic_set_serial_int(struct mpic *mpic, int enable)
 
 void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
 {
-        unsigned int is_ipi;
-        struct mpic *mpic = mpic_find(irq, &is_ipi);
+        struct mpic *mpic = mpic_find(irq);
         unsigned int src = mpic_irq_to_hw(irq);
         unsigned long flags;
         u32 reg;
@@ -1393,7 +1392,7 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
                 return;
 
         spin_lock_irqsave(&mpic_lock, flags);
-        if (is_ipi) {
+        if (mpic_is_ipi(mpic, irq)) {
                 reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) &
                         ~MPIC_VECPRI_PRIORITY_MASK;
                 mpic_ipi_write(src - mpic->ipi_vecs[0],
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index 6a2d473c345a..daefc93ddffe 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -1295,7 +1295,7 @@ static void __iomem *ppc4xx_pciex_get_config_base(struct ppc4xx_pciex_port *port
 static int ppc4xx_pciex_read_config(struct pci_bus *bus, unsigned int devfn,
                                     int offset, int len, u32 *val)
 {
-        struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         struct ppc4xx_pciex_port *port =
                 &ppc4xx_pciex_ports[hose->indirect_type];
         void __iomem *addr;
@@ -1352,7 +1352,7 @@ static int ppc4xx_pciex_read_config(struct pci_bus *bus, unsigned int devfn,
 static int ppc4xx_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
                                      int offset, int len, u32 val)
 {
-        struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         struct ppc4xx_pciex_port *port =
                 &ppc4xx_pciex_ports[hose->indirect_type];
         void __iomem *addr;
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index 01bce3784b0a..b28b0e512d67 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -61,6 +61,7 @@ struct qe_immap __iomem *qe_immr;
 EXPORT_SYMBOL(qe_immr);
 
 static struct qe_snum snums[QE_NUM_OF_SNUM];    /* Dynamically allocated SNUMs */
+static unsigned int qe_num_of_snum;
 
 static phys_addr_t qebase = -1;
 
@@ -264,10 +265,14 @@ static void qe_snums_init(void)
                 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D,
                 0x24, 0x25, 0x2C, 0x2D, 0x34, 0x35, 0x88, 0x89,
                 0x98, 0x99, 0xA8, 0xA9, 0xB8, 0xB9, 0xC8, 0xC9,
-                0xD8, 0xD9, 0xE8, 0xE9,
+                0xD8, 0xD9, 0xE8, 0xE9, 0x08, 0x09, 0x18, 0x19,
+                0x28, 0x29, 0x38, 0x39, 0x48, 0x49, 0x58, 0x59,
+                0x68, 0x69, 0x78, 0x79, 0x80, 0x81,
         };
 
-        for (i = 0; i < QE_NUM_OF_SNUM; i++) {
+        qe_num_of_snum = qe_get_num_of_snums();
+
+        for (i = 0; i < qe_num_of_snum; i++) {
                 snums[i].num = snum_init[i];
                 snums[i].state = QE_SNUM_STATE_FREE;
         }
@@ -280,7 +285,7 @@ int qe_get_snum(void)
         int i;
 
         spin_lock_irqsave(&qe_lock, flags);
-        for (i = 0; i < QE_NUM_OF_SNUM; i++) {
+        for (i = 0; i < qe_num_of_snum; i++) {
                 if (snums[i].state == QE_SNUM_STATE_FREE) {
                         snums[i].state = QE_SNUM_STATE_USED;
                         snum = snums[i].num;
@@ -297,7 +302,7 @@ void qe_put_snum(u8 snum)
 {
         int i;
 
-        for (i = 0; i < QE_NUM_OF_SNUM; i++) {
+        for (i = 0; i < qe_num_of_snum; i++) {
                 if (snums[i].num == snum) {
                         snums[i].state = QE_SNUM_STATE_FREE;
                         break;
@@ -575,3 +580,65 @@ struct qe_firmware_info *qe_get_firmware_info(void)
 }
 EXPORT_SYMBOL(qe_get_firmware_info);
 
+unsigned int qe_get_num_of_risc(void)
+{
+        struct device_node *qe;
+        int size;
+        unsigned int num_of_risc = 0;
+        const u32 *prop;
+
+        qe = of_find_compatible_node(NULL, NULL, "fsl,qe");
+        if (!qe) {
+                /* Older devices trees did not have an "fsl,qe"
+                 * compatible property, so we need to look for
+                 * the QE node by name.
+                 */
+                qe = of_find_node_by_type(NULL, "qe");
+                if (!qe)
+                        return num_of_risc;
+        }
+
+        prop = of_get_property(qe, "fsl,qe-num-riscs", &size);
+        if (prop && size == sizeof(*prop))
+                num_of_risc = *prop;
+
+        of_node_put(qe);
+
+        return num_of_risc;
+}
+EXPORT_SYMBOL(qe_get_num_of_risc);
+
+unsigned int qe_get_num_of_snums(void)
+{
+        struct device_node *qe;
+        int size;
+        unsigned int num_of_snums;
+        const u32 *prop;
+
+        num_of_snums = 28; /* The default number of snum for threads is 28 */
+        qe = of_find_compatible_node(NULL, NULL, "fsl,qe");
+        if (!qe) {
+                /* Older devices trees did not have an "fsl,qe"
+                 * compatible property, so we need to look for
+                 * the QE node by name.
+                 */
+                qe = of_find_node_by_type(NULL, "qe");
+                if (!qe)
+                        return num_of_snums;
+        }
+
+        prop = of_get_property(qe, "fsl,qe-num-snums", &size);
+        if (prop && size == sizeof(*prop)) {
+                num_of_snums = *prop;
+                if ((num_of_snums < 28) || (num_of_snums > QE_NUM_OF_SNUM)) {
+                        /* No QE ever has fewer than 28 SNUMs */
+                        pr_err("QE: number of snum is invalid\n");
+                        return -EINVAL;
+                }
+        }
+
+        of_node_put(qe);
+
+        return num_of_snums;
+}
+EXPORT_SYMBOL(qe_get_num_of_snums);
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 24e1f5a197ae..cf244a419e96 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -63,7 +63,7 @@ tsi108_direct_write_config(struct pci_bus *bus, unsigned int devfunc,
                            int offset, int len, u32 val)
 {
         volatile unsigned char *cfg_addr;
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
 
         if (ppc_md.pci_exclude_device)
                 if (ppc_md.pci_exclude_device(hose, bus->number, devfunc))
@@ -149,7 +149,7 @@ tsi108_direct_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                           int len, u32 * val)
 {
         volatile unsigned char *cfg_addr;
-        struct pci_controller *hose = bus->sysdata;
+        struct pci_controller *hose = pci_bus_to_host(bus);
         u32 temp;
 
         if (ppc_md.pci_exclude_device)
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index c658b413c9b4..3ee1fd37bbfc 100644
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -25,6 +25,7 @@
 #include <linux/of.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/i8259.h>
 #include <asm/irq.h>
 
 /*
@@ -191,20 +192,14 @@ struct irq_host * __init
 xilinx_intc_init(struct device_node *np)
 {
         struct irq_host * irq;
-        struct resource res;
         void * regs;
-        int rc;
 
         /* Find and map the intc registers */
-        rc = of_address_to_resource(np, 0, &res);
-        if (rc) {
-                printk(KERN_ERR __FILE__ ": of_address_to_resource() failed\n");
+        regs = of_iomap(np, 0);
+        if (!regs) {
+                pr_err("xilinx_intc: could not map registers\n");
                 return NULL;
         }
-        regs = ioremap(res.start, 32);
-
-        printk(KERN_INFO "Xilinx intc at 0x%08llx mapped to 0x%p\n",
-                (unsigned long long) res.start, regs);
 
         /* Setup interrupt controller */
         out_be32(regs + XINTC_IER, 0); /* disable all irqs */
@@ -217,6 +212,7 @@ xilinx_intc_init(struct device_node *np)
         if (!irq)
                 panic(__FILE__ ": Cannot allocate IRQ host\n");
         irq->host_data = regs;
+
         return irq;
 }
 
@@ -227,23 +223,70 @@ int xilinx_intc_get_irq(void)
         return irq_linear_revmap(master_irqhost, in_be32(regs + XINTC_IVR));
 }
 
+#if defined(CONFIG_PPC_I8259)
+/*
+ * Support code for cascading to 8259 interrupt controllers
+ */
+static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        unsigned int cascade_irq = i8259_irq();
+        if (cascade_irq)
+                generic_handle_irq(cascade_irq);
+
+        /* Let xilinx_intc end the interrupt */
+        desc->chip->ack(irq);
+        desc->chip->unmask(irq);
+}
+
+static void __init xilinx_i8259_setup_cascade(void)
+{
+        struct device_node *cascade_node;
+        int cascade_irq;
+
+        /* Initialize i8259 controller */
+        cascade_node = of_find_compatible_node(NULL, NULL, "chrp,iic");
+        if (!cascade_node)
+                return;
+
+        cascade_irq = irq_of_parse_and_map(cascade_node, 0);
+        if (!cascade_irq) {
+                pr_err("virtex_ml510: Failed to map cascade interrupt\n");
+                goto out;
+        }
+
+        i8259_init(cascade_node, 0);
+        set_irq_chained_handler(cascade_irq, xilinx_i8259_cascade);
+
+        /* Program irq 7 (usb/audio), 14/15 (ide) to level sensitive */
+        /* This looks like a dirty hack to me --gcl */
+        outb(0xc0, 0x4d0);
+        outb(0xc0, 0x4d1);
+
+ out:
+        of_node_put(cascade_node);
+}
+#else
+static inline void xilinx_i8259_setup_cascade(void) { return; }
+#endif /* defined(CONFIG_PPC_I8259) */
+
+static struct of_device_id xilinx_intc_match[] __initconst = {
+        { .compatible = "xlnx,opb-intc-1.00.c", },
+        { .compatible = "xlnx,xps-intc-1.00.a", },
+        {}
+};
+
+/*
+ * Initialize master Xilinx interrupt controller
+ */
 void __init xilinx_intc_init_tree(void)
 {
         struct device_node *np;
 
         /* find top level interrupt controller */
-        for_each_compatible_node(np, NULL, "xlnx,opb-intc-1.00.c") {
+        for_each_matching_node(np, xilinx_intc_match) {
                 if (!of_get_property(np, "interrupts", NULL))
                         break;
         }
-        if (!np) {
-                for_each_compatible_node(np, NULL, "xlnx,xps-intc-1.00.a") {
-                        if (!of_get_property(np, "interrupts", NULL))
-                                break;
-                }
-        }
-
-        /* xilinx interrupt controller needs to be top level */
         BUG_ON(!np);
 
         master_irqhost = xilinx_intc_init(np);
@@ -251,4 +294,6 @@ void __init xilinx_intc_init_tree(void)
 
         irq_set_default_host(master_irqhost);
         of_node_put(np);
+
+        xilinx_i8259_setup_cascade();
 }
diff --git a/arch/powerpc/sysdev/xilinx_pci.c b/arch/powerpc/sysdev/xilinx_pci.c
new file mode 100644
index 000000000000..1453b0eed220
--- /dev/null
+++ b/arch/powerpc/sysdev/xilinx_pci.c
@@ -0,0 +1,132 @@
+/*
+ * PCI support for Xilinx plbv46_pci soft-core which can be used on
+ * Xilinx Virtex ML410 / ML510 boards.
+ *
+ * Copyright 2009 Roderick Colenbrander
+ * Copyright 2009 Secret Lab Technologies Ltd.
+ *
+ * The pci bridge fixup code was copied from ppc4xx_pci.c and was written
+ * by Benjamin Herrenschmidt.
+ * Copyright 2007 Ben. Herrenschmidt <benh@kernel.crashing.org>, IBM Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/ioport.h>
+#include <linux/of.h>
+#include <linux/pci.h>
+#include <mm/mmu_decl.h>
+#include <asm/io.h>
+#include <asm/xilinx_pci.h>
+
+#define XPLB_PCI_ADDR 0x10c
+#define XPLB_PCI_DATA 0x110
+#define XPLB_PCI_BUS  0x114
+
+#define PCI_HOST_ENABLE_CMD PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY
+
+static struct of_device_id xilinx_pci_match[] = {
+        { .compatible = "xlnx,plbv46-pci-1.03.a", },
+        {}
+};
+
+/**
+ * xilinx_pci_fixup_bridge - Block Xilinx PHB configuration.
+ */
+static void xilinx_pci_fixup_bridge(struct pci_dev *dev)
+{
+        struct pci_controller *hose;
+        int i;
+
+        if (dev->devfn || dev->bus->self)
+                return;
+
+        hose = pci_bus_to_host(dev->bus);
+        if (!hose)
+                return;
+
+        if (!of_match_node(xilinx_pci_match, hose->dn))
+                return;
+
+        /* Hide the PCI host BARs from the kernel as their content doesn't
+         * fit well in the resource management
+         */
+        for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                dev->resource[i].start = 0;
+                dev->resource[i].end = 0;
+                dev->resource[i].flags = 0;
+        }
+
+        dev_info(&dev->dev, "Hiding Xilinx plb-pci host bridge resources %s\n",
+                 pci_name(dev));
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, xilinx_pci_fixup_bridge);
+
+/**
+ * xilinx_pci_exclude_device - Don't do config access for non-root bus
+ *
+ * This is a hack.  Config access to any bus other than bus 0 does not
+ * currently work on the ML510 so we prevent it here.
+ */
+static int
+xilinx_pci_exclude_device(struct pci_controller *hose, u_char bus, u8 devfn)
+{
+        return (bus != 0);
+}
+
+/**
+ * xilinx_pci_init - Find and register a Xilinx PCI host bridge
+ */
+void __init xilinx_pci_init(void)
+{
+        struct pci_controller *hose;
+        struct resource r;
+        void __iomem *pci_reg;
+        struct device_node *pci_node;
+
+        pci_node = of_find_matching_node(NULL, xilinx_pci_match);
+        if(!pci_node)
+                return;
+
+        if (of_address_to_resource(pci_node, 0, &r)) {
+                pr_err("xilinx-pci: cannot resolve base address\n");
+                return;
+        }
+
+        hose = pcibios_alloc_controller(pci_node);
+        if (!hose) {
+                pr_err("xilinx-pci: pcibios_alloc_controller() failed\n");
+                return;
+        }
+
+        /* Setup config space */
+        setup_indirect_pci(hose, r.start + XPLB_PCI_ADDR,
+                           r.start + XPLB_PCI_DATA,
+                           PPC_INDIRECT_TYPE_SET_CFG_TYPE);
+
+        /* According to the xilinx plbv46_pci documentation the soft-core starts
+         * a self-init when the bus master enable bit is set. Without this bit
+         * set the pci bus can't be scanned.
+         */
+        early_write_config_word(hose, 0, 0, PCI_COMMAND, PCI_HOST_ENABLE_CMD);
+
+        /* Set the max latency timer to 255 */
+        early_write_config_byte(hose, 0, 0, PCI_LATENCY_TIMER, 0xff);
+
+        /* Set the max bus number to 255 */
+        pci_reg = of_iomap(pci_node, 0);
+        out_8(pci_reg + XPLB_PCI_BUS, 0xff);
+        iounmap(pci_reg);
+
+        /* Nothing past the root bridge is working right now.  By default
+         * exclude config access to anything except bus 0 */
+        if (!ppc_md.pci_exclude_device)
+                ppc_md.pci_exclude_device = xilinx_pci_exclude_device;
+
+        /* Register the host bridge with the linux kernel! */
+        pci_process_bridge_OF_ranges(hose, pci_node, 1);
+
+        pr_info("xilinx-pci: Registered PCI host bridge\n");
+}
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 8dfad7d9a004..e1f33a81e5e1 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -110,6 +110,7 @@ static int bsesc(void);
 static void dump(void);
 static void prdump(unsigned long, long);
 static int ppc_inst_dump(unsigned long, long, int);
+static void dump_log_buf(void);
 static void backtrace(struct pt_regs *);
 static void excprint(struct pt_regs *);
 static void prregs(struct pt_regs *);
@@ -197,6 +198,7 @@ Commands:\n\
   di    dump instructions\n\
   df    dump float values\n\
   dd    dump double values\n\
+  dl    dump the kernel log buffer\n\
   dr    dump stream of raw bytes\n\
   e     print exception information\n\
   f     flush cache\n\
@@ -2009,6 +2011,8 @@ dump(void)
                         nidump = MAX_DUMP;
                 adrs += ppc_inst_dump(adrs, nidump, 1);
                 last_cmd = "di\n";
+        } else if (c == 'l') {
+                dump_log_buf();
         } else if (c == 'r') {
                 scanhex(&ndump);
                 if (ndump == 0)
@@ -2122,6 +2126,49 @@ print_address(unsigned long addr)
         xmon_print_symbol(addr, "\t# ", "");
 }
 
+void
+dump_log_buf(void)
+{
+        const unsigned long size = 128;
+        unsigned long end, addr;
+        unsigned char buf[size + 1];
+
+        addr = 0;
+        buf[size] = '\0';
+
+        if (setjmp(bus_error_jmp) != 0) {
+                printf("Unable to lookup symbol __log_buf!\n");
+                return;
+        }
+
+        catch_memory_errors = 1;
+        sync();
+        addr = kallsyms_lookup_name("__log_buf");
+
+        if (! addr)
+                printf("Symbol __log_buf not found!\n");
+        else {
+                end = addr + (1 << CONFIG_LOG_BUF_SHIFT);
+                while (addr < end) {
+                        if (! mread(addr, buf, size)) {
+                                printf("Can't read memory at address 0x%lx\n", addr);
+                                break;
+                        }
+
+                        printf("%s", buf);
+
+                        if (strlen(buf) < size)
+                                break;
+
+                        addr += size;
+                }
+        }
+
+        sync();
+        /* wait a little while to see if we get a machine check */
+        __delay(200);
+        catch_memory_errors = 0;
+}
 
 /*
  * Memory operations - move, set, print differences
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 99dc3ded6b49..a14dba0e4d67 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -348,6 +348,9 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
 config ARCH_ENABLE_MEMORY_HOTREMOVE
         def_bool y
 
+config ARCH_HIBERNATION_POSSIBLE
+       def_bool y if 64BIT
+
 source "mm/Kconfig"
 
 comment "I/O subsystem configuration"
@@ -592,6 +595,12 @@ config SECCOMP
 
 endmenu
 
+menu "Power Management"
+
+source "kernel/power/Kconfig"
+
+endmenu
+
 source "net/Kconfig"
 
 config PCMCIA
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 578c61f15a4b..0ff387cebf88 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -88,7 +88,9 @@ LDFLAGS_vmlinux := -e start
 head-y          := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
 
 core-y          += arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \
-                   arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/
+                   arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/ \
+                   arch/s390/power/
+
 libs-y          += arch/s390/lib/
 drivers-y       += drivers/s390/
 drivers-$(CONFIG_MATHEMU) += arch/s390/math-emu/
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 1dfc7100c7ee..264528e4f58d 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -5,7 +5,7 @@
  * Exports appldata_register_ops() and appldata_unregister_ops() for the
  * data gathering modules.
  *
- * Copyright IBM Corp. 2003, 2008
+ * Copyright IBM Corp. 2003, 2009
  *
  * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
  */
@@ -26,6 +26,8 @@
 #include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/workqueue.h>
+#include <linux/suspend.h>
+#include <linux/platform_device.h>
 #include <asm/appldata.h>
 #include <asm/timer.h>
 #include <asm/uaccess.h>
@@ -41,6 +43,9 @@
 
 #define TOD_MICRO       0x01000                 /* nr. of TOD clock units
                                                    for 1 microsecond */
+
+static struct platform_device *appldata_pdev;
+
 /*
  * /proc entries (sysctl)
  */
@@ -86,6 +91,7 @@ static atomic_t appldata_expire_count = ATOMIC_INIT(0);
 static DEFINE_SPINLOCK(appldata_timer_lock);
 static int appldata_interval = APPLDATA_CPU_INTERVAL;
 static int appldata_timer_active;
+static int appldata_timer_suspended = 0;
 
 /*
  * Work queue
@@ -475,6 +481,93 @@ void appldata_unregister_ops(struct appldata_ops *ops)
 /********************** module-ops management <END> **************************/
 
 
+/**************************** suspend / resume *******************************/
+static int appldata_freeze(struct device *dev)
+{
+        struct appldata_ops *ops;
+        int rc;
+        struct list_head *lh;
+
+        get_online_cpus();
+        spin_lock(&appldata_timer_lock);
+        if (appldata_timer_active) {
+                __appldata_vtimer_setup(APPLDATA_DEL_TIMER);
+                appldata_timer_suspended = 1;
+        }
+        spin_unlock(&appldata_timer_lock);
+        put_online_cpus();
+
+        mutex_lock(&appldata_ops_mutex);
+        list_for_each(lh, &appldata_ops_list) {
+                ops = list_entry(lh, struct appldata_ops, list);
+                if (ops->active == 1) {
+                        rc = appldata_diag(ops->record_nr, APPLDATA_STOP_REC,
+                                        (unsigned long) ops->data, ops->size,
+                                        ops->mod_lvl);
+                        if (rc != 0)
+                                pr_err("Stopping the data collection for %s "
+                                       "failed with rc=%d\n", ops->name, rc);
+                }
+        }
+        mutex_unlock(&appldata_ops_mutex);
+        return 0;
+}
+
+static int appldata_restore(struct device *dev)
+{
+        struct appldata_ops *ops;
+        int rc;
+        struct list_head *lh;
+
+        get_online_cpus();
+        spin_lock(&appldata_timer_lock);
+        if (appldata_timer_suspended) {
+                __appldata_vtimer_setup(APPLDATA_ADD_TIMER);
+                appldata_timer_suspended = 0;
+        }
+        spin_unlock(&appldata_timer_lock);
+        put_online_cpus();
+
+        mutex_lock(&appldata_ops_mutex);
+        list_for_each(lh, &appldata_ops_list) {
+                ops = list_entry(lh, struct appldata_ops, list);
+                if (ops->active == 1) {
+                        ops->callback(ops->data);       // init record
+                        rc = appldata_diag(ops->record_nr,
+                                        APPLDATA_START_INTERVAL_REC,
+                                        (unsigned long) ops->data, ops->size,
+                                        ops->mod_lvl);
+                        if (rc != 0) {
+                                pr_err("Starting the data collection for %s "
+                                       "failed with rc=%d\n", ops->name, rc);
+                        }
+                }
+        }
+        mutex_unlock(&appldata_ops_mutex);
+        return 0;
+}
+
+static int appldata_thaw(struct device *dev)
+{
+        return appldata_restore(dev);
+}
+
+static struct dev_pm_ops appldata_pm_ops = {
+        .freeze         = appldata_freeze,
+        .thaw           = appldata_thaw,
+        .restore        = appldata_restore,
+};
+
+static struct platform_driver appldata_pdrv = {
+        .driver = {
+                .name   = "appldata",
+                .owner  = THIS_MODULE,
+                .pm     = &appldata_pm_ops,
+        },
+};
+/************************* suspend / resume <END> ****************************/
+
+
 /******************************* init / exit *********************************/
 
 static void __cpuinit appldata_online_cpu(int cpu)
@@ -531,11 +624,23 @@ static struct notifier_block __cpuinitdata appldata_nb = {
  */
 static int __init appldata_init(void)
 {
-        int i;
+        int i, rc;
+
+        rc = platform_driver_register(&appldata_pdrv);
+        if (rc)
+                return rc;
 
+        appldata_pdev = platform_device_register_simple("appldata", -1, NULL,
+                                                        0);
+        if (IS_ERR(appldata_pdev)) {
+                rc = PTR_ERR(appldata_pdev);
+                goto out_driver;
+        }
         appldata_wq = create_singlethread_workqueue("appldata");
-        if (!appldata_wq)
-                return -ENOMEM;
+        if (!appldata_wq) {
+                rc = -ENOMEM;
+                goto out_device;
+        }
 
         get_online_cpus();
         for_each_online_cpu(i)
@@ -547,6 +652,12 @@ static int __init appldata_init(void)
 
         appldata_sysctl_header = register_sysctl_table(appldata_dir_table);
         return 0;
+
+out_device:
+        platform_device_unregister(appldata_pdev);
+out_driver:
+        platform_driver_unregister(&appldata_pdrv);
+        return rc;
 }
 
 __initcall(appldata_init);
diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h
index ba007d8df941..2a5419551176 100644
--- a/arch/s390/include/asm/ccwdev.h
+++ b/arch/s390/include/asm/ccwdev.h
@@ -1,11 +1,9 @@
 /*
- *  include/asm-s390/ccwdev.h
- *  include/asm-s390x/ccwdev.h
+ * Copyright  IBM Corp. 2002, 2009
  *
- *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Arnd Bergmann <arndb@de.ibm.com>
+ * Author(s): Arnd Bergmann <arndb@de.ibm.com>
  *
- *  Interface for CCW device drivers
+ * Interface for CCW device drivers
  */
 #ifndef _S390_CCWDEV_H_
 #define _S390_CCWDEV_H_
@@ -104,6 +102,11 @@ struct ccw_device {
  * @set_offline: called when setting device offline
  * @notify: notify driver of device state changes
  * @shutdown: called at device shutdown
+ * @prepare: prepare for pm state transition
+ * @complete: undo work done in @prepare
+ * @freeze: callback for freezing during hibernation snapshotting
+ * @thaw: undo work done in @freeze
+ * @restore: callback for restoring after hibernation
  * @driver: embedded device driver structure
  * @name: device driver name
  */
@@ -116,6 +119,11 @@ struct ccw_driver {
         int (*set_offline) (struct ccw_device *);
         int (*notify) (struct ccw_device *, int);
         void (*shutdown) (struct ccw_device *);
+        int (*prepare) (struct ccw_device *);
+        void (*complete) (struct ccw_device *);
+        int (*freeze)(struct ccw_device *);
+        int (*thaw) (struct ccw_device *);
+        int (*restore)(struct ccw_device *);
         struct device_driver driver;
         char *name;
 };
@@ -184,6 +192,7 @@ extern void ccw_device_get_id(struct ccw_device *, struct ccw_dev_id *);
 #define to_ccwdrv(n) container_of(n, struct ccw_driver, driver)
 
 extern struct ccw_device *ccw_device_probe_console(void);
+extern int ccw_device_force_console(void);
 
 // FIXME: these have to go
 extern int _ccw_device_get_subchannel_number(struct ccw_device *);
diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h
index a27f68985a79..c79c1e787b86 100644
--- a/arch/s390/include/asm/ccwgroup.h
+++ b/arch/s390/include/asm/ccwgroup.h
@@ -38,6 +38,11 @@ struct ccwgroup_device {
  * @set_online: function called when device is set online
  * @set_offline: function called when device is set offline
  * @shutdown: function called when device is shut down
+ * @prepare: prepare for pm state transition
+ * @complete: undo work done in @prepare
+ * @freeze: callback for freezing during hibernation snapshotting
+ * @thaw: undo work done in @freeze
+ * @restore: callback for restoring after hibernation
  * @driver: embedded driver structure
  */
 struct ccwgroup_driver {
@@ -51,6 +56,11 @@ struct ccwgroup_driver {
         int (*set_online) (struct ccwgroup_device *);
         int (*set_offline) (struct ccwgroup_device *);
         void (*shutdown)(struct ccwgroup_device *);
+        int (*prepare) (struct ccwgroup_device *);
+        void (*complete) (struct ccwgroup_device *);
+        int (*freeze)(struct ccwgroup_device *);
+        int (*thaw) (struct ccwgroup_device *);
+        int (*restore)(struct ccwgroup_device *);
 
         struct device_driver driver;
 };
diff --git a/arch/s390/include/asm/suspend.h b/arch/s390/include/asm/suspend.h
new file mode 100644
index 000000000000..dc75c616eafe
--- /dev/null
+++ b/arch/s390/include/asm/suspend.h
@@ -0,0 +1,10 @@
+#ifndef __ASM_S390_SUSPEND_H
+#define __ASM_S390_SUSPEND_H
+
+static inline int arch_prepare_suspend(void)
+{
+        return 0;
+}
+
+#endif
+
diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
index 3a8b26eb1f2e..4fb83c1cdb77 100644
--- a/arch/s390/include/asm/system.h
+++ b/arch/s390/include/asm/system.h
@@ -1,11 +1,7 @@
 /*
- *  include/asm-s390/system.h
+ * Copyright IBM Corp. 1999, 2009
  *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- *
- *  Derived from "include/asm-i386/system.h"
+ * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
  */
 
 #ifndef __ASM_SYSTEM_H
@@ -469,6 +465,20 @@ extern psw_t sysc_restore_trace_psw;
 extern psw_t io_restore_trace_psw;
 #endif
 
+static inline int tprot(unsigned long addr)
+{
+        int rc = -EFAULT;
+
+        asm volatile(
+                "       tprot   0(%1),0\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "1:\n"
+                EX_TABLE(0b,1b)
+                : "+d" (rc) : "a" (addr) : "cc");
+        return rc;
+}
+
 #endif /* __KERNEL__ */
 
 #endif
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index fb263736826c..f9b144049dc9 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -1,7 +1,7 @@
 /*
  *  arch/s390/kernel/early.c
  *
- *    Copyright IBM Corp. 2007
+ *    Copyright IBM Corp. 2007, 2009
  *    Author(s): Hongjie Yang <hongjie@us.ibm.com>,
  *               Heiko Carstens <heiko.carstens@de.ibm.com>
  */
@@ -210,7 +210,7 @@ static noinline __init void detect_machine_type(void)
                 machine_flags |= MACHINE_FLAG_VM;
 }
 
-static __init void early_pgm_check_handler(void)
+static void early_pgm_check_handler(void)
 {
         unsigned long addr;
         const struct exception_table_entry *fixup;
@@ -222,7 +222,7 @@ static __init void early_pgm_check_handler(void)
         S390_lowcore.program_old_psw.addr = fixup->fixup | PSW_ADDR_AMODE;
 }
 
-static noinline __init void setup_lowcore_early(void)
+void setup_lowcore_early(void)
 {
         psw_t psw;
 
diff --git a/arch/s390/kernel/mem_detect.c b/arch/s390/kernel/mem_detect.c
index 9872999c66d1..559af0d07878 100644
--- a/arch/s390/kernel/mem_detect.c
+++ b/arch/s390/kernel/mem_detect.c
@@ -1,6 +1,7 @@
 /*
- *    Copyright IBM Corp. 2008
- *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
+ * Copyright IBM Corp. 2008, 2009
+ *
+ * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
  */
 
 #include <linux/kernel.h>
@@ -9,20 +10,6 @@
 #include <asm/sclp.h>
 #include <asm/setup.h>
 
-static inline int tprot(unsigned long addr)
-{
-        int rc = -EFAULT;
-
-        asm volatile(
-                "       tprot   0(%1),0\n"
-                "0:     ipm     %0\n"
-                "       srl     %0,28\n"
-                "1:\n"
-                EX_TABLE(0b,1b)
-                : "+d" (rc) : "a" (addr) : "cc");
-        return rc;
-}
-
 #define ADDR2G (1ULL << 31)
 
 static void find_memory_chunks(struct mem_chunk chunk[])
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index cc8c484984e3..fd8e3111a4e8 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -1,7 +1,7 @@
 /*
  *  arch/s390/kernel/smp.c
  *
- *    Copyright IBM Corp. 1999,2007
+ *    Copyright IBM Corp. 1999, 2009
  *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com),
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
  *               Heiko Carstens (heiko.carstens@de.ibm.com)
@@ -1031,6 +1031,42 @@ out:
 static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show,
                          dispatching_store);
 
+/*
+ * If the resume kernel runs on another cpu than the suspended kernel,
+ * we have to switch the cpu IDs in the logical map.
+ */
+void smp_switch_boot_cpu_in_resume(u32 resume_phys_cpu_id,
+                                   struct _lowcore *suspend_lowcore)
+{
+        int cpu, suspend_cpu_id, resume_cpu_id;
+        u32 suspend_phys_cpu_id;
+
+        suspend_phys_cpu_id = __cpu_logical_map[suspend_lowcore->cpu_nr];
+        suspend_cpu_id = suspend_lowcore->cpu_nr;
+
+        for_each_present_cpu(cpu) {
+                if (__cpu_logical_map[cpu] == resume_phys_cpu_id) {
+                        resume_cpu_id = cpu;
+                        goto found;
+                }
+        }
+        panic("Could not find resume cpu in logical map.\n");
+
+found:
+        printk("Resume  cpu ID: %i/%i\n", resume_phys_cpu_id, resume_cpu_id);
+        printk("Suspend cpu ID: %i/%i\n", suspend_phys_cpu_id, suspend_cpu_id);
+
+        __cpu_logical_map[resume_cpu_id] = suspend_phys_cpu_id;
+        __cpu_logical_map[suspend_cpu_id] = resume_phys_cpu_id;
+
+        lowcore_ptr[suspend_cpu_id]->cpu_addr = resume_phys_cpu_id;
+}
+
+u32 smp_get_phys_cpu_id(void)
+{
+        return __cpu_logical_map[smp_processor_id()];
+}
+
 static int __init topology_init(void)
 {
         int cpu;
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 4ca8e826bf30..565667207985 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -313,3 +313,22 @@ int s390_enable_sie(void)
         return 0;
 }
 EXPORT_SYMBOL_GPL(s390_enable_sie);
+
+#ifdef CONFIG_DEBUG_PAGEALLOC
+#ifdef CONFIG_HIBERNATION
+bool kernel_page_present(struct page *page)
+{
+        unsigned long addr;
+        int cc;
+
+        addr = page_to_phys(page);
+        asm("lra %1,0(%1)\n"
+            "ipm %0\n"
+            "srl %0,28"
+            :"=d"(cc),"+a"(addr)::"cc");
+        return cc == 0;
+}
+
+#endif /* CONFIG_HIBERNATION */
+#endif /* CONFIG_DEBUG_PAGEALLOC */
+
diff --git a/arch/s390/power/Makefile b/arch/s390/power/Makefile
new file mode 100644
index 000000000000..973bb45a8fec
--- /dev/null
+++ b/arch/s390/power/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for s390 PM support
+#
+
+obj-$(CONFIG_HIBERNATION) += suspend.o
+obj-$(CONFIG_HIBERNATION) += swsusp.o
+obj-$(CONFIG_HIBERNATION) += swsusp_64.o
+obj-$(CONFIG_HIBERNATION) += swsusp_asm64.o
diff --git a/arch/s390/power/suspend.c b/arch/s390/power/suspend.c
new file mode 100644
index 000000000000..b3351eceebbe
--- /dev/null
+++ b/arch/s390/power/suspend.c
@@ -0,0 +1,40 @@
+/*
+ * Suspend support specific for s390.
+ *
+ * Copyright IBM Corp. 2009
+ *
+ * Author(s): Hans-Joachim Picht <hans@linux.vnet.ibm.com>
+ */
+
+#include <linux/mm.h>
+#include <linux/suspend.h>
+#include <linux/reboot.h>
+#include <linux/pfn.h>
+#include <asm/sections.h>
+#include <asm/ipl.h>
+
+/*
+ * References to section boundaries
+ */
+extern const void __nosave_begin, __nosave_end;
+
+/*
+ *  check if given pfn is in the 'nosave' or in the read only NSS section
+ */
+int pfn_is_nosave(unsigned long pfn)
+{
+        unsigned long nosave_begin_pfn = __pa(&__nosave_begin) >> PAGE_SHIFT;
+        unsigned long nosave_end_pfn = PAGE_ALIGN(__pa(&__nosave_end))
+                                        >> PAGE_SHIFT;
+        unsigned long eshared_pfn = PFN_DOWN(__pa(&_eshared)) - 1;
+        unsigned long stext_pfn = PFN_DOWN(__pa(&_stext));
+
+        if (pfn >= nosave_begin_pfn && pfn < nosave_end_pfn)
+                return 1;
+        if (pfn >= stext_pfn && pfn <= eshared_pfn) {
+                if (ipl_info.type == IPL_TYPE_NSS)
+                        return 1;
+        } else if ((tprot(pfn * PAGE_SIZE) && pfn > 0))
+                return 1;
+        return 0;
+}
diff --git a/arch/s390/power/swsusp.c b/arch/s390/power/swsusp.c
new file mode 100644
index 000000000000..e6a4fe9f5f24
--- /dev/null
+++ b/arch/s390/power/swsusp.c
@@ -0,0 +1,30 @@
+/*
+ * Support for suspend and resume on s390
+ *
+ * Copyright IBM Corp. 2009
+ *
+ * Author(s): Hans-Joachim Picht <hans@linux.vnet.ibm.com>
+ *
+ */
+
+
+/*
+ * save CPU registers before creating a hibernation image and before
+ * restoring the memory state from it
+ */
+void save_processor_state(void)
+{
+        /* implentation contained in the
+         * swsusp_arch_suspend function
+         */
+}
+
+/*
+ * restore the contents of CPU registers
+ */
+void restore_processor_state(void)
+{
+        /* implentation contained in the
+         * swsusp_arch_resume function
+         */
+}
diff --git a/arch/s390/power/swsusp_64.c b/arch/s390/power/swsusp_64.c
new file mode 100644
index 000000000000..9516a517d72f
--- /dev/null
+++ b/arch/s390/power/swsusp_64.c
@@ -0,0 +1,17 @@
+/*
+ * Support for suspend and resume on s390
+ *
+ * Copyright IBM Corp. 2009
+ *
+ * Author(s): Hans-Joachim Picht <hans@linux.vnet.ibm.com>
+ *
+ */
+
+#include <asm/system.h>
+#include <linux/interrupt.h>
+
+void do_after_copyback(void)
+{
+        mb();
+}
+
diff --git a/arch/s390/power/swsusp_asm64.S b/arch/s390/power/swsusp_asm64.S
new file mode 100644
index 000000000000..3c74e7d827c9
--- /dev/null
+++ b/arch/s390/power/swsusp_asm64.S
@@ -0,0 +1,199 @@
+/*
+ * S390 64-bit swsusp implementation
+ *
+ * Copyright IBM Corp. 2009
+ *
+ * Author(s): Hans-Joachim Picht <hans@linux.vnet.ibm.com>
+ *            Michael Holzheu <holzheu@linux.vnet.ibm.com>
+ */
+
+#include <asm/page.h>
+#include <asm/ptrace.h>
+#include <asm/asm-offsets.h>
+
+/*
+ * Save register context in absolute 0 lowcore and call swsusp_save() to
+ * create in-memory kernel image. The context is saved in the designated
+ * "store status" memory locations (see POP).
+ * We return from this function twice. The first time during the suspend to
+ * disk process. The second time via the swsusp_arch_resume() function
+ * (see below) in the resume process.
+ * This function runs with disabled interrupts.
+ */
+        .section .text
+        .align  2
+        .globl swsusp_arch_suspend
+swsusp_arch_suspend:
+        stmg    %r6,%r15,__SF_GPRS(%r15)
+        lgr     %r1,%r15
+        aghi    %r15,-STACK_FRAME_OVERHEAD
+        stg     %r1,__SF_BACKCHAIN(%r15)
+
+        /* Deactivate DAT */
+        stnsm   __SF_EMPTY(%r15),0xfb
+
+        /* Switch off lowcore protection */
+        stctg   %c0,%c0,__SF_EMPTY(%r15)
+        ni      __SF_EMPTY+4(%r15),0xef
+        lctlg   %c0,%c0,__SF_EMPTY(%r15)
+
+        /* Store prefix register on stack */
+        stpx    __SF_EMPTY(%r15)
+
+        /* Setup base register for lowcore (absolute 0) */
+        llgf    %r1,__SF_EMPTY(%r15)
+
+        /* Get pointer to save area */
+        aghi    %r1,0x1000
+
+        /* Store registers */
+        mvc     0x318(4,%r1),__SF_EMPTY(%r15)   /* move prefix to lowcore */
+        stfpc   0x31c(%r1)                      /* store fpu control */
+        std     0,0x200(%r1)                    /* store f0 */
+        std     1,0x208(%r1)                    /* store f1 */
+        std     2,0x210(%r1)                    /* store f2 */
+        std     3,0x218(%r1)                    /* store f3 */
+        std     4,0x220(%r1)                    /* store f4 */
+        std     5,0x228(%r1)                    /* store f5 */
+        std     6,0x230(%r1)                    /* store f6 */
+        std     7,0x238(%r1)                    /* store f7 */
+        std     8,0x240(%r1)                    /* store f8 */
+        std     9,0x248(%r1)                    /* store f9 */
+        std     10,0x250(%r1)                   /* store f10 */
+        std     11,0x258(%r1)                   /* store f11 */
+        std     12,0x260(%r1)                   /* store f12 */
+        std     13,0x268(%r1)                   /* store f13 */
+        std     14,0x270(%r1)                   /* store f14 */
+        std     15,0x278(%r1)                   /* store f15 */
+        stam    %a0,%a15,0x340(%r1)             /* store access registers */
+        stctg   %c0,%c15,0x380(%r1)             /* store control registers */
+        stmg    %r0,%r15,0x280(%r1)             /* store general registers */
+
+        stpt    0x328(%r1)                      /* store timer */
+        stckc   0x330(%r1)                      /* store clock comparator */
+
+        /* Activate DAT */
+        stosm   __SF_EMPTY(%r15),0x04
+
+        /* Set prefix page to zero */
+        xc      __SF_EMPTY(4,%r15),__SF_EMPTY(%r15)
+        spx     __SF_EMPTY(%r15)
+
+        /* Setup lowcore */
+        brasl   %r14,setup_lowcore_early
+
+        /* Save image */
+        brasl   %r14,swsusp_save
+
+        /* Switch on lowcore protection */
+        stctg   %c0,%c0,__SF_EMPTY(%r15)
+        oi      __SF_EMPTY+4(%r15),0x10
+        lctlg   %c0,%c0,__SF_EMPTY(%r15)
+
+        /* Restore prefix register and return */
+        lghi    %r1,0x1000
+        spx     0x318(%r1)
+        lmg     %r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)
+        lghi    %r2,0
+        br      %r14
+
+/*
+ * Restore saved memory image to correct place and restore register context.
+ * Then we return to the function that called swsusp_arch_suspend().
+ * swsusp_arch_resume() runs with disabled interrupts.
+ */
+        .globl swsusp_arch_resume
+swsusp_arch_resume:
+        stmg    %r6,%r15,__SF_GPRS(%r15)
+        lgr     %r1,%r15
+        aghi    %r15,-STACK_FRAME_OVERHEAD
+        stg     %r1,__SF_BACKCHAIN(%r15)
+
+        /* Save boot cpu number */
+        brasl   %r14,smp_get_phys_cpu_id
+        lgr     %r10,%r2
+
+        /* Deactivate DAT */
+        stnsm   __SF_EMPTY(%r15),0xfb
+
+        /* Switch off lowcore protection */
+        stctg   %c0,%c0,__SF_EMPTY(%r15)
+        ni      __SF_EMPTY+4(%r15),0xef
+        lctlg   %c0,%c0,__SF_EMPTY(%r15)
+
+        /* Set prefix page to zero */
+        xc      __SF_EMPTY(4,%r15),__SF_EMPTY(%r15)
+        spx     __SF_EMPTY(%r15)
+
+        /* Restore saved image */
+        larl    %r1,restore_pblist
+        lg      %r1,0(%r1)
+        ltgr    %r1,%r1
+        jz      2f
+0:
+        lg      %r2,8(%r1)
+        lg      %r4,0(%r1)
+        lghi    %r3,PAGE_SIZE
+        lghi    %r5,PAGE_SIZE
+1:
+        mvcle   %r2,%r4,0
+        jo      1b
+        lg      %r1,16(%r1)
+        ltgr    %r1,%r1
+        jnz     0b
+2:
+        ptlb                            /* flush tlb */
+
+        /* Restore registers */
+        lghi    %r13,0x1000             /* %r1 = pointer to save arae */
+
+        spt     0x328(%r13)             /* reprogram timer */
+        //sckc  0x330(%r13)             /* set clock comparator */
+
+        lctlg   %c0,%c15,0x380(%r13)    /* load control registers */
+        lam     %a0,%a15,0x340(%r13)    /* load access registers */
+
+        lfpc    0x31c(%r13)             /* load fpu control */
+        ld      0,0x200(%r13)           /* load f0 */
+        ld      1,0x208(%r13)           /* load f1 */
+        ld      2,0x210(%r13)           /* load f2 */
+        ld      3,0x218(%r13)           /* load f3 */
+        ld      4,0x220(%r13)           /* load f4 */
+        ld      5,0x228(%r13)           /* load f5 */
+        ld      6,0x230(%r13)           /* load f6 */
+        ld      7,0x238(%r13)           /* load f7 */
+        ld      8,0x240(%r13)           /* load f8 */
+        ld      9,0x248(%r13)           /* load f9 */
+        ld      10,0x250(%r13)          /* load f10 */
+        ld      11,0x258(%r13)          /* load f11 */
+        ld      12,0x260(%r13)          /* load f12 */
+        ld      13,0x268(%r13)          /* load f13 */
+        ld      14,0x270(%r13)          /* load f14 */
+        ld      15,0x278(%r13)          /* load f15 */
+
+        /* Load old stack */
+        lg      %r15,0x2f8(%r13)
+
+        /* Pointer to save arae */
+        lghi    %r13,0x1000
+
+        /* Switch CPUs */
+        lgr     %r2,%r10                /* get cpu id */
+        llgf    %r3,0x318(%r13)
+        brasl   %r14,smp_switch_boot_cpu_in_resume
+
+        /* Restore prefix register */
+        spx     0x318(%r13)
+
+        /* Switch on lowcore protection */
+        stctg   %c0,%c0,__SF_EMPTY(%r15)
+        oi      __SF_EMPTY+4(%r15),0x10
+        lctlg   %c0,%c0,__SF_EMPTY(%r15)
+
+        /* Activate DAT */
+        stosm   __SF_EMPTY(%r15),0x04
+
+        /* Return 0 */
+        lmg     %r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)
+        lghi    %r2,0
+        br      %r14
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index cc12cd48bbc5..3f8b6a92eabd 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -37,6 +37,8 @@ config SPARC64
         select HAVE_KPROBES
         select HAVE_LMB
         select HAVE_SYSCALL_WRAPPERS
+        select HAVE_DYNAMIC_FTRACE
+        select HAVE_FTRACE_MCOUNT_RECORD
         select USE_GENERIC_SMP_HELPERS if SMP
         select RTC_DRV_CMOS
         select RTC_DRV_BQ4802
@@ -93,6 +95,9 @@ config AUDIT_ARCH
 config HAVE_SETUP_PER_CPU_AREA
         def_bool y if SPARC64
 
+config HAVE_DYNAMIC_PER_CPU_AREA
+        def_bool y if SPARC64
+
 config GENERIC_HARDIRQS_NO__DO_IRQ
         bool
         def_bool y if SPARC64
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig
index b5d63bd8716e..0123a4c596ce 100644
--- a/arch/sparc/configs/sparc64_defconfig
+++ b/arch/sparc/configs/sparc64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30-rc2
-# Fri Apr 17 02:03:07 2009
+# Linux kernel version: 2.6.30
+# Tue Jun 16 04:59:36 2009
 #
 CONFIG_64BIT=y
 CONFIG_SPARC=y
@@ -19,6 +19,7 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_MMU=y
 CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -82,7 +83,6 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -95,16 +95,21 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+
+#
+# Performance Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
-# CONFIG_MARKERS is not set
+CONFIG_MARKERS=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
@@ -202,6 +207,7 @@ CONFIG_NR_QUICK=1
 CONFIG_UNEVICTABLE_LRU=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=8192
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_PREEMPT_NONE is not set
@@ -321,6 +327,7 @@ CONFIG_VLAN_8021Q=m
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_DCB is not set
 
@@ -340,7 +347,11 @@ CONFIG_WIRELESS=y
 CONFIG_WIRELESS_OLD_REGULATORY=y
 # CONFIG_WIRELESS_EXT is not set
 # CONFIG_LIB80211 is not set
-# CONFIG_MAC80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
@@ -364,6 +375,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_CONNECTOR=m
 # CONFIG_MTD is not set
 CONFIG_OF_DEVICE=y
+CONFIG_OF_MDIO=m
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
@@ -399,6 +411,7 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
 CONFIG_HAVE_IDE=y
 CONFIG_IDE=y
 
@@ -477,10 +490,6 @@ CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 # CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
@@ -499,6 +508,7 @@ CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_ACARD is not set
@@ -507,6 +517,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
@@ -521,7 +532,6 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
@@ -569,7 +579,6 @@ CONFIG_DM_ZERO=m
 # CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
 CONFIG_NETDEVICES=y
-CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -635,6 +644,7 @@ CONFIG_NET_PCI=y
 # CONFIG_SMSC9420 is not set
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
+# CONFIG_KS8842 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
 # CONFIG_ATL2 is not set
@@ -1127,6 +1137,11 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_RAWMIDI_SEQ=m
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
@@ -1153,6 +1168,7 @@ CONFIG_SND_ALI5451=m
 # CONFIG_SND_OXYGEN is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CTXFI is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_LAYLA20 is not set
@@ -1183,6 +1199,7 @@ CONFIG_SND_ALI5451=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
 # CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LX6464ES is not set
 # CONFIG_SND_MAESTRO3 is not set
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_NM256 is not set
@@ -1229,6 +1246,7 @@ CONFIG_HID_BELKIN=y
 CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
 CONFIG_HID_CYPRESS=y
+CONFIG_HID_DRAGONRISE=y
 # CONFIG_DRAGONRISE_FF is not set
 CONFIG_HID_EZKEY=y
 CONFIG_HID_KYE=y
@@ -1246,9 +1264,14 @@ CONFIG_HID_PETALYNX=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 CONFIG_HID_SUNPLUS=y
+CONFIG_HID_GREENASIA=y
 # CONFIG_GREENASIA_FF is not set
+CONFIG_HID_SMARTJOYPLUS=y
+# CONFIG_SMARTJOYPLUS_FF is not set
 CONFIG_HID_TOPSEED=y
+CONFIG_HID_THRUSTMASTER=y
 # CONFIG_THRUSTMASTER_FF is not set
+CONFIG_HID_ZEROPLUS=y
 # CONFIG_ZEROPLUS_FF is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1462,6 +1485,7 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
+CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -1636,25 +1660,28 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-
-#
-# Tracers
-#
+CONFIG_FTRACE=y
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_EVENT_TRACER is not set
 # CONFIG_BOOT_TRACER is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_KMEMTRACE is not set
 # CONFIG_WORKQUEUE_TRACER is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
index a11b89ee9ef8..926397d345ff 100644
--- a/arch/sparc/include/asm/cpudata_64.h
+++ b/arch/sparc/include/asm/cpudata_64.h
@@ -6,9 +6,6 @@
 #ifndef _SPARC64_CPUDATA_H
 #define _SPARC64_CPUDATA_H
 
-#include <asm/hypervisor.h>
-#include <asm/asi.h>
-
 #ifndef __ASSEMBLY__
 
 #include <linux/percpu.h>
@@ -38,202 +35,10 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
 #define cpu_data(__cpu)         per_cpu(__cpu_data, (__cpu))
 #define local_cpu_data()        __get_cpu_var(__cpu_data)
 
-/* Trap handling code needs to get at a few critical values upon
- * trap entry and to process TSB misses.  These cannot be in the
- * per_cpu() area as we really need to lock them into the TLB and
- * thus make them part of the main kernel image.  As a result we
- * try to make this as small as possible.
- *
- * This is padded out and aligned to 64-bytes to avoid false sharing
- * on SMP.
- */
-
-/* If you modify the size of this structure, please update
- * TRAP_BLOCK_SZ_SHIFT below.
- */
-struct thread_info;
-struct trap_per_cpu {
-/* D-cache line 1: Basic thread information, cpu and device mondo queues */
-        struct thread_info      *thread;
-        unsigned long           pgd_paddr;
-        unsigned long           cpu_mondo_pa;
-        unsigned long           dev_mondo_pa;
-
-/* D-cache line 2: Error Mondo Queue and kernel buffer pointers */
-        unsigned long           resum_mondo_pa;
-        unsigned long           resum_kernel_buf_pa;
-        unsigned long           nonresum_mondo_pa;
-        unsigned long           nonresum_kernel_buf_pa;
-
-/* Dcache lines 3, 4, 5, and 6: Hypervisor Fault Status */
-        struct hv_fault_status  fault_info;
-
-/* Dcache line 7: Physical addresses of CPU send mondo block and CPU list.  */
-        unsigned long           cpu_mondo_block_pa;
-        unsigned long           cpu_list_pa;
-        unsigned long           tsb_huge;
-        unsigned long           tsb_huge_temp;
-
-/* Dcache line 8: IRQ work list, and keep trap_block a power-of-2 in size.  */
-        unsigned long           irq_worklist_pa;
-        unsigned int            cpu_mondo_qmask;
-        unsigned int            dev_mondo_qmask;
-        unsigned int            resum_qmask;
-        unsigned int            nonresum_qmask;
-        void                    *hdesc;
-} __attribute__((aligned(64)));
-extern struct trap_per_cpu trap_block[NR_CPUS];
-extern void init_cur_cpu_trap(struct thread_info *);
-extern void setup_tba(void);
-extern int ncpus_probed;
 extern const struct seq_operations cpuinfo_op;
 
-extern unsigned long real_hard_smp_processor_id(void);
-
-struct cpuid_patch_entry {
-        unsigned int    addr;
-        unsigned int    cheetah_safari[4];
-        unsigned int    cheetah_jbus[4];
-        unsigned int    starfire[4];
-        unsigned int    sun4v[4];
-};
-extern struct cpuid_patch_entry __cpuid_patch, __cpuid_patch_end;
-
-struct sun4v_1insn_patch_entry {
-        unsigned int    addr;
-        unsigned int    insn;
-};
-extern struct sun4v_1insn_patch_entry __sun4v_1insn_patch,
-        __sun4v_1insn_patch_end;
-
-struct sun4v_2insn_patch_entry {
-        unsigned int    addr;
-        unsigned int    insns[2];
-};
-extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
-        __sun4v_2insn_patch_end;
-
 #endif /* !(__ASSEMBLY__) */
 
-#define TRAP_PER_CPU_THREAD             0x00
-#define TRAP_PER_CPU_PGD_PADDR          0x08
-#define TRAP_PER_CPU_CPU_MONDO_PA       0x10
-#define TRAP_PER_CPU_DEV_MONDO_PA       0x18
-#define TRAP_PER_CPU_RESUM_MONDO_PA     0x20
-#define TRAP_PER_CPU_RESUM_KBUF_PA      0x28
-#define TRAP_PER_CPU_NONRESUM_MONDO_PA  0x30
-#define TRAP_PER_CPU_NONRESUM_KBUF_PA   0x38
-#define TRAP_PER_CPU_FAULT_INFO         0x40
-#define TRAP_PER_CPU_CPU_MONDO_BLOCK_PA 0xc0
-#define TRAP_PER_CPU_CPU_LIST_PA        0xc8
-#define TRAP_PER_CPU_TSB_HUGE           0xd0
-#define TRAP_PER_CPU_TSB_HUGE_TEMP      0xd8
-#define TRAP_PER_CPU_IRQ_WORKLIST_PA    0xe0
-#define TRAP_PER_CPU_CPU_MONDO_QMASK    0xe8
-#define TRAP_PER_CPU_DEV_MONDO_QMASK    0xec
-#define TRAP_PER_CPU_RESUM_QMASK        0xf0
-#define TRAP_PER_CPU_NONRESUM_QMASK     0xf4
-
-#define TRAP_BLOCK_SZ_SHIFT             8
-
-#include <asm/scratchpad.h>
-
-#define __GET_CPUID(REG)                                \
-        /* Spitfire implementation (default). */        \
-661:    ldxa            [%g0] ASI_UPA_CONFIG, REG;      \
-        srlx            REG, 17, REG;                   \
-         and            REG, 0x1f, REG;                 \
-        nop;                                            \
-        .section        .cpuid_patch, "ax";             \
-        /* Instruction location. */                     \
-        .word           661b;                           \
-        /* Cheetah Safari implementation. */            \
-        ldxa            [%g0] ASI_SAFARI_CONFIG, REG;   \
-        srlx            REG, 17, REG;                   \
-        and             REG, 0x3ff, REG;                \
-        nop;                                            \
-        /* Cheetah JBUS implementation. */              \
-        ldxa            [%g0] ASI_JBUS_CONFIG, REG;     \
-        srlx            REG, 17, REG;                   \
-        and             REG, 0x1f, REG;                 \
-        nop;                                            \
-        /* Starfire implementation. */                  \
-        sethi           %hi(0x1fff40000d0 >> 9), REG;   \
-        sllx            REG, 9, REG;                    \
-        or              REG, 0xd0, REG;                 \
-        lduwa           [REG] ASI_PHYS_BYPASS_EC_E, REG;\
-        /* sun4v implementation. */                     \
-        mov             SCRATCHPAD_CPUID, REG;          \
-        ldxa            [REG] ASI_SCRATCHPAD, REG;      \
-        nop;                                            \
-        nop;                                            \
-        .previous;
-
-#ifdef CONFIG_SMP
-
-#define TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        __GET_CPUID(TMP)                        \
-        sethi   %hi(trap_block), DEST;          \
-        sllx    TMP, TRAP_BLOCK_SZ_SHIFT, TMP;  \
-        or      DEST, %lo(trap_block), DEST;    \
-        add     DEST, TMP, DEST;                \
-
-/* Clobbers TMP, current address space PGD phys address into DEST.  */
-#define TRAP_LOAD_PGD_PHYS(DEST, TMP)           \
-        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        ldx     [DEST + TRAP_PER_CPU_PGD_PADDR], DEST;
-
-/* Clobbers TMP, loads local processor's IRQ work area into DEST.  */
-#define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP)        \
-        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        add     DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST;
-
-/* Clobbers TMP, loads DEST with current thread info pointer.  */
-#define TRAP_LOAD_THREAD_REG(DEST, TMP)         \
-        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        ldx     [DEST + TRAP_PER_CPU_THREAD], DEST;
-
-/* Given the current thread info pointer in THR, load the per-cpu
- * area base of the current processor into DEST.  REG1, REG2, and REG3 are
- * clobbered.
- *
- * You absolutely cannot use DEST as a temporary in this code.  The
- * reason is that traps can happen during execution, and return from
- * trap will load the fully resolved DEST per-cpu base.  This can corrupt
- * the calculations done by the macro mid-stream.
- */
-#define LOAD_PER_CPU_BASE(DEST, THR, REG1, REG2, REG3)  \
-        lduh    [THR + TI_CPU], REG1;                   \
-        sethi   %hi(__per_cpu_shift), REG3;             \
-        sethi   %hi(__per_cpu_base), REG2;              \
-        ldx     [REG3 + %lo(__per_cpu_shift)], REG3;    \
-        ldx     [REG2 + %lo(__per_cpu_base)], REG2;     \
-        sllx    REG1, REG3, REG3;                       \
-        add     REG3, REG2, DEST;
-
-#else
-
-#define TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        sethi   %hi(trap_block), DEST;          \
-        or      DEST, %lo(trap_block), DEST;    \
-
-/* Uniprocessor versions, we know the cpuid is zero.  */
-#define TRAP_LOAD_PGD_PHYS(DEST, TMP)           \
-        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        ldx     [DEST + TRAP_PER_CPU_PGD_PADDR], DEST;
-
-/* Clobbers TMP, loads local processor's IRQ work area into DEST.  */
-#define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP)        \
-        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        add     DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST;
-
-#define TRAP_LOAD_THREAD_REG(DEST, TMP)         \
-        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        ldx     [DEST + TRAP_PER_CPU_THREAD], DEST;
-
-/* No per-cpu areas on uniprocessor, so no need to load DEST.  */
-#define LOAD_PER_CPU_BASE(DEST, THR, REG1, REG2, REG3)
-
-#endif /* !(CONFIG_SMP) */
+#include <asm/trap_block.h>
 
 #endif /* _SPARC64_CPUDATA_H */
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
index 0f4150e26619..204e4bf64438 100644
--- a/arch/sparc/include/asm/dma-mapping.h
+++ b/arch/sparc/include/asm/dma-mapping.h
@@ -1,8 +1,166 @@
 #ifndef ___ASM_SPARC_DMA_MAPPING_H
 #define ___ASM_SPARC_DMA_MAPPING_H
-#if defined(__sparc__) && defined(__arch64__)
-#include <asm/dma-mapping_64.h>
-#else
-#include <asm/dma-mapping_32.h>
-#endif
+
+#include <linux/scatterlist.h>
+#include <linux/mm.h>
+
+#define DMA_ERROR_CODE  (~(dma_addr_t)0x0)
+
+extern int dma_supported(struct device *dev, u64 mask);
+extern int dma_set_mask(struct device *dev, u64 dma_mask);
+
+#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
+#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
+#define dma_is_consistent(d, h) (1)
+
+struct dma_ops {
+        void *(*alloc_coherent)(struct device *dev, size_t size,
+                                dma_addr_t *dma_handle, gfp_t flag);
+        void (*free_coherent)(struct device *dev, size_t size,
+                              void *cpu_addr, dma_addr_t dma_handle);
+        dma_addr_t (*map_page)(struct device *dev, struct page *page,
+                               unsigned long offset, size_t size,
+                               enum dma_data_direction direction);
+        void (*unmap_page)(struct device *dev, dma_addr_t dma_addr,
+                           size_t size,
+                           enum dma_data_direction direction);
+        int (*map_sg)(struct device *dev, struct scatterlist *sg, int nents,
+                      enum dma_data_direction direction);
+        void (*unmap_sg)(struct device *dev, struct scatterlist *sg,
+                         int nhwentries,
+                         enum dma_data_direction direction);
+        void (*sync_single_for_cpu)(struct device *dev,
+                                    dma_addr_t dma_handle, size_t size,
+                                    enum dma_data_direction direction);
+        void (*sync_single_for_device)(struct device *dev,
+                                       dma_addr_t dma_handle, size_t size,
+                                       enum dma_data_direction direction);
+        void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg,
+                                int nelems,
+                                enum dma_data_direction direction);
+        void (*sync_sg_for_device)(struct device *dev,
+                                   struct scatterlist *sg, int nents,
+                                   enum dma_data_direction dir);
+};
+extern const struct dma_ops *dma_ops;
+
+static inline void *dma_alloc_coherent(struct device *dev, size_t size,
+                                       dma_addr_t *dma_handle, gfp_t flag)
+{
+        return dma_ops->alloc_coherent(dev, size, dma_handle, flag);
+}
+
+static inline void dma_free_coherent(struct device *dev, size_t size,
+                                     void *cpu_addr, dma_addr_t dma_handle)
+{
+        dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
+}
+
+static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,
+                                        size_t size,
+                                        enum dma_data_direction direction)
+{
+        return dma_ops->map_page(dev, virt_to_page(cpu_addr),
+                                 (unsigned long)cpu_addr & ~PAGE_MASK, size,
+                                 direction);
+}
+
+static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,
+                                    size_t size,
+                                    enum dma_data_direction direction)
+{
+        dma_ops->unmap_page(dev, dma_addr, size, direction);
+}
+
+static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
+                                      unsigned long offset, size_t size,
+                                      enum dma_data_direction direction)
+{
+        return dma_ops->map_page(dev, page, offset, size, direction);
+}
+
+static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,
+                                  size_t size,
+                                  enum dma_data_direction direction)
+{
+        dma_ops->unmap_page(dev, dma_address, size, direction);
+}
+
+static inline int dma_map_sg(struct device *dev, struct scatterlist *sg,
+                             int nents, enum dma_data_direction direction)
+{
+        return dma_ops->map_sg(dev, sg, nents, direction);
+}
+
+static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
+                                int nents, enum dma_data_direction direction)
+{
+        dma_ops->unmap_sg(dev, sg, nents, direction);
+}
+
+static inline void dma_sync_single_for_cpu(struct device *dev,
+                                           dma_addr_t dma_handle, size_t size,
+                                           enum dma_data_direction direction)
+{
+        dma_ops->sync_single_for_cpu(dev, dma_handle, size, direction);
+}
+
+static inline void dma_sync_single_for_device(struct device *dev,
+                                              dma_addr_t dma_handle,
+                                              size_t size,
+                                              enum dma_data_direction direction)
+{
+        if (dma_ops->sync_single_for_device)
+                dma_ops->sync_single_for_device(dev, dma_handle, size,
+                                                direction);
+}
+
+static inline void dma_sync_sg_for_cpu(struct device *dev,
+                                       struct scatterlist *sg, int nelems,
+                                       enum dma_data_direction direction)
+{
+        dma_ops->sync_sg_for_cpu(dev, sg, nelems, direction);
+}
+
+static inline void dma_sync_sg_for_device(struct device *dev,
+                                          struct scatterlist *sg, int nelems,
+                                          enum dma_data_direction direction)
+{
+        if (dma_ops->sync_sg_for_device)
+                dma_ops->sync_sg_for_device(dev, sg, nelems, direction);
+}
+
+static inline void dma_sync_single_range_for_cpu(struct device *dev,
+                                                 dma_addr_t dma_handle,
+                                                 unsigned long offset,
+                                                 size_t size,
+                                                 enum dma_data_direction dir)
+{
+        dma_sync_single_for_cpu(dev, dma_handle+offset, size, dir);
+}
+
+static inline void dma_sync_single_range_for_device(struct device *dev,
+                                                    dma_addr_t dma_handle,
+                                                    unsigned long offset,
+                                                    size_t size,
+                                                    enum dma_data_direction dir)
+{
+        dma_sync_single_for_device(dev, dma_handle+offset, size, dir);
+}
+
+
+static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+{
+        return (dma_addr == DMA_ERROR_CODE);
+}
+
+static inline int dma_get_cache_alignment(void)
+{
+        /*
+         * no easy way to get cache size on all processors, so return
+         * the maximum possible, to be safe
+         */
+        return (1 << INTERNODE_CACHE_SHIFT);
+}
+
 #endif
diff --git a/arch/sparc/include/asm/dma-mapping_32.h b/arch/sparc/include/asm/dma-mapping_32.h
deleted file mode 100644
index 8a57ea0573e6..000000000000
--- a/arch/sparc/include/asm/dma-mapping_32.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _ASM_SPARC_DMA_MAPPING_H
-#define _ASM_SPARC_DMA_MAPPING_H
-
-#include <linux/types.h>
-
-struct device;
-struct scatterlist;
-struct page;
-
-#define DMA_ERROR_CODE  (~(dma_addr_t)0x0)
-
-extern int dma_supported(struct device *dev, u64 mask);
-extern int dma_set_mask(struct device *dev, u64 dma_mask);
-extern void *dma_alloc_coherent(struct device *dev, size_t size,
-                                dma_addr_t *dma_handle, gfp_t flag);
-extern void dma_free_coherent(struct device *dev, size_t size,
-                              void *cpu_addr, dma_addr_t dma_handle);
-extern dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,
-                                 size_t size,
-                                 enum dma_data_direction direction);
-extern void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,
-                             size_t size,
-                             enum dma_data_direction direction);
-extern dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                               unsigned long offset, size_t size,
-                               enum dma_data_direction direction);
-extern void dma_unmap_page(struct device *dev, dma_addr_t dma_address,
-                           size_t size, enum dma_data_direction direction);
-extern int dma_map_sg(struct device *dev, struct scatterlist *sg,
-                      int nents, enum dma_data_direction direction);
-extern void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
-                         int nents, enum dma_data_direction direction);
-extern void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                                    size_t size,
-                                    enum dma_data_direction direction);
-extern void dma_sync_single_for_device(struct device *dev,
-                                       dma_addr_t dma_handle,
-                                       size_t size,
-                                       enum dma_data_direction direction);
-extern void dma_sync_single_range_for_cpu(struct device *dev,
-                                          dma_addr_t dma_handle,
-                                          unsigned long offset,
-                                          size_t size,
-                                          enum dma_data_direction direction);
-extern void dma_sync_single_range_for_device(struct device *dev,
-                                             dma_addr_t dma_handle,
-                                             unsigned long offset, size_t size,
-                                             enum dma_data_direction direction);
-extern void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
-                                int nelems, enum dma_data_direction direction);
-extern void dma_sync_sg_for_device(struct device *dev,
-                                   struct scatterlist *sg, int nelems,
-                                   enum dma_data_direction direction);
-extern int dma_mapping_error(struct device *dev, dma_addr_t dma_addr);
-extern int dma_get_cache_alignment(void);
-
-#define dma_alloc_noncoherent   dma_alloc_coherent
-#define dma_free_noncoherent    dma_free_coherent
-
-#endif /* _ASM_SPARC_DMA_MAPPING_H */
diff --git a/arch/sparc/include/asm/dma-mapping_64.h b/arch/sparc/include/asm/dma-mapping_64.h
deleted file mode 100644
index bfa64f9702d5..000000000000
--- a/arch/sparc/include/asm/dma-mapping_64.h
+++ /dev/null
@@ -1,154 +0,0 @@
-#ifndef _ASM_SPARC64_DMA_MAPPING_H
-#define _ASM_SPARC64_DMA_MAPPING_H
-
-#include <linux/scatterlist.h>
-#include <linux/mm.h>
-
-#define DMA_ERROR_CODE  (~(dma_addr_t)0x0)
-
-struct dma_ops {
-        void *(*alloc_coherent)(struct device *dev, size_t size,
-                                dma_addr_t *dma_handle, gfp_t flag);
-        void (*free_coherent)(struct device *dev, size_t size,
-                              void *cpu_addr, dma_addr_t dma_handle);
-        dma_addr_t (*map_single)(struct device *dev, void *cpu_addr,
-                                 size_t size,
-                                 enum dma_data_direction direction);
-        void (*unmap_single)(struct device *dev, dma_addr_t dma_addr,
-                             size_t size,
-                             enum dma_data_direction direction);
-        int (*map_sg)(struct device *dev, struct scatterlist *sg, int nents,
-                      enum dma_data_direction direction);
-        void (*unmap_sg)(struct device *dev, struct scatterlist *sg,
-                         int nhwentries,
-                         enum dma_data_direction direction);
-        void (*sync_single_for_cpu)(struct device *dev,
-                                    dma_addr_t dma_handle, size_t size,
-                                    enum dma_data_direction direction);
-        void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg,
-                                int nelems,
-                                enum dma_data_direction direction);
-};
-extern const struct dma_ops *dma_ops;
-
-extern int dma_supported(struct device *dev, u64 mask);
-extern int dma_set_mask(struct device *dev, u64 dma_mask);
-
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
-                                       dma_addr_t *dma_handle, gfp_t flag)
-{
-        return dma_ops->alloc_coherent(dev, size, dma_handle, flag);
-}
-
-static inline void dma_free_coherent(struct device *dev, size_t size,
-                                     void *cpu_addr, dma_addr_t dma_handle)
-{
-        dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
-}
-
-static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,
-                                        size_t size,
-                                        enum dma_data_direction direction)
-{
-        return dma_ops->map_single(dev, cpu_addr, size, direction);
-}
-
-static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,
-                                    size_t size,
-                                    enum dma_data_direction direction)
-{
-        dma_ops->unmap_single(dev, dma_addr, size, direction);
-}
-
-static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                                      unsigned long offset, size_t size,
-                                      enum dma_data_direction direction)
-{
-        return dma_ops->map_single(dev, page_address(page) + offset,
-                                   size, direction);
-}
-
-static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,
-                                  size_t size,
-                                  enum dma_data_direction direction)
-{
-        dma_ops->unmap_single(dev, dma_address, size, direction);
-}
-
-static inline int dma_map_sg(struct device *dev, struct scatterlist *sg,
-                             int nents, enum dma_data_direction direction)
-{
-        return dma_ops->map_sg(dev, sg, nents, direction);
-}
-
-static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
-                                int nents, enum dma_data_direction direction)
-{
-        dma_ops->unmap_sg(dev, sg, nents, direction);
-}
-
-static inline void dma_sync_single_for_cpu(struct device *dev,
-                                           dma_addr_t dma_handle, size_t size,
-                                           enum dma_data_direction direction)
-{
-        dma_ops->sync_single_for_cpu(dev, dma_handle, size, direction);
-}
-
-static inline void dma_sync_single_for_device(struct device *dev,
-                                              dma_addr_t dma_handle,
-                                              size_t size,
-                                              enum dma_data_direction direction)
-{
-        /* No flushing needed to sync cpu writes to the device.  */
-}
-
-static inline void dma_sync_single_range_for_cpu(struct device *dev,
-                                                 dma_addr_t dma_handle,
-                                                 unsigned long offset,
-                                                 size_t size,
-                                                 enum dma_data_direction direction)
-{
-        dma_sync_single_for_cpu(dev, dma_handle+offset, size, direction);
-}
-
-static inline void dma_sync_single_range_for_device(struct device *dev,
-                                                    dma_addr_t dma_handle,
-                                                    unsigned long offset,
-                                                    size_t size,
-                                                    enum dma_data_direction direction)
-{
-        /* No flushing needed to sync cpu writes to the device.  */
-}
-
-
-static inline void dma_sync_sg_for_cpu(struct device *dev,
-                                       struct scatterlist *sg, int nelems,
-                                       enum dma_data_direction direction)
-{
-        dma_ops->sync_sg_for_cpu(dev, sg, nelems, direction);
-}
-
-static inline void dma_sync_sg_for_device(struct device *dev,
-                                          struct scatterlist *sg, int nelems,
-                                          enum dma_data_direction direction)
-{
-        /* No flushing needed to sync cpu writes to the device.  */
-}
-
-static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return (dma_addr == DMA_ERROR_CODE);
-}
-
-static inline int dma_get_cache_alignment(void)
-{
-        /* no easy way to get cache size on all processors, so return
-         * the maximum possible, to be safe */
-        return (1 << INTERNODE_CACHE_SHIFT);
-}
-
-#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
-#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-#define dma_is_consistent(d, h) (1)
-
-#endif /* _ASM_SPARC64_DMA_MAPPING_H */
diff --git a/arch/sparc/include/asm/errno.h b/arch/sparc/include/asm/errno.h
index a9ef172977de..4e2bc490d714 100644
--- a/arch/sparc/include/asm/errno.h
+++ b/arch/sparc/include/asm/errno.h
@@ -110,4 +110,6 @@
 #define EOWNERDEAD      132     /* Owner died */
 #define ENOTRECOVERABLE 133     /* State not recoverable */
 
+#define ERFKILL         134     /* Operation not possible due to RF-kill */
+
 #endif
diff --git a/arch/sparc/include/asm/ftrace.h b/arch/sparc/include/asm/ftrace.h
index d27716cd38c1..b0f18e9893db 100644
--- a/arch/sparc/include/asm/ftrace.h
+++ b/arch/sparc/include/asm/ftrace.h
@@ -11,4 +11,15 @@ extern void _mcount(void);
 
 #endif
 
+#ifdef CONFIG_DYNAMIC_FTRACE
+/* reloction of mcount call site is the same as the address */
+static inline unsigned long ftrace_call_adjust(unsigned long addr)
+{
+        return addr;
+}
+
+struct dyn_arch_ftrace {
+};
+#endif /*  CONFIG_DYNAMIC_FTRACE */
+
 #endif /* _ASM_SPARC64_FTRACE */
diff --git a/arch/sparc/include/asm/mdesc.h b/arch/sparc/include/asm/mdesc.h
index 1acc7272e537..9faa046713fb 100644
--- a/arch/sparc/include/asm/mdesc.h
+++ b/arch/sparc/include/asm/mdesc.h
@@ -71,7 +71,8 @@ struct mdesc_notifier_client {
 
 extern void mdesc_register_notifier(struct mdesc_notifier_client *client);
 
-extern void mdesc_fill_in_cpu_data(cpumask_t mask);
+extern void mdesc_fill_in_cpu_data(cpumask_t *mask);
+extern void mdesc_populate_present_mask(cpumask_t *mask);
 
 extern void sun4v_mdesc_init(void);
 
diff --git a/arch/sparc/include/asm/percpu_64.h b/arch/sparc/include/asm/percpu_64.h
index bee64593023e..007aafb4ae97 100644
--- a/arch/sparc/include/asm/percpu_64.h
+++ b/arch/sparc/include/asm/percpu_64.h
@@ -7,20 +7,16 @@ register unsigned long __local_per_cpu_offset asm("g5");
 
 #ifdef CONFIG_SMP
 
-extern void real_setup_per_cpu_areas(void);
+#include <asm/trap_block.h>
 
-extern unsigned long __per_cpu_base;
-extern unsigned long __per_cpu_shift;
 #define __per_cpu_offset(__cpu) \
-        (__per_cpu_base + ((unsigned long)(__cpu) << __per_cpu_shift))
+        (trap_block[(__cpu)].__per_cpu_base)
 #define per_cpu_offset(x) (__per_cpu_offset(x))
 
 #define __my_cpu_offset __local_per_cpu_offset
 
 #else /* ! SMP */
 
-#define real_setup_per_cpu_areas()              do { } while (0)
-
 #endif  /* SMP */
 
 #include <asm-generic/percpu.h>
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h
index 900d44714f8d..be8d7aaeb60d 100644
--- a/arch/sparc/include/asm/prom.h
+++ b/arch/sparc/include/asm/prom.h
@@ -86,6 +86,8 @@ extern int of_node_to_nid(struct device_node *dp);
 #endif
 
 extern void prom_build_devicetree(void);
+extern void of_populate_present_mask(void);
+extern void of_fill_in_cpu_data(void);
 
 /* Dummy ref counting routines - to be implemented later */
 static inline struct device_node *of_node_get(struct device_node *node)
diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h
new file mode 100644
index 000000000000..7e26b2db6211
--- /dev/null
+++ b/arch/sparc/include/asm/trap_block.h
@@ -0,0 +1,207 @@
+#ifndef _SPARC_TRAP_BLOCK_H
+#define _SPARC_TRAP_BLOCK_H
+
+#include <asm/hypervisor.h>
+#include <asm/asi.h>
+
+#ifndef __ASSEMBLY__
+
+/* Trap handling code needs to get at a few critical values upon
+ * trap entry and to process TSB misses.  These cannot be in the
+ * per_cpu() area as we really need to lock them into the TLB and
+ * thus make them part of the main kernel image.  As a result we
+ * try to make this as small as possible.
+ *
+ * This is padded out and aligned to 64-bytes to avoid false sharing
+ * on SMP.
+ */
+
+/* If you modify the size of this structure, please update
+ * TRAP_BLOCK_SZ_SHIFT below.
+ */
+struct thread_info;
+struct trap_per_cpu {
+/* D-cache line 1: Basic thread information, cpu and device mondo queues */
+        struct thread_info      *thread;
+        unsigned long           pgd_paddr;
+        unsigned long           cpu_mondo_pa;
+        unsigned long           dev_mondo_pa;
+
+/* D-cache line 2: Error Mondo Queue and kernel buffer pointers */
+        unsigned long           resum_mondo_pa;
+        unsigned long           resum_kernel_buf_pa;
+        unsigned long           nonresum_mondo_pa;
+        unsigned long           nonresum_kernel_buf_pa;
+
+/* Dcache lines 3, 4, 5, and 6: Hypervisor Fault Status */
+        struct hv_fault_status  fault_info;
+
+/* Dcache line 7: Physical addresses of CPU send mondo block and CPU list.  */
+        unsigned long           cpu_mondo_block_pa;
+        unsigned long           cpu_list_pa;
+        unsigned long           tsb_huge;
+        unsigned long           tsb_huge_temp;
+
+/* Dcache line 8: IRQ work list, and keep trap_block a power-of-2 in size.  */
+        unsigned long           irq_worklist_pa;
+        unsigned int            cpu_mondo_qmask;
+        unsigned int            dev_mondo_qmask;
+        unsigned int            resum_qmask;
+        unsigned int            nonresum_qmask;
+        unsigned long           __per_cpu_base;
+} __attribute__((aligned(64)));
+extern struct trap_per_cpu trap_block[NR_CPUS];
+extern void init_cur_cpu_trap(struct thread_info *);
+extern void setup_tba(void);
+extern int ncpus_probed;
+
+extern unsigned long real_hard_smp_processor_id(void);
+
+struct cpuid_patch_entry {
+        unsigned int    addr;
+        unsigned int    cheetah_safari[4];
+        unsigned int    cheetah_jbus[4];
+        unsigned int    starfire[4];
+        unsigned int    sun4v[4];
+};
+extern struct cpuid_patch_entry __cpuid_patch, __cpuid_patch_end;
+
+struct sun4v_1insn_patch_entry {
+        unsigned int    addr;
+        unsigned int    insn;
+};
+extern struct sun4v_1insn_patch_entry __sun4v_1insn_patch,
+        __sun4v_1insn_patch_end;
+
+struct sun4v_2insn_patch_entry {
+        unsigned int    addr;
+        unsigned int    insns[2];
+};
+extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
+        __sun4v_2insn_patch_end;
+
+
+#endif /* !(__ASSEMBLY__) */
+
+#define TRAP_PER_CPU_THREAD             0x00
+#define TRAP_PER_CPU_PGD_PADDR          0x08
+#define TRAP_PER_CPU_CPU_MONDO_PA       0x10
+#define TRAP_PER_CPU_DEV_MONDO_PA       0x18
+#define TRAP_PER_CPU_RESUM_MONDO_PA     0x20
+#define TRAP_PER_CPU_RESUM_KBUF_PA      0x28
+#define TRAP_PER_CPU_NONRESUM_MONDO_PA  0x30
+#define TRAP_PER_CPU_NONRESUM_KBUF_PA   0x38
+#define TRAP_PER_CPU_FAULT_INFO         0x40
+#define TRAP_PER_CPU_CPU_MONDO_BLOCK_PA 0xc0
+#define TRAP_PER_CPU_CPU_LIST_PA        0xc8
+#define TRAP_PER_CPU_TSB_HUGE           0xd0
+#define TRAP_PER_CPU_TSB_HUGE_TEMP      0xd8
+#define TRAP_PER_CPU_IRQ_WORKLIST_PA    0xe0
+#define TRAP_PER_CPU_CPU_MONDO_QMASK    0xe8
+#define TRAP_PER_CPU_DEV_MONDO_QMASK    0xec
+#define TRAP_PER_CPU_RESUM_QMASK        0xf0
+#define TRAP_PER_CPU_NONRESUM_QMASK     0xf4
+#define TRAP_PER_CPU_PER_CPU_BASE       0xf8
+
+#define TRAP_BLOCK_SZ_SHIFT             8
+
+#include <asm/scratchpad.h>
+
+#define __GET_CPUID(REG)                                \
+        /* Spitfire implementation (default). */        \
+661:    ldxa            [%g0] ASI_UPA_CONFIG, REG;      \
+        srlx            REG, 17, REG;                   \
+         and            REG, 0x1f, REG;                 \
+        nop;                                            \
+        .section        .cpuid_patch, "ax";             \
+        /* Instruction location. */                     \
+        .word           661b;                           \
+        /* Cheetah Safari implementation. */            \
+        ldxa            [%g0] ASI_SAFARI_CONFIG, REG;   \
+        srlx            REG, 17, REG;                   \
+        and             REG, 0x3ff, REG;                \
+        nop;                                            \
+        /* Cheetah JBUS implementation. */              \
+        ldxa            [%g0] ASI_JBUS_CONFIG, REG;     \
+        srlx            REG, 17, REG;                   \
+        and             REG, 0x1f, REG;                 \
+        nop;                                            \
+        /* Starfire implementation. */                  \
+        sethi           %hi(0x1fff40000d0 >> 9), REG;   \
+        sllx            REG, 9, REG;                    \
+        or              REG, 0xd0, REG;                 \
+        lduwa           [REG] ASI_PHYS_BYPASS_EC_E, REG;\
+        /* sun4v implementation. */                     \
+        mov             SCRATCHPAD_CPUID, REG;          \
+        ldxa            [REG] ASI_SCRATCHPAD, REG;      \
+        nop;                                            \
+        nop;                                            \
+        .previous;
+
+#ifdef CONFIG_SMP
+
+#define TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
+        __GET_CPUID(TMP)                        \
+        sethi   %hi(trap_block), DEST;          \
+        sllx    TMP, TRAP_BLOCK_SZ_SHIFT, TMP;  \
+        or      DEST, %lo(trap_block), DEST;    \
+        add     DEST, TMP, DEST;                \
+
+/* Clobbers TMP, current address space PGD phys address into DEST.  */
+#define TRAP_LOAD_PGD_PHYS(DEST, TMP)           \
+        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
+        ldx     [DEST + TRAP_PER_CPU_PGD_PADDR], DEST;
+
+/* Clobbers TMP, loads local processor's IRQ work area into DEST.  */
+#define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP)        \
+        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
+        add     DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST;
+
+/* Clobbers TMP, loads DEST with current thread info pointer.  */
+#define TRAP_LOAD_THREAD_REG(DEST, TMP)         \
+        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
+        ldx     [DEST + TRAP_PER_CPU_THREAD], DEST;
+
+/* Given the current thread info pointer in THR, load the per-cpu
+ * area base of the current processor into DEST.  REG1, REG2, and REG3 are
+ * clobbered.
+ *
+ * You absolutely cannot use DEST as a temporary in this code.  The
+ * reason is that traps can happen during execution, and return from
+ * trap will load the fully resolved DEST per-cpu base.  This can corrupt
+ * the calculations done by the macro mid-stream.
+ */
+#define LOAD_PER_CPU_BASE(DEST, THR, REG1, REG2, REG3)  \
+        lduh    [THR + TI_CPU], REG1;                   \
+        sethi   %hi(trap_block), REG2;                  \
+        sllx    REG1, TRAP_BLOCK_SZ_SHIFT, REG1;        \
+        or      REG2, %lo(trap_block), REG2;            \
+        add     REG2, REG1, REG2;                       \
+        ldx     [REG2 + TRAP_PER_CPU_PER_CPU_BASE], DEST;
+
+#else
+
+#define TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
+        sethi   %hi(trap_block), DEST;          \
+        or      DEST, %lo(trap_block), DEST;    \
+
+/* Uniprocessor versions, we know the cpuid is zero.  */
+#define TRAP_LOAD_PGD_PHYS(DEST, TMP)           \
+        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
+        ldx     [DEST + TRAP_PER_CPU_PGD_PADDR], DEST;
+
+/* Clobbers TMP, loads local processor's IRQ work area into DEST.  */
+#define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP)        \
+        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
+        add     DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST;
+
+#define TRAP_LOAD_THREAD_REG(DEST, TMP)         \
+        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
+        ldx     [DEST + TRAP_PER_CPU_THREAD], DEST;
+
+/* No per-cpu areas on uniprocessor, so no need to load DEST.  */
+#define LOAD_PER_CPU_BASE(DEST, THR, REG1, REG2, REG3)
+
+#endif /* !(CONFIG_SMP) */
+
+#endif /* _SPARC_TRAP_BLOCK_H */
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index b8eb71ef3163..b2c406de7d4f 100644
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -394,8 +394,9 @@
 #define __NR_accept4            323
 #define __NR_preadv             324
 #define __NR_pwritev            325
+#define __NR_rt_tgsigqueueinfo  326
 
-#define NR_SYSCALLS             326
+#define NR_SYSCALLS             327
 
 #ifdef __32bit_syscall_numbers__
 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 54742e58831c..475ce4696acd 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -37,6 +37,7 @@ obj-y                   += una_asm_$(BITS).o
 obj-$(CONFIG_SPARC32)   += muldiv.o
 obj-y                   += prom_common.o
 obj-y                   += prom_$(BITS).o
+obj-y                   += of_device_common.o
 obj-y                   += of_device_$(BITS).o
 obj-$(CONFIG_SPARC64)   += prom_irqtrans.o
 
@@ -54,6 +55,7 @@ obj-$(CONFIG_SPARC64)   += sstate.o
 obj-$(CONFIG_SPARC64)   += mdesc.o
 obj-$(CONFIG_SPARC64)   += pcr.o
 obj-$(CONFIG_SPARC64)   += nmi.o
+obj-$(CONFIG_SPARC64_SMP) += cpumap.o
 
 # sparc32 do not use GENERIC_HARDIRQS but uses the generic devres implementation
 obj-$(CONFIG_SPARC32)     += devres.o
diff --git a/arch/sparc/kernel/cpumap.c b/arch/sparc/kernel/cpumap.c
new file mode 100644
index 000000000000..7430ed080b23
--- /dev/null
+++ b/arch/sparc/kernel/cpumap.c
@@ -0,0 +1,431 @@
+/* cpumap.c: used for optimizing CPU assignment
+ *
+ * Copyright (C) 2009 Hong H. Pham <hong.pham@windriver.com>
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/cpumask.h>
+#include <linux/spinlock.h>
+#include <asm/cpudata.h>
+#include "cpumap.h"
+
+
+enum {
+        CPUINFO_LVL_ROOT = 0,
+        CPUINFO_LVL_NODE,
+        CPUINFO_LVL_CORE,
+        CPUINFO_LVL_PROC,
+        CPUINFO_LVL_MAX,
+};
+
+enum {
+        ROVER_NO_OP              = 0,
+        /* Increment rover every time level is visited */
+        ROVER_INC_ON_VISIT       = 1 << 0,
+        /* Increment parent's rover every time rover wraps around */
+        ROVER_INC_PARENT_ON_LOOP = 1 << 1,
+};
+
+struct cpuinfo_node {
+        int id;
+        int level;
+        int num_cpus;    /* Number of CPUs in this hierarchy */
+        int parent_index;
+        int child_start; /* Array index of the first child node */
+        int child_end;   /* Array index of the last child node */
+        int rover;       /* Child node iterator */
+};
+
+struct cpuinfo_level {
+        int start_index; /* Index of first node of a level in a cpuinfo tree */
+        int end_index;   /* Index of last node of a level in a cpuinfo tree */
+        int num_nodes;   /* Number of nodes in a level in a cpuinfo tree */
+};
+
+struct cpuinfo_tree {
+        int total_nodes;
+
+        /* Offsets into nodes[] for each level of the tree */
+        struct cpuinfo_level level[CPUINFO_LVL_MAX];
+        struct cpuinfo_node  nodes[0];
+};
+
+
+static struct cpuinfo_tree *cpuinfo_tree;
+
+static u16 cpu_distribution_map[NR_CPUS];
+static DEFINE_SPINLOCK(cpu_map_lock);
+
+
+/* Niagara optimized cpuinfo tree traversal. */
+static const int niagara_iterate_method[] = {
+        [CPUINFO_LVL_ROOT] = ROVER_NO_OP,
+
+        /* Strands (or virtual CPUs) within a core may not run concurrently
+         * on the Niagara, as instruction pipeline(s) are shared.  Distribute
+         * work to strands in different cores first for better concurrency.
+         * Go to next NUMA node when all cores are used.
+         */
+        [CPUINFO_LVL_NODE] = ROVER_INC_ON_VISIT|ROVER_INC_PARENT_ON_LOOP,
+
+        /* Strands are grouped together by proc_id in cpuinfo_sparc, i.e.
+         * a proc_id represents an instruction pipeline.  Distribute work to
+         * strands in different proc_id groups if the core has multiple
+         * instruction pipelines (e.g. the Niagara 2/2+ has two).
+         */
+        [CPUINFO_LVL_CORE] = ROVER_INC_ON_VISIT,
+
+        /* Pick the next strand in the proc_id group. */
+        [CPUINFO_LVL_PROC] = ROVER_INC_ON_VISIT,
+};
+
+/* Generic cpuinfo tree traversal.  Distribute work round robin across NUMA
+ * nodes.
+ */
+static const int generic_iterate_method[] = {
+        [CPUINFO_LVL_ROOT] = ROVER_INC_ON_VISIT,
+        [CPUINFO_LVL_NODE] = ROVER_NO_OP,
+        [CPUINFO_LVL_CORE] = ROVER_INC_PARENT_ON_LOOP,
+        [CPUINFO_LVL_PROC] = ROVER_INC_ON_VISIT|ROVER_INC_PARENT_ON_LOOP,
+};
+
+
+static int cpuinfo_id(int cpu, int level)
+{
+        int id;
+
+        switch (level) {
+        case CPUINFO_LVL_ROOT:
+                id = 0;
+                break;
+        case CPUINFO_LVL_NODE:
+                id = cpu_to_node(cpu);
+                break;
+        case CPUINFO_LVL_CORE:
+                id = cpu_data(cpu).core_id;
+                break;
+        case CPUINFO_LVL_PROC:
+                id = cpu_data(cpu).proc_id;
+                break;
+        default:
+                id = -EINVAL;
+        }
+        return id;
+}
+
+/*
+ * Enumerate the CPU information in __cpu_data to determine the start index,
+ * end index, and number of nodes for each level in the cpuinfo tree.  The
+ * total number of cpuinfo nodes required to build the tree is returned.
+ */
+static int enumerate_cpuinfo_nodes(struct cpuinfo_level *tree_level)
+{
+        int prev_id[CPUINFO_LVL_MAX];
+        int i, n, num_nodes;
+
+        for (i = CPUINFO_LVL_ROOT; i < CPUINFO_LVL_MAX; i++) {
+                struct cpuinfo_level *lv = &tree_level[i];
+
+                prev_id[i] = -1;
+                lv->start_index = lv->end_index = lv->num_nodes = 0;
+        }
+
+        num_nodes = 1; /* Include the root node */
+
+        for (i = 0; i < num_possible_cpus(); i++) {
+                if (!cpu_online(i))
+                        continue;
+
+                n = cpuinfo_id(i, CPUINFO_LVL_NODE);
+                if (n > prev_id[CPUINFO_LVL_NODE]) {
+                        tree_level[CPUINFO_LVL_NODE].num_nodes++;
+                        prev_id[CPUINFO_LVL_NODE] = n;
+                        num_nodes++;
+                }
+                n = cpuinfo_id(i, CPUINFO_LVL_CORE);
+                if (n > prev_id[CPUINFO_LVL_CORE]) {
+                        tree_level[CPUINFO_LVL_CORE].num_nodes++;
+                        prev_id[CPUINFO_LVL_CORE] = n;
+                        num_nodes++;
+                }
+                n = cpuinfo_id(i, CPUINFO_LVL_PROC);
+                if (n > prev_id[CPUINFO_LVL_PROC]) {
+                        tree_level[CPUINFO_LVL_PROC].num_nodes++;
+                        prev_id[CPUINFO_LVL_PROC] = n;
+                        num_nodes++;
+                }
+        }
+
+        tree_level[CPUINFO_LVL_ROOT].num_nodes = 1;
+
+        n = tree_level[CPUINFO_LVL_NODE].num_nodes;
+        tree_level[CPUINFO_LVL_NODE].start_index = 1;
+        tree_level[CPUINFO_LVL_NODE].end_index   = n;
+
+        n++;
+        tree_level[CPUINFO_LVL_CORE].start_index = n;
+        n += tree_level[CPUINFO_LVL_CORE].num_nodes;
+        tree_level[CPUINFO_LVL_CORE].end_index   = n - 1;
+
+        tree_level[CPUINFO_LVL_PROC].start_index = n;
+        n += tree_level[CPUINFO_LVL_PROC].num_nodes;
+        tree_level[CPUINFO_LVL_PROC].end_index   = n - 1;
+
+        return num_nodes;
+}
+
+/* Build a tree representation of the CPU hierarchy using the per CPU
+ * information in __cpu_data.  Entries in __cpu_data[0..NR_CPUS] are
+ * assumed to be sorted in ascending order based on node, core_id, and
+ * proc_id (in order of significance).
+ */
+static struct cpuinfo_tree *build_cpuinfo_tree(void)
+{
+        struct cpuinfo_tree *new_tree;
+        struct cpuinfo_node *node;
+        struct cpuinfo_level tmp_level[CPUINFO_LVL_MAX];
+        int num_cpus[CPUINFO_LVL_MAX];
+        int level_rover[CPUINFO_LVL_MAX];
+        int prev_id[CPUINFO_LVL_MAX];
+        int n, id, cpu, prev_cpu, last_cpu, level;
+
+        n = enumerate_cpuinfo_nodes(tmp_level);
+
+        new_tree = kzalloc(sizeof(struct cpuinfo_tree) +
+                           (sizeof(struct cpuinfo_node) * n), GFP_ATOMIC);
+        if (!new_tree)
+                return NULL;
+
+        new_tree->total_nodes = n;
+        memcpy(&new_tree->level, tmp_level, sizeof(tmp_level));
+
+        prev_cpu = cpu = first_cpu(cpu_online_map);
+
+        /* Initialize all levels in the tree with the first CPU */
+        for (level = CPUINFO_LVL_PROC; level >= CPUINFO_LVL_ROOT; level--) {
+                n = new_tree->level[level].start_index;
+
+                level_rover[level] = n;
+                node = &new_tree->nodes[n];
+
+                id = cpuinfo_id(cpu, level);
+                if (unlikely(id < 0)) {
+                        kfree(new_tree);
+                        return NULL;
+                }
+                node->id = id;
+                node->level = level;
+                node->num_cpus = 1;
+
+                node->parent_index = (level > CPUINFO_LVL_ROOT)
+                    ? new_tree->level[level - 1].start_index : -1;
+
+                node->child_start = node->child_end = node->rover =
+                    (level == CPUINFO_LVL_PROC)
+                    ? cpu : new_tree->level[level + 1].start_index;
+
+                prev_id[level] = node->id;
+                num_cpus[level] = 1;
+        }
+
+        for (last_cpu = (num_possible_cpus() - 1); last_cpu >= 0; last_cpu--) {
+                if (cpu_online(last_cpu))
+                        break;
+        }
+
+        while (++cpu <= last_cpu) {
+                if (!cpu_online(cpu))
+                        continue;
+
+                for (level = CPUINFO_LVL_PROC; level >= CPUINFO_LVL_ROOT;
+                     level--) {
+                        id = cpuinfo_id(cpu, level);
+                        if (unlikely(id < 0)) {
+                                kfree(new_tree);
+                                return NULL;
+                        }
+
+                        if ((id != prev_id[level]) || (cpu == last_cpu)) {
+                                prev_id[level] = id;
+                                node = &new_tree->nodes[level_rover[level]];
+                                node->num_cpus = num_cpus[level];
+                                num_cpus[level] = 1;
+
+                                if (cpu == last_cpu)
+                                        node->num_cpus++;
+
+                                /* Connect tree node to parent */
+                                if (level == CPUINFO_LVL_ROOT)
+                                        node->parent_index = -1;
+                                else
+                                        node->parent_index =
+                                            level_rover[level - 1];
+
+                                if (level == CPUINFO_LVL_PROC) {
+                                        node->child_end =
+                                            (cpu == last_cpu) ? cpu : prev_cpu;
+                                } else {
+                                        node->child_end =
+                                            level_rover[level + 1] - 1;
+                                }
+
+                                /* Initialize the next node in the same level */
+                                n = ++level_rover[level];
+                                if (n <= new_tree->level[level].end_index) {
+                                        node = &new_tree->nodes[n];
+                                        node->id = id;
+                                        node->level = level;
+
+                                        /* Connect node to child */
+                                        node->child_start = node->child_end =
+                                        node->rover =
+                                            (level == CPUINFO_LVL_PROC)
+                                            ? cpu : level_rover[level + 1];
+                                }
+                        } else
+                                num_cpus[level]++;
+                }
+                prev_cpu = cpu;
+        }
+
+        return new_tree;
+}
+
+static void increment_rover(struct cpuinfo_tree *t, int node_index,
+                            int root_index, const int *rover_inc_table)
+{
+        struct cpuinfo_node *node = &t->nodes[node_index];
+        int top_level, level;
+
+        top_level = t->nodes[root_index].level;
+        for (level = node->level; level >= top_level; level--) {
+                node->rover++;
+                if (node->rover <= node->child_end)
+                        return;
+
+                node->rover = node->child_start;
+                /* If parent's rover does not need to be adjusted, stop here. */
+                if ((level == top_level) ||
+                    !(rover_inc_table[level] & ROVER_INC_PARENT_ON_LOOP))
+                        return;
+
+                node = &t->nodes[node->parent_index];
+        }
+}
+
+static int iterate_cpu(struct cpuinfo_tree *t, unsigned int root_index)
+{
+        const int *rover_inc_table;
+        int level, new_index, index = root_index;
+
+        switch (sun4v_chip_type) {
+        case SUN4V_CHIP_NIAGARA1:
+        case SUN4V_CHIP_NIAGARA2:
+                rover_inc_table = niagara_iterate_method;
+                break;
+        default:
+                rover_inc_table = generic_iterate_method;
+        }
+
+        for (level = t->nodes[root_index].level; level < CPUINFO_LVL_MAX;
+             level++) {
+                new_index = t->nodes[index].rover;
+                if (rover_inc_table[level] & ROVER_INC_ON_VISIT)
+                        increment_rover(t, index, root_index, rover_inc_table);
+
+                index = new_index;
+        }
+        return index;
+}
+
+static void _cpu_map_rebuild(void)
+{
+        int i;
+
+        if (cpuinfo_tree) {
+                kfree(cpuinfo_tree);
+                cpuinfo_tree = NULL;
+        }
+
+        cpuinfo_tree = build_cpuinfo_tree();
+        if (!cpuinfo_tree)
+                return;
+
+        /* Build CPU distribution map that spans all online CPUs.  No need
+         * to check if the CPU is online, as that is done when the cpuinfo
+         * tree is being built.
+         */
+        for (i = 0; i < cpuinfo_tree->nodes[0].num_cpus; i++)
+                cpu_distribution_map[i] = iterate_cpu(cpuinfo_tree, 0);
+}
+
+/* Fallback if the cpuinfo tree could not be built.  CPU mapping is linear
+ * round robin.
+ */
+static int simple_map_to_cpu(unsigned int index)
+{
+        int i, end, cpu_rover;
+
+        cpu_rover = 0;
+        end = index % num_online_cpus();
+        for (i = 0; i < num_possible_cpus(); i++) {
+                if (cpu_online(cpu_rover)) {
+                        if (cpu_rover >= end)
+                                return cpu_rover;
+
+                        cpu_rover++;
+                }
+        }
+
+        /* Impossible, since num_online_cpus() <= num_possible_cpus() */
+        return first_cpu(cpu_online_map);
+}
+
+static int _map_to_cpu(unsigned int index)
+{
+        struct cpuinfo_node *root_node;
+
+        if (unlikely(!cpuinfo_tree)) {
+                _cpu_map_rebuild();
+                if (!cpuinfo_tree)
+                        return simple_map_to_cpu(index);
+        }
+
+        root_node = &cpuinfo_tree->nodes[0];
+#ifdef CONFIG_HOTPLUG_CPU
+        if (unlikely(root_node->num_cpus != num_online_cpus())) {
+                _cpu_map_rebuild();
+                if (!cpuinfo_tree)
+                        return simple_map_to_cpu(index);
+        }
+#endif
+        return cpu_distribution_map[index % root_node->num_cpus];
+}
+
+int map_to_cpu(unsigned int index)
+{
+        int mapped_cpu;
+        unsigned long flag;
+
+        spin_lock_irqsave(&cpu_map_lock, flag);
+        mapped_cpu = _map_to_cpu(index);
+
+#ifdef CONFIG_HOTPLUG_CPU
+        while (unlikely(!cpu_online(mapped_cpu)))
+                mapped_cpu = _map_to_cpu(index);
+#endif
+        spin_unlock_irqrestore(&cpu_map_lock, flag);
+        return mapped_cpu;
+}
+EXPORT_SYMBOL(map_to_cpu);
+
+void cpu_map_rebuild(void)
+{
+        unsigned long flag;
+
+        spin_lock_irqsave(&cpu_map_lock, flag);
+        _cpu_map_rebuild();
+        spin_unlock_irqrestore(&cpu_map_lock, flag);
+}
diff --git a/arch/sparc/kernel/cpumap.h b/arch/sparc/kernel/cpumap.h
new file mode 100644
index 000000000000..e639880ab864
--- /dev/null
+++ b/arch/sparc/kernel/cpumap.h
@@ -0,0 +1,16 @@
+#ifndef _CPUMAP_H
+#define _CPUMAP_H
+
+#ifdef CONFIG_SMP
+extern void cpu_map_rebuild(void);
+extern int  map_to_cpu(unsigned int index);
+#define cpu_map_init() cpu_map_rebuild()
+#else
+#define cpu_map_init() do {} while (0)
+static inline int map_to_cpu(unsigned int index)
+{
+        return raw_smp_processor_id();
+}
+#endif
+
+#endif
diff --git a/arch/sparc/kernel/dma.c b/arch/sparc/kernel/dma.c
index ebc8403b035e..524c32f97c55 100644
--- a/arch/sparc/kernel/dma.c
+++ b/arch/sparc/kernel/dma.c
@@ -35,8 +35,8 @@ int dma_set_mask(struct device *dev, u64 dma_mask)
 }
 EXPORT_SYMBOL(dma_set_mask);
 
-void *dma_alloc_coherent(struct device *dev, size_t size,
-                         dma_addr_t *dma_handle, gfp_t flag)
+static void *dma32_alloc_coherent(struct device *dev, size_t size,
+                                  dma_addr_t *dma_handle, gfp_t flag)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type)
@@ -44,10 +44,9 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 #endif
         return sbus_alloc_consistent(dev, size, dma_handle);
 }
-EXPORT_SYMBOL(dma_alloc_coherent);
 
-void dma_free_coherent(struct device *dev, size_t size,
-                       void *cpu_addr, dma_addr_t dma_handle)
+static void dma32_free_coherent(struct device *dev, size_t size,
+                                void *cpu_addr, dma_addr_t dma_handle)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type) {
@@ -58,38 +57,10 @@ void dma_free_coherent(struct device *dev, size_t size,
 #endif
         sbus_free_consistent(dev, size, cpu_addr, dma_handle);
 }
-EXPORT_SYMBOL(dma_free_coherent);
 
-dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,
-                          size_t size, enum dma_data_direction direction)
-{
-#ifdef CONFIG_PCI
-        if (dev->bus == &pci_bus_type)
-                return pci_map_single(to_pci_dev(dev), cpu_addr,
-                                      size, (int)direction);
-#endif
-        return sbus_map_single(dev, cpu_addr, size, (int)direction);
-}
-EXPORT_SYMBOL(dma_map_single);
-
-void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,
-                      size_t size,
-                      enum dma_data_direction direction)
-{
-#ifdef CONFIG_PCI
-        if (dev->bus == &pci_bus_type) {
-                pci_unmap_single(to_pci_dev(dev), dma_addr,
-                                 size, (int)direction);
-                return;
-        }
-#endif
-        sbus_unmap_single(dev, dma_addr, size, (int)direction);
-}
-EXPORT_SYMBOL(dma_unmap_single);
-
-dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                        unsigned long offset, size_t size,
-                        enum dma_data_direction direction)
+static dma_addr_t dma32_map_page(struct device *dev, struct page *page,
+                                 unsigned long offset, size_t size,
+                                 enum dma_data_direction direction)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type)
@@ -99,10 +70,9 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page,
         return sbus_map_single(dev, page_address(page) + offset,
                                size, (int)direction);
 }
-EXPORT_SYMBOL(dma_map_page);
 
-void dma_unmap_page(struct device *dev, dma_addr_t dma_address,
-                    size_t size, enum dma_data_direction direction)
+static void dma32_unmap_page(struct device *dev, dma_addr_t dma_address,
+                             size_t size, enum dma_data_direction direction)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type) {
@@ -113,10 +83,9 @@ void dma_unmap_page(struct device *dev, dma_addr_t dma_address,
 #endif
         sbus_unmap_single(dev, dma_address, size, (int)direction);
 }
-EXPORT_SYMBOL(dma_unmap_page);
 
-int dma_map_sg(struct device *dev, struct scatterlist *sg,
-                             int nents, enum dma_data_direction direction)
+static int dma32_map_sg(struct device *dev, struct scatterlist *sg,
+                        int nents, enum dma_data_direction direction)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type)
@@ -124,10 +93,9 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg,
 #endif
         return sbus_map_sg(dev, sg, nents, direction);
 }
-EXPORT_SYMBOL(dma_map_sg);
 
-void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
-                  int nents, enum dma_data_direction direction)
+void dma32_unmap_sg(struct device *dev, struct scatterlist *sg,
+                    int nents, enum dma_data_direction direction)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type) {
@@ -137,10 +105,10 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
 #endif
         sbus_unmap_sg(dev, sg, nents, (int)direction);
 }
-EXPORT_SYMBOL(dma_unmap_sg);
 
-void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                             size_t size, enum dma_data_direction direction)
+static void dma32_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
+                                      size_t size,
+                                      enum dma_data_direction direction)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type) {
@@ -151,10 +119,10 @@ void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
 #endif
         sbus_dma_sync_single_for_cpu(dev, dma_handle, size, (int) direction);
 }
-EXPORT_SYMBOL(dma_sync_single_for_cpu);
 
-void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
-                                size_t size, enum dma_data_direction direction)
+static void dma32_sync_single_for_device(struct device *dev,
+                                         dma_addr_t dma_handle, size_t size,
+                                         enum dma_data_direction direction)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type) {
@@ -165,28 +133,9 @@ void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
 #endif
         sbus_dma_sync_single_for_device(dev, dma_handle, size, (int) direction);
 }
-EXPORT_SYMBOL(dma_sync_single_for_device);
-
-void dma_sync_single_range_for_cpu(struct device *dev,
-                                   dma_addr_t dma_handle,
-                                   unsigned long offset,
-                                   size_t size,
-                                   enum dma_data_direction direction)
-{
-        dma_sync_single_for_cpu(dev, dma_handle+offset, size, direction);
-}
-EXPORT_SYMBOL(dma_sync_single_range_for_cpu);
-
-void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
-                                      unsigned long offset, size_t size,
-                                      enum dma_data_direction direction)
-{
-        dma_sync_single_for_device(dev, dma_handle+offset, size, direction);
-}
-EXPORT_SYMBOL(dma_sync_single_range_for_device);
 
-void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
-                         int nelems, enum dma_data_direction direction)
+static void dma32_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
+                                  int nelems, enum dma_data_direction direction)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type) {
@@ -197,11 +146,10 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
 #endif
         BUG();
 }
-EXPORT_SYMBOL(dma_sync_sg_for_cpu);
 
-void dma_sync_sg_for_device(struct device *dev,
-                            struct scatterlist *sg, int nelems,
-                            enum dma_data_direction direction)
+static void dma32_sync_sg_for_device(struct device *dev,
+                                     struct scatterlist *sg, int nelems,
+                                     enum dma_data_direction direction)
 {
 #ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type) {
@@ -212,16 +160,19 @@ void dma_sync_sg_for_device(struct device *dev,
 #endif
         BUG();
 }
-EXPORT_SYMBOL(dma_sync_sg_for_device);
 
-int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return (dma_addr == DMA_ERROR_CODE);
-}
-EXPORT_SYMBOL(dma_mapping_error);
-
-int dma_get_cache_alignment(void)
-{
-        return 32;
-}
-EXPORT_SYMBOL(dma_get_cache_alignment);
+static const struct dma_ops dma32_dma_ops = {
+        .alloc_coherent         = dma32_alloc_coherent,
+        .free_coherent          = dma32_free_coherent,
+        .map_page               = dma32_map_page,
+        .unmap_page             = dma32_unmap_page,
+        .map_sg                 = dma32_map_sg,
+        .unmap_sg               = dma32_unmap_sg,
+        .sync_single_for_cpu    = dma32_sync_single_for_cpu,
+        .sync_single_for_device = dma32_sync_single_for_device,
+        .sync_sg_for_cpu        = dma32_sync_sg_for_cpu,
+        .sync_sg_for_device     = dma32_sync_sg_for_device,
+};
+
+const struct dma_ops *dma_ops = &dma32_dma_ops;
+EXPORT_SYMBOL(dma_ops);
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 90350f838f05..4a700f4b79ce 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -544,7 +544,8 @@ static int __cpuinit dr_cpu_configure(struct ds_info *dp,
                              resp_len, ncpus, mask,
                              DR_CPU_STAT_CONFIGURED);
 
-        mdesc_fill_in_cpu_data(*mask);
+        mdesc_populate_present_mask(mask);
+        mdesc_fill_in_cpu_data(mask);
 
         for_each_cpu_mask(cpu, *mask) {
                 int err;
diff --git a/arch/sparc/kernel/ftrace.c b/arch/sparc/kernel/ftrace.c
index d0218e73f982..d3b1a3076569 100644
--- a/arch/sparc/kernel/ftrace.c
+++ b/arch/sparc/kernel/ftrace.c
@@ -7,14 +7,10 @@
 
 #include <asm/ftrace.h>
 
+#ifdef CONFIG_DYNAMIC_FTRACE
 static const u32 ftrace_nop = 0x01000000;
 
-unsigned char *ftrace_nop_replace(void)
-{
-        return (char *)&ftrace_nop;
-}
-
-unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
+static u32 ftrace_call_replace(unsigned long ip, unsigned long addr)
 {
         static u32 call;
         s32 off;
@@ -22,15 +18,11 @@ unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
         off = ((s32)addr - (s32)ip);
         call = 0x40000000 | ((u32)off >> 2);
 
-        return (unsigned char *) &call;
+        return call;
 }
 
-int
-ftrace_modify_code(unsigned long ip, unsigned char *old_code,
-                   unsigned char *new_code)
+static int ftrace_modify_code(unsigned long ip, u32 old, u32 new)
 {
-        u32 old = *(u32 *)old_code;
-        u32 new = *(u32 *)new_code;
         u32 replaced;
         int faulted;
 
@@ -59,18 +51,43 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
         return faulted;
 }
 
+int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, unsigned long addr)
+{
+        unsigned long ip = rec->ip;
+        u32 old, new;
+
+        old = ftrace_call_replace(ip, addr);
+        new = ftrace_nop;
+        return ftrace_modify_code(ip, old, new);
+}
+
+int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
+{
+        unsigned long ip = rec->ip;
+        u32 old, new;
+
+        old = ftrace_nop;
+        new = ftrace_call_replace(ip, addr);
+        return ftrace_modify_code(ip, old, new);
+}
+
 int ftrace_update_ftrace_func(ftrace_func_t func)
 {
         unsigned long ip = (unsigned long)(&ftrace_call);
-        unsigned char old[MCOUNT_INSN_SIZE], *new;
+        u32 old, new;
 
-        memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
+        old = *(u32 *) &ftrace_call;
         new = ftrace_call_replace(ip, (unsigned long)func);
         return ftrace_modify_code(ip, old, new);
 }
 
 int __init ftrace_dyn_arch_init(void *data)
 {
-        ftrace_mcount_set(data);
+        unsigned long *p = data;
+
+        *p = 0;
+
         return 0;
 }
+#endif
+
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index 91bf4c7f79b9..f8f21050448b 100644
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -641,28 +641,6 @@ tlb_fixup_done:
         /* Not reached... */
 
 1:
-        /* If we boot on a non-zero cpu, all of the per-cpu
-         * variable references we make before setting up the
-         * per-cpu areas will use a bogus offset.  Put a
-         * compensating factor into __per_cpu_base to handle
-         * this cleanly.
-         *
-         * What the per-cpu code calculates is:
-         *
-         *      __per_cpu_base + (cpu << __per_cpu_shift)
-         *
-         * These two variables are zero initially, so to
-         * make it all cancel out to zero we need to put
-         * "0 - (cpu << 0)" into __per_cpu_base so that the
-         * above formula evaluates to zero.
-         *
-         * We cannot even perform a printk() until this stuff
-         * is setup as that calls cpu_clock() which uses
-         * per-cpu variables.
-         */
-        sub     %g0, %o0, %o1
-        sethi   %hi(__per_cpu_base), %o2
-        stx     %o1, [%o2 + %lo(__per_cpu_base)]
 #else
         mov     0, %o0
 #endif
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index d8900e1d5aad..0aeaefe696b9 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -351,8 +351,9 @@ static void dma_4u_free_coherent(struct device *dev, size_t size,
                 free_pages((unsigned long)cpu, order);
 }
 
-static dma_addr_t dma_4u_map_single(struct device *dev, void *ptr, size_t sz,
-                                    enum dma_data_direction direction)
+static dma_addr_t dma_4u_map_page(struct device *dev, struct page *page,
+                                  unsigned long offset, size_t sz,
+                                  enum dma_data_direction direction)
 {
         struct iommu *iommu;
         struct strbuf *strbuf;
@@ -368,7 +369,7 @@ static dma_addr_t dma_4u_map_single(struct device *dev, void *ptr, size_t sz,
         if (unlikely(direction == DMA_NONE))
                 goto bad_no_ctx;
 
-        oaddr = (unsigned long)ptr;
+        oaddr = (unsigned long)(page_address(page) + offset);
         npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);
         npages >>= IO_PAGE_SHIFT;
 
@@ -472,8 +473,8 @@ do_flush_sync:
                        vaddr, ctx, npages);
 }
 
-static void dma_4u_unmap_single(struct device *dev, dma_addr_t bus_addr,
-                                size_t sz, enum dma_data_direction direction)
+static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr,
+                              size_t sz, enum dma_data_direction direction)
 {
         struct iommu *iommu;
         struct strbuf *strbuf;
@@ -824,8 +825,8 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
 static const struct dma_ops sun4u_dma_ops = {
         .alloc_coherent         = dma_4u_alloc_coherent,
         .free_coherent          = dma_4u_free_coherent,
-        .map_single             = dma_4u_map_single,
-        .unmap_single           = dma_4u_unmap_single,
+        .map_page               = dma_4u_map_page,
+        .unmap_page             = dma_4u_unmap_page,
         .map_sg                 = dma_4u_map_sg,
         .unmap_sg               = dma_4u_unmap_sg,
         .sync_single_for_cpu    = dma_4u_sync_single_for_cpu,
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index e5e78f9cfc95..bd075054942b 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -45,6 +45,7 @@
 #include <asm/cacheflush.h>
 
 #include "entry.h"
+#include "cpumap.h"
 
 #define NUM_IVECS       (IMAP_INR + 1)
 
@@ -256,35 +257,13 @@ static int irq_choose_cpu(unsigned int virt_irq)
         int cpuid;
 
         cpumask_copy(&mask, irq_desc[virt_irq].affinity);
-        if (cpus_equal(mask, CPU_MASK_ALL)) {
-                static int irq_rover;
-                static DEFINE_SPINLOCK(irq_rover_lock);
-                unsigned long flags;
-
-                /* Round-robin distribution... */
-        do_round_robin:
-                spin_lock_irqsave(&irq_rover_lock, flags);
-
-                while (!cpu_online(irq_rover)) {
-                        if (++irq_rover >= nr_cpu_ids)
-                                irq_rover = 0;
-                }
-                cpuid = irq_rover;
-                do {
-                        if (++irq_rover >= nr_cpu_ids)
-                                irq_rover = 0;
-                } while (!cpu_online(irq_rover));
-
-                spin_unlock_irqrestore(&irq_rover_lock, flags);
+        if (cpus_equal(mask, cpu_online_map)) {
+                cpuid = map_to_cpu(virt_irq);
         } else {
                 cpumask_t tmp;
 
                 cpus_and(tmp, cpu_online_map, mask);
-
-                if (cpus_empty(tmp))
-                        goto do_round_robin;
-
-                cpuid = first_cpu(tmp);
+                cpuid = cpus_empty(tmp) ? map_to_cpu(virt_irq) : first_cpu(tmp);
         }
 
         return cpuid;
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index f0e6ed23a468..938da19dc065 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -574,7 +574,7 @@ static void __init report_platform_properties(void)
         mdesc_release(hp);
 }
 
-static void __devinit fill_in_one_cache(cpuinfo_sparc *c,
+static void __cpuinit fill_in_one_cache(cpuinfo_sparc *c,
                                         struct mdesc_handle *hp,
                                         u64 mp)
 {
@@ -619,8 +619,7 @@ static void __devinit fill_in_one_cache(cpuinfo_sparc *c,
         }
 }
 
-static void __devinit mark_core_ids(struct mdesc_handle *hp, u64 mp,
-                                    int core_id)
+static void __cpuinit mark_core_ids(struct mdesc_handle *hp, u64 mp, int core_id)
 {
         u64 a;
 
@@ -653,7 +652,7 @@ static void __devinit mark_core_ids(struct mdesc_handle *hp, u64 mp,
         }
 }
 
-static void __devinit set_core_ids(struct mdesc_handle *hp)
+static void __cpuinit set_core_ids(struct mdesc_handle *hp)
 {
         int idx;
         u64 mp;
@@ -678,8 +677,7 @@ static void __devinit set_core_ids(struct mdesc_handle *hp)
         }
 }
 
-static void __devinit mark_proc_ids(struct mdesc_handle *hp, u64 mp,
-                                    int proc_id)
+static void __cpuinit mark_proc_ids(struct mdesc_handle *hp, u64 mp, int proc_id)
 {
         u64 a;
 
@@ -698,8 +696,7 @@ static void __devinit mark_proc_ids(struct mdesc_handle *hp, u64 mp,
         }
 }
 
-static void __devinit __set_proc_ids(struct mdesc_handle *hp,
-                                     const char *exec_unit_name)
+static void __cpuinit __set_proc_ids(struct mdesc_handle *hp, const char *exec_unit_name)
 {
         int idx;
         u64 mp;
@@ -720,13 +717,13 @@ static void __devinit __set_proc_ids(struct mdesc_handle *hp,
         }
 }
 
-static void __devinit set_proc_ids(struct mdesc_handle *hp)
+static void __cpuinit set_proc_ids(struct mdesc_handle *hp)
 {
         __set_proc_ids(hp, "exec_unit");
         __set_proc_ids(hp, "exec-unit");
 }
 
-static void __devinit get_one_mondo_bits(const u64 *p, unsigned int *mask,
+static void __cpuinit get_one_mondo_bits(const u64 *p, unsigned int *mask,
                                          unsigned char def)
 {
         u64 val;
@@ -745,7 +742,7 @@ use_default:
         *mask = ((1U << def) * 64U) - 1U;
 }
 
-static void __devinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
+static void __cpuinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
                                      struct trap_per_cpu *tb)
 {
         const u64 *val;
@@ -763,23 +760,15 @@ static void __devinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
         get_one_mondo_bits(val, &tb->nonresum_qmask, 2);
 }
 
-void __cpuinit mdesc_fill_in_cpu_data(cpumask_t mask)
+static void * __cpuinit mdesc_iterate_over_cpus(void *(*func)(struct mdesc_handle *, u64, int, void *), void *arg, cpumask_t *mask)
 {
         struct mdesc_handle *hp = mdesc_grab();
+        void *ret = NULL;
         u64 mp;
 
-        ncpus_probed = 0;
         mdesc_for_each_node_by_name(hp, mp, "cpu") {
                 const u64 *id = mdesc_get_property(hp, mp, "id", NULL);
-                const u64 *cfreq = mdesc_get_property(hp, mp, "clock-frequency", NULL);
-                struct trap_per_cpu *tb;
-                cpuinfo_sparc *c;
-                int cpuid;
-                u64 a;
-
-                ncpus_probed++;
-
-                cpuid = *id;
+                int cpuid = *id;
 
 #ifdef CONFIG_SMP
                 if (cpuid >= NR_CPUS) {
@@ -788,62 +777,104 @@ void __cpuinit mdesc_fill_in_cpu_data(cpumask_t mask)
                                cpuid, NR_CPUS);
                         continue;
                 }
-                if (!cpu_isset(cpuid, mask))
+                if (!cpu_isset(cpuid, *mask))
                         continue;
-#else
-                /* On uniprocessor we only want the values for the
-                 * real physical cpu the kernel booted onto, however
-                 * cpu_data() only has one entry at index 0.
-                 */
-                if (cpuid != real_hard_smp_processor_id())
-                        continue;
-                cpuid = 0;
 #endif
 
-                c = &cpu_data(cpuid);
-                c->clock_tick = *cfreq;
+                ret = func(hp, mp, cpuid, arg);
+                if (ret)
+                        goto out;
+        }
+out:
+        mdesc_release(hp);
+        return ret;
+}
 
-                tb = &trap_block[cpuid];
-                get_mondo_data(hp, mp, tb);
+static void * __cpuinit record_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid, void *arg)
+{
+        ncpus_probed++;
+#ifdef CONFIG_SMP
+        set_cpu_present(cpuid, true);
+#endif
+        return NULL;
+}
 
-                mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_FWD) {
-                        u64 j, t = mdesc_arc_target(hp, a);
-                        const char *t_name;
+void __cpuinit mdesc_populate_present_mask(cpumask_t *mask)
+{
+        if (tlb_type != hypervisor)
+                return;
 
-                        t_name = mdesc_node_name(hp, t);
-                        if (!strcmp(t_name, "cache")) {
-                                fill_in_one_cache(c, hp, t);
-                                continue;
-                        }
+        ncpus_probed = 0;
+        mdesc_iterate_over_cpus(record_one_cpu, NULL, mask);
+}
 
-                        mdesc_for_each_arc(j, hp, t, MDESC_ARC_TYPE_FWD) {
-                                u64 n = mdesc_arc_target(hp, j);
-                                const char *n_name;
+static void * __cpuinit fill_in_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid, void *arg)
+{
+        const u64 *cfreq = mdesc_get_property(hp, mp, "clock-frequency", NULL);
+        struct trap_per_cpu *tb;
+        cpuinfo_sparc *c;
+        u64 a;
 
-                                n_name = mdesc_node_name(hp, n);
-                                if (!strcmp(n_name, "cache"))
-                                        fill_in_one_cache(c, hp, n);
-                        }
+#ifndef CONFIG_SMP
+        /* On uniprocessor we only want the values for the
+         * real physical cpu the kernel booted onto, however
+         * cpu_data() only has one entry at index 0.
+         */
+        if (cpuid != real_hard_smp_processor_id())
+                return NULL;
+        cpuid = 0;
+#endif
+
+        c = &cpu_data(cpuid);
+        c->clock_tick = *cfreq;
+
+        tb = &trap_block[cpuid];
+        get_mondo_data(hp, mp, tb);
+
+        mdesc_for_each_arc(a, hp, mp, MDESC_ARC_TYPE_FWD) {
+                u64 j, t = mdesc_arc_target(hp, a);
+                const char *t_name;
+
+                t_name = mdesc_node_name(hp, t);
+                if (!strcmp(t_name, "cache")) {
+                        fill_in_one_cache(c, hp, t);
+                        continue;
                 }
 
-#ifdef CONFIG_SMP
-                cpu_set(cpuid, cpu_present_map);
-#endif
+                mdesc_for_each_arc(j, hp, t, MDESC_ARC_TYPE_FWD) {
+                        u64 n = mdesc_arc_target(hp, j);
+                        const char *n_name;
 
-                c->core_id = 0;
-                c->proc_id = -1;
+                        n_name = mdesc_node_name(hp, n);
+                        if (!strcmp(n_name, "cache"))
+                                fill_in_one_cache(c, hp, n);
+                }
         }
 
+        c->core_id = 0;
+        c->proc_id = -1;
+
+        return NULL;
+}
+
+void __cpuinit mdesc_fill_in_cpu_data(cpumask_t *mask)
+{
+        struct mdesc_handle *hp;
+
+        mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, mask);
+
 #ifdef CONFIG_SMP
         sparc64_multi_core = 1;
 #endif
 
+        hp = mdesc_grab();
+
         set_core_ids(hp);
         set_proc_ids(hp);
 
-        smp_fill_in_sib_core_maps();
-
         mdesc_release(hp);
+
+        smp_fill_in_sib_core_maps();
 }
 
 static ssize_t mdesc_read(struct file *file, char __user *buf,
@@ -887,7 +918,6 @@ void __init sun4v_mdesc_init(void)
 {
         struct mdesc_handle *hp;
         unsigned long len, real_len, status;
-        cpumask_t mask;
 
         (void) sun4v_mach_desc(0UL, 0UL, &len);
 
@@ -911,7 +941,4 @@ void __init sun4v_mdesc_init(void)
         cur_mdesc = hp;
 
         report_platform_properties();
-
-        cpus_setall(mask);
-        mdesc_fill_in_cpu_data(mask);
 }
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index c8f14c1dc521..90396702ea2c 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -6,159 +6,11 @@
 #include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/irq.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 
-static int node_match(struct device *dev, void *data)
-{
-        struct of_device *op = to_of_device(dev);
-        struct device_node *dp = data;
-
-        return (op->node == dp);
-}
-
-struct of_device *of_find_device_by_node(struct device_node *dp)
-{
-        struct device *dev = bus_find_device(&of_platform_bus_type, NULL,
-                                             dp, node_match);
-
-        if (dev)
-                return to_of_device(dev);
-
-        return NULL;
-}
-EXPORT_SYMBOL(of_find_device_by_node);
-
-unsigned int irq_of_parse_and_map(struct device_node *node, int index)
-{
-        struct of_device *op = of_find_device_by_node(node);
-
-        if (!op || index >= op->num_irqs)
-                return 0;
-
-        return op->irqs[index];
-}
-EXPORT_SYMBOL(irq_of_parse_and_map);
-
-/* Take the archdata values for IOMMU, STC, and HOSTDATA found in
- * BUS and propagate to all child of_device objects.
- */
-void of_propagate_archdata(struct of_device *bus)
-{
-        struct dev_archdata *bus_sd = &bus->dev.archdata;
-        struct device_node *bus_dp = bus->node;
-        struct device_node *dp;
-
-        for (dp = bus_dp->child; dp; dp = dp->sibling) {
-                struct of_device *op = of_find_device_by_node(dp);
-
-                op->dev.archdata.iommu = bus_sd->iommu;
-                op->dev.archdata.stc = bus_sd->stc;
-                op->dev.archdata.host_controller = bus_sd->host_controller;
-                op->dev.archdata.numa_node = bus_sd->numa_node;
-
-                if (dp->child)
-                        of_propagate_archdata(op);
-        }
-}
-
-struct bus_type of_platform_bus_type;
-EXPORT_SYMBOL(of_platform_bus_type);
-
-static inline u64 of_read_addr(const u32 *cell, int size)
-{
-        u64 r = 0;
-        while (size--)
-                r = (r << 32) | *(cell++);
-        return r;
-}
-
-static void __init get_cells(struct device_node *dp,
-                             int *addrc, int *sizec)
-{
-        if (addrc)
-                *addrc = of_n_addr_cells(dp);
-        if (sizec)
-                *sizec = of_n_size_cells(dp);
-}
-
-/* Max address size we deal with */
-#define OF_MAX_ADDR_CELLS       4
-
-struct of_bus {
-        const char      *name;
-        const char      *addr_prop_name;
-        int             (*match)(struct device_node *parent);
-        void            (*count_cells)(struct device_node *child,
-                                       int *addrc, int *sizec);
-        int             (*map)(u32 *addr, const u32 *range,
-                               int na, int ns, int pna);
-        unsigned long   (*get_flags)(const u32 *addr, unsigned long);
-};
-
-/*
- * Default translator (generic bus)
- */
-
-static void of_bus_default_count_cells(struct device_node *dev,
-                                       int *addrc, int *sizec)
-{
-        get_cells(dev, addrc, sizec);
-}
-
-/* Make sure the least significant 64-bits are in-range.  Even
- * for 3 or 4 cell values it is a good enough approximation.
- */
-static int of_out_of_range(const u32 *addr, const u32 *base,
-                           const u32 *size, int na, int ns)
-{
-        u64 a = of_read_addr(addr, na);
-        u64 b = of_read_addr(base, na);
-
-        if (a < b)
-                return 1;
-
-        b += of_read_addr(size, ns);
-        if (a >= b)
-                return 1;
-
-        return 0;
-}
-
-static int of_bus_default_map(u32 *addr, const u32 *range,
-                              int na, int ns, int pna)
-{
-        u32 result[OF_MAX_ADDR_CELLS];
-        int i;
-
-        if (ns > 2) {
-                printk("of_device: Cannot handle size cells (%d) > 2.", ns);
-                return -EINVAL;
-        }
-
-        if (of_out_of_range(addr, range, range + na + pna, na, ns))
-                return -EINVAL;
-
-        /* Start with the parent range base.  */
-        memcpy(result, range + na, pna * 4);
-
-        /* Add in the child address offset.  */
-        for (i = 0; i < na; i++)
-                result[pna - 1 - i] +=
-                        (addr[na - 1 - i] -
-                         range[na - 1 - i]);
-
-        memcpy(addr, result, pna * 4);
-
-        return 0;
-}
-
-static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)
-{
-        if (flags)
-                return flags;
-        return IORESOURCE_MEM;
-}
+#include "of_device_common.h"
 
 /*
  * PCI bus specific translator
@@ -240,47 +92,6 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
         return flags;
 }
 
-/*
- * SBUS bus specific translator
- */
-
-static int of_bus_sbus_match(struct device_node *np)
-{
-        struct device_node *dp = np;
-
-        while (dp) {
-                if (!strcmp(dp->name, "sbus") ||
-                    !strcmp(dp->name, "sbi"))
-                        return 1;
-
-                /* Have a look at use_1to1_mapping().  We're trying
-                 * to match SBUS if that's the top-level bus and we
-                 * don't have some intervening real bus that provides
-                 * ranges based translations.
-                 */
-                if (of_find_property(dp, "ranges", NULL) != NULL)
-                        break;
-
-                dp = dp->parent;
-        }
-
-        return 0;
-}
-
-static void of_bus_sbus_count_cells(struct device_node *child,
-                                   int *addrc, int *sizec)
-{
-        if (addrc)
-                *addrc = 2;
-        if (sizec)
-                *sizec = 1;
-}
-
-static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)
-{
-        return of_bus_default_map(addr, range, na, ns, pna);
-}
-
 static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags)
 {
         return IORESOURCE_MEM;
@@ -307,7 +118,7 @@ static struct of_bus of_busses[] = {
                 .addr_prop_name = "reg",
                 .match = of_bus_sbus_match,
                 .count_cells = of_bus_sbus_count_cells,
-                .map = of_bus_sbus_map,
+                .map = of_bus_default_map,
                 .get_flags = of_bus_sbus_get_flags,
         },
         /* Default */
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 5ac287ac03de..881947e59e95 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -10,6 +10,8 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 
+#include "of_device_common.h"
+
 void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name)
 {
         unsigned long ret = res->start + offset;
@@ -35,156 +37,6 @@ void of_iounmap(struct resource *res, void __iomem *base, unsigned long size)
 }
 EXPORT_SYMBOL(of_iounmap);
 
-static int node_match(struct device *dev, void *data)
-{
-        struct of_device *op = to_of_device(dev);
-        struct device_node *dp = data;
-
-        return (op->node == dp);
-}
-
-struct of_device *of_find_device_by_node(struct device_node *dp)
-{
-        struct device *dev = bus_find_device(&of_platform_bus_type, NULL,
-                                             dp, node_match);
-
-        if (dev)
-                return to_of_device(dev);
-
-        return NULL;
-}
-EXPORT_SYMBOL(of_find_device_by_node);
-
-unsigned int irq_of_parse_and_map(struct device_node *node, int index)
-{
-        struct of_device *op = of_find_device_by_node(node);
-
-        if (!op || index >= op->num_irqs)
-                return 0;
-
-        return op->irqs[index];
-}
-EXPORT_SYMBOL(irq_of_parse_and_map);
-
-/* Take the archdata values for IOMMU, STC, and HOSTDATA found in
- * BUS and propagate to all child of_device objects.
- */
-void of_propagate_archdata(struct of_device *bus)
-{
-        struct dev_archdata *bus_sd = &bus->dev.archdata;
-        struct device_node *bus_dp = bus->node;
-        struct device_node *dp;
-
-        for (dp = bus_dp->child; dp; dp = dp->sibling) {
-                struct of_device *op = of_find_device_by_node(dp);
-
-                op->dev.archdata.iommu = bus_sd->iommu;
-                op->dev.archdata.stc = bus_sd->stc;
-                op->dev.archdata.host_controller = bus_sd->host_controller;
-                op->dev.archdata.numa_node = bus_sd->numa_node;
-
-                if (dp->child)
-                        of_propagate_archdata(op);
-        }
-}
-
-struct bus_type of_platform_bus_type;
-EXPORT_SYMBOL(of_platform_bus_type);
-
-static inline u64 of_read_addr(const u32 *cell, int size)
-{
-        u64 r = 0;
-        while (size--)
-                r = (r << 32) | *(cell++);
-        return r;
-}
-
-static void get_cells(struct device_node *dp, int *addrc, int *sizec)
-{
-        if (addrc)
-                *addrc = of_n_addr_cells(dp);
-        if (sizec)
-                *sizec = of_n_size_cells(dp);
-}
-
-/* Max address size we deal with */
-#define OF_MAX_ADDR_CELLS       4
-
-struct of_bus {
-        const char      *name;
-        const char      *addr_prop_name;
-        int             (*match)(struct device_node *parent);
-        void            (*count_cells)(struct device_node *child,
-                                       int *addrc, int *sizec);
-        int             (*map)(u32 *addr, const u32 *range,
-                               int na, int ns, int pna);
-        unsigned long   (*get_flags)(const u32 *addr, unsigned long);
-};
-
-/*
- * Default translator (generic bus)
- */
-
-static void of_bus_default_count_cells(struct device_node *dev,
-                                       int *addrc, int *sizec)
-{
-        get_cells(dev, addrc, sizec);
-}
-
-/* Make sure the least significant 64-bits are in-range.  Even
- * for 3 or 4 cell values it is a good enough approximation.
- */
-static int of_out_of_range(const u32 *addr, const u32 *base,
-                           const u32 *size, int na, int ns)
-{
-        u64 a = of_read_addr(addr, na);
-        u64 b = of_read_addr(base, na);
-
-        if (a < b)
-                return 1;
-
-        b += of_read_addr(size, ns);
-        if (a >= b)
-                return 1;
-
-        return 0;
-}
-
-static int of_bus_default_map(u32 *addr, const u32 *range,
-                              int na, int ns, int pna)
-{
-        u32 result[OF_MAX_ADDR_CELLS];
-        int i;
-
-        if (ns > 2) {
-                printk("of_device: Cannot handle size cells (%d) > 2.", ns);
-                return -EINVAL;
-        }
-
-        if (of_out_of_range(addr, range, range + na + pna, na, ns))
-                return -EINVAL;
-
-        /* Start with the parent range base.  */
-        memcpy(result, range + na, pna * 4);
-
-        /* Add in the child address offset.  */
-        for (i = 0; i < na; i++)
-                result[pna - 1 - i] +=
-                        (addr[na - 1 - i] -
-                         range[na - 1 - i]);
-
-        memcpy(addr, result, pna * 4);
-
-        return 0;
-}
-
-static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)
-{
-        if (flags)
-                return flags;
-        return IORESOURCE_MEM;
-}
-
 /*
  * PCI bus specific translator
  */
@@ -295,42 +147,6 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
 }
 
 /*
- * SBUS bus specific translator
- */
-
-static int of_bus_sbus_match(struct device_node *np)
-{
-        struct device_node *dp = np;
-
-        while (dp) {
-                if (!strcmp(dp->name, "sbus") ||
-                    !strcmp(dp->name, "sbi"))
-                        return 1;
-
-                /* Have a look at use_1to1_mapping().  We're trying
-                 * to match SBUS if that's the top-level bus and we
-                 * don't have some intervening real bus that provides
-                 * ranges based translations.
-                 */
-                if (of_find_property(dp, "ranges", NULL) != NULL)
-                        break;
-
-                dp = dp->parent;
-        }
-
-        return 0;
-}
-
-static void of_bus_sbus_count_cells(struct device_node *child,
-                                   int *addrc, int *sizec)
-{
-        if (addrc)
-                *addrc = 2;
-        if (sizec)
-                *sizec = 1;
-}
-
-/*
  * FHC/Central bus specific translator.
  *
  * This is just needed to hard-code the address and size cell
diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c
new file mode 100644
index 000000000000..cb8eb799bb6c
--- /dev/null
+++ b/arch/sparc/kernel/of_device_common.c
@@ -0,0 +1,174 @@
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mod_devicetable.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/irq.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
+
+#include "of_device_common.h"
+
+static int node_match(struct device *dev, void *data)
+{
+        struct of_device *op = to_of_device(dev);
+        struct device_node *dp = data;
+
+        return (op->node == dp);
+}
+
+struct of_device *of_find_device_by_node(struct device_node *dp)
+{
+        struct device *dev = bus_find_device(&of_platform_bus_type, NULL,
+                                             dp, node_match);
+
+        if (dev)
+                return to_of_device(dev);
+
+        return NULL;
+}
+EXPORT_SYMBOL(of_find_device_by_node);
+
+unsigned int irq_of_parse_and_map(struct device_node *node, int index)
+{
+        struct of_device *op = of_find_device_by_node(node);
+
+        if (!op || index >= op->num_irqs)
+                return 0;
+
+        return op->irqs[index];
+}
+EXPORT_SYMBOL(irq_of_parse_and_map);
+
+/* Take the archdata values for IOMMU, STC, and HOSTDATA found in
+ * BUS and propagate to all child of_device objects.
+ */
+void of_propagate_archdata(struct of_device *bus)
+{
+        struct dev_archdata *bus_sd = &bus->dev.archdata;
+        struct device_node *bus_dp = bus->node;
+        struct device_node *dp;
+
+        for (dp = bus_dp->child; dp; dp = dp->sibling) {
+                struct of_device *op = of_find_device_by_node(dp);
+
+                op->dev.archdata.iommu = bus_sd->iommu;
+                op->dev.archdata.stc = bus_sd->stc;
+                op->dev.archdata.host_controller = bus_sd->host_controller;
+                op->dev.archdata.numa_node = bus_sd->numa_node;
+
+                if (dp->child)
+                        of_propagate_archdata(op);
+        }
+}
+
+struct bus_type of_platform_bus_type;
+EXPORT_SYMBOL(of_platform_bus_type);
+
+static void get_cells(struct device_node *dp, int *addrc, int *sizec)
+{
+        if (addrc)
+                *addrc = of_n_addr_cells(dp);
+        if (sizec)
+                *sizec = of_n_size_cells(dp);
+}
+
+/*
+ * Default translator (generic bus)
+ */
+
+void of_bus_default_count_cells(struct device_node *dev, int *addrc, int *sizec)
+{
+        get_cells(dev, addrc, sizec);
+}
+
+/* Make sure the least significant 64-bits are in-range.  Even
+ * for 3 or 4 cell values it is a good enough approximation.
+ */
+int of_out_of_range(const u32 *addr, const u32 *base,
+                    const u32 *size, int na, int ns)
+{
+        u64 a = of_read_addr(addr, na);
+        u64 b = of_read_addr(base, na);
+
+        if (a < b)
+                return 1;
+
+        b += of_read_addr(size, ns);
+        if (a >= b)
+                return 1;
+
+        return 0;
+}
+
+int of_bus_default_map(u32 *addr, const u32 *range, int na, int ns, int pna)
+{
+        u32 result[OF_MAX_ADDR_CELLS];
+        int i;
+
+        if (ns > 2) {
+                printk("of_device: Cannot handle size cells (%d) > 2.", ns);
+                return -EINVAL;
+        }
+
+        if (of_out_of_range(addr, range, range + na + pna, na, ns))
+                return -EINVAL;
+
+        /* Start with the parent range base.  */
+        memcpy(result, range + na, pna * 4);
+
+        /* Add in the child address offset.  */
+        for (i = 0; i < na; i++)
+                result[pna - 1 - i] +=
+                        (addr[na - 1 - i] -
+                         range[na - 1 - i]);
+
+        memcpy(addr, result, pna * 4);
+
+        return 0;
+}
+
+unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)
+{
+        if (flags)
+                return flags;
+        return IORESOURCE_MEM;
+}
+
+/*
+ * SBUS bus specific translator
+ */
+
+int of_bus_sbus_match(struct device_node *np)
+{
+        struct device_node *dp = np;
+
+        while (dp) {
+                if (!strcmp(dp->name, "sbus") ||
+                    !strcmp(dp->name, "sbi"))
+                        return 1;
+
+                /* Have a look at use_1to1_mapping().  We're trying
+                 * to match SBUS if that's the top-level bus and we
+                 * don't have some intervening real bus that provides
+                 * ranges based translations.
+                 */
+                if (of_find_property(dp, "ranges", NULL) != NULL)
+                        break;
+
+                dp = dp->parent;
+        }
+
+        return 0;
+}
+
+void of_bus_sbus_count_cells(struct device_node *child, int *addrc, int *sizec)
+{
+        if (addrc)
+                *addrc = 2;
+        if (sizec)
+                *sizec = 1;
+}
diff --git a/arch/sparc/kernel/of_device_common.h b/arch/sparc/kernel/of_device_common.h
new file mode 100644
index 000000000000..cdfd23992841
--- /dev/null
+++ b/arch/sparc/kernel/of_device_common.h
@@ -0,0 +1,36 @@
+#ifndef _OF_DEVICE_COMMON_H
+#define _OF_DEVICE_COMMON_H
+
+static inline u64 of_read_addr(const u32 *cell, int size)
+{
+        u64 r = 0;
+        while (size--)
+                r = (r << 32) | *(cell++);
+        return r;
+}
+
+void of_bus_default_count_cells(struct device_node *dev, int *addrc,
+                                int *sizec);
+int of_out_of_range(const u32 *addr, const u32 *base,
+                    const u32 *size, int na, int ns);
+int of_bus_default_map(u32 *addr, const u32 *range, int na, int ns, int pna);
+unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags);
+
+int of_bus_sbus_match(struct device_node *np);
+void of_bus_sbus_count_cells(struct device_node *child, int *addrc, int *sizec);
+
+/* Max address size we deal with */
+#define OF_MAX_ADDR_CELLS       4
+
+struct of_bus {
+        const char      *name;
+        const char      *addr_prop_name;
+        int             (*match)(struct device_node *parent);
+        void            (*count_cells)(struct device_node *child,
+                                       int *addrc, int *sizec);
+        int             (*map)(u32 *addr, const u32 *range,
+                               int na, int ns, int pna);
+        unsigned long   (*get_flags)(const u32 *addr, unsigned long);
+};
+
+#endif /* _OF_DEVICE_COMMON_H */
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index 5db5ebed35da..2485eaa23101 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -230,8 +230,9 @@ static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu,
                 free_pages((unsigned long)cpu, order);
 }
 
-static dma_addr_t dma_4v_map_single(struct device *dev, void *ptr, size_t sz,
-                                    enum dma_data_direction direction)
+static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
+                                  unsigned long offset, size_t sz,
+                                  enum dma_data_direction direction)
 {
         struct iommu *iommu;
         unsigned long flags, npages, oaddr;
@@ -245,7 +246,7 @@ static dma_addr_t dma_4v_map_single(struct device *dev, void *ptr, size_t sz,
         if (unlikely(direction == DMA_NONE))
                 goto bad;
 
-        oaddr = (unsigned long)ptr;
+        oaddr = (unsigned long)(page_address(page) + offset);
         npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);
         npages >>= IO_PAGE_SHIFT;
 
@@ -294,8 +295,8 @@ iommu_map_fail:
         return DMA_ERROR_CODE;
 }
 
-static void dma_4v_unmap_single(struct device *dev, dma_addr_t bus_addr,
-                                size_t sz, enum dma_data_direction direction)
+static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr,
+                              size_t sz, enum dma_data_direction direction)
 {
         struct pci_pbm_info *pbm;
         struct iommu *iommu;
@@ -537,8 +538,8 @@ static void dma_4v_sync_sg_for_cpu(struct device *dev,
 static const struct dma_ops sun4v_dma_ops = {
         .alloc_coherent                 = dma_4v_alloc_coherent,
         .free_coherent                  = dma_4v_free_coherent,
-        .map_single                     = dma_4v_map_single,
-        .unmap_single                   = dma_4v_unmap_single,
+        .map_page                       = dma_4v_map_page,
+        .unmap_page                     = dma_4v_unmap_page,
         .map_sg                         = dma_4v_map_sg,
         .unmap_sg                       = dma_4v_unmap_sg,
         .sync_single_for_cpu            = dma_4v_sync_single_for_cpu,
diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h
index bb0f0fda6cab..453397fe5e14 100644
--- a/arch/sparc/kernel/prom.h
+++ b/arch/sparc/kernel/prom.h
@@ -22,7 +22,6 @@ static inline int is_root_node(const struct device_node *dp)
 
 extern char *build_path_component(struct device_node *dp);
 extern void of_console_init(void);
-extern void of_fill_in_cpu_data(void);
 
 extern unsigned int prom_early_allocated;
 
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index ca55c7012f77..fb06ac2bd38f 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -374,75 +374,26 @@ static const char *get_mid_prop(void)
         return (tlb_type == spitfire ? "upa-portid" : "portid");
 }
 
-struct device_node *of_find_node_by_cpuid(int cpuid)
-{
-        struct device_node *dp;
-        const char *mid_prop = get_mid_prop();
-
-        for_each_node_by_type(dp, "cpu") {
-                int id = of_getintprop_default(dp, mid_prop, -1);
-                const char *this_mid_prop = mid_prop;
-
-                if (id < 0) {
-                        this_mid_prop = "cpuid";
-                        id = of_getintprop_default(dp, this_mid_prop, -1);
-                }
-
-                if (id < 0) {
-                        prom_printf("OF: Serious problem, cpu lacks "
-                                    "%s property", this_mid_prop);
-                        prom_halt();
-                }
-                if (cpuid == id)
-                        return dp;
-        }
-        return NULL;
-}
-
-void __init of_fill_in_cpu_data(void)
+static void *of_iterate_over_cpus(void *(*func)(struct device_node *, int, int), int arg)
 {
         struct device_node *dp;
         const char *mid_prop;
 
-        if (tlb_type == hypervisor)
-                return;
-
         mid_prop = get_mid_prop();
-        ncpus_probed = 0;
         for_each_node_by_type(dp, "cpu") {
                 int cpuid = of_getintprop_default(dp, mid_prop, -1);
                 const char *this_mid_prop = mid_prop;
-                struct device_node *portid_parent;
-                int portid = -1;
+                void *ret;
 
-                portid_parent = NULL;
                 if (cpuid < 0) {
                         this_mid_prop = "cpuid";
                         cpuid = of_getintprop_default(dp, this_mid_prop, -1);
-                        if (cpuid >= 0) {
-                                int limit = 2;
-
-                                portid_parent = dp;
-                                while (limit--) {
-                                        portid_parent = portid_parent->parent;
-                                        if (!portid_parent)
-                                                break;
-                                        portid = of_getintprop_default(portid_parent,
-                                                                       "portid", -1);
-                                        if (portid >= 0)
-                                                break;
-                                }
-                        }
                 }
-
                 if (cpuid < 0) {
                         prom_printf("OF: Serious problem, cpu lacks "
                                     "%s property", this_mid_prop);
                         prom_halt();
                 }
-
-                ncpus_probed++;
-
 #ifdef CONFIG_SMP
                 if (cpuid >= NR_CPUS) {
                         printk(KERN_WARNING "Ignoring CPU %d which is "
@@ -450,79 +401,142 @@ void __init of_fill_in_cpu_data(void)
                                cpuid, NR_CPUS);
                         continue;
                 }
-#else
-                /* On uniprocessor we only want the values for the
-                 * real physical cpu the kernel booted onto, however
-                 * cpu_data() only has one entry at index 0.
-                 */
-                if (cpuid != real_hard_smp_processor_id())
-                        continue;
-                cpuid = 0;
 #endif
+                ret = func(dp, cpuid, arg);
+                if (ret)
+                        return ret;
+        }
+        return NULL;
+}
 
-                cpu_data(cpuid).clock_tick =
-                        of_getintprop_default(dp, "clock-frequency", 0);
-
-                if (portid_parent) {
-                        cpu_data(cpuid).dcache_size =
-                                of_getintprop_default(dp, "l1-dcache-size",
-                                                      16 * 1024);
-                        cpu_data(cpuid).dcache_line_size =
-                                of_getintprop_default(dp, "l1-dcache-line-size",
-                                                      32);
-                        cpu_data(cpuid).icache_size =
-                                of_getintprop_default(dp, "l1-icache-size",
-                                                      8 * 1024);
-                        cpu_data(cpuid).icache_line_size =
-                                of_getintprop_default(dp, "l1-icache-line-size",
-                                                      32);
-                        cpu_data(cpuid).ecache_size =
-                                of_getintprop_default(dp, "l2-cache-size", 0);
-                        cpu_data(cpuid).ecache_line_size =
-                                of_getintprop_default(dp, "l2-cache-line-size", 0);
-                        if (!cpu_data(cpuid).ecache_size ||
-                            !cpu_data(cpuid).ecache_line_size) {
-                                cpu_data(cpuid).ecache_size =
-                                        of_getintprop_default(portid_parent,
-                                                              "l2-cache-size",
-                                                              (4 * 1024 * 1024));
-                                cpu_data(cpuid).ecache_line_size =
-                                        of_getintprop_default(portid_parent,
-                                                              "l2-cache-line-size", 64);
-                        }
-
-                        cpu_data(cpuid).core_id = portid + 1;
-                        cpu_data(cpuid).proc_id = portid;
+static void *check_cpu_node(struct device_node *dp, int cpuid, int id)
+{
+        if (id == cpuid)
+                return dp;
+        return NULL;
+}
+
+struct device_node *of_find_node_by_cpuid(int cpuid)
+{
+        return of_iterate_over_cpus(check_cpu_node, cpuid);
+}
+
+static void *record_one_cpu(struct device_node *dp, int cpuid, int arg)
+{
+        ncpus_probed++;
 #ifdef CONFIG_SMP
-                        sparc64_multi_core = 1;
+        set_cpu_present(cpuid, true);
+        set_cpu_possible(cpuid, true);
 #endif
-                } else {
-                        cpu_data(cpuid).dcache_size =
-                                of_getintprop_default(dp, "dcache-size", 16 * 1024);
-                        cpu_data(cpuid).dcache_line_size =
-                                of_getintprop_default(dp, "dcache-line-size", 32);
+        return NULL;
+}
 
-                        cpu_data(cpuid).icache_size =
-                                of_getintprop_default(dp, "icache-size", 16 * 1024);
-                        cpu_data(cpuid).icache_line_size =
-                                of_getintprop_default(dp, "icache-line-size", 32);
+void __init of_populate_present_mask(void)
+{
+        if (tlb_type == hypervisor)
+                return;
+
+        ncpus_probed = 0;
+        of_iterate_over_cpus(record_one_cpu, 0);
+}
 
+static void *fill_in_one_cpu(struct device_node *dp, int cpuid, int arg)
+{
+        struct device_node *portid_parent = NULL;
+        int portid = -1;
+
+        if (of_find_property(dp, "cpuid", NULL)) {
+                int limit = 2;
+
+                portid_parent = dp;
+                while (limit--) {
+                        portid_parent = portid_parent->parent;
+                        if (!portid_parent)
+                                break;
+                        portid = of_getintprop_default(portid_parent,
+                                                       "portid", -1);
+                        if (portid >= 0)
+                                break;
+                }
+        }
+
+#ifndef CONFIG_SMP
+        /* On uniprocessor we only want the values for the
+         * real physical cpu the kernel booted onto, however
+         * cpu_data() only has one entry at index 0.
+         */
+        if (cpuid != real_hard_smp_processor_id())
+                return NULL;
+        cpuid = 0;
+#endif
+
+        cpu_data(cpuid).clock_tick =
+                of_getintprop_default(dp, "clock-frequency", 0);
+
+        if (portid_parent) {
+                cpu_data(cpuid).dcache_size =
+                        of_getintprop_default(dp, "l1-dcache-size",
+                                              16 * 1024);
+                cpu_data(cpuid).dcache_line_size =
+                        of_getintprop_default(dp, "l1-dcache-line-size",
+                                              32);
+                cpu_data(cpuid).icache_size =
+                        of_getintprop_default(dp, "l1-icache-size",
+                                              8 * 1024);
+                cpu_data(cpuid).icache_line_size =
+                        of_getintprop_default(dp, "l1-icache-line-size",
+                                              32);
+                cpu_data(cpuid).ecache_size =
+                        of_getintprop_default(dp, "l2-cache-size", 0);
+                cpu_data(cpuid).ecache_line_size =
+                        of_getintprop_default(dp, "l2-cache-line-size", 0);
+                if (!cpu_data(cpuid).ecache_size ||
+                    !cpu_data(cpuid).ecache_line_size) {
                         cpu_data(cpuid).ecache_size =
-                                of_getintprop_default(dp, "ecache-size",
+                                of_getintprop_default(portid_parent,
+                                                      "l2-cache-size",
                                                       (4 * 1024 * 1024));
                         cpu_data(cpuid).ecache_line_size =
-                                of_getintprop_default(dp, "ecache-line-size", 64);
-
-                        cpu_data(cpuid).core_id = 0;
-                        cpu_data(cpuid).proc_id = -1;
+                                of_getintprop_default(portid_parent,
+                                                      "l2-cache-line-size", 64);
                 }
 
+                cpu_data(cpuid).core_id = portid + 1;
+                cpu_data(cpuid).proc_id = portid;
 #ifdef CONFIG_SMP
-                set_cpu_present(cpuid, true);
-                set_cpu_possible(cpuid, true);
+                sparc64_multi_core = 1;
 #endif
+        } else {
+                cpu_data(cpuid).dcache_size =
+                        of_getintprop_default(dp, "dcache-size", 16 * 1024);
+                cpu_data(cpuid).dcache_line_size =
+                        of_getintprop_default(dp, "dcache-line-size", 32);
+
+                cpu_data(cpuid).icache_size =
+                        of_getintprop_default(dp, "icache-size", 16 * 1024);
+                cpu_data(cpuid).icache_line_size =
+                        of_getintprop_default(dp, "icache-line-size", 32);
+
+                cpu_data(cpuid).ecache_size =
+                        of_getintprop_default(dp, "ecache-size",
+                                              (4 * 1024 * 1024));
+                cpu_data(cpuid).ecache_line_size =
+                        of_getintprop_default(dp, "ecache-line-size", 64);
+
+                cpu_data(cpuid).core_id = 0;
+                cpu_data(cpuid).proc_id = -1;
         }
 
+        return NULL;
+}
+
+void __init of_fill_in_cpu_data(void)
+{
+        if (tlb_type == hypervisor)
+                return;
+
+        of_iterate_over_cpus(fill_in_one_cpu, 0);
+
         smp_fill_in_sib_core_maps();
 }
 
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index ff7b591c8946..0fb5789d43c8 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -313,6 +313,4 @@ void __init prom_build_devicetree(void)
 
         printk("PROM: Built device tree with %u bytes of memory.\n",
                prom_early_allocated);
-
-        of_fill_in_cpu_data();
 }
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index f7642e5a94db..fa44eaf8d897 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -20,7 +20,8 @@
 #include <linux/cache.h>
 #include <linux/jiffies.h>
 #include <linux/profile.h>
-#include <linux/lmb.h>
+#include <linux/bootmem.h>
+#include <linux/vmalloc.h>
 #include <linux/cpu.h>
 
 #include <asm/head.h>
@@ -47,6 +48,8 @@
 #include <asm/ldc.h>
 #include <asm/hypervisor.h>
 
+#include "cpumap.h"
+
 int sparc64_multi_core __read_mostly;
 
 DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE;
@@ -278,7 +281,7 @@ static unsigned long kimage_addr_to_ra(void *p)
         return kern_base + (val - KERNBASE);
 }
 
-static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
+static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg, void **descrp)
 {
         extern unsigned long sparc64_ttable_tl0;
         extern unsigned long kern_locked_tte_data;
@@ -298,12 +301,12 @@ static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread
                        "hvtramp_descr.\n");
                 return;
         }
+        *descrp = hdesc;
 
         hdesc->cpu = cpu;
         hdesc->num_mappings = num_kernel_image_mappings;
 
         tb = &trap_block[cpu];
-        tb->hdesc = hdesc;
 
         hdesc->fault_info_va = (unsigned long) &tb->fault_info;
         hdesc->fault_info_pa = kimage_addr_to_ra(&tb->fault_info);
@@ -341,12 +344,12 @@ static struct thread_info *cpu_new_thread = NULL;
 
 static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
 {
-        struct trap_per_cpu *tb = &trap_block[cpu];
         unsigned long entry =
                 (unsigned long)(&sparc64_cpu_startup);
         unsigned long cookie =
                 (unsigned long)(&cpu_new_thread);
         struct task_struct *p;
+        void *descr = NULL;
         int timeout, ret;
 
         p = fork_idle(cpu);
@@ -359,7 +362,8 @@ static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
 #if defined(CONFIG_SUN_LDOMS) && defined(CONFIG_HOTPLUG_CPU)
                 if (ldom_domaining_enabled)
                         ldom_startcpu_cpuid(cpu,
-                                            (unsigned long) cpu_new_thread);
+                                            (unsigned long) cpu_new_thread,
+                                            &descr);
                 else
 #endif
                         prom_startcpu_cpuid(cpu, entry, cookie);
@@ -383,10 +387,7 @@ static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
         }
         cpu_new_thread = NULL;
 
-        if (tb->hdesc) {
-                kfree(tb->hdesc);
-                tb->hdesc = NULL;
-        }
+        kfree(descr);
 
         return ret;
 }
@@ -1315,6 +1316,8 @@ int __cpu_disable(void)
         cpu_clear(cpu, cpu_online_map);
         ipi_call_unlock();
 
+        cpu_map_rebuild();
+
         return 0;
 }
 
@@ -1373,36 +1376,171 @@ void smp_send_stop(void)
 {
 }
 
-unsigned long __per_cpu_base __read_mostly;
-unsigned long __per_cpu_shift __read_mostly;
+/**
+ * pcpu_alloc_bootmem - NUMA friendly alloc_bootmem wrapper for percpu
+ * @cpu: cpu to allocate for
+ * @size: size allocation in bytes
+ * @align: alignment
+ *
+ * Allocate @size bytes aligned at @align for cpu @cpu.  This wrapper
+ * does the right thing for NUMA regardless of the current
+ * configuration.
+ *
+ * RETURNS:
+ * Pointer to the allocated area on success, NULL on failure.
+ */
+static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
+                                        unsigned long align)
+{
+        const unsigned long goal = __pa(MAX_DMA_ADDRESS);
+#ifdef CONFIG_NEED_MULTIPLE_NODES
+        int node = cpu_to_node(cpu);
+        void *ptr;
+
+        if (!node_online(node) || !NODE_DATA(node)) {
+                ptr = __alloc_bootmem(size, align, goal);
+                pr_info("cpu %d has no node %d or node-local memory\n",
+                        cpu, node);
+                pr_debug("per cpu data for cpu%d %lu bytes at %016lx\n",
+                         cpu, size, __pa(ptr));
+        } else {
+                ptr = __alloc_bootmem_node(NODE_DATA(node),
+                                           size, align, goal);
+                pr_debug("per cpu data for cpu%d %lu bytes on node%d at "
+                         "%016lx\n", cpu, size, node, __pa(ptr));
+        }
+        return ptr;
+#else
+        return __alloc_bootmem(size, align, goal);
+#endif
+}
 
-EXPORT_SYMBOL(__per_cpu_base);
-EXPORT_SYMBOL(__per_cpu_shift);
+static size_t pcpur_size __initdata;
+static void **pcpur_ptrs __initdata;
 
-void __init real_setup_per_cpu_areas(void)
+static struct page * __init pcpur_get_page(unsigned int cpu, int pageno)
 {
-        unsigned long paddr, goal, size, i;
-        char *ptr;
+        size_t off = (size_t)pageno << PAGE_SHIFT;
 
-        /* Copy section for each CPU (we discard the original) */
-        goal = PERCPU_ENOUGH_ROOM;
+        if (off >= pcpur_size)
+                return NULL;
 
-        __per_cpu_shift = PAGE_SHIFT;
-        for (size = PAGE_SIZE; size < goal; size <<= 1UL)
-                __per_cpu_shift++;
+        return virt_to_page(pcpur_ptrs[cpu] + off);
+}
+
+#define PCPU_CHUNK_SIZE (4UL * 1024UL * 1024UL)
+
+static void __init pcpu_map_range(unsigned long start, unsigned long end,
+                                  struct page *page)
+{
+        unsigned long pfn = page_to_pfn(page);
+        unsigned long pte_base;
+
+        BUG_ON((pfn<<PAGE_SHIFT)&(PCPU_CHUNK_SIZE - 1UL));
+
+        pte_base = (_PAGE_VALID | _PAGE_SZ4MB_4U |
+                    _PAGE_CP_4U | _PAGE_CV_4U |
+                    _PAGE_P_4U | _PAGE_W_4U);
+        if (tlb_type == hypervisor)
+                pte_base = (_PAGE_VALID | _PAGE_SZ4MB_4V |
+                            _PAGE_CP_4V | _PAGE_CV_4V |
+                            _PAGE_P_4V | _PAGE_W_4V);
+
+        while (start < end) {
+                pgd_t *pgd = pgd_offset_k(start);
+                unsigned long this_end;
+                pud_t *pud;
+                pmd_t *pmd;
+                pte_t *pte;
+
+                pud = pud_offset(pgd, start);
+                if (pud_none(*pud)) {
+                        pmd_t *new;
+
+                        new = __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, PAGE_SIZE);
+                        pud_populate(&init_mm, pud, new);
+                }
+
+                pmd = pmd_offset(pud, start);
+                if (!pmd_present(*pmd)) {
+                        pte_t *new;
+
+                        new = __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, PAGE_SIZE);
+                        pmd_populate_kernel(&init_mm, pmd, new);
+                }
 
-        paddr = lmb_alloc(size * NR_CPUS, PAGE_SIZE);
-        if (!paddr) {
-                prom_printf("Cannot allocate per-cpu memory.\n");
-                prom_halt();
+                pte = pte_offset_kernel(pmd, start);
+                this_end = (start + PMD_SIZE) & PMD_MASK;
+                if (this_end > end)
+                        this_end = end;
+
+                while (start < this_end) {
+                        unsigned long paddr = pfn << PAGE_SHIFT;
+
+                        pte_val(*pte) = (paddr | pte_base);
+
+                        start += PAGE_SIZE;
+                        pte++;
+                        pfn++;
+                }
+        }
+}
+
+void __init setup_per_cpu_areas(void)
+{
+        size_t dyn_size, static_size = __per_cpu_end - __per_cpu_start;
+        static struct vm_struct vm;
+        unsigned long delta, cpu;
+        size_t pcpu_unit_size;
+        size_t ptrs_size;
+
+        pcpur_size = PFN_ALIGN(static_size + PERCPU_MODULE_RESERVE +
+                               PERCPU_DYNAMIC_RESERVE);
+        dyn_size = pcpur_size - static_size - PERCPU_MODULE_RESERVE;
+
+
+        ptrs_size = PFN_ALIGN(num_possible_cpus() * sizeof(pcpur_ptrs[0]));
+        pcpur_ptrs = alloc_bootmem(ptrs_size);
+
+        for_each_possible_cpu(cpu) {
+                pcpur_ptrs[cpu] = pcpu_alloc_bootmem(cpu, PCPU_CHUNK_SIZE,
+                                                     PCPU_CHUNK_SIZE);
+
+                free_bootmem(__pa(pcpur_ptrs[cpu] + pcpur_size),
+                             PCPU_CHUNK_SIZE - pcpur_size);
+
+                memcpy(pcpur_ptrs[cpu], __per_cpu_load, static_size);
         }
 
-        ptr = __va(paddr);
-        __per_cpu_base = ptr - __per_cpu_start;
+        /* allocate address and map */
+        vm.flags = VM_ALLOC;
+        vm.size = num_possible_cpus() * PCPU_CHUNK_SIZE;
+        vm_area_register_early(&vm, PCPU_CHUNK_SIZE);
+
+        for_each_possible_cpu(cpu) {
+                unsigned long start = (unsigned long) vm.addr;
+                unsigned long end;
+
+                start += cpu * PCPU_CHUNK_SIZE;
+                end = start + PCPU_CHUNK_SIZE;
+                pcpu_map_range(start, end, virt_to_page(pcpur_ptrs[cpu]));
+        }
 
-        for (i = 0; i < NR_CPUS; i++, ptr += size)
-                memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
+        pcpu_unit_size = pcpu_setup_first_chunk(pcpur_get_page, static_size,
+                                                PERCPU_MODULE_RESERVE, dyn_size,
+                                                PCPU_CHUNK_SIZE, vm.addr, NULL);
+
+        free_bootmem(__pa(pcpur_ptrs), ptrs_size);
+
+        delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
+        for_each_possible_cpu(cpu) {
+                __per_cpu_offset(cpu) = delta + cpu * pcpu_unit_size;
+        }
 
         /* Setup %g5 for the boot cpu.  */
         __local_per_cpu_offset = __per_cpu_offset(smp_processor_id());
+
+        of_fill_in_cpu_data();
+        if (tlb_type == hypervisor)
+                mdesc_fill_in_cpu_data(cpu_all_mask);
 }
diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S
index 00ec3b15f38c..690901657291 100644
--- a/arch/sparc/kernel/systbls_32.S
+++ b/arch/sparc/kernel/systbls_32.S
@@ -81,4 +81,6 @@ sys_call_table:
 /*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait
 /*310*/ .long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate
 /*315*/ .long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1
-/*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv, sys_pwritev
+/*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
+/*325*/ .long sys_pwritev, sys_rt_tgsigqueueinfo
+
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
index 82b5bf85b9d2..6b3ee88e253c 100644
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
@@ -82,7 +82,8 @@ sys_call_table32:
         .word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait
 /*310*/ .word compat_sys_utimensat, compat_sys_signalfd, sys_timerfd_create, sys_eventfd, compat_sys_fallocate
         .word compat_sys_timerfd_settime, compat_sys_timerfd_gettime, compat_sys_signalfd4, sys_eventfd2, sys_epoll_create1
-/*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv, compat_sys_pwritev
+/*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv
+        .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo
 
 #endif /* CONFIG_COMPAT */
 
@@ -156,4 +157,5 @@ sys_call_table:
         .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait
 /*310*/ .word sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate
         .word sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1
-/*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv, sys_pwritev
+/*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
+        .word sys_pwritev, sys_rt_tgsigqueueinfo
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index d809c4ebb48f..10f7bb9fc140 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -2509,6 +2509,7 @@ void do_getpsr(struct pt_regs *regs)
 }
 
 struct trap_per_cpu trap_block[NR_CPUS];
+EXPORT_SYMBOL(trap_block);
 
 /* This can get invoked before sched_init() so play it super safe
  * and use hard_smp_processor_id().
@@ -2530,84 +2531,97 @@ extern void tsb_config_offsets_are_bolixed_dave(void);
 void __init trap_init(void)
 {
         /* Compile time sanity check. */
-        if (TI_TASK != offsetof(struct thread_info, task) ||
-            TI_FLAGS != offsetof(struct thread_info, flags) ||
-            TI_CPU != offsetof(struct thread_info, cpu) ||
-            TI_FPSAVED != offsetof(struct thread_info, fpsaved) ||
-            TI_KSP != offsetof(struct thread_info, ksp) ||
-            TI_FAULT_ADDR != offsetof(struct thread_info, fault_address) ||
-            TI_KREGS != offsetof(struct thread_info, kregs) ||
-            TI_UTRAPS != offsetof(struct thread_info, utraps) ||
-            TI_EXEC_DOMAIN != offsetof(struct thread_info, exec_domain) ||
-            TI_REG_WINDOW != offsetof(struct thread_info, reg_window) ||
-            TI_RWIN_SPTRS != offsetof(struct thread_info, rwbuf_stkptrs) ||
-            TI_GSR != offsetof(struct thread_info, gsr) ||
-            TI_XFSR != offsetof(struct thread_info, xfsr) ||
-            TI_USER_CNTD0 != offsetof(struct thread_info, user_cntd0) ||
-            TI_USER_CNTD1 != offsetof(struct thread_info, user_cntd1) ||
-            TI_KERN_CNTD0 != offsetof(struct thread_info, kernel_cntd0) ||
-            TI_KERN_CNTD1 != offsetof(struct thread_info, kernel_cntd1) ||
-            TI_PCR != offsetof(struct thread_info, pcr_reg) ||
-            TI_PRE_COUNT != offsetof(struct thread_info, preempt_count) ||
-            TI_NEW_CHILD != offsetof(struct thread_info, new_child) ||
-            TI_SYS_NOERROR != offsetof(struct thread_info, syscall_noerror) ||
-            TI_RESTART_BLOCK != offsetof(struct thread_info, restart_block) ||
-            TI_KUNA_REGS != offsetof(struct thread_info, kern_una_regs) ||
-            TI_KUNA_INSN != offsetof(struct thread_info, kern_una_insn) ||
-            TI_FPREGS != offsetof(struct thread_info, fpregs) ||
-            (TI_FPREGS & (64 - 1)))
-                thread_info_offsets_are_bolixed_dave();
-
-        if (TRAP_PER_CPU_THREAD != offsetof(struct trap_per_cpu, thread) ||
-            (TRAP_PER_CPU_PGD_PADDR !=
-             offsetof(struct trap_per_cpu, pgd_paddr)) ||
-            (TRAP_PER_CPU_CPU_MONDO_PA !=
-             offsetof(struct trap_per_cpu, cpu_mondo_pa)) ||
-            (TRAP_PER_CPU_DEV_MONDO_PA !=
-             offsetof(struct trap_per_cpu, dev_mondo_pa)) ||
-            (TRAP_PER_CPU_RESUM_MONDO_PA !=
-             offsetof(struct trap_per_cpu, resum_mondo_pa)) ||
-            (TRAP_PER_CPU_RESUM_KBUF_PA !=
-             offsetof(struct trap_per_cpu, resum_kernel_buf_pa)) ||
-            (TRAP_PER_CPU_NONRESUM_MONDO_PA !=
-             offsetof(struct trap_per_cpu, nonresum_mondo_pa)) ||
-            (TRAP_PER_CPU_NONRESUM_KBUF_PA !=
-             offsetof(struct trap_per_cpu, nonresum_kernel_buf_pa)) ||
-            (TRAP_PER_CPU_FAULT_INFO !=
-             offsetof(struct trap_per_cpu, fault_info)) ||
-            (TRAP_PER_CPU_CPU_MONDO_BLOCK_PA !=
-             offsetof(struct trap_per_cpu, cpu_mondo_block_pa)) ||
-            (TRAP_PER_CPU_CPU_LIST_PA !=
-             offsetof(struct trap_per_cpu, cpu_list_pa)) ||
-            (TRAP_PER_CPU_TSB_HUGE !=
-             offsetof(struct trap_per_cpu, tsb_huge)) ||
-            (TRAP_PER_CPU_TSB_HUGE_TEMP !=
-             offsetof(struct trap_per_cpu, tsb_huge_temp)) ||
-            (TRAP_PER_CPU_IRQ_WORKLIST_PA !=
-             offsetof(struct trap_per_cpu, irq_worklist_pa)) ||
-            (TRAP_PER_CPU_CPU_MONDO_QMASK !=
-             offsetof(struct trap_per_cpu, cpu_mondo_qmask)) ||
-            (TRAP_PER_CPU_DEV_MONDO_QMASK !=
-             offsetof(struct trap_per_cpu, dev_mondo_qmask)) ||
-            (TRAP_PER_CPU_RESUM_QMASK !=
-             offsetof(struct trap_per_cpu, resum_qmask)) ||
-            (TRAP_PER_CPU_NONRESUM_QMASK !=
-             offsetof(struct trap_per_cpu, nonresum_qmask)))
-                trap_per_cpu_offsets_are_bolixed_dave();
-
-        if ((TSB_CONFIG_TSB !=
-             offsetof(struct tsb_config, tsb)) ||
-            (TSB_CONFIG_RSS_LIMIT !=
-             offsetof(struct tsb_config, tsb_rss_limit)) ||
-            (TSB_CONFIG_NENTRIES !=
-             offsetof(struct tsb_config, tsb_nentries)) ||
-            (TSB_CONFIG_REG_VAL !=
-             offsetof(struct tsb_config, tsb_reg_val)) ||
-            (TSB_CONFIG_MAP_VADDR !=
-             offsetof(struct tsb_config, tsb_map_vaddr)) ||
-            (TSB_CONFIG_MAP_PTE !=
-             offsetof(struct tsb_config, tsb_map_pte)))
-                tsb_config_offsets_are_bolixed_dave();
+        BUILD_BUG_ON(TI_TASK != offsetof(struct thread_info, task) ||
+                     TI_FLAGS != offsetof(struct thread_info, flags) ||
+                     TI_CPU != offsetof(struct thread_info, cpu) ||
+                     TI_FPSAVED != offsetof(struct thread_info, fpsaved) ||
+                     TI_KSP != offsetof(struct thread_info, ksp) ||
+                     TI_FAULT_ADDR != offsetof(struct thread_info,
+                                               fault_address) ||
+                     TI_KREGS != offsetof(struct thread_info, kregs) ||
+                     TI_UTRAPS != offsetof(struct thread_info, utraps) ||
+                     TI_EXEC_DOMAIN != offsetof(struct thread_info,
+                                                exec_domain) ||
+                     TI_REG_WINDOW != offsetof(struct thread_info,
+                                               reg_window) ||
+                     TI_RWIN_SPTRS != offsetof(struct thread_info,
+                                               rwbuf_stkptrs) ||
+                     TI_GSR != offsetof(struct thread_info, gsr) ||
+                     TI_XFSR != offsetof(struct thread_info, xfsr) ||
+                     TI_USER_CNTD0 != offsetof(struct thread_info,
+                                               user_cntd0) ||
+                     TI_USER_CNTD1 != offsetof(struct thread_info,
+                                               user_cntd1) ||
+                     TI_KERN_CNTD0 != offsetof(struct thread_info,
+                                               kernel_cntd0) ||
+                     TI_KERN_CNTD1 != offsetof(struct thread_info,
+                                               kernel_cntd1) ||
+                     TI_PCR != offsetof(struct thread_info, pcr_reg) ||
+                     TI_PRE_COUNT != offsetof(struct thread_info,
+                                              preempt_count) ||
+                     TI_NEW_CHILD != offsetof(struct thread_info, new_child) ||
+                     TI_SYS_NOERROR != offsetof(struct thread_info,
+                                                syscall_noerror) ||
+                     TI_RESTART_BLOCK != offsetof(struct thread_info,
+                                                  restart_block) ||
+                     TI_KUNA_REGS != offsetof(struct thread_info,
+                                              kern_una_regs) ||
+                     TI_KUNA_INSN != offsetof(struct thread_info,
+                                              kern_una_insn) ||
+                     TI_FPREGS != offsetof(struct thread_info, fpregs) ||
+                     (TI_FPREGS & (64 - 1)));
+
+        BUILD_BUG_ON(TRAP_PER_CPU_THREAD != offsetof(struct trap_per_cpu,
+                                                     thread) ||
+                     (TRAP_PER_CPU_PGD_PADDR !=
+                      offsetof(struct trap_per_cpu, pgd_paddr)) ||
+                     (TRAP_PER_CPU_CPU_MONDO_PA !=
+                      offsetof(struct trap_per_cpu, cpu_mondo_pa)) ||
+                     (TRAP_PER_CPU_DEV_MONDO_PA !=
+                      offsetof(struct trap_per_cpu, dev_mondo_pa)) ||
+                     (TRAP_PER_CPU_RESUM_MONDO_PA !=
+                      offsetof(struct trap_per_cpu, resum_mondo_pa)) ||
+                     (TRAP_PER_CPU_RESUM_KBUF_PA !=
+                      offsetof(struct trap_per_cpu, resum_kernel_buf_pa)) ||
+                     (TRAP_PER_CPU_NONRESUM_MONDO_PA !=
+                      offsetof(struct trap_per_cpu, nonresum_mondo_pa)) ||
+                     (TRAP_PER_CPU_NONRESUM_KBUF_PA !=
+                      offsetof(struct trap_per_cpu, nonresum_kernel_buf_pa)) ||
+                     (TRAP_PER_CPU_FAULT_INFO !=
+                      offsetof(struct trap_per_cpu, fault_info)) ||
+                     (TRAP_PER_CPU_CPU_MONDO_BLOCK_PA !=
+                      offsetof(struct trap_per_cpu, cpu_mondo_block_pa)) ||
+                     (TRAP_PER_CPU_CPU_LIST_PA !=
+                      offsetof(struct trap_per_cpu, cpu_list_pa)) ||
+                     (TRAP_PER_CPU_TSB_HUGE !=
+                      offsetof(struct trap_per_cpu, tsb_huge)) ||
+                     (TRAP_PER_CPU_TSB_HUGE_TEMP !=
+                      offsetof(struct trap_per_cpu, tsb_huge_temp)) ||
+                     (TRAP_PER_CPU_IRQ_WORKLIST_PA !=
+                      offsetof(struct trap_per_cpu, irq_worklist_pa)) ||
+                     (TRAP_PER_CPU_CPU_MONDO_QMASK !=
+                      offsetof(struct trap_per_cpu, cpu_mondo_qmask)) ||
+                     (TRAP_PER_CPU_DEV_MONDO_QMASK !=
+                      offsetof(struct trap_per_cpu, dev_mondo_qmask)) ||
+                     (TRAP_PER_CPU_RESUM_QMASK !=
+                      offsetof(struct trap_per_cpu, resum_qmask)) ||
+                     (TRAP_PER_CPU_NONRESUM_QMASK !=
+                      offsetof(struct trap_per_cpu, nonresum_qmask)) ||
+                     (TRAP_PER_CPU_PER_CPU_BASE !=
+                      offsetof(struct trap_per_cpu, __per_cpu_base)));
+
+        BUILD_BUG_ON((TSB_CONFIG_TSB !=
+                      offsetof(struct tsb_config, tsb)) ||
+                     (TSB_CONFIG_RSS_LIMIT !=
+                      offsetof(struct tsb_config, tsb_rss_limit)) ||
+                     (TSB_CONFIG_NENTRIES !=
+                      offsetof(struct tsb_config, tsb_nentries)) ||
+                     (TSB_CONFIG_REG_VAL !=
+                      offsetof(struct tsb_config, tsb_reg_val)) ||
+                     (TSB_CONFIG_MAP_VADDR !=
+                      offsetof(struct tsb_config, tsb_map_vaddr)) ||
+                     (TSB_CONFIG_MAP_PTE !=
+                      offsetof(struct tsb_config, tsb_map_pte)));
 
         /* Attach to the address space of init_task.  On SMP we
          * do this in smp.c:smp_callin for other cpus.
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index cbb282dab5a7..26bb3919ff1f 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -358,6 +358,7 @@ void __init paging_init(void)
         protection_map[15] = PAGE_SHARED;
         btfixup();
         prom_build_devicetree();
+        of_fill_in_cpu_data();
         device_scan();
 }
 
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index f26a352c08a0..ca92e2f54e4d 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1679,11 +1679,6 @@ pgd_t swapper_pg_dir[2048];
 static void sun4u_pgprot_init(void);
 static void sun4v_pgprot_init(void);
 
-/* Dummy function */
-void __init setup_per_cpu_areas(void)
-{
-}
-
 void __init paging_init(void)
 {
         unsigned long end_pfn, shift, phys_base;
@@ -1799,16 +1794,13 @@ void __init paging_init(void)
         if (tlb_type == hypervisor)
                 sun4v_ktsb_register();
 
-        /* We must setup the per-cpu areas before we pull in the
-         * PROM and the MDESC.  The code there fills in cpu and
-         * other information into per-cpu data structures.
-         */
-        real_setup_per_cpu_areas();
-
         prom_build_devicetree();
+        of_populate_present_mask();
 
-        if (tlb_type == hypervisor)
+        if (tlb_type == hypervisor) {
                 sun4v_mdesc_init();
+                mdesc_populate_present_mask(cpu_all_mask);
+        }
 
         /* Once the OF device tree and MDESC have been setup, we know
          * the list of possible cpus.  Therefore we can allocate the
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 06c9a7d98206..ade4eb373bdd 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -19,6 +19,7 @@
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/kdebug.h>
+#include <linux/log2.h>
 
 #include <asm/bitext.h>
 #include <asm/page.h>
@@ -349,7 +350,7 @@ static void srmmu_free_nocache(unsigned long vaddr, int size)
                     vaddr, srmmu_nocache_end);
                 BUG();
         }
-        if (size & (size-1)) {
+        if (!is_power_of_2(size)) {
                 printk("Size 0x%x is not a power of 2\n", size);
                 BUG();
         }
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 434ba121e3c5..3b44b47c7e1d 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -360,7 +360,7 @@ static struct platform_driver uml_net_driver = {
 
 static void net_device_release(struct device *dev)
 {
-        struct uml_net *device = dev->driver_data;
+        struct uml_net *device = dev_get_drvdata(dev);
         struct net_device *netdev = device->dev;
         struct uml_net_private *lp = netdev_priv(netdev);
 
@@ -440,7 +440,7 @@ static void eth_configure(int n, void *init, char *mac,
         device->pdev.id = n;
         device->pdev.name = DRIVER_NAME;
         device->pdev.dev.release = net_device_release;
-        device->pdev.dev.driver_data = device;
+        dev_set_drvdata(&device->pdev.dev, device);
         if (platform_device_register(&device->pdev))
                 goto out_free_netdev;
         SET_NETDEV_DEV(dev,&device->pdev.dev);
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index aa9e926e13d7..8f05d4d9da12 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -778,7 +778,7 @@ static int ubd_open_dev(struct ubd *ubd_dev)
 
 static void ubd_device_release(struct device *dev)
 {
-        struct ubd *ubd_dev = dev->driver_data;
+        struct ubd *ubd_dev = dev_get_drvdata(dev);
 
         blk_cleanup_queue(ubd_dev->queue);
         *ubd_dev = ((struct ubd) DEFAULT_UBD);
@@ -807,7 +807,7 @@ static int ubd_disk_register(int major, u64 size, int unit,
                 ubd_devs[unit].pdev.id   = unit;
                 ubd_devs[unit].pdev.name = DRIVER_NAME;
                 ubd_devs[unit].pdev.dev.release = ubd_device_release;
-                ubd_devs[unit].pdev.dev.driver_data = &ubd_devs[unit];
+                dev_set_drvdata(&ubd_devs[unit].pdev.dev, &ubd_devs[unit]);
                 platform_device_register(&ubd_devs[unit].pdev);
                 disk->driverfs_dev = &ubd_devs[unit].pdev.dev;
         }
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index ef0ae207a7c8..096d19aea2f7 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -463,7 +463,7 @@ static void uv_heartbeat(unsigned long ignored)
         uv_set_scir_bits(bits);
 
         /* enable next timer period */
-        mod_timer(timer, jiffies + SCIR_CPU_HB_INTERVAL);
+        mod_timer_pinned(timer, jiffies + SCIR_CPU_HB_INTERVAL);
 }
 
 static void __cpuinit uv_heartbeat_enable(int cpu)
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 2ac1f0c2beb3..b07af8861244 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -182,6 +182,11 @@ static struct notifier_block __refdata cpuid_class_cpu_notifier =
         .notifier_call = cpuid_class_cpu_callback,
 };
 
+static char *cpuid_nodename(struct device *dev)
+{
+        return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt));
+}
+
 static int __init cpuid_init(void)
 {
         int i, err = 0;
@@ -198,6 +203,7 @@ static int __init cpuid_init(void)
                 err = PTR_ERR(cpuid_class);
                 goto out_chrdev;
         }
+        cpuid_class->nodename = cpuid_nodename;
         for_each_online_cpu(i) {
                 err = cpuid_device_create(i);
                 if (err != 0)
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 9c4461501fcb..9371448290ac 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -236,6 +236,7 @@ static const struct file_operations microcode_fops = {
 static struct miscdevice microcode_dev = {
         .minor                  = MICROCODE_MINOR,
         .name                   = "microcode",
+        .devnode                = "cpu/microcode",
         .fops                   = &microcode_fops,
 };
 
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 3cf3413ec626..98fd6cd4e3a4 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -196,6 +196,11 @@ static struct notifier_block __refdata msr_class_cpu_notifier = {
         .notifier_call = msr_class_cpu_callback,
 };
 
+static char *msr_nodename(struct device *dev)
+{
+        return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev->devt));
+}
+
 static int __init msr_init(void)
 {
         int i, err = 0;
@@ -212,6 +217,7 @@ static int __init msr_init(void)
                 err = PTR_ERR(msr_class);
                 goto out_chrdev;
         }
+        msr_class->nodename = msr_nodename;
         for_each_online_cpu(i) {
                 err = msr_device_create(i);
                 if (err != 0)