276 files changed, 9366 insertions, 3359 deletions

diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index fc9ce6f1688c..6d21c0288e9e 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -54,8 +54,13 @@ PROPERTIES
    - compatible
       Usage: required
       Value type: <string>
-      Definition: Must include "fsl,sec-v4.0". Also includes SEC
-           ERA versions (optional) with which the device is compatible.
+      Definition: Must include "fsl,sec-v4.0"
+
+   - fsl,sec-era
+      Usage: optional
+      Value type: <u32>
+      Definition: A standard property. Define the 'ERA' of the SEC
+          device.
 
    - #address-cells
        Usage: required
@@ -107,7 +112,8 @@ PROPERTIES
 
 EXAMPLE
         crypto@300000 {
-                compatible = "fsl,sec-v4.0", "fsl,sec-era-v2.0";
+                compatible = "fsl,sec-v4.0";
+                fsl,sec-era = <0x2>;
                 #address-cells = <1>;
                 #size-cells = <1>;
                 reg = <0x300000 0x10000>;
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/guts.txt b/Documentation/devicetree/bindings/powerpc/fsl/guts.txt
index 9e7a2417dac5..7f150b5012cc 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/guts.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/guts.txt
@@ -17,9 +17,20 @@ Recommended properties:
    contains a functioning "reset control register" (i.e. the board
    is wired to reset upon setting the HRESET_REQ bit in this register).
 
-Example:
+ - fsl,liodn-bits : Indicates the number of defined bits in the LIODN
+   registers, for those SOCs that have a PAMU device.
+
+Examples:
         global-utilities@e0000 {        /* global utilities block */
                 compatible = "fsl,mpc8548-guts";
                 reg = <e0000 1000>;
                 fsl,has-rstcr;
         };
+
+        guts: global-utilities@e0000 {
+                compatible = "fsl,qoriq-device-config-1.0";
+                reg = <0xe0000 0xe00>;
+                fsl,has-rstcr;
+                #sleep-cells = <1>;
+                fsl,liodn-bits = <12>;
+        };
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/pamu.txt b/Documentation/devicetree/bindings/powerpc/fsl/pamu.txt
new file mode 100644
index 000000000000..1f5e329f756c
--- /dev/null
+++ b/Documentation/devicetree/bindings/powerpc/fsl/pamu.txt
@@ -0,0 +1,140 @@
+Freescale Peripheral Management Access Unit (PAMU) Device Tree Binding
+
+DESCRIPTION
+
+The PAMU is an I/O MMU that provides device-to-memory access control and
+address translation capabilities.
+
+Required properties:
+
+- compatible    : <string>
+                  First entry is a version-specific string, such as
+                  "fsl,pamu-v1.0".  The second is "fsl,pamu".
+- ranges        : <prop-encoded-array>
+                  A standard property. Utilized to describe the memory mapped
+                  I/O space utilized by the controller.  The size should
+                  be set to the total size of the register space of all
+                  physically present PAMU controllers.  For example, for
+                  PAMU v1.0, on an SOC that has five PAMU devices, the size
+                  is 0x5000.
+- interrupts    : <prop-encoded-array>
+                  Interrupt mappings.  The first tuple is the normal PAMU
+                  interrupt, used for reporting access violations.  The second
+                  is for PAMU hardware errors, such as PAMU operation errors
+                  and ECC errors.
+- #address-cells: <u32>
+                  A standard property.
+- #size-cells   : <u32>
+                  A standard property.
+
+Optional properties:
+- reg           : <prop-encoded-array>
+                  A standard property.   It represents the CCSR registers of
+                  all child PAMUs combined.  Include it to provide support
+                  for legacy drivers.
+- interrupt-parent : <phandle>
+                  Phandle to interrupt controller
+
+Child nodes:
+
+Each child node represents one PAMU controller.  Each SOC device that is
+connected to a specific PAMU device should have a "fsl,pamu-phandle" property
+that links to the corresponding specific child PAMU controller.
+
+- reg           : <prop-encoded-array>
+                  A standard property.  Specifies the physical address and
+                  length (relative to the parent 'ranges' property) of this
+                  PAMU controller's configuration registers.  The size should
+                  be set to the size of this PAMU controllers's register space.
+                  For PAMU v1.0, this size is 0x1000.
+- fsl,primary-cache-geometry
+                : <prop-encoded-array>
+                  Two cells that specify the geometry of the primary PAMU
+                  cache.  The first is the number of cache lines, and the
+                  second is the number of "ways".  For direct-mapped caches,
+                  specify a value of 1.
+- fsl,secondary-cache-geometry
+                : <prop-encoded-array>
+                  Two cells that specify the geometry of the secondary PAMU
+                  cache.  The first is the number of cache lines, and the
+                  second is the number of "ways".  For direct-mapped caches,
+                  specify a value of 1.
+
+Device nodes:
+
+Devices that have LIODNs need to specify links to the parent PAMU controller
+(the actual PAMU controller that this device is connected to) and a pointer to
+the LIODN register, if applicable.
+
+- fsl,iommu-parent
+                : <phandle>
+                Phandle to the single, specific PAMU controller node to which
+                this device is connect.  The PAMU topology is represented in
+                the device tree to assist code that dynamically determines the
+                best LIODN values to minimize PAMU cache thrashing.
+
+- fsl,liodn-reg : <prop-encoded-array>
+                  Two cells that specify the location of the LIODN register
+                  for this device.  Required for devices that have a single
+                  LIODN.  The first cell is a phandle to a node that contains
+                  the registers where the LIODN is to be set.  The second is
+                  the offset from the first "reg" resource of the node where
+                  the specific LIODN register is located.
+
+
+Example:
+
+        iommu@20000 {
+                compatible = "fsl,pamu-v1.0", "fsl,pamu";
+                reg = <0x20000 0x5000>;
+                ranges = <0 0x20000 0x5000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                interrupts = <
+                        24 2 0 0
+                        16 2 1 30>;
+
+                pamu0: pamu@0 {
+                        reg = <0 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu1: pamu@1000 {
+                        reg = <0x1000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu2: pamu@2000 {
+                        reg = <0x2000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu3: pamu@3000 {
+                        reg = <0x3000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu4: pamu@4000 {
+                        reg = <0x4000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+        };
+
+        guts: global-utilities@e0000 {
+                compatible = "fsl,qoriq-device-config-1.0";
+                reg = <0xe0000 0xe00>;
+                fsl,has-rstcr;
+                #sleep-cells = <1>;
+                fsl,liodn-bits = <12>;
+        };
+
+/include/ "qoriq-dma-0.dtsi"
+        dma@100300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */
+        };
diff --git a/Documentation/lockstat.txt b/Documentation/lockstat.txt
index cef00d42ed5b..dd2f7b26ca30 100644
--- a/Documentation/lockstat.txt
+++ b/Documentation/lockstat.txt
@@ -65,7 +65,7 @@ that had to wait on lock acquisition.
 
  - CONFIGURATION
 
-Lock statistics are enabled via CONFIG_LOCK_STATS.
+Lock statistics are enabled via CONFIG_LOCK_STAT.
 
  - USAGE
 
diff --git a/Documentation/powerpc/cpu_features.txt b/Documentation/powerpc/cpu_features.txt
index ffa4183fdb8b..ae09df8722c8 100644
--- a/Documentation/powerpc/cpu_features.txt
+++ b/Documentation/powerpc/cpu_features.txt
@@ -11,10 +11,10 @@ split instruction and data caches, and if the CPU supports the DOZE and NAP
 sleep modes.
 
 Detection of the feature set is simple. A list of processors can be found in
-arch/ppc/kernel/cputable.c. The PVR register is masked and compared with each
-value in the list. If a match is found, the cpu_features of cur_cpu_spec is
-assigned to the feature bitmask for this processor and a __setup_cpu function
-is called.
+arch/powerpc/kernel/cputable.c. The PVR register is masked and compared with
+each value in the list. If a match is found, the cpu_features of cur_cpu_spec
+is assigned to the feature bitmask for this processor and a __setup_cpu
+function is called.
 
 C code may test 'cur_cpu_spec[smp_processor_id()]->cpu_features' for a
 particular feature bit. This is done in quite a few places, for example
@@ -51,6 +51,6 @@ should be used in the majority of cases.
 
 The END_FTR_SECTION macros are implemented by storing information about this
 code in the '__ftr_fixup' ELF section. When do_cpu_ftr_fixups
-(arch/ppc/kernel/misc.S) is invoked, it will iterate over the records in
+(arch/powerpc/kernel/misc.S) is invoked, it will iterate over the records in
 __ftr_fixup, and if the required feature is not present it will loop writing
 nop's from each BEGIN_FTR_SECTION to END_FTR_SECTION.
diff --git a/Documentation/powerpc/transactional_memory.txt b/Documentation/powerpc/transactional_memory.txt
new file mode 100644
index 000000000000..c907be41d60f
--- /dev/null
+++ b/Documentation/powerpc/transactional_memory.txt
@@ -0,0 +1,175 @@
+Transactional Memory support
+============================
+
+POWER kernel support for this feature is currently limited to supporting
+its use by user programs.  It is not currently used by the kernel itself.
+
+This file aims to sum up how it is supported by Linux and what behaviour you
+can expect from your user programs.
+
+
+Basic overview
+==============
+
+Hardware Transactional Memory is supported on POWER8 processors, and is a
+feature that enables a different form of atomic memory access.  Several new
+instructions are presented to delimit transactions; transactions are
+guaranteed to either complete atomically or roll back and undo any partial
+changes.
+
+A simple transaction looks like this:
+
+begin_move_money:
+  tbegin
+  beq   abort_handler
+
+  ld    r4, SAVINGS_ACCT(r3)
+  ld    r5, CURRENT_ACCT(r3)
+  subi  r5, r5, 1
+  addi  r4, r4, 1
+  std   r4, SAVINGS_ACCT(r3)
+  std   r5, CURRENT_ACCT(r3)
+
+  tend
+
+  b     continue
+
+abort_handler:
+  ... test for odd failures ...
+
+  /* Retry the transaction if it failed because it conflicted with
+   * someone else: */
+  b     begin_move_money
+
+
+The 'tbegin' instruction denotes the start point, and 'tend' the end point.
+Between these points the processor is in 'Transactional' state; any memory
+references will complete in one go if there are no conflicts with other
+transactional or non-transactional accesses within the system.  In this
+example, the transaction completes as though it were normal straight-line code
+IF no other processor has touched SAVINGS_ACCT(r3) or CURRENT_ACCT(r3); an
+atomic move of money from the current account to the savings account has been
+performed.  Even though the normal ld/std instructions are used (note no
+lwarx/stwcx), either *both* SAVINGS_ACCT(r3) and CURRENT_ACCT(r3) will be
+updated, or neither will be updated.
+
+If, in the meantime, there is a conflict with the locations accessed by the
+transaction, the transaction will be aborted by the CPU.  Register and memory
+state will roll back to that at the 'tbegin', and control will continue from
+'tbegin+4'.  The branch to abort_handler will be taken this second time; the
+abort handler can check the cause of the failure, and retry.
+
+Checkpointed registers include all GPRs, FPRs, VRs/VSRs, LR, CCR/CR, CTR, FPCSR
+and a few other status/flag regs; see the ISA for details.
+
+Causes of transaction aborts
+============================
+
+- Conflicts with cache lines used by other processors
+- Signals
+- Context switches
+- See the ISA for full documentation of everything that will abort transactions.
+
+
+Syscalls
+========
+
+Performing syscalls from within transaction is not recommended, and can lead
+to unpredictable results.
+
+Syscalls do not by design abort transactions, but beware: The kernel code will
+not be running in transactional state.  The effect of syscalls will always
+remain visible, but depending on the call they may abort your transaction as a
+side-effect, read soon-to-be-aborted transactional data that should not remain
+invisible, etc.  If you constantly retry a transaction that constantly aborts
+itself by calling a syscall, you'll have a livelock & make no progress.
+
+Simple syscalls (e.g. sigprocmask()) "could" be OK.  Even things like write()
+from, say, printf() should be OK as long as the kernel does not access any
+memory that was accessed transactionally.
+
+Consider any syscalls that happen to work as debug-only -- not recommended for
+production use.  Best to queue them up till after the transaction is over.
+
+
+Signals
+=======
+
+Delivery of signals (both sync and async) during transactions provides a second
+thread state (ucontext/mcontext) to represent the second transactional register
+state.  Signal delivery 'treclaim's to capture both register states, so signals
+abort transactions.  The usual ucontext_t passed to the signal handler
+represents the checkpointed/original register state; the signal appears to have
+arisen at 'tbegin+4'.
+
+If the sighandler ucontext has uc_link set, a second ucontext has been
+delivered.  For future compatibility the MSR.TS field should be checked to
+determine the transactional state -- if so, the second ucontext in uc->uc_link
+represents the active transactional registers at the point of the signal.
+
+For 64-bit processes, uc->uc_mcontext.regs->msr is a full 64-bit MSR and its TS
+field shows the transactional mode.
+
+For 32-bit processes, the mcontext's MSR register is only 32 bits; the top 32
+bits are stored in the MSR of the second ucontext, i.e. in
+uc->uc_link->uc_mcontext.regs->msr.  The top word contains the transactional
+state TS.
+
+However, basic signal handlers don't need to be aware of transactions
+and simply returning from the handler will deal with things correctly:
+
+Transaction-aware signal handlers can read the transactional register state
+from the second ucontext.  This will be necessary for crash handlers to
+determine, for example, the address of the instruction causing the SIGSEGV.
+
+Example signal handler:
+
+    void crash_handler(int sig, siginfo_t *si, void *uc)
+    {
+      ucontext_t *ucp = uc;
+      ucontext_t *transactional_ucp = ucp->uc_link;
+
+      if (ucp_link) {
+        u64 msr = ucp->uc_mcontext.regs->msr;
+        /* May have transactional ucontext! */
+#ifndef __powerpc64__
+        msr |= ((u64)transactional_ucp->uc_mcontext.regs->msr) << 32;
+#endif
+        if (MSR_TM_ACTIVE(msr)) {
+           /* Yes, we crashed during a transaction.  Oops. */
+   fprintf(stderr, "Transaction to be restarted at 0x%llx, but "
+                           "crashy instruction was at 0x%llx\n",
+                           ucp->uc_mcontext.regs->nip,
+                           transactional_ucp->uc_mcontext.regs->nip);
+        }
+      }
+
+      fix_the_problem(ucp->dar);
+    }
+
+
+Failure cause codes used by kernel
+==================================
+
+These are defined in <asm/reg.h>, and distinguish different reasons why the
+kernel aborted a transaction:
+
+ TM_CAUSE_RESCHED       Thread was rescheduled.
+ TM_CAUSE_FAC_UNAV      FP/VEC/VSX unavailable trap.
+ TM_CAUSE_SYSCALL       Currently unused; future syscalls that must abort
+                        transactions for consistency will use this.
+ TM_CAUSE_SIGNAL        Signal delivered.
+ TM_CAUSE_MISC          Currently unused.
+
+These can be checked by the user program's abort handler as TEXASR[0:7].
+
+
+GDB
+===
+
+GDB and ptrace are not currently TM-aware.  If one stops during a transaction,
+it looks like the transaction has just started (the checkpointed state is
+presented).  The transaction cannot then be continued and will take the failure
+handler route.  Furthermore, the transactional 2nd register state will be
+inaccessible.  GDB can currently be used on programs using TM, but not sensibly
+in parts within transactions.
diff --git a/Documentation/x86/early-microcode.txt b/Documentation/x86/early-microcode.txt
new file mode 100644
index 000000000000..4aaf0dfb0cb8
--- /dev/null
+++ b/Documentation/x86/early-microcode.txt
@@ -0,0 +1,43 @@
+Early load microcode
+====================
+By Fenghua Yu <fenghua.yu@intel.com>
+
+Kernel can update microcode in early phase of boot time. Loading microcode early
+can fix CPU issues before they are observed during kernel boot time.
+
+Microcode is stored in an initrd file. The microcode is read from the initrd
+file and loaded to CPUs during boot time.
+
+The format of the combined initrd image is microcode in cpio format followed by
+the initrd image (maybe compressed). Kernel parses the combined initrd image
+during boot time. The microcode file in cpio name space is:
+kernel/x86/microcode/GenuineIntel.bin
+
+During BSP boot (before SMP starts), if the kernel finds the microcode file in
+the initrd file, it parses the microcode and saves matching microcode in memory.
+If matching microcode is found, it will be uploaded in BSP and later on in all
+APs.
+
+The cached microcode patch is applied when CPUs resume from a sleep state.
+
+There are two legacy user space interfaces to load microcode, either through
+/dev/cpu/microcode or through /sys/devices/system/cpu/microcode/reload file
+in sysfs.
+
+In addition to these two legacy methods, the early loading method described
+here is the third method with which microcode can be uploaded to a system's
+CPUs.
+
+The following example script shows how to generate a new combined initrd file in
+/boot/initrd-3.5.0.ucode.img with original microcode microcode.bin and
+original initrd image /boot/initrd-3.5.0.img.
+
+mkdir initrd
+cd initrd
+mkdir kernel
+mkdir kernel/x86
+mkdir kernel/x86/microcode
+cp ../microcode.bin kernel/x86/microcode/GenuineIntel.bin
+find .|cpio -oc >../ucode.cpio
+cd ..
+cat ucode.cpio /boot/initrd-3.5.0.img >/boot/initrd-3.5.0.ucode.img
diff --git a/arch/blackfin/include/asm/mem_init.h b/arch/blackfin/include/asm/mem_init.h
index f019e9bcefe9..9b33e7247864 100644
--- a/arch/blackfin/include/asm/mem_init.h
+++ b/arch/blackfin/include/asm/mem_init.h
@@ -411,7 +411,7 @@ static struct ddr_config ddr_config_table[] __attribute__((section(".data_l1")))
                 .dmc_ddrcfg = 0x00000422,
                 .dmc_ddrtr0 = 0x20E0A424,
                 .dmc_ddrtr1 = 0x3020079E,
-                .dmc_ddrtr2 = 0x0032020D,
+                .dmc_ddrtr2 = 0x0032050D,
                 .dmc_ddrmr  = 0x00000842,
                 .dmc_ddrmr1 = 0x4,
         },
diff --git a/arch/blackfin/include/asm/uaccess.h b/arch/blackfin/include/asm/uaccess.h
index 461bb542e2e8..57701c3b8a59 100644
--- a/arch/blackfin/include/asm/uaccess.h
+++ b/arch/blackfin/include/asm/uaccess.h
@@ -191,6 +191,7 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
                 memcpy((void __force *)to, from, n);
         else
                 return n;
+        SSYNC();
         return 0;
 }
 
diff --git a/arch/blackfin/kernel/dma-mapping.c b/arch/blackfin/kernel/dma-mapping.c
index e7be6532d6a0..df437e52d9df 100644
--- a/arch/blackfin/kernel/dma-mapping.c
+++ b/arch/blackfin/kernel/dma-mapping.c
@@ -13,6 +13,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/export.h>
+#include <linux/bitmap.h>
 
 static spinlock_t dma_page_lock;
 static unsigned long *dma_page;
@@ -46,24 +47,17 @@ static inline unsigned int get_pages(size_t size)
 static unsigned long __alloc_dma_pages(unsigned int pages)
 {
         unsigned long ret = 0, flags;
-        int i, count = 0;
+        unsigned long start;
 
         if (dma_initialized == 0)
                 dma_alloc_init(_ramend - DMA_UNCACHED_REGION, _ramend);
 
         spin_lock_irqsave(&dma_page_lock, flags);
 
-        for (i = 0; i < dma_pages;) {
-                if (test_bit(i++, dma_page) == 0) {
-                        if (++count == pages) {
-                                while (count--)
-                                        __set_bit(--i, dma_page);
-
-                                ret = dma_base + (i << PAGE_SHIFT);
-                                break;
-                        }
-                } else
-                        count = 0;
+        start = bitmap_find_next_zero_area(dma_page, dma_pages, 0, pages, 0);
+        if (start < dma_pages) {
+                ret = dma_base + (start << PAGE_SHIFT);
+                bitmap_set(dma_page, start, pages);
         }
         spin_unlock_irqrestore(&dma_page_lock, flags);
         return ret;
@@ -73,7 +67,6 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages)
 {
         unsigned long page = (addr - dma_base) >> PAGE_SHIFT;
         unsigned long flags;
-        int i;
 
         if ((page + pages) > dma_pages) {
                 printk(KERN_ERR "%s: freeing outside range.\n", __func__);
@@ -81,9 +74,7 @@ static void __free_dma_pages(unsigned long addr, unsigned int pages)
         }
 
         spin_lock_irqsave(&dma_page_lock, flags);
-        for (i = page; i < page + pages; i++)
-                __clear_bit(i, dma_page);
-
+        bitmap_clear(dma_page, page, pages);
         spin_unlock_irqrestore(&dma_page_lock, flags);
 }
 
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c
index f608f02f29a3..cb0a4845339e 100644
--- a/arch/blackfin/kernel/time-ts.c
+++ b/arch/blackfin/kernel/time-ts.c
@@ -329,12 +329,6 @@ void bfin_coretmr_clockevent_init(void)
         evt->broadcast = smp_timer_broadcast;
 #endif
 
-
-#ifdef CONFIG_SMP
-        evt->broadcast = smp_timer_broadcast;
-#endif
-
-
         evt->name = "bfin_core_timer";
         evt->rating = 350;
         evt->irq = -1;
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 83ff311fd6ea..6c0c6816a51a 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -1195,6 +1195,7 @@ static struct syscore_ops sec_pm_syscore_ops = {
         .suspend = sec_suspend,
         .resume = sec_resume,
 };
+
 #endif
 #else
 # define bfin_gpio_set_wake NULL
@@ -1596,7 +1597,10 @@ int __init init_arch_irq(void)
         bfin_write_SEC_SCI(1, SEC_CCTL, SEC_CCTL_EN | SEC_CCTL_NMI_EN);
 
         init_software_driven_irq();
+
+#ifdef CONFIG_PM
         register_syscore_ops(&sec_pm_syscore_ops);
+#endif
 
         return 0;
 }
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index c600f39aa453..7f9b3c53f74a 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -160,6 +160,23 @@ config PREFETCH
         def_bool y
         depends on PA8X00 || PA7200
 
+config MLONGCALLS
+        bool "Enable the -mlong-calls compiler option for big kernels"
+        def_bool y if (!MODULES)
+        depends on PA8X00
+        help
+          If you configure the kernel to include many drivers built-in instead
+          as modules, the kernel executable may become too big, so that the
+          linker will not be able to resolve some long branches and fails to link
+          your vmlinux kernel. In that case enabling this option will help you
+          to overcome this limit by using the -mlong-calls compiler option.
+
+          Usually you want to say N here, unless you e.g. want to build
+          a kernel which includes all necessary drivers built-in and which can
+          be used for TFTP booting without the need to have an initrd ramdisk.
+
+          Enabling this option will probably slow down your kernel.
+
 config 64BIT
         bool "64-bit kernel"
         depends on PA8X00
@@ -254,6 +271,10 @@ config COMPAT
         def_bool y
         depends on 64BIT
 
+config SYSVIPC_COMPAT
+        def_bool y
+        depends on COMPAT && SYSVIPC
+
 config HPUX
         bool "Support for HP-UX binaries"
         depends on !64BIT
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 5707f1a62341..ed9a14ccd066 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -32,11 +32,6 @@ ifdef CONFIG_64BIT
 UTS_MACHINE     := parisc64
 CHECKFLAGS      += -D__LP64__=1 -m64
 WIDTH           := 64
-
-# FIXME: if no default set, should really try to locate dynamically
-ifeq ($(CROSS_COMPILE),)
-CROSS_COMPILE   := hppa64-linux-gnu-
-endif
 else # 32-bit
 WIDTH           :=
 endif
@@ -44,6 +39,10 @@ endif
 # attempt to help out folks who are cross-compiling
 ifeq ($(NATIVE),1)
 CROSS_COMPILE   := hppa$(WIDTH)-linux-
+else
+ ifeq ($(CROSS_COMPILE),)
+ CROSS_COMPILE  := hppa$(WIDTH)-linux-gnu-
+ endif
 endif
 
 OBJCOPY_FLAGS =-O binary -R .note -R .comment -S
@@ -65,6 +64,10 @@ ifndef CONFIG_FUNCTION_TRACER
   cflags-y      += -ffunction-sections
 endif
 
+# Use long jumps instead of long branches (needed if your linker fails to
+# link a too big vmlinux executable)
+cflags-$(CONFIG_MLONGCALLS)     += -mlong-calls
+
 # select which processor to optimise for
 cflags-$(CONFIG_PA7100)         += -march=1.1 -mschedule=7100
 cflags-$(CONFIG_PA7200)         += -march=1.1 -mschedule=7200
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index a0760b87fd4e..838b479a42c4 100644
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -43,8 +43,7 @@ int hpux_execve(struct pt_regs *regs)
 
         error = do_execve(filename->name,
                           (const char __user *const __user *) regs->gr[25],
-                          (const char __user *const __user *) regs->gr[24],
-                          regs);
+                          (const char __user *const __user *) regs->gr[24]);
 
         putname(filename);
 
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h
index 9f21ab0c02e3..79f694f3ad9b 100644
--- a/arch/parisc/include/asm/cacheflush.h
+++ b/arch/parisc/include/asm/cacheflush.h
@@ -115,7 +115,9 @@ flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vma
 {
         if (PageAnon(page)) {
                 flush_tlb_page(vma, vmaddr);
+                preempt_disable();
                 flush_dcache_page_asm(page_to_phys(page), vmaddr);
+                preempt_enable();
         }
 }
 
diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h
index db7a662691a8..94710cfc1ce8 100644
--- a/arch/parisc/include/asm/compat.h
+++ b/arch/parisc/include/asm/compat.h
@@ -28,6 +28,7 @@ typedef u16	compat_nlink_t;
 typedef u16     compat_ipc_pid_t;
 typedef s32     compat_daddr_t;
 typedef u32     compat_caddr_t;
+typedef s32     compat_key_t;
 typedef s32     compat_timer_t;
 
 typedef s32     compat_int_t;
@@ -188,6 +189,66 @@ typedef struct compat_siginfo {
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
+struct compat_ipc64_perm {
+        compat_key_t key;
+        __compat_uid_t uid;
+        __compat_gid_t gid;
+        __compat_uid_t cuid;
+        __compat_gid_t cgid;
+        unsigned short int __pad1;
+        compat_mode_t mode;
+        unsigned short int __pad2;
+        unsigned short int seq;
+        unsigned int __pad3;
+        unsigned long __unused1;        /* yes they really are 64bit pads */
+        unsigned long __unused2;
+};
+
+struct compat_semid64_ds {
+        struct compat_ipc64_perm sem_perm;
+        compat_time_t sem_otime;
+        unsigned int __unused1;
+        compat_time_t sem_ctime;
+        unsigned int __unused2;
+        compat_ulong_t sem_nsems;
+        compat_ulong_t __unused3;
+        compat_ulong_t __unused4;
+};
+
+struct compat_msqid64_ds {
+        struct compat_ipc64_perm msg_perm;
+        unsigned int __unused1;
+        compat_time_t msg_stime;
+        unsigned int __unused2;
+        compat_time_t msg_rtime;
+        unsigned int __unused3;
+        compat_time_t msg_ctime;
+        compat_ulong_t msg_cbytes;
+        compat_ulong_t msg_qnum;
+        compat_ulong_t msg_qbytes;
+        compat_pid_t msg_lspid;
+        compat_pid_t msg_lrpid;
+        compat_ulong_t __unused4;
+        compat_ulong_t __unused5;
+};
+
+struct compat_shmid64_ds {
+        struct compat_ipc64_perm shm_perm;
+        unsigned int __unused1;
+        compat_time_t shm_atime;
+        unsigned int __unused2;
+        compat_time_t shm_dtime;
+        unsigned int __unused3;
+        compat_time_t shm_ctime;
+        unsigned int __unused4;
+        compat_size_t shm_segsz;
+        compat_pid_t shm_cpid;
+        compat_pid_t shm_lpid;
+        compat_ulong_t shm_nattch;
+        compat_ulong_t __unused5;
+        compat_ulong_t __unused6;
+};
+
 /*
  * A pointer passed in from user mode. This should not
  * be used for syscall parameters, just declare them
diff --git a/arch/parisc/include/asm/compat_rt_sigframe.h b/arch/parisc/include/asm/compat_rt_sigframe.h
deleted file mode 100644
index b3f95a7f18b4..000000000000
--- a/arch/parisc/include/asm/compat_rt_sigframe.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <linux/compat.h>
-#include <linux/compat_siginfo.h>
-#include <asm/compat_ucontext.h>
-
-#ifndef _ASM_PARISC_COMPAT_RT_SIGFRAME_H
-#define _ASM_PARISC_COMPAT_RT_SIGFRAME_H
-
-/* In a deft move of uber-hackery, we decide to carry the top half of all
- * 64-bit registers in a non-portable, non-ABI, hidden structure.
- * Userspace can read the hidden structure if it *wants* but is never
- * guaranteed to be in the same place. Infact the uc_sigmask from the 
- * ucontext_t structure may push the hidden register file downards
- */
-struct compat_regfile {
-        /* Upper half of all the 64-bit registers that were truncated
-           on a copy to a 32-bit userspace */
-        compat_int_t rf_gr[32];
-        compat_int_t rf_iasq[2];
-        compat_int_t rf_iaoq[2];
-        compat_int_t rf_sar;
-};
-
-#define COMPAT_SIGRETURN_TRAMP 4
-#define COMPAT_SIGRESTARTBLOCK_TRAMP 5 
-#define COMPAT_TRAMP_SIZE (COMPAT_SIGRETURN_TRAMP + COMPAT_SIGRESTARTBLOCK_TRAMP)
-
-struct compat_rt_sigframe {
-        /* XXX: Must match trampoline size in arch/parisc/kernel/signal.c 
-                Secondary to that it must protect the ERESTART_RESTARTBLOCK
-                trampoline we left on the stack (we were bad and didn't 
-                change sp so we could run really fast.) */
-        compat_uint_t tramp[COMPAT_TRAMP_SIZE];
-        compat_siginfo_t info;
-        struct compat_ucontext uc;
-        /* Hidden location of truncated registers, *must* be last. */
-        struct compat_regfile regs; 
-};
-
-/*
- * The 32-bit ABI wants at least 48 bytes for a function call frame:
- * 16 bytes for arg0-arg3, and 32 bytes for magic (the only part of
- * which Linux/parisc uses is sp-20 for the saved return pointer...)
- * Then, the stack pointer must be rounded to a cache line (64 bytes).
- */
-#define SIGFRAME32              64
-#define FUNCTIONCALLFRAME32     48
-#define PARISC_RT_SIGFRAME_SIZE32                                       \
-        (((sizeof(struct compat_rt_sigframe) + FUNCTIONCALLFRAME32) + SIGFRAME32) & -SIGFRAME32)
-
-#endif
diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
index 19f6cb1a4a1c..ad2b50397894 100644
--- a/arch/parisc/include/asm/elf.h
+++ b/arch/parisc/include/asm/elf.h
@@ -247,7 +247,7 @@ typedef unsigned long elf_greg_t;
 #define ELF_PLATFORM  ("PARISC\0")
 
 #define SET_PERSONALITY(ex) \
-        current->personality = PER_LINUX; \
+        set_personality((current->personality & ~PER_MASK) | PER_LINUX); \
         current->thread.map_base = DEFAULT_MAP_BASE; \
         current->thread.task_size = DEFAULT_TASK_SIZE \
 
diff --git a/arch/parisc/include/asm/floppy.h b/arch/parisc/include/asm/floppy.h
index 4ca69f558fae..f84ff12574b7 100644
--- a/arch/parisc/include/asm/floppy.h
+++ b/arch/parisc/include/asm/floppy.h
@@ -157,10 +157,10 @@ static int fd_request_irq(void)
 {
         if(can_use_virtual_dma)
                 return request_irq(FLOPPY_IRQ, floppy_hardint,
-                                   IRQF_DISABLED, "floppy", NULL);
+                                   0, "floppy", NULL);
         else
                 return request_irq(FLOPPY_IRQ, floppy_interrupt,
-                                   IRQF_DISABLED, "floppy", NULL);
+                                   0, "floppy", NULL);
 }
 
 static unsigned long dma_mem_alloc(unsigned long size)
diff --git a/arch/parisc/include/asm/mmzone.h b/arch/parisc/include/asm/mmzone.h
index e67eb9c3d1bf..0e625ab9aaec 100644
--- a/arch/parisc/include/asm/mmzone.h
+++ b/arch/parisc/include/asm/mmzone.h
@@ -1,9 +1,10 @@
 #ifndef _PARISC_MMZONE_H
 #define _PARISC_MMZONE_H
 
+#define MAX_PHYSMEM_RANGES 8 /* Fix the size for now (current known max is 3) */
+
 #ifdef CONFIG_DISCONTIGMEM
 
-#define MAX_PHYSMEM_RANGES 8 /* Fix the size for now (current known max is 3) */
 extern int npmem_ranges;
 
 struct node_map_data {
@@ -44,7 +45,7 @@ static inline int pfn_to_nid(unsigned long pfn)
                 return 0;
 
         i = pfn >> PFNNID_SHIFT;
-        BUG_ON(i >= sizeof(pfnnid_map) / sizeof(pfnnid_map[0]));
+        BUG_ON(i >= ARRAY_SIZE(pfnnid_map));
         r = pfnnid_map[i];
         BUG_ON(r == 0xff);
 
@@ -60,7 +61,5 @@ static inline int pfn_valid(int pfn)
         return 0;
 }
 
-#else /* !CONFIG_DISCONTIGMEM */
-#define MAX_PHYSMEM_RANGES      1 
 #endif
 #endif /* _PARISC_MMZONE_H */
diff --git a/arch/parisc/include/asm/page.h b/arch/parisc/include/asm/page.h
index 4e0e7dbf0f3f..b7adb2ac049c 100644
--- a/arch/parisc/include/asm/page.h
+++ b/arch/parisc/include/asm/page.h
@@ -21,15 +21,27 @@
 #include <asm/types.h>
 #include <asm/cache.h>
 
-#define clear_page(page)        memset((void *)(page), 0, PAGE_SIZE)
-#define copy_page(to,from)      copy_user_page_asm((void *)(to), (void *)(from))
+#define clear_page(page)        clear_page_asm((void *)(page))
+#define copy_page(to, from)     copy_page_asm((void *)(to), (void *)(from))
 
 struct page;
 
-void copy_user_page_asm(void *to, void *from);
+void clear_page_asm(void *page);
+void copy_page_asm(void *to, void *from);
+void clear_user_page(void *vto, unsigned long vaddr, struct page *pg);
 void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
                            struct page *pg);
-void clear_user_page(void *page, unsigned long vaddr, struct page *pg);
+
+/* #define CONFIG_PARISC_TMPALIAS */
+
+#ifdef CONFIG_PARISC_TMPALIAS
+void clear_user_highpage(struct page *page, unsigned long vaddr);
+#define clear_user_highpage clear_user_highpage
+struct vm_area_struct;
+void copy_user_highpage(struct page *to, struct page *from,
+        unsigned long vaddr, struct vm_area_struct *vma);
+#define __HAVE_ARCH_COPY_USER_HIGHPAGE
+#endif
 
 /*
  * These are used to make use of C type-checking..
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index ee99f2339356..7df49fad29f9 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -12,11 +12,10 @@
 
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
+#include <linux/mm_types.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
 
-struct vm_area_struct;
-
 /*
  * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel
  * memory.  For the return value to be meaningful, ADDR must be >=
@@ -40,7 +39,14 @@ struct vm_area_struct;
         do{                                                     \
                 *(pteptr) = (pteval);                           \
         } while(0)
-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
+
+extern void purge_tlb_entries(struct mm_struct *, unsigned long);
+
+#define set_pte_at(mm, addr, ptep, pteval)                      \
+        do {                                                    \
+                set_pte(ptep, pteval);                          \
+                purge_tlb_entries(mm, addr);                    \
+        } while (0)
 
 #endif /* !__ASSEMBLY__ */
 
@@ -466,6 +472,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
                 old = pte_val(*ptep);
                 new = pte_val(pte_wrprotect(__pte (old)));
         } while (cmpxchg((unsigned long *) ptep, old, new) != old);
+        purge_tlb_entries(mm, addr);
 #else
         pte_t old_pte = *ptep;
         set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h
index 0fdb3c835952..b1a7c4c4a53a 100644
--- a/arch/parisc/include/asm/signal.h
+++ b/arch/parisc/include/asm/signal.h
@@ -3,16 +3,12 @@
 
 #include <uapi/asm/signal.h>
 
-
 #define _NSIG           64
 /* bits-per-word, where word apparently means 'long' not 'int' */
 #define _NSIG_BPW       BITS_PER_LONG
 #define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
 
 # ifndef __ASSEMBLY__
-#ifdef CONFIG_64BIT
-#else
-#endif
 
 /* Most things should be clean enough to redefine this at will, if care
    is taken to make libc match.  */
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index 3043194547cd..74f801ebbe77 100644
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -149,6 +149,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)	\
 #define __ARCH_WANT_SYS_SIGNAL
 #define __ARCH_WANT_SYS_TIME
 #define __ARCH_WANT_COMPAT_SYS_TIME
+#define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL
 #define __ARCH_WANT_SYS_UTIME
 #define __ARCH_WANT_SYS_WAITPID
 #define __ARCH_WANT_SYS_SOCKETCALL
@@ -166,6 +167,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)	\
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
+#define __ARCH_WANT_COMPAT_SYS_SENDFILE
 
 #endif /* __ASSEMBLY__ */
 
diff --git a/arch/parisc/include/uapi/asm/unistd.h b/arch/parisc/include/uapi/asm/unistd.h
index e178f30f2ccc..2c8b9bde18eb 100644
--- a/arch/parisc/include/uapi/asm/unistd.h
+++ b/arch/parisc/include/uapi/asm/unistd.h
@@ -822,8 +822,12 @@
 #define __NR_syncfs             (__NR_Linux + 327)
 #define __NR_setns              (__NR_Linux + 328)
 #define __NR_sendmmsg           (__NR_Linux + 329)
+#define __NR_process_vm_readv   (__NR_Linux + 330)
+#define __NR_process_vm_writev  (__NR_Linux + 331)
+#define __NR_kcmp               (__NR_Linux + 332)
+#define __NR_finit_module       (__NR_Linux + 333)
 
-#define __NR_Linux_syscalls     (__NR_sendmmsg + 1)
+#define __NR_Linux_syscalls     (__NR_finit_module + 1)
 
 
 #define __IGNORE_select         /* newselect */
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 48e16dc20102..4b12890642eb 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -267,9 +267,11 @@ static inline void
 __flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr,
                    unsigned long physaddr)
 {
+        preempt_disable();
         flush_dcache_page_asm(physaddr, vmaddr);
         if (vma->vm_flags & VM_EXEC)
                 flush_icache_page_asm(physaddr, vmaddr);
+        preempt_enable();
 }
 
 void flush_dcache_page(struct page *page)
@@ -329,17 +331,6 @@ EXPORT_SYMBOL(flush_kernel_dcache_page_asm);
 EXPORT_SYMBOL(flush_data_cache_local);
 EXPORT_SYMBOL(flush_kernel_icache_range_asm);
 
-void clear_user_page_asm(void *page, unsigned long vaddr)
-{
-        unsigned long flags;
-        /* This function is implemented in assembly in pacache.S */
-        extern void __clear_user_page_asm(void *page, unsigned long vaddr);
-
-        purge_tlb_start(flags);
-        __clear_user_page_asm(page, vaddr);
-        purge_tlb_end(flags);
-}
-
 #define FLUSH_THRESHOLD 0x80000 /* 0.5MB */
 int parisc_cache_flush_threshold __read_mostly = FLUSH_THRESHOLD;
 
@@ -373,20 +364,9 @@ void __init parisc_setup_cache_timing(void)
         printk(KERN_INFO "Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus());
 }
 
-extern void purge_kernel_dcache_page(unsigned long);
-extern void clear_user_page_asm(void *page, unsigned long vaddr);
-
-void clear_user_page(void *page, unsigned long vaddr, struct page *pg)
-{
-        unsigned long flags;
-
-        purge_kernel_dcache_page((unsigned long)page);
-        purge_tlb_start(flags);
-        pdtlb_kernel(page);
-        purge_tlb_end(flags);
-        clear_user_page_asm(page, vaddr);
-}
-EXPORT_SYMBOL(clear_user_page);
+extern void purge_kernel_dcache_page_asm(unsigned long);
+extern void clear_user_page_asm(void *, unsigned long);
+extern void copy_user_page_asm(void *, void *, unsigned long);
 
 void flush_kernel_dcache_page_addr(void *addr)
 {
@@ -399,11 +379,26 @@ void flush_kernel_dcache_page_addr(void *addr)
 }
 EXPORT_SYMBOL(flush_kernel_dcache_page_addr);
 
+void clear_user_page(void *vto, unsigned long vaddr, struct page *page)
+{
+        clear_page_asm(vto);
+        if (!parisc_requires_coherency())
+                flush_kernel_dcache_page_asm(vto);
+}
+EXPORT_SYMBOL(clear_user_page);
+
 void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
-                    struct page *pg)
+        struct page *pg)
 {
-        /* no coherency needed (all in kmap/kunmap) */
-        copy_user_page_asm(vto, vfrom);
+        /* Copy using kernel mapping.  No coherency is needed
+           (all in kmap/kunmap) on machines that don't support
+           non-equivalent aliasing.  However, the `from' page
+           needs to be flushed before it can be accessed through
+           the kernel mapping. */
+        preempt_disable();
+        flush_dcache_page_asm(__pa(vfrom), vaddr);
+        preempt_enable();
+        copy_page_asm(vto, vfrom);
         if (!parisc_requires_coherency())
                 flush_kernel_dcache_page_asm(vto);
 }
@@ -419,6 +414,24 @@ void kunmap_parisc(void *addr)
 EXPORT_SYMBOL(kunmap_parisc);
 #endif
 
+void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
+{
+        unsigned long flags;
+
+        /* Note: purge_tlb_entries can be called at startup with
+           no context.  */
+
+        /* Disable preemption while we play with %sr1.  */
+        preempt_disable();
+        mtsp(mm->context, 1);
+        purge_tlb_start(flags);
+        pdtlb(addr);
+        pitlb(addr);
+        purge_tlb_end(flags);
+        preempt_enable();
+}
+EXPORT_SYMBOL(purge_tlb_entries);
+
 void __flush_tlb_range(unsigned long sid, unsigned long start,
                        unsigned long end)
 {
@@ -458,8 +471,66 @@ void flush_cache_all(void)
         on_each_cpu(cacheflush_h_tmp_function, NULL, 1);
 }
 
+static inline unsigned long mm_total_size(struct mm_struct *mm)
+{
+        struct vm_area_struct *vma;
+        unsigned long usize = 0;
+
+        for (vma = mm->mmap; vma; vma = vma->vm_next)
+                usize += vma->vm_end - vma->vm_start;
+        return usize;
+}
+
+static inline pte_t *get_ptep(pgd_t *pgd, unsigned long addr)
+{
+        pte_t *ptep = NULL;
+
+        if (!pgd_none(*pgd)) {
+                pud_t *pud = pud_offset(pgd, addr);
+                if (!pud_none(*pud)) {
+                        pmd_t *pmd = pmd_offset(pud, addr);
+                        if (!pmd_none(*pmd))
+                                ptep = pte_offset_map(pmd, addr);
+                }
+        }
+        return ptep;
+}
+
 void flush_cache_mm(struct mm_struct *mm)
 {
+        /* Flushing the whole cache on each cpu takes forever on
+           rp3440, etc.  So, avoid it if the mm isn't too big.  */
+        if (mm_total_size(mm) < parisc_cache_flush_threshold) {
+                struct vm_area_struct *vma;
+
+                if (mm->context == mfsp(3)) {
+                        for (vma = mm->mmap; vma; vma = vma->vm_next) {
+                                flush_user_dcache_range_asm(vma->vm_start,
+                                        vma->vm_end);
+                                if (vma->vm_flags & VM_EXEC)
+                                        flush_user_icache_range_asm(
+                                          vma->vm_start, vma->vm_end);
+                        }
+                } else {
+                        pgd_t *pgd = mm->pgd;
+
+                        for (vma = mm->mmap; vma; vma = vma->vm_next) {
+                                unsigned long addr;
+
+                                for (addr = vma->vm_start; addr < vma->vm_end;
+                                     addr += PAGE_SIZE) {
+                                        pte_t *ptep = get_ptep(pgd, addr);
+                                        if (ptep != NULL) {
+                                                pte_t pte = *ptep;
+                                                __flush_cache_page(vma, addr,
+                                                  page_to_phys(pte_page(pte)));
+                                        }
+                                }
+                        }
+                }
+                return;
+        }
+
 #ifdef CONFIG_SMP
         flush_cache_all();
 #else
@@ -485,20 +556,36 @@ flush_user_icache_range(unsigned long start, unsigned long end)
                 flush_instruction_cache();
 }
 
-
 void flush_cache_range(struct vm_area_struct *vma,
                 unsigned long start, unsigned long end)
 {
-        int sr3;
-
         BUG_ON(!vma->vm_mm->context);
 
-        sr3 = mfsp(3);
-        if (vma->vm_mm->context == sr3) {
-                flush_user_dcache_range(start,end);
-                flush_user_icache_range(start,end);
+        if ((end - start) < parisc_cache_flush_threshold) {
+                if (vma->vm_mm->context == mfsp(3)) {
+                        flush_user_dcache_range_asm(start, end);
+                        if (vma->vm_flags & VM_EXEC)
+                                flush_user_icache_range_asm(start, end);
+                } else {
+                        unsigned long addr;
+                        pgd_t *pgd = vma->vm_mm->pgd;
+
+                        for (addr = start & PAGE_MASK; addr < end;
+                             addr += PAGE_SIZE) {
+                                pte_t *ptep = get_ptep(pgd, addr);
+                                if (ptep != NULL) {
+                                        pte_t pte = *ptep;
+                                        flush_cache_page(vma,
+                                           addr, pte_pfn(pte));
+                                }
+                        }
+                }
         } else {
+#ifdef CONFIG_SMP
                 flush_cache_all();
+#else
+                flush_cache_all_local();
+#endif
         }
 }
 
@@ -511,3 +598,67 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long
         __flush_cache_page(vma, vmaddr, page_to_phys(pfn_to_page(pfn)));
 
 }
+
+#ifdef CONFIG_PARISC_TMPALIAS
+
+void clear_user_highpage(struct page *page, unsigned long vaddr)
+{
+        void *vto;
+        unsigned long flags;
+
+        /* Clear using TMPALIAS region.  The page doesn't need to
+           be flushed but the kernel mapping needs to be purged.  */
+
+        vto = kmap_atomic(page, KM_USER0);
+
+        /* The PA-RISC 2.0 Architecture book states on page F-6:
+           "Before a write-capable translation is enabled, *all*
+           non-equivalently-aliased translations must be removed
+           from the page table and purged from the TLB.  (Note
+           that the caches are not required to be flushed at this
+           time.)  Before any non-equivalent aliased translation
+           is re-enabled, the virtual address range for the writeable
+           page (the entire page) must be flushed from the cache,
+           and the write-capable translation removed from the page
+           table and purged from the TLB."  */
+
+        purge_kernel_dcache_page_asm((unsigned long)vto);
+        purge_tlb_start(flags);
+        pdtlb_kernel(vto);
+        purge_tlb_end(flags);
+        preempt_disable();
+        clear_user_page_asm(vto, vaddr);
+        preempt_enable();
+
+        pagefault_enable();             /* kunmap_atomic(addr, KM_USER0); */
+}
+
+void copy_user_highpage(struct page *to, struct page *from,
+        unsigned long vaddr, struct vm_area_struct *vma)
+{
+        void *vfrom, *vto;
+        unsigned long flags;
+
+        /* Copy using TMPALIAS region.  This has the advantage
+           that the `from' page doesn't need to be flushed.  However,
+           the `to' page must be flushed in copy_user_page_asm since
+           it can be used to bring in executable code.  */
+
+        vfrom = kmap_atomic(from, KM_USER0);
+        vto = kmap_atomic(to, KM_USER1);
+
+        purge_kernel_dcache_page_asm((unsigned long)vto);
+        purge_tlb_start(flags);
+        pdtlb_kernel(vto);
+        pdtlb_kernel(vfrom);
+        purge_tlb_end(flags);
+        preempt_disable();
+        copy_user_page_asm(vto, vfrom, vaddr);
+        flush_dcache_page_asm(__pa(vto), vaddr);
+        preempt_enable();
+
+        pagefault_enable();             /* kunmap_atomic(addr, KM_USER1); */
+        pagefault_enable();             /* kunmap_atomic(addr, KM_USER0); */
+}
+
+#endif /* CONFIG_PARISC_TMPALIAS */
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index eb7850b46c25..7c9648919c91 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -483,7 +483,7 @@
          * B <-> _PAGE_DMB (memory break)
          *
          * Then incredible subtlety: The access rights are
-         * _PAGE_GATEWAY _PAGE_EXEC _PAGE_READ
+         * _PAGE_GATEWAY, _PAGE_EXEC and _PAGE_WRITE
          * See 3-14 of the parisc 2.0 manual
          *
          * Finally, _PAGE_READ goes in the top bit of PL1 (so we
@@ -493,7 +493,7 @@
 
         /* PAGE_USER indicates the page can be read with user privileges,
          * so deposit X1|11 to PL1|PL2 (remember the upper bit of PL1
-         * contains _PAGE_READ */
+         * contains _PAGE_READ) */
         extrd,u,*=      \pte,_PAGE_USER_BIT+32,1,%r0
         depdi           7,11,3,\prot
         /* If we're a gateway page, drop PL2 back to zero for promotion
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index 08324aac3544..3295ef4a185d 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -186,12 +186,14 @@ pat_query_module(ulong pcell_loc, ulong mod_index)
 
         if (status != PDC_OK) {
                 /* no more cell modules or error */
+                kfree(pa_pdc_cell);
                 return status;
         }
 
         temp = pa_pdc_cell->cba;
         dev = alloc_pa_dev(PAT_GET_CBA(temp), &(pa_pdc_cell->mod_path));
         if (!dev) {
+                kfree(pa_pdc_cell);
                 return PDC_OK;
         }
 
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 0299d63cd112..8094d3ed3b64 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -379,14 +379,14 @@ void do_cpu_irq_mask(struct pt_regs *regs)
 static struct irqaction timer_action = {
         .handler = timer_interrupt,
         .name = "timer",
-        .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_PERCPU | IRQF_IRQPOLL,
+        .flags = IRQF_TIMER | IRQF_PERCPU | IRQF_IRQPOLL,
 };
 
 #ifdef CONFIG_SMP
 static struct irqaction ipi_action = {
         .handler = ipi_interrupt,
         .name = "IPI",
-        .flags = IRQF_DISABLED | IRQF_PERCPU,
+        .flags = IRQF_PERCPU,
 };
 #endif
 
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 5d7218ad885c..312b48422a56 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -199,7 +199,6 @@ ENTRY(flush_instruction_cache_local)
         .callinfo NO_CALLS
         .entry
 
-        mtsp            %r0, %sr1
         load32          cache_info, %r1
 
         /* Flush Instruction Cache */
@@ -208,7 +207,8 @@ ENTRY(flush_instruction_cache_local)
         LDREG           ICACHE_STRIDE(%r1), %arg1
         LDREG           ICACHE_COUNT(%r1), %arg2
         LDREG           ICACHE_LOOP(%r1), %arg3
-        rsm             PSW_SM_I, %r22          /* No mmgt ops during loop*/
+        rsm             PSW_SM_I, %r22          /* No mmgt ops during loop*/
+        mtsp            %r0, %sr1
         addib,COND(=)           -1, %arg3, fioneloop    /* Preadjust and test */
         movb,<,n        %arg3, %r31, fisync     /* If loop < 0, do sync */
 
@@ -220,7 +220,33 @@ fimanyloop:					/* Loop if LOOP >= 2 */
         addib,COND(<=),n        -1, %arg2, fisync       /* Outer loop decr */
 
 fioneloop:                                      /* Loop if LOOP = 1 */
-        addib,COND(>)           -1, %arg2, fioneloop    /* Outer loop count decr */
+        /* Some implementations may flush with a single fice instruction */
+        cmpib,COND(>>=),n       15, %arg2, fioneloop2
+
+fioneloop1:
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        fice,m          %arg1(%sr1, %arg0)
+        addib,COND(>)   -16, %arg2, fioneloop1
+        fice,m          %arg1(%sr1, %arg0)
+
+        /* Check if done */
+        cmpb,COND(=),n  %arg2, %r0, fisync      /* Predict branch taken */
+
+fioneloop2:
+        addib,COND(>)   -1, %arg2, fioneloop2   /* Outer loop count decr */
         fice,m          %arg1(%sr1, %arg0)      /* Fice for one loop */
 
 fisync:
@@ -240,8 +266,7 @@ ENTRY(flush_data_cache_local)
         .callinfo NO_CALLS
         .entry
 
-        mtsp            %r0, %sr1
-        load32          cache_info, %r1
+        load32          cache_info, %r1
 
         /* Flush Data Cache */
 
@@ -249,7 +274,8 @@ ENTRY(flush_data_cache_local)
         LDREG           DCACHE_STRIDE(%r1), %arg1
         LDREG           DCACHE_COUNT(%r1), %arg2
         LDREG           DCACHE_LOOP(%r1), %arg3
-        rsm             PSW_SM_I, %r22
+        rsm             PSW_SM_I, %r22          /* No mmgt ops during loop*/
+        mtsp            %r0, %sr1
         addib,COND(=)           -1, %arg3, fdoneloop    /* Preadjust and test */
         movb,<,n        %arg3, %r31, fdsync     /* If loop < 0, do sync */
 
@@ -261,7 +287,33 @@ fdmanyloop:					/* Loop if LOOP >= 2 */
         addib,COND(<=),n        -1, %arg2, fdsync       /* Outer loop decr */
 
 fdoneloop:                                      /* Loop if LOOP = 1 */
-        addib,COND(>)           -1, %arg2, fdoneloop    /* Outer loop count decr */
+        /* Some implementations may flush with a single fdce instruction */
+        cmpib,COND(>>=),n       15, %arg2, fdoneloop2
+
+fdoneloop1:
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        fdce,m          %arg1(%sr1, %arg0)
+        addib,COND(>)   -16, %arg2, fdoneloop1
+        fdce,m          %arg1(%sr1, %arg0)
+
+        /* Check if done */
+        cmpb,COND(=),n  %arg2, %r0, fdsync      /* Predict branch taken */
+
+fdoneloop2:
+        addib,COND(>)   -1, %arg2, fdoneloop2   /* Outer loop count decr */
         fdce,m          %arg1(%sr1, %arg0)      /* Fdce for one loop */
 
 fdsync:
@@ -277,7 +329,104 @@ ENDPROC(flush_data_cache_local)
 
         .align  16
 
-ENTRY(copy_user_page_asm)
+/* Macros to serialize TLB purge operations on SMP.  */
+
+        .macro  tlb_lock        la,flags,tmp
+#ifdef CONFIG_SMP
+        ldil            L%pa_tlb_lock,%r1
+        ldo             R%pa_tlb_lock(%r1),\la
+        rsm             PSW_SM_I,\flags
+1:      LDCW            0(\la),\tmp
+        cmpib,<>,n      0,\tmp,3f
+2:      ldw             0(\la),\tmp
+        cmpb,<>         %r0,\tmp,1b
+        nop
+        b,n             2b
+3:
+#endif
+        .endm
+
+        .macro  tlb_unlock      la,flags,tmp
+#ifdef CONFIG_SMP
+        ldi             1,\tmp
+        stw             \tmp,0(\la)
+        mtsm            \flags
+#endif
+        .endm
+
+/* Clear page using kernel mapping.  */
+
+ENTRY(clear_page_asm)
+        .proc
+        .callinfo NO_CALLS
+        .entry
+
+#ifdef CONFIG_64BIT
+
+        /* Unroll the loop.  */
+        ldi             (PAGE_SIZE / 128), %r1
+
+1:
+        std             %r0, 0(%r26)
+        std             %r0, 8(%r26)
+        std             %r0, 16(%r26)
+        std             %r0, 24(%r26)
+        std             %r0, 32(%r26)
+        std             %r0, 40(%r26)
+        std             %r0, 48(%r26)
+        std             %r0, 56(%r26)
+        std             %r0, 64(%r26)
+        std             %r0, 72(%r26)
+        std             %r0, 80(%r26)
+        std             %r0, 88(%r26)
+        std             %r0, 96(%r26)
+        std             %r0, 104(%r26)
+        std             %r0, 112(%r26)
+        std             %r0, 120(%r26)
+
+        /* Note reverse branch hint for addib is taken.  */
+        addib,COND(>),n -1, %r1, 1b
+        ldo             128(%r26), %r26
+
+#else
+
+        /*
+         * Note that until (if) we start saving the full 64-bit register
+         * values on interrupt, we can't use std on a 32 bit kernel.
+         */
+        ldi             (PAGE_SIZE / 64), %r1
+
+1:
+        stw             %r0, 0(%r26)
+        stw             %r0, 4(%r26)
+        stw             %r0, 8(%r26)
+        stw             %r0, 12(%r26)
+        stw             %r0, 16(%r26)
+        stw             %r0, 20(%r26)
+        stw             %r0, 24(%r26)
+        stw             %r0, 28(%r26)
+        stw             %r0, 32(%r26)
+        stw             %r0, 36(%r26)
+        stw             %r0, 40(%r26)
+        stw             %r0, 44(%r26)
+        stw             %r0, 48(%r26)
+        stw             %r0, 52(%r26)
+        stw             %r0, 56(%r26)
+        stw             %r0, 60(%r26)
+
+        addib,COND(>),n -1, %r1, 1b
+        ldo             64(%r26), %r26
+#endif
+        bv              %r0(%r2)
+        nop
+        .exit
+
+        .procend
+ENDPROC(clear_page_asm)
+
+/* Copy page using kernel mapping.  */
+
+ENTRY(copy_page_asm)
         .proc
         .callinfo NO_CALLS
         .entry
@@ -285,18 +434,14 @@ ENTRY(copy_user_page_asm)
 #ifdef CONFIG_64BIT
         /* PA8x00 CPUs can consume 2 loads or 1 store per cycle.
          * Unroll the loop by hand and arrange insn appropriately.
-         * GCC probably can do this just as well.
+         * Prefetch doesn't improve performance on rp3440.
+         * GCC probably can do this just as well...
          */
 
-        ldd             0(%r25), %r19
         ldi             (PAGE_SIZE / 128), %r1
 
-        ldw             64(%r25), %r0           /* prefetch 1 cacheline ahead */
-        ldw             128(%r25), %r0          /* prefetch 2 */
-
-1:      ldd             8(%r25), %r20
-        ldw             192(%r25), %r0          /* prefetch 3 */
-        ldw             256(%r25), %r0          /* prefetch 4 */
+1:      ldd             0(%r25), %r19
+        ldd             8(%r25), %r20
 
         ldd             16(%r25), %r21
         ldd             24(%r25), %r22
@@ -330,20 +475,16 @@ ENTRY(copy_user_page_asm)
 
         ldd             112(%r25), %r21
         ldd             120(%r25), %r22
+        ldo             128(%r25), %r25
         std             %r19, 96(%r26)
         std             %r20, 104(%r26)
 
-        ldo             128(%r25), %r25
         std             %r21, 112(%r26)
         std             %r22, 120(%r26)
-        ldo             128(%r26), %r26
 
-        /* conditional branches nullify on forward taken branch, and on
-         * non-taken backward branch. Note that .+4 is a backwards branch.
-         * The ldd should only get executed if the branch is taken.
-         */
-        addib,COND(>),n -1, %r1, 1b             /* bundle 10 */
-        ldd             0(%r25), %r19           /* start next loads */
+        /* Note reverse branch hint for addib is taken.  */
+        addib,COND(>),n -1, %r1, 1b
+        ldo             128(%r26), %r26
 
 #else
 
@@ -399,7 +540,7 @@ ENTRY(copy_user_page_asm)
         .exit
 
         .procend
-ENDPROC(copy_user_page_asm)
+ENDPROC(copy_page_asm)
 
 /*
  * NOTE: Code in clear_user_page has a hard coded dependency on the
@@ -422,8 +563,6 @@ ENDPROC(copy_user_page_asm)
  *          %r23 physical page (shifted for tlb insert) of "from" translation
  */
 
-#if 0
-
         /*
          * We can't do this since copy_user_page is used to bring in
          * file data that might have instructions. Since the data would
@@ -435,6 +574,7 @@ ENDPROC(copy_user_page_asm)
          * use it if more information is passed into copy_user_page().
          * Have to do some measurements to see if it is worthwhile to
          * lobby for such a change.
+         *
          */
 
 ENTRY(copy_user_page_asm)
@@ -442,16 +582,21 @@ ENTRY(copy_user_page_asm)
         .callinfo NO_CALLS
         .entry
 
+        /* Convert virtual `to' and `from' addresses to physical addresses.
+           Move `from' physical address to non shadowed register.  */
         ldil            L%(__PAGE_OFFSET), %r1
         sub             %r26, %r1, %r26
-        sub             %r25, %r1, %r23         /* move physical addr into non shadowed reg */
+        sub             %r25, %r1, %r23
 
         ldil            L%(TMPALIAS_MAP_START), %r28
         /* FIXME for different page sizes != 4k */
 #ifdef CONFIG_64BIT
-        extrd,u         %r26,56,32, %r26                /* convert phys addr to tlb insert format */
-        extrd,u         %r23,56,32, %r23                /* convert phys addr to tlb insert format */
-        depd            %r24,63,22, %r28                /* Form aliased virtual address 'to' */
+#if (TMPALIAS_MAP_START >= 0x80000000)
+        depdi           0, 31,32, %r28          /* clear any sign extension */
+#endif
+        extrd,u         %r26,56,32, %r26        /* convert phys addr to tlb insert format */
+        extrd,u         %r23,56,32, %r23        /* convert phys addr to tlb insert format */
+        depd            %r24,63,22, %r28        /* Form aliased virtual address 'to' */
         depdi           0, 63,12, %r28          /* Clear any offset bits */
         copy            %r28, %r29
         depdi           1, 41,1, %r29           /* Form aliased virtual address 'from' */
@@ -466,10 +611,76 @@ ENTRY(copy_user_page_asm)
 
         /* Purge any old translations */
 
+#ifdef CONFIG_PA20
+        pdtlb,l         0(%r28)
+        pdtlb,l         0(%r29)
+#else
+        tlb_lock        %r20,%r21,%r22
         pdtlb           0(%r28)
         pdtlb           0(%r29)
+        tlb_unlock      %r20,%r21,%r22
+#endif
+
+#ifdef CONFIG_64BIT
+        /* PA8x00 CPUs can consume 2 loads or 1 store per cycle.
+         * Unroll the loop by hand and arrange insn appropriately.
+         * GCC probably can do this just as well.
+         */
 
-        ldi             64, %r1
+        ldd             0(%r29), %r19
+        ldi             (PAGE_SIZE / 128), %r1
+
+1:      ldd             8(%r29), %r20
+
+        ldd             16(%r29), %r21
+        ldd             24(%r29), %r22
+        std             %r19, 0(%r28)
+        std             %r20, 8(%r28)
+
+        ldd             32(%r29), %r19
+        ldd             40(%r29), %r20
+        std             %r21, 16(%r28)
+        std             %r22, 24(%r28)
+
+        ldd             48(%r29), %r21
+        ldd             56(%r29), %r22
+        std             %r19, 32(%r28)
+        std             %r20, 40(%r28)
+
+        ldd             64(%r29), %r19
+        ldd             72(%r29), %r20
+        std             %r21, 48(%r28)
+        std             %r22, 56(%r28)
+
+        ldd             80(%r29), %r21
+        ldd             88(%r29), %r22
+        std             %r19, 64(%r28)
+        std             %r20, 72(%r28)
+
+        ldd              96(%r29), %r19
+        ldd             104(%r29), %r20
+        std             %r21, 80(%r28)
+        std             %r22, 88(%r28)
+
+        ldd             112(%r29), %r21
+        ldd             120(%r29), %r22
+        std             %r19, 96(%r28)
+        std             %r20, 104(%r28)
+
+        ldo             128(%r29), %r29
+        std             %r21, 112(%r28)
+        std             %r22, 120(%r28)
+        ldo             128(%r28), %r28
+
+        /* conditional branches nullify on forward taken branch, and on
+         * non-taken backward branch. Note that .+4 is a backwards branch.
+         * The ldd should only get executed if the branch is taken.
+         */
+        addib,COND(>),n -1, %r1, 1b             /* bundle 10 */
+        ldd             0(%r29), %r19           /* start next loads */
+
+#else
+        ldi             (PAGE_SIZE / 64), %r1
 
         /*
          * This loop is optimized for PCXL/PCXL2 ldw/ldw and stw/stw
@@ -480,9 +691,7 @@ ENTRY(copy_user_page_asm)
          * use ldd/std on a 32 bit kernel.
          */
 
-
-1:
-        ldw             0(%r29), %r19
+1:      ldw             0(%r29), %r19
         ldw             4(%r29), %r20
         ldw             8(%r29), %r21
         ldw             12(%r29), %r22
@@ -515,8 +724,10 @@ ENTRY(copy_user_page_asm)
         stw             %r21, 56(%r28)
         stw             %r22, 60(%r28)
         ldo             64(%r28), %r28
+
         addib,COND(>)           -1, %r1,1b
         ldo             64(%r29), %r29
+#endif
 
         bv              %r0(%r2)
         nop
@@ -524,9 +735,8 @@ ENTRY(copy_user_page_asm)
 
         .procend
 ENDPROC(copy_user_page_asm)
-#endif
 
-ENTRY(__clear_user_page_asm)
+ENTRY(clear_user_page_asm)
         .proc
         .callinfo NO_CALLS
         .entry
@@ -550,7 +760,13 @@ ENTRY(__clear_user_page_asm)
 
         /* Purge any old translation */
 
+#ifdef CONFIG_PA20
+        pdtlb,l         0(%r28)
+#else
+        tlb_lock        %r20,%r21,%r22
         pdtlb           0(%r28)
+        tlb_unlock      %r20,%r21,%r22
+#endif
 
 #ifdef CONFIG_64BIT
         ldi             (PAGE_SIZE / 128), %r1
@@ -580,8 +796,7 @@ ENTRY(__clear_user_page_asm)
 #else   /* ! CONFIG_64BIT */
         ldi             (PAGE_SIZE / 64), %r1
 
-1:
-        stw             %r0, 0(%r28)
+1:      stw             %r0, 0(%r28)
         stw             %r0, 4(%r28)
         stw             %r0, 8(%r28)
         stw             %r0, 12(%r28)
@@ -606,7 +821,7 @@ ENTRY(__clear_user_page_asm)
         .exit
 
         .procend
-ENDPROC(__clear_user_page_asm)
+ENDPROC(clear_user_page_asm)
 
 ENTRY(flush_dcache_page_asm)
         .proc
@@ -630,7 +845,13 @@ ENTRY(flush_dcache_page_asm)
 
         /* Purge any old translation */
 
+#ifdef CONFIG_PA20
+        pdtlb,l         0(%r28)
+#else
+        tlb_lock        %r20,%r21,%r22
         pdtlb           0(%r28)
+        tlb_unlock      %r20,%r21,%r22
+#endif
 
         ldil            L%dcache_stride, %r1
         ldw             R%dcache_stride(%r1), %r1
@@ -663,8 +884,17 @@ ENTRY(flush_dcache_page_asm)
         fdc,m           %r1(%r28)
 
         sync
+
+#ifdef CONFIG_PA20
+        pdtlb,l         0(%r25)
+#else
+        tlb_lock        %r20,%r21,%r22
+        pdtlb           0(%r25)
+        tlb_unlock      %r20,%r21,%r22
+#endif
+
         bv              %r0(%r2)
-        pdtlb           (%r25)
+        nop
         .exit
 
         .procend
@@ -692,7 +922,13 @@ ENTRY(flush_icache_page_asm)
 
         /* Purge any old translation */
 
-        pitlb           (%sr4,%r28)
+#ifdef CONFIG_PA20
+        pitlb,l         %r0(%sr4,%r28)
+#else
+        tlb_lock        %r20,%r21,%r22
+        pitlb           (%sr4,%r28)
+        tlb_unlock      %r20,%r21,%r22
+#endif
 
         ldil            L%icache_stride, %r1
         ldw             R%icache_stride(%r1), %r1
@@ -727,8 +963,17 @@ ENTRY(flush_icache_page_asm)
         fic,m           %r1(%sr4,%r28)
 
         sync
+
+#ifdef CONFIG_PA20
+        pitlb,l         %r0(%sr4,%r25)
+#else
+        tlb_lock        %r20,%r21,%r22
+        pitlb           (%sr4,%r25)
+        tlb_unlock      %r20,%r21,%r22
+#endif
+
         bv              %r0(%r2)
-        pitlb           (%sr4,%r25)
+        nop
         .exit
 
         .procend
@@ -777,7 +1022,7 @@ ENTRY(flush_kernel_dcache_page_asm)
         .procend
 ENDPROC(flush_kernel_dcache_page_asm)
 
-ENTRY(purge_kernel_dcache_page)
+ENTRY(purge_kernel_dcache_page_asm)
         .proc
         .callinfo NO_CALLS
         .entry
@@ -817,7 +1062,7 @@ ENTRY(purge_kernel_dcache_page)
         .exit
 
         .procend
-ENDPROC(purge_kernel_dcache_page)
+ENDPROC(purge_kernel_dcache_page_asm)
 
 ENTRY(flush_user_dcache_range_asm)
         .proc
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index ceec85de6290..6795dc6c995f 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -157,5 +157,6 @@ extern void _mcount(void);
 EXPORT_SYMBOL(_mcount);
 #endif
 
-/* from pacache.S -- needed for copy_page */
-EXPORT_SYMBOL(copy_user_page_asm);
+/* from pacache.S -- needed for clear/copy_page */
+EXPORT_SYMBOL(clear_page_asm);
+EXPORT_SYMBOL(copy_page_asm);
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index fd051705a407..52c85b2f502e 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -312,7 +312,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 #if DEBUG_SIG
         /* Assert that we're flushing in the correct space... */
         {
-                int sid;
+                unsigned long sid;
                 asm ("mfsp %%sr3,%0" : "=r" (sid));
                 DBG(1,"setup_rt_frame: Flushing 64 bytes at space %#x offset %p\n",
                        sid, frame->tramp);
diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c
index 5dede04f2f3e..2ddcabb616ce 100644
--- a/arch/parisc/kernel/signal32.c
+++ b/arch/parisc/kernel/signal32.c
@@ -65,7 +65,7 @@ put_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz)
 {
         compat_sigset_t s;
 
-        if (sz != sizeof *set)
+        if (sz != sizeof(compat_sigset_t))
                 return -EINVAL;
         sigset_64to32(&s, set);
 
@@ -78,7 +78,7 @@ get_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz)
         compat_sigset_t s;
         int r;
 
-        if (sz != sizeof *set)
+        if (sz != sizeof(compat_sigset_t))
                 return -EINVAL;
 
         if ((r = copy_from_user(&s, up, sz)) == 0) {
@@ -94,8 +94,11 @@ int sys32_rt_sigprocmask(int how, compat_sigset_t __user *set, compat_sigset_t _
         sigset_t old_set, new_set;
         int ret;
 
-        if (set && get_sigset32(set, &new_set, sigsetsize))
-                return -EFAULT;
+        if (set) {
+                ret = get_sigset32(set, &new_set, sigsetsize);
+                if (ret)
+                        return ret;
+        }
         
         KERNEL_SYSCALL(ret, sys_rt_sigprocmask, how, set ? (sigset_t __user *)&new_set : NULL,
                                  oset ? (sigset_t __user *)&old_set : NULL, sigsetsize);
@@ -128,6 +131,10 @@ sys32_rt_sigaction(int sig, const struct sigaction32 __user *act, struct sigacti
         struct k_sigaction new_sa, old_sa;
         int ret = -EINVAL;
 
+        /* XXX: Don't preclude handling different sized sigset_t's.  */
+        if (sigsetsize != sizeof(compat_sigset_t))
+                return -EINVAL;
+
         if (act) {
                 if (copy_from_user(&new_sa32.sa, act, sizeof new_sa32.sa))
                         return -EFAULT;
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index f76c10863c62..54d619d4cac6 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -94,11 +94,12 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
 {
         if (len > TASK_SIZE)
                 return -ENOMEM;
-        /* Might want to check for cache aliasing issues for MAP_FIXED case
-         * like ARM or MIPS ??? --BenH.
-         */
-        if (flags & MAP_FIXED)
+        if (flags & MAP_FIXED) {
+                if ((flags & MAP_SHARED) &&
+                    (addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))
+                        return -EINVAL;
                 return addr;
+        }
         if (!addr)
                 addr = TASK_UNMAPPED_BASE;
 
@@ -212,6 +213,13 @@ asmlinkage long parisc_sync_file_range(int fd,
                         (loff_t)hi_nbytes << 32 | lo_nbytes, flags);
 }
 
+asmlinkage long parisc_fallocate(int fd, int mode, u32 offhi, u32 offlo,
+                                u32 lenhi, u32 lenlo)
+{
+        return sys_fallocate(fd, mode, ((u64)offhi << 32) | offlo,
+                             ((u64)lenhi << 32) | lenlo);
+}
+
 asmlinkage unsigned long sys_alloc_hugepages(int key, unsigned long addr, unsigned long len, int prot, int flag)
 {
         return -ENOMEM;
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 9cfdaa19ab63..eca69bb8ef5f 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -21,7 +21,6 @@
 #include <linux/time.h>
 #include <linux/smp.h>
 #include <linux/sem.h>
-#include <linux/msg.h>
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/uio.h>
@@ -61,111 +60,23 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23,
     return -ENOSYS;
 }
 
-asmlinkage long sys32_sched_rr_get_interval(pid_t pid,
-        struct compat_timespec __user *interval)
-{
-        struct timespec t;
-        int ret;
-
-        KERNEL_SYSCALL(ret, sys_sched_rr_get_interval, pid, (struct timespec __user *)&t);
-        if (put_compat_timespec(&t, interval))
-                return -EFAULT;
-        return ret;
-}
-
-struct msgbuf32 {
-    int mtype;
-    char mtext[1];
-};
-
-asmlinkage long sys32_msgsnd(int msqid,
-                                struct msgbuf32 __user *umsgp32,
-                                size_t msgsz, int msgflg)
-{
-        struct msgbuf *mb;
-        struct msgbuf32 mb32;
-        int err;
-
-        if ((mb = kmalloc(msgsz + sizeof *mb + 4, GFP_KERNEL)) == NULL)
-                return -ENOMEM;
-
-        err = get_user(mb32.mtype, &umsgp32->mtype);
-        mb->mtype = mb32.mtype;
-        err |= copy_from_user(mb->mtext, &umsgp32->mtext, msgsz);
-
-        if (err)
-                err = -EFAULT;
-        else
-                KERNEL_SYSCALL(err, sys_msgsnd, msqid, (struct msgbuf __user *)mb, msgsz, msgflg);
-
-        kfree(mb);
-        return err;
-}
-
-asmlinkage long sys32_msgrcv(int msqid,
-                                struct msgbuf32 __user *umsgp32,
-                                size_t msgsz, long msgtyp, int msgflg)
-{
-        struct msgbuf *mb;
-        struct msgbuf32 mb32;
-        int err, len;
-
-        if ((mb = kmalloc(msgsz + sizeof *mb + 4, GFP_KERNEL)) == NULL)
-                return -ENOMEM;
-
-        KERNEL_SYSCALL(err, sys_msgrcv, msqid, (struct msgbuf __user *)mb, msgsz, msgtyp, msgflg);
-
-        if (err >= 0) {
-                len = err;
-                mb32.mtype = mb->mtype;
-                err = put_user(mb32.mtype, &umsgp32->mtype);
-                err |= copy_to_user(&umsgp32->mtext, mb->mtext, len);
-                if (err)
-                        err = -EFAULT;
-                else
-                        err = len;
-        }
-
-        kfree(mb);
-        return err;
-}
-
-asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count)
+/* Note: it is necessary to treat out_fd and in_fd as unsigned ints, with the
+ * corresponding cast to a signed int to insure that the proper conversion
+ * (sign extension) between the register representation of a signed int (msr in
+ * 32-bit mode) and the register representation of a signed int (msr in 64-bit
+ * mode) is performed.
+ */
+asmlinkage long sys32_sendfile(u32 out_fd, u32 in_fd,
+                               compat_off_t __user *offset, compat_size_t count)
 {
-        mm_segment_t old_fs = get_fs();
-        int ret;
-        off_t of;
-
-        if (offset && get_user(of, offset))
-                return -EFAULT;
-
-        set_fs(KERNEL_DS);
-        ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL, count);
-        set_fs(old_fs);
-
-        if (offset && put_user(of, offset))
-                return -EFAULT;
-
-        return ret;
+        return compat_sys_sendfile((int)out_fd, (int)in_fd, offset, count);
 }
 
-asmlinkage int sys32_sendfile64(int out_fd, int in_fd, compat_loff_t __user *offset, s32 count)
+asmlinkage long sys32_sendfile64(u32 out_fd, u32 in_fd,
+                                 compat_loff_t __user *offset, compat_size_t count)
 {
-        mm_segment_t old_fs = get_fs();
-        int ret;
-        loff_t lof;
-        
-        if (offset && get_user(lof, offset))
-                return -EFAULT;
-                
-        set_fs(KERNEL_DS);
-        ret = sys_sendfile64(out_fd, in_fd, offset ? (loff_t __user *)&lof : NULL, count);
-        set_fs(old_fs);
-        
-        if (offset && put_user(lof, offset))
-                return -EFAULT;
-                
-        return ret;
+        return sys_sendfile64((int)out_fd, (int)in_fd,
+                                (loff_t __user *)offset, count);
 }
 
 
@@ -200,13 +111,6 @@ long sys32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char __user *buf,
                                   buf, len);
 }
 
-asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,
-                                u32 lenhi, u32 lenlo)
-{
-        return sys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,
-                             ((loff_t)lenhi << 32) | lenlo);
-}
-
 asmlinkage long compat_sys_fanotify_mark(int fan_fd, int flags, u32 mask_hi,
                                          u32 mask_lo, int fd,
                                          const char __user *pathname)
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 86742df0b194..5e055240f00b 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -309,10 +309,13 @@ tracesys_next:
         LDREG   TASK_PT_GR25(%r1), %r25
         LDREG   TASK_PT_GR24(%r1), %r24
         LDREG   TASK_PT_GR23(%r1), %r23
-#ifdef CONFIG_64BIT
         LDREG   TASK_PT_GR22(%r1), %r22
         LDREG   TASK_PT_GR21(%r1), %r21
+#ifdef CONFIG_64BIT
         ldo     -16(%r30),%r29                  /* Reference param save area */
+#else
+        stw     %r22, -52(%r30)                 /* 5th argument */
+        stw     %r21, -56(%r30)                 /* 6th argument */
 #endif
 
         comiclr,>>=     __NR_Linux_syscalls, %r20, %r0
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 54d950b067b7..129fd472c471 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -247,10 +247,7 @@
         ENTRY_SAME(sched_yield)
         ENTRY_SAME(sched_get_priority_max)
         ENTRY_SAME(sched_get_priority_min)      /* 160 */
-        /* These 2 would've worked if someone had defined struct timespec
-         * carefully, like timeval for example (which is about the same).
-         * Unfortunately it contains a long :-( */
-        ENTRY_DIFF(sched_rr_get_interval)
+        ENTRY_COMP(sched_rr_get_interval)
         ENTRY_COMP(nanosleep)
         ENTRY_SAME(mremap)
         ENTRY_SAME(setresuid)
@@ -286,8 +283,8 @@
         ENTRY_SAME(semop)               /* 185 */
         ENTRY_SAME(semget)
         ENTRY_DIFF(semctl)
-        ENTRY_DIFF(msgsnd)
-        ENTRY_DIFF(msgrcv)
+        ENTRY_COMP(msgsnd)
+        ENTRY_COMP(msgrcv)
         ENTRY_SAME(msgget)              /* 190 */
         ENTRY_SAME(msgctl)
         ENTRY_SAME(shmat)
@@ -307,7 +304,7 @@
         ENTRY_SAME(gettid)
         ENTRY_OURS(readahead)
         ENTRY_SAME(tkill)
-        ENTRY_SAME(sendfile64)
+        ENTRY_DIFF(sendfile64)
         ENTRY_COMP(futex)               /* 210 */
         ENTRY_COMP(sched_setaffinity)
         ENTRY_COMP(sched_getaffinity)
@@ -327,12 +324,12 @@
         ENTRY_SAME(epoll_wait)
         ENTRY_SAME(remap_file_pages)
         ENTRY_SAME(semtimedop)
-        ENTRY_SAME(mq_open)
+        ENTRY_COMP(mq_open)
         ENTRY_SAME(mq_unlink)           /* 230 */
-        ENTRY_SAME(mq_timedsend)
-        ENTRY_SAME(mq_timedreceive)
-        ENTRY_SAME(mq_notify)
-        ENTRY_SAME(mq_getsetattr)
+        ENTRY_COMP(mq_timedsend)
+        ENTRY_COMP(mq_timedreceive)
+        ENTRY_COMP(mq_notify)
+        ENTRY_COMP(mq_getsetattr)
         ENTRY_COMP(waitid)              /* 235 */
         ENTRY_OURS(fadvise64_64)
         ENTRY_SAME(set_tid_address)
@@ -403,7 +400,7 @@
         ENTRY_COMP(signalfd)
         ENTRY_SAME(ni_syscall)          /* was timerfd */
         ENTRY_SAME(eventfd)
-        ENTRY_COMP(fallocate)           /* 305 */
+        ENTRY_OURS(fallocate)           /* 305 */
         ENTRY_SAME(timerfd_create)
         ENTRY_COMP(timerfd_settime)
         ENTRY_COMP(timerfd_gettime)
@@ -428,6 +425,10 @@
         ENTRY_SAME(syncfs)
         ENTRY_SAME(setns)
         ENTRY_COMP(sendmmsg)
+        ENTRY_COMP(process_vm_readv)    /* 330 */
+        ENTRY_COMP(process_vm_writev)
+        ENTRY_SAME(kcmp)
+        ENTRY_SAME(finit_module)
 
         /* Nothing yet */
 
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 18162ce4261e..f247a3480e8e 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -175,10 +175,12 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
         struct mm_struct *mm = tsk->mm;
         unsigned long acc_type;
         int fault;
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         if (in_atomic() || !mm)
                 goto no_context;
 
+retry:
         down_read(&mm->mmap_sem);
         vma = find_vma_prev(mm, address, &prev_vma);
         if (!vma || address < vma->vm_start)
@@ -201,7 +203,12 @@ good_area:
          * fault.
          */
 
-        fault = handle_mm_fault(mm, vma, address, (acc_type & VM_WRITE) ? FAULT_FLAG_WRITE : 0);
+        fault = handle_mm_fault(mm, vma, address,
+                        flags | ((acc_type & VM_WRITE) ? FAULT_FLAG_WRITE : 0));
+
+        if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
+                return;
+
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 /*
                  * We hit a shared mapping outside of the file, or some
@@ -214,10 +221,23 @@ good_area:
                         goto bad_area;
                 BUG();
         }
-        if (fault & VM_FAULT_MAJOR)
-                current->maj_flt++;
-        else
-                current->min_flt++;
+        if (flags & FAULT_FLAG_ALLOW_RETRY) {
+                if (fault & VM_FAULT_MAJOR)
+                        current->maj_flt++;
+                else
+                        current->min_flt++;
+                if (fault & VM_FAULT_RETRY) {
+                        flags &= ~FAULT_FLAG_ALLOW_RETRY;
+
+                        /*
+                         * No need to up_read(&mm->mmap_sem) as we would
+                         * have already released it in __lock_page_or_retry
+                         * in mm/filemap.c.
+                         */
+
+                        goto retry;
+                }
+        }
         up_read(&mm->mmap_sem);
         return;
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index e7fb8edb629b..a5255f242be9 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -142,6 +142,7 @@ config PPC
         select HAVE_MOD_ARCH_SPECIFIC
         select MODULES_USE_ELF_RELA
         select CLONE_BACKWARDS
+        select ARCH_USE_BUILTIN_BSWAP
 
 config EARLY_PRINTK
         bool
@@ -273,6 +274,10 @@ config PPC_ADV_DEBUG_DAC_RANGE
         depends on PPC_ADV_DEBUG_REGS && 44x
         default y
 
+config PPC_EMULATE_SSTEP
+        bool
+        default y if KPROBES || UPROBES || XMON || HAVE_HW_BREAKPOINT
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
@@ -306,6 +311,14 @@ config MATH_EMULATION
           unit, which will allow programs that use floating-point
           instructions to run.
 
+config PPC_TRANSACTIONAL_MEM
+       bool "Transactional Memory support for POWERPC"
+       depends on PPC_BOOK3S_64
+       depends on SMP
+       default n
+       ---help---
+         Support user-mode Transactional Memory on POWERPC.
+
 config 8XX_MINIMAL_FPEMU
         bool "Minimal math emulation for 8xx"
         depends on 8xx && !MATH_EMULATION
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index b639852116fa..967fd23ace78 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -67,7 +67,25 @@ LDFLAGS_vmlinux-y := -Bstatic
 LDFLAGS_vmlinux-$(CONFIG_RELOCATABLE) := -pie
 LDFLAGS_vmlinux := $(LDFLAGS_vmlinux-y)
 
-CFLAGS-$(CONFIG_PPC64)  := -mminimal-toc -mtraceback=no -mcall-aixdesc
+ifeq ($(CONFIG_PPC64),y)
+ifeq ($(call cc-option-yn,-mcmodel=medium),y)
+        # -mcmodel=medium breaks modules because it uses 32bit offsets from
+        # the TOC pointer to create pointers where possible. Pointers into the
+        # percpu data area are created by this method.
+        #
+        # The kernel module loader relocates the percpu data section from the
+        # original location (starting with 0xd...) to somewhere in the base
+        # kernel percpu data space (starting with 0xc...). We need a full
+        # 64bit relocation for this to work, hence -mcmodel=large.
+        KBUILD_CFLAGS_MODULE += -mcmodel=large
+else
+        export NO_MINIMAL_TOC := -mno-minimal-toc
+endif
+endif
+
+CFLAGS-$(CONFIG_PPC64)  := -mtraceback=no -mcall-aixdesc
+CFLAGS-$(CONFIG_PPC64)  += $(call cc-option,-mcmodel=medium,-mminimal-toc)
+CFLAGS-$(CONFIG_PPC64)  += $(call cc-option,-mno-pointers-to-nested-functions)
 CFLAGS-$(CONFIG_PPC32)  := -ffixed-r2 -mmultiple
 
 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,-mtune=power4)
@@ -136,6 +154,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
+head-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE)  += arch/powerpc/kernel/prom_init.o
 
 core-y                          += arch/powerpc/kernel/ \
                                    arch/powerpc/mm/ \
@@ -143,6 +162,7 @@ core-y				+= arch/powerpc/kernel/ \
                                    arch/powerpc/sysdev/ \
                                    arch/powerpc/platforms/ \
                                    arch/powerpc/math-emu/ \
+                                   arch/powerpc/crypto/ \
                                    arch/powerpc/net/
 core-$(CONFIG_XMON)             += arch/powerpc/xmon/
 core-$(CONFIG_KVM)              += arch/powerpc/kvm/
diff --git a/arch/powerpc/boot/dts/a3m071.dts b/arch/powerpc/boot/dts/a3m071.dts
index 877a28cb77e4..bf81b8f9704c 100644
--- a/arch/powerpc/boot/dts/a3m071.dts
+++ b/arch/powerpc/boot/dts/a3m071.dts
@@ -17,6 +17,8 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { fsl,has-wdt; };
+
 / {
         model = "anonymous,a3m071";
         compatible = "anonymous,a3m071";
@@ -30,10 +32,6 @@
                 bus-frequency = <0>; /* From boot loader */
                 system-frequency = <0>; /* From boot loader */
 
-                timer@600 {
-                        fsl,has-wdt;
-                };
-
                 spi@f00 {
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/a4m072.dts b/arch/powerpc/boot/dts/a4m072.dts
index fabe7b7d5f13..1f02034c7e99 100644
--- a/arch/powerpc/boot/dts/a4m072.dts
+++ b/arch/powerpc/boot/dts/a4m072.dts
@@ -15,6 +15,11 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { fsl,has-wdt; };
+&gpt3 { gpio-controller; };
+&gpt4 { gpio-controller; };
+&gpt5 { gpio-controller; };
+
 / {
         model = "anonymous,a4m072";
         compatible = "anonymous,a4m072";
@@ -34,28 +39,6 @@
                         fsl,init-fd-counters = <0x3333>;
                 };
 
-                timer@600 {
-                        fsl,has-wdt;
-                };
-
-                gpt3: timer@630 { /* General Purpose Timer in GPIO mode */
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt4: timer@640 { /* General Purpose Timer in GPIO mode */
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt5: timer@650 { /* General Purpose Timer in GPIO mode */
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
                 spi@f00 {
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/bluestone.dts b/arch/powerpc/boot/dts/bluestone.dts
index 9d4917aebe6b..7daaca324c01 100644
--- a/arch/powerpc/boot/dts/bluestone.dts
+++ b/arch/powerpc/boot/dts/bluestone.dts
@@ -107,6 +107,14 @@
                 interrupt-parent = <&UIC0>;
         };
 
+        OCM: ocm@400040000 {
+                compatible = "ibm,ocm";
+                status = "ok";
+                cell-index = <1>;
+                /* configured in U-Boot */
+                reg = <4 0x00040000 0x8000>; /* 32K */
+        };
+
         SDR0: sdr {
                 compatible = "ibm,sdr-apm821xx";
                 dcr-reg = <0x00e 0x002>;
diff --git a/arch/powerpc/boot/dts/bsc9131rdb.dtsi b/arch/powerpc/boot/dts/bsc9131rdb.dtsi
index 638adda2c218..9e6c01339ccc 100644
--- a/arch/powerpc/boot/dts/bsc9131rdb.dtsi
+++ b/arch/powerpc/boot/dts/bsc9131rdb.dtsi
@@ -126,7 +126,7 @@
                 };
         };
 
-        sdhci@2e000 {
+        sdhc@2e000 {
                 status = "disabled";
         };
 
diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts
index ad3a4f4a2b04..fb580dd84ddf 100644
--- a/arch/powerpc/boot/dts/cm5200.dts
+++ b/arch/powerpc/boot/dts/cm5200.dts
@@ -12,15 +12,13 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { fsl,has-wdt; };
+
 / {
         model = "schindler,cm5200";
         compatible = "schindler,cm5200";
 
         soc5200@f0000000 {
-                timer@600 {     // General Purpose Timer
-                        fsl,has-wdt;
-                };
-
                 can@900 {
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/digsy_mtc.dts b/arch/powerpc/boot/dts/digsy_mtc.dts
index a7511f2d844d..955bff629df3 100644
--- a/arch/powerpc/boot/dts/digsy_mtc.dts
+++ b/arch/powerpc/boot/dts/digsy_mtc.dts
@@ -13,6 +13,9 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { gpio-controller; fsl,has-wdt; };
+&gpt1 { gpio-controller; };
+
 / {
         model = "intercontrol,digsy-mtc";
         compatible = "intercontrol,digsy-mtc";
@@ -22,17 +25,6 @@
         };
 
         soc5200@f0000000 {
-                timer@600 {     // General Purpose Timer
-                        #gpio-cells = <2>;
-                        fsl,has-wdt;
-                        gpio-controller;
-                };
-
-                timer@610 {
-                        #gpio-cells = <2>;
-                        gpio-controller;
-                };
-
                 rtc@800 {
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
index 0bde9ee8afaf..af12ead88c5f 100644
--- a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
@@ -41,7 +41,7 @@
 
 /* controller at 0x9000 */
 &pci0 {
-        compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";
+        compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3";
         device_type = "pci";
         #size-cells = <2>;
         #address-cells = <3>;
@@ -69,7 +69,7 @@
 
 /* controller at 0xa000 */
 &pci1 {
-        compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3", "fsl,qoriq-pcie-v2.2";
+        compatible = "fsl,p1010-pcie", "fsl,qoriq-pcie-v2.3";
         device_type = "pci";
         #size-cells = <2>;
         #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
index 06216b8c0af5..e179803a81ef 100644
--- a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
@@ -45,7 +45,7 @@
 
 /* controller at 0x9000 */
 &pci0 {
-        compatible = "fsl,p1022-pcie";
+        compatible = "fsl,mpc8548-pcie";
         device_type = "pci";
         #size-cells = <2>;
         #address-cells = <3>;
@@ -73,7 +73,7 @@
 
 /* controller at 0xa000 */
 &pci1 {
-        compatible = "fsl,p1022-pcie";
+        compatible = "fsl,mpc8548-pcie";
         device_type = "pci";
         #size-cells = <2>;
         #address-cells = <3>;
@@ -102,7 +102,7 @@
 
 /* controller at 0xb000 */
 &pci2 {
-        compatible = "fsl,p1022-pcie";
+        compatible = "fsl,mpc8548-pcie";
         device_type = "pci";
         #size-cells = <2>;
         #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
index 531eab82c6c9..69ac1acd4349 100644
--- a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
@@ -48,6 +48,8 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 15>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x500>; /* PEX1LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -75,6 +77,8 @@
         bus-range = <0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 14>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x504>; /* PEX2LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -102,6 +106,8 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 13>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x508>; /* PEX3LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -125,18 +131,21 @@
         interrupts = <16 2 1 11>;
         #address-cells = <2>;
         #size-cells = <2>;
+        fsl,iommu-parent = <&pamu0>;
         ranges;
 
         port1 {
                 #address-cells = <2>;
                 #size-cells = <2>;
                 cell-index = <1>;
+                fsl,liodn-reg = <&guts 0x510>; /* RIO1LIODNR */
         };
 
         port2 {
                 #address-cells = <2>;
                 #size-cells = <2>;
                 cell-index = <2>;
+                fsl,liodn-reg = <&guts 0x514>; /* RIO2LIODNR */
         };
 };
 
@@ -246,10 +255,37 @@
 
         iommu@20000 {
                 compatible = "fsl,pamu-v1.0", "fsl,pamu";
-                reg = <0x20000 0x4000>;
+                reg = <0x20000 0x4000>; /* for compatibility with older PAMU drivers */
+                ranges = <0 0x20000 0x4000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
                 interrupts = <
                         24 2 0 0
                         16 2 1 30>;
+
+                pamu0: pamu@0 {
+                        reg = <0 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu1: pamu@1000 {
+                        reg = <0x1000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu2: pamu@2000 {
+                        reg = <0x2000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu3: pamu@3000 {
+                        reg = <0x3000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
         };
 
 /include/ "qoriq-mpic.dtsi"
@@ -291,7 +327,17 @@
         };
 
 /include/ "qoriq-dma-0.dtsi"
+        dma@100300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */
+        };
+
 /include/ "qoriq-dma-1.dtsi"
+        dma@101300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */
+        };
+
 /include/ "qoriq-espi-0.dtsi"
         spi@110000 {
                 fsl,espi-num-chipselects = <4>;
@@ -299,6 +345,8 @@
 
 /include/ "qoriq-esdhc-0.dtsi"
         sdhc@114000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x530>; /* eSDHCLIODNR */
                 sdhci,auto-cmd12;
         };
 
@@ -308,20 +356,37 @@
 /include/ "qoriq-duart-1.dtsi"
 /include/ "qoriq-gpio-0.dtsi"
 /include/ "qoriq-usb2-mph-0.dtsi"
-                usb0: usb@210000 {
-                        compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";
-                        phy_type = "utmi";
-                        port0;
-                };
+        usb0: usb@210000 {
+                compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";
+                phy_type = "utmi";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */
+                port0;
+        };
 
 /include/ "qoriq-usb2-dr-0.dtsi"
-                usb1: usb@211000 {
-                        compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
-                        dr_mode = "host";
-                        phy_type = "utmi";
-                };
+        usb1: usb@211000 {
+                compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x524>; /* USB2LIODNR */
+                dr_mode = "host";
+                phy_type = "utmi";
+        };
 
 /include/ "qoriq-sata2-0.dtsi"
+        sata@220000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */
+        };
+
 /include/ "qoriq-sata2-1.dtsi"
+        sata@221000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */
+        };
+
 /include/ "qoriq-sec4.2-0.dtsi"
+crypto: crypto@300000 {
+                fsl,iommu-parent = <&pamu1>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
index af4ebc8009e3..9b5a81a4529c 100644
--- a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
@@ -48,6 +48,8 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 15>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x500>; /* PEX1LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -75,6 +77,8 @@
         bus-range = <0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 14>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x504>; /* PEX2LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -102,6 +106,8 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 13>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x508>; /* PEX3LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -152,18 +158,21 @@
         interrupts = <16 2 1 11>;
         #address-cells = <2>;
         #size-cells = <2>;
+        fsl,iommu-parent = <&pamu0>;
         ranges;
 
         port1 {
                 #address-cells = <2>;
                 #size-cells = <2>;
                 cell-index = <1>;
+                fsl,liodn-reg = <&guts 0x510>; /* RIO1LIODNR */
         };
 
         port2 {
                 #address-cells = <2>;
                 #size-cells = <2>;
                 cell-index = <2>;
+                fsl,liodn-reg = <&guts 0x514>; /* RIO2LIODNR */
         };
 };
 
@@ -273,10 +282,37 @@
 
         iommu@20000 {
                 compatible = "fsl,pamu-v1.0", "fsl,pamu";
-                reg = <0x20000 0x4000>;
+                reg = <0x20000 0x4000>; /* for compatibility with older PAMU drivers */
+                ranges = <0 0x20000 0x4000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
                 interrupts = <
                         24 2 0 0
                         16 2 1 30>;
+
+                pamu0: pamu@0 {
+                        reg = <0 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu1: pamu@1000 {
+                        reg = <0x1000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu2: pamu@2000 {
+                        reg = <0x2000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu3: pamu@3000 {
+                        reg = <0x3000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
         };
 
 /include/ "qoriq-mpic.dtsi"
@@ -318,7 +354,17 @@
         };
 
 /include/ "qoriq-dma-0.dtsi"
+        dma@100300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */
+        };
+
 /include/ "qoriq-dma-1.dtsi"
+        dma@101300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */
+        };
+
 /include/ "qoriq-espi-0.dtsi"
         spi@110000 {
                 fsl,espi-num-chipselects = <4>;
@@ -326,6 +372,8 @@
 
 /include/ "qoriq-esdhc-0.dtsi"
         sdhc@114000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x530>; /* eSDHCLIODNR */
                 sdhci,auto-cmd12;
         };
 
@@ -335,20 +383,37 @@
 /include/ "qoriq-duart-1.dtsi"
 /include/ "qoriq-gpio-0.dtsi"
 /include/ "qoriq-usb2-mph-0.dtsi"
-                usb0: usb@210000 {
-                        compatible = "fsl-usb2-mph-v1.6", "fsl-usb2-mph";
-                        phy_type = "utmi";
-                        port0;
-                };
+        usb0: usb@210000 {
+                compatible = "fsl-usb2-mph-v1.6", "fsl-usb2-mph";
+                phy_type = "utmi";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */
+                port0;
+        };
 
 /include/ "qoriq-usb2-dr-0.dtsi"
-                usb1: usb@211000 {
-                        compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
-                        dr_mode = "host";
-                        phy_type = "utmi";
-                };
+        usb1: usb@211000 {
+                compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x524>; /* USB2LIODNR */
+                dr_mode = "host";
+                phy_type = "utmi";
+        };
 
 /include/ "qoriq-sata2-0.dtsi"
+        sata@220000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */
+        };
+
 /include/ "qoriq-sata2-1.dtsi"
+        sata@221000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */
+        };
+
 /include/ "qoriq-sec4.2-0.dtsi"
+crypto: crypto@300000 {
+                fsl,iommu-parent = <&pamu1>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
index 4f9c9f682ecf..19859ad851eb 100644
--- a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
@@ -41,13 +41,15 @@
 
 /* controller at 0x200000 */
 &pci0 {
-        compatible = "fsl,p4080-pcie";
+        compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";
         device_type = "pci";
         #size-cells = <2>;
         #address-cells = <3>;
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 15>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x500>; /* PEX1LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -68,13 +70,15 @@
 
 /* controller at 0x201000 */
 &pci1 {
-        compatible = "fsl,p4080-pcie";
+        compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";
         device_type = "pci";
         #size-cells = <2>;
         #address-cells = <3>;
         bus-range = <0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 14>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x504>; /* PEX2LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -95,13 +99,15 @@
 
 /* controller at 0x202000 */
 &pci2 {
-        compatible = "fsl,p4080-pcie";
+        compatible = "fsl,p4080-pcie", "fsl,qoriq-pcie-v2.1";
         device_type = "pci";
         #size-cells = <2>;
         #address-cells = <3>;
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 13>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x508>; /* PEX3LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -126,18 +132,21 @@
         #address-cells = <2>;
         #size-cells = <2>;
         fsl,srio-rmu-handle = <&rmu>;
+        fsl,iommu-parent = <&pamu0>;
         ranges;
 
         port1 {
                 #address-cells = <2>;
                 #size-cells = <2>;
                 cell-index = <1>;
+                fsl,liodn-reg = <&guts 0x510>; /* RIO1LIODNR */
         };
 
         port2 {
                 #address-cells = <2>;
                 #size-cells = <2>;
                 cell-index = <2>;
+                fsl,liodn-reg = <&guts 0x514>; /* RIO2LIODNR */
         };
 };
 
@@ -281,13 +290,51 @@
 
         iommu@20000 {
                 compatible = "fsl,pamu-v1.0", "fsl,pamu";
-                reg = <0x20000 0x5000>;
+                reg = <0x20000 0x5000>; /* for compatibility with older PAMU drivers */
+                ranges = <0 0x20000 0x5000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
                 interrupts = <
                         24 2 0 0
                         16 2 1 30>;
+
+                pamu0: pamu@0 {
+                        reg = <0 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu1: pamu@1000 {
+                        reg = <0x1000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu2: pamu@2000 {
+                        reg = <0x2000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu3: pamu@3000 {
+                        reg = <0x3000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu4: pamu@4000 {
+                        reg = <0x4000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
         };
 
 /include/ "qoriq-rmu-0.dtsi"
+        rmu@d3000 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x540>; /* RMULIODNR */
+        };
+
 /include/ "qoriq-mpic.dtsi"
 
         guts: global-utilities@e0000 {
@@ -327,7 +374,17 @@
         };
 
 /include/ "qoriq-dma-0.dtsi"
+        dma@100300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */
+        };
+
 /include/ "qoriq-dma-1.dtsi"
+        dma@101300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */
+        };
+
 /include/ "qoriq-espi-0.dtsi"
         spi@110000 {
                 fsl,espi-num-chipselects = <4>;
@@ -335,6 +392,8 @@
 
 /include/ "qoriq-esdhc-0.dtsi"
         sdhc@114000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x530>; /* eSDHCLIODNR */
                 voltage-ranges = <3300 3300>;
                 sdhci,auto-cmd12;
         };
@@ -347,11 +406,18 @@
 /include/ "qoriq-usb2-mph-0.dtsi"
         usb@210000 {
                 compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */
                 port0;
         };
 /include/ "qoriq-usb2-dr-0.dtsi"
         usb@211000 {
                 compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x524>; /* USB2LIODNR */
         };
 /include/ "qoriq-sec4.0-0.dtsi"
+crypto: crypto@300000 {
+                fsl,iommu-parent = <&pamu1>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi
index 5d7205b7bb05..9ea77c3513f6 100644
--- a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi
@@ -48,6 +48,8 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 15>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x500>; /* PEX1LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -75,6 +77,8 @@
         bus-range = <0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 14>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x504>; /* PEX2LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -102,6 +106,8 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 13>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x508>; /* PEX3LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -129,6 +135,8 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 12>;
+        fsl,iommu-parent = <&pamu0>;
+        fsl,liodn-reg = <&guts 0x50c>; /* PEX4LIODNR */
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -152,18 +160,21 @@
         interrupts = <16 2 1 11>;
         #address-cells = <2>;
         #size-cells = <2>;
+        fsl,iommu-parent = <&pamu0>;
         ranges;
 
         port1 {
                 #address-cells = <2>;
                 #size-cells = <2>;
                 cell-index = <1>;
+                fsl,liodn-reg = <&guts 0x510>; /* RIO1LIODNR */
         };
 
         port2 {
                 #address-cells = <2>;
                 #size-cells = <2>;
                 cell-index = <2>;
+                fsl,liodn-reg = <&guts 0x514>; /* RIO2LIODNR */
         };
 };
 
@@ -276,10 +287,37 @@
 
         iommu@20000 {
                 compatible = "fsl,pamu-v1.0", "fsl,pamu";
-                reg = <0x20000 0x4000>;
+                reg = <0x20000 0x4000>; /* for compatibility with older PAMU drivers */
+                ranges = <0 0x20000 0x4000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
                 interrupts = <
                         24 2 0 0
                         16 2 1 30>;
+
+                pamu0: pamu@0 {
+                        reg = <0 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu1: pamu@1000 {
+                        reg = <0x1000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu2: pamu@2000 {
+                        reg = <0x2000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu3: pamu@3000 {
+                        reg = <0x3000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
         };
 
 /include/ "qoriq-mpic.dtsi"
@@ -321,7 +359,17 @@
         };
 
 /include/ "qoriq-dma-0.dtsi"
+        dma@100300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */
+        };
+
 /include/ "qoriq-dma-1.dtsi"
+        dma@101300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */
+        };
+
 /include/ "qoriq-espi-0.dtsi"
         spi@110000 {
                 fsl,espi-num-chipselects = <4>;
@@ -329,6 +377,8 @@
 
 /include/ "qoriq-esdhc-0.dtsi"
         sdhc@114000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x530>; /* eSDHCLIODNR */
                 sdhci,auto-cmd12;
         };
 
@@ -338,21 +388,41 @@
 /include/ "qoriq-duart-1.dtsi"
 /include/ "qoriq-gpio-0.dtsi"
 /include/ "qoriq-usb2-mph-0.dtsi"
-                usb0: usb@210000 {
-                        compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";
-                        phy_type = "utmi";
-                        port0;
-                };
+        usb0: usb@210000 {
+                compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */
+                phy_type = "utmi";
+                port0;
+        };
 
 /include/ "qoriq-usb2-dr-0.dtsi"
-                usb1: usb@211000 {
-                        compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
-                        dr_mode = "host";
-                        phy_type = "utmi";
-                };
+        usb1: usb@211000 {
+                compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x524>; /* USB2LIODNR */
+                dr_mode = "host";
+                phy_type = "utmi";
+        };
 
 /include/ "qoriq-sata2-0.dtsi"
+        sata@220000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */
+        };
+
 /include/ "qoriq-sata2-1.dtsi"
+        sata@221000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */
+        };
 /include/ "qoriq-sec4.2-0.dtsi"
+        crypto@300000 {
+                fsl,iommu-parent = <&pamu1>;
+        };
+
 /include/ "qoriq-raid1.0-0.dtsi"
+        raideng@320000 {
+                fsl,iommu-parent = <&pamu1>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
index db2c9a7b3a0e..97f8c26f9709 100644
--- a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
@@ -48,6 +48,7 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 15>;
+        fsl,iommu-parent = <&pamu0>;
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -75,6 +76,7 @@
         bus-range = <0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 14>;
+        fsl,iommu-parent = <&pamu0>;
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -102,6 +104,7 @@
         bus-range = <0x0 0xff>;
         clock-frequency = <33333333>;
         interrupts = <16 2 1 13>;
+        fsl,iommu-parent = <&pamu0>;
         pcie@0 {
                 reg = <0 0 0 0 0>;
                 #interrupt-cells = <1>;
@@ -239,10 +242,42 @@
 
         iommu@20000 {
                 compatible = "fsl,pamu-v1.0", "fsl,pamu";
-                reg = <0x20000 0x5000>;
-                interrupts = <
-                        24 2 0 0
-                        16 2 1 30>;
+                reg = <0x20000 0x5000>; /* for compatibility with older PAMU drivers */
+                ranges = <0 0x20000 0x5000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                interrupts = <24 2 0 0
+                              16 2 1 30>;
+
+                pamu0: pamu@0 {
+                        reg = <0 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu1: pamu@1000 {
+                        reg = <0x1000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu2: pamu@2000 {
+                        reg = <0x2000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu3: pamu@3000 {
+                        reg = <0x3000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu4: pamu@4000 {
+                        reg = <0x4000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
         };
 
 /include/ "qoriq-mpic.dtsi"
@@ -284,7 +319,17 @@
         };
 
 /include/ "qoriq-dma-0.dtsi"
+        dma@100300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */
+        };
+
 /include/ "qoriq-dma-1.dtsi"
+        dma@101300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */
+        };
+
 /include/ "qoriq-espi-0.dtsi"
         spi@110000 {
                 fsl,espi-num-chipselects = <4>;
@@ -292,6 +337,8 @@
 
 /include/ "qoriq-esdhc-0.dtsi"
         sdhc@114000 {
+                fsl,iommu-parent = <&pamu2>;
+                fsl,liodn-reg = <&guts 0x530>; /* eSDHCLIODNR */
                 sdhci,auto-cmd12;
         };
 
@@ -301,20 +348,37 @@
 /include/ "qoriq-duart-1.dtsi"
 /include/ "qoriq-gpio-0.dtsi"
 /include/ "qoriq-usb2-mph-0.dtsi"
-                usb0: usb@210000 {
-                        compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";
-                        phy_type = "utmi";
-                        port0;
-                };
+        usb0: usb@210000 {
+                compatible = "fsl-usb2-mph-v1.6", "fsl,mpc85xx-usb2-mph", "fsl-usb2-mph";
+                fsl,iommu-parent = <&pamu4>;
+                fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */
+                phy_type = "utmi";
+                port0;
+        };
 
 /include/ "qoriq-usb2-dr-0.dtsi"
-                usb1: usb@211000 {
-                        compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
-                        dr_mode = "host";
-                        phy_type = "utmi";
-                };
+        usb1: usb@211000 {
+                compatible = "fsl-usb2-dr-v1.6", "fsl,mpc85xx-usb2-dr", "fsl-usb2-dr";
+                fsl,iommu-parent = <&pamu4>;
+                fsl,liodn-reg = <&guts 0x524>; /* USB2LIODNR */
+                dr_mode = "host";
+                phy_type = "utmi";
+        };
 
 /include/ "qoriq-sata2-0.dtsi"
+        sata@220000 {
+                fsl,iommu-parent = <&pamu4>;
+                fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */
+        };
+
 /include/ "qoriq-sata2-1.dtsi"
+        sata@221000 {
+                fsl,iommu-parent = <&pamu4>;
+                fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */
+        };
+
 /include/ "qoriq-sec5.2-0.dtsi"
+        crypto@300000 {
+                fsl,iommu-parent = <&pamu4>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
index d4c9d5daab21..ffadcb563ada 100644
--- a/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
@@ -36,6 +36,7 @@ crypto@30000 {
         compatible = "fsl,sec-v4.4", "fsl,sec-v4.0";
         #address-cells = <1>;
         #size-cells = <1>;
+        ranges           = <0x0 0x30000 0x10000>;
         reg              = <0x30000 0x10000>;
         interrupts       = <58 2 0 0>;
 
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index fb288bb882b6..5abb46c5cc95 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -12,19 +12,34 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { fsl,has-wdt; };
+&gpt2 { gpio-controller; };
+&gpt3 { gpio-controller; };
+
 / {
         model = "fsl,lite5200b";
         compatible = "fsl,lite5200b";
 
+        leds {
+                compatible = "gpio-leds";
+                tmr2 {
+                        gpios = <&gpt2 0 1>;
+                };
+                tmr3 {
+                        gpios = <&gpt3 0 1>;
+                        linux,default-trigger = "heartbeat";
+                };
+                led1 { gpios = <&gpio_wkup 2 1>; };
+                led2 { gpios = <&gpio_simple 3 1>; };
+                led3 { gpios = <&gpio_wkup 3 1>; };
+                led4 { gpios = <&gpio_simple 2 1>; };
+        };
+
         memory {
                 reg = <0x00000000 0x10000000>;  // 256MB
         };
 
         soc5200@f0000000 {
-                timer@600 {     // General Purpose Timer
-                        fsl,has-wdt;
-                };
-
                 psc@2000 {              // PSC1
                         compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
                         cell-index = <0>;
diff --git a/arch/powerpc/boot/dts/media5200.dts b/arch/powerpc/boot/dts/media5200.dts
index 48d72f38e5ed..b5413cb85f13 100644
--- a/arch/powerpc/boot/dts/media5200.dts
+++ b/arch/powerpc/boot/dts/media5200.dts
@@ -13,6 +13,8 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { fsl,has-wdt; };
+
 / {
         model = "fsl,media5200";
         compatible = "fsl,media5200";
@@ -41,10 +43,6 @@
         soc5200@f0000000 {
                 bus-frequency = <132000000>;// 132 MHz
 
-                timer@600 {     // General Purpose Timer
-                        fsl,has-wdt;
-                };
-
                 psc@2000 {      // PSC1
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/motionpro.dts b/arch/powerpc/boot/dts/motionpro.dts
index 0b78e89ac69b..bbabd97492ad 100644
--- a/arch/powerpc/boot/dts/motionpro.dts
+++ b/arch/powerpc/boot/dts/motionpro.dts
@@ -12,26 +12,22 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { fsl,has-wdt; };
+&gpt6 { // Motion-PRO status LED
+        compatible = "promess,motionpro-led";
+        label = "motionpro-statusled";
+        blink-delay = <100>; // 100 msec
+};
+&gpt7 { // Motion-PRO ready LED
+        compatible = "promess,motionpro-led";
+        label = "motionpro-readyled";
+};
+
 / {
         model = "promess,motionpro";
         compatible = "promess,motionpro";
 
         soc5200@f0000000 {
-                timer@600 {     // General Purpose Timer
-                        fsl,has-wdt;
-                };
-
-                timer@660 {     // Motion-PRO status LED
-                        compatible = "promess,motionpro-led";
-                        label = "motionpro-statusled";
-                        blink-delay = <100>; // 100 msec
-                };
-
-                timer@670 {     // Motion-PRO ready LED
-                        compatible = "promess,motionpro-led";
-                        label = "motionpro-readyled";
-                };
-
                 can@900 {
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi
new file mode 100644
index 000000000000..723e292b6b4e
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc5121.dtsi
@@ -0,0 +1,410 @@
+/*
+ * base MPC5121 Device Tree Source
+ *
+ * Copyright 2007-2008 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 = "mpc5121";
+        compatible = "fsl,mpc5121";
+        #address-cells = <1>;
+        #size-cells = <1>;
+        interrupt-parent = <&ipic>;
+
+        aliases {
+                ethernet0 = &eth0;
+                pci = &pci;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,5121@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <0x20>;     /* 32 bytes */
+                        i-cache-line-size = <0x20>;     /* 32 bytes */
+                        d-cache-size = <0x8000>;        /* L1, 32K */
+                        i-cache-size = <0x8000>;        /* L1, 32K */
+                        timebase-frequency = <49500000>;/* 49.5 MHz (csb/4) */
+                        bus-frequency = <198000000>;    /* 198 MHz csb bus */
+                        clock-frequency = <396000000>;  /* 396 MHz ppc core */
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;  /* 256MB at 0 */
+        };
+
+        mbx@20000000 {
+                compatible = "fsl,mpc5121-mbx";
+                reg = <0x20000000 0x4000>;
+                interrupts = <66 0x8>;
+        };
+
+        sram@30000000 {
+                compatible = "fsl,mpc5121-sram";
+                reg = <0x30000000 0x20000>;     /* 128K at 0x30000000 */
+        };
+
+        nfc@40000000 {
+                compatible = "fsl,mpc5121-nfc";
+                reg = <0x40000000 0x100000>;    /* 1M at 0x40000000 */
+                interrupts = <6 8>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+        };
+
+        localbus@80000020 {
+                compatible = "fsl,mpc5121-localbus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0x80000020 0x40>;
+                interrupts = <7 0x8>;
+                ranges = <0x0 0x0 0xfc000000 0x04000000>;
+        };
+
+        soc@80000000 {
+                compatible = "fsl,mpc5121-immr";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                #interrupt-cells = <2>;
+                ranges = <0x0 0x80000000 0x400000>;
+                reg = <0x80000000 0x400000>;
+                bus-frequency = <66000000>;     /* 66 MHz ips bus */
+
+
+                /*
+                 * IPIC
+                 * interrupts cell = <intr #, sense>
+                 * sense values match linux IORESOURCE_IRQ_* defines:
+                 * sense == 8: Level, low assertion
+                 * sense == 2: Edge, high-to-low change
+                 */
+                ipic: interrupt-controller@c00 {
+                        compatible = "fsl,mpc5121-ipic", "fsl,ipic";
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0xc00 0x100>;
+                };
+
+                /* Watchdog timer */
+                wdt@900 {
+                        compatible = "fsl,mpc5121-wdt";
+                        reg = <0x900 0x100>;
+                };
+
+                /* Real time clock */
+                rtc@a00 {
+                        compatible = "fsl,mpc5121-rtc";
+                        reg = <0xa00 0x100>;
+                        interrupts = <79 0x8 80 0x8>;
+                };
+
+                /* Reset module */
+                reset@e00 {
+                        compatible = "fsl,mpc5121-reset";
+                        reg = <0xe00 0x100>;
+                };
+
+                /* Clock control */
+                clock@f00 {
+                        compatible = "fsl,mpc5121-clock";
+                        reg = <0xf00 0x100>;
+                };
+
+                /* Power Management Controller */
+                pmc@1000{
+                        compatible = "fsl,mpc5121-pmc";
+                        reg = <0x1000 0x100>;
+                        interrupts = <83 0x8>;
+                };
+
+                gpio@1100 {
+                        compatible = "fsl,mpc5121-gpio";
+                        reg = <0x1100 0x100>;
+                        interrupts = <78 0x8>;
+                };
+
+                can@1300 {
+                        compatible = "fsl,mpc5121-mscan";
+                        reg = <0x1300 0x80>;
+                        interrupts = <12 0x8>;
+                };
+
+                can@1380 {
+                        compatible = "fsl,mpc5121-mscan";
+                        reg = <0x1380 0x80>;
+                        interrupts = <13 0x8>;
+                };
+
+                sdhc@1500 {
+                        compatible = "fsl,mpc5121-sdhc";
+                        reg = <0x1500 0x100>;
+                        interrupts = <8 0x8>;
+                };
+
+                i2c@1700 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
+                        reg = <0x1700 0x20>;
+                        interrupts = <9 0x8>;
+                };
+
+                i2c@1720 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
+                        reg = <0x1720 0x20>;
+                        interrupts = <10 0x8>;
+                };
+
+                i2c@1740 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
+                        reg = <0x1740 0x20>;
+                        interrupts = <11 0x8>;
+                };
+
+                i2ccontrol@1760 {
+                        compatible = "fsl,mpc5121-i2c-ctrl";
+                        reg = <0x1760 0x8>;
+                };
+
+                axe@2000 {
+                        compatible = "fsl,mpc5121-axe";
+                        reg = <0x2000 0x100>;
+                        interrupts = <42 0x8>;
+                };
+
+                display@2100 {
+                        compatible = "fsl,mpc5121-diu";
+                        reg = <0x2100 0x100>;
+                        interrupts = <64 0x8>;
+                };
+
+                can@2300 {
+                        compatible = "fsl,mpc5121-mscan";
+                        reg = <0x2300 0x80>;
+                        interrupts = <90 0x8>;
+                };
+
+                can@2380 {
+                        compatible = "fsl,mpc5121-mscan";
+                        reg = <0x2380 0x80>;
+                        interrupts = <91 0x8>;
+                };
+
+                viu@2400 {
+                        compatible = "fsl,mpc5121-viu";
+                        reg = <0x2400 0x400>;
+                        interrupts = <67 0x8>;
+                };
+
+                mdio@2800 {
+                        compatible = "fsl,mpc5121-fec-mdio";
+                        reg = <0x2800 0x800>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                eth0: ethernet@2800 {
+                        device_type = "network";
+                        compatible = "fsl,mpc5121-fec";
+                        reg = <0x2800 0x800>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <4 0x8>;
+                };
+
+                /* USB1 using external ULPI PHY */
+                usb@3000 {
+                        compatible = "fsl,mpc5121-usb2-dr";
+                        reg = <0x3000 0x600>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupts = <43 0x8>;
+                        dr_mode = "otg";
+                        phy_type = "ulpi";
+                };
+
+                /* USB0 using internal UTMI PHY */
+                usb@4000 {
+                        compatible = "fsl,mpc5121-usb2-dr";
+                        reg = <0x4000 0x600>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupts = <44 0x8>;
+                        dr_mode = "otg";
+                        phy_type = "utmi_wide";
+                };
+
+                /* IO control */
+                ioctl@a000 {
+                        compatible = "fsl,mpc5121-ioctl";
+                        reg = <0xA000 0x1000>;
+                };
+
+                /* LocalPlus controller */
+                lpc@10000 {
+                        compatible = "fsl,mpc5121-lpc";
+                        reg = <0x10000 0x200>;
+                };
+
+                pata@10200 {
+                        compatible = "fsl,mpc5121-pata";
+                        reg = <0x10200 0x100>;
+                        interrupts = <5 0x8>;
+                };
+
+                /* 512x PSCs are not 52xx PSC compatible */
+
+                /* PSC0 */
+                psc@11000 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11000 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC1 */
+                psc@11100 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11100 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC2 */
+                psc@11200 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11200 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC3 */
+                psc@11300 {
+                        compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
+                        reg = <0x11300 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC4 */
+                psc@11400 {
+                        compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
+                        reg = <0x11400 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC5 */
+                psc@11500 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11500 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC6 */
+                psc@11600 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11600 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC7 */
+                psc@11700 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11700 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC8 */
+                psc@11800 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11800 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC9 */
+                psc@11900 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11900 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC10 */
+                psc@11a00 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11a00 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                /* PSC11 */
+                psc@11b00 {
+                        compatible = "fsl,mpc5121-psc";
+                        reg = <0x11b00 0x100>;
+                        interrupts = <40 0x8>;
+                        fsl,rx-fifo-size = <16>;
+                        fsl,tx-fifo-size = <16>;
+                };
+
+                pscfifo@11f00 {
+                        compatible = "fsl,mpc5121-psc-fifo";
+                        reg = <0x11f00 0x100>;
+                        interrupts = <40 0x8>;
+                };
+
+                dma@14000 {
+                        compatible = "fsl,mpc5121-dma";
+                        reg = <0x14000 0x1800>;
+                        interrupts = <65 0x8>;
+                };
+        };
+
+        pci: pci@80008500 {
+                compatible = "fsl,mpc5121-pci";
+                device_type = "pci";
+                interrupts = <1 0x8>;
+                clock-frequency = <0>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+
+                reg = <0x80008500 0x100 /* internal registers */
+                       0x80008300 0x8>; /* config space access registers */
+                bus-range = <0x0 0x0>;
+                ranges = <0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0x84000000 0x0 0x01000000>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index c9ef6bbe26cf..f269b1382ef7 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -1,7 +1,7 @@
 /*
  * MPC5121E ADS Device Tree Source
  *
- * Copyright 2007,2008 Freescale Semiconductor Inc.
+ * Copyright 2007-2008 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
@@ -9,74 +9,26 @@
  * option) any later version.
  */
 
-/dts-v1/;
+/include/ "mpc5121.dtsi"
 
 / {
         model = "mpc5121ads";
         compatible = "fsl,mpc5121ads";
-        #address-cells = <1>;
-        #size-cells = <1>;
-
-        aliases {
-                pci = &pci;
-        };
-
-        cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                PowerPC,5121@0 {
-                        device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <0x20>;     // 32 bytes
-                        i-cache-line-size = <0x20>;     // 32 bytes
-                        d-cache-size = <0x8000>;        // L1, 32K
-                        i-cache-size = <0x8000>;        // L1, 32K
-                        timebase-frequency = <49500000>;// 49.5 MHz (csb/4)
-                        bus-frequency = <198000000>;    // 198 MHz csb bus
-                        clock-frequency = <396000000>;  // 396 MHz ppc core
-                };
-        };
-
-        memory {
-                device_type = "memory";
-                reg = <0x00000000 0x10000000>;  // 256MB at 0
-        };
-
-        mbx@20000000 {
-                compatible = "fsl,mpc5121-mbx";
-                reg = <0x20000000 0x4000>;
-                interrupts = <66 0x8>;
-                interrupt-parent = < &ipic >;
-        };
-
-        sram@30000000 {
-                compatible = "fsl,mpc5121-sram";
-                reg = <0x30000000 0x20000>;             // 128K at 0x30000000
-        };
 
         nfc@40000000 {
-                compatible = "fsl,mpc5121-nfc";
-                reg = <0x40000000 0x100000>;    // 1M at 0x40000000
-                interrupts = <6 8>;
-                interrupt-parent = < &ipic >;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                // ADS has two Hynix 512MB Nand flash chips in a single
-                // stacked package.
+                /*
+                 * ADS has two Hynix 512MB Nand flash chips in a single
+                 * stacked package.
+                 */
                 chips = <2>;
+
                 nand@0 {
                         label = "nand";
-                        reg = <0x00000000 0x40000000>;  // 512MB + 512MB
+                        reg = <0x00000000 0x40000000>;  /* 512MB + 512MB */
                 };
         };
 
         localbus@80000020 {
-                compatible = "fsl,mpc5121-localbus";
-                #address-cells = <2>;
-                #size-cells = <1>;
-                reg = <0x80000020 0x40>;
-
                 ranges = <0x0 0x0 0xfc000000 0x04000000
                           0x2 0x0 0x82000000 0x00008000>;
 
@@ -87,6 +39,7 @@
                         #size-cells = <1>;
                         bank-width = <4>;
                         device-width = <2>;
+
                         protected@0 {
                                 label = "protected";
                                 reg = <0x00000000 0x00040000>;  // first sector is protected
@@ -121,91 +74,18 @@
                         interrupt-controller;
                         #interrupt-cells = <2>;
                         reg = <0x2 0xa 0x5>;
-                        interrupt-parent = < &ipic >;
-                        // irq routing
-                        //      all irqs but touch screen are routed to irq0 (ipic 48)
-                        //      touch screen is statically routed to irq1 (ipic 17)
-                        //      so don't use it here
+                        /* irq routing:
+                         * all irqs but touch screen are routed to irq0 (ipic 48)
+                         * touch screen is statically routed to irq1 (ipic 17)
+                         * so don't use it here
+                         */
                         interrupts = <48 0x8>;
                 };
         };
 
         soc@80000000 {
-                compatible = "fsl,mpc5121-immr";
-                #address-cells = <1>;
-                #size-cells = <1>;
-                #interrupt-cells = <2>;
-                ranges = <0x0 0x80000000 0x400000>;
-                reg = <0x80000000 0x400000>;
-                bus-frequency = <66000000>;     // 66 MHz ips bus
-
-
-                // IPIC
-                // interrupts cell = <intr #, sense>
-                // sense values match linux IORESOURCE_IRQ_* defines:
-                // sense == 8: Level, low assertion
-                // sense == 2: Edge, high-to-low change
-                //
-                ipic: interrupt-controller@c00 {
-                        compatible = "fsl,mpc5121-ipic", "fsl,ipic";
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <0xc00 0x100>;
-                };
-
-                rtc@a00 {       // Real time clock
-                        compatible = "fsl,mpc5121-rtc";
-                        reg = <0xa00 0x100>;
-                        interrupts = <79 0x8 80 0x8>;
-                        interrupt-parent = < &ipic >;
-                };
-
-                reset@e00 {     // Reset module
-                        compatible = "fsl,mpc5121-reset";
-                        reg = <0xe00 0x100>;
-                };
-
-                clock@f00 {     // Clock control
-                        compatible = "fsl,mpc5121-clock";
-                        reg = <0xf00 0x100>;
-                };
-
-                pmc@1000{  //Power Management Controller
-                        compatible = "fsl,mpc5121-pmc";
-                        reg = <0x1000 0x100>;
-                        interrupts = <83 0x2>;
-                        interrupt-parent = < &ipic >;
-                };
-
-                gpio@1100 {
-                        compatible = "fsl,mpc5121-gpio";
-                        reg = <0x1100 0x100>;
-                        interrupts = <78 0x8>;
-                        interrupt-parent = < &ipic >;
-                };
-
-                can@1300 {
-                        compatible = "fsl,mpc5121-mscan";
-                        interrupts = <12 0x8>;
-                        interrupt-parent = < &ipic >;
-                        reg = <0x1300 0x80>;
-                };
-
-                can@1380 {
-                        compatible = "fsl,mpc5121-mscan";
-                        interrupts = <13 0x8>;
-                        interrupt-parent = < &ipic >;
-                        reg = <0x1380 0x80>;
-                };
 
                 i2c@1700 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
-                        reg = <0x1700 0x20>;
-                        interrupts = <9 0x8>;
-                        interrupt-parent = < &ipic >;
                         fsl,preserve-clocking;
 
                         hwmon@4a {
@@ -224,196 +104,75 @@
                         };
                 };
 
-                i2c@1720 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
-                        reg = <0x1720 0x20>;
-                        interrupts = <10 0x8>;
-                        interrupt-parent = < &ipic >;
-                };
-
-                i2c@1740 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
-                        reg = <0x1740 0x20>;
-                        interrupts = <11 0x8>;
-                        interrupt-parent = < &ipic >;
+                eth0: ethernet@2800 {
+                        phy-handle = <&phy0>;
                 };
 
-                i2ccontrol@1760 {
-                        compatible = "fsl,mpc5121-i2c-ctrl";
-                        reg = <0x1760 0x8>;
+                can@2300 {
+                        status = "disabled";
                 };
 
-                axe@2000 {
-                        compatible = "fsl,mpc5121-axe";
-                        reg = <0x2000 0x100>;
-                        interrupts = <42 0x8>;
-                        interrupt-parent = < &ipic >;
+                can@2380 {
+                        status = "disabled";
                 };
 
-                display@2100 {
-                        compatible = "fsl,mpc5121-diu";
-                        reg = <0x2100 0x100>;
-                        interrupts = <64 0x8>;
-                        interrupt-parent = < &ipic >;
+                viu@2400 {
+                        status = "disabled";
                 };
 
                 mdio@2800 {
-                        compatible = "fsl,mpc5121-fec-mdio";
-                        reg = <0x2800 0x800>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        phy: ethernet-phy@0 {
+                        phy0: ethernet-phy@0 {
                                 reg = <1>;
-                                device_type = "ethernet-phy";
                         };
                 };
 
-                ethernet@2800 {
-                        device_type = "network";
-                        compatible = "fsl,mpc5121-fec";
-                        reg = <0x2800 0x800>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <4 0x8>;
-                        interrupt-parent = < &ipic >;
-                        phy-handle = < &phy >;
-                        fsl,align-tx-packets = <4>;
+                /* mpc5121ads only uses USB0 */
+                usb@3000 {
+                        status = "disabled";
                 };
 
-                // 5121e has two dr usb modules
-                // mpc5121_ads only uses USB0
-
-                // USB1 using external ULPI PHY
-                //usb@3000 {
-                //      compatible = "fsl,mpc5121-usb2-dr";
-                //      reg = <0x3000 0x1000>;
-                //      #address-cells = <1>;
-                //      #size-cells = <0>;
-                //      interrupt-parent = < &ipic >;
-                //      interrupts = <43 0x8>;
-                //      dr_mode = "otg";
-                //      phy_type = "ulpi";
-                //};
-
-                // USB0 using internal UTMI PHY
+                /* USB0 using internal UTMI PHY */
                 usb@4000 {
-                        compatible = "fsl,mpc5121-usb2-dr";
-                        reg = <0x4000 0x1000>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <44 0x8>;
-                        dr_mode = "otg";
-                        phy_type = "utmi_wide";
+                        dr_mode = "host";
                         fsl,invert-drvvbus;
                         fsl,invert-pwr-fault;
                 };
 
-                // IO control
-                ioctl@a000 {
-                        compatible = "fsl,mpc5121-ioctl";
-                        reg = <0xA000 0x1000>;
-                };
-
-                pata@10200 {
-                        compatible = "fsl,mpc5121-pata";
-                        reg = <0x10200 0x100>;
-                        interrupts = <5 0x8>;
-                        interrupt-parent = < &ipic >;
-                };
-
-                // 512x PSCs are not 52xx PSC compatible
-                // PSC3 serial port A aka ttyPSC0
-                serial@11300 {
-                        device_type = "serial";
+                /* PSC3 serial port A aka ttyPSC0 */
+                psc@11300 {
                         compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        // Logical port assignment needed until driver
-                        // learns to use aliases
-                        port-number = <0>;
-                        cell-index = <3>;
-                        reg = <0x11300 0x100>;
-                        interrupts = <40 0x8>;
-                        interrupt-parent = < &ipic >;
-                        rx-fifo-size = <16>;
-                        tx-fifo-size = <16>;
                 };
 
-                // PSC4 serial port B aka ttyPSC1
-                serial@11400 {
-                        device_type = "serial";
+                /* PSC4 serial port B aka ttyPSC1 */
+                psc@11400 {
                         compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        // Logical port assignment needed until driver
-                        // learns to use aliases
-                        port-number = <1>;
-                        cell-index = <4>;
-                        reg = <0x11400 0x100>;
-                        interrupts = <40 0x8>;
-                        interrupt-parent = < &ipic >;
-                        rx-fifo-size = <16>;
-                        tx-fifo-size = <16>;
                 };
 
-                // PSC5 in ac97 mode
-                ac97@11500 {
+                /* PSC5 in ac97 mode */
+                ac97: psc@11500 {
                         compatible = "fsl,mpc5121-psc-ac97", "fsl,mpc5121-psc";
-                        cell-index = <5>;
-                        reg = <0x11500 0x100>;
-                        interrupts = <40 0x8>;
-                        interrupt-parent = < &ipic >;
                         fsl,mode = "ac97-slave";
-                        rx-fifo-size = <384>;
-                        tx-fifo-size = <384>;
-                };
-
-                pscfifo@11f00 {
-                        compatible = "fsl,mpc5121-psc-fifo";
-                        reg = <0x11f00 0x100>;
-                        interrupts = <40 0x8>;
-                        interrupt-parent = < &ipic >;
+                        fsl,rx-fifo-size = <384>;
+                        fsl,tx-fifo-size = <384>;
                 };
-
-                dma@14000 {
-                        compatible = "fsl,mpc5121-dma";
-                        reg = <0x14000 0x1800>;
-                        interrupts = <65 0x8>;
-                        interrupt-parent = < &ipic >;
-                };
-
         };
 
         pci: pci@80008500 {
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
-                                // IDSEL 0x15 - Slot 1 PCI
+                                /* IDSEL 0x15 - Slot 1 PCI */
                                  0xa800 0x0 0x0 0x1 &cpld_pic 0x0 0x8
                                  0xa800 0x0 0x0 0x2 &cpld_pic 0x1 0x8
                                  0xa800 0x0 0x0 0x3 &cpld_pic 0x2 0x8
                                  0xa800 0x0 0x0 0x4 &cpld_pic 0x3 0x8
 
-                                // IDSEL 0x16 - Slot 2 MiniPCI
+                                /* IDSEL 0x16 - Slot 2 MiniPCI */
                                  0xb000 0x0 0x0 0x1 &cpld_pic 0x4 0x8
                                  0xb000 0x0 0x0 0x2 &cpld_pic 0x5 0x8
 
-                                // IDSEL 0x17 - Slot 3 MiniPCI
+                                /* IDSEL 0x17 - Slot 3 MiniPCI */
                                  0xb800 0x0 0x0 0x1 &cpld_pic 0x6 0x8
                                  0xb800 0x0 0x0 0x2 &cpld_pic 0x7 0x8
                                 >;
-                interrupt-parent = < &ipic >;
-                interrupts = <1 0x8>;
-                bus-range = <0 0>;
-                ranges = <0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
-                          0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
-                          0x01000000 0x0 0x00000000 0x84000000 0x0 0x01000000>;
-                clock-frequency = <0>;
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0x80008500 0x100         /* internal registers */
-                       0x80008300 0x8>;         /* config space access registers */
-                compatible = "fsl,mpc5121-pci";
-                device_type = "pci";
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc5200b.dtsi b/arch/powerpc/boot/dts/mpc5200b.dtsi
index 39ed65a44c5f..969b2200b2f9 100644
--- a/arch/powerpc/boot/dts/mpc5200b.dtsi
+++ b/arch/powerpc/boot/dts/mpc5200b.dtsi
@@ -64,50 +64,59 @@
                         reg = <0x500 0x80>;
                 };
 
-                timer@600 {     // General Purpose Timer
+                gpt0: timer@600 {       // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        #gpio-cells = <2>;  // Add 'gpio-controller;' to enable gpio mode
                         reg = <0x600 0x10>;
                         interrupts = <1 9 0>;
+                        // add 'fsl,has-wdt' to enable watchdog
                 };
 
-                timer@610 {     // General Purpose Timer
+                gpt1: timer@610 {       // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        #gpio-cells = <2>;  // Add 'gpio-controller;' to enable gpio mode
                         reg = <0x610 0x10>;
                         interrupts = <1 10 0>;
                 };
 
-                timer@620 {     // General Purpose Timer
+                gpt2: timer@620 {       // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        #gpio-cells = <2>;  // Add 'gpio-controller;' to enable gpio mode
                         reg = <0x620 0x10>;
                         interrupts = <1 11 0>;
                 };
 
-                timer@630 {     // General Purpose Timer
+                gpt3: timer@630 {       // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        #gpio-cells = <2>;  // Add 'gpio-controller;' to enable gpio mode
                         reg = <0x630 0x10>;
                         interrupts = <1 12 0>;
                 };
 
-                timer@640 {     // General Purpose Timer
+                gpt4: timer@640 {       // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        #gpio-cells = <2>;  // Add 'gpio-controller;' to enable gpio mode
                         reg = <0x640 0x10>;
                         interrupts = <1 13 0>;
                 };
 
-                timer@650 {     // General Purpose Timer
+                gpt5: timer@650 {       // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        #gpio-cells = <2>;  // Add 'gpio-controller;' to enable gpio mode
                         reg = <0x650 0x10>;
                         interrupts = <1 14 0>;
                 };
 
-                timer@660 {     // General Purpose Timer
+                gpt6: timer@660 {       // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        #gpio-cells = <2>;  // Add 'gpio-controller;' to enable gpio mode
                         reg = <0x660 0x10>;
                         interrupts = <1 15 0>;
                 };
 
-                timer@670 {     // General Purpose Timer
+                gpt7: timer@670 {       // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        #gpio-cells = <2>;  // Add 'gpio-controller;' to enable gpio mode
                         reg = <0x670 0x10>;
                         interrupts = <1 16 0>;
                 };
diff --git a/arch/powerpc/boot/dts/mucmc52.dts b/arch/powerpc/boot/dts/mucmc52.dts
index 21d34720fcc9..d3a792bb5c1a 100644
--- a/arch/powerpc/boot/dts/mucmc52.dts
+++ b/arch/powerpc/boot/dts/mucmc52.dts
@@ -13,47 +13,23 @@
 
 /include/ "mpc5200b.dtsi"
 
+/* Timer pins that need to be in GPIO mode */
+&gpt0 { gpio-controller; };
+&gpt1 { gpio-controller; };
+&gpt2 { gpio-controller; };
+&gpt3 { gpio-controller; };
+
+/* Disabled timers */
+&gpt4 { status = "disabled"; };
+&gpt5 { status = "disabled"; };
+&gpt6 { status = "disabled"; };
+&gpt7 { status = "disabled"; };
+
 / {
         model = "manroland,mucmc52";
         compatible = "manroland,mucmc52";
 
         soc5200@f0000000 {
-                gpt0: timer@600 {       // GPT 0 in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt1: timer@610 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt2: timer@620 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt3: timer@630 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                timer@640 {
-                        status = "disabled";
-                };
-
-                timer@650 {
-                        status = "disabled";
-                };
-
-                timer@660 {
-                        status = "disabled";
-                };
-
-                timer@670 {
-                        status = "disabled";
-                };
-
                 rtc@800 {
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/o2d.dtsi b/arch/powerpc/boot/dts/o2d.dtsi
index 24f668039295..cf073e693f24 100644
--- a/arch/powerpc/boot/dts/o2d.dtsi
+++ b/arch/powerpc/boot/dts/o2d.dtsi
@@ -12,6 +12,13 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 {
+        gpio-controller;
+        fsl,has-wdt;
+        fsl,wdt-on-boot = <0>;
+};
+&gpt1 { gpio-controller; };
+
 / {
         model = "ifm,o2d";
         compatible = "ifm,o2d";
@@ -22,24 +29,6 @@
 
         soc5200@f0000000 {
 
-                gpio_simple: gpio@b00 {
-                };
-
-                timer@600 {     // General Purpose Timer
-                        #gpio-cells = <2>;
-                        gpio-controller;
-                        fsl,has-wdt;
-                        fsl,wdt-on-boot = <0>;
-                };
-
-                timer@610 {
-                        #gpio-cells = <2>;
-                        gpio-controller;
-                };
-
-                timer7: timer@670 {
-                };
-
                 rtc@800 {
                         status = "disabled";
                 };
@@ -118,7 +107,7 @@
                 csi@3,0 {
                         compatible = "ifm,o2d-csi";
                         reg = <3 0 0x00100000>;
-                        ifm,csi-clk-handle = <&timer7>;
+                        ifm,csi-clk-handle = <&gpt7>;
                         gpios = <&gpio_simple 23 0      /* imag_capture */
                                  &gpio_simple 26 0      /* imag_reset */
                                  &gpio_simple 29 0>;    /* imag_master_en */
diff --git a/arch/powerpc/boot/dts/pcm030.dts b/arch/powerpc/boot/dts/pcm030.dts
index 96512c058033..192e66af0001 100644
--- a/arch/powerpc/boot/dts/pcm030.dts
+++ b/arch/powerpc/boot/dts/pcm030.dts
@@ -14,51 +14,19 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { fsl,has-wdt; };
+&gpt2 { gpio-controller; };
+&gpt3 { gpio-controller; };
+&gpt4 { gpio-controller; };
+&gpt5 { gpio-controller; };
+&gpt6 { gpio-controller; };
+&gpt7 { gpio-controller; };
+
 / {
         model = "phytec,pcm030";
         compatible = "phytec,pcm030";
 
         soc5200@f0000000 {
-                timer@600 {             // General Purpose Timer
-                        fsl,has-wdt;
-                };
-
-                gpt2: timer@620 {       // General Purpose Timer in GPIO mode
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt3: timer@630 {       // General Purpose Timer in GPIO mode
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt4: timer@640 {       // General Purpose Timer in GPIO mode
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt5: timer@650 {       // General Purpose Timer in GPIO mode
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt6: timer@660 {       // General Purpose Timer in GPIO mode
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt7: timer@670 {       // General Purpose Timer in GPIO mode
-                        compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
                 audioplatform: psc@2000 { /* PSC1 in ac97 mode */
                         compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97";
                         cell-index = <0>;
diff --git a/arch/powerpc/boot/dts/pcm032.dts b/arch/powerpc/boot/dts/pcm032.dts
index 1dd478bfff96..96b139bf50e9 100644
--- a/arch/powerpc/boot/dts/pcm032.dts
+++ b/arch/powerpc/boot/dts/pcm032.dts
@@ -14,6 +14,14 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { fsl,has-wdt; };
+&gpt2 { gpio-controller; };
+&gpt3 { gpio-controller; };
+&gpt4 { gpio-controller; };
+&gpt5 { gpio-controller; };
+&gpt6 { gpio-controller; };
+&gpt7 { gpio-controller; };
+
 / {
         model = "phytec,pcm032";
         compatible = "phytec,pcm032";
@@ -23,43 +31,6 @@
         };
 
         soc5200@f0000000 {
-                timer@600 {             // General Purpose Timer
-                        fsl,has-wdt;
-                };
-
-                gpt2: timer@620 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt3: timer@630 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt4: timer@640 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt5: timer@650 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt6: timer@660 {       // General Purpose Timer in GPIO mode
-                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        reg = <0x660 0x10>;
-                        interrupts = <1 15 0>;
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt7: timer@670 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
                 psc@2000 {      /* PSC1 is ac97 */
                         compatible = "fsl,mpc5200b-psc-ac97","fsl,mpc5200-psc-ac97";
                         cell-index = <0>;
diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
index 94dfa5c9a7f9..0b069477838a 100644
--- a/arch/powerpc/boot/dts/pdm360ng.dts
+++ b/arch/powerpc/boot/dts/pdm360ng.dts
@@ -13,7 +13,7 @@
  * option) any later version.
  */
 
-/dts-v1/;
+/include/ "mpc5121.dtsi"
 
 / {
         model = "pdm360ng";
@@ -22,38 +22,12 @@
         #size-cells = <1>;
         interrupt-parent = <&ipic>;
 
-        aliases {
-                ethernet0 = &eth0;
-        };
-
-        cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                PowerPC,5121@0 {
-                        device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <0x20>;     // 32 bytes
-                        i-cache-line-size = <0x20>;     // 32 bytes
-                        d-cache-size = <0x8000>;        // L1, 32K
-                        i-cache-size = <0x8000>;        // L1, 32K
-                        timebase-frequency = <49500000>;// 49.5 MHz (csb/4)
-                        bus-frequency = <198000000>;    // 198 MHz csb bus
-                        clock-frequency = <396000000>;  // 396 MHz ppc core
-                };
-        };
-
         memory {
                 device_type = "memory";
                 reg = <0x00000000 0x20000000>;  // 512MB at 0
         };
 
         nfc@40000000 {
-                compatible = "fsl,mpc5121-nfc";
-                reg = <0x40000000 0x100000>;
-                interrupts = <0x6 0x8>;
-                #address-cells = <0x1>;
-                #size-cells = <0x1>;
                 bank-width = <0x1>;
                 chips = <0x1>;
 
@@ -63,17 +37,7 @@
                 };
         };
 
-        sram@50000000 {
-                compatible = "fsl,mpc5121-sram";
-                reg = <0x50000000 0x20000>;     // 128K at 0x50000000
-        };
-
         localbus@80000020 {
-                compatible = "fsl,mpc5121-localbus";
-                #address-cells = <2>;
-                #size-cells = <1>;
-                reg = <0x80000020 0x40>;
-
                 ranges = <0x0 0x0 0xf0000000 0x10000000   /* Flash */
                           0x2 0x0 0x50040000 0x00020000>; /* CS2: MRAM */
 
@@ -129,74 +93,8 @@
         };
 
         soc@80000000 {
-                compatible = "fsl,mpc5121-immr";
-                #address-cells = <1>;
-                #size-cells = <1>;
-                #interrupt-cells = <2>;
-                ranges = <0x0 0x80000000 0x400000>;
-                reg = <0x80000000 0x400000>;
-                bus-frequency = <66000000>;     // 66 MHz ips bus
-
-                // IPIC
-                // interrupts cell = <intr #, sense>
-                // sense values match linux IORESOURCE_IRQ_* defines:
-                // sense == 8: Level, low assertion
-                // sense == 2: Edge, high-to-low change
-                //
-                ipic: interrupt-controller@c00 {
-                        compatible = "fsl,mpc5121-ipic", "fsl,ipic";
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <0xc00 0x100>;
-                };
-
-                rtc@a00 {       // Real time clock
-                        compatible = "fsl,mpc5121-rtc";
-                        reg = <0xa00 0x100>;
-                        interrupts = <79 0x8 80 0x8>;
-                };
-
-                reset@e00 {     // Reset module
-                        compatible = "fsl,mpc5121-reset";
-                        reg = <0xe00 0x100>;
-                };
-
-                clock@f00 {     // Clock control
-                        compatible = "fsl,mpc5121-clock";
-                        reg = <0xf00 0x100>;
-                };
-
-                pmc@1000{       //Power Management Controller
-                        compatible = "fsl,mpc5121-pmc";
-                        reg = <0x1000 0x100>;
-                        interrupts = <83 0x2>;
-                };
-
-                gpio@1100 {
-                        compatible = "fsl,mpc5121-gpio";
-                        reg = <0x1100 0x100>;
-                        interrupts = <78 0x8>;
-                };
-
-                can@1300 {
-                        compatible = "fsl,mpc5121-mscan";
-                        interrupts = <12 0x8>;
-                        reg = <0x1300 0x80>;
-                };
-
-                can@1380 {
-                        compatible = "fsl,mpc5121-mscan";
-                        interrupts = <13 0x8>;
-                        reg = <0x1380 0x80>;
-                };
 
                 i2c@1700 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,mpc5121-i2c";
-                        reg = <0x1700 0x20>;
-                        interrupts = <0x9 0x8>;
                         fsl,preserve-clocking;
 
                         eeprom@50 {
@@ -210,201 +108,92 @@
                         };
                 };
 
-                i2c@1740 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,mpc5121-i2c";
-                        reg = <0x1740 0x20>;
-                        interrupts = <0xb 0x8>;
-                        fsl,preserve-clocking;
-                };
-
-                i2ccontrol@1760 {
-                        compatible = "fsl,mpc5121-i2c-ctrl";
-                        reg = <0x1760 0x8>;
-                };
-
-                axe@2000 {
-                        compatible = "fsl,mpc5121-axe";
-                        reg = <0x2000 0x100>;
-                        interrupts = <42 0x8>;
-                };
-
-                display@2100 {
-                        compatible = "fsl,mpc5121-diu";
-                        reg = <0x2100 0x100>;
-                        interrupts = <64 0x8>;
+                i2c@1720 {
+                        status = "disabled";
                 };
 
-                can@2300 {
-                        compatible = "fsl,mpc5121-mscan";
-                        interrupts = <90 0x8>;
-                        reg = <0x2300 0x80>;
-                };
-
-                can@2380 {
-                        compatible = "fsl,mpc5121-mscan";
-                        interrupts = <91 0x8>;
-                        reg = <0x2380 0x80>;
+                i2c@1740 {
+                        fsl,preserve-clocking;
                 };
 
-                viu@2400 {
-                        compatible = "fsl,mpc5121-viu";
-                        reg = <0x2400 0x400>;
-                        interrupts = <67 0x8>;
+                ethernet@2800 {
+                        phy-handle = <&phy0>;
                 };
 
                 mdio@2800 {
-                        compatible = "fsl,mpc5121-fec-mdio";
-                        reg = <0x2800 0x200>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        phy: ethernet-phy@0 {
+                        phy0: ethernet-phy@1f {
                                 compatible = "smsc,lan8700";
                                 reg = <0x1f>;
                         };
                 };
 
-                eth0: ethernet@2800 {
-                        compatible = "fsl,mpc5121-fec";
-                        reg = <0x2800 0x200>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <4 0x8>;
-                        phy-handle = < &phy >;
-                };
-
-                // USB1 using external ULPI PHY
+                /* USB1 using external ULPI PHY */
                 usb@3000 {
-                        compatible = "fsl,mpc5121-usb2-dr";
-                        reg = <0x3000 0x600>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        interrupts = <43 0x8>;
                         dr_mode = "host";
-                        phy_type = "ulpi";
                 };
 
-                // USB0 using internal UTMI PHY
+                /* USB0 using internal UTMI PHY */
                 usb@4000 {
-                        compatible = "fsl,mpc5121-usb2-dr";
-                        reg = <0x4000 0x600>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        interrupts = <44 0x8>;
-                        dr_mode = "otg";
-                        phy_type = "utmi_wide";
                         fsl,invert-pwr-fault;
                 };
 
-                // IO control
-                ioctl@a000 {
-                        compatible = "fsl,mpc5121-ioctl";
-                        reg = <0xA000 0x1000>;
-                };
-
-                // 512x PSCs are not 52xx PSCs compatible
-                serial@11000 {
+                psc@11000 {
                         compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        cell-index = <0>;
-                        reg = <0x11000 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
                 };
 
-                serial@11100 {
+                psc@11100 {
                         compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        cell-index = <1>;
-                        reg = <0x11100 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
                 };
 
-                serial@11200 {
+                psc@11200 {
                         compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        cell-index = <2>;
-                        reg = <0x11200 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
                 };
 
-                serial@11300 {
+                psc@11300 {
                         compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        cell-index = <3>;
-                        reg = <0x11300 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
                 };
 
-                serial@11400 {
+                psc@11400 {
                         compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        cell-index = <4>;
-                        reg = <0x11400 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
                 };
 
-                serial@11600 {
-                        compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        cell-index = <6>;
-                        reg = <0x11600 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
+                psc@11500 {
+                        status = "disabled";
                 };
 
-                serial@11800 {
+                psc@11600 {
                         compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        cell-index = <8>;
-                        reg = <0x11800 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
                 };
 
-                serial@11B00 {
-                        compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
-                        cell-index = <11>;
-                        reg = <0x11B00 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
+                psc@11700 {
+                        status = "disabled";
                 };
 
-                pscfifo@11f00 {
-                        compatible = "fsl,mpc5121-psc-fifo";
-                        reg = <0x11f00 0x100>;
-                        interrupts = <40 0x8>;
+                psc@11800 {
+                        compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
                 };
 
-                spi@11900 {
+                psc@11900 {
                         compatible = "fsl,mpc5121-psc-spi", "fsl,mpc5121-psc";
-                        cell-index = <9>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        reg = <0x11900 0x100>;
-                        interrupts = <40 0x8>;
-                        fsl,rx-fifo-size = <16>;
-                        fsl,tx-fifo-size = <16>;
 
-                        // 7845 touch screen controller
+                        /* ADS7845 touch screen controller */
                         ts@0 {
                                 compatible = "ti,ads7846";
                                 reg = <0x0>;
                                 spi-max-frequency = <3000000>;
-                                // pen irq is GPIO25
+                                /* pen irq is GPIO25 */
                                 interrupts = <78 0x8>;
                         };
                 };
 
-                dma@14000 {
-                        compatible = "fsl,mpc5121-dma";
-                        reg = <0x14000 0x1800>;
-                        interrupts = <65 0x8>;
+                psc@11a00 {
+                        status = "disabled";
+                };
+
+                psc@11b00 {
+                        compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/ppa8548.dts b/arch/powerpc/boot/dts/ppa8548.dts
new file mode 100644
index 000000000000..f97eceed610a
--- /dev/null
+++ b/arch/powerpc/boot/dts/ppa8548.dts
@@ -0,0 +1,166 @@
+/*
+ * PPA8548 Device Tree Source (36-bit address map)
+ * Copyright 2013 Prodrive B.V.
+ *
+ * Based on:
+ * MPC8548 CDS Device Tree Source (36-bit address map)
+ * Copyright 2012 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.
+ */
+
+/include/ "fsl/mpc8548si-pre.dtsi"
+
+/ {
+        model = "ppa8548";
+        compatible = "ppa8548";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        memory {
+                device_type = "memory";
+                reg = <0 0 0x0 0x40000000>;
+        };
+
+        lbc: localbus@fe0005000 {
+                reg = <0xf 0xe0005000 0 0x1000>;
+                ranges = <0x0 0x0 0xf 0xff800000 0x00800000>;
+        };
+
+        soc: soc8548@fe0000000 {
+                ranges = <0 0xf 0xe0000000 0x100000>;
+        };
+
+        pci0: pci@fe0008000 {
+                /* ppa8548 board doesn't support PCI */
+                status = "disabled";
+        };
+
+        pci1: pci@fe0009000 {
+                /* ppa8548 board doesn't support PCI */
+                status = "disabled";
+        };
+
+        pci2: pcie@fe000a000 {
+                /* ppa8548 board doesn't support PCI */
+                status = "disabled";
+        };
+
+        rio: rapidio@fe00c0000 {
+                reg = <0xf 0xe00c0000 0x0 0x11000>;
+                port1 {
+                        ranges = <0x0 0x0 0x0 0x80000000 0x0 0x40000000>;
+                };
+        };
+};
+
+&lbc {
+        nor@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "cfi-flash";
+                reg = <0x0 0x0 0x00800000>;
+                bank-width = <2>;
+                device-width = <2>;
+
+                partition@0 {
+                        reg = <0x0 0x7A0000>;
+                        label = "user";
+                };
+
+                partition@7A0000 {
+                        reg = <0x7A0000 0x20000>;
+                        label = "env";
+                        read-only;
+                };
+
+                partition@7C0000 {
+                        reg = <0x7C0000 0x40000>;
+                        label = "u-boot";
+                        read-only;
+                };
+        };
+};
+
+&soc {
+        i2c@3000 {
+                rtc@6f {
+                        compatible = "intersil,isl1208";
+                        reg = <0x6f>;
+                };
+        };
+
+        i2c@3100 {
+        };
+
+        /*
+         * Only ethernet controller @25000 and @26000 are used.
+         * Use alias enet2 and enet3 for the remainig controllers,
+         * to stay compatible with mpc8548si-pre.dtsi.
+         */
+        enet2: ethernet@24000 {
+                status = "disabled";
+        };
+
+        mdio@24520 {
+                phy0: ethernet-phy@0 {
+                        interrupts = <7 1 0 0>;
+                        reg = <0x0>;
+                        device_type = "ethernet-phy";
+                };
+                phy1: ethernet-phy@1 {
+                        interrupts = <8 1 0 0>;
+                        reg = <0x1>;
+                        device_type = "ethernet-phy";
+                };
+                tbi0: tbi-phy@11 {
+                        reg = <0x11>;
+                        device_type = "tbi-phy";
+                };
+        };
+
+        enet0: ethernet@25000 {
+                tbi-handle = <&tbi1>;
+                phy-handle = <&phy0>;
+        };
+
+        mdio@25520 {
+                tbi1: tbi-phy@11 {
+                        reg = <0x11>;
+                        device_type = "tbi-phy";
+                };
+        };
+
+        enet1: ethernet@26000 {
+                tbi-handle = <&tbi2>;
+                phy-handle = <&phy1>;
+        };
+
+        mdio@26520 {
+                tbi2: tbi-phy@11 {
+                        reg = <0x11>;
+                        device_type = "tbi-phy";
+                };
+        };
+
+        enet3: ethernet@27000 {
+                status = "disabled";
+        };
+
+        mdio@27520 {
+                tbi3: tbi-phy@11 {
+                        reg = <0x11>;
+                        device_type = "tbi-phy";
+                };
+        };
+
+        crypto@30000 {
+                status = "disabled";
+        };
+};
+
+/include/ "fsl/mpc8548si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/sbc8548-altflash.dts b/arch/powerpc/boot/dts/sbc8548-altflash.dts
new file mode 100644
index 000000000000..0b38a0defd2c
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8548-altflash.dts
@@ -0,0 +1,115 @@
+/*
+ * SBC8548 Device Tree Source
+ *
+ * Configured for booting off the alternate (64MB SODIMM) flash.
+ * Requires switching JP12 jumpers and changing SW2.8 setting.
+ *
+ * Copyright 2013 Wind River Systems Inc.
+ *
+ * Paul Gortmaker (see MAINTAINERS for contact information)
+ *
+ * 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/;
+
+/include/ "sbc8548-pre.dtsi"
+
+/{
+        localbus@e0000000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                reg = <0xe0000000 0x5000>;
+                interrupt-parent = <&mpic>;
+
+                ranges = <0x0 0x0 0xfc000000 0x04000000         /*64MB Flash*/
+                          0x3 0x0 0xf0000000 0x04000000         /*64MB SDRAM*/
+                          0x4 0x0 0xf4000000 0x04000000         /*64MB SDRAM*/
+                          0x5 0x0 0xf8000000 0x00b10000         /* EPLD */
+                          0x6 0x0 0xef800000 0x00800000>;       /*8MB Flash*/
+
+                flash@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x0 0x0 0x04000000>;
+                        compatible = "intel,JS28F128", "cfi-flash";
+                        bank-width = <4>;
+                        device-width = <1>;
+                        partition@0x0 {
+                                label = "space";
+                                /* FC000000 -> FFEFFFFF */
+                                reg = <0x00000000 0x03f00000>;
+                        };
+                        partition@0x03f00000 {
+                                label = "bootloader";
+                                /* FFF00000 -> FFFFFFFF */
+                                reg = <0x03f00000 0x00100000>;
+                                read-only;
+                        };
+                };
+
+
+                epld@5,0 {
+                        compatible = "wrs,epld-localbus";
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        reg = <0x5 0x0 0x00b10000>;
+                        ranges = <
+                                0x0 0x0 0x5 0x000000 0x1fff     /* LED */
+                                0x1 0x0 0x5 0x100000 0x1fff     /* Switches */
+                                0x3 0x0 0x5 0x300000 0x1fff     /* HW Rev. */
+                                0xb 0x0 0x5 0xb00000 0x1fff     /* EEPROM */
+                        >;
+
+                        led@0,0 {
+                                compatible = "led";
+                                reg = <0x0 0x0 0x1fff>;
+                        };
+
+                        switches@1,0 {
+                                compatible = "switches";
+                                reg = <0x1 0x0 0x1fff>;
+                        };
+
+                        hw-rev@3,0 {
+                                compatible = "hw-rev";
+                                reg = <0x3 0x0 0x1fff>;
+                        };
+
+                        eeprom@b,0 {
+                                compatible = "eeprom";
+                                reg = <0xb 0 0x1fff>;
+                        };
+
+                };
+
+                alt-flash@6,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "intel,JS28F640", "cfi-flash";
+                        reg = <0x6 0x0 0x800000>;
+                        bank-width = <1>;
+                        device-width = <1>;
+                        partition@0x0 {
+                                label = "space";
+                                /* EF800000 -> EFF9FFFF */
+                                reg = <0x00000000 0x007a0000>;
+                        };
+                        partition@0x7a0000 {
+                                label = "bootloader";
+                                /* EFFA0000 -> EFFFFFFF */
+                                reg = <0x007a0000 0x00060000>;
+                                read-only;
+                        };
+                };
+
+
+        };
+};
+
+/include/ "sbc8548-post.dtsi"
diff --git a/arch/powerpc/boot/dts/sbc8548-post.dtsi b/arch/powerpc/boot/dts/sbc8548-post.dtsi
new file mode 100644
index 000000000000..33a47e27a11e
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8548-post.dtsi
@@ -0,0 +1,295 @@
+/*
+ * SBC8548 Device Tree Source
+ *
+ * Copyright 2007 Wind River Systems Inc.
+ *
+ * Paul Gortmaker (see MAINTAINERS for contact information)
+ *
+ * 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.
+ */
+
+/{
+        soc8548@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x00000000 0xe0000000 0x00100000>;
+                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>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <0x12 0x2>;
+                };
+
+                L2: l2-cache-controller@20000 {
+                        compatible = "fsl,mpc8548-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <0x20>;       // 32 bytes
+                        cache-size = <0x80000>; // L2, 512K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <0x10 0x2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8548-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8548-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 = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi0>;
+                        phy-handle = <&phy0>;
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-mdio";
+                                reg = <0x520 0x20>;
+
+                                phy0: ethernet-phy@19 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <0x6 0x1>;
+                                        reg = <0x19>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy1: ethernet-phy@1a {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <0x7 0x1>;
+                                        reg = <0x1a>;
+                                        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 = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        ranges = <0x0 0x25000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
+                        interrupt-parent = <&mpic>;
+                        tbi-handle = <&tbi1>;
+                        phy-handle = <&phy1>;
+
+                        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";
+                                };
+                        };
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "fsl,ns16550", "ns16550";
+                        reg = <0x4500 0x100>;   // reg base, size
+                        clock-frequency = <0>;  // should we fill in in uboot?
+                        interrupts = <0x2a 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "fsl,ns16550", "ns16550";
+                        reg = <0x4600 0x100>;   // reg base, size
+                        clock-frequency = <0>;  // should we fill in in uboot?
+                        interrupts = <0x2a 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {        //global utilities reg
+                        compatible = "fsl,mpc8548-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+
+                crypto@30000 {
+                        compatible = "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xfe>;
+                        fsl,descriptor-types-mask = <0x12b0ebf>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+        };
+
+        pci0: pci@e0008000 {
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x01 (PCI-X slot) @66MHz */
+                        0x0800 0x0 0x0 0x1 &mpic 0x2 0x1
+                        0x0800 0x0 0x0 0x2 &mpic 0x3 0x1
+                        0x0800 0x0 0x0 0x3 &mpic 0x4 0x1
+                        0x0800 0x0 0x0 0x4 &mpic 0x1 0x1
+
+                        /* IDSEL 0x11 (PCI, 3.3V 32bit) @33MHz */
+                        0x8800 0x0 0x0 0x1 &mpic 0x2 0x1
+                        0x8800 0x0 0x0 0x2 &mpic 0x3 0x1
+                        0x8800 0x0 0x0 0x3 &mpic 0x4 0x1
+                        0x8800 0x0 0x0 0x4 &mpic 0x1 0x1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <0x18 0x2>;
+                bus-range = <0 0>;
+                ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00800000>;
+                clock-frequency = <66000000>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008000 0x1000>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
+        };
+
+        pci1: pcie@e000a000 {
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x0 (PEX) */
+                        0x0000 0x0 0x0 0x1 &mpic 0x0 0x1
+                        0x0000 0x0 0x0 0x2 &mpic 0x1 0x1
+                        0x0000 0x0 0x0 0x3 &mpic 0x2 0x1
+                        0x0000 0x0 0x0 0x4 &mpic 0x3 0x1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <0x1a 0x2>;
+                bus-range = <0x0 0xff>;
+                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2800000 0x0 0x08000000>;
+                clock-frequency = <33000000>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe000a000 0x1000>;
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                pcie@0 {
+                        reg = <0x0 0x0 0x0 0x0 0x0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0x0 0xa0000000
+                                  0x02000000 0x0 0xa0000000
+                                  0x0 0x10000000
+
+                                  0x01000000 0x0 0x00000000
+                                  0x01000000 0x0 0x00000000
+                                  0x0 0x00800000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/sbc8548-pre.dtsi b/arch/powerpc/boot/dts/sbc8548-pre.dtsi
new file mode 100644
index 000000000000..d8c66290c5b4
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8548-pre.dtsi
@@ -0,0 +1,52 @@
+/*
+ * SBC8548 Device Tree Source
+ *
+ * Copyright 2007 Wind River Systems Inc.
+ *
+ * Paul Gortmaker (see MAINTAINERS for contact information)
+ *
+ * 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.
+ */
+
+/{
+        model = "SBC8548";
+        compatible = "SBC8548";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8548@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <0x20>;     // 32 bytes
+                        i-cache-line-size = <0x20>;     // 32 bytes
+                        d-cache-size = <0x8000>;        // L1, 32K
+                        i-cache-size = <0x8000>;        // L1, 32K
+                        timebase-frequency = <0>;       // From uboot
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+};
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
index 77be77116c2e..1df2a0955668 100644
--- a/arch/powerpc/boot/dts/sbc8548.dts
+++ b/arch/powerpc/boot/dts/sbc8548.dts
@@ -14,44 +14,9 @@
 
 /dts-v1/;
 
-/ {
-        model = "SBC8548";
-        compatible = "SBC8548";
-        #address-cells = <1>;
-        #size-cells = <1>;
-
-        aliases {
-                ethernet0 = &enet0;
-                ethernet1 = &enet1;
-                serial0 = &serial0;
-                serial1 = &serial1;
-                pci0 = &pci0;
-                pci1 = &pci1;
-        };
-
-        cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                PowerPC,8548@0 {
-                        device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <0x20>;     // 32 bytes
-                        i-cache-line-size = <0x20>;     // 32 bytes
-                        d-cache-size = <0x8000>;        // L1, 32K
-                        i-cache-size = <0x8000>;        // L1, 32K
-                        timebase-frequency = <0>;       // From uboot
-                        bus-frequency = <0>;
-                        clock-frequency = <0>;
-                        next-level-cache = <&L2>;
-                };
-        };
-
-        memory {
-                device_type = "memory";
-                reg = <0x00000000 0x10000000>;
-        };
+/include/ "sbc8548-pre.dtsi"
 
+/{
         localbus@e0000000 {
                 #address-cells = <2>;
                 #size-cells = <1>;
@@ -63,23 +28,25 @@
                           0x3 0x0 0xf0000000 0x04000000         /*64MB SDRAM*/
                           0x4 0x0 0xf4000000 0x04000000         /*64MB SDRAM*/
                           0x5 0x0 0xf8000000 0x00b10000         /* EPLD */
-                          0x6 0x0 0xfb800000 0x04000000>;       /*64MB Flash*/
+                          0x6 0x0 0xec000000 0x04000000>;       /*64MB Flash*/
 
 
                 flash@0,0 {
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        compatible = "cfi-flash";
+                        compatible = "intel,JS28F640", "cfi-flash";
                         reg = <0x0 0x0 0x800000>;
                         bank-width = <1>;
                         device-width = <1>;
                         partition@0x0 {
                                 label = "space";
-                                reg = <0x00000000 0x00100000>;
+                                /* FF800000 -> FFF9FFFF */
+                                reg = <0x00000000 0x007a0000>;
                         };
-                        partition@0x100000 {
+                        partition@0x7a0000 {
                                 label = "bootloader";
-                                reg = <0x00100000 0x00700000>;
+                                /* FFFA0000 -> FFFFFFFF */
+                                reg = <0x007a0000 0x00060000>;
                                 read-only;
                         };
                 };
@@ -122,307 +89,22 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0x6 0x0 0x04000000>;
-                        compatible = "cfi-flash";
+                        compatible = "intel,JS28F128", "cfi-flash";
                         bank-width = <4>;
                         device-width = <1>;
                         partition@0x0 {
+                                label = "space";
+                                /* EC000000 -> EFEFFFFF */
+                                reg = <0x00000000 0x03f00000>;
+                        };
+                        partition@0x03f00000 {
                                 label = "bootloader";
-                                reg = <0x00000000 0x00100000>;
+                                /* EFF00000 -> EFFFFFFF */
+                                reg = <0x03f00000 0x00100000>;
                                 read-only;
                         };
-                        partition@0x00100000 {
-                                label = "file-system";
-                                reg = <0x00100000 0x01f00000>;
-                        };
-                        partition@0x02000000 {
-                                label = "boot-config";
-                                reg = <0x02000000 0x00100000>;
-                        };
-                        partition@0x02100000 {
-                                label = "space";
-                                reg = <0x02100000 0x01f00000>;
-                        };
                 };
         };
-
-        soc8548@e0000000 {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                device_type = "soc";
-                ranges = <0x00000000 0xe0000000 0x00100000>;
-                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>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <0x12 0x2>;
-                };
-
-                L2: l2-cache-controller@20000 {
-                        compatible = "fsl,mpc8548-l2-cache-controller";
-                        reg = <0x20000 0x1000>;
-                        cache-line-size = <0x20>;       // 32 bytes
-                        cache-size = <0x80000>; // L2, 512K
-                        interrupt-parent = <&mpic>;
-                        interrupts = <0x10 0x2>;
-                };
-
-                i2c@3000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <0>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3000 0x100>;
-                        interrupts = <0x2b 0x2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
-                };
-
-                i2c@3100 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <1>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3100 0x100>;
-                        interrupts = <0x2b 0x2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
-                };
-
-                dma@21300 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "fsl,mpc8548-dma", "fsl,eloplus-dma";
-                        reg = <0x21300 0x4>;
-                        ranges = <0x0 0x21100 0x200>;
-                        cell-index = <0>;
-                        dma-channel@0 {
-                                compatible = "fsl,mpc8548-dma-channel",
-                                                "fsl,eloplus-dma-channel";
-                                reg = <0x0 0x80>;
-                                cell-index = <0>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <20 2>;
-                        };
-                        dma-channel@80 {
-                                compatible = "fsl,mpc8548-dma-channel",
-                                                "fsl,eloplus-dma-channel";
-                                reg = <0x80 0x80>;
-                                cell-index = <1>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <21 2>;
-                        };
-                        dma-channel@100 {
-                                compatible = "fsl,mpc8548-dma-channel",
-                                                "fsl,eloplus-dma-channel";
-                                reg = <0x100 0x80>;
-                                cell-index = <2>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <22 2>;
-                        };
-                        dma-channel@180 {
-                                compatible = "fsl,mpc8548-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 = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x24000 0x1000>;
-                        ranges = <0x0 0x24000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
-                        interrupt-parent = <&mpic>;
-                        tbi-handle = <&tbi0>;
-                        phy-handle = <&phy0>;
-
-                        mdio@520 {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,gianfar-mdio";
-                                reg = <0x520 0x20>;
-
-                                phy0: ethernet-phy@19 {
-                                        interrupt-parent = <&mpic>;
-                                        interrupts = <0x6 0x1>;
-                                        reg = <0x19>;
-                                        device_type = "ethernet-phy";
-                                };
-                                phy1: ethernet-phy@1a {
-                                        interrupt-parent = <&mpic>;
-                                        interrupts = <0x7 0x1>;
-                                        reg = <0x1a>;
-                                        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 = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x25000 0x1000>;
-                        ranges = <0x0 0x25000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
-                        interrupt-parent = <&mpic>;
-                        tbi-handle = <&tbi1>;
-                        phy-handle = <&phy1>;
-
-                        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";
-                                };
-                        };
-                };
-
-                serial0: serial@4500 {
-                        cell-index = <0>;
-                        device_type = "serial";
-                        compatible = "fsl,ns16550", "ns16550";
-                        reg = <0x4500 0x100>;   // reg base, size
-                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <0x2a 0x2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                serial1: serial@4600 {
-                        cell-index = <1>;
-                        device_type = "serial";
-                        compatible = "fsl,ns16550", "ns16550";
-                        reg = <0x4600 0x100>;   // reg base, size
-                        clock-frequency = <0>;  // should we fill in in uboot?
-                        interrupts = <0x2a 0x2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                global-utilities@e0000 {        //global utilities reg
-                        compatible = "fsl,mpc8548-guts";
-                        reg = <0xe0000 0x1000>;
-                        fsl,has-rstcr;
-                };
-
-                crypto@30000 {
-                        compatible = "fsl,sec2.1", "fsl,sec2.0";
-                        reg = <0x30000 0x10000>;
-                        interrupts = <45 2>;
-                        interrupt-parent = <&mpic>;
-                        fsl,num-channels = <4>;
-                        fsl,channel-fifo-len = <24>;
-                        fsl,exec-units-mask = <0xfe>;
-                        fsl,descriptor-types-mask = <0x12b0ebf>;
-                };
-
-                mpic: pic@40000 {
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <0x40000 0x40000>;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                };
-        };
-
-        pci0: pci@e0008000 {
-                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                interrupt-map = <
-                        /* IDSEL 0x01 (PCI-X slot) @66MHz */
-                        0x0800 0x0 0x0 0x1 &mpic 0x2 0x1
-                        0x0800 0x0 0x0 0x2 &mpic 0x3 0x1
-                        0x0800 0x0 0x0 0x3 &mpic 0x4 0x1
-                        0x0800 0x0 0x0 0x4 &mpic 0x1 0x1
-
-                        /* IDSEL 0x11 (PCI, 3.3V 32bit) @33MHz */
-                        0x8800 0x0 0x0 0x1 &mpic 0x2 0x1
-                        0x8800 0x0 0x0 0x2 &mpic 0x3 0x1
-                        0x8800 0x0 0x0 0x3 &mpic 0x4 0x1
-                        0x8800 0x0 0x0 0x4 &mpic 0x1 0x1>;
-
-                interrupt-parent = <&mpic>;
-                interrupts = <0x18 0x2>;
-                bus-range = <0 0>;
-                ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
-                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00800000>;
-                clock-frequency = <66000000>;
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0xe0008000 0x1000>;
-                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-                device_type = "pci";
-        };
-
-        pci1: pcie@e000a000 {
-                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                interrupt-map = <
-
-                        /* IDSEL 0x0 (PEX) */
-                        0x0000 0x0 0x0 0x1 &mpic 0x0 0x1
-                        0x0000 0x0 0x0 0x2 &mpic 0x1 0x1
-                        0x0000 0x0 0x0 0x3 &mpic 0x2 0x1
-                        0x0000 0x0 0x0 0x4 &mpic 0x3 0x1>;
-
-                interrupt-parent = <&mpic>;
-                interrupts = <0x1a 0x2>;
-                bus-range = <0x0 0xff>;
-                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
-                          0x01000000 0x0 0x00000000 0xe2800000 0x0 0x08000000>;
-                clock-frequency = <33000000>;
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0xe000a000 0x1000>;
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                pcie@0 {
-                        reg = <0x0 0x0 0x0 0x0 0x0>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        device_type = "pci";
-                        ranges = <0x02000000 0x0 0xa0000000
-                                  0x02000000 0x0 0xa0000000
-                                  0x0 0x10000000
-
-                                  0x01000000 0x0 0x00000000
-                                  0x01000000 0x0 0x00000000
-                                  0x0 0x00800000>;
-                };
-        };
 };
+
+/include/ "sbc8548-post.dtsi"
diff --git a/arch/powerpc/boot/dts/uc101.dts b/arch/powerpc/boot/dts/uc101.dts
index ba83d5488ec6..5c462194ef06 100644
--- a/arch/powerpc/boot/dts/uc101.dts
+++ b/arch/powerpc/boot/dts/uc101.dts
@@ -13,54 +13,20 @@
 
 /include/ "mpc5200b.dtsi"
 
+&gpt0 { gpio-controller; };
+&gpt1 { gpio-controller; };
+&gpt2 { gpio-controller; };
+&gpt3 { gpio-controller; };
+&gpt4 { gpio-controller; };
+&gpt5 { gpio-controller; };
+&gpt6 { gpio-controller; };
+&gpt7 { gpio-controller; };
+
 / {
         model = "manroland,uc101";
         compatible = "manroland,uc101";
 
         soc5200@f0000000 {
-                gpt0: timer@600 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt1: timer@610 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt2: timer@620 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt3: timer@630 {       // General Purpose Timer in GPIO mode
-                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        reg = <0x630 0x10>;
-                        interrupts = <1 12 0>;
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt4: timer@640 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt5: timer@650 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt6: timer@660 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpt7: timer@670 {       // General Purpose Timer in GPIO mode
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
                 rtc@800 {
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/virtex440-ml507.dts b/arch/powerpc/boot/dts/virtex440-ml507.dts
index 52d8c1ad26a1..fc7073bc547e 100644
--- a/arch/powerpc/boot/dts/virtex440-ml507.dts
+++ b/arch/powerpc/boot/dts/virtex440-ml507.dts
@@ -272,6 +272,12 @@
                                 xlnx,temac-type = <0>;
                                 xlnx,txcsum = <1>;
                                 xlnx,txfifo = <0x1000>;
+                                phy-handle = <&phy7>;
+                                clock-frequency = <100000000>;
+                                phy7: phy@7 {
+                                          compatible = "marvell,88e1111";
+                                          reg = <7>;
+                                } ;
                         } ;
                 } ;
                 IIC_EEPROM: i2c@81600000 {
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index a0dfef1fcdb7..e12e60c3b9a2 100644
--- a/arch/powerpc/configs/83xx/kmeter1_defconfig
+++ b/arch/powerpc/configs/83xx/kmeter1_defconfig
@@ -2,6 +2,8 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_EXPERT=y
 CONFIG_SLAB=y
@@ -16,8 +18,6 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_83xx=y
 CONFIG_KMETER1=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 # CONFIG_SECCOMP is not set
 CONFIG_NET=y
@@ -45,7 +45,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_PHRAM=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_GLUEBI=y
-CONFIG_MTD_UBI_DEBUG=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
@@ -76,5 +75,4 @@ CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_UBIFS_FS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y
diff --git a/arch/powerpc/configs/85xx/ge_imp3a_defconfig b/arch/powerpc/configs/85xx/ge_imp3a_defconfig
index f8c51a4ab995..c9765b54dd1a 100644
--- a/arch/powerpc/configs/85xx/ge_imp3a_defconfig
+++ b/arch/powerpc/configs/85xx/ge_imp3a_defconfig
@@ -34,7 +34,6 @@ CONFIG_PREEMPT=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_MATH_EMULATION=y
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_FORCE_MAX_ZONEORDER=17
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
diff --git a/arch/powerpc/configs/85xx/ppa8548_defconfig b/arch/powerpc/configs/85xx/ppa8548_defconfig
new file mode 100644
index 000000000000..a11337de8aa2
--- /dev/null
+++ b/arch/powerpc/configs/85xx/ppa8548_defconfig
@@ -0,0 +1,65 @@
+CONFIG_PPC_85xx=y
+CONFIG_PPA8548=y
+CONFIG_DTC=y
+CONFIG_DEFAULT_UIMAGE=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_PCI is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_ADVANCED_OPTIONS=y
+CONFIG_LOWMEM_SIZE_BOOL=y
+CONFIG_LOWMEM_SIZE=0x40000000
+CONFIG_LOWMEM_CAM_NUM_BOOL=y
+CONFIG_LOWMEM_CAM_NUM=4
+CONFIG_PAGE_OFFSET_BOOL=y
+CONFIG_PAGE_OFFSET=0xb0000000
+CONFIG_KERNEL_START_BOOL=y
+CONFIG_KERNEL_START=0xb0000000
+# CONFIG_PHYSICAL_START_BOOL is not set
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_PHYSICAL_ALIGN=0x04000000
+CONFIG_TASK_SIZE_BOOL=y
+CONFIG_TASK_SIZE=0xb0000000
+
+CONFIG_FSL_LBC=y
+CONFIG_FSL_DMA=y
+CONFIG_FSL_RIO=y
+
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_TSI57X=y
+CONFIG_RAPIDIO_TSI568=y
+CONFIG_RAPIDIO_CPS_XX=y
+CONFIG_RAPIDIO_CPS_GEN2=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_PROC_DEVICETREE=y
+
+CONFIG_MTD=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_PHYSMAP_OF=y
+
+CONFIG_I2C=y
+CONFIG_I2C_MPC=y
+CONFIG_I2C_CHARDEV
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_DRV_ISL1208=y
+
+CONFIG_NET=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_GIANFAR=y
+CONFIG_MARVELL_PHY=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig
index 5b2b651dfb98..008a7a47b89b 100644
--- a/arch/powerpc/configs/85xx/sbc8548_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8548_defconfig
@@ -55,3 +55,22 @@ CONFIG_ROOT_NFS=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_MTD=y
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_PHYSMAP_OF=y
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
index da731c2fe984..f2f6734d5f76 100644
--- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
+++ b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
@@ -25,7 +25,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_1000=y
 CONFIG_PREEMPT=y
 CONFIG_BINFMT_MISC=m
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
index 2149360a1e62..be73219212b7 100644
--- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
@@ -25,7 +25,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_1000=y
 CONFIG_PREEMPT=y
 CONFIG_BINFMT_MISC=y
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index af2e8e1edba6..b3e2b1058f27 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -25,7 +25,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_1000=y
 CONFIG_PREEMPT=y
 CONFIG_BINFMT_MISC=m
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index 0a92ca045641..1a62baf855e9 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig
@@ -23,7 +23,6 @@ CONFIG_SBC8641D=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_BINFMT_MISC=m
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index 1c0f2432ecdb..60027c2a7034 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -32,7 +32,6 @@ CONFIG_HIGHMEM=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KEXEC=y
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index f7df8362911f..3d139fa04050 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -26,7 +26,6 @@ CONFIG_P5020_DS=y
 CONFIG_P5040_DS=y
 # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
 CONFIG_BINFMT_MISC=m
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_MSI=y
 CONFIG_RAPIDIO=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index 502cd9e027e4..8d00ea5b8a9f 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -49,7 +49,6 @@ CONFIG_QE_GPIO=y
 CONFIG_HIGHMEM=y
 CONFIG_BINFMT_MISC=m
 CONFIG_MATH_EMULATION=y
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index bcedeea0df89..bd8a6f71944f 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -1,28 +1,27 @@
 CONFIG_PPC64=y
 CONFIG_ALTIVEC=y
-# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_MAC_PARTITION=y
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_PASEMI=y
 CONFIG_PPC_PASEMI_IOMMU=y
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_1000=y
 CONFIG_PPC_64K_PAGES=y
 # CONFIG_SECCOMP is not set
@@ -47,7 +46,6 @@ CONFIG_INET_ESP=y
 # CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_SLRAM=y
@@ -58,7 +56,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_MISC_DEVICES=y
 CONFIG_EEPROM_LEGACY=y
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDECD=y
@@ -91,21 +88,19 @@ CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
-CONFIG_MARVELL_PHY=y
-CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
-CONFIG_NET_PCI=y
-CONFIG_E1000=y
 CONFIG_TIGON3=y
+CONFIG_E1000=y
 CONFIG_PASEMI_MAC=y
+CONFIG_MARVELL_PHY=y
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_SERIO is not set
+CONFIG_LEGACY_PTY_COUNT=4
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_LEGACY_PTY_COUNT=4
 CONFIG_HW_RANDOM=y
 CONFIG_RAW_DRIVER=y
 CONFIG_I2C_CHARDEV=y
@@ -146,14 +141,11 @@ CONFIG_HID_TOPSEED=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_USB_LIBUSUAL=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_EDAC_PASEMI=y
@@ -164,8 +156,6 @@ CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-CONFIG_INOTIFY=y
-CONFIG_AUTOFS_FS=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_ISO9660_FS=y
 CONFIG_UDF_FS=y
@@ -177,27 +167,22 @@ CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_JFFS2_FS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V4=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_MAC_PARTITION=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_CRC_CCITT=y
+CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_SCHED_DEBUG is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
 CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_BLOWFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 6d03530b7506..aef3f71de5ad 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -5,6 +5,9 @@ CONFIG_SMP=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_IRQ_DOMAIN_DEBUG=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_IKCONFIG=y
@@ -21,6 +24,8 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_EFI_PARTITION=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_SCANLOG=m
 CONFIG_PPC_SMLPAR=y
@@ -42,10 +47,9 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_PMAC64=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_100=y
 CONFIG_BINFMT_MISC=m
+CONFIG_PPC_TRANSACTIONAL_MEM=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_KEXEC=y
 CONFIG_IRQ_ALL_CPUS=y
@@ -73,7 +77,6 @@ CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 # CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -130,19 +133,12 @@ CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -151,7 +147,10 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_BPF_JIT=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_LOOP=y
@@ -173,7 +172,6 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
@@ -205,13 +203,6 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
-CONFIG_IEEE1394=y
-CONFIG_IEEE1394_OHCI1394=y
-CONFIG_IEEE1394_SBP2=m
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_RAWIO=y
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_DV1394=m
 CONFIG_ADB_PMU=y
 CONFIG_PMAC_SMU=y
 CONFIG_THERM_PM72=y
@@ -220,50 +211,43 @@ CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
 CONFIG_WINDFARM_PM112=y
 CONFIG_WINDFARM_PM121=y
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
 CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_NETCONSOLE=y
+CONFIG_NETPOLL_TRAP=y
 CONFIG_TUN=m
-CONFIG_MARVELL_PHY=y
-CONFIG_BROADCOM_PHY=m
-CONFIG_NET_ETHERNET=y
-CONFIG_SUNGEM=y
-CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=y
-CONFIG_IBMVETH=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-CONFIG_E100=y
 CONFIG_ACENIC=m
 CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_E1000=y
-CONFIG_E1000E=y
+CONFIG_PCNET32=y
 CONFIG_TIGON3=y
-CONFIG_BNX2=m
-CONFIG_SPIDER_NET=m
-CONFIG_GELIC_NET=m
-CONFIG_GELIC_WIRELESS=y
 CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
+CONFIG_BE2NET=m
+CONFIG_S2IO=m
+CONFIG_IBMVETH=m
 CONFIG_EHEA=m
-CONFIG_IXGBE=m
+CONFIG_E100=y
+CONFIG_E1000=y
+CONFIG_E1000E=y
 CONFIG_IXGB=m
-CONFIG_S2IO=m
+CONFIG_IXGBE=m
+CONFIG_MLX4_EN=m
 CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
 CONFIG_PASEMI_MAC=y
-CONFIG_MLX4_EN=m
 CONFIG_QLGE=m
-CONFIG_BE2NET=m
+CONFIG_NETXEN_NIC=m
+CONFIG_SUNGEM=y
+CONFIG_GELIC_NET=m
+CONFIG_GELIC_WIRELESS=y
+CONFIG_SPIDER_NET=m
+CONFIG_MARVELL_PHY=y
+CONFIG_BROADCOM_PHY=m
 CONFIG_PPP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
 CONFIG_PPPOE=m
-CONFIG_NETCONSOLE=y
-CONFIG_NETPOLL_TRAP=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_MISC=y
@@ -279,13 +263,10 @@ CONFIG_HVC_RTAS=y
 CONFIG_HVC_BEAT=y
 CONFIG_HVCS=m
 CONFIG_IBM_BSR=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_RAW_DRIVER=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_AMD8111=y
 CONFIG_I2C_PASEMI=y
-# CONFIG_HWMON is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
@@ -300,7 +281,6 @@ CONFIG_FB_RADEON=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_PS3=m
 CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
@@ -317,18 +297,16 @@ CONFIG_SND_AOA_FABRIC_LAYOUT=m
 CONFIG_SND_AOA_ONYX=m
 CONFIG_SND_AOA_TAS=m
 CONFIG_SND_AOA_TOONIE=m
-CONFIG_USB_HIDDEV=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_PANTHERLORD=y
 CONFIG_HID_PETALYNX=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 CONFIG_HID_SUNPLUS=y
+CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
 CONFIG_USB_MON=m
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHCI_HCD_PPC_OF is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=m
@@ -370,11 +348,9 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 CONFIG_XFS_FS=m
 CONFIG_XFS_POSIX_ACL=y
-CONFIG_OCFS2_FS=m
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
-CONFIG_INOTIFY=y
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=m
 CONFIG_ISO9660_FS=y
@@ -383,100 +359,53 @@ CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_RPCSEC_GSS_SPKM3=m
 CONFIG_CIFS=m
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_PARTITION_ADVANCED=y
+CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
 CONFIG_CRC_T10DIF=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOCKUP_DETECTOR=y
-CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_LATENCYTOP=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_SCHED_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_CODE_PATCHING_SELFTEST=y
 CONFIG_FTR_FIXUP_SELFTEST=y
 CONFIG_MSI_BITMAP_SELFTEST=y
 CONFIG_XMON=y
-CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_BOOTX_TEXT=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_KHAZAD=m
@@ -486,11 +415,9 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=y
 CONFIG_VHOST_NET=m
-CONFIG_BPF_JIT=y
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
index f55c27609fc6..4b20f76172e2 100644
--- a/arch/powerpc/configs/ppc64e_defconfig
+++ b/arch/powerpc/configs/ppc64e_defconfig
@@ -4,6 +4,8 @@ CONFIG_SMP=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_IKCONFIG=y
@@ -18,12 +20,13 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_MAC_PARTITION=y
+CONFIG_EFI_PARTITION=y
 CONFIG_P5020_DS=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BINFMT_MISC=m
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -46,7 +49,6 @@ CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 # CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -103,19 +105,12 @@ CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -125,6 +120,8 @@ CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_LOOP=y
@@ -167,41 +164,31 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
-CONFIG_IEEE1394=y
-CONFIG_IEEE1394_OHCI1394=y
-CONFIG_IEEE1394_SBP2=m
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_RAWIO=y
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_DV1394=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_WINDFARM=y
 CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
 CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_NETCONSOLE=y
+CONFIG_NETPOLL_TRAP=y
 CONFIG_TUN=m
-CONFIG_MARVELL_PHY=y
-CONFIG_BROADCOM_PHY=m
-CONFIG_NET_ETHERNET=y
-CONFIG_SUNGEM=y
-CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=y
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-CONFIG_E100=y
 CONFIG_ACENIC=y
 CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_E1000=y
+CONFIG_PCNET32=y
 CONFIG_TIGON3=y
+CONFIG_E100=y
+CONFIG_E1000=y
 CONFIG_IXGB=m
+CONFIG_SUNGEM=y
+CONFIG_MARVELL_PHY=y
+CONFIG_BROADCOM_PHY=m
 CONFIG_PPP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
 CONFIG_PPPOE=m
-CONFIG_NETCONSOLE=y
-CONFIG_NETPOLL_TRAP=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_MISC=y
@@ -213,7 +200,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_RAW_DRIVER=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_AMD8111=y
-# CONFIG_HWMON is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
@@ -227,7 +213,6 @@ CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_RADEON=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
@@ -238,7 +223,6 @@ CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_USB_HIDDEV=y
 CONFIG_HID_DRAGONRISE=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_TWINHAN=y
@@ -253,8 +237,8 @@ CONFIG_HID_SMARTJOYPLUS=y
 CONFIG_HID_TOPSEED=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_HID_ZEROPLUS=y
+CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_HCD_PPC_OF is not set
 CONFIG_USB_OHCI_HCD=y
@@ -296,73 +280,36 @@ CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_CRAMFS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_RPCSEC_GSS_SPKM3=m
 CONFIG_CIFS=m
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_MAC_PARTITION=y
+CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
 CONFIG_CRC_T10DIF=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_LATENCYTOP=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_IRQSOFF_TRACER=y
 CONFIG_SCHED_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_CODE_PATCHING_SELFTEST=y
 CONFIG_FTR_FIXUP_SELFTEST=y
 CONFIG_MSI_BITMAP_SELFTEST=y
@@ -371,16 +318,12 @@ CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAST6=m
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index c2f4b4a86ece..7a5c15fcc7cf 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_CPUS=2
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EMBEDDED=y
@@ -24,12 +25,13 @@ CONFIG_PS3_DISK=y
 CONFIG_PS3_ROM=y
 CONFIG_PS3_FLASH=y
 CONFIG_PS3_VRAM=m
+CONFIG_PS3_LPM=m
 # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
-CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_KEXEC=y
 # CONFIG_SPARSEMEM_VMEMMAP is not set
+# CONFIG_COMPACTION is not set
 CONFIG_SCHED_SMT=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE=""
@@ -59,6 +61,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=m
 CONFIG_MAC80211_RC_PID=y
 # CONFIG_MAC80211_RC_MINSTREL is not set
@@ -78,7 +81,6 @@ CONFIG_MD=y
 CONFIG_BLK_DEV_DM=m
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
 # CONFIG_NET_VENDOR_INTEL is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MICREL is not set
@@ -119,21 +121,21 @@ CONFIG_SND=m
 # CONFIG_SND_DRIVERS is not set
 CONFIG_SND_USB_AUDIO=m
 CONFIG_HIDRAW=y
-CONFIG_USB_HIDDEV=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_EZKEY=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_MICROSOFT=m
+CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_SONY=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_USB_HIDDEV=y
 CONFIG_USB=m
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_MON=m
 CONFIG_USB_EHCI_HCD=m
@@ -158,8 +160,8 @@ CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
+CONFIG_NFS_SWAP=y
 CONFIG_ROOT_NFS=y
 CONFIG_CIFS=m
 CONFIG_NLS=y
@@ -176,6 +178,7 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_FTRACE is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_CRYPTO_CCM=m
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 5b8e1e508270..c4dfbaf8b192 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -6,12 +6,15 @@ CONFIG_NR_CPUS=2048
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_IRQ_DOMAIN_DEBUG=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
@@ -29,6 +32,8 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_EFI_PARTITION=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_SCANLOG=m
 CONFIG_PPC_SMLPAR=y
@@ -36,10 +41,9 @@ CONFIG_DTL=y
 # CONFIG_PPC_PMAC is not set
 CONFIG_RTAS_FLASH=m
 CONFIG_IBMEBUS=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_100=y
 CONFIG_BINFMT_MISC=m
+CONFIG_PPC_TRANSACTIONAL_MEM=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_KEXEC=y
 CONFIG_IRQ_ALL_CPUS=y
@@ -65,7 +69,6 @@ CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 # CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -112,20 +115,15 @@ CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
@@ -146,7 +144,6 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
@@ -177,43 +174,36 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
 CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_NETCONSOLE=y
+CONFIG_NETPOLL_TRAP=y
 CONFIG_TUN=m
-CONFIG_NET_ETHERNET=y
-CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=y
-CONFIG_IBMVETH=y
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-CONFIG_E100=y
 CONFIG_ACENIC=m
 CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_E1000=y
-CONFIG_E1000E=y
+CONFIG_PCNET32=y
 CONFIG_TIGON3=y
-CONFIG_BNX2=m
 CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
+CONFIG_BE2NET=m
+CONFIG_S2IO=m
+CONFIG_IBMVETH=y
 CONFIG_EHEA=y
-CONFIG_IXGBE=m
+CONFIG_E100=y
+CONFIG_E1000=y
+CONFIG_E1000E=y
 CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
+CONFIG_IXGBE=m
 CONFIG_MLX4_EN=m
+CONFIG_MYRI10GE=m
 CONFIG_QLGE=m
-CONFIG_BE2NET=m
+CONFIG_NETXEN_NIC=m
 CONFIG_PPP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
 CONFIG_PPPOE=m
-CONFIG_NETCONSOLE=y
-CONFIG_NETPOLL_TRAP=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_MISC=y
@@ -227,12 +217,9 @@ CONFIG_HVC_CONSOLE=y
 CONFIG_HVC_RTAS=y
 CONFIG_HVCS=m
 CONFIG_IBM_BSR=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_GEN_RTC=y
 CONFIG_RAW_DRIVER=y
 CONFIG_MAX_RAW_DEVS=1024
-# CONFIG_HWMON is not set
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_OF=y
@@ -243,19 +230,17 @@ CONFIG_FB_MATROX_G=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_LCD_PLATFORM=m
-CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
-CONFIG_USB_HIDDEV=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_PANTHERLORD=y
 CONFIG_HID_PETALYNX=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 CONFIG_HID_SUNPLUS=y
+CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
 CONFIG_USB_MON=m
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_HCD_PPC_OF is not set
@@ -293,7 +278,6 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 CONFIG_XFS_FS=m
 CONFIG_XFS_POSIX_ACL=y
-CONFIG_OCFS2_FS=m
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
@@ -305,61 +289,49 @@ CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_RPCSEC_GSS_SPKM3=m
 CONFIG_CIFS=m
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
+CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=y
 CONFIG_CRC_T10DIF=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOCKUP_DETECTOR=y
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_LATENCYTOP=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_SCHED_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_CODE_PATCHING_SELFTEST=y
 CONFIG_FTR_FIXUP_SELFTEST=y
 CONFIG_MSI_BITMAP_SELFTEST=y
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
-CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_KHAZAD=m
@@ -369,7 +341,6 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 CONFIG_VIRTUALIZATION=y
diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile
new file mode 100644
index 000000000000..2926fb9c570a
--- /dev/null
+++ b/arch/powerpc/crypto/Makefile
@@ -0,0 +1,9 @@
+#
+# powerpc/crypto/Makefile
+#
+# Arch-specific CryptoAPI modules.
+#
+
+obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o
+
+sha1-powerpc-y := sha1-powerpc-asm.o sha1.o
diff --git a/arch/powerpc/crypto/sha1-powerpc-asm.S b/arch/powerpc/crypto/sha1-powerpc-asm.S
new file mode 100644
index 000000000000..a5f8264d2d3c
--- /dev/null
+++ b/arch/powerpc/crypto/sha1-powerpc-asm.S
@@ -0,0 +1,179 @@
+/*
+ * SHA-1 implementation for PowerPC.
+ *
+ * Copyright (C) 2005 Paul Mackerras <paulus@samba.org>
+ */
+
+#include <asm/ppc_asm.h>
+#include <asm/asm-offsets.h>
+
+/*
+ * We roll the registers for T, A, B, C, D, E around on each
+ * iteration; T on iteration t is A on iteration t+1, and so on.
+ * We use registers 7 - 12 for this.
+ */
+#define RT(t)   ((((t)+5)%6)+7)
+#define RA(t)   ((((t)+4)%6)+7)
+#define RB(t)   ((((t)+3)%6)+7)
+#define RC(t)   ((((t)+2)%6)+7)
+#define RD(t)   ((((t)+1)%6)+7)
+#define RE(t)   ((((t)+0)%6)+7)
+
+/* We use registers 16 - 31 for the W values */
+#define W(t)    (((t)%16)+16)
+
+#define LOADW(t)                                \
+        lwz     W(t),(t)*4(r4)
+
+#define STEPD0_LOAD(t)                          \
+        andc    r0,RD(t),RB(t);         \
+        and     r6,RB(t),RC(t);         \
+        rotlwi  RT(t),RA(t),5;                  \
+        or      r6,r6,r0;                       \
+        add     r0,RE(t),r15;                   \
+        add     RT(t),RT(t),r6;         \
+        add     r14,r0,W(t);                    \
+        lwz     W((t)+4),((t)+4)*4(r4); \
+        rotlwi  RB(t),RB(t),30;                 \
+        add     RT(t),RT(t),r14
+
+#define STEPD0_UPDATE(t)                        \
+        and     r6,RB(t),RC(t);         \
+        andc    r0,RD(t),RB(t);         \
+        rotlwi  RT(t),RA(t),5;                  \
+        rotlwi  RB(t),RB(t),30;                 \
+        or      r6,r6,r0;                       \
+        add     r0,RE(t),r15;                   \
+        xor     r5,W((t)+4-3),W((t)+4-8);               \
+        add     RT(t),RT(t),r6;         \
+        xor     W((t)+4),W((t)+4-16),W((t)+4-14);       \
+        add     r0,r0,W(t);                     \
+        xor     W((t)+4),W((t)+4),r5;                   \
+        add     RT(t),RT(t),r0;         \
+        rotlwi  W((t)+4),W((t)+4),1
+
+#define STEPD1(t)                               \
+        xor     r6,RB(t),RC(t);         \
+        rotlwi  RT(t),RA(t),5;                  \
+        rotlwi  RB(t),RB(t),30;                 \
+        xor     r6,r6,RD(t);                    \
+        add     r0,RE(t),r15;                   \
+        add     RT(t),RT(t),r6;         \
+        add     r0,r0,W(t);                     \
+        add     RT(t),RT(t),r0
+
+#define STEPD1_UPDATE(t)                                \
+        xor     r6,RB(t),RC(t);         \
+        rotlwi  RT(t),RA(t),5;                  \
+        rotlwi  RB(t),RB(t),30;                 \
+        xor     r6,r6,RD(t);                    \
+        add     r0,RE(t),r15;                   \
+        xor     r5,W((t)+4-3),W((t)+4-8);               \
+        add     RT(t),RT(t),r6;         \
+        xor     W((t)+4),W((t)+4-16),W((t)+4-14);       \
+        add     r0,r0,W(t);                     \
+        xor     W((t)+4),W((t)+4),r5;                   \
+        add     RT(t),RT(t),r0;         \
+        rotlwi  W((t)+4),W((t)+4),1
+
+#define STEPD2_UPDATE(t)                        \
+        and     r6,RB(t),RC(t);         \
+        and     r0,RB(t),RD(t);         \
+        rotlwi  RT(t),RA(t),5;                  \
+        or      r6,r6,r0;                       \
+        rotlwi  RB(t),RB(t),30;                 \
+        and     r0,RC(t),RD(t);         \
+        xor     r5,W((t)+4-3),W((t)+4-8);       \
+        or      r6,r6,r0;                       \
+        xor     W((t)+4),W((t)+4-16),W((t)+4-14);       \
+        add     r0,RE(t),r15;                   \
+        add     RT(t),RT(t),r6;         \
+        add     r0,r0,W(t);                     \
+        xor     W((t)+4),W((t)+4),r5;           \
+        add     RT(t),RT(t),r0;         \
+        rotlwi  W((t)+4),W((t)+4),1
+
+#define STEP0LD4(t)                             \
+        STEPD0_LOAD(t);                         \
+        STEPD0_LOAD((t)+1);                     \
+        STEPD0_LOAD((t)+2);                     \
+        STEPD0_LOAD((t)+3)
+
+#define STEPUP4(t, fn)                          \
+        STEP##fn##_UPDATE(t);                   \
+        STEP##fn##_UPDATE((t)+1);               \
+        STEP##fn##_UPDATE((t)+2);               \
+        STEP##fn##_UPDATE((t)+3)
+
+#define STEPUP20(t, fn)                         \
+        STEPUP4(t, fn);                         \
+        STEPUP4((t)+4, fn);                     \
+        STEPUP4((t)+8, fn);                     \
+        STEPUP4((t)+12, fn);                    \
+        STEPUP4((t)+16, fn)
+
+_GLOBAL(powerpc_sha_transform)
+        PPC_STLU r1,-STACKFRAMESIZE(r1)
+        SAVE_8GPRS(14, r1)
+        SAVE_10GPRS(22, r1)
+
+        /* Load up A - E */
+        lwz     RA(0),0(r3)     /* A */
+        lwz     RB(0),4(r3)     /* B */
+        lwz     RC(0),8(r3)     /* C */
+        lwz     RD(0),12(r3)    /* D */
+        lwz     RE(0),16(r3)    /* E */
+
+        LOADW(0)
+        LOADW(1)
+        LOADW(2)
+        LOADW(3)
+
+        lis     r15,0x5a82      /* K0-19 */
+        ori     r15,r15,0x7999
+        STEP0LD4(0)
+        STEP0LD4(4)
+        STEP0LD4(8)
+        STEPUP4(12, D0)
+        STEPUP4(16, D0)
+
+        lis     r15,0x6ed9      /* K20-39 */
+        ori     r15,r15,0xeba1
+        STEPUP20(20, D1)
+
+        lis     r15,0x8f1b      /* K40-59 */
+        ori     r15,r15,0xbcdc
+        STEPUP20(40, D2)
+
+        lis     r15,0xca62      /* K60-79 */
+        ori     r15,r15,0xc1d6
+        STEPUP4(60, D1)
+        STEPUP4(64, D1)
+        STEPUP4(68, D1)
+        STEPUP4(72, D1)
+        lwz     r20,16(r3)
+        STEPD1(76)
+        lwz     r19,12(r3)
+        STEPD1(77)
+        lwz     r18,8(r3)
+        STEPD1(78)
+        lwz     r17,4(r3)
+        STEPD1(79)
+
+        lwz     r16,0(r3)
+        add     r20,RE(80),r20
+        add     RD(0),RD(80),r19
+        add     RC(0),RC(80),r18
+        add     RB(0),RB(80),r17
+        add     RA(0),RA(80),r16
+        mr      RE(0),r20
+        stw     RA(0),0(r3)
+        stw     RB(0),4(r3)
+        stw     RC(0),8(r3)
+        stw     RD(0),12(r3)
+        stw     RE(0),16(r3)
+
+        REST_8GPRS(14, r1)
+        REST_10GPRS(22, r1)
+        addi    r1,r1,STACKFRAMESIZE
+        blr
diff --git a/arch/powerpc/crypto/sha1.c b/arch/powerpc/crypto/sha1.c
new file mode 100644
index 000000000000..f9e8b9491efc
--- /dev/null
+++ b/arch/powerpc/crypto/sha1.c
@@ -0,0 +1,157 @@
+/*
+ * Cryptographic API.
+ *
+ * powerpc implementation of the SHA1 Secure Hash Algorithm.
+ *
+ * Derived from cryptoapi implementation, adapted for in-place
+ * scatterlist interface.
+ *
+ * Derived from "crypto/sha1.c"
+ * Copyright (c) Alan Smithee.
+ * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
+ * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
+ *
+ * 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 <crypto/internal/hash.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/cryptohash.h>
+#include <linux/types.h>
+#include <crypto/sha.h>
+#include <asm/byteorder.h>
+
+extern void powerpc_sha_transform(u32 *state, const u8 *src, u32 *temp);
+
+static int sha1_init(struct shash_desc *desc)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        *sctx = (struct sha1_state){
+                .state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 },
+        };
+
+        return 0;
+}
+
+static int sha1_update(struct shash_desc *desc, const u8 *data,
+                        unsigned int len)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial, done;
+        const u8 *src;
+
+        partial = sctx->count & 0x3f;
+        sctx->count += len;
+        done = 0;
+        src = data;
+
+        if ((partial + len) > 63) {
+                u32 temp[SHA_WORKSPACE_WORDS];
+
+                if (partial) {
+                        done = -partial;
+                        memcpy(sctx->buffer + partial, data, done + 64);
+                        src = sctx->buffer;
+                }
+
+                do {
+                        powerpc_sha_transform(sctx->state, src, temp);
+                        done += 64;
+                        src = data + done;
+                } while (done + 63 < len);
+
+                memset(temp, 0, sizeof(temp));
+                partial = 0;
+        }
+        memcpy(sctx->buffer + partial, src, len - done);
+
+        return 0;
+}
+
+
+/* Add padding and return the message digest. */
+static int sha1_final(struct shash_desc *desc, u8 *out)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        __be32 *dst = (__be32 *)out;
+        u32 i, index, padlen;
+        __be64 bits;
+        static const u8 padding[64] = { 0x80, };
+
+        bits = cpu_to_be64(sctx->count << 3);
+
+        /* Pad out to 56 mod 64 */
+        index = sctx->count & 0x3f;
+        padlen = (index < 56) ? (56 - index) : ((64+56) - index);
+        sha1_update(desc, padding, padlen);
+
+        /* Append length */
+        sha1_update(desc, (const u8 *)&bits, sizeof(bits));
+
+        /* Store state in digest */
+        for (i = 0; i < 5; i++)
+                dst[i] = cpu_to_be32(sctx->state[i]);
+
+        /* Wipe context */
+        memset(sctx, 0, sizeof *sctx);
+
+        return 0;
+}
+
+static int sha1_export(struct shash_desc *desc, void *out)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        memcpy(out, sctx, sizeof(*sctx));
+        return 0;
+}
+
+static int sha1_import(struct shash_desc *desc, const void *in)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        memcpy(sctx, in, sizeof(*sctx));
+        return 0;
+}
+
+static struct shash_alg alg = {
+        .digestsize     =       SHA1_DIGEST_SIZE,
+        .init           =       sha1_init,
+        .update         =       sha1_update,
+        .final          =       sha1_final,
+        .export         =       sha1_export,
+        .import         =       sha1_import,
+        .descsize       =       sizeof(struct sha1_state),
+        .statesize      =       sizeof(struct sha1_state),
+        .base           =       {
+                .cra_name       =       "sha1",
+                .cra_driver_name=       "sha1-powerpc",
+                .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
+                .cra_blocksize  =       SHA1_BLOCK_SIZE,
+                .cra_module     =       THIS_MODULE,
+        }
+};
+
+static int __init sha1_powerpc_mod_init(void)
+{
+        return crypto_register_shash(&alg);
+}
+
+static void __exit sha1_powerpc_mod_fini(void)
+{
+        crypto_unregister_shash(&alg);
+}
+
+module_init(sha1_powerpc_mod_init);
+module_exit(sha1_powerpc_mod_fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
+
+MODULE_ALIAS("sha1-powerpc");
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 76f81bd64f1d..fb3245e928ea 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -106,37 +106,37 @@ extern const char *powerpc_base_platform;
 /* CPU kernel features */
 
 /* Retain the 32b definitions all use bottom half of word */
-#define CPU_FTR_COHERENT_ICACHE         ASM_CONST(0x0000000000000001)
-#define CPU_FTR_L2CR                    ASM_CONST(0x0000000000000002)
-#define CPU_FTR_SPEC7450                ASM_CONST(0x0000000000000004)
-#define CPU_FTR_ALTIVEC                 ASM_CONST(0x0000000000000008)
-#define CPU_FTR_TAU                     ASM_CONST(0x0000000000000010)
-#define CPU_FTR_CAN_DOZE                ASM_CONST(0x0000000000000020)
-#define CPU_FTR_USE_TB                  ASM_CONST(0x0000000000000040)
-#define CPU_FTR_L2CSR                   ASM_CONST(0x0000000000000080)
-#define CPU_FTR_601                     ASM_CONST(0x0000000000000100)
-#define CPU_FTR_DBELL                   ASM_CONST(0x0000000000000200)
-#define CPU_FTR_CAN_NAP                 ASM_CONST(0x0000000000000400)
-#define CPU_FTR_L3CR                    ASM_CONST(0x0000000000000800)
-#define CPU_FTR_L3_DISABLE_NAP          ASM_CONST(0x0000000000001000)
-#define CPU_FTR_NAP_DISABLE_L2_PR       ASM_CONST(0x0000000000002000)
-#define CPU_FTR_DUAL_PLL_750FX          ASM_CONST(0x0000000000004000)
-#define CPU_FTR_NO_DPM                  ASM_CONST(0x0000000000008000)
-#define CPU_FTR_476_DD2                 ASM_CONST(0x0000000000010000)
-#define CPU_FTR_NEED_COHERENT           ASM_CONST(0x0000000000020000)
-#define CPU_FTR_NO_BTIC                 ASM_CONST(0x0000000000040000)
-#define CPU_FTR_DEBUG_LVL_EXC           ASM_CONST(0x0000000000080000)
-#define CPU_FTR_NODSISRALIGN            ASM_CONST(0x0000000000100000)
-#define CPU_FTR_PPC_LE                  ASM_CONST(0x0000000000200000)
-#define CPU_FTR_REAL_LE                 ASM_CONST(0x0000000000400000)
-#define CPU_FTR_FPU_UNAVAILABLE         ASM_CONST(0x0000000000800000)
-#define CPU_FTR_UNIFIED_ID_CACHE        ASM_CONST(0x0000000001000000)
-#define CPU_FTR_SPE                     ASM_CONST(0x0000000002000000)
-#define CPU_FTR_NEED_PAIRED_STWCX       ASM_CONST(0x0000000004000000)
-#define CPU_FTR_LWSYNC                  ASM_CONST(0x0000000008000000)
-#define CPU_FTR_NOEXECUTE               ASM_CONST(0x0000000010000000)
-#define CPU_FTR_INDEXED_DCR             ASM_CONST(0x0000000020000000)
-#define CPU_FTR_EMB_HV                  ASM_CONST(0x0000000040000000)
+#define CPU_FTR_COHERENT_ICACHE         ASM_CONST(0x00000001)
+#define CPU_FTR_L2CR                    ASM_CONST(0x00000002)
+#define CPU_FTR_SPEC7450                ASM_CONST(0x00000004)
+#define CPU_FTR_ALTIVEC                 ASM_CONST(0x00000008)
+#define CPU_FTR_TAU                     ASM_CONST(0x00000010)
+#define CPU_FTR_CAN_DOZE                ASM_CONST(0x00000020)
+#define CPU_FTR_USE_TB                  ASM_CONST(0x00000040)
+#define CPU_FTR_L2CSR                   ASM_CONST(0x00000080)
+#define CPU_FTR_601                     ASM_CONST(0x00000100)
+#define CPU_FTR_DBELL                   ASM_CONST(0x00000200)
+#define CPU_FTR_CAN_NAP                 ASM_CONST(0x00000400)
+#define CPU_FTR_L3CR                    ASM_CONST(0x00000800)
+#define CPU_FTR_L3_DISABLE_NAP          ASM_CONST(0x00001000)
+#define CPU_FTR_NAP_DISABLE_L2_PR       ASM_CONST(0x00002000)
+#define CPU_FTR_DUAL_PLL_750FX          ASM_CONST(0x00004000)
+#define CPU_FTR_NO_DPM                  ASM_CONST(0x00008000)
+#define CPU_FTR_476_DD2                 ASM_CONST(0x00010000)
+#define CPU_FTR_NEED_COHERENT           ASM_CONST(0x00020000)
+#define CPU_FTR_NO_BTIC                 ASM_CONST(0x00040000)
+#define CPU_FTR_DEBUG_LVL_EXC           ASM_CONST(0x00080000)
+#define CPU_FTR_NODSISRALIGN            ASM_CONST(0x00100000)
+#define CPU_FTR_PPC_LE                  ASM_CONST(0x00200000)
+#define CPU_FTR_REAL_LE                 ASM_CONST(0x00400000)
+#define CPU_FTR_FPU_UNAVAILABLE         ASM_CONST(0x00800000)
+#define CPU_FTR_UNIFIED_ID_CACHE        ASM_CONST(0x01000000)
+#define CPU_FTR_SPE                     ASM_CONST(0x02000000)
+#define CPU_FTR_NEED_PAIRED_STWCX       ASM_CONST(0x04000000)
+#define CPU_FTR_LWSYNC                  ASM_CONST(0x08000000)
+#define CPU_FTR_NOEXECUTE               ASM_CONST(0x10000000)
+#define CPU_FTR_INDEXED_DCR             ASM_CONST(0x20000000)
+#define CPU_FTR_EMB_HV                  ASM_CONST(0x40000000)
 
 /*
  * Add the 64-bit processor unique features in the top half of the word;
@@ -148,29 +148,33 @@ extern const char *powerpc_base_platform;
 #define LONG_ASM_CONST(x)               0
 #endif
 
-#define CPU_FTR_HVMODE                  LONG_ASM_CONST(0x0000000200000000)
-#define CPU_FTR_ARCH_201                LONG_ASM_CONST(0x0000000400000000)
-#define CPU_FTR_ARCH_206                LONG_ASM_CONST(0x0000000800000000)
-#define CPU_FTR_CFAR                    LONG_ASM_CONST(0x0000001000000000)
-#define CPU_FTR_IABR                    LONG_ASM_CONST(0x0000002000000000)
-#define CPU_FTR_MMCRA                   LONG_ASM_CONST(0x0000004000000000)
-#define CPU_FTR_CTRL                    LONG_ASM_CONST(0x0000008000000000)
-#define CPU_FTR_SMT                     LONG_ASM_CONST(0x0000010000000000)
-#define CPU_FTR_PAUSE_ZERO              LONG_ASM_CONST(0x0000200000000000)
-#define CPU_FTR_PURR                    LONG_ASM_CONST(0x0000400000000000)
-#define CPU_FTR_CELL_TB_BUG             LONG_ASM_CONST(0x0000800000000000)
-#define CPU_FTR_SPURR                   LONG_ASM_CONST(0x0001000000000000)
-#define CPU_FTR_DSCR                    LONG_ASM_CONST(0x0002000000000000)
-#define CPU_FTR_VSX                     LONG_ASM_CONST(0x0010000000000000)
-#define CPU_FTR_SAO                     LONG_ASM_CONST(0x0020000000000000)
-#define CPU_FTR_CP_USE_DCBTZ            LONG_ASM_CONST(0x0040000000000000)
-#define CPU_FTR_UNALIGNED_LD_STD        LONG_ASM_CONST(0x0080000000000000)
-#define CPU_FTR_ASYM_SMT                LONG_ASM_CONST(0x0100000000000000)
-#define CPU_FTR_STCX_CHECKS_ADDRESS     LONG_ASM_CONST(0x0200000000000000)
-#define CPU_FTR_POPCNTB                 LONG_ASM_CONST(0x0400000000000000)
-#define CPU_FTR_POPCNTD                 LONG_ASM_CONST(0x0800000000000000)
-#define CPU_FTR_ICSWX                   LONG_ASM_CONST(0x1000000000000000)
-#define CPU_FTR_VMX_COPY                LONG_ASM_CONST(0x2000000000000000)
+#define CPU_FTR_HVMODE                  LONG_ASM_CONST(0x0000000100000000)
+#define CPU_FTR_ARCH_201                LONG_ASM_CONST(0x0000000200000000)
+#define CPU_FTR_ARCH_206                LONG_ASM_CONST(0x0000000400000000)
+#define CPU_FTR_CFAR                    LONG_ASM_CONST(0x0000000800000000)
+#define CPU_FTR_IABR                    LONG_ASM_CONST(0x0000001000000000)
+#define CPU_FTR_MMCRA                   LONG_ASM_CONST(0x0000002000000000)
+#define CPU_FTR_CTRL                    LONG_ASM_CONST(0x0000004000000000)
+#define CPU_FTR_SMT                     LONG_ASM_CONST(0x0000008000000000)
+#define CPU_FTR_PAUSE_ZERO              LONG_ASM_CONST(0x0000010000000000)
+#define CPU_FTR_PURR                    LONG_ASM_CONST(0x0000020000000000)
+#define CPU_FTR_CELL_TB_BUG             LONG_ASM_CONST(0x0000040000000000)
+#define CPU_FTR_SPURR                   LONG_ASM_CONST(0x0000080000000000)
+#define CPU_FTR_DSCR                    LONG_ASM_CONST(0x0000100000000000)
+#define CPU_FTR_VSX                     LONG_ASM_CONST(0x0000200000000000)
+#define CPU_FTR_SAO                     LONG_ASM_CONST(0x0000400000000000)
+#define CPU_FTR_CP_USE_DCBTZ            LONG_ASM_CONST(0x0000800000000000)
+#define CPU_FTR_UNALIGNED_LD_STD        LONG_ASM_CONST(0x0001000000000000)
+#define CPU_FTR_ASYM_SMT                LONG_ASM_CONST(0x0002000000000000)
+#define CPU_FTR_STCX_CHECKS_ADDRESS     LONG_ASM_CONST(0x0004000000000000)
+#define CPU_FTR_POPCNTB                 LONG_ASM_CONST(0x0008000000000000)
+#define CPU_FTR_POPCNTD                 LONG_ASM_CONST(0x0010000000000000)
+#define CPU_FTR_ICSWX                   LONG_ASM_CONST(0x0020000000000000)
+#define CPU_FTR_VMX_COPY                LONG_ASM_CONST(0x0040000000000000)
+#define CPU_FTR_TM                      LONG_ASM_CONST(0x0080000000000000)
+#define CPU_FTR_BCTAR                   LONG_ASM_CONST(0x0100000000000000)
+#define CPU_FTR_HAS_PPR                 LONG_ASM_CONST(0x0200000000000000)
+#define CPU_FTR_DAWR                    LONG_ASM_CONST(0x0400000000000000)
 
 #ifndef __ASSEMBLY__
 
@@ -216,6 +220,13 @@ extern const char *powerpc_base_platform;
 #define PPC_FEATURE_HAS_EFP_DOUBLE_COMP 0
 #endif
 
+/* We only set the TM feature if the kernel was compiled with TM supprt */
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+#define CPU_FTR_TM_COMP         CPU_FTR_TM
+#else
+#define CPU_FTR_TM_COMP         0
+#endif
+
 /* We need to mark all pages as being coherent if we're SMP or we have a
  * 74[45]x and an MPC107 host bridge. Also 83xx and PowerQUICC II
  * require it for PCI "streaming/prefetch" to work properly.
@@ -400,7 +411,8 @@ extern const char *powerpc_base_platform;
             CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \
             CPU_FTR_DSCR | CPU_FTR_SAO  | CPU_FTR_ASYM_SMT | \
             CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
-            CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY)
+            CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | \
+            CPU_FTR_VMX_COPY | CPU_FTR_HAS_PPR)
 #define CPU_FTRS_POWER8 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | CPU_FTR_ARCH_206 |\
             CPU_FTR_MMCRA | CPU_FTR_SMT | \
@@ -408,7 +420,9 @@ extern const char *powerpc_base_platform;
             CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \
             CPU_FTR_DSCR | CPU_FTR_SAO  | \
             CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
-            CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY)
+            CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \
+            CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | CPU_FTR_BCTAR | \
+            CPU_FTR_TM_COMP)
 #define CPU_FTRS_CELL   (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
             CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
diff --git a/arch/powerpc/include/asm/dbell.h b/arch/powerpc/include/asm/dbell.h
index 607e4eeeb694..5fa6b20eba10 100644
--- a/arch/powerpc/include/asm/dbell.h
+++ b/arch/powerpc/include/asm/dbell.h
@@ -28,8 +28,36 @@ enum ppc_dbell {
         PPC_G_DBELL = 2,        /* guest doorbell */
         PPC_G_DBELL_CRIT = 3,   /* guest critical doorbell */
         PPC_G_DBELL_MC = 4,     /* guest mcheck doorbell */
+        PPC_DBELL_SERVER = 5,   /* doorbell on server */
 };
 
+#ifdef CONFIG_PPC_BOOK3S
+
+#define PPC_DBELL_MSGTYPE               PPC_DBELL_SERVER
+#define SPRN_DOORBELL_CPUTAG            SPRN_TIR
+#define PPC_DBELL_TAG_MASK              0x7f
+
+static inline void _ppc_msgsnd(u32 msg)
+{
+        if (cpu_has_feature(CPU_FTR_HVMODE))
+                __asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg));
+        else
+                __asm__ __volatile__ (PPC_MSGSNDP(%0) : : "r" (msg));
+}
+
+#else /* CONFIG_PPC_BOOK3S */
+
+#define PPC_DBELL_MSGTYPE               PPC_DBELL
+#define SPRN_DOORBELL_CPUTAG            SPRN_PIR
+#define PPC_DBELL_TAG_MASK              0x3fff
+
+static inline void _ppc_msgsnd(u32 msg)
+{
+        __asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg));
+}
+
+#endif /* CONFIG_PPC_BOOK3S */
+
 extern void doorbell_cause_ipi(int cpu, unsigned long data);
 extern void doorbell_exception(struct pt_regs *regs);
 extern void doorbell_setup_this_cpu(void);
@@ -39,7 +67,7 @@ static inline void ppc_msgsnd(enum ppc_dbell type, u32 flags, u32 tag)
         u32 msg = PPC_DBELL_TYPE(type) | (flags & PPC_DBELL_MSG_BRDCAST) |
                         (tag & 0x07ffffff);
 
-        __asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg));
+        _ppc_msgsnd(msg);
 }
 
 #endif /* _ASM_POWERPC_DBELL_H */
diff --git a/arch/powerpc/include/asm/debug.h b/arch/powerpc/include/asm/debug.h
index 32de2577bb6d..d2516308ed1e 100644
--- a/arch/powerpc/include/asm/debug.h
+++ b/arch/powerpc/include/asm/debug.h
@@ -4,6 +4,8 @@
 #ifndef _ASM_POWERPC_DEBUG_H
 #define _ASM_POWERPC_DEBUG_H
 
+#include <asm/hw_breakpoint.h>
+
 struct pt_regs;
 
 extern struct dentry *powerpc_debugfs_root;
@@ -15,7 +17,7 @@ extern int (*__debugger_ipi)(struct pt_regs *regs);
 extern int (*__debugger_bpt)(struct pt_regs *regs);
 extern int (*__debugger_sstep)(struct pt_regs *regs);
 extern int (*__debugger_iabr_match)(struct pt_regs *regs);
-extern int (*__debugger_dabr_match)(struct pt_regs *regs);
+extern int (*__debugger_break_match)(struct pt_regs *regs);
 extern int (*__debugger_fault_handler)(struct pt_regs *regs);
 
 #define DEBUGGER_BOILERPLATE(__NAME) \
@@ -31,7 +33,7 @@ DEBUGGER_BOILERPLATE(debugger_ipi)
 DEBUGGER_BOILERPLATE(debugger_bpt)
 DEBUGGER_BOILERPLATE(debugger_sstep)
 DEBUGGER_BOILERPLATE(debugger_iabr_match)
-DEBUGGER_BOILERPLATE(debugger_dabr_match)
+DEBUGGER_BOILERPLATE(debugger_break_match)
 DEBUGGER_BOILERPLATE(debugger_fault_handler)
 
 #else
@@ -40,17 +42,18 @@ static inline int debugger_ipi(struct pt_regs *regs) { return 0; }
 static inline int debugger_bpt(struct pt_regs *regs) { return 0; }
 static inline int debugger_sstep(struct pt_regs *regs) { return 0; }
 static inline int debugger_iabr_match(struct pt_regs *regs) { return 0; }
-static inline int debugger_dabr_match(struct pt_regs *regs) { return 0; }
+static inline int debugger_break_match(struct pt_regs *regs) { return 0; }
 static inline int debugger_fault_handler(struct pt_regs *regs) { return 0; }
 #endif
 
-extern int set_dabr(unsigned long dabr, unsigned long dabrx);
+int set_breakpoint(struct arch_hw_breakpoint *brk);
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
 extern void do_send_trap(struct pt_regs *regs, unsigned long address,
                          unsigned long error_code, int signal_code, int brkpt);
 #else
-extern void do_dabr(struct pt_regs *regs, unsigned long address,
-                    unsigned long error_code);
+
+extern void do_break(struct pt_regs *regs, unsigned long address,
+                     unsigned long error_code);
 #endif
 
 #endif /* _ASM_POWERPC_DEBUG_H */
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index a8fb03e22770..a80e32b46c11 100644
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -201,6 +201,7 @@ int eeh_dev_check_failure(struct eeh_dev *edev);
 void __init eeh_addr_cache_build(void);
 void eeh_add_device_tree_early(struct device_node *);
 void eeh_add_device_tree_late(struct pci_bus *);
+void eeh_add_sysfs_files(struct pci_bus *);
 void eeh_remove_bus_device(struct pci_dev *, int);
 
 /**
@@ -240,6 +241,8 @@ static inline void eeh_add_device_tree_early(struct device_node *dn) { }
 
 static inline void eeh_add_device_tree_late(struct pci_bus *bus) { }
 
+static inline void eeh_add_sysfs_files(struct pci_bus *bus) { }
+
 static inline void eeh_remove_bus_device(struct pci_dev *dev, int purge_pe) { }
 
 static inline void eeh_lock(void) { }
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index ad708dda3ba3..05e6d2ee1db9 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -47,9 +47,10 @@
 #define EX_R3           64
 #define EX_LR           72
 #define EX_CFAR         80
+#define EX_PPR          88      /* SMT thread status register (priority) */
 
 #ifdef CONFIG_RELOCATABLE
-#define EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)                      \
+#define __EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)                    \
         ld      r12,PACAKBASE(r13);     /* get high part of &label */   \
         mfspr   r11,SPRN_##h##SRR0;     /* save SRR0 */                 \
         LOAD_HANDLER(r12,label);                                        \
@@ -60,13 +61,15 @@
         blr;
 #else
 /* If not relocatable, we can jump directly -- and save messing with LR */
-#define EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)                      \
+#define __EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)                    \
         mfspr   r11,SPRN_##h##SRR0;     /* save SRR0 */                 \
         mfspr   r12,SPRN_##h##SRR1;     /* and SRR1 */                  \
         li      r10,MSR_RI;                                             \
         mtmsrd  r10,1;                  /* Set RI (EE=0) */             \
         b       label;
 #endif
+#define EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)                      \
+        __EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)                    \
 
 /*
  * As EXCEPTION_PROLOG_PSERIES(), except we've already got relocation on
@@ -74,6 +77,7 @@
  * case EXCEPTION_RELON_PROLOG_PSERIES_1 will be using lr.
  */
 #define EXCEPTION_RELON_PROLOG_PSERIES(area, label, h, extra, vec)      \
+        EXCEPTION_PROLOG_0(area);                                       \
         EXCEPTION_PROLOG_1(area, extra, vec);                           \
         EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)
 
@@ -107,14 +111,59 @@
 #define RESTORE_LR(reg, area)
 #endif
 
-#define __EXCEPTION_PROLOG_1(area, extra, vec)                          \
+/*
+ * PPR save/restore macros used in exceptions_64s.S  
+ * Used for P7 or later processors
+ */
+#define SAVE_PPR(area, ra, rb)                                          \
+BEGIN_FTR_SECTION_NESTED(940)                                           \
+        ld      ra,PACACURRENT(r13);                                    \
+        ld      rb,area+EX_PPR(r13);    /* Read PPR from paca */        \
+        std     rb,TASKTHREADPPR(ra);                                   \
+END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,940)
+
+#define RESTORE_PPR_PACA(area, ra)                                      \
+BEGIN_FTR_SECTION_NESTED(941)                                           \
+        ld      ra,area+EX_PPR(r13);                                    \
+        mtspr   SPRN_PPR,ra;                                            \
+END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,941)
+
+/*
+ * Increase the priority on systems where PPR save/restore is not
+ * implemented/ supported.
+ */
+#define HMT_MEDIUM_PPR_DISCARD                                          \
+BEGIN_FTR_SECTION_NESTED(942)                                           \
+        HMT_MEDIUM;                                                     \
+END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,0,942)  /*non P7*/               
+
+/*
+ * Get an SPR into a register if the CPU has the given feature
+ */
+#define OPT_GET_SPR(ra, spr, ftr)                                       \
+BEGIN_FTR_SECTION_NESTED(943)                                           \
+        mfspr   ra,spr;                                                 \
+END_FTR_SECTION_NESTED(ftr,ftr,943)
+
+/*
+ * Save a register to the PACA if the CPU has the given feature
+ */
+#define OPT_SAVE_REG_TO_PACA(offset, ra, ftr)                           \
+BEGIN_FTR_SECTION_NESTED(943)                                           \
+        std     ra,offset(r13);                                         \
+END_FTR_SECTION_NESTED(ftr,ftr,943)
+
+#define EXCEPTION_PROLOG_0(area)                                        \
         GET_PACA(r13);                                                  \
-        std     r9,area+EX_R9(r13);     /* save r9 - r12 */             \
-        std     r10,area+EX_R10(r13);                                   \
-        BEGIN_FTR_SECTION_NESTED(66);                                   \
-        mfspr   r10,SPRN_CFAR;                                          \
-        std     r10,area+EX_CFAR(r13);                                  \
-        END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66);         \
+        std     r9,area+EX_R9(r13);     /* save r9 */                   \
+        OPT_GET_SPR(r9, SPRN_PPR, CPU_FTR_HAS_PPR);                     \
+        HMT_MEDIUM;                                                     \
+        std     r10,area+EX_R10(r13);   /* save r10 - r12 */            \
+        OPT_GET_SPR(r10, SPRN_CFAR, CPU_FTR_CFAR)
+
+#define __EXCEPTION_PROLOG_1(area, extra, vec)                          \
+        OPT_SAVE_REG_TO_PACA(area+EX_PPR, r9, CPU_FTR_HAS_PPR);         \
+        OPT_SAVE_REG_TO_PACA(area+EX_CFAR, r10, CPU_FTR_CFAR);          \
         SAVE_LR(r10, area);                                             \
         mfcr    r9;                                                     \
         extra(vec);                                                     \
@@ -139,6 +188,7 @@
         __EXCEPTION_PROLOG_PSERIES_1(label, h)
 
 #define EXCEPTION_PROLOG_PSERIES(area, label, h, extra, vec)            \
+        EXCEPTION_PROLOG_0(area);                                       \
         EXCEPTION_PROLOG_1(area, extra, vec);                           \
         EXCEPTION_PROLOG_PSERIES_1(label, h);
 
@@ -149,10 +199,14 @@
 
 #define __KVM_HANDLER(area, h, n)                                       \
 do_kvm_##n:                                                             \
+        BEGIN_FTR_SECTION_NESTED(947)                                   \
+        ld      r10,area+EX_CFAR(r13);                                  \
+        std     r10,HSTATE_CFAR(r13);                                   \
+        END_FTR_SECTION_NESTED(CPU_FTR_CFAR,CPU_FTR_CFAR,947);          \
         ld      r10,area+EX_R10(r13);                                   \
-        stw     r9,HSTATE_SCRATCH1(r13);                        \
+        stw     r9,HSTATE_SCRATCH1(r13);                                \
         ld      r9,area+EX_R9(r13);                                     \
-        std     r12,HSTATE_SCRATCH0(r13);                       \
+        std     r12,HSTATE_SCRATCH0(r13);                               \
         li      r12,n;                                                  \
         b       kvmppc_interrupt
 
@@ -224,8 +278,10 @@ do_kvm_##n:								\
         std     r10,0(r1);              /* make stack chain pointer     */ \
         std     r0,GPR0(r1);            /* save r0 in stackframe        */ \
         std     r10,GPR1(r1);           /* save r1 in stackframe        */ \
+        beq     4f;                     /* if from kernel mode          */ \
         ACCOUNT_CPU_USER_ENTRY(r9, r10);                                   \
-        std     r2,GPR2(r1);            /* save r2 in stackframe        */ \
+        SAVE_PPR(area, r9, r10);                                           \
+4:      std     r2,GPR2(r1);            /* save r2 in stackframe        */ \
         SAVE_4GPRS(3, r1);              /* save r3 - r6 in stackframe   */ \
         SAVE_2GPRS(7, r1);              /* save r7, r8 in stackframe    */ \
         ld      r9,area+EX_R9(r13);     /* move r9, r10 to stackframe   */ \
@@ -266,45 +322,74 @@ do_kvm_##n:								\
         . = loc;                                        \
         .globl label##_pSeries;                         \
 label##_pSeries:                                        \
-        HMT_MEDIUM;                                     \
+        HMT_MEDIUM_PPR_DISCARD;                         \
         SET_SCRATCH0(r13);              /* save r13 */          \
         EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common,    \
                                  EXC_STD, KVMTEST_PR, vec)
 
+/* Version of above for when we have to branch out-of-line */
+#define STD_EXCEPTION_PSERIES_OOL(vec, label)                   \
+        .globl label##_pSeries;                                 \
+label##_pSeries:                                                \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST_PR, vec);        \
+        EXCEPTION_PROLOG_PSERIES_1(label##_common, EXC_STD)
+
 #define STD_EXCEPTION_HV(loc, vec, label)               \
         . = loc;                                        \
         .globl label##_hv;                              \
 label##_hv:                                             \
-        HMT_MEDIUM;                                     \
+        HMT_MEDIUM_PPR_DISCARD;                         \
         SET_SCRATCH0(r13);      /* save r13 */                  \
         EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common,    \
                                  EXC_HV, KVMTEST, vec)
 
+/* Version of above for when we have to branch out-of-line */
+#define STD_EXCEPTION_HV_OOL(vec, label)                \
+        .globl label##_hv;                              \
+label##_hv:                                             \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST, vec);   \
+        EXCEPTION_PROLOG_PSERIES_1(label##_common, EXC_HV)
+
 #define STD_RELON_EXCEPTION_PSERIES(loc, vec, label)    \
         . = loc;                                        \
         .globl label##_relon_pSeries;                   \
 label##_relon_pSeries:                                  \
-        HMT_MEDIUM;                                     \
+        HMT_MEDIUM_PPR_DISCARD;                         \
         /* No guest interrupts come through here */     \
         SET_SCRATCH0(r13);              /* save r13 */  \
         EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label##_common, \
                                        EXC_STD, KVMTEST_PR, vec)
 
+#define STD_RELON_EXCEPTION_PSERIES_OOL(vec, label)             \
+        .globl label##_relon_pSeries;                           \
+label##_relon_pSeries:                                          \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST_PR, vec);        \
+        EXCEPTION_RELON_PROLOG_PSERIES_1(label##_common, EXC_STD)
+
 #define STD_RELON_EXCEPTION_HV(loc, vec, label)         \
         . = loc;                                        \
         .globl label##_relon_hv;                        \
 label##_relon_hv:                                       \
-        HMT_MEDIUM;                                     \
+        HMT_MEDIUM_PPR_DISCARD;                         \
         /* No guest interrupts come through here */     \
         SET_SCRATCH0(r13);      /* save r13 */          \
         EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label##_common, \
                                        EXC_HV, KVMTEST, vec)
 
+#define STD_RELON_EXCEPTION_HV_OOL(vec, label)                  \
+        .globl label##_relon_hv;                                \
+label##_relon_hv:                                               \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST, vec);           \
+        EXCEPTION_RELON_PROLOG_PSERIES_1(label##_common, EXC_HV)
+
 /* This associate vector numbers with bits in paca->irq_happened */
 #define SOFTEN_VALUE_0x500      PACA_IRQ_EE
 #define SOFTEN_VALUE_0x502      PACA_IRQ_EE
 #define SOFTEN_VALUE_0x900      PACA_IRQ_DEC
 #define SOFTEN_VALUE_0x982      PACA_IRQ_DEC
+#define SOFTEN_VALUE_0xa00      PACA_IRQ_DBELL
+#define SOFTEN_VALUE_0xe80      PACA_IRQ_DBELL
+#define SOFTEN_VALUE_0xe82      PACA_IRQ_DBELL
 
 #define __SOFTEN_TEST(h, vec)                                           \
         lbz     r10,PACASOFTIRQEN(r13);                                 \
@@ -329,10 +414,12 @@ label##_relon_hv:					\
 #define SOFTEN_NOTEST_HV(vec)           _SOFTEN_TEST(EXC_HV, vec)
 
 #define __MASKABLE_EXCEPTION_PSERIES(vec, label, h, extra)              \
-        HMT_MEDIUM;                                                     \
+        HMT_MEDIUM_PPR_DISCARD;                                         \
         SET_SCRATCH0(r13);    /* save r13 */                            \
-        __EXCEPTION_PROLOG_1(PACA_EXGEN, extra, vec);           \
+        EXCEPTION_PROLOG_0(PACA_EXGEN);                                 \
+        __EXCEPTION_PROLOG_1(PACA_EXGEN, extra, vec);                   \
         EXCEPTION_PROLOG_PSERIES_1(label##_common, h);
+
 #define _MASKABLE_EXCEPTION_PSERIES(vec, label, h, extra)               \
         __MASKABLE_EXCEPTION_PSERIES(vec, label, h, extra)
 
@@ -350,9 +437,16 @@ label##_hv:								\
         _MASKABLE_EXCEPTION_PSERIES(vec, label,                         \
                                     EXC_HV, SOFTEN_TEST_HV)
 
+#define MASKABLE_EXCEPTION_HV_OOL(vec, label)                           \
+        .globl label##_hv;                                              \
+label##_hv:                                                             \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec);            \
+        EXCEPTION_PROLOG_PSERIES_1(label##_common, EXC_HV);
+
 #define __MASKABLE_RELON_EXCEPTION_PSERIES(vec, label, h, extra)        \
-        HMT_MEDIUM;                                                     \
+        HMT_MEDIUM_PPR_DISCARD;                                         \
         SET_SCRATCH0(r13);    /* save r13 */                            \
+        EXCEPTION_PROLOG_0(PACA_EXGEN);                                 \
         __EXCEPTION_PROLOG_1(PACA_EXGEN, extra, vec);           \
         EXCEPTION_RELON_PROLOG_PSERIES_1(label##_common, h);
 #define _MASKABLE_RELON_EXCEPTION_PSERIES(vec, label, h, extra) \
@@ -372,6 +466,12 @@ label##_relon_hv:							\
         _MASKABLE_RELON_EXCEPTION_PSERIES(vec, label,                   \
                                           EXC_HV, SOFTEN_NOTEST_HV)
 
+#define MASKABLE_RELON_EXCEPTION_HV_OOL(vec, label)                     \
+        .globl label##_relon_hv;                                        \
+label##_relon_hv:                                                       \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_NOTEST_HV, vec);          \
+        EXCEPTION_PROLOG_PSERIES_1(label##_common, EXC_HV);
+
 /*
  * Our exception common code can be passed various "additions"
  * to specify the behaviour of interrupts, whether to kick the
diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h
index 973cc3be011b..097dee57a7a9 100644
--- a/arch/powerpc/include/asm/firmware.h
+++ b/arch/powerpc/include/asm/firmware.h
@@ -50,6 +50,7 @@
 #define FW_FEATURE_OPAL         ASM_CONST(0x0000000010000000)
 #define FW_FEATURE_OPALv2       ASM_CONST(0x0000000020000000)
 #define FW_FEATURE_SET_MODE     ASM_CONST(0x0000000040000000)
+#define FW_FEATURE_BEST_ENERGY  ASM_CONST(0x0000000080000000)
 
 #ifndef __ASSEMBLY__
 
@@ -64,7 +65,7 @@ enum {
                 FW_FEATURE_BULK_REMOVE | FW_FEATURE_XDABR |
                 FW_FEATURE_MULTITCE | FW_FEATURE_SPLPAR | FW_FEATURE_LPAR |
                 FW_FEATURE_CMO | FW_FEATURE_VPHN | FW_FEATURE_XCMO |
-                FW_FEATURE_SET_MODE,
+                FW_FEATURE_SET_MODE | FW_FEATURE_BEST_ENERGY,
         FW_FEATURE_PSERIES_ALWAYS = 0,
         FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL | FW_FEATURE_OPALv2,
         FW_FEATURE_POWERNV_ALWAYS = 0,
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index 0975e5c0bb19..4bc2c3dad6ad 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -395,6 +395,15 @@ static inline unsigned long cmo_get_page_size(void)
 {
         return CMO_PageSize;
 }
+
+extern long pSeries_enable_reloc_on_exc(void);
+extern long pSeries_disable_reloc_on_exc(void);
+
+#else
+
+#define pSeries_enable_reloc_on_exc()  do {} while (0)
+#define pSeries_disable_reloc_on_exc() do {} while (0)
+
 #endif /* CONFIG_PPC_PSERIES */
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/powerpc/include/asm/hw_breakpoint.h b/arch/powerpc/include/asm/hw_breakpoint.h
index 423424599dad..eb0f4ac75c4c 100644
--- a/arch/powerpc/include/asm/hw_breakpoint.h
+++ b/arch/powerpc/include/asm/hw_breakpoint.h
@@ -24,16 +24,30 @@
 #define _PPC_BOOK3S_64_HW_BREAKPOINT_H
 
 #ifdef  __KERNEL__
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
-
 struct arch_hw_breakpoint {
         unsigned long   address;
-        unsigned long   dabrx;
-        int             type;
-        u8              len; /* length of the target data symbol */
-        bool            extraneous_interrupt;
+        u16             type;
+        u16             len; /* length of the target data symbol */
 };
 
+/* Note: Don't change the the first 6 bits below as they are in the same order
+ * as the dabr and dabrx.
+ */
+#define HW_BRK_TYPE_READ                0x01
+#define HW_BRK_TYPE_WRITE               0x02
+#define HW_BRK_TYPE_TRANSLATE           0x04
+#define HW_BRK_TYPE_USER                0x08
+#define HW_BRK_TYPE_KERNEL              0x10
+#define HW_BRK_TYPE_HYP                 0x20
+#define HW_BRK_TYPE_EXTRANEOUS_IRQ      0x80
+
+/* bits that overlap with the bottom 3 bits of the dabr */
+#define HW_BRK_TYPE_RDWR        (HW_BRK_TYPE_READ | HW_BRK_TYPE_WRITE)
+#define HW_BRK_TYPE_DABR        (HW_BRK_TYPE_RDWR | HW_BRK_TYPE_TRANSLATE)
+#define HW_BRK_TYPE_PRIV_ALL    (HW_BRK_TYPE_USER | HW_BRK_TYPE_KERNEL | \
+                                 HW_BRK_TYPE_HYP)
+
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
 #include <linux/kdebug.h>
 #include <asm/reg.h>
 #include <asm/debug.h>
@@ -43,8 +57,6 @@ struct pmu;
 struct perf_sample_data;
 
 #define HW_BREAKPOINT_ALIGN 0x7
-/* Maximum permissible length of any HW Breakpoint */
-#define HW_BREAKPOINT_LEN 0x8
 
 extern int hw_breakpoint_slots(int type);
 extern int arch_bp_generic_fields(int type, int *gen_bp_type);
@@ -62,7 +74,12 @@ extern void ptrace_triggered(struct perf_event *bp,
                         struct perf_sample_data *data, struct pt_regs *regs);
 static inline void hw_breakpoint_disable(void)
 {
-        set_dabr(0, 0);
+        struct arch_hw_breakpoint brk;
+
+        brk.address = 0;
+        brk.type = 0;
+        brk.len = 0;
+        set_breakpoint(&brk);
 }
 extern void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs);
 
diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h
index 88609b23b775..cdc3d2717cc6 100644
--- a/arch/powerpc/include/asm/kvm_book3s_asm.h
+++ b/arch/powerpc/include/asm/kvm_book3s_asm.h
@@ -93,6 +93,9 @@ struct kvmppc_host_state {
         u64 host_dscr;
         u64 dec_expires;
 #endif
+#ifdef CONFIG_PPC_BOOK3S_64
+        u64 cfar;
+#endif
 };
 
 struct kvmppc_book3s_shadow_vcpu {
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index ca9bf459db6a..03d7beae89a0 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -440,6 +440,7 @@ struct kvm_vcpu_arch {
         ulong uamor;
         u32 ctrl;
         ulong dabr;
+        ulong cfar;
 #endif
         u32 vrsave; /* also USPRG0 */
         u32 mmucr;
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 19d9d96eb8d3..3d6b4100dac1 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -180,6 +180,10 @@ struct machdep_calls {
         int             (*set_dabr)(unsigned long dabr,
                                     unsigned long dabrx);
 
+        /* Set DAWR for this platform, leave empty for default implemenation */
+        int             (*set_dawr)(unsigned long dawr,
+                                    unsigned long dawrx);
+
 #ifdef CONFIG_PPC32     /* XXX for now */
         /* A general init function, called by ppc_init in init/main.c.
            May be NULL. */
diff --git a/arch/powerpc/include/asm/mpc5121.h b/arch/powerpc/include/asm/mpc5121.h
index 8c0ab2ca689c..885c040d6194 100644
--- a/arch/powerpc/include/asm/mpc5121.h
+++ b/arch/powerpc/include/asm/mpc5121.h
@@ -53,4 +53,21 @@ struct mpc512x_ccm {
         u32     m4ccr;  /* MSCAN4 CCR */
         u8      res[0x98]; /* Reserved */
 };
+
+/*
+ * LPC Module
+ */
+struct mpc512x_lpc {
+        u32     cs_cfg[8];      /* CS config */
+        u32     cs_ctrl;        /* CS Control Register */
+        u32     cs_status;      /* CS Status Register */
+        u32     burst_ctrl;     /* CS Burst Control Register */
+        u32     deadcycle_ctrl; /* CS Deadcycle Control Register */
+        u32     holdcycle_ctrl; /* CS Holdcycle Control Register */
+        u32     alt;            /* Address Latch Timing Register */
+};
+
+int mpc512x_cs_config(unsigned int cs, u32 val);
+int __init mpc5121_clk_init(void);
+
 #endif /* __ASM_POWERPC_MPC5121_H__ */
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index e9e7a6999bb8..77c91e74b612 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -93,9 +93,9 @@ struct paca_struct {
          * Now, starting in cacheline 2, the exception save areas
          */
         /* used for most interrupts/exceptions */
-        u64 exgen[11] __attribute__((aligned(0x80)));
-        u64 exmc[11];           /* used for machine checks */
-        u64 exslb[11];          /* used for SLB/segment table misses
+        u64 exgen[12] __attribute__((aligned(0x80)));
+        u64 exmc[12];           /* used for machine checks */
+        u64 exslb[12];          /* used for SLB/segment table misses
                                  * on the linear mapping */
         /* SLB related definitions */
         u16 vmalloc_sllp;
@@ -137,6 +137,9 @@ struct paca_struct {
         u8 irq_work_pending;            /* IRQ_WORK interrupt while soft-disable */
         u8 nap_state_lost;              /* NV GPR values lost in power7_idle */
         u64 sprg3;                      /* Saved user-visible sprg */
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        u64 tm_scratch;                 /* TM scratch area for reclaim */
+#endif
 
 #ifdef CONFIG_PPC_POWERNV
         /* Pointer to OPAL machine check event structure set by the
@@ -167,7 +170,6 @@ struct paca_struct {
 };
 
 extern struct paca_struct *paca;
-extern __initdata struct paca_struct boot_paca;
 extern void initialise_paca(struct paca_struct *new_paca, int cpu);
 extern void setup_paca(struct paca_struct *new_paca);
 extern void allocate_pacas(void);
diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h
index 136bba62efa4..d0aec72722e9 100644
--- a/arch/powerpc/include/asm/perf_event_server.h
+++ b/arch/powerpc/include/asm/perf_event_server.h
@@ -47,11 +47,11 @@ struct power_pmu {
 /*
  * Values for power_pmu.flags
  */
-#define PPMU_LIMITED_PMC5_6     1       /* PMC5/6 have limited function */
-#define PPMU_ALT_SIPR           2       /* uses alternate posn for SIPR/HV */
-#define PPMU_NO_SIPR            4       /* no SIPR/HV in MMCRA at all */
-#define PPMU_NO_CONT_SAMPLING   8       /* no continuous sampling */
-#define PPMU_SIAR_VALID         16      /* Processor has SIAR Valid bit */
+#define PPMU_LIMITED_PMC5_6     0x00000001 /* PMC5/6 have limited function */
+#define PPMU_ALT_SIPR           0x00000002 /* uses alternate posn for SIPR/HV */
+#define PPMU_NO_SIPR            0x00000004 /* no SIPR/HV in MMCRA at all */
+#define PPMU_NO_CONT_SAMPLING   0x00000008 /* no continuous sampling */
+#define PPMU_SIAR_VALID         0x00000010 /* Processor has SIAR Valid bit */
 
 /*
  * Values for flags to get_alternatives()
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 51fb00a20d7e..8752bc8e34a3 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -100,6 +100,7 @@
 #define PPC_INST_MFSPR_PVR              0x7c1f42a6
 #define PPC_INST_MFSPR_PVR_MASK         0xfc1fffff
 #define PPC_INST_MSGSND                 0x7c00019c
+#define PPC_INST_MSGSNDP                0x7c00011c
 #define PPC_INST_NOP                    0x60000000
 #define PPC_INST_POPCNTB                0x7c0000f4
 #define PPC_INST_POPCNTB_MASK           0xfc0007fe
@@ -128,6 +129,9 @@
 #define PPC_INST_TLBSRX_DOT             0x7c0006a5
 #define PPC_INST_XXLOR                  0xf0000510
 #define PPC_INST_XVCPSGNDP              0xf0000780
+#define PPC_INST_TRECHKPT               0x7c0007dd
+#define PPC_INST_TRECLAIM               0x7c00075d
+#define PPC_INST_TABORT                 0x7c00071d
 
 #define PPC_INST_NAP                    0x4c000364
 #define PPC_INST_SLEEP                  0x4c0003a4
@@ -227,6 +231,8 @@
                                         ___PPC_RB(b) | __PPC_EH(eh))
 #define PPC_MSGSND(b)           stringify_in_c(.long PPC_INST_MSGSND | \
                                         ___PPC_RB(b))
+#define PPC_MSGSNDP(b)          stringify_in_c(.long PPC_INST_MSGSNDP | \
+                                        ___PPC_RB(b))
 #define PPC_POPCNTB(a, s)       stringify_in_c(.long PPC_INST_POPCNTB | \
                                         __PPC_RA(a) | __PPC_RS(s))
 #define PPC_POPCNTD(a, s)       stringify_in_c(.long PPC_INST_POPCNTD | \
@@ -291,4 +297,11 @@
 #define PPC_NAP                 stringify_in_c(.long PPC_INST_NAP)
 #define PPC_SLEEP               stringify_in_c(.long PPC_INST_SLEEP)
 
+/* Transactional memory instructions */
+#define TRECHKPT                stringify_in_c(.long PPC_INST_TRECHKPT)
+#define TRECLAIM(r)             stringify_in_c(.long PPC_INST_TRECLAIM \
+                                               | __PPC_RA(r))
+#define TABORT(r)               stringify_in_c(.long PPC_INST_TABORT \
+                                               | __PPC_RA(r))
+
 #endif /* _ASM_POWERPC_PPC_OPCODE_H */
diff --git a/arch/powerpc/include/asm/ppc4xx_ocm.h b/arch/powerpc/include/asm/ppc4xx_ocm.h
new file mode 100644
index 000000000000..6ce904605538
--- /dev/null
+++ b/arch/powerpc/include/asm/ppc4xx_ocm.h
@@ -0,0 +1,45 @@
+/*
+ * PowerPC 4xx OCM memory allocation support
+ *
+ * (C) Copyright 2009, Applied Micro Circuits Corporation
+ * Victor Gallardo (vgallardo@amcc.com)
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __ASM_POWERPC_PPC4XX_OCM_H__
+#define __ASM_POWERPC_PPC4XX_OCM_H__
+
+#define PPC4XX_OCM_NON_CACHED 0
+#define PPC4XX_OCM_CACHED     1
+
+#if defined(CONFIG_PPC4xx_OCM)
+
+void *ppc4xx_ocm_alloc(phys_addr_t *phys, int size, int align,
+                  int flags, const char *owner);
+void ppc4xx_ocm_free(const void *virt);
+
+#else
+
+#define ppc4xx_ocm_alloc(phys, size, align, flags, owner)       NULL
+#define ppc4xx_ocm_free(addr)   ((void)0)
+
+#endif /* CONFIG_PPC4xx_OCM */
+
+#endif  /* __ASM_POWERPC_PPC4XX_OCM_H__ */
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 2d0e1f5d8339..cea8496091ff 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -30,7 +30,6 @@
 #define ACCOUNT_STOLEN_TIME
 #else
 #define ACCOUNT_CPU_USER_ENTRY(ra, rb)                                  \
-        beq     2f;                     /* if from kernel mode */       \
         MFTB(ra);                       /* get timebase */              \
         ld      rb,PACA_STARTTIME_USER(r13);                            \
         std     ra,PACA_STARTTIME(r13);                                 \
@@ -38,7 +37,6 @@
         ld      ra,PACA_USER_TIME(r13);                                 \
         add     ra,ra,rb;               /* add on to user time */       \
         std     ra,PACA_USER_TIME(r13);                                 \
-2:
 
 #define ACCOUNT_CPU_USER_EXIT(ra, rb)                                   \
         MFTB(ra);                       /* get timebase */              \
@@ -125,6 +123,89 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
 #define REST_16VRS(n,b,base)    REST_8VRS(n,b,base); REST_8VRS(n+8,b,base)
 #define REST_32VRS(n,b,base)    REST_16VRS(n,b,base); REST_16VRS(n+16,b,base)
 
+/* Save/restore FPRs, VRs and VSRs from their checkpointed backups in
+ * thread_struct:
+ */
+#define SAVE_FPR_TRANSACT(n, base)      stfd n,THREAD_TRANSACT_FPR0+    \
+                                        8*TS_FPRWIDTH*(n)(base)
+#define SAVE_2FPRS_TRANSACT(n, base)    SAVE_FPR_TRANSACT(n, base);     \
+                                        SAVE_FPR_TRANSACT(n+1, base)
+#define SAVE_4FPRS_TRANSACT(n, base)    SAVE_2FPRS_TRANSACT(n, base);   \
+                                        SAVE_2FPRS_TRANSACT(n+2, base)
+#define SAVE_8FPRS_TRANSACT(n, base)    SAVE_4FPRS_TRANSACT(n, base);   \
+                                        SAVE_4FPRS_TRANSACT(n+4, base)
+#define SAVE_16FPRS_TRANSACT(n, base)   SAVE_8FPRS_TRANSACT(n, base);   \
+                                        SAVE_8FPRS_TRANSACT(n+8, base)
+#define SAVE_32FPRS_TRANSACT(n, base)   SAVE_16FPRS_TRANSACT(n, base);  \
+                                        SAVE_16FPRS_TRANSACT(n+16, base)
+
+#define REST_FPR_TRANSACT(n, base)      lfd     n,THREAD_TRANSACT_FPR0+ \
+                                        8*TS_FPRWIDTH*(n)(base)
+#define REST_2FPRS_TRANSACT(n, base)    REST_FPR_TRANSACT(n, base);     \
+                                        REST_FPR_TRANSACT(n+1, base)
+#define REST_4FPRS_TRANSACT(n, base)    REST_2FPRS_TRANSACT(n, base);   \
+                                        REST_2FPRS_TRANSACT(n+2, base)
+#define REST_8FPRS_TRANSACT(n, base)    REST_4FPRS_TRANSACT(n, base);   \
+                                        REST_4FPRS_TRANSACT(n+4, base)
+#define REST_16FPRS_TRANSACT(n, base)   REST_8FPRS_TRANSACT(n, base);   \
+                                        REST_8FPRS_TRANSACT(n+8, base)
+#define REST_32FPRS_TRANSACT(n, base)   REST_16FPRS_TRANSACT(n, base);  \
+                                        REST_16FPRS_TRANSACT(n+16, base)
+
+
+#define SAVE_VR_TRANSACT(n,b,base)      li b,THREAD_TRANSACT_VR0+(16*(n)); \
+                                        stvx n,b,base
+#define SAVE_2VRS_TRANSACT(n,b,base)    SAVE_VR_TRANSACT(n,b,base);     \
+                                        SAVE_VR_TRANSACT(n+1,b,base)
+#define SAVE_4VRS_TRANSACT(n,b,base)    SAVE_2VRS_TRANSACT(n,b,base);   \
+                                        SAVE_2VRS_TRANSACT(n+2,b,base)
+#define SAVE_8VRS_TRANSACT(n,b,base)    SAVE_4VRS_TRANSACT(n,b,base);   \
+                                        SAVE_4VRS_TRANSACT(n+4,b,base)
+#define SAVE_16VRS_TRANSACT(n,b,base)   SAVE_8VRS_TRANSACT(n,b,base);   \
+                                        SAVE_8VRS_TRANSACT(n+8,b,base)
+#define SAVE_32VRS_TRANSACT(n,b,base)   SAVE_16VRS_TRANSACT(n,b,base);  \
+                                        SAVE_16VRS_TRANSACT(n+16,b,base)
+
+#define REST_VR_TRANSACT(n,b,base)      li b,THREAD_TRANSACT_VR0+(16*(n)); \
+                                        lvx n,b,base
+#define REST_2VRS_TRANSACT(n,b,base)    REST_VR_TRANSACT(n,b,base);     \
+                                        REST_VR_TRANSACT(n+1,b,base)
+#define REST_4VRS_TRANSACT(n,b,base)    REST_2VRS_TRANSACT(n,b,base);   \
+                                        REST_2VRS_TRANSACT(n+2,b,base)
+#define REST_8VRS_TRANSACT(n,b,base)    REST_4VRS_TRANSACT(n,b,base);   \
+                                        REST_4VRS_TRANSACT(n+4,b,base)
+#define REST_16VRS_TRANSACT(n,b,base)   REST_8VRS_TRANSACT(n,b,base);   \
+                                        REST_8VRS_TRANSACT(n+8,b,base)
+#define REST_32VRS_TRANSACT(n,b,base)   REST_16VRS_TRANSACT(n,b,base);  \
+                                        REST_16VRS_TRANSACT(n+16,b,base)
+
+
+#define SAVE_VSR_TRANSACT(n,b,base)     li b,THREAD_TRANSACT_VSR0+(16*(n)); \
+                                        STXVD2X(n,R##base,R##b)
+#define SAVE_2VSRS_TRANSACT(n,b,base)   SAVE_VSR_TRANSACT(n,b,base);    \
+                                        SAVE_VSR_TRANSACT(n+1,b,base)
+#define SAVE_4VSRS_TRANSACT(n,b,base)   SAVE_2VSRS_TRANSACT(n,b,base);  \
+                                        SAVE_2VSRS_TRANSACT(n+2,b,base)
+#define SAVE_8VSRS_TRANSACT(n,b,base)   SAVE_4VSRS_TRANSACT(n,b,base);  \
+                                        SAVE_4VSRS_TRANSACT(n+4,b,base)
+#define SAVE_16VSRS_TRANSACT(n,b,base)  SAVE_8VSRS_TRANSACT(n,b,base);  \
+                                        SAVE_8VSRS_TRANSACT(n+8,b,base)
+#define SAVE_32VSRS_TRANSACT(n,b,base)  SAVE_16VSRS_TRANSACT(n,b,base); \
+                                        SAVE_16VSRS_TRANSACT(n+16,b,base)
+
+#define REST_VSR_TRANSACT(n,b,base)     li b,THREAD_TRANSACT_VSR0+(16*(n)); \
+                                        LXVD2X(n,R##base,R##b)
+#define REST_2VSRS_TRANSACT(n,b,base)   REST_VSR_TRANSACT(n,b,base);    \
+                                        REST_VSR_TRANSACT(n+1,b,base)
+#define REST_4VSRS_TRANSACT(n,b,base)   REST_2VSRS_TRANSACT(n,b,base);  \
+                                        REST_2VSRS_TRANSACT(n+2,b,base)
+#define REST_8VSRS_TRANSACT(n,b,base)   REST_4VSRS_TRANSACT(n,b,base);  \
+                                        REST_4VSRS_TRANSACT(n+4,b,base)
+#define REST_16VSRS_TRANSACT(n,b,base)  REST_8VSRS_TRANSACT(n,b,base);  \
+                                        REST_8VSRS_TRANSACT(n+8,b,base)
+#define REST_32VSRS_TRANSACT(n,b,base)  REST_16VSRS_TRANSACT(n,b,base); \
+                                        REST_16VSRS_TRANSACT(n+16,b,base)
+
 /* Save the lower 32 VSRs in the thread VSR region */
 #define SAVE_VSR(n,b,base)      li b,THREAD_VSR0+(16*(n));  STXVD2X(n,R##base,R##b)
 #define SAVE_2VSRS(n,b,base)    SAVE_VSR(n,b,base); SAVE_VSR(n+1,b,base)
@@ -391,6 +472,31 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
         FTR_SECTION_ELSE_NESTED(848);   \
         mtocrf (FXM), RS;               \
         ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_NOEXECUTE, 848)
+
+/*
+ * PPR restore macros used in entry_64.S
+ * Used for P7 or later processors
+ */
+#define HMT_MEDIUM_LOW_HAS_PPR                                          \
+BEGIN_FTR_SECTION_NESTED(944)                                           \
+        HMT_MEDIUM_LOW;                                                 \
+END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,944)
+
+#define SET_DEFAULT_THREAD_PPR(ra, rb)                                  \
+BEGIN_FTR_SECTION_NESTED(945)                                           \
+        lis     ra,INIT_PPR@highest;    /* default ppr=3 */             \
+        ld      rb,PACACURRENT(r13);                                    \
+        sldi    ra,ra,32;       /* 11- 13 bits are used for ppr */      \
+        std     ra,TASKTHREADPPR(rb);                                   \
+END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,945)
+
+#define RESTORE_PPR(ra, rb)                                             \
+BEGIN_FTR_SECTION_NESTED(946)                                           \
+        ld      ra,PACACURRENT(r13);                                    \
+        ld      rb,TASKTHREADPPR(ra);                                   \
+        mtspr   SPRN_PPR,rb;    /* Restore PPR */                       \
+END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,946)
+
 #endif
 
 /*
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 87502046c0dc..7ff9eaa3ea6c 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -18,11 +18,22 @@
 #define TS_FPRWIDTH 1
 #endif
 
+#ifdef CONFIG_PPC64
+/* Default SMT priority is set to 3. Use 11- 13bits to save priority. */
+#define PPR_PRIORITY 3
+#ifdef __ASSEMBLY__
+#define INIT_PPR (PPR_PRIORITY << 50)
+#else
+#define INIT_PPR ((u64)PPR_PRIORITY << 50)
+#endif /* __ASSEMBLY__ */
+#endif /* CONFIG_PPC64 */
+
 #ifndef __ASSEMBLY__
 #include <linux/compiler.h>
 #include <linux/cache.h>
 #include <asm/ptrace.h>
 #include <asm/types.h>
+#include <asm/hw_breakpoint.h>
 
 /* We do _not_ want to define new machine types at all, those must die
  * in favor of using the device-tree
@@ -141,6 +152,7 @@ typedef struct {
 #define TS_FPROFFSET 0
 #define TS_VSRLOWOFFSET 1
 #define TS_FPR(i) fpr[i][TS_FPROFFSET]
+#define TS_TRANS_FPR(i) transact_fpr[i][TS_FPROFFSET]
 
 struct thread_struct {
         unsigned long   ksp;            /* Kernel stack pointer */
@@ -215,8 +227,7 @@ struct thread_struct {
         struct perf_event *last_hit_ubp;
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
 #endif
-        unsigned long   dabr;           /* Data address breakpoint register */
-        unsigned long   dabrx;          /*      ... extension  */
+        struct arch_hw_breakpoint hw_brk; /* info on the hardware breakpoint */
         unsigned long   trap_nr;        /* last trap # on this thread */
 #ifdef CONFIG_ALTIVEC
         /* Complete AltiVec register set */
@@ -236,6 +247,34 @@ struct thread_struct {
         unsigned long   spefscr;        /* SPE & eFP status */
         int             used_spe;       /* set if process has used spe */
 #endif /* CONFIG_SPE */
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        u64             tm_tfhar;       /* Transaction fail handler addr */
+        u64             tm_texasr;      /* Transaction exception & summary */
+        u64             tm_tfiar;       /* Transaction fail instr address reg */
+        unsigned long   tm_orig_msr;    /* Thread's MSR on ctx switch */
+        struct pt_regs  ckpt_regs;      /* Checkpointed registers */
+
+        /*
+         * Transactional FP and VSX 0-31 register set.
+         * NOTE: the sense of these is the opposite of the integer ckpt_regs!
+         *
+         * When a transaction is active/signalled/scheduled etc., *regs is the
+         * most recent set of/speculated GPRs with ckpt_regs being the older
+         * checkpointed regs to which we roll back if transaction aborts.
+         *
+         * However, fpr[] is the checkpointed 'base state' of FP regs, and
+         * transact_fpr[] is the new set of transactional values.
+         * VRs work the same way.
+         */
+        double          transact_fpr[32][TS_FPRWIDTH];
+        struct {
+                unsigned int pad;
+                unsigned int val;       /* Floating point status */
+        } transact_fpscr;
+        vector128       transact_vr[32] __attribute__((aligned(16)));
+        vector128       transact_vscr __attribute__((aligned(16)));
+        unsigned long   transact_vrsave;
+#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
 #ifdef CONFIG_KVM_BOOK3S_32_HANDLER
         void*           kvm_shadow_vcpu; /* KVM internal data */
 #endif /* CONFIG_KVM_BOOK3S_32_HANDLER */
@@ -245,6 +284,10 @@ struct thread_struct {
 #ifdef CONFIG_PPC64
         unsigned long   dscr;
         int             dscr_inherit;
+        unsigned long   ppr;    /* used to save/restore SMT priority */
+#endif
+#ifdef CONFIG_PPC_BOOK3S_64
+        unsigned long   tar;
 #endif
 };
 
@@ -278,6 +321,7 @@ struct thread_struct {
         .fpr = {{0}}, \
         .fpscr = { .val = 0, }, \
         .fpexc_mode = 0, \
+        .ppr = INIT_PPR, \
 }
 #endif
 
diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h
index 0e15db4d703b..678a7c1d9cb8 100644
--- a/arch/powerpc/include/asm/ps3.h
+++ b/arch/powerpc/include/asm/ps3.h
@@ -245,7 +245,7 @@ enum lv1_result {
 
 static inline const char* ps3_result(int result)
 {
-#if defined(DEBUG)
+#if defined(DEBUG) || defined(PS3_VERBOSE_RESULT)
         switch (result) {
         case LV1_SUCCESS:
                 return "LV1_SUCCESS (0)";
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 3d5c9dc8917a..7035e608f3fa 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -29,6 +29,10 @@
 #define MSR_SF_LG       63              /* Enable 64 bit mode */
 #define MSR_ISF_LG      61              /* Interrupt 64b mode valid on 630 */
 #define MSR_HV_LG       60              /* Hypervisor state */
+#define MSR_TS_T_LG     34              /* Trans Mem state: Transactional */
+#define MSR_TS_S_LG     33              /* Trans Mem state: Suspended */
+#define MSR_TS_LG       33              /* Trans Mem state (2 bits) */
+#define MSR_TM_LG       32              /* Trans Mem Available */
 #define MSR_VEC_LG      25              /* Enable AltiVec */
 #define MSR_VSX_LG      23              /* Enable VSX */
 #define MSR_POW_LG      18              /* Enable Power Management */
@@ -98,6 +102,26 @@
 #define MSR_RI          __MASK(MSR_RI_LG)       /* Recoverable Exception */
 #define MSR_LE          __MASK(MSR_LE_LG)       /* Little Endian */
 
+#define MSR_TM          __MASK(MSR_TM_LG)       /* Transactional Mem Available */
+#define MSR_TS_N        0                       /*  Non-transactional */
+#define MSR_TS_S        __MASK(MSR_TS_S_LG)     /*  Transaction Suspended */
+#define MSR_TS_T        __MASK(MSR_TS_T_LG)     /*  Transaction Transactional */
+#define MSR_TS_MASK     (MSR_TS_T | MSR_TS_S)   /* Transaction State bits */
+#define MSR_TM_ACTIVE(x) (((x) & MSR_TS_MASK) != 0) /* Transaction active? */
+#define MSR_TM_TRANSACTIONAL(x) (((x) & MSR_TS_MASK) == MSR_TS_T)
+#define MSR_TM_SUSPENDED(x)     (((x) & MSR_TS_MASK) == MSR_TS_S)
+
+/* Reason codes describing kernel causes for transaction aborts.  By
+   convention, bit0 is copied to TEXASR[56] (IBM bit 7) which is set if
+   the failure is persistent.
+*/
+#define TM_CAUSE_RESCHED        0xfe
+#define TM_CAUSE_TLBI           0xfc
+#define TM_CAUSE_FAC_UNAV       0xfa
+#define TM_CAUSE_SYSCALL        0xf9 /* Persistent */
+#define TM_CAUSE_MISC           0xf6
+#define TM_CAUSE_SIGNAL         0xf4
+
 #if defined(CONFIG_PPC_BOOK3S_64)
 #define MSR_64BIT       MSR_SF
 
@@ -193,6 +217,10 @@
 #define SPRN_UAMOR      0x9d    /* User Authority Mask Override Register */
 #define SPRN_AMOR       0x15d   /* Authority Mask Override Register */
 #define SPRN_ACOP       0x1F    /* Available Coprocessor Register */
+#define SPRN_TFIAR      0x81    /* Transaction Failure Inst Addr   */
+#define SPRN_TEXASR     0x82    /* Transaction EXception & Summary */
+#define SPRN_TEXASRU    0x83    /* ''      ''      ''    Upper 32  */
+#define SPRN_TFHAR      0x80    /* Transaction Failure Handler Addr */
 #define SPRN_CTRLF      0x088
 #define SPRN_CTRLT      0x098
 #define   CTRL_CT       0xc0000000      /* current thread */
@@ -200,10 +228,12 @@
 #define   CTRL_CT1      0x40000000      /* thread 1 */
 #define   CTRL_TE       0x00c00000      /* thread enable */
 #define   CTRL_RUNLATCH 0x1
+#define SPRN_DAWR       0xB4
+#define SPRN_DAWRX      0xBC
+#define   DAWRX_USER    (1UL << 0)
+#define   DAWRX_KERNEL  (1UL << 1)
+#define   DAWRX_HYP     (1UL << 2)
 #define SPRN_DABR       0x3F5   /* Data Address Breakpoint Register */
-#define   DABR_TRANSLATION      (1UL << 2)
-#define   DABR_DATA_WRITE       (1UL << 1)
-#define   DABR_DATA_READ        (1UL << 0)
 #define SPRN_DABR2      0x13D   /* e300 */
 #define SPRN_DABRX      0x3F7   /* Data Address Breakpoint Register Extension */
 #define   DABRX_USER    (1UL << 0)
@@ -235,6 +265,9 @@
 #define SPRN_HRMOR      0x139   /* Real mode offset register */
 #define SPRN_HSRR0      0x13A   /* Hypervisor Save/Restore 0 */
 #define SPRN_HSRR1      0x13B   /* Hypervisor Save/Restore 1 */
+#define SPRN_FSCR       0x099   /* Facility Status & Control Register */
+#define FSCR_TAR        (1<<8)  /* Enable Target Adress Register */
+#define SPRN_TAR        0x32f   /* Target Address Register */
 #define SPRN_LPCR       0x13E   /* LPAR Control Register */
 #define   LPCR_VPM0     (1ul << (63-0))
 #define   LPCR_VPM1     (1ul << (63-1))
@@ -289,6 +322,7 @@
 #define SPRN_DBAT6U     0x23C   /* Data BAT 6 Upper Register */
 #define SPRN_DBAT7L     0x23F   /* Data BAT 7 Lower Register */
 #define SPRN_DBAT7U     0x23E   /* Data BAT 7 Upper Register */
+#define SPRN_PPR        0x380   /* SMT Thread status Register */
 
 #define SPRN_DEC        0x016           /* Decrement Register */
 #define SPRN_DER        0x095           /* Debug Enable Regsiter */
@@ -483,6 +517,7 @@
 #ifndef SPRN_PIR
 #define SPRN_PIR        0x3FF   /* Processor Identification Register */
 #endif
+#define SPRN_TIR        0x1BE   /* Thread Identification Register */
 #define SPRN_PTEHI      0x3D5   /* 981 7450 PTE HI word (S/W TLB load) */
 #define SPRN_PTELO      0x3D6   /* 982 7450 PTE LO word (S/W TLB load) */
 #define SPRN_PURR       0x135   /* Processor Utilization of Resources Reg */
@@ -763,7 +798,7 @@
  *        HV mode in which case it is HSPRG0
  *
  * 64-bit server:
- *      - SPRG0 unused (reserved for HV on Power4)
+ *      - SPRG0 scratch for TM recheckpoint/reclaim (reserved for HV on Power4)
  *      - SPRG2 scratch for exception vectors
  *      - SPRG3 CPU and NUMA node for VDSO getcpu (user visible)
  *      - HSPRG0 stores PACA in HV mode
diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h
index a0f358d4a00c..4ee06fe15de4 100644
--- a/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@ -10,6 +10,9 @@
 
 extern char __end_interrupts[];
 
+extern char __prom_init_toc_start[];
+extern char __prom_init_toc_end[];
+
 static inline int in_kernel_text(unsigned long addr)
 {
         if (addr >= (unsigned long)_stext && addr < (unsigned long)__init_end)
diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index 7124fc06ad47..5b23f910ee57 100644
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -96,7 +96,7 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
 
 #if defined(CONFIG_PPC_SPLPAR)
 /* We only yield to the hypervisor if we are in shared processor mode */
-#define SHARED_PROCESSOR (get_lppaca()->shared_proc)
+#define SHARED_PROCESSOR (local_paca->lppaca_ptr->shared_proc)
 extern void __spin_yield(arch_spinlock_t *lock);
 extern void __rw_yield(arch_rwlock_t *lock);
 #else /* SPLPAR */
diff --git a/arch/powerpc/include/asm/tm.h b/arch/powerpc/include/asm/tm.h
new file mode 100644
index 000000000000..4b4449abf3f8
--- /dev/null
+++ b/arch/powerpc/include/asm/tm.h
@@ -0,0 +1,20 @@
+/*
+ * Transactional memory support routines to reclaim and recheckpoint
+ * transactional process state.
+ *
+ * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation.
+ */
+
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+extern void do_load_up_transact_fpu(struct thread_struct *thread);
+extern void do_load_up_transact_altivec(struct thread_struct *thread);
+#endif
+
+extern void tm_enable(void);
+extern void tm_reclaim(struct thread_struct *thread,
+                       unsigned long orig_msr, uint8_t cause);
+extern void tm_recheckpoint(struct thread_struct *thread,
+                            unsigned long orig_msr);
+extern void tm_abort(uint8_t cause);
+extern void tm_save_sprs(struct thread_struct *thread);
+extern void tm_restore_sprs(struct thread_struct *thread);
diff --git a/arch/powerpc/include/uapi/asm/ptrace.h b/arch/powerpc/include/uapi/asm/ptrace.h
index ee67a2bc91bb..66b9ca4ee94a 100644
--- a/arch/powerpc/include/uapi/asm/ptrace.h
+++ b/arch/powerpc/include/uapi/asm/ptrace.h
@@ -108,6 +108,7 @@ struct pt_regs {
 #define PT_DAR  41
 #define PT_DSISR 42
 #define PT_RESULT 43
+#define PT_DSCR 44
 #define PT_REGS_COUNT 44
 
 #define PT_FPR0 48      /* each FP reg occupies 2 slots in this space */
@@ -146,34 +147,34 @@ struct pt_regs {
  * structures.  This also simplifies the implementation of a bi-arch
  * (combined (32- and 64-bit) gdb.
  */
-#define PTRACE_GETVRREGS        18
-#define PTRACE_SETVRREGS        19
+#define PTRACE_GETVRREGS        0x12
+#define PTRACE_SETVRREGS        0x13
 
 /* Get/set all the upper 32-bits of the SPE registers, accumulator, and
  * spefscr, in one go */
-#define PTRACE_GETEVRREGS       20
-#define PTRACE_SETEVRREGS       21
+#define PTRACE_GETEVRREGS       0x14
+#define PTRACE_SETEVRREGS       0x15
 
 /* Get the first 32 128bit VSX registers */
-#define PTRACE_GETVSRREGS       27
-#define PTRACE_SETVSRREGS       28
+#define PTRACE_GETVSRREGS       0x1b
+#define PTRACE_SETVSRREGS       0x1c
 
 /*
  * Get or set a debug register. The first 16 are DABR registers and the
  * second 16 are IABR registers.
  */
-#define PTRACE_GET_DEBUGREG     25
-#define PTRACE_SET_DEBUGREG     26
+#define PTRACE_GET_DEBUGREG     0x19
+#define PTRACE_SET_DEBUGREG     0x1a
 
 /* (new) PTRACE requests using the same numbers as x86 and the same
  * argument ordering. Additionally, they support more registers too
  */
-#define PTRACE_GETREGS            12
-#define PTRACE_SETREGS            13
-#define PTRACE_GETFPREGS          14
-#define PTRACE_SETFPREGS          15
-#define PTRACE_GETREGS64          22
-#define PTRACE_SETREGS64          23
+#define PTRACE_GETREGS            0xc
+#define PTRACE_SETREGS            0xd
+#define PTRACE_GETFPREGS          0xe
+#define PTRACE_SETFPREGS          0xf
+#define PTRACE_GETREGS64          0x16
+#define PTRACE_SETREGS64          0x17
 
 /* Calls to trace a 64bit program from a 32bit program */
 #define PPC_PTRACE_PEEKTEXT_3264 0x95
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 8f619342f14c..f960a7944553 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -7,7 +7,7 @@ CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
 ifeq ($(CONFIG_PPC64),y)
-CFLAGS_prom_init.o      += -mno-minimal-toc
+CFLAGS_prom_init.o      += $(NO_MINIMAL_TOC)
 endif
 ifeq ($(CONFIG_PPC32),y)
 CFLAGS_prom_init.o      += -fPIC
@@ -75,8 +75,8 @@ endif
 obj64-$(CONFIG_HIBERNATION)     += swsusp_asm64.o
 obj-$(CONFIG_MODULES)           += module.o module_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_44x)               += cpu_setup_44x.o
-obj-$(CONFIG_PPC_FSL_BOOK3E)    += cpu_setup_fsl_booke.o dbell.o
-obj-$(CONFIG_PPC_BOOK3E_64)     += dbell.o
+obj-$(CONFIG_PPC_FSL_BOOK3E)    += cpu_setup_fsl_booke.o
+obj-$(CONFIG_PPC_DOORBELL)      += dbell.o
 obj-$(CONFIG_JUMP_LABEL)        += jump_label.o
 
 extra-y                         := head_$(CONFIG_WORD_SIZE).o
@@ -91,7 +91,6 @@ obj-$(CONFIG_RELOCATABLE_PPC32)	+= reloc_32.o
 obj-$(CONFIG_PPC32)             += entry_32.o setup_32.o
 obj-$(CONFIG_PPC64)             += dma-iommu.o iommu.o
 obj-$(CONFIG_KGDB)              += kgdb.o
-obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE)    += prom_init.o
 obj-$(CONFIG_MODULES)           += ppc_ksyms.o
 obj-$(CONFIG_BOOTX_TEXT)        += btext.o
 obj-$(CONFIG_SMP)               += smp.o
@@ -122,6 +121,8 @@ ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
 obj-y                           += iomap.o
 endif
 
+obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM)   += tm.o
+
 obj-$(CONFIG_PPC64)             += $(obj64-y)
 obj-$(CONFIG_PPC32)             += $(obj32-y)
 
@@ -142,6 +143,7 @@ GCOV_PROFILE_kprobes.o := n
 extra-$(CONFIG_PPC_FPU)         += fpu.o
 extra-$(CONFIG_ALTIVEC)         += vector.o
 extra-$(CONFIG_PPC64)           += entry_64.o
+extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE)  += prom_init.o
 
 extra-y                         += systbl_chk.i
 $(obj)/systbl.o:                systbl_chk
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 4e23ba2f3ca7..781190367292 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -77,6 +77,7 @@ int main(void)
         DEFINE(NMI_MASK, NMI_MASK);
         DEFINE(THREAD_DSCR, offsetof(struct thread_struct, dscr));
         DEFINE(THREAD_DSCR_INHERIT, offsetof(struct thread_struct, dscr_inherit));
+        DEFINE(TASKTHREADPPR, offsetof(struct task_struct, thread.ppr));
 #else
         DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
 #endif /* CONFIG_PPC64 */
@@ -121,6 +122,34 @@ int main(void)
         DEFINE(THREAD_KVM_VCPU, offsetof(struct thread_struct, kvm_vcpu));
 #endif
 
+#ifdef CONFIG_PPC_BOOK3S_64
+        DEFINE(THREAD_TAR, offsetof(struct thread_struct, tar));
+#endif
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        DEFINE(PACATMSCRATCH, offsetof(struct paca_struct, tm_scratch));
+        DEFINE(THREAD_TM_TFHAR, offsetof(struct thread_struct, tm_tfhar));
+        DEFINE(THREAD_TM_TEXASR, offsetof(struct thread_struct, tm_texasr));
+        DEFINE(THREAD_TM_TFIAR, offsetof(struct thread_struct, tm_tfiar));
+        DEFINE(PT_CKPT_REGS, offsetof(struct thread_struct, ckpt_regs));
+        DEFINE(THREAD_TRANSACT_VR0, offsetof(struct thread_struct,
+                                         transact_vr[0]));
+        DEFINE(THREAD_TRANSACT_VSCR, offsetof(struct thread_struct,
+                                          transact_vscr));
+        DEFINE(THREAD_TRANSACT_VRSAVE, offsetof(struct thread_struct,
+                                            transact_vrsave));
+        DEFINE(THREAD_TRANSACT_FPR0, offsetof(struct thread_struct,
+                                          transact_fpr[0]));
+        DEFINE(THREAD_TRANSACT_FPSCR, offsetof(struct thread_struct,
+                                           transact_fpscr));
+#ifdef CONFIG_VSX
+        DEFINE(THREAD_TRANSACT_VSR0, offsetof(struct thread_struct,
+                                          transact_fpr[0]));
+#endif
+        /* Local pt_regs on stack for Transactional Memory funcs. */
+        DEFINE(TM_FRAME_SIZE, STACK_FRAME_OVERHEAD +
+               sizeof(struct pt_regs) + 16);
+#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
+
         DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
         DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
         DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
@@ -474,6 +503,7 @@ int main(void)
         DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));
         DEFINE(VCPU_TRAP, offsetof(struct kvm_vcpu, arch.trap));
         DEFINE(VCPU_PTID, offsetof(struct kvm_vcpu, arch.ptid));
+        DEFINE(VCPU_CFAR, offsetof(struct kvm_vcpu, arch.cfar));
         DEFINE(VCORE_ENTRY_EXIT, offsetof(struct kvmppc_vcore, entry_exit_count));
         DEFINE(VCORE_NAP_COUNT, offsetof(struct kvmppc_vcore, nap_count));
         DEFINE(VCORE_IN_GUEST, offsetof(struct kvmppc_vcore, in_guest));
@@ -553,6 +583,10 @@ int main(void)
         DEFINE(IPI_PRIORITY, IPI_PRIORITY);
 #endif /* CONFIG_KVM_BOOK3S_64_HV */
 
+#ifdef CONFIG_PPC_BOOK3S_64
+        HSTATE_FIELD(HSTATE_CFAR, cfar);
+#endif /* CONFIG_PPC_BOOK3S_64 */
+
 #else /* CONFIG_PPC_BOOK3S */
         DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));
         DEFINE(VCPU_XER, offsetof(struct kvm_vcpu, arch.xer));
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S
index 57cf14065aec..d29facbf9a28 100644
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@ -56,6 +56,7 @@ _GLOBAL(__setup_cpu_power8)
         mfspr   r3,SPRN_LPCR
         oris    r3, r3, LPCR_AIL_3@h
         bl      __init_LPCR
+        bl      __init_FSCR
         bl      __init_TLB
         mtlr    r11
         blr
@@ -112,6 +113,12 @@ __init_LPCR:
         isync
         blr
 
+__init_FSCR:
+        mfspr   r3,SPRN_FSCR
+        ori     r3,r3,FSCR_TAR
+        mtspr   SPRN_FSCR,r3
+        blr
+
 __init_TLB:
         /* Clear the TLB */
         li      r6,128
diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c
index a892680668d8..9ebbc24bb23c 100644
--- a/arch/powerpc/kernel/dbell.c
+++ b/arch/powerpc/kernel/dbell.c
@@ -21,7 +21,7 @@
 #ifdef CONFIG_SMP
 void doorbell_setup_this_cpu(void)
 {
-        unsigned long tag = mfspr(SPRN_PIR) & 0x3fff;
+        unsigned long tag = mfspr(SPRN_DOORBELL_CPUTAG) & PPC_DBELL_TAG_MASK;
 
         smp_muxed_ipi_set_data(smp_processor_id(), tag);
 }
@@ -30,7 +30,7 @@ void doorbell_cause_ipi(int cpu, unsigned long data)
 {
         /* Order previous accesses vs. msgsnd, which is treated as a store */
         mb();
-        ppc_msgsnd(PPC_DBELL, 0, data);
+        ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, data);
 }
 
 void doorbell_exception(struct pt_regs *regs)
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index ac057013f9fd..256c5bf0adb7 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -62,8 +62,9 @@ system_call_common:
         std     r12,_MSR(r1)
         std     r0,GPR0(r1)
         std     r10,GPR1(r1)
+        beq     2f                      /* if from kernel mode */
         ACCOUNT_CPU_USER_ENTRY(r10, r11)
-        std     r2,GPR2(r1)
+2:      std     r2,GPR2(r1)
         std     r3,GPR3(r1)
         mfcr    r2
         std     r4,GPR4(r1)
@@ -226,6 +227,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_STCX_CHECKS_ADDRESS)
 
         beq-    1f
         ACCOUNT_CPU_USER_EXIT(r11, r12)
+        HMT_MEDIUM_LOW_HAS_PPR
         ld      r13,GPR13(r1)   /* only restore r13 if returning to usermode */
 1:      ld      r2,GPR2(r1)
         ld      r1,GPR1(r1)
@@ -302,6 +304,7 @@ syscall_exit_work:
         subi    r12,r12,TI_FLAGS
 
 4:      /* Anything else left to do? */
+        SET_DEFAULT_THREAD_PPR(r3, r9)          /* Set thread.ppr = 3 */
         andi.   r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP)
         beq     .ret_from_except_lite
 
@@ -445,6 +448,19 @@ END_FTR_SECTION_IFSET(CPU_FTR_DSCR)
         std     r23,_CCR(r1)
         std     r1,KSP(r3)      /* Set old stack pointer */
 
+#ifdef CONFIG_PPC_BOOK3S_64
+BEGIN_FTR_SECTION
+        /*
+         * Back up the TAR across context switches.  Note that the TAR is not
+         * available for use in the kernel.  (To provide this, the TAR should
+         * be backed up/restored on exception entry/exit instead, and be in
+         * pt_regs.  FIXME, this should be in pt_regs anyway (for debug).)
+         */
+        mfspr   r0,SPRN_TAR
+        std     r0,THREAD_TAR(r3)
+END_FTR_SECTION_IFSET(CPU_FTR_BCTAR)
+#endif
+
 #ifdef CONFIG_SMP
         /* We need a sync somewhere here to make sure that if the
          * previous task gets rescheduled on another CPU, it sees all
@@ -527,6 +543,13 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
         mr      r1,r8           /* start using new stack pointer */
         std     r7,PACAKSAVE(r13)
 
+#ifdef CONFIG_PPC_BOOK3S_64
+BEGIN_FTR_SECTION
+        ld      r0,THREAD_TAR(r4)
+        mtspr   SPRN_TAR,r0
+END_FTR_SECTION_IFSET(CPU_FTR_BCTAR)
+#endif
+
 #ifdef CONFIG_ALTIVEC
 BEGIN_FTR_SECTION
         ld      r0,THREAD_VRSAVE(r4)
@@ -762,6 +785,10 @@ fast_exception_return:
         andc    r4,r4,r0         /* r0 contains MSR_RI here */
         mtmsrd  r4,1
 
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        /* TM debug */
+        std     r3, PACATMSCRATCH(r13) /* Stash returned-to MSR */
+#endif
         /*
          * r13 is our per cpu area, only restore it if we are returning to
          * userspace the value stored in the stack frame may belong to
@@ -770,6 +797,7 @@ fast_exception_return:
         andi.   r0,r3,MSR_PR
         beq     1f
         ACCOUNT_CPU_USER_EXIT(r2, r4)
+        RESTORE_PPR(r2, r4)
         REST_GPR(13, r1)
 1:
         mtspr   SPRN_SRR1,r3
@@ -849,13 +877,22 @@ restore_check_irq_replay:
         addi    r3,r1,STACK_FRAME_OVERHEAD;
         bl      .timer_interrupt
         b       .ret_from_except
+#ifdef CONFIG_PPC_DOORBELL
+1:
 #ifdef CONFIG_PPC_BOOK3E
-1:      cmpwi   cr0,r3,0x280
+        cmpwi   cr0,r3,0x280
+#else
+        BEGIN_FTR_SECTION
+                cmpwi   cr0,r3,0xe80
+        FTR_SECTION_ELSE
+                cmpwi   cr0,r3,0xa00
+        ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)
+#endif /* CONFIG_PPC_BOOK3E */
         bne     1f
         addi    r3,r1,STACK_FRAME_OVERHEAD;
         bl      .doorbell_exception
         b       .ret_from_except
-#endif /* CONFIG_PPC_BOOK3E */
+#endif /* CONFIG_PPC_DOORBELL */
 1:      b       .ret_from_except /* What else to do here ? */
  
 unrecov_restore:
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index 4684e33a26c3..ae54553eacd9 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -159,8 +159,9 @@ exc_##n##_common:							    \
         std     r9,GPR9(r1);            /* save r9 in stackframe */         \
         std     r10,_NIP(r1);           /* save SRR0 to stackframe */       \
         std     r11,_MSR(r1);           /* save SRR1 to stackframe */       \
+        beq     2f;                     /* if from kernel mode */           \
         ACCOUNT_CPU_USER_ENTRY(r10,r11);/* accounting (uses cr0+eq) */      \
-        ld      r3,excf+EX_R10(r13);    /* get back r10 */                  \
+2:      ld      r3,excf+EX_R10(r13);    /* get back r10 */                  \
         ld      r4,excf+EX_R11(r13);    /* get back r11 */                  \
         mfspr   r5,SPRN_SPRG_GEN_SCRATCH;/* get back r13 */                 \
         std     r12,GPR12(r1);          /* save r12 in stackframe */        \
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 4665e82fa377..a8a5361fb70c 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -104,7 +104,7 @@ __start_interrupts:
 
         .globl system_reset_pSeries;
 system_reset_pSeries:
-        HMT_MEDIUM;
+        HMT_MEDIUM_PPR_DISCARD
         SET_SCRATCH0(r13)
 #ifdef CONFIG_PPC_P7_NAP
 BEGIN_FTR_SECTION
@@ -153,12 +153,15 @@ machine_check_pSeries_1:
          * some code path might still want to branch into the original
          * vector
          */
-        b       machine_check_pSeries
+        HMT_MEDIUM_PPR_DISCARD
+        SET_SCRATCH0(r13)               /* save r13 */
+        EXCEPTION_PROLOG_0(PACA_EXMC)
+        b       machine_check_pSeries_0
 
         . = 0x300
         .globl data_access_pSeries
 data_access_pSeries:
-        HMT_MEDIUM
+        HMT_MEDIUM_PPR_DISCARD
         SET_SCRATCH0(r13)
 BEGIN_FTR_SECTION
         b       data_access_check_stab
@@ -170,8 +173,9 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_SLB)
         . = 0x380
         .globl data_access_slb_pSeries
 data_access_slb_pSeries:
-        HMT_MEDIUM
+        HMT_MEDIUM_PPR_DISCARD
         SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXSLB)
         EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST, 0x380)
         std     r3,PACA_EXSLB+EX_R3(r13)
         mfspr   r3,SPRN_DAR
@@ -201,8 +205,9 @@ data_access_slb_pSeries:
         . = 0x480
         .globl instruction_access_slb_pSeries
 instruction_access_slb_pSeries:
-        HMT_MEDIUM
+        HMT_MEDIUM_PPR_DISCARD
         SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXSLB)
         EXCEPTION_PROLOG_1(PACA_EXSLB, KVMTEST_PR, 0x480)
         std     r3,PACA_EXSLB+EX_R3(r13)
         mfspr   r3,SPRN_SRR0            /* SRR0 is faulting address */
@@ -252,7 +257,7 @@ hardware_interrupt_hv:
         MASKABLE_EXCEPTION_PSERIES(0x900, 0x900, decrementer)
         STD_EXCEPTION_HV(0x980, 0x982, hdecrementer)
 
-        STD_EXCEPTION_PSERIES(0xa00, 0xa00, trap_0a)
+        MASKABLE_EXCEPTION_PSERIES(0xa00, 0xa00, doorbell_super)
         KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xa00)
 
         STD_EXCEPTION_PSERIES(0xb00, 0xb00, trap_0b)
@@ -284,16 +289,30 @@ system_call_pSeries:
          */
         . = 0xe00
 hv_exception_trampoline:
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       h_data_storage_hv
+
         . = 0xe20
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       h_instr_storage_hv
+
         . = 0xe40
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       emulation_assist_hv
-        . = 0xe50
-        b       hmi_exception_hv
+
         . = 0xe60
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       hmi_exception_hv
 
+        . = 0xe80
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
+        b       h_doorbell_hv
+
         /* 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
@@ -301,16 +320,27 @@ hv_exception_trampoline:
          */
 performance_monitor_pSeries_1:
         . = 0xf00
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       performance_monitor_pSeries
 
 altivec_unavailable_pSeries_1:
         . = 0xf20
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       altivec_unavailable_pSeries
 
 vsx_unavailable_pSeries_1:
         . = 0xf40
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       vsx_unavailable_pSeries
 
+        . = 0xf60
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
+        b       tm_unavailable_pSeries
+
 #ifdef CONFIG_CBE_RAS
         STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error)
         KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1202)
@@ -322,11 +352,9 @@ vsx_unavailable_pSeries_1:
         . = 0x1500
         .global denorm_exception_hv
 denorm_exception_hv:
-        HMT_MEDIUM
+        HMT_MEDIUM_PPR_DISCARD
         mtspr   SPRN_SPRG_HSCRATCH0,r13
-        mfspr   r13,SPRN_SPRG_HPACA
-        std     r9,PACA_EXGEN+EX_R9(r13)
-        std     r10,PACA_EXGEN+EX_R10(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         std     r11,PACA_EXGEN+EX_R11(r13)
         std     r12,PACA_EXGEN+EX_R12(r13)
         mfspr   r9,SPRN_SPRG_HSCRATCH0
@@ -367,10 +395,12 @@ denorm_exception_hv:
 machine_check_pSeries:
         .globl machine_check_fwnmi
 machine_check_fwnmi:
-        HMT_MEDIUM
+        HMT_MEDIUM_PPR_DISCARD
         SET_SCRATCH0(r13)               /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common,
-                                 EXC_STD, KVMTEST, 0x200)
+        EXCEPTION_PROLOG_0(PACA_EXMC)
+machine_check_pSeries_0:
+        EXCEPTION_PROLOG_1(PACA_EXMC, KVMTEST, 0x200)
+        EXCEPTION_PROLOG_PSERIES_1(machine_check_common, EXC_STD)
         KVM_HANDLER_SKIP(PACA_EXMC, EXC_STD, 0x200)
 
         /* moved from 0x300 */
@@ -496,6 +526,7 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_206)
         mtspr   SPRN_HSRR0,r11
         mtcrf   0x80,r9
         ld      r9,PACA_EXGEN+EX_R9(r13)
+        RESTORE_PPR_PACA(PACA_EXGEN, r10)
         ld      r10,PACA_EXGEN+EX_R10(r13)
         ld      r11,PACA_EXGEN+EX_R11(r13)
         ld      r12,PACA_EXGEN+EX_R12(r13)
@@ -506,28 +537,34 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_206)
 
         .align  7
         /* moved from 0xe00 */
-        STD_EXCEPTION_HV(., 0xe02, h_data_storage)
+        STD_EXCEPTION_HV_OOL(0xe02, h_data_storage)
         KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0xe02)
-        STD_EXCEPTION_HV(., 0xe22, h_instr_storage)
+        STD_EXCEPTION_HV_OOL(0xe22, h_instr_storage)
         KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe22)
-        STD_EXCEPTION_HV(., 0xe42, emulation_assist)
+        STD_EXCEPTION_HV_OOL(0xe42, emulation_assist)
         KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe42)
-        STD_EXCEPTION_HV(., 0xe62, hmi_exception) /* need to flush cache ? */
+        STD_EXCEPTION_HV_OOL(0xe62, hmi_exception) /* need to flush cache ? */
         KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe62)
+        MASKABLE_EXCEPTION_HV_OOL(0xe82, h_doorbell)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe82)
 
         /* moved from 0xf00 */
-        STD_EXCEPTION_PSERIES(., 0xf00, performance_monitor)
+        STD_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor)
         KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf00)
-        STD_EXCEPTION_PSERIES(., 0xf20, altivec_unavailable)
+        STD_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable)
         KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf20)
-        STD_EXCEPTION_PSERIES(., 0xf40, vsx_unavailable)
+        STD_EXCEPTION_PSERIES_OOL(0xf40, vsx_unavailable)
         KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf40)
+        STD_EXCEPTION_PSERIES_OOL(0xf60, tm_unavailable)
+        KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf60)
 
 /*
- * An interrupt came in while soft-disabled. We set paca->irq_happened,
- * then, if it was a decrementer interrupt, we bump the dec to max and
- * and return, else we hard disable and return. This is called with
- * r10 containing the value to OR to the paca field.
+ * An interrupt came in while soft-disabled. We set paca->irq_happened, then:
+ * - If it was a decrementer interrupt, we bump the dec to max and and return.
+ * - If it was a doorbell we return immediately since doorbells are edge
+ *   triggered and won't automatically refire.
+ * - else we hard disable and return.
+ * This is called with r10 containing the value to OR to the paca field.
  */
 #define MASKED_INTERRUPT(_H)                            \
 masked_##_H##interrupt:                                 \
@@ -535,13 +572,15 @@ masked_##_H##interrupt:					\
         lbz     r11,PACAIRQHAPPENED(r13);               \
         or      r11,r11,r10;                            \
         stb     r11,PACAIRQHAPPENED(r13);               \
-        andi.   r10,r10,PACA_IRQ_DEC;                   \
-        beq     1f;                                     \
+        cmpwi   r10,PACA_IRQ_DEC;                       \
+        bne     1f;                                     \
         lis     r10,0x7fff;                             \
         ori     r10,r10,0xffff;                         \
         mtspr   SPRN_DEC,r10;                           \
         b       2f;                                     \
-1:      mfspr   r10,SPRN_##_H##SRR1;                    \
+1:      cmpwi   r10,PACA_IRQ_DBELL;                     \
+        beq     2f;                                     \
+        mfspr   r10,SPRN_##_H##SRR1;                    \
         rldicl  r10,r10,48,1; /* clear MSR_EE */        \
         rotldi  r10,r10,16;                             \
         mtspr   SPRN_##_H##SRR1,r10;                    \
@@ -558,8 +597,8 @@ masked_##_H##interrupt:					\
 
 /*
  * Called from arch_local_irq_enable when an interrupt needs
- * to be resent. r3 contains 0x500 or 0x900 to indicate which
- * kind of interrupt. MSR:EE is already off. We generate a
+ * to be resent. r3 contains 0x500, 0x900, 0xa00 or 0xe80 to indicate
+ * which kind of interrupt. MSR:EE is already off. We generate a
  * stackframe like if a real interrupt had happened.
  *
  * Note: While MSR:EE is off, we need to make sure that _MSR
@@ -575,9 +614,18 @@ _GLOBAL(__replay_interrupt)
         mflr    r11
         mfcr    r9
         ori     r12,r12,MSR_EE
-        andi.   r3,r3,0x0800
-        bne     decrementer_common
-        b       hardware_interrupt_common
+        cmpwi   r3,0x900
+        beq     decrementer_common
+        cmpwi   r3,0x500
+        beq     hardware_interrupt_common
+BEGIN_FTR_SECTION
+        cmpwi   r3,0xe80
+        beq     h_doorbell_common
+FTR_SECTION_ELSE
+        cmpwi   r3,0xa00
+        beq     doorbell_super_common
+ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)
+        blr
 
 #ifdef CONFIG_PPC_PSERIES
 /*
@@ -586,7 +634,7 @@ _GLOBAL(__replay_interrupt)
         .globl system_reset_fwnmi
       .align 7
 system_reset_fwnmi:
-        HMT_MEDIUM
+        HMT_MEDIUM_PPR_DISCARD
         SET_SCRATCH0(r13)               /* save r13 */
         EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD,
                                  NOTEST, 0x100)
@@ -651,12 +699,21 @@ machine_check_common:
         STD_EXCEPTION_COMMON_ASYNC(0x500, hardware_interrupt, do_IRQ)
         STD_EXCEPTION_COMMON_ASYNC(0x900, decrementer, .timer_interrupt)
         STD_EXCEPTION_COMMON(0x980, hdecrementer, .hdec_interrupt)
-        STD_EXCEPTION_COMMON(0xa00, trap_0a, .unknown_exception)
+#ifdef CONFIG_PPC_DOORBELL
+        STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, .doorbell_exception)
+#else
+        STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, .unknown_exception)
+#endif
         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(0xe40, emulation_assist, .program_check_exception)
         STD_EXCEPTION_COMMON(0xe60, hmi_exception, .unknown_exception)
+#ifdef CONFIG_PPC_DOORBELL
+        STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, .doorbell_exception)
+#else
+        STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, .unknown_exception)
+#endif
         STD_EXCEPTION_COMMON_ASYNC(0xf00, performance_monitor, .performance_monitor_exception)
         STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception)
         STD_EXCEPTION_COMMON(0x1502, denorm, .unknown_exception)
@@ -690,8 +747,8 @@ machine_check_common:
         . = 0x4380
         .globl data_access_slb_relon_pSeries
 data_access_slb_relon_pSeries:
-        HMT_MEDIUM
         SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXSLB)
         EXCEPTION_PROLOG_1(PACA_EXSLB, NOTEST, 0x380)
         std     r3,PACA_EXSLB+EX_R3(r13)
         mfspr   r3,SPRN_DAR
@@ -715,8 +772,8 @@ data_access_slb_relon_pSeries:
         . = 0x4480
         .globl instruction_access_slb_relon_pSeries
 instruction_access_slb_relon_pSeries:
-        HMT_MEDIUM
         SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXSLB)
         EXCEPTION_PROLOG_1(PACA_EXSLB, NOTEST, 0x480)
         std     r3,PACA_EXSLB+EX_R3(r13)
         mfspr   r3,SPRN_SRR0            /* SRR0 is faulting address */
@@ -746,6 +803,7 @@ hardware_interrupt_relon_hv:
         STD_RELON_EXCEPTION_PSERIES(0x4800, 0x800, fp_unavailable)
         MASKABLE_RELON_EXCEPTION_PSERIES(0x4900, 0x900, decrementer)
         STD_RELON_EXCEPTION_HV(0x4980, 0x982, hdecrementer)
+        MASKABLE_RELON_EXCEPTION_PSERIES(0x4a00, 0xa00, doorbell_super)
         STD_RELON_EXCEPTION_PSERIES(0x4b00, 0xb00, trap_0b)
 
         . = 0x4c00
@@ -759,56 +817,64 @@ system_call_relon_pSeries:
         STD_RELON_EXCEPTION_PSERIES(0x4d00, 0xd00, single_step)
 
         . = 0x4e00
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       h_data_storage_relon_hv
 
         . = 0x4e20
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       h_instr_storage_relon_hv
 
         . = 0x4e40
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       emulation_assist_relon_hv
 
-        . = 0x4e50
-        b       hmi_exception_relon_hv
-
         . = 0x4e60
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       hmi_exception_relon_hv
 
-        /* For when we support the doorbell interrupt:
-        STD_RELON_EXCEPTION_HYPERVISOR(0x4e80, 0xe80, doorbell_hyper)
-        */
+        . = 0x4e80
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
+        b       h_doorbell_relon_hv
 
 performance_monitor_relon_pSeries_1:
         . = 0x4f00
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       performance_monitor_relon_pSeries
 
 altivec_unavailable_relon_pSeries_1:
         . = 0x4f20
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       altivec_unavailable_relon_pSeries
 
 vsx_unavailable_relon_pSeries_1:
         . = 0x4f40
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       vsx_unavailable_relon_pSeries
 
-#ifdef CONFIG_CBE_RAS
-        STD_RELON_EXCEPTION_HV(0x5200, 0x1202, cbe_system_error)
-#endif /* CONFIG_CBE_RAS */
+tm_unavailable_relon_pSeries_1:
+        . = 0x4f60
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
+        b       tm_unavailable_relon_pSeries
+
         STD_RELON_EXCEPTION_PSERIES(0x5300, 0x1300, instruction_breakpoint)
 #ifdef CONFIG_PPC_DENORMALISATION
         . = 0x5500
         b       denorm_exception_hv
 #endif
-#ifdef CONFIG_CBE_RAS
-        STD_RELON_EXCEPTION_HV(0x5600, 0x1602, cbe_maintenance)
-#else
 #ifdef CONFIG_HVC_SCOM
         STD_RELON_EXCEPTION_HV(0x5600, 0x1600, maintence_interrupt)
         KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1600)
 #endif /* CONFIG_HVC_SCOM */
-#endif /* CONFIG_CBE_RAS */
         STD_RELON_EXCEPTION_PSERIES(0x5700, 0x1700, altivec_assist)
-#ifdef CONFIG_CBE_RAS
-        STD_RELON_EXCEPTION_HV(0x5800, 0x1802, cbe_thermal)
-#endif /* CONFIG_CBE_RAS */
 
         /* Other future vectors */
         .align  7
@@ -1036,6 +1102,7 @@ _GLOBAL(slb_miss_realmode)
         mtcrf   0x01,r9         /* slb_allocate uses cr0 and cr7 */
 .machine        pop
 
+        RESTORE_PPR_PACA(PACA_EXSLB, r9)
         ld      r9,PACA_EXSLB+EX_R9(r13)
         ld      r10,PACA_EXSLB+EX_R10(r13)
         ld      r11,PACA_EXSLB+EX_R11(r13)
@@ -1109,9 +1176,26 @@ fp_unavailable_common:
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      .kernel_fp_unavailable_exception
         BUG_OPCODE
-1:      bl      .load_up_fpu
+1:
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+BEGIN_FTR_SECTION
+        /* Test if 2 TM state bits are zero.  If non-zero (ie. userspace was in
+         * transaction), go do TM stuff
+         */
+        rldicl. r0, r12, (64-MSR_TS_LG), (64-2)
+        bne-    2f
+END_FTR_SECTION_IFSET(CPU_FTR_TM)
+#endif
+        bl      .load_up_fpu
         b       fast_exception_return
-
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+2:      /* User process was in a transaction */
+        bl      .save_nvgprs
+        DISABLE_INTS
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .fp_unavailable_tm
+        b       .ret_from_except
+#endif
         .align  7
         .globl altivec_unavailable_common
 altivec_unavailable_common:
@@ -1119,8 +1203,25 @@ altivec_unavailable_common:
 #ifdef CONFIG_ALTIVEC
 BEGIN_FTR_SECTION
         beq     1f
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+  BEGIN_FTR_SECTION_NESTED(69)
+        /* Test if 2 TM state bits are zero.  If non-zero (ie. userspace was in
+         * transaction), go do TM stuff
+         */
+        rldicl. r0, r12, (64-MSR_TS_LG), (64-2)
+        bne-    2f
+  END_FTR_SECTION_NESTED(CPU_FTR_TM, CPU_FTR_TM, 69)
+#endif
         bl      .load_up_altivec
         b       fast_exception_return
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+2:      /* User process was in a transaction */
+        bl      .save_nvgprs
+        DISABLE_INTS
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .altivec_unavailable_tm
+        b       .ret_from_except
+#endif
 1:
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif
@@ -1137,7 +1238,24 @@ vsx_unavailable_common:
 #ifdef CONFIG_VSX
 BEGIN_FTR_SECTION
         beq     1f
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+  BEGIN_FTR_SECTION_NESTED(69)
+        /* Test if 2 TM state bits are zero.  If non-zero (ie. userspace was in
+         * transaction), go do TM stuff
+         */
+        rldicl. r0, r12, (64-MSR_TS_LG), (64-2)
+        bne-    2f
+  END_FTR_SECTION_NESTED(CPU_FTR_TM, CPU_FTR_TM, 69)
+#endif
         b       .load_up_vsx
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+2:      /* User process was in a transaction */
+        bl      .save_nvgprs
+        DISABLE_INTS
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .vsx_unavailable_tm
+        b       .ret_from_except
+#endif
 1:
 END_FTR_SECTION_IFSET(CPU_FTR_VSX)
 #endif
@@ -1148,9 +1266,75 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
         b       .ret_from_except
 
         .align  7
+        .globl tm_unavailable_common
+tm_unavailable_common:
+        EXCEPTION_PROLOG_COMMON(0xf60, PACA_EXGEN)
+        bl      .save_nvgprs
+        DISABLE_INTS
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .tm_unavailable_exception
+        b       .ret_from_except
+
+        .align  7
         .globl  __end_handlers
 __end_handlers:
 
+        /* Equivalents to the above handlers for relocation-on interrupt vectors */
+        STD_RELON_EXCEPTION_HV_OOL(0xe00, h_data_storage)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe00)
+        STD_RELON_EXCEPTION_HV_OOL(0xe20, h_instr_storage)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe20)
+        STD_RELON_EXCEPTION_HV_OOL(0xe40, emulation_assist)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe40)
+        STD_RELON_EXCEPTION_HV_OOL(0xe60, hmi_exception)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe60)
+        MASKABLE_RELON_EXCEPTION_HV_OOL(0xe80, h_doorbell)
+        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe80)
+
+        STD_RELON_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor)
+        STD_RELON_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable)
+        STD_RELON_EXCEPTION_PSERIES_OOL(0xf40, vsx_unavailable)
+        STD_RELON_EXCEPTION_PSERIES_OOL(0xf60, tm_unavailable)
+
+#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV)
+/*
+ * Data area reserved for FWNMI option.
+ * This address (0x7000) is fixed by the RPA.
+ */
+        .= 0x7000
+        .globl fwnmi_data_area
+fwnmi_data_area:
+
+        /* pseries and powernv need to keep the whole page from
+         * 0x7000 to 0x8000 free for use by the firmware
+         */
+        . = 0x8000
+#endif /* defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV) */
+
+/* Space for CPU0's segment table */
+        .balign 4096
+        .globl initial_stab
+initial_stab:
+        .space  4096
+
+#ifdef CONFIG_PPC_POWERNV
+_GLOBAL(opal_mc_secondary_handler)
+        HMT_MEDIUM_PPR_DISCARD
+        SET_SCRATCH0(r13)
+        GET_PACA(r13)
+        clrldi  r3,r3,2
+        tovirt(r3,r3)
+        std     r3,PACA_OPAL_MC_EVT(r13)
+        ld      r13,OPAL_MC_SRR0(r3)
+        mtspr   SPRN_SRR0,r13
+        ld      r13,OPAL_MC_SRR1(r3)
+        mtspr   SPRN_SRR1,r13
+        ld      r3,OPAL_MC_GPR3(r3)
+        GET_SCRATCH0(r13)
+        b       machine_check_pSeries
+#endif /* CONFIG_PPC_POWERNV */
+
+
 /*
  * Hash table stuff
  */
@@ -1222,7 +1406,7 @@ handle_dabr_fault:
         ld      r4,_DAR(r1)
         ld      r5,_DSISR(r1)
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_dabr
+        bl      .do_break
 12:     b       .ret_from_except_lite
 
 
@@ -1344,56 +1528,3 @@ _GLOBAL(do_stab_bolted)
         ld      r13,PACA_EXSLB+EX_R13(r13)
         rfid
         b       .       /* prevent speculative execution */
-
-
-        /* Equivalents to the above handlers for relocation-on interrupt vectors */
-        STD_RELON_EXCEPTION_HV(., 0xe00, h_data_storage)
-        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe00)
-        STD_RELON_EXCEPTION_HV(., 0xe20, h_instr_storage)
-        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe20)
-        STD_RELON_EXCEPTION_HV(., 0xe40, emulation_assist)
-        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe40)
-        STD_RELON_EXCEPTION_HV(., 0xe60, hmi_exception)
-        KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe60)
-
-        STD_RELON_EXCEPTION_PSERIES(., 0xf00, performance_monitor)
-        STD_RELON_EXCEPTION_PSERIES(., 0xf20, altivec_unavailable)
-        STD_RELON_EXCEPTION_PSERIES(., 0xf40, vsx_unavailable)
-
-#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV)
-/*
- * Data area reserved for FWNMI option.
- * This address (0x7000) is fixed by the RPA.
- */
-        .= 0x7000
-        .globl fwnmi_data_area
-fwnmi_data_area:
-
-        /* pseries and powernv need to keep the whole page from
-         * 0x7000 to 0x8000 free for use by the firmware
-         */
-        . = 0x8000
-#endif /* defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV) */
-
-/* Space for CPU0's segment table */
-        .balign 4096
-        .globl initial_stab
-initial_stab:
-        .space  4096
-
-#ifdef CONFIG_PPC_POWERNV
-_GLOBAL(opal_mc_secondary_handler)
-        HMT_MEDIUM
-        SET_SCRATCH0(r13)
-        GET_PACA(r13)
-        clrldi  r3,r3,2
-        tovirt(r3,r3)
-        std     r3,PACA_OPAL_MC_EVT(r13)
-        ld      r13,OPAL_MC_SRR0(r3)
-        mtspr   SPRN_SRR0,r13
-        ld      r13,OPAL_MC_SRR1(r3)
-        mtspr   SPRN_SRR1,r13
-        ld      r3,OPAL_MC_GPR3(r3)
-        GET_SCRATCH0(r13)
-        b       machine_check_pSeries
-#endif /* CONFIG_PPC_POWERNV */
diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S
index e0ada05f2df3..caeaabf11a2f 100644
--- a/arch/powerpc/kernel/fpu.S
+++ b/arch/powerpc/kernel/fpu.S
@@ -35,6 +35,15 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX);					\
 2:      REST_32VSRS(n,c,base);                                          \
 3:
 
+#define __REST_32FPVSRS_TRANSACT(n,c,base)                              \
+BEGIN_FTR_SECTION                                                       \
+        b       2f;                                                     \
+END_FTR_SECTION_IFSET(CPU_FTR_VSX);                                     \
+        REST_32FPRS_TRANSACT(n,base);                                   \
+        b       3f;                                                     \
+2:      REST_32VSRS_TRANSACT(n,c,base);                                 \
+3:
+
 #define __SAVE_32FPVSRS(n,c,base)                                       \
 BEGIN_FTR_SECTION                                                       \
         b       2f;                                                     \
@@ -45,11 +54,68 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX);					\
 3:
 #else
 #define __REST_32FPVSRS(n,b,base)       REST_32FPRS(n, base)
+#define __REST_32FPVSRS_TRANSACT(n,b,base)      REST_32FPRS(n, base)
 #define __SAVE_32FPVSRS(n,b,base)       SAVE_32FPRS(n, base)
 #endif
 #define REST_32FPVSRS(n,c,base) __REST_32FPVSRS(n,__REG_##c,__REG_##base)
+#define REST_32FPVSRS_TRANSACT(n,c,base) \
+        __REST_32FPVSRS_TRANSACT(n,__REG_##c,__REG_##base)
 #define SAVE_32FPVSRS(n,c,base) __SAVE_32FPVSRS(n,__REG_##c,__REG_##base)
 
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+/*
+ * Wrapper to call load_up_fpu from C.
+ * void do_load_up_fpu(struct pt_regs *regs);
+ */
+_GLOBAL(do_load_up_fpu)
+        mflr    r0
+        std     r0, 16(r1)
+        stdu    r1, -112(r1)
+
+        subi    r6, r3, STACK_FRAME_OVERHEAD
+        /* load_up_fpu expects r12=MSR, r13=PACA, and returns
+         * with r12 = new MSR.
+         */
+        ld      r12,_MSR(r6)
+        GET_PACA(r13)
+
+        bl      load_up_fpu
+        std     r12,_MSR(r6)
+
+        ld      r0, 112+16(r1)
+        addi    r1, r1, 112
+        mtlr    r0
+        blr
+
+
+/* void do_load_up_transact_fpu(struct thread_struct *thread)
+ *
+ * This is similar to load_up_fpu but for the transactional version of the FP
+ * register set.  It doesn't mess with the task MSR or valid flags.
+ * Furthermore, we don't do lazy FP with TM currently.
+ */
+_GLOBAL(do_load_up_transact_fpu)
+        mfmsr   r6
+        ori     r5,r6,MSR_FP
+#ifdef CONFIG_VSX
+BEGIN_FTR_SECTION
+        oris    r5,r5,MSR_VSX@h
+END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif
+        SYNC
+        MTMSRD(r5)
+
+        lfd     fr0,THREAD_TRANSACT_FPSCR(r3)
+        MTFSF_L(fr0)
+        REST_32FPVSRS_TRANSACT(0, R4, R3)
+
+        /* FP/VSX off again */
+        MTMSRD(r6)
+        SYNC
+
+        blr
+#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
+
 /*
  * This task wants to use the FPU now.
  * On UP, disable FP for the task which had the FPU previously,
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index 4989661b710b..8a9b6f59822d 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -430,30 +430,18 @@ label:
         EXCEPTION(0x0F00, Trap_0F, unknown_exception, EXC_XFER_EE)
 
 /* 0x1000 - Programmable Interval Timer (PIT) Exception */
-        START_EXCEPTION(0x1000, Decrementer)
-        NORMAL_EXCEPTION_PROLOG
-        lis     r0,TSR_PIS@h
-        mtspr   SPRN_TSR,r0             /* Clear the PIT exception */
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        EXC_XFER_LITE(0x1000, timer_interrupt)
-
-#if 0
-/* NOTE:
- * FIT and WDT handlers are not implemented yet.
- */
+        . = 0x1000
+        b Decrementer
 
 /* 0x1010 - Fixed Interval Timer (FIT) Exception
 */
-        STND_EXCEPTION(0x1010,  FITException,           unknown_exception)
+        . = 0x1010
+        b FITException
 
 /* 0x1020 - Watchdog Timer (WDT) Exception
 */
-#ifdef CONFIG_BOOKE_WDT
-        CRITICAL_EXCEPTION(0x1020, WDTException, WatchdogException)
-#else
-        CRITICAL_EXCEPTION(0x1020, WDTException, unknown_exception)
-#endif
-#endif
+        . = 0x1020
+        b WDTException
 
 /* 0x1100 - Data TLB Miss Exception
  * As the name implies, translation is not in the MMU, so search the
@@ -738,6 +726,29 @@ label:
                 (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), \
                 NOCOPY, crit_transfer_to_handler, ret_from_crit_exc)
 
+        /* Programmable Interval Timer (PIT) Exception. (from 0x1000) */
+Decrementer:
+        NORMAL_EXCEPTION_PROLOG
+        lis     r0,TSR_PIS@h
+        mtspr   SPRN_TSR,r0             /* Clear the PIT exception */
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        EXC_XFER_LITE(0x1000, timer_interrupt)
+
+        /* Fixed Interval Timer (FIT) Exception. (from 0x1010) */
+FITException:
+        NORMAL_EXCEPTION_PROLOG
+        addi    r3,r1,STACK_FRAME_OVERHEAD;
+        EXC_XFER_EE(0x1010, unknown_exception)
+
+        /* Watchdog Timer (WDT) Exception. (from 0x1020) */
+WDTException:
+        CRITICAL_EXCEPTION_PROLOG;
+        addi    r3,r1,STACK_FRAME_OVERHEAD;
+        EXC_XFER_TEMPLATE(WatchdogException, 0x1020+2,
+                          (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)),
+                          NOCOPY, crit_transfer_to_handler,
+                          ret_from_crit_exc)
+
 /*
  * The other Data TLB exceptions bail out to this point
  * if they can't resolve the lightweight TLB fault.
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 116f0868695b..0886ae6dd5be 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -122,6 +122,8 @@ __secondary_hold:
 #endif
         /* Grab our physical cpu number */
         mr      r24,r3
+        /* stash r4 for book3e */
+        mr      r25,r4
 
         /* Tell the master cpu we're here */
         /* Relocation is off & we are located at an address less */
@@ -129,16 +131,31 @@ __secondary_hold:
         std     r24,__secondary_hold_acknowledge-_stext(0)
         sync
 
+        li      r26,0
+#ifdef CONFIG_PPC_BOOK3E
+        tovirt(r26,r26)
+#endif
         /* All secondary cpus wait here until told to start. */
-100:    ld      r4,__secondary_hold_spinloop-_stext(0)
+100:    ld      r4,__secondary_hold_spinloop-_stext(r26)
         cmpdi   0,r4,0
         beq     100b
 
 #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
+#ifdef CONFIG_PPC_BOOK3E
+        tovirt(r4,r4)
+#endif
         ld      r4,0(r4)                /* deref function descriptor */
         mtctr   r4
         mr      r3,r24
+        /*
+         * it may be the case that other platforms have r4 right to
+         * begin with, this gives us some safety in case it is not
+         */
+#ifdef CONFIG_PPC_BOOK3E
+        mr      r4,r25
+#else
         li      r4,0
+#endif
         /* Make sure that patched code is visible */
         isync
         bctr
@@ -169,6 +186,7 @@ _GLOBAL(generic_secondary_thread_init)
 
         /* get a valid TOC pointer, wherever we're mapped at */
         bl      .relative_toc
+        tovirt(r2,r2)
 
 #ifdef CONFIG_PPC_BOOK3E
         /* Book3E initialization */
@@ -195,6 +213,7 @@ _GLOBAL(generic_secondary_smp_init)
 
         /* get a valid TOC pointer, wherever we're mapped at */
         bl      .relative_toc
+        tovirt(r2,r2)
 
 #ifdef CONFIG_PPC_BOOK3E
         /* Book3E initialization */
@@ -531,6 +550,7 @@ _GLOBAL(pmac_secondary_start)
 
         /* get TOC pointer (real address) */
         bl      .relative_toc
+        tovirt(r2,r2)
 
         /* Copy some CPU settings from CPU 0 */
         bl      .__restore_cpu_ppc970
@@ -665,6 +685,13 @@ _GLOBAL(enable_64b_mode)
  * This puts the TOC pointer into r2, offset by 0x8000 (as expected
  * by the toolchain).  It computes the correct value for wherever we
  * are running at the moment, using position-independent code.
+ *
+ * Note: The compiler constructs pointers using offsets from the
+ * TOC in -mcmodel=medium mode. After we relocate to 0 but before
+ * the MMU is on we need our TOC to be a virtual address otherwise
+ * these pointers will be real addresses which may get stored and
+ * accessed later with the MMU on. We use tovirt() at the call
+ * sites to handle this.
  */
 _GLOBAL(relative_toc)
         mflr    r0
@@ -681,8 +708,9 @@ p_toc:	.llong	__toc_start + 0x8000 - 0b
  * This is where the main kernel code starts.
  */
 _INIT_STATIC(start_here_multiplatform)
-        /* set up the TOC (real address) */
-        bl      .relative_toc
+        /* set up the TOC */
+        bl      .relative_toc
+        tovirt(r2,r2)
 
         /* Clear out the BSS. It may have been done in prom_init,
          * already but that's irrelevant since prom_init will soon
diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c
index a89cae481b04..a949bdfc9623 100644
--- a/arch/powerpc/kernel/hw_breakpoint.c
+++ b/arch/powerpc/kernel/hw_breakpoint.c
@@ -73,7 +73,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp)
          * If so, DABR will be populated in single_step_dabr_instruction().
          */
         if (current->thread.last_hit_ubp != bp)
-                set_dabr(info->address | info->type | DABR_TRANSLATION, info->dabrx);
+                set_breakpoint(info);
 
         return 0;
 }
@@ -97,7 +97,7 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp)
         }
 
         *slot = NULL;
-        set_dabr(0, 0);
+        hw_breakpoint_disable();
 }
 
 /*
@@ -127,19 +127,13 @@ int arch_check_bp_in_kernelspace(struct perf_event *bp)
 
 int arch_bp_generic_fields(int type, int *gen_bp_type)
 {
-        switch (type) {
-        case DABR_DATA_READ:
-                *gen_bp_type = HW_BREAKPOINT_R;
-                break;
-        case DABR_DATA_WRITE:
-                *gen_bp_type = HW_BREAKPOINT_W;
-                break;
-        case (DABR_DATA_WRITE | DABR_DATA_READ):
-                *gen_bp_type = (HW_BREAKPOINT_W | HW_BREAKPOINT_R);
-                break;
-        default:
+        *gen_bp_type = 0;
+        if (type & HW_BRK_TYPE_READ)
+                *gen_bp_type |= HW_BREAKPOINT_R;
+        if (type & HW_BRK_TYPE_WRITE)
+                *gen_bp_type |= HW_BREAKPOINT_W;
+        if (*gen_bp_type == 0)
                 return -EINVAL;
-        }
         return 0;
 }
 
@@ -148,35 +142,28 @@ int arch_bp_generic_fields(int type, int *gen_bp_type)
  */
 int arch_validate_hwbkpt_settings(struct perf_event *bp)
 {
-        int ret = -EINVAL;
+        int ret = -EINVAL, length_max;
         struct arch_hw_breakpoint *info = counter_arch_bp(bp);
 
         if (!bp)
                 return ret;
 
-        switch (bp->attr.bp_type) {
-        case HW_BREAKPOINT_R:
-                info->type = DABR_DATA_READ;
-                break;
-        case HW_BREAKPOINT_W:
-                info->type = DABR_DATA_WRITE;
-                break;
-        case HW_BREAKPOINT_R | HW_BREAKPOINT_W:
-                info->type = (DABR_DATA_READ | DABR_DATA_WRITE);
-                break;
-        default:
+        info->type = HW_BRK_TYPE_TRANSLATE;
+        if (bp->attr.bp_type & HW_BREAKPOINT_R)
+                info->type |= HW_BRK_TYPE_READ;
+        if (bp->attr.bp_type & HW_BREAKPOINT_W)
+                info->type |= HW_BRK_TYPE_WRITE;
+        if (info->type == HW_BRK_TYPE_TRANSLATE)
+                /* must set alteast read or write */
                 return ret;
-        }
-
+        if (!(bp->attr.exclude_user))
+                info->type |= HW_BRK_TYPE_USER;
+        if (!(bp->attr.exclude_kernel))
+                info->type |= HW_BRK_TYPE_KERNEL;
+        if (!(bp->attr.exclude_hv))
+                info->type |= HW_BRK_TYPE_HYP;
         info->address = bp->attr.bp_addr;
         info->len = bp->attr.bp_len;
-        info->dabrx = DABRX_ALL;
-        if (bp->attr.exclude_user)
-                info->dabrx &= ~DABRX_USER;
-        if (bp->attr.exclude_kernel)
-                info->dabrx &= ~DABRX_KERNEL;
-        if (bp->attr.exclude_hv)
-                info->dabrx &= ~DABRX_HYP;
 
         /*
          * Since breakpoint length can be a maximum of HW_BREAKPOINT_LEN(8)
@@ -184,8 +171,16 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
          * HW_BREAKPOINT_ALIGN by rounding off to the lower address, the
          * 'symbolsize' should satisfy the check below.
          */
+        length_max = 8; /* DABR */
+        if (cpu_has_feature(CPU_FTR_DAWR)) {
+                length_max = 512 ; /* 64 doublewords */
+                /* DAWR region can't cross 512 boundary */
+                if ((bp->attr.bp_addr >> 10) != 
+                    ((bp->attr.bp_addr + bp->attr.bp_len) >> 10))
+                        return -EINVAL;
+        }
         if (info->len >
-            (HW_BREAKPOINT_LEN - (info->address & HW_BREAKPOINT_ALIGN)))
+            (length_max - (info->address & HW_BREAKPOINT_ALIGN)))
                 return -EINVAL;
         return 0;
 }
@@ -204,7 +199,7 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)
 
         info = counter_arch_bp(tsk->thread.last_hit_ubp);
         regs->msr &= ~MSR_SE;
-        set_dabr(info->address | info->type | DABR_TRANSLATION, info->dabrx);
+        set_breakpoint(info);
         tsk->thread.last_hit_ubp = NULL;
 }
 
@@ -222,7 +217,7 @@ int __kprobes hw_breakpoint_handler(struct die_args *args)
         unsigned long dar = regs->dar;
 
         /* Disable breakpoints during exception handling */
-        set_dabr(0, 0);
+        hw_breakpoint_disable();
 
         /*
          * The counter may be concurrently released but that can only
@@ -255,8 +250,9 @@ int __kprobes hw_breakpoint_handler(struct die_args *args)
          * we still need to single-step the instruction, but we don't
          * generate an event.
          */
-        info->extraneous_interrupt = !((bp->attr.bp_addr <= dar) &&
-                        (dar - bp->attr.bp_addr < bp->attr.bp_len));
+        if (!((bp->attr.bp_addr <= dar) &&
+              (dar - bp->attr.bp_addr < bp->attr.bp_len)))
+                info->type |= HW_BRK_TYPE_EXTRANEOUS_IRQ;
 
         /* Do not emulate user-space instructions, instead single-step them */
         if (user_mode(regs)) {
@@ -285,10 +281,10 @@ int __kprobes hw_breakpoint_handler(struct die_args *args)
          * As a policy, the callback is invoked in a 'trigger-after-execute'
          * fashion
          */
-        if (!info->extraneous_interrupt)
+        if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))
                 perf_bp_event(bp, regs);
 
-        set_dabr(info->address | info->type | DABR_TRANSLATION, info->dabrx);
+        set_breakpoint(info);
 out:
         rcu_read_unlock();
         return rc;
@@ -317,10 +313,10 @@ int __kprobes single_step_dabr_instruction(struct die_args *args)
          * We shall invoke the user-defined callback function in the single
          * stepping handler to confirm to 'trigger-after-execute' semantics
          */
-        if (!info->extraneous_interrupt)
+        if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))
                 perf_bp_event(bp, regs);
 
-        set_dabr(info->address | info->type | DABR_TRANSLATION, info->dabrx);
+        set_breakpoint(info);
         current->thread.last_hit_ubp = NULL;
 
         /*
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index c862fd716fe3..31c4fdc6859c 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -717,6 +717,13 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name)
                 return;
         }
 
+        /*
+         * In case we have reserved the first bit, we should not emit
+         * the warning below.
+         */
+        if (tbl->it_offset == 0)
+                clear_bit(0, tbl->it_map);
+
         /* verify that table contains no entries */
         if (!bitmap_empty(tbl->it_map, tbl->it_size))
                 pr_warn("%s: Unexpected TCEs for %s\n", __func__, node_name);
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 71413f41278f..4f97fe345526 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -122,8 +122,8 @@ static inline notrace int decrementer_check_overflow(void)
 }
 
 /* This is called whenever we are re-enabling interrupts
- * and returns either 0 (nothing to do) or 500/900 if there's
- * either an EE or a DEC to generate.
+ * and returns either 0 (nothing to do) or 500/900/280/a00/e80 if
+ * there's an EE, DEC or DBELL to generate.
  *
  * This is called in two contexts: From arch_local_irq_restore()
  * before soft-enabling interrupts, and from the exception exit
@@ -182,6 +182,13 @@ notrace unsigned int __check_irq_replay(void)
         local_paca->irq_happened &= ~PACA_IRQ_DBELL;
         if (happened & PACA_IRQ_DBELL)
                 return 0x280;
+#else
+        local_paca->irq_happened &= ~PACA_IRQ_DBELL;
+        if (happened & PACA_IRQ_DBELL) {
+                if (cpu_has_feature(CPU_FTR_HVMODE))
+                        return 0xe80;
+                return 0xa00;
+        }
 #endif /* CONFIG_PPC_BOOK3E */
 
         /* There should be nothing left ! */
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
index a7bc7521c064..5ca82cd4a374 100644
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -199,7 +199,7 @@ static int kgdb_iabr_match(struct pt_regs *regs)
         return 1;
 }
 
-static int kgdb_dabr_match(struct pt_regs *regs)
+static int kgdb_break_match(struct pt_regs *regs)
 {
         if (user_mode(regs))
                 return 0;
@@ -459,7 +459,7 @@ static void *old__debugger;
 static void *old__debugger_bpt;
 static void *old__debugger_sstep;
 static void *old__debugger_iabr_match;
-static void *old__debugger_dabr_match;
+static void *old__debugger_break_match;
 static void *old__debugger_fault_handler;
 
 int kgdb_arch_init(void)
@@ -469,7 +469,7 @@ int kgdb_arch_init(void)
         old__debugger_bpt = __debugger_bpt;
         old__debugger_sstep = __debugger_sstep;
         old__debugger_iabr_match = __debugger_iabr_match;
-        old__debugger_dabr_match = __debugger_dabr_match;
+        old__debugger_break_match = __debugger_break_match;
         old__debugger_fault_handler = __debugger_fault_handler;
 
         __debugger_ipi = kgdb_call_nmi_hook;
@@ -477,7 +477,7 @@ int kgdb_arch_init(void)
         __debugger_bpt = kgdb_handle_breakpoint;
         __debugger_sstep = kgdb_singlestep;
         __debugger_iabr_match = kgdb_iabr_match;
-        __debugger_dabr_match = kgdb_dabr_match;
+        __debugger_break_match = kgdb_break_match;
         __debugger_fault_handler = kgdb_not_implemented;
 
         return 0;
@@ -490,6 +490,6 @@ void kgdb_arch_exit(void)
         __debugger_bpt = old__debugger_bpt;
         __debugger_sstep = old__debugger_sstep;
         __debugger_iabr_match = old__debugger_iabr_match;
-        __debugger_dabr_match = old__debugger_dabr_match;
+        __debugger_break_match = old__debugger_break_match;
         __debugger_fault_handler = old__debugger_fault_handler;
 }
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 7206701b1ff1..466a2908bb63 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -162,6 +162,8 @@ static int kexec_all_irq_disabled = 0;
 static void kexec_smp_down(void *arg)
 {
         local_irq_disable();
+        hard_irq_disable();
+
         mb(); /* make sure our irqs are disabled before we say they are */
         get_paca()->kexec_state = KEXEC_STATE_IRQS_OFF;
         while(kexec_all_irq_disabled == 0)
@@ -244,6 +246,8 @@ static void kexec_prepare_cpus(void)
         wake_offline_cpus();
         smp_call_function(kexec_smp_down, NULL, /* wait */0);
         local_irq_disable();
+        hard_irq_disable();
+
         mb(); /* make sure IRQs are disabled before we say they are */
         get_paca()->kexec_state = KEXEC_STATE_IRQS_OFF;
 
@@ -281,6 +285,7 @@ static void kexec_prepare_cpus(void)
         if (ppc_md.kexec_cpu_down)
                 ppc_md.kexec_cpu_down(0, 0);
         local_irq_disable();
+        hard_irq_disable();
 }
 
 #endif /* SMP */
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index 9f44a775a106..6ee59a0eb268 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -386,6 +386,14 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
                                 | (value & 0xffff);
                         break;
 
+                case R_PPC64_TOC16_LO:
+                        /* Subtract TOC pointer */
+                        value -= my_r2(sechdrs, me);
+                        *((uint16_t *) location)
+                                = (*((uint16_t *) location) & ~0xffff)
+                                | (value & 0xffff);
+                        break;
+
                 case R_PPC64_TOC16_DS:
                         /* Subtract TOC pointer */
                         value -= my_r2(sechdrs, me);
@@ -399,6 +407,28 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
                                 | (value & 0xfffc);
                         break;
 
+                case R_PPC64_TOC16_LO_DS:
+                        /* Subtract TOC pointer */
+                        value -= my_r2(sechdrs, me);
+                        if ((value & 3) != 0) {
+                                printk("%s: bad TOC16_LO_DS relocation (%lu)\n",
+                                       me->name, value);
+                                return -ENOEXEC;
+                        }
+                        *((uint16_t *) location)
+                                = (*((uint16_t *) location) & ~0xfffc)
+                                | (value & 0xfffc);
+                        break;
+
+                case R_PPC64_TOC16_HA:
+                        /* Subtract TOC pointer */
+                        value -= my_r2(sechdrs, me);
+                        value = ((value + 0x8000) >> 16);
+                        *((uint16_t *) location)
+                                = (*((uint16_t *) location) & ~0xffff)
+                                | (value & 0xffff);
+                        break;
+
                 case R_PPC_REL24:
                         /* FIXME: Handle weak symbols here --RR */
                         if (sym->st_shndx == SHN_UNDEF) {
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 07c12697d708..a7b743076720 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -71,10 +71,8 @@ static int of_pci_phb_probe(struct platform_device *dev)
         eeh_dev_phb_init_dynamic(phb);
 
         /* Register devices with EEH */
-#ifdef CONFIG_EEH
         if (dev->dev.of_node->child)
                 eeh_add_device_tree_early(dev->dev.of_node);
-#endif /* CONFIG_EEH */
 
         /* Scan the bus */
         pcibios_scan_phb(phb);
@@ -88,13 +86,14 @@ static int of_pci_phb_probe(struct platform_device *dev)
         pcibios_claim_one_bus(phb->bus);
 
         /* Finish EEH setup */
-#ifdef CONFIG_EEH
         eeh_add_device_tree_late(phb->bus);
-#endif
 
         /* Add probed PCI devices to the device model */
         pci_bus_add_devices(phb->bus);
 
+        /* sysfs files should only be added after devices are added */
+        eeh_add_sysfs_files(phb->bus);
+
         return 0;
 }
 
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index cd6da855090c..f8f24685f10a 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -120,8 +120,6 @@ struct slb_shadow slb_shadow[] __cacheline_aligned = {
 struct paca_struct *paca;
 EXPORT_SYMBOL(paca);
 
-struct paca_struct boot_paca;
-
 void __init initialise_paca(struct paca_struct *new_paca, int cpu)
 {
        /* The TOC register (GPR2) points 32kB into the TOC, so that 64kB
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7c37379ea9b1..fa12ae42d98c 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1477,11 +1477,14 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
         pcibios_allocate_bus_resources(bus);
         pcibios_claim_one_bus(bus);
 
+        /* Fixup EEH */
+        eeh_add_device_tree_late(bus);
+
         /* Add new devices to global lists.  Register in proc, sysfs. */
         pci_bus_add_devices(bus);
 
-        /* Fixup EEH */
-        eeh_add_device_tree_late(bus);
+        /* sysfs files should only be added after devices are added */
+        eeh_add_sysfs_files(bus);
 }
 EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
 
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 81430674e71c..59dd545fdde1 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -50,6 +50,7 @@
 #include <asm/runlatch.h>
 #include <asm/syscalls.h>
 #include <asm/switch_to.h>
+#include <asm/tm.h>
 #include <asm/debug.h>
 #ifdef CONFIG_PPC64
 #include <asm/firmware.h>
@@ -57,6 +58,13 @@
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
 
+/* Transactional Memory debug */
+#ifdef TM_DEBUG_SW
+#define TM_DEBUG(x...) printk(KERN_INFO x)
+#else
+#define TM_DEBUG(x...) do { } while(0)
+#endif
+
 extern unsigned long _get_SP(void);
 
 #ifndef CONFIG_SMP
@@ -271,7 +279,7 @@ void do_send_trap(struct pt_regs *regs, unsigned long address,
         force_sig_info(SIGTRAP, &info, current);
 }
 #else   /* !CONFIG_PPC_ADV_DEBUG_REGS */
-void do_dabr(struct pt_regs *regs, unsigned long address,
+void do_break (struct pt_regs *regs, unsigned long address,
                     unsigned long error_code)
 {
         siginfo_t info;
@@ -281,11 +289,11 @@ void do_dabr(struct pt_regs *regs, unsigned long address,
                         11, SIGSEGV) == NOTIFY_STOP)
                 return;
 
-        if (debugger_dabr_match(regs))
+        if (debugger_break_match(regs))
                 return;
 
-        /* Clear the DABR */
-        set_dabr(0, 0);
+        /* Clear the breakpoint */
+        hw_breakpoint_disable();
 
         /* Deliver the signal to userspace */
         info.si_signo = SIGTRAP;
@@ -296,7 +304,7 @@ void do_dabr(struct pt_regs *regs, unsigned long address,
 }
 #endif  /* CONFIG_PPC_ADV_DEBUG_REGS */
 
-static DEFINE_PER_CPU(unsigned long, current_dabr);
+static DEFINE_PER_CPU(struct arch_hw_breakpoint, current_brk);
 
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
 /*
@@ -364,39 +372,214 @@ static void switch_booke_debug_regs(struct thread_struct *new_thread)
 #ifndef CONFIG_HAVE_HW_BREAKPOINT
 static void set_debug_reg_defaults(struct thread_struct *thread)
 {
-        if (thread->dabr) {
-                thread->dabr = 0;
-                thread->dabrx = 0;
-                set_dabr(0, 0);
-        }
+        thread->hw_brk.address = 0;
+        thread->hw_brk.type = 0;
+        set_breakpoint(&thread->hw_brk);
 }
 #endif /* !CONFIG_HAVE_HW_BREAKPOINT */
 #endif  /* CONFIG_PPC_ADV_DEBUG_REGS */
 
-int set_dabr(unsigned long dabr, unsigned long dabrx)
-{
-        __get_cpu_var(current_dabr) = dabr;
-
-        if (ppc_md.set_dabr)
-                return ppc_md.set_dabr(dabr, dabrx);
-
-        /* XXX should we have a CPU_FTR_HAS_DABR ? */
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
+static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
+{
         mtspr(SPRN_DAC1, dabr);
 #ifdef CONFIG_PPC_47x
         isync();
 #endif
+        return 0;
+}
 #elif defined(CONFIG_PPC_BOOK3S)
+static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
+{
         mtspr(SPRN_DABR, dabr);
         mtspr(SPRN_DABRX, dabrx);
+        return 0;
+}
+#else
+static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
+{
+        return -EINVAL;
+}
 #endif
+
+static inline int set_dabr(struct arch_hw_breakpoint *brk)
+{
+        unsigned long dabr, dabrx;
+
+        dabr = brk->address | (brk->type & HW_BRK_TYPE_DABR);
+        dabrx = ((brk->type >> 3) & 0x7);
+
+        if (ppc_md.set_dabr)
+                return ppc_md.set_dabr(dabr, dabrx);
+
+        return __set_dabr(dabr, dabrx);
+}
+
+static inline int set_dawr(struct arch_hw_breakpoint *brk)
+{
+        unsigned long dawr, dawrx, mrd;
+
+        dawr = brk->address;
+
+        dawrx  = (brk->type & (HW_BRK_TYPE_READ | HW_BRK_TYPE_WRITE)) \
+                                   << (63 - 58); //* read/write bits */
+        dawrx |= ((brk->type & (HW_BRK_TYPE_TRANSLATE)) >> 2) \
+                                   << (63 - 59); //* translate */
+        dawrx |= (brk->type & (HW_BRK_TYPE_PRIV_ALL)) \
+                                   >> 3; //* PRIM bits */
+        /* dawr length is stored in field MDR bits 48:53.  Matches range in
+           doublewords (64 bits) baised by -1 eg. 0b000000=1DW and
+           0b111111=64DW.
+           brk->len is in bytes.
+           This aligns up to double word size, shifts and does the bias.
+        */
+        mrd = ((brk->len + 7) >> 3) - 1;
+        dawrx |= (mrd & 0x3f) << (63 - 53);
+
+        if (ppc_md.set_dawr)
+                return ppc_md.set_dawr(dawr, dawrx);
+        mtspr(SPRN_DAWR, dawr);
+        mtspr(SPRN_DAWRX, dawrx);
         return 0;
 }
 
+int set_breakpoint(struct arch_hw_breakpoint *brk)
+{
+        __get_cpu_var(current_brk) = *brk;
+
+        if (cpu_has_feature(CPU_FTR_DAWR))
+                return set_dawr(brk);
+
+        return set_dabr(brk);
+}
+
 #ifdef CONFIG_PPC64
 DEFINE_PER_CPU(struct cpu_usage, cpu_usage_array);
 #endif
 
+static inline bool hw_brk_match(struct arch_hw_breakpoint *a,
+                              struct arch_hw_breakpoint *b)
+{
+        if (a->address != b->address)
+                return false;
+        if (a->type != b->type)
+                return false;
+        if (a->len != b->len)
+                return false;
+        return true;
+}
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+static inline void tm_reclaim_task(struct task_struct *tsk)
+{
+        /* We have to work out if we're switching from/to a task that's in the
+         * middle of a transaction.
+         *
+         * In switching we need to maintain a 2nd register state as
+         * oldtask->thread.ckpt_regs.  We tm_reclaim(oldproc); this saves the
+         * checkpointed (tbegin) state in ckpt_regs and saves the transactional
+         * (current) FPRs into oldtask->thread.transact_fpr[].
+         *
+         * We also context switch (save) TFHAR/TEXASR/TFIAR in here.
+         */
+        struct thread_struct *thr = &tsk->thread;
+
+        if (!thr->regs)
+                return;
+
+        if (!MSR_TM_ACTIVE(thr->regs->msr))
+                goto out_and_saveregs;
+
+        /* Stash the original thread MSR, as giveup_fpu et al will
+         * modify it.  We hold onto it to see whether the task used
+         * FP & vector regs.
+         */
+        thr->tm_orig_msr = thr->regs->msr;
+
+        TM_DEBUG("--- tm_reclaim on pid %d (NIP=%lx, "
+                 "ccr=%lx, msr=%lx, trap=%lx)\n",
+                 tsk->pid, thr->regs->nip,
+                 thr->regs->ccr, thr->regs->msr,
+                 thr->regs->trap);
+
+        tm_reclaim(thr, thr->regs->msr, TM_CAUSE_RESCHED);
+
+        TM_DEBUG("--- tm_reclaim on pid %d complete\n",
+                 tsk->pid);
+
+out_and_saveregs:
+        /* Always save the regs here, even if a transaction's not active.
+         * This context-switches a thread's TM info SPRs.  We do it here to
+         * be consistent with the restore path (in recheckpoint) which
+         * cannot happen later in _switch().
+         */
+        tm_save_sprs(thr);
+}
+
+static inline void tm_recheckpoint_new_task(struct task_struct *new)
+{
+        unsigned long msr;
+
+        if (!cpu_has_feature(CPU_FTR_TM))
+                return;
+
+        /* Recheckpoint the registers of the thread we're about to switch to.
+         *
+         * If the task was using FP, we non-lazily reload both the original and
+         * the speculative FP register states.  This is because the kernel
+         * doesn't see if/when a TM rollback occurs, so if we take an FP
+         * unavoidable later, we are unable to determine which set of FP regs
+         * need to be restored.
+         */
+        if (!new->thread.regs)
+                return;
+
+        /* The TM SPRs are restored here, so that TEXASR.FS can be set
+         * before the trecheckpoint and no explosion occurs.
+         */
+        tm_restore_sprs(&new->thread);
+
+        if (!MSR_TM_ACTIVE(new->thread.regs->msr))
+                return;
+        msr = new->thread.tm_orig_msr;
+        /* Recheckpoint to restore original checkpointed register state. */
+        TM_DEBUG("*** tm_recheckpoint of pid %d "
+                 "(new->msr 0x%lx, new->origmsr 0x%lx)\n",
+                 new->pid, new->thread.regs->msr, msr);
+
+        /* This loads the checkpointed FP/VEC state, if used */
+        tm_recheckpoint(&new->thread, msr);
+
+        /* This loads the speculative FP/VEC state, if used */
+        if (msr & MSR_FP) {
+                do_load_up_transact_fpu(&new->thread);
+                new->thread.regs->msr |=
+                        (MSR_FP | new->thread.fpexc_mode);
+        }
+        if (msr & MSR_VEC) {
+                do_load_up_transact_altivec(&new->thread);
+                new->thread.regs->msr |= MSR_VEC;
+        }
+        /* We may as well turn on VSX too since all the state is restored now */
+        if (msr & MSR_VSX)
+                new->thread.regs->msr |= MSR_VSX;
+
+        TM_DEBUG("*** tm_recheckpoint of pid %d complete "
+                 "(kernel msr 0x%lx)\n",
+                 new->pid, mfmsr());
+}
+
+static inline void __switch_to_tm(struct task_struct *prev)
+{
+        if (cpu_has_feature(CPU_FTR_TM)) {
+                tm_enable();
+                tm_reclaim_task(prev);
+        }
+}
+#else
+#define tm_recheckpoint_new_task(new)
+#define __switch_to_tm(prev)
+#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
+
 struct task_struct *__switch_to(struct task_struct *prev,
         struct task_struct *new)
 {
@@ -407,6 +590,8 @@ struct task_struct *__switch_to(struct task_struct *prev,
         struct ppc64_tlb_batch *batch;
 #endif
 
+        __switch_to_tm(prev);
+
 #ifdef CONFIG_SMP
         /* avoid complexity of lazy save/restore of fpu
          * by just saving it every time we switch out if
@@ -481,8 +666,8 @@ struct task_struct *__switch_to(struct task_struct *prev,
  * schedule DABR
  */
 #ifndef CONFIG_HAVE_HW_BREAKPOINT
-        if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr))
-                set_dabr(new->thread.dabr, new->thread.dabrx);
+        if (unlikely(hw_brk_match(&__get_cpu_var(current_brk), &new->thread.hw_brk)))
+                set_breakpoint(&new->thread.hw_brk);
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
 #endif
 
@@ -522,6 +707,9 @@ struct task_struct *__switch_to(struct task_struct *prev,
          * of sync. Hard disable here.
          */
         hard_irq_disable();
+
+        tm_recheckpoint_new_task(new);
+
         last = _switch(old_thread, new_thread);
 
 #ifdef CONFIG_PPC_BOOK3S_64
@@ -683,6 +871,9 @@ void show_regs(struct pt_regs * regs)
         printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
         printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
 #endif
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch);
+#endif
         show_stack(current, (unsigned long *) regs->gpr[1]);
         if (!user_mode(regs))
                 show_instructions(regs);
@@ -813,6 +1004,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
                 p->thread.dscr_inherit = current->thread.dscr_inherit;
                 p->thread.dscr = current->thread.dscr;
         }
+        if (cpu_has_feature(CPU_FTR_HAS_PPR))
+                p->thread.ppr = INIT_PPR;
 #endif
         /*
          * The PPC64 ABI makes use of a TOC to contain function 
@@ -892,7 +1085,6 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
                 regs->msr = MSR_USER32;
         }
 #endif
-
         discard_lazy_cpu_state();
 #ifdef CONFIG_VSX
         current->thread.used_vsr = 0;
@@ -912,6 +1104,13 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
         current->thread.spefscr = 0;
         current->thread.used_spe = 0;
 #endif /* CONFIG_SPE */
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        if (cpu_has_feature(CPU_FTR_TM))
+                regs->msr |= MSR_TM;
+        current->thread.tm_tfhar = 0;
+        current->thread.tm_texasr = 0;
+        current->thread.tm_tfiar = 0;
+#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
 }
 
 #define PR_FP_ALL_EXCEPT (PR_FP_EXC_DIV | PR_FP_EXC_OVF | PR_FP_EXC_UND \
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 779f34049a56..7f7fb7fd991b 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -66,8 +66,8 @@
  * is running at whatever address it has been loaded at.
  * On ppc32 we compile with -mrelocatable, which means that references
  * to extern and static variables get relocated automatically.
- * On ppc64 we have to relocate the references explicitly with
- * RELOC.  (Note that strings count as static variables.)
+ * ppc64 objects are always relocatable, we just need to relocate the
+ * TOC.
  *
  * Because OF may have mapped I/O devices into the area starting at
  * KERNELBASE, particularly on CHRP machines, we can't safely call
@@ -79,13 +79,11 @@
  * On ppc64, 64 bit values are truncated to 32 bits (and
  * fortunately don't get interpreted as two arguments).
  */
+#define ADDR(x)         (u32)(unsigned long)(x)
+
 #ifdef CONFIG_PPC64
-#define RELOC(x)        (*PTRRELOC(&(x)))
-#define ADDR(x)         (u32) add_reloc_offset((unsigned long)(x))
 #define OF_WORKAROUNDS  0
 #else
-#define RELOC(x)        (x)
-#define ADDR(x)         (u32) (x)
 #define OF_WORKAROUNDS  of_workarounds
 int of_workarounds;
 #endif
@@ -95,7 +93,7 @@ int of_workarounds;
 
 #define PROM_BUG() do {                                         \
         prom_printf("kernel BUG at %s line 0x%x!\n",            \
-                    RELOC(__FILE__), __LINE__);                 \
+                    __FILE__, __LINE__);                        \
         __asm__ __volatile__(".long " BUG_ILLEGAL_INSTR);       \
 } while (0)
 
@@ -233,7 +231,7 @@ static int __init call_prom(const char *service, int nargs, int nret, ...)
         for (i = 0; i < nret; i++)
                 args.args[nargs+i] = 0;
 
-        if (enter_prom(&args, RELOC(prom_entry)) < 0)
+        if (enter_prom(&args, prom_entry) < 0)
                 return PROM_ERROR;
 
         return (nret > 0) ? args.args[nargs] : 0;
@@ -258,7 +256,7 @@ static int __init call_prom_ret(const char *service, int nargs, int nret,
         for (i = 0; i < nret; i++)
                 args.args[nargs+i] = 0;
 
-        if (enter_prom(&args, RELOC(prom_entry)) < 0)
+        if (enter_prom(&args, prom_entry) < 0)
                 return PROM_ERROR;
 
         if (rets != NULL)
@@ -272,20 +270,19 @@ static int __init call_prom_ret(const char *service, int nargs, int nret,
 static void __init prom_print(const char *msg)
 {
         const char *p, *q;
-        struct prom_t *_prom = &RELOC(prom);
 
-        if (_prom->stdout == 0)
+        if (prom.stdout == 0)
                 return;
 
         for (p = msg; *p != 0; p = q) {
                 for (q = p; *q != 0 && *q != '\n'; ++q)
                         ;
                 if (q > p)
-                        call_prom("write", 3, 1, _prom->stdout, p, q - p);
+                        call_prom("write", 3, 1, prom.stdout, p, q - p);
                 if (*q == 0)
                         break;
                 ++q;
-                call_prom("write", 3, 1, _prom->stdout, ADDR("\r\n"), 2);
+                call_prom("write", 3, 1, prom.stdout, ADDR("\r\n"), 2);
         }
 }
 
@@ -294,7 +291,6 @@ static void __init prom_print_hex(unsigned long val)
 {
         int i, nibbles = sizeof(val)*2;
         char buf[sizeof(val)*2+1];
-        struct prom_t *_prom = &RELOC(prom);
 
         for (i = nibbles-1;  i >= 0;  i--) {
                 buf[i] = (val & 0xf) + '0';
@@ -303,7 +299,7 @@ static void __init prom_print_hex(unsigned long val)
                 val >>= 4;
         }
         buf[nibbles] = '\0';
-        call_prom("write", 3, 1, _prom->stdout, buf, nibbles);
+        call_prom("write", 3, 1, prom.stdout, buf, nibbles);
 }
 
 /* max number of decimal digits in an unsigned long */
@@ -312,7 +308,6 @@ static void __init prom_print_dec(unsigned long val)
 {
         int i, size;
         char buf[UL_DIGITS+1];
-        struct prom_t *_prom = &RELOC(prom);
 
         for (i = UL_DIGITS-1; i >= 0;  i--) {
                 buf[i] = (val % 10) + '0';
@@ -322,7 +317,7 @@ static void __init prom_print_dec(unsigned long val)
         }
         /* shift stuff down */
         size = UL_DIGITS - i;
-        call_prom("write", 3, 1, _prom->stdout, buf+i, size);
+        call_prom("write", 3, 1, prom.stdout, buf+i, size);
 }
 
 static void __init prom_printf(const char *format, ...)
@@ -331,22 +326,18 @@ static void __init prom_printf(const char *format, ...)
         va_list args;
         unsigned long v;
         long vs;
-        struct prom_t *_prom = &RELOC(prom);
 
         va_start(args, format);
-#ifdef CONFIG_PPC64
-        format = PTRRELOC(format);
-#endif
         for (p = format; *p != 0; p = q) {
                 for (q = p; *q != 0 && *q != '\n' && *q != '%'; ++q)
                         ;
                 if (q > p)
-                        call_prom("write", 3, 1, _prom->stdout, p, q - p);
+                        call_prom("write", 3, 1, prom.stdout, p, q - p);
                 if (*q == 0)
                         break;
                 if (*q == '\n') {
                         ++q;
-                        call_prom("write", 3, 1, _prom->stdout,
+                        call_prom("write", 3, 1, prom.stdout,
                                   ADDR("\r\n"), 2);
                         continue;
                 }
@@ -368,7 +359,7 @@ static void __init prom_printf(const char *format, ...)
                         ++q;
                         vs = va_arg(args, int);
                         if (vs < 0) {
-                                prom_print(RELOC("-"));
+                                prom_print("-");
                                 vs = -vs;
                         }
                         prom_print_dec(vs);
@@ -389,7 +380,7 @@ static void __init prom_printf(const char *format, ...)
                                 ++q;
                                 vs = va_arg(args, long);
                                 if (vs < 0) {
-                                        prom_print(RELOC("-"));
+                                        prom_print("-");
                                         vs = -vs;
                                 }
                                 prom_print_dec(vs);
@@ -403,7 +394,6 @@ static void __init prom_printf(const char *format, ...)
 static unsigned int __init prom_claim(unsigned long virt, unsigned long size,
                                 unsigned long align)
 {
-        struct prom_t *_prom = &RELOC(prom);
 
         if (align == 0 && (OF_WORKAROUNDS & OF_WA_CLAIM)) {
                 /*
@@ -414,21 +404,21 @@ static unsigned int __init prom_claim(unsigned long virt, unsigned long size,
                 prom_arg_t result;
 
                 ret = call_prom_ret("call-method", 5, 2, &result,
-                                    ADDR("claim"), _prom->memory,
+                                    ADDR("claim"), prom.memory,
                                     align, size, virt);
                 if (ret != 0 || result == -1)
                         return -1;
                 ret = call_prom_ret("call-method", 5, 2, &result,
-                                    ADDR("claim"), _prom->mmumap,
+                                    ADDR("claim"), prom.mmumap,
                                     align, size, virt);
                 if (ret != 0) {
                         call_prom("call-method", 4, 1, ADDR("release"),
-                                  _prom->memory, size, virt);
+                                  prom.memory, size, virt);
                         return -1;
                 }
                 /* the 0x12 is M (coherence) + PP == read/write */
                 call_prom("call-method", 6, 1,
-                          ADDR("map"), _prom->mmumap, 0x12, size, virt, virt);
+                          ADDR("map"), prom.mmumap, 0x12, size, virt, virt);
                 return virt;
         }
         return call_prom("claim", 3, 1, (prom_arg_t)virt, (prom_arg_t)size,
@@ -437,13 +427,10 @@ static unsigned int __init prom_claim(unsigned long virt, unsigned long size,
 
 static void __init __attribute__((noreturn)) prom_panic(const char *reason)
 {
-#ifdef CONFIG_PPC64
-        reason = PTRRELOC(reason);
-#endif
         prom_print(reason);
         /* Do not call exit because it clears the screen on pmac
          * it also causes some sort of double-fault on early pmacs */
-        if (RELOC(of_platform) == PLATFORM_POWERMAC)
+        if (of_platform == PLATFORM_POWERMAC)
                 asm("trap\n");
 
         /* ToDo: should put up an SRC here on pSeries */
@@ -525,13 +512,13 @@ static int __init prom_setprop(phandle node, const char *nodename,
         add_string(&p, tohex((u32)(unsigned long) value));
         add_string(&p, tohex(valuelen));
         add_string(&p, tohex(ADDR(pname)));
-        add_string(&p, tohex(strlen(RELOC(pname))));
+        add_string(&p, tohex(strlen(pname)));
         add_string(&p, "property");
         *p = 0;
         return call_prom("interpret", 1, 1, (u32)(unsigned long) cmd);
 }
 
-/* We can't use the standard versions because of RELOC headaches. */
+/* We can't use the standard versions because of relocation headaches. */
 #define isxdigit(c)     (('0' <= (c) && (c) <= '9') \
                          || ('a' <= (c) && (c) <= 'f') \
                          || ('A' <= (c) && (c) <= 'F'))
@@ -598,43 +585,42 @@ unsigned long prom_memparse(const char *ptr, const char **retptr)
  */
 static void __init early_cmdline_parse(void)
 {
-        struct prom_t *_prom = &RELOC(prom);
         const char *opt;
 
         char *p;
         int l = 0;
 
-        RELOC(prom_cmd_line[0]) = 0;
-        p = RELOC(prom_cmd_line);
-        if ((long)_prom->chosen > 0)
-                l = prom_getprop(_prom->chosen, "bootargs", p, COMMAND_LINE_SIZE-1);
+        prom_cmd_line[0] = 0;
+        p = prom_cmd_line;
+        if ((long)prom.chosen > 0)
+                l = prom_getprop(prom.chosen, "bootargs", p, COMMAND_LINE_SIZE-1);
 #ifdef CONFIG_CMDLINE
         if (l <= 0 || p[0] == '\0') /* dbl check */
-                strlcpy(RELOC(prom_cmd_line),
-                        RELOC(CONFIG_CMDLINE), sizeof(prom_cmd_line));
+                strlcpy(prom_cmd_line,
+                        CONFIG_CMDLINE, sizeof(prom_cmd_line));
 #endif /* CONFIG_CMDLINE */
-        prom_printf("command line: %s\n", RELOC(prom_cmd_line));
+        prom_printf("command line: %s\n", prom_cmd_line);
 
 #ifdef CONFIG_PPC64
-        opt = strstr(RELOC(prom_cmd_line), RELOC("iommu="));
+        opt = strstr(prom_cmd_line, "iommu=");
         if (opt) {
                 prom_printf("iommu opt is: %s\n", opt);
                 opt += 6;
                 while (*opt && *opt == ' ')
                         opt++;
-                if (!strncmp(opt, RELOC("off"), 3))
-                        RELOC(prom_iommu_off) = 1;
-                else if (!strncmp(opt, RELOC("force"), 5))
-                        RELOC(prom_iommu_force_on) = 1;
+                if (!strncmp(opt, "off", 3))
+                        prom_iommu_off = 1;
+                else if (!strncmp(opt, "force", 5))
+                        prom_iommu_force_on = 1;
         }
 #endif
-        opt = strstr(RELOC(prom_cmd_line), RELOC("mem="));
+        opt = strstr(prom_cmd_line, "mem=");
         if (opt) {
                 opt += 4;
-                RELOC(prom_memory_limit) = prom_memparse(opt, (const char **)&opt);
+                prom_memory_limit = prom_memparse(opt, (const char **)&opt);
 #ifdef CONFIG_PPC64
                 /* Align to 16 MB == size of ppc64 large page */
-                RELOC(prom_memory_limit) = ALIGN(RELOC(prom_memory_limit), 0x1000000);
+                prom_memory_limit = ALIGN(prom_memory_limit, 0x1000000);
 #endif
         }
 }
@@ -887,7 +873,7 @@ static int __init prom_count_smt_threads(void)
                 type[0] = 0;
                 prom_getprop(node, "device_type", type, sizeof(type));
 
-                if (strcmp(type, RELOC("cpu")))
+                if (strcmp(type, "cpu"))
                         continue;
                 /*
                  * There is an entry for each smt thread, each entry being
@@ -929,7 +915,7 @@ static void __init prom_send_capabilities(void)
                  * (we assume this is the same for all cores) and use it to
                  * divide NR_CPUS.
                  */
-                cores = (u32 *)PTRRELOC(&ibm_architecture_vec[IBM_ARCH_VEC_NRCORES_OFFSET]);
+                cores = (u32 *)&ibm_architecture_vec[IBM_ARCH_VEC_NRCORES_OFFSET];
                 if (*cores != NR_CPUS) {
                         prom_printf("WARNING ! "
                                     "ibm_architecture_vec structure inconsistent: %lu!\n",
@@ -1005,21 +991,21 @@ static void __init prom_send_capabilities(void)
  */
 static unsigned long __init alloc_up(unsigned long size, unsigned long align)
 {
-        unsigned long base = RELOC(alloc_bottom);
+        unsigned long base = alloc_bottom;
         unsigned long addr = 0;
 
         if (align)
                 base = _ALIGN_UP(base, align);
         prom_debug("alloc_up(%x, %x)\n", size, align);
-        if (RELOC(ram_top) == 0)
+        if (ram_top == 0)
                 prom_panic("alloc_up() called with mem not initialized\n");
 
         if (align)
-                base = _ALIGN_UP(RELOC(alloc_bottom), align);
+                base = _ALIGN_UP(alloc_bottom, align);
         else
-                base = RELOC(alloc_bottom);
+                base = alloc_bottom;
 
-        for(; (base + size) <= RELOC(alloc_top); 
+        for(; (base + size) <= alloc_top; 
             base = _ALIGN_UP(base + 0x100000, align)) {
                 prom_debug("    trying: 0x%x\n\r", base);
                 addr = (unsigned long)prom_claim(base, size, 0);
@@ -1031,14 +1017,14 @@ static unsigned long __init alloc_up(unsigned long size, unsigned long align)
         }
         if (addr == 0)
                 return 0;
-        RELOC(alloc_bottom) = addr + size;
+        alloc_bottom = addr + size;
 
         prom_debug(" -> %x\n", addr);
-        prom_debug("  alloc_bottom : %x\n", RELOC(alloc_bottom));
-        prom_debug("  alloc_top    : %x\n", RELOC(alloc_top));
-        prom_debug("  alloc_top_hi : %x\n", RELOC(alloc_top_high));
-        prom_debug("  rmo_top      : %x\n", RELOC(rmo_top));
-        prom_debug("  ram_top      : %x\n", RELOC(ram_top));
+        prom_debug("  alloc_bottom : %x\n", alloc_bottom);
+        prom_debug("  alloc_top    : %x\n", alloc_top);
+        prom_debug("  alloc_top_hi : %x\n", alloc_top_high);
+        prom_debug("  rmo_top      : %x\n", rmo_top);
+        prom_debug("  ram_top      : %x\n", ram_top);
 
         return addr;
 }
@@ -1054,32 +1040,32 @@ static unsigned long __init alloc_down(unsigned long size, unsigned long align,
         unsigned long base, addr = 0;
 
         prom_debug("alloc_down(%x, %x, %s)\n", size, align,
-                   highmem ? RELOC("(high)") : RELOC("(low)"));
-        if (RELOC(ram_top) == 0)
+                   highmem ? "(high)" : "(low)");
+        if (ram_top == 0)
                 prom_panic("alloc_down() called with mem not initialized\n");
 
         if (highmem) {
                 /* Carve out storage for the TCE table. */
-                addr = _ALIGN_DOWN(RELOC(alloc_top_high) - size, align);
-                if (addr <= RELOC(alloc_bottom))
+                addr = _ALIGN_DOWN(alloc_top_high - size, align);
+                if (addr <= alloc_bottom)
                         return 0;
                 /* Will we bump into the RMO ? If yes, check out that we
                  * didn't overlap existing allocations there, if we did,
                  * we are dead, we must be the first in town !
                  */
-                if (addr < RELOC(rmo_top)) {
+                if (addr < rmo_top) {
                         /* Good, we are first */
-                        if (RELOC(alloc_top) == RELOC(rmo_top))
-                                RELOC(alloc_top) = RELOC(rmo_top) = addr;
+                        if (alloc_top == rmo_top)
+                                alloc_top = rmo_top = addr;
                         else
                                 return 0;
                 }
-                RELOC(alloc_top_high) = addr;
+                alloc_top_high = addr;
                 goto bail;
         }
 
-        base = _ALIGN_DOWN(RELOC(alloc_top) - size, align);
-        for (; base > RELOC(alloc_bottom);
+        base = _ALIGN_DOWN(alloc_top - size, align);
+        for (; base > alloc_bottom;
              base = _ALIGN_DOWN(base - 0x100000, align))  {
                 prom_debug("    trying: 0x%x\n\r", base);
                 addr = (unsigned long)prom_claim(base, size, 0);
@@ -1089,15 +1075,15 @@ static unsigned long __init alloc_down(unsigned long size, unsigned long align,
         }
         if (addr == 0)
                 return 0;
-        RELOC(alloc_top) = addr;
+        alloc_top = addr;
 
  bail:
         prom_debug(" -> %x\n", addr);
-        prom_debug("  alloc_bottom : %x\n", RELOC(alloc_bottom));
-        prom_debug("  alloc_top    : %x\n", RELOC(alloc_top));
-        prom_debug("  alloc_top_hi : %x\n", RELOC(alloc_top_high));
-        prom_debug("  rmo_top      : %x\n", RELOC(rmo_top));
-        prom_debug("  ram_top      : %x\n", RELOC(ram_top));
+        prom_debug("  alloc_bottom : %x\n", alloc_bottom);
+        prom_debug("  alloc_top    : %x\n", alloc_top);
+        prom_debug("  alloc_top_hi : %x\n", alloc_top_high);
+        prom_debug("  rmo_top      : %x\n", rmo_top);
+        prom_debug("  ram_top      : %x\n", ram_top);
 
         return addr;
 }
@@ -1137,7 +1123,7 @@ static unsigned long __init prom_next_cell(int s, cell_t **cellp)
 static void __init reserve_mem(u64 base, u64 size)
 {
         u64 top = base + size;
-        unsigned long cnt = RELOC(mem_reserve_cnt);
+        unsigned long cnt = mem_reserve_cnt;
 
         if (size == 0)
                 return;
@@ -1152,9 +1138,9 @@ static void __init reserve_mem(u64 base, u64 size)
 
         if (cnt >= (MEM_RESERVE_MAP_SIZE - 1))
                 prom_panic("Memory reserve map exhausted !\n");
-        RELOC(mem_reserve_map)[cnt].base = base;
-        RELOC(mem_reserve_map)[cnt].size = size;
-        RELOC(mem_reserve_cnt) = cnt + 1;
+        mem_reserve_map[cnt].base = base;
+        mem_reserve_map[cnt].size = size;
+        mem_reserve_cnt = cnt + 1;
 }
 
 /*
@@ -1167,7 +1153,6 @@ static void __init prom_init_mem(void)
         char *path, type[64];
         unsigned int plen;
         cell_t *p, *endp;
-        struct prom_t *_prom = &RELOC(prom);
         u32 rac, rsc;
 
         /*
@@ -1176,14 +1161,14 @@ static void __init prom_init_mem(void)
          * 2) top of memory
          */
         rac = 2;
-        prom_getprop(_prom->root, "#address-cells", &rac, sizeof(rac));
+        prom_getprop(prom.root, "#address-cells", &rac, sizeof(rac));
         rsc = 1;
-        prom_getprop(_prom->root, "#size-cells", &rsc, sizeof(rsc));
+        prom_getprop(prom.root, "#size-cells", &rsc, sizeof(rsc));
         prom_debug("root_addr_cells: %x\n", (unsigned long) rac);
         prom_debug("root_size_cells: %x\n", (unsigned long) rsc);
 
         prom_debug("scanning memory:\n");
-        path = RELOC(prom_scratch);
+        path = prom_scratch;
 
         for (node = 0; prom_next_node(&node); ) {
                 type[0] = 0;
@@ -1196,15 +1181,15 @@ static void __init prom_init_mem(void)
                          */
                         prom_getprop(node, "name", type, sizeof(type));
                 }
-                if (strcmp(type, RELOC("memory")))
+                if (strcmp(type, "memory"))
                         continue;
 
-                plen = prom_getprop(node, "reg", RELOC(regbuf), sizeof(regbuf));
+                plen = prom_getprop(node, "reg", regbuf, sizeof(regbuf));
                 if (plen > sizeof(regbuf)) {
                         prom_printf("memory node too large for buffer !\n");
                         plen = sizeof(regbuf);
                 }
-                p = RELOC(regbuf);
+                p = regbuf;
                 endp = p + (plen / sizeof(cell_t));
 
 #ifdef DEBUG_PROM
@@ -1222,14 +1207,14 @@ static void __init prom_init_mem(void)
                         if (size == 0)
                                 continue;
                         prom_debug("    %x %x\n", base, size);
-                        if (base == 0 && (RELOC(of_platform) & PLATFORM_LPAR))
-                                RELOC(rmo_top) = size;
-                        if ((base + size) > RELOC(ram_top))
-                                RELOC(ram_top) = base + size;
+                        if (base == 0 && (of_platform & PLATFORM_LPAR))
+                                rmo_top = size;
+                        if ((base + size) > ram_top)
+                                ram_top = base + size;
                 }
         }
 
-        RELOC(alloc_bottom) = PAGE_ALIGN((unsigned long)&RELOC(_end) + 0x4000);
+        alloc_bottom = PAGE_ALIGN((unsigned long)&_end + 0x4000);
 
         /*
          * If prom_memory_limit is set we reduce the upper limits *except* for
@@ -1237,20 +1222,20 @@ static void __init prom_init_mem(void)
          * TCE's up there.
          */
 
-        RELOC(alloc_top_high) = RELOC(ram_top);
+        alloc_top_high = ram_top;
 
-        if (RELOC(prom_memory_limit)) {
-                if (RELOC(prom_memory_limit) <= RELOC(alloc_bottom)) {
+        if (prom_memory_limit) {
+                if (prom_memory_limit <= alloc_bottom) {
                         prom_printf("Ignoring mem=%x <= alloc_bottom.\n",
-                                RELOC(prom_memory_limit));
-                        RELOC(prom_memory_limit) = 0;
-                } else if (RELOC(prom_memory_limit) >= RELOC(ram_top)) {
+                                prom_memory_limit);
+                        prom_memory_limit = 0;
+                } else if (prom_memory_limit >= ram_top) {
                         prom_printf("Ignoring mem=%x >= ram_top.\n",
-                                RELOC(prom_memory_limit));
-                        RELOC(prom_memory_limit) = 0;
+                                prom_memory_limit);
+                        prom_memory_limit = 0;
                 } else {
-                        RELOC(ram_top) = RELOC(prom_memory_limit);
-                        RELOC(rmo_top) = min(RELOC(rmo_top), RELOC(prom_memory_limit));
+                        ram_top = prom_memory_limit;
+                        rmo_top = min(rmo_top, prom_memory_limit);
                 }
         }
 
@@ -1262,36 +1247,35 @@ static void __init prom_init_mem(void)
          * Since 768MB is plenty of room, and we need to cap to something
          * reasonable on 32-bit, cap at 768MB on all machines.
          */
-        if (!RELOC(rmo_top))
-                RELOC(rmo_top) = RELOC(ram_top);
-        RELOC(rmo_top) = min(0x30000000ul, RELOC(rmo_top));
-        RELOC(alloc_top) = RELOC(rmo_top);
-        RELOC(alloc_top_high) = RELOC(ram_top);
+        if (!rmo_top)
+                rmo_top = ram_top;
+        rmo_top = min(0x30000000ul, rmo_top);
+        alloc_top = rmo_top;
+        alloc_top_high = ram_top;
 
         /*
          * Check if we have an initrd after the kernel but still inside
          * the RMO.  If we do move our bottom point to after it.
          */
-        if (RELOC(prom_initrd_start) &&
-            RELOC(prom_initrd_start) < RELOC(rmo_top) &&
-            RELOC(prom_initrd_end) > RELOC(alloc_bottom))
-                RELOC(alloc_bottom) = PAGE_ALIGN(RELOC(prom_initrd_end));
+        if (prom_initrd_start &&
+            prom_initrd_start < rmo_top &&
+            prom_initrd_end > alloc_bottom)
+                alloc_bottom = PAGE_ALIGN(prom_initrd_end);
 
         prom_printf("memory layout at init:\n");
-        prom_printf("  memory_limit : %x (16 MB aligned)\n", RELOC(prom_memory_limit));
-        prom_printf("  alloc_bottom : %x\n", RELOC(alloc_bottom));
-        prom_printf("  alloc_top    : %x\n", RELOC(alloc_top));
-        prom_printf("  alloc_top_hi : %x\n", RELOC(alloc_top_high));
-        prom_printf("  rmo_top      : %x\n", RELOC(rmo_top));
-        prom_printf("  ram_top      : %x\n", RELOC(ram_top));
+        prom_printf("  memory_limit : %x (16 MB aligned)\n", prom_memory_limit);
+        prom_printf("  alloc_bottom : %x\n", alloc_bottom);
+        prom_printf("  alloc_top    : %x\n", alloc_top);
+        prom_printf("  alloc_top_hi : %x\n", alloc_top_high);
+        prom_printf("  rmo_top      : %x\n", rmo_top);
+        prom_printf("  ram_top      : %x\n", ram_top);
 }
 
 static void __init prom_close_stdin(void)
 {
-        struct prom_t *_prom = &RELOC(prom);
         ihandle val;
 
-        if (prom_getprop(_prom->chosen, "stdin", &val, sizeof(val)) > 0)
+        if (prom_getprop(prom.chosen, "stdin", &val, sizeof(val)) > 0)
                 call_prom("close", 1, 0, val);
 }
 
@@ -1332,19 +1316,19 @@ static void __init prom_query_opal(void)
         }
 
         prom_printf("Querying for OPAL presence... ");
-        rc = opal_query_takeover(&RELOC(prom_opal_size),
-                                 &RELOC(prom_opal_align));
+        rc = opal_query_takeover(&prom_opal_size,
+                                 &prom_opal_align);
         prom_debug("(rc = %ld) ", rc);
         if (rc != 0) {
                 prom_printf("not there.\n");
                 return;
         }
-        RELOC(of_platform) = PLATFORM_OPAL;
+        of_platform = PLATFORM_OPAL;
         prom_printf(" there !\n");
-        prom_debug("  opal_size  = 0x%lx\n", RELOC(prom_opal_size));
-        prom_debug("  opal_align = 0x%lx\n", RELOC(prom_opal_align));
-        if (RELOC(prom_opal_align) < 0x10000)
-                RELOC(prom_opal_align) = 0x10000;
+        prom_debug("  opal_size  = 0x%lx\n", prom_opal_size);
+        prom_debug("  opal_align = 0x%lx\n", prom_opal_align);
+        if (prom_opal_align < 0x10000)
+                prom_opal_align = 0x10000;
 }
 
 static int prom_rtas_call(int token, int nargs, int nret, int *outputs, ...)
@@ -1365,8 +1349,8 @@ static int prom_rtas_call(int token, int nargs, int nret, int *outputs, ...)
         for (i = 0; i < nret; ++i)
                 rtas_args.rets[i] = 0;
 
-        opal_enter_rtas(&rtas_args, RELOC(prom_rtas_data),
-                        RELOC(prom_rtas_entry));
+        opal_enter_rtas(&rtas_args, prom_rtas_data,
+                        prom_rtas_entry);
 
         if (nret > 1 && outputs != NULL)
                 for (i = 0; i < nret-1; ++i)
@@ -1381,9 +1365,8 @@ static void __init prom_opal_hold_cpus(void)
         phandle node;
         char type[64];
         u32 servers[8];
-        struct prom_t *_prom = &RELOC(prom);
-        void *entry = (unsigned long *)&RELOC(opal_secondary_entry);
-        struct opal_secondary_data *data = &RELOC(opal_secondary_data);
+        void *entry = (unsigned long *)&opal_secondary_entry;
+        struct opal_secondary_data *data = &opal_secondary_data;
 
         prom_debug("prom_opal_hold_cpus: start...\n");
         prom_debug("    - entry       = 0x%x\n", entry);
@@ -1396,12 +1379,12 @@ static void __init prom_opal_hold_cpus(void)
         for (node = 0; prom_next_node(&node); ) {
                 type[0] = 0;
                 prom_getprop(node, "device_type", type, sizeof(type));
-                if (strcmp(type, RELOC("cpu")) != 0)
+                if (strcmp(type, "cpu") != 0)
                         continue;
 
                 /* Skip non-configured cpus. */
                 if (prom_getprop(node, "status", type, sizeof(type)) > 0)
-                        if (strcmp(type, RELOC("okay")) != 0)
+                        if (strcmp(type, "okay") != 0)
                                 continue;
 
                 cnt = prom_getprop(node, "ibm,ppc-interrupt-server#s", servers,
@@ -1412,7 +1395,7 @@ static void __init prom_opal_hold_cpus(void)
                 for (i = 0; i < cnt; i++) {
                         cpu = servers[i];
                         prom_debug("CPU %d ... ", cpu);
-                        if (cpu == _prom->cpu) {
+                        if (cpu == prom.cpu) {
                                 prom_debug("booted !\n");
                                 continue;
                         }
@@ -1423,7 +1406,7 @@ static void __init prom_opal_hold_cpus(void)
                          * spinloop.
                          */
                         data->ack = -1;
-                        rc = prom_rtas_call(RELOC(prom_rtas_start_cpu), 3, 1,
+                        rc = prom_rtas_call(prom_rtas_start_cpu, 3, 1,
                                             NULL, cpu, entry, data);
                         prom_debug("rtas rc=%d ...", rc);
 
@@ -1443,21 +1426,21 @@ static void __init prom_opal_hold_cpus(void)
 
 static void __init prom_opal_takeover(void)
 {
-        struct opal_secondary_data *data = &RELOC(opal_secondary_data);
+        struct opal_secondary_data *data = &opal_secondary_data;
         struct opal_takeover_args *args = &data->args;
-        u64 align = RELOC(prom_opal_align);
+        u64 align = prom_opal_align;
         u64 top_addr, opal_addr;
 
-        args->k_image   = (u64)RELOC(_stext);
+        args->k_image   = (u64)_stext;
         args->k_size    = _end - _stext;
         args->k_entry   = 0;
         args->k_entry2  = 0x60;
 
         top_addr = _ALIGN_UP(args->k_size, align);
 
-        if (RELOC(prom_initrd_start) != 0) {
-                args->rd_image = RELOC(prom_initrd_start);
-                args->rd_size = RELOC(prom_initrd_end) - args->rd_image;
+        if (prom_initrd_start != 0) {
+                args->rd_image = prom_initrd_start;
+                args->rd_size = prom_initrd_end - args->rd_image;
                 args->rd_loc = top_addr;
                 top_addr = _ALIGN_UP(args->rd_loc + args->rd_size, align);
         }
@@ -1469,13 +1452,13 @@ static void __init prom_opal_takeover(void)
          * has plenty of memory, and we ask for the HAL for now to
          * be just below the 1G point, or above the initrd
          */
-        opal_addr = _ALIGN_DOWN(0x40000000 - RELOC(prom_opal_size), align);
+        opal_addr = _ALIGN_DOWN(0x40000000 - prom_opal_size, align);
         if (opal_addr < top_addr)
                 opal_addr = top_addr;
         args->hal_addr = opal_addr;
 
         /* Copy the command line to the kernel image */
-        strlcpy(RELOC(boot_command_line), RELOC(prom_cmd_line),
+        strlcpy(boot_command_line, prom_cmd_line,
                 COMMAND_LINE_SIZE);
 
         prom_debug("  k_image    = 0x%lx\n", args->k_image);
@@ -1557,8 +1540,8 @@ static void __init prom_instantiate_opal(void)
                      &entry, sizeof(entry));
 
 #ifdef CONFIG_PPC_EARLY_DEBUG_OPAL
-        RELOC(prom_opal_base) = base;
-        RELOC(prom_opal_entry) = entry;
+        prom_opal_base = base;
+        prom_opal_entry = entry;
 #endif
         prom_debug("prom_instantiate_opal: end...\n");
 }
@@ -1616,9 +1599,9 @@ static void __init prom_instantiate_rtas(void)
 
 #ifdef CONFIG_PPC_POWERNV
         /* PowerVN takeover hack */
-        RELOC(prom_rtas_data) = base;
-        RELOC(prom_rtas_entry) = entry;
-        prom_getprop(rtas_node, "start-cpu", &RELOC(prom_rtas_start_cpu), 4);
+        prom_rtas_data = base;
+        prom_rtas_entry = entry;
+        prom_getprop(rtas_node, "start-cpu", &prom_rtas_start_cpu, 4);
 #endif
         prom_debug("rtas base     = 0x%x\n", base);
         prom_debug("rtas entry    = 0x%x\n", entry);
@@ -1693,20 +1676,20 @@ static void __init prom_initialize_tce_table(void)
         phandle node;
         ihandle phb_node;
         char compatible[64], type[64], model[64];
-        char *path = RELOC(prom_scratch);
+        char *path = prom_scratch;
         u64 base, align;
         u32 minalign, minsize;
         u64 tce_entry, *tce_entryp;
         u64 local_alloc_top, local_alloc_bottom;
         u64 i;
 
-        if (RELOC(prom_iommu_off))
+        if (prom_iommu_off)
                 return;
 
         prom_debug("starting prom_initialize_tce_table\n");
 
         /* Cache current top of allocs so we reserve a single block */
-        local_alloc_top = RELOC(alloc_top_high);
+        local_alloc_top = alloc_top_high;
         local_alloc_bottom = local_alloc_top;
 
         /* Search all nodes looking for PHBs. */
@@ -1719,19 +1702,19 @@ static void __init prom_initialize_tce_table(void)
                 prom_getprop(node, "device_type", type, sizeof(type));
                 prom_getprop(node, "model", model, sizeof(model));
 
-                if ((type[0] == 0) || (strstr(type, RELOC("pci")) == NULL))
+                if ((type[0] == 0) || (strstr(type, "pci") == NULL))
                         continue;
 
                 /* Keep the old logic intact to avoid regression. */
                 if (compatible[0] != 0) {
-                        if ((strstr(compatible, RELOC("python")) == NULL) &&
-                            (strstr(compatible, RELOC("Speedwagon")) == NULL) &&
-                            (strstr(compatible, RELOC("Winnipeg")) == NULL))
+                        if ((strstr(compatible, "python") == NULL) &&
+                            (strstr(compatible, "Speedwagon") == NULL) &&
+                            (strstr(compatible, "Winnipeg") == NULL))
                                 continue;
                 } else if (model[0] != 0) {
-                        if ((strstr(model, RELOC("ython")) == NULL) &&
-                            (strstr(model, RELOC("peedwagon")) == NULL) &&
-                            (strstr(model, RELOC("innipeg")) == NULL))
+                        if ((strstr(model, "ython") == NULL) &&
+                            (strstr(model, "peedwagon") == NULL) &&
+                            (strstr(model, "innipeg") == NULL))
                                 continue;
                 }
 
@@ -1810,8 +1793,8 @@ static void __init prom_initialize_tce_table(void)
 
         /* These are only really needed if there is a memory limit in
          * effect, but we don't know so export them always. */
-        RELOC(prom_tce_alloc_start) = local_alloc_bottom;
-        RELOC(prom_tce_alloc_end) = local_alloc_top;
+        prom_tce_alloc_start = local_alloc_bottom;
+        prom_tce_alloc_end = local_alloc_top;
 
         /* Flag the first invalid entry */
         prom_debug("ending prom_initialize_tce_table\n");
@@ -1848,7 +1831,6 @@ static void __init prom_hold_cpus(void)
         unsigned int reg;
         phandle node;
         char type[64];
-        struct prom_t *_prom = &RELOC(prom);
         unsigned long *spinloop
                 = (void *) LOW_ADDR(__secondary_hold_spinloop);
         unsigned long *acknowledge
@@ -1874,12 +1856,12 @@ static void __init prom_hold_cpus(void)
         for (node = 0; prom_next_node(&node); ) {
                 type[0] = 0;
                 prom_getprop(node, "device_type", type, sizeof(type));
-                if (strcmp(type, RELOC("cpu")) != 0)
+                if (strcmp(type, "cpu") != 0)
                         continue;
 
                 /* Skip non-configured cpus. */
                 if (prom_getprop(node, "status", type, sizeof(type)) > 0)
-                        if (strcmp(type, RELOC("okay")) != 0)
+                        if (strcmp(type, "okay") != 0)
                                 continue;
 
                 reg = -1;
@@ -1893,7 +1875,7 @@ static void __init prom_hold_cpus(void)
                  */
                 *acknowledge = (unsigned long)-1;
 
-                if (reg != _prom->cpu) {
+                if (reg != prom.cpu) {
                         /* Primary Thread of non-boot cpu or any thread */
                         prom_printf("starting cpu hw idx %lu... ", reg);
                         call_prom("start-cpu", 3, 0, node,
@@ -1920,22 +1902,20 @@ static void __init prom_hold_cpus(void)
 
 static void __init prom_init_client_services(unsigned long pp)
 {
-        struct prom_t *_prom = &RELOC(prom);
-
         /* Get a handle to the prom entry point before anything else */
-        RELOC(prom_entry) = pp;
+        prom_entry = pp;
 
         /* get a handle for the stdout device */
-        _prom->chosen = call_prom("finddevice", 1, 1, ADDR("/chosen"));
-        if (!PHANDLE_VALID(_prom->chosen))
+        prom.chosen = call_prom("finddevice", 1, 1, ADDR("/chosen"));
+        if (!PHANDLE_VALID(prom.chosen))
                 prom_panic("cannot find chosen"); /* msg won't be printed :( */
 
         /* get device tree root */
-        _prom->root = call_prom("finddevice", 1, 1, ADDR("/"));
-        if (!PHANDLE_VALID(_prom->root))
+        prom.root = call_prom("finddevice", 1, 1, ADDR("/"));
+        if (!PHANDLE_VALID(prom.root))
                 prom_panic("cannot find device tree root"); /* msg won't be printed :( */
 
-        _prom->mmumap = 0;
+        prom.mmumap = 0;
 }
 
 #ifdef CONFIG_PPC32
@@ -1946,7 +1926,6 @@ static void __init prom_init_client_services(unsigned long pp)
  */
 static void __init prom_find_mmu(void)
 {
-        struct prom_t *_prom = &RELOC(prom);
         phandle oprom;
         char version[64];
 
@@ -1964,10 +1943,10 @@ static void __init prom_find_mmu(void)
                 call_prom("interpret", 1, 1, "dev /memory 0 to allow-reclaim");
         } else
                 return;
-        _prom->memory = call_prom("open", 1, 1, ADDR("/memory"));
-        prom_getprop(_prom->chosen, "mmu", &_prom->mmumap,
-                     sizeof(_prom->mmumap));
-        if (!IHANDLE_VALID(_prom->memory) || !IHANDLE_VALID(_prom->mmumap))
+        prom.memory = call_prom("open", 1, 1, ADDR("/memory"));
+        prom_getprop(prom.chosen, "mmu", &prom.mmumap,
+                     sizeof(prom.mmumap));
+        if (!IHANDLE_VALID(prom.memory) || !IHANDLE_VALID(prom.mmumap))
                 of_workarounds &= ~OF_WA_CLAIM;         /* hmmm */
 }
 #else
@@ -1976,36 +1955,34 @@ static void __init prom_find_mmu(void)
 
 static void __init prom_init_stdout(void)
 {
-        struct prom_t *_prom = &RELOC(prom);
-        char *path = RELOC(of_stdout_device);
+        char *path = of_stdout_device;
         char type[16];
         u32 val;
 
-        if (prom_getprop(_prom->chosen, "stdout", &val, sizeof(val)) <= 0)
+        if (prom_getprop(prom.chosen, "stdout", &val, sizeof(val)) <= 0)
                 prom_panic("cannot find stdout");
 
-        _prom->stdout = val;
+        prom.stdout = val;
 
         /* Get the full OF pathname of the stdout device */
         memset(path, 0, 256);
-        call_prom("instance-to-path", 3, 1, _prom->stdout, path, 255);
-        val = call_prom("instance-to-package", 1, 1, _prom->stdout);
-        prom_setprop(_prom->chosen, "/chosen", "linux,stdout-package",
+        call_prom("instance-to-path", 3, 1, prom.stdout, path, 255);
+        val = call_prom("instance-to-package", 1, 1, prom.stdout);
+        prom_setprop(prom.chosen, "/chosen", "linux,stdout-package",
                      &val, sizeof(val));
-        prom_printf("OF stdout device is: %s\n", RELOC(of_stdout_device));
-        prom_setprop(_prom->chosen, "/chosen", "linux,stdout-path",
+        prom_printf("OF stdout device is: %s\n", of_stdout_device);
+        prom_setprop(prom.chosen, "/chosen", "linux,stdout-path",
                      path, strlen(path) + 1);
 
         /* If it's a display, note it */
         memset(type, 0, sizeof(type));
         prom_getprop(val, "device_type", type, sizeof(type));
-        if (strcmp(type, RELOC("display")) == 0)
+        if (strcmp(type, "display") == 0)
                 prom_setprop(val, path, "linux,boot-display", NULL, 0);
 }
 
 static int __init prom_find_machine_type(void)
 {
-        struct prom_t *_prom = &RELOC(prom);
         char compat[256];
         int len, i = 0;
 #ifdef CONFIG_PPC64
@@ -2014,7 +1991,7 @@ static int __init prom_find_machine_type(void)
 #endif
 
         /* Look for a PowerMac or a Cell */
-        len = prom_getprop(_prom->root, "compatible",
+        len = prom_getprop(prom.root, "compatible",
                            compat, sizeof(compat)-1);
         if (len > 0) {
                 compat[len] = 0;
@@ -2023,16 +2000,16 @@ static int __init prom_find_machine_type(void)
                         int sl = strlen(p);
                         if (sl == 0)
                                 break;
-                        if (strstr(p, RELOC("Power Macintosh")) ||
-                            strstr(p, RELOC("MacRISC")))
+                        if (strstr(p, "Power Macintosh") ||
+                            strstr(p, "MacRISC"))
                                 return PLATFORM_POWERMAC;
 #ifdef CONFIG_PPC64
                         /* We must make sure we don't detect the IBM Cell
                          * blades as pSeries due to some firmware issues,
                          * so we do it here.
                          */
-                        if (strstr(p, RELOC("IBM,CBEA")) ||
-                            strstr(p, RELOC("IBM,CPBW-1.0")))
+                        if (strstr(p, "IBM,CBEA") ||
+                            strstr(p, "IBM,CPBW-1.0"))
                                 return PLATFORM_GENERIC;
 #endif /* CONFIG_PPC64 */
                         i += sl + 1;
@@ -2049,11 +2026,11 @@ static int __init prom_find_machine_type(void)
          *    non-IBM designs !
          *  - it has /rtas
          */
-        len = prom_getprop(_prom->root, "device_type",
+        len = prom_getprop(prom.root, "device_type",
                            compat, sizeof(compat)-1);
         if (len <= 0)
                 return PLATFORM_GENERIC;
-        if (strcmp(compat, RELOC("chrp")))
+        if (strcmp(compat, "chrp"))
                 return PLATFORM_GENERIC;
 
         /* Default to pSeries. We need to know if we are running LPAR */
@@ -2115,11 +2092,11 @@ static void __init prom_check_displays(void)
         for (node = 0; prom_next_node(&node); ) {
                 memset(type, 0, sizeof(type));
                 prom_getprop(node, "device_type", type, sizeof(type));
-                if (strcmp(type, RELOC("display")) != 0)
+                if (strcmp(type, "display") != 0)
                         continue;
 
                 /* It seems OF doesn't null-terminate the path :-( */
-                path = RELOC(prom_scratch);
+                path = prom_scratch;
                 memset(path, 0, PROM_SCRATCH_SIZE);
 
                 /*
@@ -2143,15 +2120,15 @@ static void __init prom_check_displays(void)
 
                 /* Setup a usable color table when the appropriate
                  * method is available. Should update this to set-colors */
-                clut = RELOC(default_colors);
+                clut = default_colors;
                 for (i = 0; i < 16; i++, clut += 3)
                         if (prom_set_color(ih, i, clut[0], clut[1],
                                            clut[2]) != 0)
                                 break;
 
 #ifdef CONFIG_LOGO_LINUX_CLUT224
-                clut = PTRRELOC(RELOC(logo_linux_clut224.clut));
-                for (i = 0; i < RELOC(logo_linux_clut224.clutsize); i++, clut += 3)
+                clut = PTRRELOC(logo_linux_clut224.clut);
+                for (i = 0; i < logo_linux_clut224.clutsize; i++, clut += 3)
                         if (prom_set_color(ih, i + 32, clut[0], clut[1],
                                            clut[2]) != 0)
                                 break;
@@ -2171,8 +2148,8 @@ static void __init *make_room(unsigned long *mem_start, unsigned long *mem_end,
                 unsigned long room, chunk;
 
                 prom_debug("Chunk exhausted, claiming more at %x...\n",
-                           RELOC(alloc_bottom));
-                room = RELOC(alloc_top) - RELOC(alloc_bottom);
+                           alloc_bottom);
+                room = alloc_top - alloc_bottom;
                 if (room > DEVTREE_CHUNK_SIZE)
                         room = DEVTREE_CHUNK_SIZE;
                 if (room < PAGE_SIZE)
@@ -2198,9 +2175,9 @@ static unsigned long __init dt_find_string(char *str)
 {
         char *s, *os;
 
-        s = os = (char *)RELOC(dt_string_start);
+        s = os = (char *)dt_string_start;
         s += 4;
-        while (s <  (char *)RELOC(dt_string_end)) {
+        while (s <  (char *)dt_string_end) {
                 if (strcmp(s, str) == 0)
                         return s - os;
                 s += strlen(s) + 1;
@@ -2222,10 +2199,10 @@ static void __init scan_dt_build_strings(phandle node,
         unsigned long soff;
         phandle child;
 
-        sstart =  (char *)RELOC(dt_string_start);
+        sstart =  (char *)dt_string_start;
 
         /* get and store all property names */
-        prev_name = RELOC("");
+        prev_name = "";
         for (;;) {
                 /* 64 is max len of name including nul. */
                 namep = make_room(mem_start, mem_end, MAX_PROPERTY_NAME, 1);
@@ -2236,9 +2213,9 @@ static void __init scan_dt_build_strings(phandle node,
                 }
 
                 /* skip "name" */
-                if (strcmp(namep, RELOC("name")) == 0) {
+                if (strcmp(namep, "name") == 0) {
                         *mem_start = (unsigned long)namep;
-                        prev_name = RELOC("name");
+                        prev_name = "name";
                         continue;
                 }
                 /* get/create string entry */
@@ -2249,7 +2226,7 @@ static void __init scan_dt_build_strings(phandle node,
                 } else {
                         /* Trim off some if we can */
                         *mem_start = (unsigned long)namep + strlen(namep) + 1;
-                        RELOC(dt_string_end) = *mem_start;
+                        dt_string_end = *mem_start;
                 }
                 prev_name = namep;
         }
@@ -2304,35 +2281,35 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
         }
 
         /* get it again for debugging */
-        path = RELOC(prom_scratch);
+        path = prom_scratch;
         memset(path, 0, PROM_SCRATCH_SIZE);
         call_prom("package-to-path", 3, 1, node, path, PROM_SCRATCH_SIZE-1);
 
         /* get and store all properties */
-        prev_name = RELOC("");
-        sstart = (char *)RELOC(dt_string_start);
+        prev_name = "";
+        sstart = (char *)dt_string_start;
         for (;;) {
                 if (call_prom("nextprop", 3, 1, node, prev_name,
-                              RELOC(pname)) != 1)
+                              pname) != 1)
                         break;
 
                 /* skip "name" */
-                if (strcmp(RELOC(pname), RELOC("name")) == 0) {
-                        prev_name = RELOC("name");
+                if (strcmp(pname, "name") == 0) {
+                        prev_name = "name";
                         continue;
                 }
 
                 /* find string offset */
-                soff = dt_find_string(RELOC(pname));
+                soff = dt_find_string(pname);
                 if (soff == 0) {
                         prom_printf("WARNING: Can't find string index for"
-                                    " <%s>, node %s\n", RELOC(pname), path);
+                                    " <%s>, node %s\n", pname, path);
                         break;
                 }
                 prev_name = sstart + soff;
 
                 /* get length */
-                l = call_prom("getproplen", 2, 1, node, RELOC(pname));
+                l = call_prom("getproplen", 2, 1, node, pname);
 
                 /* sanity checks */
                 if (l == PROM_ERROR)
@@ -2345,10 +2322,10 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
 
                 /* push property content */
                 valp = make_room(mem_start, mem_end, l, 4);
-                call_prom("getprop", 4, 1, node, RELOC(pname), valp, l);
+                call_prom("getprop", 4, 1, node, pname, valp, l);
                 *mem_start = _ALIGN(*mem_start, 4);
 
-                if (!strcmp(RELOC(pname), RELOC("phandle")))
+                if (!strcmp(pname, "phandle"))
                         has_phandle = 1;
         }
 
@@ -2356,7 +2333,7 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
          * existed (can happen with OPAL)
          */
         if (!has_phandle) {
-                soff = dt_find_string(RELOC("linux,phandle"));
+                soff = dt_find_string("linux,phandle");
                 if (soff == 0)
                         prom_printf("WARNING: Can't find string index for"
                                     " <linux-phandle> node %s\n", path);
@@ -2384,7 +2361,6 @@ static void __init flatten_device_tree(void)
         phandle root;
         unsigned long mem_start, mem_end, room;
         struct boot_param_header *hdr;
-        struct prom_t *_prom = &RELOC(prom);
         char *namep;
         u64 *rsvmap;
 
@@ -2392,10 +2368,10 @@ static void __init flatten_device_tree(void)
          * Check how much room we have between alloc top & bottom (+/- a
          * few pages), crop to 1MB, as this is our "chunk" size
          */
-        room = RELOC(alloc_top) - RELOC(alloc_bottom) - 0x4000;
+        room = alloc_top - alloc_bottom - 0x4000;
         if (room > DEVTREE_CHUNK_SIZE)
                 room = DEVTREE_CHUNK_SIZE;
-        prom_debug("starting device tree allocs at %x\n", RELOC(alloc_bottom));
+        prom_debug("starting device tree allocs at %x\n", alloc_bottom);
 
         /* Now try to claim that */
         mem_start = (unsigned long)alloc_up(room, PAGE_SIZE);
@@ -2412,66 +2388,66 @@ static void __init flatten_device_tree(void)
         mem_start = _ALIGN(mem_start, 4);
         hdr = make_room(&mem_start, &mem_end,
                         sizeof(struct boot_param_header), 4);
-        RELOC(dt_header_start) = (unsigned long)hdr;
+        dt_header_start = (unsigned long)hdr;
         rsvmap = make_room(&mem_start, &mem_end, sizeof(mem_reserve_map), 8);
 
         /* Start of strings */
         mem_start = PAGE_ALIGN(mem_start);
-        RELOC(dt_string_start) = mem_start;
+        dt_string_start = mem_start;
         mem_start += 4; /* hole */
 
         /* Add "linux,phandle" in there, we'll need it */
         namep = make_room(&mem_start, &mem_end, 16, 1);
-        strcpy(namep, RELOC("linux,phandle"));
+        strcpy(namep, "linux,phandle");
         mem_start = (unsigned long)namep + strlen(namep) + 1;
 
         /* Build string array */
         prom_printf("Building dt strings...\n"); 
         scan_dt_build_strings(root, &mem_start, &mem_end);
-        RELOC(dt_string_end) = mem_start;
+        dt_string_end = mem_start;
 
         /* Build structure */
         mem_start = PAGE_ALIGN(mem_start);
-        RELOC(dt_struct_start) = mem_start;
+        dt_struct_start = mem_start;
         prom_printf("Building dt structure...\n"); 
         scan_dt_build_struct(root, &mem_start, &mem_end);
         dt_push_token(OF_DT_END, &mem_start, &mem_end);
-        RELOC(dt_struct_end) = PAGE_ALIGN(mem_start);
+        dt_struct_end = PAGE_ALIGN(mem_start);
 
         /* Finish header */
-        hdr->boot_cpuid_phys = _prom->cpu;
+        hdr->boot_cpuid_phys = prom.cpu;
         hdr->magic = OF_DT_HEADER;
-        hdr->totalsize = RELOC(dt_struct_end) - RELOC(dt_header_start);
-        hdr->off_dt_struct = RELOC(dt_struct_start) - RELOC(dt_header_start);
-        hdr->off_dt_strings = RELOC(dt_string_start) - RELOC(dt_header_start);
-        hdr->dt_strings_size = RELOC(dt_string_end) - RELOC(dt_string_start);
-        hdr->off_mem_rsvmap = ((unsigned long)rsvmap) - RELOC(dt_header_start);
+        hdr->totalsize = dt_struct_end - dt_header_start;
+        hdr->off_dt_struct = dt_struct_start - dt_header_start;
+        hdr->off_dt_strings = dt_string_start - dt_header_start;
+        hdr->dt_strings_size = dt_string_end - dt_string_start;
+        hdr->off_mem_rsvmap = ((unsigned long)rsvmap) - dt_header_start;
         hdr->version = OF_DT_VERSION;
         /* Version 16 is not backward compatible */
         hdr->last_comp_version = 0x10;
 
         /* Copy the reserve map in */
-        memcpy(rsvmap, RELOC(mem_reserve_map), sizeof(mem_reserve_map));
+        memcpy(rsvmap, mem_reserve_map, sizeof(mem_reserve_map));
 
 #ifdef DEBUG_PROM
         {
                 int i;
                 prom_printf("reserved memory map:\n");
-                for (i = 0; i < RELOC(mem_reserve_cnt); i++)
+                for (i = 0; i < mem_reserve_cnt; i++)
                         prom_printf("  %x - %x\n",
-                                    RELOC(mem_reserve_map)[i].base,
-                                    RELOC(mem_reserve_map)[i].size);
+                                    mem_reserve_map[i].base,
+                                    mem_reserve_map[i].size);
         }
 #endif
         /* Bump mem_reserve_cnt to cause further reservations to fail
          * since it's too late.
          */
-        RELOC(mem_reserve_cnt) = MEM_RESERVE_MAP_SIZE;
+        mem_reserve_cnt = MEM_RESERVE_MAP_SIZE;
 
         prom_printf("Device tree strings 0x%x -> 0x%x\n",
-                    RELOC(dt_string_start), RELOC(dt_string_end)); 
+                    dt_string_start, dt_string_end);
         prom_printf("Device tree struct  0x%x -> 0x%x\n",
-                    RELOC(dt_struct_start), RELOC(dt_struct_end));
+                    dt_struct_start, dt_struct_end);
 
 }
 
@@ -2526,7 +2502,6 @@ static void __init fixup_device_tree_maple_memory_controller(void)
         phandle mc;
         u32 mc_reg[4];
         char *name = "/hostbridge@f8000000";
-        struct prom_t *_prom = &RELOC(prom);
         u32 ac, sc;
 
         mc = call_prom("finddevice", 1, 1, ADDR(name));
@@ -2536,8 +2511,8 @@ static void __init fixup_device_tree_maple_memory_controller(void)
         if (prom_getproplen(mc, "reg") != 8)
                 return;
 
-        prom_getprop(_prom->root, "#address-cells", &ac, sizeof(ac));
-        prom_getprop(_prom->root, "#size-cells", &sc, sizeof(sc));
+        prom_getprop(prom.root, "#address-cells", &ac, sizeof(ac));
+        prom_getprop(prom.root, "#size-cells", &sc, sizeof(sc));
         if ((ac != 2) || (sc != 2))
                 return;
 
@@ -2806,50 +2781,94 @@ static void __init fixup_device_tree(void)
 
 static void __init prom_find_boot_cpu(void)
 {
-        struct prom_t *_prom = &RELOC(prom);
         u32 getprop_rval;
         ihandle prom_cpu;
         phandle cpu_pkg;
 
-        _prom->cpu = 0;
-        if (prom_getprop(_prom->chosen, "cpu", &prom_cpu, sizeof(prom_cpu)) <= 0)
+        prom.cpu = 0;
+        if (prom_getprop(prom.chosen, "cpu", &prom_cpu, sizeof(prom_cpu)) <= 0)
                 return;
 
         cpu_pkg = call_prom("instance-to-package", 1, 1, prom_cpu);
 
         prom_getprop(cpu_pkg, "reg", &getprop_rval, sizeof(getprop_rval));
-        _prom->cpu = getprop_rval;
+        prom.cpu = getprop_rval;
 
-        prom_debug("Booting CPU hw index = %lu\n", _prom->cpu);
+        prom_debug("Booting CPU hw index = %lu\n", prom.cpu);
 }
 
 static void __init prom_check_initrd(unsigned long r3, unsigned long r4)
 {
 #ifdef CONFIG_BLK_DEV_INITRD
-        struct prom_t *_prom = &RELOC(prom);
-
         if (r3 && r4 && r4 != 0xdeadbeef) {
                 unsigned long val;
 
-                RELOC(prom_initrd_start) = is_kernel_addr(r3) ? __pa(r3) : r3;
-                RELOC(prom_initrd_end) = RELOC(prom_initrd_start) + r4;
+                prom_initrd_start = is_kernel_addr(r3) ? __pa(r3) : r3;
+                prom_initrd_end = prom_initrd_start + r4;
 
-                val = RELOC(prom_initrd_start);
-                prom_setprop(_prom->chosen, "/chosen", "linux,initrd-start",
+                val = prom_initrd_start;
+                prom_setprop(prom.chosen, "/chosen", "linux,initrd-start",
                              &val, sizeof(val));
-                val = RELOC(prom_initrd_end);
-                prom_setprop(_prom->chosen, "/chosen", "linux,initrd-end",
+                val = prom_initrd_end;
+                prom_setprop(prom.chosen, "/chosen", "linux,initrd-end",
                              &val, sizeof(val));
 
-                reserve_mem(RELOC(prom_initrd_start),
-                            RELOC(prom_initrd_end) - RELOC(prom_initrd_start));
+                reserve_mem(prom_initrd_start,
+                            prom_initrd_end - prom_initrd_start);
 
-                prom_debug("initrd_start=0x%x\n", RELOC(prom_initrd_start));
-                prom_debug("initrd_end=0x%x\n", RELOC(prom_initrd_end));
+                prom_debug("initrd_start=0x%x\n", prom_initrd_start);
+                prom_debug("initrd_end=0x%x\n", prom_initrd_end);
         }
 #endif /* CONFIG_BLK_DEV_INITRD */
 }
 
+#ifdef CONFIG_PPC64
+#ifdef CONFIG_RELOCATABLE
+static void reloc_toc(void)
+{
+}
+
+static void unreloc_toc(void)
+{
+}
+#else
+static void __reloc_toc(void *tocstart, unsigned long offset,
+                        unsigned long nr_entries)
+{
+        unsigned long i;
+        unsigned long *toc_entry = (unsigned long *)tocstart;
+
+        for (i = 0; i < nr_entries; i++) {
+                *toc_entry = *toc_entry + offset;
+                toc_entry++;
+        }
+}
+
+static void reloc_toc(void)
+{
+        unsigned long offset = reloc_offset();
+        unsigned long nr_entries =
+                (__prom_init_toc_end - __prom_init_toc_start) / sizeof(long);
+
+        /* Need to add offset to get at __prom_init_toc_start */
+        __reloc_toc(__prom_init_toc_start + offset, offset, nr_entries);
+
+        mb();
+}
+
+static void unreloc_toc(void)
+{
+        unsigned long offset = reloc_offset();
+        unsigned long nr_entries =
+                (__prom_init_toc_end - __prom_init_toc_start) / sizeof(long);
+
+        mb();
+
+        /* __prom_init_toc_start has been relocated, no need to add offset */
+        __reloc_toc(__prom_init_toc_start, -offset, nr_entries);
+}
+#endif
+#endif
 
 /*
  * We enter here early on, when the Open Firmware prom is still
@@ -2861,20 +2880,19 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
                                unsigned long r6, unsigned long r7,
                                unsigned long kbase)
 {       
-        struct prom_t *_prom;
         unsigned long hdr;
 
 #ifdef CONFIG_PPC32
         unsigned long offset = reloc_offset();
         reloc_got2(offset);
+#else
+        reloc_toc();
 #endif
 
-        _prom = &RELOC(prom);
-
         /*
          * First zero the BSS
          */
-        memset(&RELOC(__bss_start), 0, __bss_stop - __bss_start);
+        memset(&__bss_start, 0, __bss_stop - __bss_start);
 
         /*
          * Init interface to Open Firmware, get some node references,
@@ -2893,14 +2911,14 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          */
         prom_init_stdout();
 
-        prom_printf("Preparing to boot %s", RELOC(linux_banner));
+        prom_printf("Preparing to boot %s", linux_banner);
 
         /*
          * Get default machine type. At this point, we do not differentiate
          * between pSeries SMP and pSeries LPAR
          */
-        RELOC(of_platform) = prom_find_machine_type();
-        prom_printf("Detected machine type: %x\n", RELOC(of_platform));
+        of_platform = prom_find_machine_type();
+        prom_printf("Detected machine type: %x\n", of_platform);
 
 #ifndef CONFIG_NONSTATIC_KERNEL
         /* Bail if this is a kdump kernel. */
@@ -2917,15 +2935,15 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
         /*
          * On pSeries, inform the firmware about our capabilities
          */
-        if (RELOC(of_platform) == PLATFORM_PSERIES ||
-            RELOC(of_platform) == PLATFORM_PSERIES_LPAR)
+        if (of_platform == PLATFORM_PSERIES ||
+            of_platform == PLATFORM_PSERIES_LPAR)
                 prom_send_capabilities();
 #endif
 
         /*
          * Copy the CPU hold code
          */
-        if (RELOC(of_platform) != PLATFORM_POWERMAC)
+        if (of_platform != PLATFORM_POWERMAC)
                 copy_and_flush(0, kbase, 0x100, 0);
 
         /*
@@ -2954,7 +2972,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          * that uses the allocator, we need to make sure we get the top of memory
          * available for us here...
          */
-        if (RELOC(of_platform) == PLATFORM_PSERIES)
+        if (of_platform == PLATFORM_PSERIES)
                 prom_initialize_tce_table();
 #endif
 
@@ -2962,19 +2980,19 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          * On non-powermacs, try to instantiate RTAS. PowerMacs don't
          * have a usable RTAS implementation.
          */
-        if (RELOC(of_platform) != PLATFORM_POWERMAC &&
-            RELOC(of_platform) != PLATFORM_OPAL)
+        if (of_platform != PLATFORM_POWERMAC &&
+            of_platform != PLATFORM_OPAL)
                 prom_instantiate_rtas();
 
 #ifdef CONFIG_PPC_POWERNV
         /* Detect HAL and try instanciating it & doing takeover */
-        if (RELOC(of_platform) == PLATFORM_PSERIES_LPAR) {
+        if (of_platform == PLATFORM_PSERIES_LPAR) {
                 prom_query_opal();
-                if (RELOC(of_platform) == PLATFORM_OPAL) {
+                if (of_platform == PLATFORM_OPAL) {
                         prom_opal_hold_cpus();
                         prom_opal_takeover();
                 }
-        } else if (RELOC(of_platform) == PLATFORM_OPAL)
+        } else if (of_platform == PLATFORM_OPAL)
                 prom_instantiate_opal();
 #endif
 
@@ -2988,32 +3006,32 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          *
          * PowerMacs use a different mechanism to spin CPUs
          */
-        if (RELOC(of_platform) != PLATFORM_POWERMAC &&
-            RELOC(of_platform) != PLATFORM_OPAL)
+        if (of_platform != PLATFORM_POWERMAC &&
+            of_platform != PLATFORM_OPAL)
                 prom_hold_cpus();
 
         /*
          * Fill in some infos for use by the kernel later on
          */
-        if (RELOC(prom_memory_limit))
-                prom_setprop(_prom->chosen, "/chosen", "linux,memory-limit",
-                             &RELOC(prom_memory_limit),
+        if (prom_memory_limit)
+                prom_setprop(prom.chosen, "/chosen", "linux,memory-limit",
+                             &prom_memory_limit,
                              sizeof(prom_memory_limit));
 #ifdef CONFIG_PPC64
-        if (RELOC(prom_iommu_off))
-                prom_setprop(_prom->chosen, "/chosen", "linux,iommu-off",
+        if (prom_iommu_off)
+                prom_setprop(prom.chosen, "/chosen", "linux,iommu-off",
                              NULL, 0);
 
-        if (RELOC(prom_iommu_force_on))
-                prom_setprop(_prom->chosen, "/chosen", "linux,iommu-force-on",
+        if (prom_iommu_force_on)
+                prom_setprop(prom.chosen, "/chosen", "linux,iommu-force-on",
                              NULL, 0);
 
-        if (RELOC(prom_tce_alloc_start)) {
-                prom_setprop(_prom->chosen, "/chosen", "linux,tce-alloc-start",
-                             &RELOC(prom_tce_alloc_start),
+        if (prom_tce_alloc_start) {
+                prom_setprop(prom.chosen, "/chosen", "linux,tce-alloc-start",
+                             &prom_tce_alloc_start,
                              sizeof(prom_tce_alloc_start));
-                prom_setprop(_prom->chosen, "/chosen", "linux,tce-alloc-end",
-                             &RELOC(prom_tce_alloc_end),
+                prom_setprop(prom.chosen, "/chosen", "linux,tce-alloc-end",
+                             &prom_tce_alloc_end,
                              sizeof(prom_tce_alloc_end));
         }
 #endif
@@ -3035,8 +3053,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          * closed stdin already (in particular the powerbook 101). It
          * appears that the OPAL version of OFW doesn't like it either.
          */
-        if (RELOC(of_platform) != PLATFORM_POWERMAC &&
-            RELOC(of_platform) != PLATFORM_OPAL)
+        if (of_platform != PLATFORM_POWERMAC &&
+            of_platform != PLATFORM_OPAL)
                 prom_close_stdin();
 
         /*
@@ -3051,22 +3069,24 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          * tree and NULL as r5, thus triggering the new entry point which
          * is common to us and kexec
          */
-        hdr = RELOC(dt_header_start);
+        hdr = dt_header_start;
 
         /* Don't print anything after quiesce under OPAL, it crashes OFW */
-        if (RELOC(of_platform) != PLATFORM_OPAL) {
+        if (of_platform != PLATFORM_OPAL) {
                 prom_printf("returning from prom_init\n");
                 prom_debug("->dt_header_start=0x%x\n", hdr);
         }
 
 #ifdef CONFIG_PPC32
         reloc_got2(-offset);
+#else
+        unreloc_toc();
 #endif
 
 #ifdef CONFIG_PPC_EARLY_DEBUG_OPAL
         /* OPAL early debug gets the OPAL base & entry in r8 and r9 */
         __start(hdr, kbase, 0, 0, 0,
-                RELOC(prom_opal_base), RELOC(prom_opal_entry));
+                prom_opal_base, prom_opal_entry);
 #else
         __start(hdr, kbase, 0, 0, 0, 0, 0);
 #endif
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 70f4286eaa7a..3765da6be4f2 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -22,7 +22,7 @@ __secondary_hold_acknowledge __secondary_hold_spinloop __start
 strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224
 reloc_got2 kernstart_addr memstart_addr linux_banner _stext
 opal_query_takeover opal_do_takeover opal_enter_rtas opal_secondary_entry
-boot_command_line"
+boot_command_line __prom_init_toc_start __prom_init_toc_end"
 
 NM="$1"
 OBJ="$2"
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index c4970004d44d..245c1b6a0858 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -179,6 +179,30 @@ static int set_user_msr(struct task_struct *task, unsigned long msr)
         return 0;
 }
 
+#ifdef CONFIG_PPC64
+static unsigned long get_user_dscr(struct task_struct *task)
+{
+        return task->thread.dscr;
+}
+
+static int set_user_dscr(struct task_struct *task, unsigned long dscr)
+{
+        task->thread.dscr = dscr;
+        task->thread.dscr_inherit = 1;
+        return 0;
+}
+#else
+static unsigned long get_user_dscr(struct task_struct *task)
+{
+        return -EIO;
+}
+
+static int set_user_dscr(struct task_struct *task, unsigned long dscr)
+{
+        return -EIO;
+}
+#endif
+
 /*
  * We prevent mucking around with the reserved area of trap
  * which are used internally by the kernel.
@@ -200,6 +224,9 @@ unsigned long ptrace_get_reg(struct task_struct *task, int regno)
         if (regno == PT_MSR)
                 return get_user_msr(task);
 
+        if (regno == PT_DSCR)
+                return get_user_dscr(task);
+
         if (regno < (sizeof(struct pt_regs) / sizeof(unsigned long)))
                 return ((unsigned long *)task->thread.regs)[regno];
 
@@ -218,6 +245,8 @@ int ptrace_put_reg(struct task_struct *task, int regno, unsigned long data)
                 return set_user_msr(task, data);
         if (regno == PT_TRAP)
                 return set_user_trap(task, data);
+        if (regno == PT_DSCR)
+                return set_user_dscr(task, data);
 
         if (regno <= PT_MAX_PUT_REG) {
                 ((unsigned long *)task->thread.regs)[regno] = data;
@@ -905,6 +934,9 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
         struct perf_event *bp;
         struct perf_event_attr attr;
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
+#ifndef CONFIG_PPC_ADV_DEBUG_REGS
+        struct arch_hw_breakpoint hw_brk;
+#endif
 
         /* For ppc64 we support one DABR and no IABR's at the moment (ppc64).
          *  For embedded processors we support one DAC and no IAC's at the
@@ -931,14 +963,17 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
          */
 
         /* Ensure breakpoint translation bit is set */
-        if (data && !(data & DABR_TRANSLATION))
+        if (data && !(data & HW_BRK_TYPE_TRANSLATE))
                 return -EIO;
+        hw_brk.address = data & (~HW_BRK_TYPE_DABR);
+        hw_brk.type = (data & HW_BRK_TYPE_DABR) | HW_BRK_TYPE_PRIV_ALL;
+        hw_brk.len = 8;
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
         if (ptrace_get_breakpoints(task) < 0)
                 return -ESRCH;
 
         bp = thread->ptrace_bps[0];
-        if ((!data) || !(data & (DABR_DATA_WRITE | DABR_DATA_READ))) {
+        if ((!data) || !(hw_brk.type & HW_BRK_TYPE_RDWR)) {
                 if (bp) {
                         unregister_hw_breakpoint(bp);
                         thread->ptrace_bps[0] = NULL;
@@ -948,10 +983,8 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
         }
         if (bp) {
                 attr = bp->attr;
-                attr.bp_addr = data & ~HW_BREAKPOINT_ALIGN;
-                arch_bp_generic_fields(data &
-                                        (DABR_DATA_WRITE | DABR_DATA_READ),
-                                                        &attr.bp_type);
+                attr.bp_addr = hw_brk.address;
+                arch_bp_generic_fields(hw_brk.type, &attr.bp_type);
 
                 /* Enable breakpoint */
                 attr.disabled = false;
@@ -963,16 +996,15 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
                 }
                 thread->ptrace_bps[0] = bp;
                 ptrace_put_breakpoints(task);
-                thread->dabr = data;
-                thread->dabrx = DABRX_ALL;
+                thread->hw_brk = hw_brk;
                 return 0;
         }
 
         /* Create a new breakpoint request if one doesn't exist already */
         hw_breakpoint_init(&attr);
-        attr.bp_addr = data & ~HW_BREAKPOINT_ALIGN;
-        arch_bp_generic_fields(data & (DABR_DATA_WRITE | DABR_DATA_READ),
-                                                                &attr.bp_type);
+        attr.bp_addr = hw_brk.address;
+        arch_bp_generic_fields(hw_brk.type,
+                               &attr.bp_type);
 
         thread->ptrace_bps[0] = bp = register_user_hw_breakpoint(&attr,
                                                ptrace_triggered, NULL, task);
@@ -985,10 +1017,7 @@ int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
         ptrace_put_breakpoints(task);
 
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
-
-        /* Move contents to the DABR register */
-        task->thread.dabr = data;
-        task->thread.dabrx = DABRX_ALL;
+        task->thread.hw_brk = hw_brk;
 #else /* CONFIG_PPC_ADV_DEBUG_REGS */
         /* As described above, it was assumed 3 bits were passed with the data
          *  address, but we will assume only the mode bits will be passed
@@ -1349,7 +1378,7 @@ static long ppc_set_hwdebug(struct task_struct *child,
         struct perf_event_attr attr;
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
 #ifndef CONFIG_PPC_ADV_DEBUG_REGS
-        unsigned long dabr;
+        struct arch_hw_breakpoint brk;
 #endif
 
         if (bp_info->version != 1)
@@ -1397,12 +1426,12 @@ static long ppc_set_hwdebug(struct task_struct *child,
         if ((unsigned long)bp_info->addr >= TASK_SIZE)
                 return -EIO;
 
-        dabr = (unsigned long)bp_info->addr & ~7UL;
-        dabr |= DABR_TRANSLATION;
+        brk.address = bp_info->addr & ~7UL;
+        brk.type = HW_BRK_TYPE_TRANSLATE;
         if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_READ)
-                dabr |= DABR_DATA_READ;
+                brk.type |= HW_BRK_TYPE_READ;
         if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_WRITE)
-                dabr |= DABR_DATA_WRITE;
+                brk.type |= HW_BRK_TYPE_WRITE;
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
         if (ptrace_get_breakpoints(child) < 0)
                 return -ESRCH;
@@ -1427,8 +1456,7 @@ static long ppc_set_hwdebug(struct task_struct *child,
         hw_breakpoint_init(&attr);
         attr.bp_addr = (unsigned long)bp_info->addr & ~HW_BREAKPOINT_ALIGN;
         attr.bp_len = len;
-        arch_bp_generic_fields(dabr & (DABR_DATA_WRITE | DABR_DATA_READ),
-                                                                &attr.bp_type);
+        arch_bp_generic_fields(brk.type, &attr.bp_type);
 
         thread->ptrace_bps[0] = bp = register_user_hw_breakpoint(&attr,
                                                ptrace_triggered, NULL, child);
@@ -1445,11 +1473,10 @@ static long ppc_set_hwdebug(struct task_struct *child,
         if (bp_info->addr_mode != PPC_BREAKPOINT_MODE_EXACT)
                 return -EINVAL;
 
-        if (child->thread.dabr)
+        if (child->thread.hw_brk.address)
                 return -ENOSPC;
 
-        child->thread.dabr = dabr;
-        child->thread.dabrx = DABRX_ALL;
+        child->thread.hw_brk = brk;
 
         return 1;
 #endif /* !CONFIG_PPC_ADV_DEBUG_DVCS */
@@ -1495,10 +1522,11 @@ static long ppc_del_hwdebug(struct task_struct *child, long data)
         ptrace_put_breakpoints(child);
         return ret;
 #else /* CONFIG_HAVE_HW_BREAKPOINT */
-        if (child->thread.dabr == 0)
+        if (child->thread.hw_brk.address == 0)
                 return -ENOENT;
 
-        child->thread.dabr = 0;
+        child->thread.hw_brk.address = 0;
+        child->thread.hw_brk.type = 0;
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
 
         return 0;
@@ -1642,6 +1670,9 @@ long arch_ptrace(struct task_struct *child, long request,
         }
 
         case PTRACE_GET_DEBUGREG: {
+#ifndef CONFIG_PPC_ADV_DEBUG_REGS
+                unsigned long dabr_fake;
+#endif
                 ret = -EINVAL;
                 /* We only support one DABR and no IABRS at the moment */
                 if (addr > 0)
@@ -1649,7 +1680,9 @@ long arch_ptrace(struct task_struct *child, long request,
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
                 ret = put_user(child->thread.dac1, datalp);
 #else
-                ret = put_user(child->thread.dabr, datalp);
+                dabr_fake = ((child->thread.hw_brk.address & (~HW_BRK_TYPE_DABR)) |
+                             (child->thread.hw_brk.type & HW_BRK_TYPE_DABR));
+                ret = put_user(dabr_fake, datalp);
 #endif
                 break;
         }
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 8c21658719d9..c0244e766834 100644
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -252,6 +252,9 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
         }
 
         case PTRACE_GET_DEBUGREG: {
+#ifndef CONFIG_PPC_ADV_DEBUG_REGS
+                unsigned long dabr_fake;
+#endif
                 ret = -EINVAL;
                 /* We only support one DABR and no IABRS at the moment */
                 if (addr > 0)
@@ -259,7 +262,10 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
                 ret = put_user(child->thread.dac1, (u32 __user *)data);
 #else
-                ret = put_user(child->thread.dabr, (u32 __user *)data);
+                dabr_fake = (
+                        (child->thread.hw_brk.address & (~HW_BRK_TYPE_DABR)) |
+                        (child->thread.hw_brk.type & HW_BRK_TYPE_DABR));
+                ret = put_user(dabr_fake, (u32 __user *)data);
 #endif
                 break;
         }
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6da881b35dac..75fbaceb5c87 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -156,6 +156,15 @@ early_param("smt-enabled", early_smt_enabled);
 #define check_smt_enabled()
 #endif /* CONFIG_SMP */
 
+/** Fix up paca fields required for the boot cpu */
+static void fixup_boot_paca(void)
+{
+        /* The boot cpu is started */
+        get_paca()->cpu_start = 1;
+        /* Allow percpu accesses to work until we setup percpu data */
+        get_paca()->data_offset = 0;
+}
+
 /*
  * Early initialization entry point. This is called by head.S
  * with MMU translation disabled. We rely on the "feature" of
@@ -177,6 +186,8 @@ early_param("smt-enabled", early_smt_enabled);
 
 void __init early_setup(unsigned long dt_ptr)
 {
+        static __initdata struct paca_struct boot_paca;
+
         /* -------- printk is _NOT_ safe to use here ! ------- */
 
         /* Identify CPU type */
@@ -185,6 +196,7 @@ void __init early_setup(unsigned long dt_ptr)
         /* Assume we're on cpu 0 for now. Don't write to the paca yet! */
         initialise_paca(&boot_paca, 0);
         setup_paca(&boot_paca);
+        fixup_boot_paca();
 
         /* Initialize lockdep early or else spinlocks will blow */
         lockdep_init();
@@ -205,11 +217,7 @@ void __init early_setup(unsigned long dt_ptr)
 
         /* Now we know the logical id of our boot cpu, setup the paca. */
         setup_paca(&paca[boot_cpuid]);
-
-        /* Fix up paca fields required for the boot cpu */
-        get_paca()->cpu_start = 1;
-        /* Allow percpu accesses to "work" until we setup percpu data */
-        get_paca()->data_offset = 0;
+        fixup_boot_paca();
 
         /* Probe the machine type */
         probe_machine();
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 3b997118df50..3003d890e9ef 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -130,8 +130,9 @@ static int do_signal(struct pt_regs *regs)
          * user space. The DABR will have been cleared if it
          * triggered inside the kernel.
          */
-        if (current->thread.dabr)
-                set_dabr(current->thread.dabr, current->thread.dabrx);
+        if (current->thread.hw_brk.address &&
+                current->thread.hw_brk.type)
+                set_breakpoint(&current->thread.hw_brk);
 #endif
         /* Re-enable the breakpoints for the signal stack */
         thread_change_pc(current, regs);
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
index e00acb413934..ec84c901ceab 100644
--- a/arch/powerpc/kernel/signal.h
+++ b/arch/powerpc/kernel/signal.h
@@ -25,13 +25,21 @@ extern int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
 
 extern unsigned long copy_fpr_to_user(void __user *to,
                                       struct task_struct *task);
+extern unsigned long copy_transact_fpr_to_user(void __user *to,
+                                               struct task_struct *task);
 extern unsigned long copy_fpr_from_user(struct task_struct *task,
                                         void __user *from);
+extern unsigned long copy_transact_fpr_from_user(struct task_struct *task,
+                                                 void __user *from);
 #ifdef CONFIG_VSX
 extern unsigned long copy_vsx_to_user(void __user *to,
                                       struct task_struct *task);
+extern unsigned long copy_transact_vsx_to_user(void __user *to,
+                                               struct task_struct *task);
 extern unsigned long copy_vsx_from_user(struct task_struct *task,
                                         void __user *from);
+extern unsigned long copy_transact_vsx_from_user(struct task_struct *task,
+                                                 void __user *from);
 #endif
 
 #ifdef CONFIG_PPC64
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 804e323c139d..e4a88d340de6 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -43,6 +43,7 @@
 #include <asm/sigcontext.h>
 #include <asm/vdso.h>
 #include <asm/switch_to.h>
+#include <asm/tm.h>
 #ifdef CONFIG_PPC64
 #include "ppc32.h"
 #include <asm/unistd.h>
@@ -293,6 +294,10 @@ long sys_sigaction(int sig, struct old_sigaction __user *act,
 struct sigframe {
         struct sigcontext sctx;         /* the sigcontext */
         struct mcontext mctx;           /* all the register values */
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        struct sigcontext sctx_transact;
+        struct mcontext mctx_transact;
+#endif
         /*
          * Programs using the rs6000/xcoff abi can save up to 19 gp
          * regs and 18 fp regs below sp before decrementing it.
@@ -321,6 +326,9 @@ struct rt_sigframe {
         struct siginfo info;
 #endif
         struct ucontext uc;
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        struct ucontext uc_transact;
+#endif
         /*
          * Programs using the rs6000/xcoff abi can save up to 19 gp
          * regs and 18 fp regs below sp before decrementing it.
@@ -381,6 +389,61 @@ unsigned long copy_vsx_from_user(struct task_struct *task,
                 task->thread.fpr[i][TS_VSRLOWOFFSET] = buf[i];
         return 0;
 }
+
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+unsigned long copy_transact_fpr_to_user(void __user *to,
+                                  struct task_struct *task)
+{
+        double buf[ELF_NFPREG];
+        int i;
+
+        /* save FPR copy to local buffer then write to the thread_struct */
+        for (i = 0; i < (ELF_NFPREG - 1) ; i++)
+                buf[i] = task->thread.TS_TRANS_FPR(i);
+        memcpy(&buf[i], &task->thread.transact_fpscr, sizeof(double));
+        return __copy_to_user(to, buf, ELF_NFPREG * sizeof(double));
+}
+
+unsigned long copy_transact_fpr_from_user(struct task_struct *task,
+                                          void __user *from)
+{
+        double buf[ELF_NFPREG];
+        int i;
+
+        if (__copy_from_user(buf, from, ELF_NFPREG * sizeof(double)))
+                return 1;
+        for (i = 0; i < (ELF_NFPREG - 1) ; i++)
+                task->thread.TS_TRANS_FPR(i) = buf[i];
+        memcpy(&task->thread.transact_fpscr, &buf[i], sizeof(double));
+
+        return 0;
+}
+
+unsigned long copy_transact_vsx_to_user(void __user *to,
+                                  struct task_struct *task)
+{
+        double buf[ELF_NVSRHALFREG];
+        int i;
+
+        /* save FPR copy to local buffer then write to the thread_struct */
+        for (i = 0; i < ELF_NVSRHALFREG; i++)
+                buf[i] = task->thread.transact_fpr[i][TS_VSRLOWOFFSET];
+        return __copy_to_user(to, buf, ELF_NVSRHALFREG * sizeof(double));
+}
+
+unsigned long copy_transact_vsx_from_user(struct task_struct *task,
+                                          void __user *from)
+{
+        double buf[ELF_NVSRHALFREG];
+        int i;
+
+        if (__copy_from_user(buf, from, ELF_NVSRHALFREG * sizeof(double)))
+                return 1;
+        for (i = 0; i < ELF_NVSRHALFREG ; i++)
+                task->thread.transact_fpr[i][TS_VSRLOWOFFSET] = buf[i];
+        return 0;
+}
+#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
 #else
 inline unsigned long copy_fpr_to_user(void __user *to,
                                       struct task_struct *task)
@@ -395,6 +458,22 @@ inline unsigned long copy_fpr_from_user(struct task_struct *task,
         return __copy_from_user(task->thread.fpr, from,
                               ELF_NFPREG * sizeof(double));
 }
+
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+inline unsigned long copy_transact_fpr_to_user(void __user *to,
+                                         struct task_struct *task)
+{
+        return __copy_to_user(to, task->thread.transact_fpr,
+                              ELF_NFPREG * sizeof(double));
+}
+
+inline unsigned long copy_transact_fpr_from_user(struct task_struct *task,
+                                                 void __user *from)
+{
+        return __copy_from_user(task->thread.transact_fpr, from,
+                                ELF_NFPREG * sizeof(double));
+}
+#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
 #endif
 
 /*
@@ -483,6 +562,156 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
         return 0;
 }
 
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+/*
+ * Save the current user registers on the user stack.
+ * We only save the altivec/spe registers if the process has used
+ * altivec/spe instructions at some point.
+ * We also save the transactional registers to a second ucontext in the
+ * frame.
+ *
+ * See save_user_regs() and signal_64.c:setup_tm_sigcontexts().
+ */
+static int save_tm_user_regs(struct pt_regs *regs,
+                             struct mcontext __user *frame,
+                             struct mcontext __user *tm_frame, int sigret)
+{
+        unsigned long msr = regs->msr;
+
+        /* tm_reclaim rolls back all reg states, updating thread.ckpt_regs,
+         * thread.transact_fpr[], thread.transact_vr[], etc.
+         */
+        tm_enable();
+        tm_reclaim(&current->thread, msr, TM_CAUSE_SIGNAL);
+
+        /* Make sure floating point registers are stored in regs */
+        flush_fp_to_thread(current);
+
+        /* Save both sets of general registers */
+        if (save_general_regs(&current->thread.ckpt_regs, frame)
+            || save_general_regs(regs, tm_frame))
+                return 1;
+
+        /* Stash the top half of the 64bit MSR into the 32bit MSR word
+         * of the transactional mcontext.  This way we have a backward-compatible
+         * MSR in the 'normal' (checkpointed) mcontext and additionally one can
+         * also look at what type of transaction (T or S) was active at the
+         * time of the signal.
+         */
+        if (__put_user((msr >> 32), &tm_frame->mc_gregs[PT_MSR]))
+                return 1;
+
+#ifdef CONFIG_ALTIVEC
+        /* save altivec registers */
+        if (current->thread.used_vr) {
+                flush_altivec_to_thread(current);
+                if (__copy_to_user(&frame->mc_vregs, current->thread.vr,
+                                   ELF_NVRREG * sizeof(vector128)))
+                        return 1;
+                if (msr & MSR_VEC) {
+                        if (__copy_to_user(&tm_frame->mc_vregs,
+                                           current->thread.transact_vr,
+                                           ELF_NVRREG * sizeof(vector128)))
+                                return 1;
+                } else {
+                        if (__copy_to_user(&tm_frame->mc_vregs,
+                                           current->thread.vr,
+                                           ELF_NVRREG * sizeof(vector128)))
+                                return 1;
+                }
+
+                /* set MSR_VEC in the saved MSR value to indicate that
+                 * frame->mc_vregs contains valid data
+                 */
+                msr |= MSR_VEC;
+        }
+
+        /* We always copy to/from vrsave, it's 0 if we don't have or don't
+         * use altivec. Since VSCR only contains 32 bits saved in the least
+         * significant bits of a vector, we "cheat" and stuff VRSAVE in the
+         * most significant bits of that same vector. --BenH
+         */
+        if (__put_user(current->thread.vrsave,
+                       (u32 __user *)&frame->mc_vregs[32]))
+                return 1;
+        if (msr & MSR_VEC) {
+                if (__put_user(current->thread.transact_vrsave,
+                               (u32 __user *)&tm_frame->mc_vregs[32]))
+                        return 1;
+        } else {
+                if (__put_user(current->thread.vrsave,
+                               (u32 __user *)&tm_frame->mc_vregs[32]))
+                        return 1;
+        }
+#endif /* CONFIG_ALTIVEC */
+
+        if (copy_fpr_to_user(&frame->mc_fregs, current))
+                return 1;
+        if (msr & MSR_FP) {
+                if (copy_transact_fpr_to_user(&tm_frame->mc_fregs, current))
+                        return 1;
+        } else {
+                if (copy_fpr_to_user(&tm_frame->mc_fregs, current))
+                        return 1;
+        }
+
+#ifdef CONFIG_VSX
+        /*
+         * Copy VSR 0-31 upper half from thread_struct to local
+         * buffer, then write that to userspace.  Also set MSR_VSX in
+         * the saved MSR value to indicate that frame->mc_vregs
+         * contains valid data
+         */
+        if (current->thread.used_vsr) {
+                __giveup_vsx(current);
+                if (copy_vsx_to_user(&frame->mc_vsregs, current))
+                        return 1;
+                if (msr & MSR_VSX) {
+                        if (copy_transact_vsx_to_user(&tm_frame->mc_vsregs,
+                                                      current))
+                                return 1;
+                } else {
+                        if (copy_vsx_to_user(&tm_frame->mc_vsregs, current))
+                                return 1;
+                }
+
+                msr |= MSR_VSX;
+        }
+#endif /* CONFIG_VSX */
+#ifdef CONFIG_SPE
+        /* SPE regs are not checkpointed with TM, so this section is
+         * simply the same as in save_user_regs().
+         */
+        if (current->thread.used_spe) {
+                flush_spe_to_thread(current);
+                if (__copy_to_user(&frame->mc_vregs, current->thread.evr,
+                                   ELF_NEVRREG * sizeof(u32)))
+                        return 1;
+                /* set MSR_SPE in the saved MSR value to indicate that
+                 * frame->mc_vregs contains valid data */
+                msr |= MSR_SPE;
+        }
+
+        /* We always copy to/from spefscr */
+        if (__put_user(current->thread.spefscr, (u32 __user *)&frame->mc_vregs + ELF_NEVRREG))
+                return 1;
+#endif /* CONFIG_SPE */
+
+        if (__put_user(msr, &frame->mc_gregs[PT_MSR]))
+                return 1;
+        if (sigret) {
+                /* Set up the sigreturn trampoline: li r0,sigret; sc */
+                if (__put_user(0x38000000UL + sigret, &frame->tramp[0])
+                    || __put_user(0x44000002UL, &frame->tramp[1]))
+                        return 1;
+                flush_icache_range((unsigned long) &frame->tramp[0],
+                                   (unsigned long) &frame->tramp[2]);
+        }
+
+        return 0;
+}
+#endif
+
 /*
  * Restore the current user register values from the user stack,
  * (except for MSR).
@@ -588,6 +817,139 @@ static long restore_user_regs(struct pt_regs *regs,
         return 0;
 }
 
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+/*
+ * Restore the current user register values from the user stack, except for
+ * MSR, and recheckpoint the original checkpointed register state for processes
+ * in transactions.
+ */
+static long restore_tm_user_regs(struct pt_regs *regs,
+                                 struct mcontext __user *sr,
+                                 struct mcontext __user *tm_sr)
+{
+        long err;
+        unsigned long msr;
+#ifdef CONFIG_VSX
+        int i;
+#endif
+
+        /*
+         * restore general registers but not including MSR or SOFTE. Also
+         * take care of keeping r2 (TLS) intact if not a signal.
+         * See comment in signal_64.c:restore_tm_sigcontexts();
+         * TFHAR is restored from the checkpointed NIP; TEXASR and TFIAR
+         * were set by the signal delivery.
+         */
+        err = restore_general_regs(regs, tm_sr);
+        err |= restore_general_regs(&current->thread.ckpt_regs, sr);
+
+        err |= __get_user(current->thread.tm_tfhar, &sr->mc_gregs[PT_NIP]);
+
+        err |= __get_user(msr, &sr->mc_gregs[PT_MSR]);
+        if (err)
+                return 1;
+
+        /* Restore the previous little-endian mode */
+        regs->msr = (regs->msr & ~MSR_LE) | (msr & MSR_LE);
+
+        /*
+         * Do this before updating the thread state in
+         * current->thread.fpr/vr/evr.  That way, if we get preempted
+         * and another task grabs the FPU/Altivec/SPE, it won't be
+         * tempted to save the current CPU state into the thread_struct
+         * and corrupt what we are writing there.
+         */
+        discard_lazy_cpu_state();
+
+#ifdef CONFIG_ALTIVEC
+        regs->msr &= ~MSR_VEC;
+        if (msr & MSR_VEC) {
+                /* restore altivec registers from the stack */
+                if (__copy_from_user(current->thread.vr, &sr->mc_vregs,
+                                     sizeof(sr->mc_vregs)) ||
+                    __copy_from_user(current->thread.transact_vr,
+                                     &tm_sr->mc_vregs,
+                                     sizeof(sr->mc_vregs)))
+                        return 1;
+        } else if (current->thread.used_vr) {
+                memset(current->thread.vr, 0, ELF_NVRREG * sizeof(vector128));
+                memset(current->thread.transact_vr, 0,
+                       ELF_NVRREG * sizeof(vector128));
+        }
+
+        /* Always get VRSAVE back */
+        if (__get_user(current->thread.vrsave,
+                       (u32 __user *)&sr->mc_vregs[32]) ||
+            __get_user(current->thread.transact_vrsave,
+                       (u32 __user *)&tm_sr->mc_vregs[32]))
+                return 1;
+#endif /* CONFIG_ALTIVEC */
+
+        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1);
+
+        if (copy_fpr_from_user(current, &sr->mc_fregs) ||
+            copy_transact_fpr_from_user(current, &tm_sr->mc_fregs))
+                return 1;
+
+#ifdef CONFIG_VSX
+        regs->msr &= ~MSR_VSX;
+        if (msr & MSR_VSX) {
+                /*
+                 * Restore altivec registers from the stack to a local
+                 * buffer, then write this out to the thread_struct
+                 */
+                if (copy_vsx_from_user(current, &sr->mc_vsregs) ||
+                    copy_transact_vsx_from_user(current, &tm_sr->mc_vsregs))
+                        return 1;
+        } else if (current->thread.used_vsr)
+                for (i = 0; i < 32 ; i++) {
+                        current->thread.fpr[i][TS_VSRLOWOFFSET] = 0;
+                        current->thread.transact_fpr[i][TS_VSRLOWOFFSET] = 0;
+                }
+#endif /* CONFIG_VSX */
+
+#ifdef CONFIG_SPE
+        /* SPE regs are not checkpointed with TM, so this section is
+         * simply the same as in restore_user_regs().
+         */
+        regs->msr &= ~MSR_SPE;
+        if (msr & MSR_SPE) {
+                if (__copy_from_user(current->thread.evr, &sr->mc_vregs,
+                                     ELF_NEVRREG * sizeof(u32)))
+                        return 1;
+        } else if (current->thread.used_spe)
+                memset(current->thread.evr, 0, ELF_NEVRREG * sizeof(u32));
+
+        /* Always get SPEFSCR back */
+        if (__get_user(current->thread.spefscr, (u32 __user *)&sr->mc_vregs
+                       + ELF_NEVRREG))
+                return 1;
+#endif /* CONFIG_SPE */
+
+        /* Now, recheckpoint.  This loads up all of the checkpointed (older)
+         * registers, including FP and V[S]Rs.  After recheckpointing, the
+         * transactional versions should be loaded.
+         */
+        tm_enable();
+        /* This loads the checkpointed FP/VEC state, if used */
+        tm_recheckpoint(&current->thread, msr);
+        /* The task has moved into TM state S, so ensure MSR reflects this */
+        regs->msr = (regs->msr & ~MSR_TS_MASK) | MSR_TS_S;
+
+        /* This loads the speculative FP/VEC state, if used */
+        if (msr & MSR_FP) {
+                do_load_up_transact_fpu(&current->thread);
+                regs->msr |= (MSR_FP | current->thread.fpexc_mode);
+        }
+        if (msr & MSR_VEC) {
+                do_load_up_transact_altivec(&current->thread);
+                regs->msr |= MSR_VEC;
+        }
+
+        return 0;
+}
+#endif
+
 #ifdef CONFIG_PPC64
 long compat_sys_rt_sigaction(int sig, const struct sigaction32 __user *act,
                 struct sigaction32 __user *oact, size_t sigsetsize)
@@ -827,6 +1189,8 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
         struct mcontext __user *frame;
         void __user *addr;
         unsigned long newsp = 0;
+        int sigret;
+        unsigned long tramp;
 
         /* Set up Signal Frame */
         /* Put a Real Time Context onto stack */
@@ -838,7 +1202,6 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
         /* Put the siginfo & fill in most of the ucontext */
         if (copy_siginfo_to_user(&rt_sf->info, info)
             || __put_user(0, &rt_sf->uc.uc_flags)
-            || __put_user(0, &rt_sf->uc.uc_link)
             || __put_user(current->sas_ss_sp, &rt_sf->uc.uc_stack.ss_sp)
             || __put_user(sas_ss_flags(regs->gpr[1]),
                           &rt_sf->uc.uc_stack.ss_flags)
@@ -852,14 +1215,37 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
         frame = &rt_sf->uc.uc_mcontext;
         addr = frame;
         if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
-                if (save_user_regs(regs, frame, 0, 1))
-                        goto badframe;
-                regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
+                sigret = 0;
+                tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
         } else {
-                if (save_user_regs(regs, frame, __NR_rt_sigreturn, 1))
+                sigret = __NR_rt_sigreturn;
+                tramp = (unsigned long) frame->tramp;
+        }
+
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        if (MSR_TM_ACTIVE(regs->msr)) {
+                if (save_tm_user_regs(regs, &rt_sf->uc.uc_mcontext,
+                                      &rt_sf->uc_transact.uc_mcontext, sigret))
                         goto badframe;
-                regs->link = (unsigned long) frame->tramp;
         }
+        else
+#endif
+                if (save_user_regs(regs, frame, sigret, 1))
+                        goto badframe;
+        regs->link = tramp;
+
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        if (MSR_TM_ACTIVE(regs->msr)) {
+                if (__put_user((unsigned long)&rt_sf->uc_transact,
+                               &rt_sf->uc.uc_link)
+                    || __put_user(to_user_ptr(&rt_sf->uc_transact.uc_mcontext),
+                                  &rt_sf->uc_transact.uc_regs))
+                        goto badframe;
+        }
+        else
+#endif
+                if (__put_user(0, &rt_sf->uc.uc_link))
+                        goto badframe;
 
         current->thread.fpscr.val = 0;  /* turn off all fp exceptions */
 
@@ -878,6 +1264,13 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
         regs->nip = (unsigned long) ka->sa.sa_handler;
         /* enter the signal handler in big-endian mode */
         regs->msr &= ~MSR_LE;
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        /* Remove TM bits from thread's MSR.  The MSR in the sigcontext
+         * just indicates to userland that we were doing a transaction, but we
+         * don't want to return in transactional state:
+         */
+        regs->msr &= ~MSR_TS_MASK;
+#endif
         return 1;
 
 badframe:
@@ -925,6 +1318,35 @@ static int do_setcontext(struct ucontext __user *ucp, struct pt_regs *regs, int
         return 0;
 }
 
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+static int do_setcontext_tm(struct ucontext __user *ucp,
+                            struct ucontext __user *tm_ucp,
+                            struct pt_regs *regs)
+{
+        sigset_t set;
+        struct mcontext __user *mcp;
+        struct mcontext __user *tm_mcp;
+        u32 cmcp;
+        u32 tm_cmcp;
+
+        if (get_sigset_t(&set, &ucp->uc_sigmask))
+                return -EFAULT;
+
+        if (__get_user(cmcp, &ucp->uc_regs) ||
+            __get_user(tm_cmcp, &tm_ucp->uc_regs))
+                return -EFAULT;
+        mcp = (struct mcontext __user *)(u64)cmcp;
+        tm_mcp = (struct mcontext __user *)(u64)tm_cmcp;
+        /* no need to check access_ok(mcp), since mcp < 4GB */
+
+        set_current_blocked(&set);
+        if (restore_tm_user_regs(regs, mcp, tm_mcp))
+                return -EFAULT;
+
+        return 0;
+}
+#endif
+
 long sys_swapcontext(struct ucontext __user *old_ctx,
                      struct ucontext __user *new_ctx,
                      int ctx_size, int r6, int r7, int r8, struct pt_regs *regs)
@@ -1020,7 +1442,12 @@ long sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
                      struct pt_regs *regs)
 {
         struct rt_sigframe __user *rt_sf;
-
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        struct ucontext __user *uc_transact;
+        unsigned long msr_hi;
+        unsigned long tmp;
+        int tm_restore = 0;
+#endif
         /* Always make any pending restarted system calls return -EINTR */
         current_thread_info()->restart_block.fn = do_no_restart_syscall;
 
@@ -1028,6 +1455,34 @@ long sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
                 (regs->gpr[1] + __SIGNAL_FRAMESIZE + 16);
         if (!access_ok(VERIFY_READ, rt_sf, sizeof(*rt_sf)))
                 goto bad;
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        if (__get_user(tmp, &rt_sf->uc.uc_link))
+                goto bad;
+        uc_transact = (struct ucontext __user *)(uintptr_t)tmp;
+        if (uc_transact) {
+                u32 cmcp;
+                struct mcontext __user *mcp;
+
+                if (__get_user(cmcp, &uc_transact->uc_regs))
+                        return -EFAULT;
+                mcp = (struct mcontext __user *)(u64)cmcp;
+                /* The top 32 bits of the MSR are stashed in the transactional
+                 * ucontext. */
+                if (__get_user(msr_hi, &mcp->mc_gregs[PT_MSR]))
+                        goto bad;
+
+                if (MSR_TM_SUSPENDED(msr_hi<<32)) {
+                        /* We only recheckpoint on return if we're
+                         * transaction.
+                         */
+                        tm_restore = 1;
+                        if (do_setcontext_tm(&rt_sf->uc, uc_transact, regs))
+                                goto bad;
+                }
+        }
+        if (!tm_restore)
+                /* Fall through, for non-TM restore */
+#endif
         if (do_setcontext(&rt_sf->uc, regs, 1))
                 goto bad;
 
@@ -1179,6 +1634,8 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
         struct sigcontext __user *sc;
         struct sigframe __user *frame;
         unsigned long newsp = 0;
+        int sigret;
+        unsigned long tramp;
 
         /* Set up Signal Frame */
         frame = get_sigframe(ka, regs, sizeof(*frame), 1);
@@ -1201,14 +1658,25 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
                 goto badframe;
 
         if (vdso32_sigtramp && current->mm->context.vdso_base) {
-                if (save_user_regs(regs, &frame->mctx, 0, 1))
-                        goto badframe;
-                regs->link = current->mm->context.vdso_base + vdso32_sigtramp;
+                sigret = 0;
+                tramp = current->mm->context.vdso_base + vdso32_sigtramp;
         } else {
-                if (save_user_regs(regs, &frame->mctx, __NR_sigreturn, 1))
+                sigret = __NR_sigreturn;
+                tramp = (unsigned long) frame->mctx.tramp;
+        }
+
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        if (MSR_TM_ACTIVE(regs->msr)) {
+                if (save_tm_user_regs(regs, &frame->mctx, &frame->mctx_transact,
+                                      sigret))
                         goto badframe;
-                regs->link = (unsigned long) frame->mctx.tramp;
         }
+        else
+#endif
+                if (save_user_regs(regs, &frame->mctx, sigret, 1))
+                        goto badframe;
+
+        regs->link = tramp;
 
         current->thread.fpscr.val = 0;  /* turn off all fp exceptions */
 
@@ -1223,7 +1691,13 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
         regs->nip = (unsigned long) ka->sa.sa_handler;
         /* enter the signal handler in big-endian mode */
         regs->msr &= ~MSR_LE;
-
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        /* Remove TM bits from thread's MSR.  The MSR in the sigcontext
+         * just indicates to userland that we were doing a transaction, but we
+         * don't want to return in transactional state:
+         */
+        regs->msr &= ~MSR_TS_MASK;
+#endif
         return 1;
 
 badframe:
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 1ca045d44324..7a76ee48a952 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -34,6 +34,7 @@
 #include <asm/syscalls.h>
 #include <asm/vdso.h>
 #include <asm/switch_to.h>
+#include <asm/tm.h>
 
 #include "signal.h"
 
@@ -56,6 +57,9 @@
 struct rt_sigframe {
         /* sys_rt_sigreturn requires the ucontext be the first field */
         struct ucontext uc;
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        struct ucontext uc_transact;
+#endif
         unsigned long _unused[2];
         unsigned int tramp[TRAMP_SIZE];
         struct siginfo __user *pinfo;
@@ -145,6 +149,145 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
         return err;
 }
 
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+/*
+ * As above, but Transactional Memory is in use, so deliver sigcontexts
+ * containing checkpointed and transactional register states.
+ *
+ * To do this, we treclaim to gather both sets of registers and set up the
+ * 'normal' sigcontext registers with rolled-back register values such that a
+ * simple signal handler sees a correct checkpointed register state.
+ * If interested, a TM-aware sighandler can examine the transactional registers
+ * in the 2nd sigcontext to determine the real origin of the signal.
+ */
+static long setup_tm_sigcontexts(struct sigcontext __user *sc,
+                                 struct sigcontext __user *tm_sc,
+                                 struct pt_regs *regs,
+                                 int signr, sigset_t *set, unsigned long handler)
+{
+        /* When CONFIG_ALTIVEC is set, we _always_ setup v_regs even if the
+         * process never used altivec yet (MSR_VEC is zero in pt_regs of
+         * the context). This is very important because we must ensure we
+         * don't lose the VRSAVE content that may have been set prior to
+         * the process doing its first vector operation
+         * Userland shall check AT_HWCAP to know wether it can rely on the
+         * v_regs pointer or not.
+         */
+#ifdef CONFIG_ALTIVEC
+        elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)
+                (((unsigned long)sc->vmx_reserve + 15) & ~0xful);
+        elf_vrreg_t __user *tm_v_regs = (elf_vrreg_t __user *)
+                (((unsigned long)tm_sc->vmx_reserve + 15) & ~0xful);
+#endif
+        unsigned long msr = regs->msr;
+        long err = 0;
+
+        BUG_ON(!MSR_TM_ACTIVE(regs->msr));
+
+        /* tm_reclaim rolls back all reg states, saving checkpointed (older)
+         * GPRs to thread.ckpt_regs and (if used) FPRs to (newer)
+         * thread.transact_fp and/or VRs to (newer) thread.transact_vr.
+         * THEN we save out FP/VRs, if necessary, to the checkpointed (older)
+         * thread.fr[]/vr[]s.  The transactional (newer) GPRs are on the
+         * stack, in *regs.
+         */
+        tm_enable();
+        tm_reclaim(&current->thread, msr, TM_CAUSE_SIGNAL);
+
+        flush_fp_to_thread(current);
+
+#ifdef CONFIG_ALTIVEC
+        err |= __put_user(v_regs, &sc->v_regs);
+        err |= __put_user(tm_v_regs, &tm_sc->v_regs);
+
+        /* save altivec registers */
+        if (current->thread.used_vr) {
+                flush_altivec_to_thread(current);
+                /* Copy 33 vec registers (vr0..31 and vscr) to the stack */
+                err |= __copy_to_user(v_regs, current->thread.vr,
+                                      33 * sizeof(vector128));
+                /* If VEC was enabled there are transactional VRs valid too,
+                 * else they're a copy of the checkpointed VRs.
+                 */
+                if (msr & MSR_VEC)
+                        err |= __copy_to_user(tm_v_regs,
+                                              current->thread.transact_vr,
+                                              33 * sizeof(vector128));
+                else
+                        err |= __copy_to_user(tm_v_regs,
+                                              current->thread.vr,
+                                              33 * sizeof(vector128));
+
+                /* set MSR_VEC in the MSR value in the frame to indicate
+                 * that sc->v_reg contains valid data.
+                 */
+                msr |= MSR_VEC;
+        }
+        /* We always copy to/from vrsave, it's 0 if we don't have or don't
+         * use altivec.
+         */
+        err |= __put_user(current->thread.vrsave, (u32 __user *)&v_regs[33]);
+        if (msr & MSR_VEC)
+                err |= __put_user(current->thread.transact_vrsave,
+                                  (u32 __user *)&tm_v_regs[33]);
+        else
+                err |= __put_user(current->thread.vrsave,
+                                  (u32 __user *)&tm_v_regs[33]);
+
+#else /* CONFIG_ALTIVEC */
+        err |= __put_user(0, &sc->v_regs);
+        err |= __put_user(0, &tm_sc->v_regs);
+#endif /* CONFIG_ALTIVEC */
+
+        /* copy fpr regs and fpscr */
+        err |= copy_fpr_to_user(&sc->fp_regs, current);
+        if (msr & MSR_FP)
+                err |= copy_transact_fpr_to_user(&tm_sc->fp_regs, current);
+        else
+                err |= copy_fpr_to_user(&tm_sc->fp_regs, current);
+
+#ifdef CONFIG_VSX
+        /*
+         * Copy VSX low doubleword to local buffer for formatting,
+         * then out to userspace.  Update v_regs to point after the
+         * VMX data.
+         */
+        if (current->thread.used_vsr) {
+                __giveup_vsx(current);
+                v_regs += ELF_NVRREG;
+                tm_v_regs += ELF_NVRREG;
+
+                err |= copy_vsx_to_user(v_regs, current);
+
+                if (msr & MSR_VSX)
+                        err |= copy_transact_vsx_to_user(tm_v_regs, current);
+                else
+                        err |= copy_vsx_to_user(tm_v_regs, current);
+
+                /* set MSR_VSX in the MSR value in the frame to
+                 * indicate that sc->vs_reg) contains valid data.
+                 */
+                msr |= MSR_VSX;
+        }
+#endif /* CONFIG_VSX */
+
+        err |= __put_user(&sc->gp_regs, &sc->regs);
+        err |= __put_user(&tm_sc->gp_regs, &tm_sc->regs);
+        WARN_ON(!FULL_REGS(regs));
+        err |= __copy_to_user(&tm_sc->gp_regs, regs, GP_REGS_SIZE);
+        err |= __copy_to_user(&sc->gp_regs,
+                              &current->thread.ckpt_regs, GP_REGS_SIZE);
+        err |= __put_user(msr, &tm_sc->gp_regs[PT_MSR]);
+        err |= __put_user(msr, &sc->gp_regs[PT_MSR]);
+        err |= __put_user(signr, &sc->signal);
+        err |= __put_user(handler, &sc->handler);
+        if (set != NULL)
+                err |=  __put_user(set->sig[0], &sc->oldmask);
+
+        return err;
+}
+#endif
+
 /*
  * Restore the sigcontext from the signal frame.
  */
@@ -241,6 +384,153 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
         return err;
 }
 
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+/*
+ * Restore the two sigcontexts from the frame of a transactional processes.
+ */
+
+static long restore_tm_sigcontexts(struct pt_regs *regs,
+                                   struct sigcontext __user *sc,
+                                   struct sigcontext __user *tm_sc)
+{
+#ifdef CONFIG_ALTIVEC
+        elf_vrreg_t __user *v_regs, *tm_v_regs;
+#endif
+        unsigned long err = 0;
+        unsigned long msr;
+#ifdef CONFIG_VSX
+        int i;
+#endif
+        /* copy the GPRs */
+        err |= __copy_from_user(regs->gpr, tm_sc->gp_regs, sizeof(regs->gpr));
+        err |= __copy_from_user(&current->thread.ckpt_regs, sc->gp_regs,
+                                sizeof(regs->gpr));
+
+        /*
+         * TFHAR is restored from the checkpointed 'wound-back' ucontext's NIP.
+         * TEXASR was set by the signal delivery reclaim, as was TFIAR.
+         * Users doing anything abhorrent like thread-switching w/ signals for
+         * TM-Suspended code will have to back TEXASR/TFIAR up themselves.
+         * For the case of getting a signal and simply returning from it,
+         * we don't need to re-copy them here.
+         */
+        err |= __get_user(regs->nip, &tm_sc->gp_regs[PT_NIP]);
+        err |= __get_user(current->thread.tm_tfhar, &sc->gp_regs[PT_NIP]);
+
+        /* get MSR separately, transfer the LE bit if doing signal return */
+        err |= __get_user(msr, &sc->gp_regs[PT_MSR]);
+        regs->msr = (regs->msr & ~MSR_LE) | (msr & MSR_LE);
+
+        /* The following non-GPR non-FPR non-VR state is also checkpointed: */
+        err |= __get_user(regs->ctr, &tm_sc->gp_regs[PT_CTR]);
+        err |= __get_user(regs->link, &tm_sc->gp_regs[PT_LNK]);
+        err |= __get_user(regs->xer, &tm_sc->gp_regs[PT_XER]);
+        err |= __get_user(regs->ccr, &tm_sc->gp_regs[PT_CCR]);
+        err |= __get_user(current->thread.ckpt_regs.ctr,
+                          &sc->gp_regs[PT_CTR]);
+        err |= __get_user(current->thread.ckpt_regs.link,
+                          &sc->gp_regs[PT_LNK]);
+        err |= __get_user(current->thread.ckpt_regs.xer,
+                          &sc->gp_regs[PT_XER]);
+        err |= __get_user(current->thread.ckpt_regs.ccr,
+                          &sc->gp_regs[PT_CCR]);
+
+        /* These regs are not checkpointed; they can go in 'regs'. */
+        err |= __get_user(regs->trap, &sc->gp_regs[PT_TRAP]);
+        err |= __get_user(regs->dar, &sc->gp_regs[PT_DAR]);
+        err |= __get_user(regs->dsisr, &sc->gp_regs[PT_DSISR]);
+        err |= __get_user(regs->result, &sc->gp_regs[PT_RESULT]);
+
+        /*
+         * Do this before updating the thread state in
+         * current->thread.fpr/vr.  That way, if we get preempted
+         * and another task grabs the FPU/Altivec, it won't be
+         * tempted to save the current CPU state into the thread_struct
+         * and corrupt what we are writing there.
+         */
+        discard_lazy_cpu_state();
+
+        /*
+         * Force reload of FP/VEC.
+         * This has to be done before copying stuff into current->thread.fpr/vr
+         * for the reasons explained in the previous comment.
+         */
+        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC | MSR_VSX);
+
+#ifdef CONFIG_ALTIVEC
+        err |= __get_user(v_regs, &sc->v_regs);
+        err |= __get_user(tm_v_regs, &tm_sc->v_regs);
+        if (err)
+                return err;
+        if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128)))
+                return -EFAULT;
+        if (tm_v_regs && !access_ok(VERIFY_READ,
+                                    tm_v_regs, 34 * sizeof(vector128)))
+                return -EFAULT;
+        /* Copy 33 vec registers (vr0..31 and vscr) from the stack */
+        if (v_regs != 0 && tm_v_regs != 0 && (msr & MSR_VEC) != 0) {
+                err |= __copy_from_user(current->thread.vr, v_regs,
+                                        33 * sizeof(vector128));
+                err |= __copy_from_user(current->thread.transact_vr, tm_v_regs,
+                                        33 * sizeof(vector128));
+        }
+        else if (current->thread.used_vr) {
+                memset(current->thread.vr, 0, 33 * sizeof(vector128));
+                memset(current->thread.transact_vr, 0, 33 * sizeof(vector128));
+        }
+        /* Always get VRSAVE back */
+        if (v_regs != 0 && tm_v_regs != 0) {
+                err |= __get_user(current->thread.vrsave,
+                                  (u32 __user *)&v_regs[33]);
+                err |= __get_user(current->thread.transact_vrsave,
+                                  (u32 __user *)&tm_v_regs[33]);
+        }
+        else {
+                current->thread.vrsave = 0;
+                current->thread.transact_vrsave = 0;
+        }
+#endif /* CONFIG_ALTIVEC */
+        /* restore floating point */
+        err |= copy_fpr_from_user(current, &sc->fp_regs);
+        err |= copy_transact_fpr_from_user(current, &tm_sc->fp_regs);
+#ifdef CONFIG_VSX
+        /*
+         * Get additional VSX data. Update v_regs to point after the
+         * VMX data.  Copy VSX low doubleword from userspace to local
+         * buffer for formatting, then into the taskstruct.
+         */
+        if (v_regs && ((msr & MSR_VSX) != 0)) {
+                v_regs += ELF_NVRREG;
+                tm_v_regs += ELF_NVRREG;
+                err |= copy_vsx_from_user(current, v_regs);
+                err |= copy_transact_vsx_from_user(current, tm_v_regs);
+        } else {
+                for (i = 0; i < 32 ; i++) {
+                        current->thread.fpr[i][TS_VSRLOWOFFSET] = 0;
+                        current->thread.transact_fpr[i][TS_VSRLOWOFFSET] = 0;
+                }
+        }
+#endif
+        tm_enable();
+        /* This loads the checkpointed FP/VEC state, if used */
+        tm_recheckpoint(&current->thread, msr);
+        /* The task has moved into TM state S, so ensure MSR reflects this: */
+        regs->msr = (regs->msr & ~MSR_TS_MASK) | __MASK(33);
+
+        /* This loads the speculative FP/VEC state, if used */
+        if (msr & MSR_FP) {
+                do_load_up_transact_fpu(&current->thread);
+                regs->msr |= (MSR_FP | current->thread.fpexc_mode);
+        }
+        if (msr & MSR_VEC) {
+                do_load_up_transact_altivec(&current->thread);
+                regs->msr |= MSR_VEC;
+        }
+
+        return err;
+}
+#endif
+
 /*
  * Setup the trampoline code on the stack
  */
@@ -355,6 +645,9 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
 {
         struct ucontext __user *uc = (struct ucontext __user *)regs->gpr[1];
         sigset_t set;
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        unsigned long msr;
+#endif
 
         /* Always make any pending restarted system calls return -EINTR */
         current_thread_info()->restart_block.fn = do_no_restart_syscall;
@@ -365,6 +658,21 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
         if (__copy_from_user(&set, &uc->uc_sigmask, sizeof(set)))
                 goto badframe;
         set_current_blocked(&set);
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        if (__get_user(msr, &uc->uc_mcontext.gp_regs[PT_MSR]))
+                goto badframe;
+        if (MSR_TM_SUSPENDED(msr)) {
+                /* We recheckpoint on return. */
+                struct ucontext __user *uc_transact;
+                if (__get_user(uc_transact, &uc->uc_link))
+                        goto badframe;
+                if (restore_tm_sigcontexts(regs, &uc->uc_mcontext,
+                                           &uc_transact->uc_mcontext))
+                        goto badframe;
+        }
+        else
+        /* Fall through, for non-TM restore */
+#endif
         if (restore_sigcontext(regs, NULL, 1, &uc->uc_mcontext))
                 goto badframe;
 
@@ -415,19 +723,42 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
-        err |= __put_user(0, &frame->uc.uc_link);
         err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
         err |= __put_user(sas_ss_flags(regs->gpr[1]),
                           &frame->uc.uc_stack.ss_flags);
         err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
-        err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, signr, NULL,
-                                (unsigned long)ka->sa.sa_handler, 1);
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        if (MSR_TM_ACTIVE(regs->msr)) {
+                /* The ucontext_t passed to userland points to the second
+                 * ucontext_t (for transactional state) with its uc_link ptr.
+                 */
+                err |= __put_user(&frame->uc_transact, &frame->uc.uc_link);
+                err |= setup_tm_sigcontexts(&frame->uc.uc_mcontext,
+                                            &frame->uc_transact.uc_mcontext,
+                                            regs, signr,
+                                            NULL,
+                                            (unsigned long)ka->sa.sa_handler);
+        } else
+#endif
+        {
+                err |= __put_user(0, &frame->uc.uc_link);
+                err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, signr,
+                                        NULL, (unsigned long)ka->sa.sa_handler,
+                                        1);
+        }
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         if (err)
                 goto badframe;
 
         /* Make sure signal handler doesn't get spurious FP exceptions */
         current->thread.fpscr.val = 0;
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        /* Remove TM bits from thread's MSR.  The MSR in the sigcontext
+         * just indicates to userland that we were doing a transaction, but we
+         * don't want to return in transactional state:
+         */
+        regs->msr &= ~MSR_TS_MASK;
+#endif
 
         /* Set up to return from userspace. */
         if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 793401e65088..76bd9da8cb71 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -610,7 +610,7 @@ static struct device_node *cpu_to_l2cache(int cpu)
 }
 
 /* Activate a secondary processor. */
-void start_secondary(void *unused)
+__cpuinit void start_secondary(void *unused)
 {
         unsigned int cpu = smp_processor_id();
         struct device_node *l2_cache;
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
new file mode 100644
index 000000000000..84dbace657ce
--- /dev/null
+++ b/arch/powerpc/kernel/tm.S
@@ -0,0 +1,388 @@
+/*
+ * Transactional memory support routines to reclaim and recheckpoint
+ * transactional process state.
+ *
+ * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation.
+ */
+
+#include <asm/asm-offsets.h>
+#include <asm/ppc_asm.h>
+#include <asm/ppc-opcode.h>
+#include <asm/ptrace.h>
+#include <asm/reg.h>
+
+#ifdef CONFIG_VSX
+/* See fpu.S, this is very similar but to save/restore checkpointed FPRs/VSRs */
+#define __SAVE_32FPRS_VSRS_TRANSACT(n,c,base)   \
+BEGIN_FTR_SECTION                               \
+        b       2f;                             \
+END_FTR_SECTION_IFSET(CPU_FTR_VSX);             \
+        SAVE_32FPRS_TRANSACT(n,base);           \
+        b       3f;                             \
+2:      SAVE_32VSRS_TRANSACT(n,c,base);         \
+3:
+/* ...and this is just plain borrowed from there. */
+#define __REST_32FPRS_VSRS(n,c,base)            \
+BEGIN_FTR_SECTION                               \
+        b       2f;                             \
+END_FTR_SECTION_IFSET(CPU_FTR_VSX);             \
+        REST_32FPRS(n,base);                    \
+        b       3f;                             \
+2:      REST_32VSRS(n,c,base);                  \
+3:
+#else
+#define __SAVE_32FPRS_VSRS_TRANSACT(n,c,base) SAVE_32FPRS_TRANSACT(n, base)
+#define __REST_32FPRS_VSRS(n,c,base)          REST_32FPRS(n, base)
+#endif
+#define SAVE_32FPRS_VSRS_TRANSACT(n,c,base) \
+        __SAVE_32FPRS_VSRS_TRANSACT(n,__REG_##c,__REG_##base)
+#define REST_32FPRS_VSRS(n,c,base) \
+        __REST_32FPRS_VSRS(n,__REG_##c,__REG_##base)
+
+/* Stack frame offsets for local variables. */
+#define TM_FRAME_L0     TM_FRAME_SIZE-16
+#define TM_FRAME_L1     TM_FRAME_SIZE-8
+#define STACK_PARAM(x)  (48+((x)*8))
+
+
+/* In order to access the TM SPRs, TM must be enabled.  So, do so: */
+_GLOBAL(tm_enable)
+        mfmsr   r4
+        li      r3, MSR_TM >> 32
+        sldi    r3, r3, 32
+        and.    r0, r4, r3
+        bne     1f
+        or      r4, r4, r3
+        mtmsrd  r4
+1:      blr
+
+_GLOBAL(tm_save_sprs)
+        mfspr   r0, SPRN_TFHAR
+        std     r0, THREAD_TM_TFHAR(r3)
+        mfspr   r0, SPRN_TEXASR
+        std     r0, THREAD_TM_TEXASR(r3)
+        mfspr   r0, SPRN_TFIAR
+        std     r0, THREAD_TM_TFIAR(r3)
+        blr
+
+_GLOBAL(tm_restore_sprs)
+        ld      r0, THREAD_TM_TFHAR(r3)
+        mtspr   SPRN_TFHAR, r0
+        ld      r0, THREAD_TM_TEXASR(r3)
+        mtspr   SPRN_TEXASR, r0
+        ld      r0, THREAD_TM_TFIAR(r3)
+        mtspr   SPRN_TFIAR, r0
+        blr
+
+        /* Passed an 8-bit failure cause as first argument. */
+_GLOBAL(tm_abort)
+        TABORT(R3)
+        blr
+
+
+/* void tm_reclaim(struct thread_struct *thread,
+ *                 unsigned long orig_msr,
+ *                 uint8_t cause)
+ *
+ *      - Performs a full reclaim.  This destroys outstanding
+ *        transactions and updates thread->regs.tm_ckpt_* with the
+ *        original checkpointed state.  Note that thread->regs is
+ *        unchanged.
+ *      - FP regs are written back to thread->transact_fpr before
+ *        reclaiming.  These are the transactional (current) versions.
+ *
+ * Purpose is to both abort transactions of, and preserve the state of,
+ * a transactions at a context switch. We preserve/restore both sets of process
+ * state to restore them when the thread's scheduled again.  We continue in
+ * userland as though nothing happened, but when the transaction is resumed
+ * they will abort back to the checkpointed state we save out here.
+ *
+ * Call with IRQs off, stacks get all out of sync for some periods in here!
+ */
+_GLOBAL(tm_reclaim)
+        mfcr    r6
+        mflr    r0
+        std     r6, 8(r1)
+        std     r0, 16(r1)
+        std     r2, 40(r1)
+        stdu    r1, -TM_FRAME_SIZE(r1)
+
+        /* We've a struct pt_regs at [r1+STACK_FRAME_OVERHEAD]. */
+
+        std     r3, STACK_PARAM(0)(r1)
+        SAVE_NVGPRS(r1)
+
+        mfmsr   r14
+        mr      r15, r14
+        ori     r15, r15, MSR_FP
+        oris    r15, r15, MSR_VEC@h
+#ifdef CONFIG_VSX
+        BEGIN_FTR_SECTION
+        oris    r15,r15, MSR_VSX@h
+        END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif
+        mtmsrd  r15
+        std     r14, TM_FRAME_L0(r1)
+
+        /* Stash the stack pointer away for use after reclaim */
+        std     r1, PACAR1(r13)
+
+        /* ******************** FPR/VR/VSRs ************
+         * Before reclaiming, capture the current/transactional FPR/VR
+        * versions /if used/.
+         *
+         * (If VSX used, FP and VMX are implied.  Or, we don't need to look
+         * at MSR.VSX as copying FP regs if .FP, vector regs if .VMX covers it.)
+         *
+         * We're passed the thread's MSR as parameter 2.
+         *
+         * We enabled VEC/FP/VSX in the msr above, so we can execute these
+         * instructions!
+         */
+        andis.          r0, r4, MSR_VEC@h
+        beq     dont_backup_vec
+
+        SAVE_32VRS_TRANSACT(0, r6, r3)  /* r6 scratch, r3 thread */
+        mfvscr  vr0
+        li      r6, THREAD_TRANSACT_VSCR
+        stvx    vr0, r3, r6
+        mfspr   r0, SPRN_VRSAVE
+        std     r0, THREAD_TRANSACT_VRSAVE(r3)
+
+dont_backup_vec:
+        andi.   r0, r4, MSR_FP
+        beq     dont_backup_fp
+
+        SAVE_32FPRS_VSRS_TRANSACT(0, R6, R3)    /* r6 scratch, r3 thread */
+
+        mffs    fr0
+        stfd    fr0,THREAD_TRANSACT_FPSCR(r3)
+
+dont_backup_fp:
+        /* The moment we treclaim, ALL of our GPRs will switch
+         * to user register state.  (FPRs, CCR etc. also!)
+         * Use an sprg and a tm_scratch in the PACA to shuffle.
+         */
+        TRECLAIM(R5)                            /* Cause in r5 */
+
+        /* ******************** GPRs ******************** */
+        /* Stash the checkpointed r13 away in the scratch SPR and get the real
+         *  paca
+         */
+        SET_SCRATCH0(r13)
+        GET_PACA(r13)
+
+        /* Stash the checkpointed r1 away in paca tm_scratch and get the real
+         * stack pointer back
+         */
+        std     r1, PACATMSCRATCH(r13)
+        ld      r1, PACAR1(r13)
+
+        /* Now get some more GPRS free */
+        std     r7, GPR7(r1)                    /* Temporary stash */
+        std     r12, GPR12(r1)                  /* ''   ''    ''   */
+        ld      r12, STACK_PARAM(0)(r1)         /* Param 0, thread_struct * */
+
+        addi    r7, r12, PT_CKPT_REGS           /* Thread's ckpt_regs */
+
+        /* Make r7 look like an exception frame so that we
+         * can use the neat GPRx(n) macros.  r7 is NOT a pt_regs ptr!
+         */
+        subi    r7, r7, STACK_FRAME_OVERHEAD
+
+        /* Sync the userland GPRs 2-12, 14-31 to thread->regs: */
+        SAVE_GPR(0, r7)                         /* user r0 */
+        SAVE_GPR(2, r7)                 /* user r2 */
+        SAVE_4GPRS(3, r7)                       /* user r3-r6 */
+        SAVE_4GPRS(8, r7)                       /* user r8-r11 */
+        ld      r3, PACATMSCRATCH(r13)          /* user r1 */
+        ld      r4, GPR7(r1)                    /* user r7 */
+        ld      r5, GPR12(r1)                   /* user r12 */
+        GET_SCRATCH0(6)                         /* user r13 */
+        std     r3, GPR1(r7)
+        std     r4, GPR7(r7)
+        std     r5, GPR12(r7)
+        std     r6, GPR13(r7)
+
+        SAVE_NVGPRS(r7)                         /* user r14-r31 */
+
+        /* ******************** NIP ******************** */
+        mfspr   r3, SPRN_TFHAR
+        std     r3, _NIP(r7)                    /* Returns to failhandler */
+        /* The checkpointed NIP is ignored when rescheduling/rechkpting,
+         * but is used in signal return to 'wind back' to the abort handler.
+         */
+
+        /* ******************** CR,LR,CCR,MSR ********** */
+        mfctr   r3
+        mflr    r4
+        mfcr    r5
+        mfxer   r6
+
+        std     r3, _CTR(r7)
+        std     r4, _LINK(r7)
+        std     r5, _CCR(r7)
+        std     r6, _XER(r7)
+
+        /* MSR and flags:  We don't change CRs, and we don't need to alter
+         * MSR.
+         */
+
+        /* TM regs, incl TEXASR -- these live in thread_struct.  Note they've
+         * been updated by the treclaim, to explain to userland the failure
+         * cause (aborted).
+         */
+        mfspr   r0, SPRN_TEXASR
+        mfspr   r3, SPRN_TFHAR
+        mfspr   r4, SPRN_TFIAR
+        std     r0, THREAD_TM_TEXASR(r12)
+        std     r3, THREAD_TM_TFHAR(r12)
+        std     r4, THREAD_TM_TFIAR(r12)
+
+        /* AMR and PPR are checkpointed too, but are unsupported by Linux. */
+
+        /* Restore original MSR/IRQ state & clear TM mode */
+        ld      r14, TM_FRAME_L0(r1)            /* Orig MSR */
+        li      r15, 0
+        rldimi  r14, r15, MSR_TS_LG, (63-MSR_TS_LG)-1
+        mtmsrd  r14
+
+        REST_NVGPRS(r1)
+
+        addi    r1, r1, TM_FRAME_SIZE
+        ld      r4, 8(r1)
+        ld      r0, 16(r1)
+        mtcr    r4
+        mtlr    r0
+        ld      r2, 40(r1)
+        blr
+
+
+        /* void tm_recheckpoint(struct thread_struct *thread,
+         *                      unsigned long orig_msr)
+         *      - Restore the checkpointed register state saved by tm_reclaim
+         *        when we switch_to a process.
+         *
+         *      Call with IRQs off, stacks get all out of sync for
+         *      some periods in here!
+         */
+_GLOBAL(tm_recheckpoint)
+        mfcr    r5
+        mflr    r0
+        std     r5, 8(r1)
+        std     r0, 16(r1)
+        std     r2, 40(r1)
+        stdu    r1, -TM_FRAME_SIZE(r1)
+
+        /* We've a struct pt_regs at [r1+STACK_FRAME_OVERHEAD].
+         * This is used for backing up the NVGPRs:
+         */
+        SAVE_NVGPRS(r1)
+
+        std     r1, PACAR1(r13)
+
+        /* Load complete register state from ts_ckpt* registers */
+
+        addi    r7, r3, PT_CKPT_REGS            /* Thread's ckpt_regs */
+
+        /* Make r7 look like an exception frame so that we
+         * can use the neat GPRx(n) macros.  r7 is now NOT a pt_regs ptr!
+         */
+        subi    r7, r7, STACK_FRAME_OVERHEAD
+
+        SET_SCRATCH0(r1)
+
+        mfmsr   r6
+        /* R4 = original MSR to indicate whether thread used FP/Vector etc. */
+
+        /* Enable FP/vec in MSR if necessary! */
+        lis     r5, MSR_VEC@h
+        ori     r5, r5, MSR_FP
+        and.    r5, r4, r5
+        beq     restore_gprs                    /* if neither, skip both */
+
+#ifdef CONFIG_VSX
+        BEGIN_FTR_SECTION
+        oris    r5, r5, MSR_VSX@h
+        END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif
+        or      r5, r6, r5                      /* Set MSR.FP+.VSX/.VEC */
+        mtmsr   r5
+
+        /* FP and VEC registers:  These are recheckpointed from thread.fpr[]
+         * and thread.vr[] respectively.  The thread.transact_fpr[] version
+         * is more modern, and will be loaded subsequently by any FPUnavailable
+         * trap.
+         */
+        andis.  r0, r4, MSR_VEC@h
+        beq     dont_restore_vec
+
+        li      r5, THREAD_VSCR
+        lvx     vr0, r3, r5
+        mtvscr  vr0
+        REST_32VRS(0, r5, r3)                   /* r5 scratch, r3 THREAD ptr */
+        ld      r5, THREAD_VRSAVE(r3)
+        mtspr   SPRN_VRSAVE, r5
+
+dont_restore_vec:
+        andi.   r0, r4, MSR_FP
+        beq     dont_restore_fp
+
+        lfd     fr0, THREAD_FPSCR(r3)
+        MTFSF_L(fr0)
+        REST_32FPRS_VSRS(0, R4, R3)
+
+dont_restore_fp:
+        mtmsr   r6                              /* FP/Vec off again! */
+
+restore_gprs:
+        /* ******************** CR,LR,CCR,MSR ********** */
+        ld      r3, _CTR(r7)
+        ld      r4, _LINK(r7)
+        ld      r5, _CCR(r7)
+        ld      r6, _XER(r7)
+
+        mtctr   r3
+        mtlr    r4
+        mtcr    r5
+        mtxer   r6
+
+        /* MSR and flags:  We don't change CRs, and we don't need to alter
+         * MSR.
+         */
+
+        REST_4GPRS(0, r7)                       /* GPR0-3 */
+        REST_GPR(4, r7)                         /* GPR4-6 */
+        REST_GPR(5, r7)
+        REST_GPR(6, r7)
+        REST_4GPRS(8, r7)                       /* GPR8-11 */
+        REST_2GPRS(12, r7)                      /* GPR12-13 */
+
+        REST_NVGPRS(r7)                         /* GPR14-31 */
+
+        ld      r7, GPR7(r7)                    /* GPR7 */
+
+        /* Commit register state as checkpointed state: */
+        TRECHKPT
+
+        /* Our transactional state has now changed.
+         *
+         * Now just get out of here.  Transactional (current) state will be
+         * updated once restore is called on the return path in the _switch-ed
+         * -to process.
+         */
+
+        GET_PACA(r13)
+        GET_SCRATCH0(r1)
+
+        REST_NVGPRS(r1)
+
+        addi    r1, r1, TM_FRAME_SIZE
+        ld      r4, 8(r1)
+        ld      r0, 16(r1)
+        mtcr    r4
+        mtlr    r0
+        ld      r2, 40(r1)
+        blr
+
+        /* ****************************************************************** */
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 32518401af68..f9b751b29558 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -58,6 +58,7 @@
 #include <asm/rio.h>
 #include <asm/fadump.h>
 #include <asm/switch_to.h>
+#include <asm/tm.h>
 #include <asm/debug.h>
 
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
@@ -66,7 +67,7 @@ int (*__debugger_ipi)(struct pt_regs *regs) __read_mostly;
 int (*__debugger_bpt)(struct pt_regs *regs) __read_mostly;
 int (*__debugger_sstep)(struct pt_regs *regs) __read_mostly;
 int (*__debugger_iabr_match)(struct pt_regs *regs) __read_mostly;
-int (*__debugger_dabr_match)(struct pt_regs *regs) __read_mostly;
+int (*__debugger_break_match)(struct pt_regs *regs) __read_mostly;
 int (*__debugger_fault_handler)(struct pt_regs *regs) __read_mostly;
 
 EXPORT_SYMBOL(__debugger);
@@ -74,10 +75,17 @@ EXPORT_SYMBOL(__debugger_ipi);
 EXPORT_SYMBOL(__debugger_bpt);
 EXPORT_SYMBOL(__debugger_sstep);
 EXPORT_SYMBOL(__debugger_iabr_match);
-EXPORT_SYMBOL(__debugger_dabr_match);
+EXPORT_SYMBOL(__debugger_break_match);
 EXPORT_SYMBOL(__debugger_fault_handler);
 #endif
 
+/* Transactional Memory trap debug */
+#ifdef TM_DEBUG_SW
+#define TM_DEBUG(x...) printk(KERN_INFO x)
+#else
+#define TM_DEBUG(x...) do { } while(0)
+#endif
+
 /*
  * Trap & Exception support
  */
@@ -350,6 +358,7 @@ static inline int check_io_access(struct pt_regs *regs)
    exception is in the MSR. */
 #define get_reason(regs)        ((regs)->msr)
 #define get_mc_reason(regs)     ((regs)->msr)
+#define REASON_TM               0x200000
 #define REASON_FP               0x100000
 #define REASON_ILLEGAL          0x80000
 #define REASON_PRIVILEGED       0x40000
@@ -1020,6 +1029,38 @@ void __kprobes program_check_exception(struct pt_regs *regs)
                 _exception(SIGTRAP, regs, TRAP_BRKPT, regs->nip);
                 return;
         }
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        if (reason & REASON_TM) {
+                /* This is a TM "Bad Thing Exception" program check.
+                 * This occurs when:
+                 * -  An rfid/hrfid/mtmsrd attempts to cause an illegal
+                 *    transition in TM states.
+                 * -  A trechkpt is attempted when transactional.
+                 * -  A treclaim is attempted when non transactional.
+                 * -  A tend is illegally attempted.
+                 * -  writing a TM SPR when transactional.
+                 */
+                if (!user_mode(regs) &&
+                    report_bug(regs->nip, regs) == BUG_TRAP_TYPE_WARN) {
+                        regs->nip += 4;
+                        return;
+                }
+                /* If usermode caused this, it's done something illegal and
+                 * gets a SIGILL slap on the wrist.  We call it an illegal
+                 * operand to distinguish from the instruction just being bad
+                 * (e.g. executing a 'tend' on a CPU without TM!); it's an
+                 * illegal /placement/ of a valid instruction.
+                 */
+                if (user_mode(regs)) {
+                        _exception(SIGILL, regs, ILL_ILLOPN, regs->nip);
+                        return;
+                } else {
+                        printk(KERN_EMERG "Unexpected TM Bad Thing exception "
+                               "at %lx (msr 0x%x)\n", regs->nip, reason);
+                        die("Unrecoverable exception", regs, SIGABRT);
+                }
+        }
+#endif
 
         /* We restore the interrupt state now */
         if (!arch_irq_disabled_regs(regs))
@@ -1160,6 +1201,109 @@ void vsx_unavailable_exception(struct pt_regs *regs)
         die("Unrecoverable VSX Unavailable Exception", regs, SIGABRT);
 }
 
+void tm_unavailable_exception(struct pt_regs *regs)
+{
+        /* We restore the interrupt state now */
+        if (!arch_irq_disabled_regs(regs))
+                local_irq_enable();
+
+        /* Currently we never expect a TMU exception.  Catch
+         * this and kill the process!
+         */
+        printk(KERN_EMERG "Unexpected TM unavailable exception at %lx "
+               "(msr %lx)\n",
+               regs->nip, regs->msr);
+
+        if (user_mode(regs)) {
+                _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
+                return;
+        }
+
+        die("Unexpected TM unavailable exception", regs, SIGABRT);
+}
+
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+
+extern void do_load_up_fpu(struct pt_regs *regs);
+
+void fp_unavailable_tm(struct pt_regs *regs)
+{
+        /* Note:  This does not handle any kind of FP laziness. */
+
+        TM_DEBUG("FP Unavailable trap whilst transactional at 0x%lx, MSR=%lx\n",
+                 regs->nip, regs->msr);
+        tm_enable();
+
+        /* We can only have got here if the task started using FP after
+         * beginning the transaction.  So, the transactional regs are just a
+         * copy of the checkpointed ones.  But, we still need to recheckpoint
+         * as we're enabling FP for the process; it will return, abort the
+         * transaction, and probably retry but now with FP enabled.  So the
+         * checkpointed FP registers need to be loaded.
+         */
+        tm_reclaim(&current->thread, current->thread.regs->msr,
+                   TM_CAUSE_FAC_UNAV);
+        /* Reclaim didn't save out any FPRs to transact_fprs. */
+
+        /* Enable FP for the task: */
+        regs->msr |= (MSR_FP | current->thread.fpexc_mode);
+
+        /* This loads and recheckpoints the FP registers from
+         * thread.fpr[].  They will remain in registers after the
+         * checkpoint so we don't need to reload them after.
+         */
+        tm_recheckpoint(&current->thread, regs->msr);
+}
+
+#ifdef CONFIG_ALTIVEC
+extern void do_load_up_altivec(struct pt_regs *regs);
+
+void altivec_unavailable_tm(struct pt_regs *regs)
+{
+        /* See the comments in fp_unavailable_tm().  This function operates
+         * the same way.
+         */
+
+        TM_DEBUG("Vector Unavailable trap whilst transactional at 0x%lx,"
+                 "MSR=%lx\n",
+                 regs->nip, regs->msr);
+        tm_enable();
+        tm_reclaim(&current->thread, current->thread.regs->msr,
+                   TM_CAUSE_FAC_UNAV);
+        regs->msr |= MSR_VEC;
+        tm_recheckpoint(&current->thread, regs->msr);
+        current->thread.used_vr = 1;
+}
+#endif
+
+#ifdef CONFIG_VSX
+void vsx_unavailable_tm(struct pt_regs *regs)
+{
+        /* See the comments in fp_unavailable_tm().  This works similarly,
+         * though we're loading both FP and VEC registers in here.
+         *
+         * If FP isn't in use, load FP regs.  If VEC isn't in use, load VEC
+         * regs.  Either way, set MSR_VSX.
+         */
+
+        TM_DEBUG("VSX Unavailable trap whilst transactional at 0x%lx,"
+                 "MSR=%lx\n",
+                 regs->nip, regs->msr);
+
+        tm_enable();
+        /* This reclaims FP and/or VR regs if they're already enabled */
+        tm_reclaim(&current->thread, current->thread.regs->msr,
+                   TM_CAUSE_FAC_UNAV);
+
+        regs->msr |= MSR_VEC | MSR_FP | current->thread.fpexc_mode |
+                MSR_VSX;
+        /* This loads & recheckpoints FP and VRs. */
+        tm_recheckpoint(&current->thread, regs->msr);
+        current->thread.used_vsr = 1;
+}
+#endif
+#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
+
 void performance_monitor_exception(struct pt_regs *regs)
 {
         __get_cpu_var(irq_stat).pmu_irqs++;
@@ -1515,7 +1659,7 @@ void unrecoverable_exception(struct pt_regs *regs)
         die("Unrecoverable exception", regs, SIGABRT);
 }
 
-#ifdef CONFIG_BOOKE_WDT
+#if defined(CONFIG_BOOKE_WDT) || defined(CONFIG_40x)
 /*
  * Default handler for a Watchdog exception,
  * spins until a reboot occurs
diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S
index e830289d2e48..9e20999aaef2 100644
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
@@ -7,6 +7,57 @@
 #include <asm/page.h>
 #include <asm/ptrace.h>
 
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+/*
+ * Wrapper to call load_up_altivec from C.
+ * void do_load_up_altivec(struct pt_regs *regs);
+ */
+_GLOBAL(do_load_up_altivec)
+        mflr    r0
+        std     r0, 16(r1)
+        stdu    r1, -112(r1)
+
+        subi    r6, r3, STACK_FRAME_OVERHEAD
+        /* load_up_altivec expects r12=MSR, r13=PACA, and returns
+         * with r12 = new MSR.
+         */
+        ld      r12,_MSR(r6)
+        GET_PACA(r13)
+        bl      load_up_altivec
+        std     r12,_MSR(r6)
+
+        ld      r0, 112+16(r1)
+        addi    r1, r1, 112
+        mtlr    r0
+        blr
+
+/* void do_load_up_transact_altivec(struct thread_struct *thread)
+ *
+ * This is similar to load_up_altivec but for the transactional version of the
+ * vector regs.  It doesn't mess with the task MSR or valid flags.
+ * Furthermore, VEC laziness is not supported with TM currently.
+ */
+_GLOBAL(do_load_up_transact_altivec)
+        mfmsr   r6
+        oris    r5,r6,MSR_VEC@h
+        MTMSRD(r5)
+        isync
+
+        li      r4,1
+        stw     r4,THREAD_USED_VR(r3)
+
+        li      r10,THREAD_TRANSACT_VSCR
+        lvx     vr0,r10,r3
+        mtvscr  vr0
+        REST_32VRS_TRANSACT(0,r4,r3)
+
+        /* Disable VEC again. */
+        MTMSRD(r6)
+        isync
+
+        blr
+#endif
+
 /*
  * load_up_altivec(unused, unused, tsk)
  * Disable VMX for the task which had it previously,
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 65d1c08cf09e..654e479802f2 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -218,6 +218,11 @@ SECTIONS
 
         .got : AT(ADDR(.got) - LOAD_OFFSET) {
                 __toc_start = .;
+#ifndef CONFIG_RELOCATABLE
+                __prom_init_toc_start = .;
+                arch/powerpc/kernel/prom_init.o*(.toc .got)
+                __prom_init_toc_end = .;
+#endif
                 *(.got)
                 *(.toc)
         }
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 10b6c358dd77..e33d11f1b977 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -539,6 +539,11 @@ fast_guest_return:
 
         /* Enter guest */
 
+BEGIN_FTR_SECTION
+        ld      r5, VCPU_CFAR(r4)
+        mtspr   SPRN_CFAR, r5
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
+
         ld      r5, VCPU_LR(r4)
         lwz     r6, VCPU_CR(r4)
         mtlr    r5
@@ -604,6 +609,10 @@ kvmppc_interrupt:
         lwz     r4, HSTATE_SCRATCH1(r13)
         std     r3, VCPU_GPR(R12)(r9)
         stw     r4, VCPU_CR(r9)
+BEGIN_FTR_SECTION
+        ld      r3, HSTATE_CFAR(r13)
+        std     r3, VCPU_CFAR(r9)
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
 
         /* Restore R1/R2 so we can handle faults */
         ld      r1, HSTATE_HOST_R1(r13)
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 28d38adeca73..6702442ca818 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -34,6 +34,8 @@
 #include <asm/kvm_book3s.h>
 #include <asm/mmu_context.h>
 #include <asm/switch_to.h>
+#include <asm/firmware.h>
+#include <asm/hvcall.h>
 #include <linux/gfp.h>
 #include <linux/sched.h>
 #include <linux/vmalloc.h>
@@ -1284,12 +1286,21 @@ void kvmppc_core_flush_memslot(struct kvm *kvm, struct kvm_memory_slot *memslot)
 {
 }
 
+static unsigned int kvm_global_user_count = 0;
+static DEFINE_SPINLOCK(kvm_global_user_count_lock);
+
 int kvmppc_core_init_vm(struct kvm *kvm)
 {
 #ifdef CONFIG_PPC64
         INIT_LIST_HEAD(&kvm->arch.spapr_tce_tables);
 #endif
 
+        if (firmware_has_feature(FW_FEATURE_SET_MODE)) {
+                spin_lock(&kvm_global_user_count_lock);
+                if (++kvm_global_user_count == 1)
+                        pSeries_disable_reloc_on_exc();
+                spin_unlock(&kvm_global_user_count_lock);
+        }
         return 0;
 }
 
@@ -1298,6 +1309,14 @@ void kvmppc_core_destroy_vm(struct kvm *kvm)
 #ifdef CONFIG_PPC64
         WARN_ON(!list_empty(&kvm->arch.spapr_tce_tables));
 #endif
+
+        if (firmware_has_feature(FW_FEATURE_SET_MODE)) {
+                spin_lock(&kvm_global_user_count_lock);
+                BUG_ON(kvm_global_user_count == 0);
+                if (--kvm_global_user_count == 0)
+                        pSeries_enable_reloc_on_exc();
+                spin_unlock(&kvm_global_user_count_lock);
+        }
 }
 
 static int kvmppc_book3s_init(void)
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 746e0c895cd7..450433276699 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -4,7 +4,7 @@
 
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
-ccflags-$(CONFIG_PPC64) := -mno-minimal-toc
+ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)
 
 CFLAGS_REMOVE_code-patching.o = -pg
 CFLAGS_REMOVE_feature-fixups.o = -pg
@@ -19,9 +19,7 @@ obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
                            checksum_wrappers_64.o hweight_64.o \
                            copyuser_power7.o string_64.o copypage_power7.o \
                            memcpy_power7.o
-obj-$(CONFIG_XMON)      += sstep.o ldstfp.o
-obj-$(CONFIG_KPROBES)   += sstep.o ldstfp.o
-obj-$(CONFIG_HAVE_HW_BREAKPOINT)        += sstep.o ldstfp.o
+obj-$(CONFIG_PPC_EMULATE_SSTEP) += sstep.o ldstfp.o
 
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)       += locks.o
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index 3787b61f7d20..cf16b5733eaa 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -4,7 +4,7 @@
 
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
-ccflags-$(CONFIG_PPC64) := -mno-minimal-toc
+ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)
 
 obj-y                           := fault.o mem.o pgtable.o gup.o \
                                    init_$(CONFIG_WORD_SIZE).o \
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 3a8489a354e9..229951ffc351 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -249,8 +249,8 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
 #if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE) || \
                              defined(CONFIG_PPC_BOOK3S_64))
         if (error_code & DSISR_DABRMATCH) {
-                /* DABR match */
-                do_dabr(regs, address, error_code);
+                /* breakpoint match */
+                do_break(regs, address, error_code);
                 return 0;
         }
 #endif
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 3a292be2e079..1b6e1271719f 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -55,6 +55,7 @@
 #include <asm/code-patching.h>
 #include <asm/fadump.h>
 #include <asm/firmware.h>
+#include <asm/tm.h>
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -1171,6 +1172,21 @@ void flush_hash_page(unsigned long vpn, real_pte_t pte, int psize, int ssize,
                 DBG_LOW(" sub %ld: hash=%lx, hidx=%lx\n", index, slot, hidx);
                 ppc_md.hpte_invalidate(slot, vpn, psize, ssize, local);
         } pte_iterate_hashed_end();
+
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
+        /* Transactions are not aborted by tlbiel, only tlbie.
+         * Without, syncing a page back to a block device w/ PIO could pick up
+         * transactional data (bad!) so we force an abort here.  Before the
+         * sync the page will be made read-only, which will flush_hash_page.
+         * BIG ISSUE here: if the kernel uses a page from userspace without
+         * unmapping it first, it may see the speculated version.
+         */
+        if (local && cpu_has_feature(CPU_FTR_TM) &&
+            MSR_TM_ACTIVE(current->thread.regs->msr)) {
+                tm_enable();
+                tm_abort(TM_CAUSE_TLBI);
+        }
+#endif
 }
 
 void flush_hash_range(unsigned long number, int local)
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 09c64518b4d0..f1f7409a4183 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -207,13 +207,10 @@ void __init do_init_bootmem(void)
         min_low_pfn = MEMORY_START >> PAGE_SHIFT;
         boot_mapsize = init_bootmem_node(NODE_DATA(0), start >> PAGE_SHIFT, min_low_pfn, max_low_pfn);
 
-        /* Add active regions with valid PFNs */
-        for_each_memblock(memory, reg) {
-                unsigned long start_pfn, end_pfn;
-                start_pfn = memblock_region_memory_base_pfn(reg);
-                end_pfn = memblock_region_memory_end_pfn(reg);
-                memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0);
-        }
+        /* Place all memblock_regions in the same node and merge contiguous
+         * memblock_regions
+         */
+        memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0);
 
         /* Add all physical memory to the bootmem map, mark each area
          * present.
diff --git a/arch/powerpc/oprofile/Makefile b/arch/powerpc/oprofile/Makefile
index 73456c4cec28..751ec7bd5018 100644
--- a/arch/powerpc/oprofile/Makefile
+++ b/arch/powerpc/oprofile/Makefile
@@ -1,6 +1,6 @@
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
-ccflags-$(CONFIG_PPC64) := -mno-minimal-toc
+ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)
 
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index fa476d50791f..65362e98eb26 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -880,8 +880,16 @@ static int power_pmu_add(struct perf_event *event, int ef_flags)
         cpuhw->events[n0] = event->hw.config;
         cpuhw->flags[n0] = event->hw.event_base;
 
+        /*
+         * This event may have been disabled/stopped in record_and_restart()
+         * because we exceeded the ->event_limit. If re-starting the event,
+         * clear the ->hw.state (STOPPED and UPTODATE flags), so the user
+         * notification is re-enabled.
+         */
         if (!(ef_flags & PERF_EF_START))
                 event->hw.state = PERF_HES_STOPPED | PERF_HES_UPTODATE;
+        else
+                event->hw.state = 0;
 
         /*
          * If group events scheduling transaction was started,
@@ -1359,6 +1367,8 @@ static void record_and_restart(struct perf_event *event, unsigned long val,
          */
         val = 0;
         left = local64_read(&event->hw.period_left) - delta;
+        if (delta == 0)
+                left++;
         if (period) {
                 if (left <= 0) {
                         left += period;
@@ -1422,11 +1432,8 @@ unsigned long perf_instruction_pointer(struct pt_regs *regs)
                 return regs->nip;
 }
 
-static bool pmc_overflow(unsigned long val)
+static bool pmc_overflow_power7(unsigned long val)
 {
-        if ((int)val < 0)
-                return true;
-
         /*
          * Events on POWER7 can roll back if a speculative event doesn't
          * eventually complete. Unfortunately in some rare cases they will
@@ -1438,7 +1445,15 @@ static bool pmc_overflow(unsigned long val)
          * PMCs because a user might set a period of less than 256 and we
          * don't want to mistakenly reset them.
          */
-        if (pvr_version_is(PVR_POWER7) && ((0x80000000 - val) <= 256))
+        if ((0x80000000 - val) <= 256)
+                return true;
+
+        return false;
+}
+
+static bool pmc_overflow(unsigned long val)
+{
+        if ((int)val < 0)
                 return true;
 
         return false;
@@ -1449,11 +1464,11 @@ static bool pmc_overflow(unsigned long val)
  */
 static void perf_event_interrupt(struct pt_regs *regs)
 {
-        int i;
+        int i, j;
         struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
         struct perf_event *event;
-        unsigned long val;
-        int found = 0;
+        unsigned long val[8];
+        int found, active;
         int nmi;
 
         if (cpuhw->n_limited)
@@ -1468,33 +1483,53 @@ static void perf_event_interrupt(struct pt_regs *regs)
         else
                 irq_enter();
 
-        for (i = 0; i < cpuhw->n_events; ++i) {
-                event = cpuhw->event[i];
-                if (!event->hw.idx || is_limited_pmc(event->hw.idx))
+        /* Read all the PMCs since we'll need them a bunch of times */
+        for (i = 0; i < ppmu->n_counter; ++i)
+                val[i] = read_pmc(i + 1);
+
+        /* Try to find what caused the IRQ */
+        found = 0;
+        for (i = 0; i < ppmu->n_counter; ++i) {
+                if (!pmc_overflow(val[i]))
                         continue;
-                val = read_pmc(event->hw.idx);
-                if ((int)val < 0) {
-                        /* event has overflowed */
-                        found = 1;
-                        record_and_restart(event, val, regs);
+                if (is_limited_pmc(i + 1))
+                        continue; /* these won't generate IRQs */
+                /*
+                 * We've found one that's overflowed.  For active
+                 * counters we need to log this.  For inactive
+                 * counters, we need to reset it anyway
+                 */
+                found = 1;
+                active = 0;
+                for (j = 0; j < cpuhw->n_events; ++j) {
+                        event = cpuhw->event[j];
+                        if (event->hw.idx == (i + 1)) {
+                                active = 1;
+                                record_and_restart(event, val[i], regs);
+                                break;
+                        }
                 }
+                if (!active)
+                        /* reset non active counters that have overflowed */
+                        write_pmc(i + 1, 0);
         }
-
-        /*
-         * In case we didn't find and reset the event that caused
-         * the interrupt, scan all events and reset any that are
-         * negative, to avoid getting continual interrupts.
-         * Any that we processed in the previous loop will not be negative.
-         */
-        if (!found) {
-                for (i = 0; i < ppmu->n_counter; ++i) {
-                        if (is_limited_pmc(i + 1))
+        if (!found && pvr_version_is(PVR_POWER7)) {
+                /* check active counters for special buggy p7 overflow */
+                for (i = 0; i < cpuhw->n_events; ++i) {
+                        event = cpuhw->event[i];
+                        if (!event->hw.idx || is_limited_pmc(event->hw.idx))
                                 continue;
-                        val = read_pmc(i + 1);
-                        if (pmc_overflow(val))
-                                write_pmc(i + 1, 0);
+                        if (pmc_overflow_power7(val[event->hw.idx - 1])) {
+                                /* event has overflowed in a buggy way*/
+                                found = 1;
+                                record_and_restart(event,
+                                                   val[event->hw.idx - 1],
+                                                   regs);
+                        }
                 }
         }
+        if ((!found) && printk_ratelimit())
+                printk(KERN_WARNING "Can't find PMC that caused IRQ\n");
 
         /*
          * Reset MMCR0 to its normal value.  This will set PMXE and
diff --git a/arch/powerpc/perf/e500-pmu.c b/arch/powerpc/perf/e500-pmu.c
index cb2e2949c8d1..fb664929f5da 100644
--- a/arch/powerpc/perf/e500-pmu.c
+++ b/arch/powerpc/perf/e500-pmu.c
@@ -24,6 +24,8 @@ static int e500_generic_events[] = {
         [PERF_COUNT_HW_CACHE_MISSES] = 41, /* Data L1 cache reloads */
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 12,
         [PERF_COUNT_HW_BRANCH_MISSES] = 15,
+        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 18,
+        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 19,
 };
 
 #define C(x)    PERF_COUNT_HW_CACHE_##x
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 8abf6fb8f410..0effe9f5a1ea 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -252,6 +252,14 @@ config PPC4xx_GPIO
         help
           Enable gpiolib support for ppc440 based boards
 
+config PPC4xx_OCM
+        bool "PPC4xx On Chip Memory (OCM) support"
+        depends on 4xx
+        select PPC_LIB_RHEAP
+        help
+          Enable OCM support for PowerPC 4xx platforms with on chip memory,
+          OCM provides the fast place for memory access to improve performance.
+
 # 44x specific CPU modules, selected based on the board above.
 config 440EP
         bool
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c
index 9f771e05457c..52d57d281724 100644
--- a/arch/powerpc/platforms/512x/clock.c
+++ b/arch/powerpc/platforms/512x/clock.c
@@ -26,6 +26,7 @@
 
 #include <linux/of_platform.h>
 #include <asm/mpc5xxx.h>
+#include <asm/mpc5121.h>
 #include <asm/clk_interface.h>
 
 #undef CLK_DEBUG
@@ -122,7 +123,7 @@ struct mpc512x_clockctl {
         u32 dccr;               /* DIU Clk Cnfg Reg */
 };
 
-struct mpc512x_clockctl __iomem *clockctl;
+static struct mpc512x_clockctl __iomem *clockctl;
 
 static int mpc5121_clk_enable(struct clk *clk)
 {
@@ -184,7 +185,7 @@ static unsigned long spmf_mult(void)
                 36, 40, 44, 48,
                 52, 56, 60, 64
         };
-        int spmf = (clockctl->spmr >> 24) & 0xf;
+        int spmf = (in_be32(&clockctl->spmr) >> 24) & 0xf;
         return spmf_to_mult[spmf];
 }
 
@@ -206,7 +207,7 @@ static unsigned long sysdiv_div_x_2(void)
                 52, 56, 58, 62,
                 60, 64, 66,
         };
-        int sysdiv = (clockctl->scfr2 >> 26) & 0x3f;
+        int sysdiv = (in_be32(&clockctl->scfr2) >> 26) & 0x3f;
         return sysdiv_to_div_x_2[sysdiv];
 }
 
@@ -230,7 +231,7 @@ static unsigned long sys_to_ref(unsigned long rate)
 
 static long ips_to_ref(unsigned long rate)
 {
-        int ips_div = (clockctl->scfr1 >> 23) & 0x7;
+        int ips_div = (in_be32(&clockctl->scfr1) >> 23) & 0x7;
 
         rate *= ips_div;        /* csb_clk = ips_clk * ips_div */
         rate *= 2;              /* sys_clk = csb_clk * 2 */
@@ -284,7 +285,7 @@ static struct clk sys_clk = {
 
 static void diu_clk_calc(struct clk *clk)
 {
-        int diudiv_x_2 = clockctl->scfr1 & 0xff;
+        int diudiv_x_2 = in_be32(&clockctl->scfr1) & 0xff;
         unsigned long rate;
 
         rate = sys_clk.rate;
@@ -311,7 +312,7 @@ static void half_clk_calc(struct clk *clk)
 
 static void generic_div_clk_calc(struct clk *clk)
 {
-        int div = (clockctl->scfr1 >> clk->div_shift) & 0x7;
+        int div = (in_be32(&clockctl->scfr1) >> clk->div_shift) & 0x7;
 
         clk->rate = clk->parent->rate / div;
 }
@@ -329,7 +330,7 @@ static struct clk csb_clk = {
 
 static void e300_clk_calc(struct clk *clk)
 {
-        int spmf = (clockctl->spmr >> 16) & 0xf;
+        int spmf = (in_be32(&clockctl->spmr) >> 16) & 0xf;
         int ratex2 = clk->parent->rate * spmf;
 
         clk->rate = ratex2 / 2;
@@ -551,7 +552,7 @@ static struct clk ac97_clk = {
         .calc = ac97_clk_calc,
 };
 
-struct clk *rate_clks[] = {
+static struct clk *rate_clks[] = {
         &ref_clk,
         &sys_clk,
         &diu_clk,
@@ -607,7 +608,7 @@ static void rate_clks_init(void)
  * There are two clk enable registers with 32 enable bits each
  * psc clocks and device clocks are all stored in dev_clks
  */
-struct clk dev_clks[2][32];
+static struct clk dev_clks[2][32];
 
 /*
  * Given a psc number return the dev_clk
@@ -648,12 +649,12 @@ static void psc_calc_rate(struct clk *clk, int pscnum, struct device_node *np)
         out_be32(&clockctl->pccr[pscnum], 0x00020000);
         out_be32(&clockctl->pccr[pscnum], 0x00030000);
 
-        if (clockctl->pccr[pscnum] & 0x80) {
+        if (in_be32(&clockctl->pccr[pscnum]) & 0x80) {
                 clk->rate = spdif_rxclk.rate;
                 return;
         }
 
-        switch ((clockctl->pccr[pscnum] >> 14) & 0x3) {
+        switch ((in_be32(&clockctl->pccr[pscnum]) >> 14) & 0x3) {
         case 0:
                 mclk_src = sys_clk.rate;
                 break;
@@ -668,7 +669,7 @@ static void psc_calc_rate(struct clk *clk, int pscnum, struct device_node *np)
                 break;
         }
 
-        mclk_div = ((clockctl->pccr[pscnum] >> 17) & 0x7fff) + 1;
+        mclk_div = ((in_be32(&clockctl->pccr[pscnum]) >> 17) & 0x7fff) + 1;
         clk->rate = mclk_src / mclk_div;
 }
 
@@ -680,13 +681,12 @@ static void psc_calc_rate(struct clk *clk, int pscnum, struct device_node *np)
 static void psc_clks_init(void)
 {
         struct device_node *np;
-        const u32 *cell_index;
         struct platform_device *ofdev;
+        u32 reg;
 
         for_each_compatible_node(np, NULL, "fsl,mpc5121-psc") {
-                cell_index = of_get_property(np, "cell-index", NULL);
-                if (cell_index) {
-                        int pscnum = *cell_index;
+                if (!of_property_read_u32(np, "reg", &reg)) {
+                        int pscnum = (reg & 0xf00) >> 8;
                         struct clk *clk = psc_dev_clk(pscnum);
 
                         clk->flags = CLK_HAS_RATE | CLK_HAS_CTRL;
@@ -696,7 +696,7 @@ static void psc_clks_init(void)
                          * AC97 is special rate clock does
                          * not go through normal path
                          */
-                        if (strcmp("ac97", np->name) == 0)
+                        if (of_device_is_compatible(np, "fsl,mpc5121-psc-ac97"))
                                 clk->rate = ac97_clk.rate;
                         else
                                 psc_calc_rate(clk, pscnum, np);
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index 35f14fda108a..d30235b7e3f7 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -68,10 +68,6 @@ struct fsl_diu_shared_fb {
         bool            in_use;
 };
 
-void mpc512x_set_monitor_port(enum fsl_diu_monitor_port port)
-{
-}
-
 #define DIU_DIV_MASK    0x000000ff
 void mpc512x_set_pixel_clock(unsigned int pixclock)
 {
@@ -303,7 +299,6 @@ void __init mpc512x_setup_diu(void)
                 }
         }
 
-        diu_ops.set_monitor_port        = mpc512x_set_monitor_port;
         diu_ops.set_pixel_clock         = mpc512x_set_pixel_clock;
         diu_ops.valid_monitor_port      = mpc512x_valid_monitor_port;
         diu_ops.release_bootmem         = mpc512x_release_bootmem;
@@ -431,8 +426,38 @@ void __init mpc512x_psc_fifo_init(void)
 
 void __init mpc512x_init(void)
 {
-        mpc512x_declare_of_platform_devices();
         mpc5121_clk_init();
+        mpc512x_declare_of_platform_devices();
         mpc512x_restart_init();
         mpc512x_psc_fifo_init();
 }
+
+/**
+ * mpc512x_cs_config - Setup chip select configuration
+ * @cs: chip select number
+ * @val: chip select configuration value
+ *
+ * Perform chip select configuration for devices on LocalPlus Bus.
+ * Intended to dynamically reconfigure the chip select parameters
+ * for configurable devices on the bus.
+ */
+int mpc512x_cs_config(unsigned int cs, u32 val)
+{
+        static struct mpc512x_lpc __iomem *lpc;
+        struct device_node *np;
+
+        if (cs > 7)
+                return -EINVAL;
+
+        if (!lpc) {
+                np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-lpc");
+                lpc = of_iomap(np, 0);
+                of_node_put(np);
+                if (!lpc)
+                        return -ENOMEM;
+        }
+
+        out_be32(&lpc->cs_cfg[cs], val);
+        return 0;
+}
+EXPORT_SYMBOL(mpc512x_cs_config);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index f9f4537f546d..be7b1aa4d54c 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -20,9 +20,9 @@
 #include <asm/mpc52xx.h>
 #include <asm/time.h>
 
-#include <sysdev/bestcomm/bestcomm.h>
-#include <sysdev/bestcomm/bestcomm_priv.h>
-#include <sysdev/bestcomm/gen_bd.h>
+#include <linux/fsl/bestcomm/bestcomm.h>
+#include <linux/fsl/bestcomm/bestcomm_priv.h>
+#include <linux/fsl/bestcomm/gen_bd.h>
 
 MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
 MODULE_DESCRIPTION("MPC5200 LocalPlus FIFO device driver");
diff --git a/arch/powerpc/platforms/82xx/km82xx.c b/arch/powerpc/platforms/82xx/km82xx.c
index cf964e19573a..058cc1895c88 100644
--- a/arch/powerpc/platforms/82xx/km82xx.c
+++ b/arch/powerpc/platforms/82xx/km82xx.c
@@ -18,11 +18,11 @@
 #include <linux/fsl_devices.h>
 #include <linux/of_platform.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/cpm2.h>
 #include <asm/udbg.h>
 #include <asm/machdep.h>
-#include <asm/time.h>
+#include <linux/time.h>
 #include <asm/mpc8260.h>
 #include <asm/prom.h>
 
@@ -36,7 +36,7 @@ static void __init km82xx_pic_init(void)
         struct device_node *np = of_find_compatible_node(NULL, NULL,
                                                         "fsl,pq2-pic");
         if (!np) {
-                printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
+                pr_err("PIC init: can not find cpm-pic node\n");
                 return;
         }
 
diff --git a/arch/powerpc/platforms/82xx/pq2.c b/arch/powerpc/platforms/82xx/pq2.c
index fb94d10e5a4d..fc8b2d6a7d8d 100644
--- a/arch/powerpc/platforms/82xx/pq2.c
+++ b/arch/powerpc/platforms/82xx/pq2.c
@@ -71,11 +71,11 @@ err:
 
 void __init pq2_init_pci(void)
 {
-        struct device_node *np = NULL;
+        struct device_node *np;
 
         ppc_md.pci_exclude_device = pq2_pci_exclude_device;
 
-        while ((np = of_find_compatible_node(np, NULL, "fsl,pq2-pci")))
+        for_each_compatible_node(np, NULL, "fsl,pq2-pci")
                 pq2_pci_add_bridge(np);
 }
 #endif
diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index 89923d723349..bf4c4473abb9 100644
--- a/arch/powerpc/platforms/83xx/km83xx.c
+++ b/arch/powerpc/platforms/83xx/km83xx.c
@@ -28,8 +28,8 @@
 #include <linux/of_device.h>
 
 #include <linux/atomic.h>
-#include <asm/time.h>
-#include <asm/io.h>
+#include <linux/time.h>
+#include <linux/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
 #include <asm/irq.h>
@@ -43,6 +43,82 @@
 #include "mpc83xx.h"
 
 #define SVR_REV(svr)    (((svr) >>  0) & 0xFFFF) /* Revision field */
+
+static void quirk_mpc8360e_qe_enet10(void)
+{
+        /*
+         * handle mpc8360E Erratum QE_ENET10:
+         * RGMII AC values do not meet the specification
+         */
+        uint svid = mfspr(SPRN_SVR);
+        struct  device_node *np_par;
+        struct  resource res;
+        void    __iomem *base;
+        int     ret;
+
+        np_par = of_find_node_by_name(NULL, "par_io");
+        if (np_par == NULL) {
+                pr_warn("%s couldn;t find par_io node\n", __func__);
+                return;
+        }
+        /* Map Parallel I/O ports registers */
+        ret = of_address_to_resource(np_par, 0, &res);
+        if (ret) {
+                pr_warn("%s couldn;t map par_io registers\n", __func__);
+                return;
+        }
+
+        base = ioremap(res.start, res.end - res.start + 1);
+
+        /*
+         * set output delay adjustments to default values according
+         * table 5 in Errata Rev. 5, 9/2011:
+         *
+         * write 0b01 to UCC1 bits 18:19
+         * write 0b01 to UCC2 option 1 bits 4:5
+         * write 0b01 to UCC2 option 2 bits 16:17
+         */
+        clrsetbits_be32((base + 0xa8), 0x0c00f000, 0x04005000);
+
+        /*
+         * set output delay adjustments to default values according
+         * table 3-13 in Reference Manual Rev.3 05/2010:
+         *
+         * write 0b01 to UCC2 option 2 bits 16:17
+         * write 0b0101 to UCC1 bits 20:23
+         * write 0b0101 to UCC2 option 1 bits 24:27
+         */
+        clrsetbits_be32((base + 0xac), 0x0000cff0, 0x00004550);
+
+        if (SVR_REV(svid) == 0x0021) {
+                /*
+                 * UCC2 option 1: write 0b1010 to bits 24:27
+                 * at address IMMRBAR+0x14AC
+                 */
+                clrsetbits_be32((base + 0xac), 0x000000f0, 0x000000a0);
+        } else if (SVR_REV(svid) == 0x0020) {
+                /*
+                 * UCC1: write 0b11 to bits 18:19
+                 * at address IMMRBAR+0x14A8
+                 */
+                setbits32((base + 0xa8), 0x00003000);
+
+                /*
+                 * UCC2 option 1: write 0b11 to bits 4:5
+                 * at address IMMRBAR+0x14A8
+                 */
+                setbits32((base + 0xa8), 0x0c000000);
+
+                /*
+                 * UCC2 option 2: write 0b11 to bits 16:17
+                 * at address IMMRBAR+0x14AC
+                 */
+                setbits32((base + 0xac), 0x0000c000);
+        }
+        iounmap(base);
+        of_node_put(np_par);
+}
+
 /* ************************************************************************
  *
  * Setup the architecture
@@ -72,84 +148,13 @@ static void __init mpc83xx_km_setup_arch(void)
 
                 for_each_node_by_name(np, "ucc")
                         par_io_of_config(np);
-        }
-
-        np = of_find_compatible_node(NULL, "network", "ucc_geth");
-        if (np != NULL) {
-                /*
-                 * handle mpc8360E Erratum QE_ENET10:
-                 * RGMII AC values do not meet the specification
-                 */
-                uint svid = mfspr(SPRN_SVR);
-                struct  device_node *np_par;
-                struct  resource res;
-                void    __iomem *base;
-                int     ret;
-
-                np_par = of_find_node_by_name(NULL, "par_io");
-                if (np_par == NULL) {
-                        printk(KERN_WARNING "%s couldn;t find par_io node\n",
-                                __func__);
-                        return;
-                }
-                /* Map Parallel I/O ports registers */
-                ret = of_address_to_resource(np_par, 0, &res);
-                if (ret) {
-                        printk(KERN_WARNING "%s couldn;t map par_io registers\n",
-                                __func__);
-                        return;
-                }
-
-                base = ioremap(res.start, res.end - res.start + 1);
-
-                /*
-                 * set output delay adjustments to default values according
-                 * table 5 in Errata Rev. 5, 9/2011:
-                 *
-                 * write 0b01 to UCC1 bits 18:19
-                 * write 0b01 to UCC2 option 1 bits 4:5
-                 * write 0b01 to UCC2 option 2 bits 16:17
-                 */
-                clrsetbits_be32((base + 0xa8), 0x0c00f000, 0x04005000);
 
-                /*
-                 * set output delay adjustments to default values according
-                 * table 3-13 in Reference Manual Rev.3 05/2010:
-                 *
-                 * write 0b01 to UCC2 option 2 bits 16:17
-                 * write 0b0101 to UCC1 bits 20:23
-                 * write 0b0101 to UCC2 option 1 bits 24:27
-                 */
-                clrsetbits_be32((base + 0xac), 0x0000cff0, 0x00004550);
-
-                if (SVR_REV(svid) == 0x0021) {
-                        /*
-                         * UCC2 option 1: write 0b1010 to bits 24:27
-                         * at address IMMRBAR+0x14AC
-                         */
-                        clrsetbits_be32((base + 0xac), 0x000000f0, 0x000000a0);
-                } else if (SVR_REV(svid) == 0x0020) {
-                        /*
-                         * UCC1: write 0b11 to bits 18:19
-                         * at address IMMRBAR+0x14A8
-                         */
-                        setbits32((base + 0xa8), 0x00003000);
-
-                        /*
-                         * UCC2 option 1: write 0b11 to bits 4:5
-                         * at address IMMRBAR+0x14A8
-                         */
-                        setbits32((base + 0xa8), 0x0c000000);
-
-                        /*
-                         * UCC2 option 2: write 0b11 to bits 16:17
-                         * at address IMMRBAR+0x14AC
-                         */
-                        setbits32((base + 0xac), 0x0000c000);
+                /* Only apply this quirk when par_io is available */
+                np = of_find_compatible_node(NULL, "network", "ucc_geth");
+                if (np != NULL) {
+                        quirk_mpc8360e_qe_enet10();
+                        of_node_put(np);
                 }
-                iounmap(base);
-                of_node_put(np_par);
-                of_node_put(np);
         }
 #endif  /* CONFIG_QUICC_ENGINE */
 }
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 92ab60a62711..a0dcd577fb0d 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -191,6 +191,13 @@ config SBC8548
         help
           This option enables support for the Wind River SBC8548 board
 
+config PPA8548
+        bool "Prodrive PPA8548"
+        help
+          This option enables support for the Prodrive PPA8548 board.
+        select DEFAULT_UIMAGE
+        select HAS_RAPIDIO
+
 config GE_IMP3A
         bool "GE Intelligent Platforms IMP3A"
         select DEFAULT_UIMAGE
@@ -245,6 +252,14 @@ config P4080_DS
         help
           This option enables support for the P4080 DS board
 
+config SGY_CTS1000
+        tristate "Servergy CTS-1000 support"
+        select GPIOLIB
+        select OF_GPIO
+        depends on P4080_DS
+        help
+          Enable this to support functionality in Servergy's CTS-1000 systems.
+
 endif # PPC32
 
 config P5020_DS
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 76f679cb04a0..07d0dbb141c0 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -25,8 +25,10 @@ obj-$(CONFIG_P5040_DS)    += p5040_ds.o corenet_ds.o
 obj-$(CONFIG_STX_GP3)     += stx_gp3.o
 obj-$(CONFIG_TQM85xx)     += tqm85xx.o
 obj-$(CONFIG_SBC8548)     += sbc8548.o
+obj-$(CONFIG_PPA8548)     += ppa8548.o
 obj-$(CONFIG_SOCRATES)    += socrates.o socrates_fpga_pic.o
 obj-$(CONFIG_KSI8560)     += ksi8560.o
 obj-$(CONFIG_XES_MPC85xx) += xes_mpc85xx.o
 obj-$(CONFIG_GE_IMP3A)    += ge_imp3a.o
 obj-$(CONFIG_PPC_QEMU_E500) += qemu_e500.o
+obj-$(CONFIG_SGY_CTS1000) += sgy_cts1000.o
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index bd12588fa252..a7b3621a8df5 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -206,9 +206,7 @@ static void __init mpc85xx_mds_reset_ucc_phys(void)
                 setbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST);
                 clrbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST);
 
-                for (np = NULL; (np = of_find_compatible_node(np,
-                                                "network",
-                                                "ucc_geth")) != NULL;) {
+                for_each_compatible_node(np, "network", "ucc_geth") {
                         const unsigned int *prop;
                         int ucc_num;
 
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index e346edf7f157..e611e79f23ce 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -106,42 +106,6 @@
         (c2 << AD_COMP_2_SHIFT) | (c1 << AD_COMP_1_SHIFT) | \
         (c0 << AD_COMP_0_SHIFT) | (size << AD_PIXEL_S_SHIFT))
 
-/**
- * p1022ds_get_pixel_format: return the Area Descriptor for a given pixel depth
- *
- * The Area Descriptor is a 32-bit value that determine which bits in each
- * pixel are to be used for each color.
- */
-static u32 p1022ds_get_pixel_format(enum fsl_diu_monitor_port port,
-                                    unsigned int bits_per_pixel)
-{
-        switch (bits_per_pixel) {
-        case 32:
-                /* 0x88883316 */
-                return MAKE_AD(3, 2, 0, 1, 3, 8, 8, 8, 8);
-        case 24:
-                /* 0x88082219 */
-                return MAKE_AD(4, 0, 1, 2, 2, 0, 8, 8, 8);
-        case 16:
-                /* 0x65053118 */
-                return MAKE_AD(4, 2, 1, 0, 1, 5, 6, 5, 0);
-        default:
-                pr_err("fsl-diu: unsupported pixel depth %u\n", bits_per_pixel);
-                return 0;
-        }
-}
-
-/**
- * p1022ds_set_gamma_table: update the gamma table, if necessary
- *
- * On some boards, the gamma table for some ports may need to be modified.
- * This is not the case on the P1022DS, so we do nothing.
-*/
-static void p1022ds_set_gamma_table(enum fsl_diu_monitor_port port,
-                                    char *gamma_table_base)
-{
-}
-
 struct fsl_law {
         u32     lawbar;
         u32     reserved1;
@@ -302,7 +266,7 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
                 goto exit;
         }
         cs1_addr = lbc_br_to_phys(ecm, num_laws, br1);
-        if (!cs0_addr) {
+        if (!cs1_addr) {
                 pr_err("p1022ds: could not determine physical address for CS1"
                        " (BR1=%08x)\n", br1);
                 goto exit;
@@ -510,8 +474,6 @@ static void __init p1022_ds_setup_arch(void)
                 ppc_md.progress("p1022_ds_setup_arch()", 0);
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
-        diu_ops.get_pixel_format        = p1022ds_get_pixel_format;
-        diu_ops.set_gamma_table         = p1022ds_set_gamma_table;
         diu_ops.set_monitor_port        = p1022ds_set_monitor_port;
         diu_ops.set_pixel_clock         = p1022ds_set_pixel_clock;
         diu_ops.valid_monitor_port      = p1022ds_valid_monitor_port;
diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c
index 55ffa1cc380c..8c9297112b30 100644
--- a/arch/powerpc/platforms/85xx/p1022_rdk.c
+++ b/arch/powerpc/platforms/85xx/p1022_rdk.c
@@ -35,17 +35,6 @@
 #define CLKDVDR_PXCLK_MASK      0x00FF0000
 
 /**
- * p1022rdk_set_monitor_port: switch the output to a different monitor port
- */
-static void p1022rdk_set_monitor_port(enum fsl_diu_monitor_port port)
-{
-        if (port != FSL_DIU_PORT_DVI) {
-                pr_err("p1022rdk: unsupported monitor port %i\n", port);
-                return;
-        }
-}
-
-/**
  * p1022rdk_set_pixel_clock: program the DIU's clock
  *
  * @pixclock: the wavelength, in picoseconds, of the clock
@@ -124,7 +113,6 @@ static void __init p1022_rdk_setup_arch(void)
                 ppc_md.progress("p1022_rdk_setup_arch()", 0);
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
-        diu_ops.set_monitor_port        = p1022rdk_set_monitor_port;
         diu_ops.set_pixel_clock         = p1022rdk_set_pixel_clock;
         diu_ops.valid_monitor_port      = p1022rdk_valid_monitor_port;
 #endif
diff --git a/arch/powerpc/platforms/85xx/ppa8548.c b/arch/powerpc/platforms/85xx/ppa8548.c
new file mode 100644
index 000000000000..6a7704b92c3b
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/ppa8548.c
@@ -0,0 +1,98 @@
+/*
+ * ppa8548 setup and early boot code.
+ *
+ * Copyright 2009 Prodrive B.V..
+ *
+ * By Stef van Os (see MAINTAINERS for contact information)
+ *
+ * Based on the SBC8548 support - Copyright 2007 Wind River Systems Inc.
+ * Based on the MPC8548CDS support - Copyright 2005 Freescale 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.
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/reboot.h>
+#include <linux/seq_file.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/udbg.h>
+#include <asm/mpic.h>
+
+#include <sysdev/fsl_soc.h>
+
+static void __init ppa8548_pic_init(void)
+{
+        struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN,
+                        0, 256, " OpenPIC  ");
+        BUG_ON(mpic == NULL);
+        mpic_init(mpic);
+}
+
+/*
+ * Setup the architecture
+ */
+static void __init ppa8548_setup_arch(void)
+{
+        if (ppc_md.progress)
+                ppc_md.progress("ppa8548_setup_arch()", 0);
+}
+
+static void ppa8548_show_cpuinfo(struct seq_file *m)
+{
+        uint32_t svid, phid1;
+
+        svid = mfspr(SPRN_SVR);
+
+        seq_printf(m, "Vendor\t\t: Prodrive B.V.\n");
+        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
+
+        /* Display cpu Pll setting */
+        phid1 = mfspr(SPRN_HID1);
+        seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
+}
+
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .type = "soc", },
+        { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
+        { .compatible = "fsl,srio", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(ppa8548, declare_of_platform_devices);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init ppa8548_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "ppa8548");
+}
+
+define_machine(ppa8548) {
+        .name           = "ppa8548",
+        .probe          = ppa8548_probe,
+        .setup_arch     = ppa8548_setup_arch,
+        .init_IRQ       = ppa8548_pic_init,
+        .show_cpuinfo   = ppa8548_show_cpuinfo,
+        .get_irq        = mpic_get_irq,
+        .restart        = fsl_rstcr_restart,
+        .calibrate_decr = generic_calibrate_decr,
+        .progress       = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/qemu_e500.c b/arch/powerpc/platforms/85xx/qemu_e500.c
index f6ea5618c733..5cefc5a9a144 100644
--- a/arch/powerpc/platforms/85xx/qemu_e500.c
+++ b/arch/powerpc/platforms/85xx/qemu_e500.c
@@ -29,9 +29,10 @@
 void __init qemu_e500_pic_init(void)
 {
         struct mpic *mpic;
+        unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU |
+                MPIC_ENABLE_COREINT;
 
-        mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU,
-                        0, 256, " OpenPIC  ");
+        mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC  ");
 
         BUG_ON(mpic == NULL);
         mpic_init(mpic);
@@ -66,7 +67,7 @@ define_machine(qemu_e500) {
 #ifdef CONFIG_PCI
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #endif
-        .get_irq                = mpic_get_irq,
+        .get_irq                = mpic_get_coreint_irq,
         .restart                = fsl_rstcr_restart,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platforms/85xx/sgy_cts1000.c
new file mode 100644
index 000000000000..611e92f291c4
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/sgy_cts1000.c
@@ -0,0 +1,176 @@
+/*
+ * Servergy CTS-1000 Setup
+ *
+ * Maintained by Ben Collins <ben.c@servergy.com>
+ *
+ * Copyright 2012 by Servergy, 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.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/of_gpio.h>
+#include <linux/workqueue.h>
+#include <linux/reboot.h>
+#include <linux/interrupt.h>
+
+#include <asm/machdep.h>
+
+static struct device_node *halt_node;
+
+static struct of_device_id child_match[] = {
+        {
+                .compatible = "sgy,gpio-halt",
+        },
+        {},
+};
+
+static void gpio_halt_wfn(struct work_struct *work)
+{
+        /* Likely wont return */
+        orderly_poweroff(true);
+}
+static DECLARE_WORK(gpio_halt_wq, gpio_halt_wfn);
+
+static void gpio_halt_cb(void)
+{
+        enum of_gpio_flags flags;
+        int trigger, gpio;
+
+        if (!halt_node)
+                return;
+
+        gpio = of_get_gpio_flags(halt_node, 0, &flags);
+
+        if (!gpio_is_valid(gpio))
+                return;
+
+        trigger = (flags == OF_GPIO_ACTIVE_LOW);
+
+        printk(KERN_INFO "gpio-halt: triggering GPIO.\n");
+
+        /* Probably wont return */
+        gpio_set_value(gpio, trigger);
+}
+
+/* This IRQ means someone pressed the power button and it is waiting for us
+ * to handle the shutdown/poweroff. */
+static irqreturn_t gpio_halt_irq(int irq, void *__data)
+{
+        printk(KERN_INFO "gpio-halt: shutdown due to power button IRQ.\n");
+        schedule_work(&gpio_halt_wq);
+
+        return IRQ_HANDLED;
+};
+
+static int __devinit gpio_halt_probe(struct platform_device *pdev)
+{
+        enum of_gpio_flags flags;
+        struct device_node *node = pdev->dev.of_node;
+        int gpio, err, irq;
+        int trigger;
+
+        if (!node)
+                return -ENODEV;
+
+        /* If there's no matching child, this isn't really an error */
+        halt_node = of_find_matching_node(node, child_match);
+        if (!halt_node)
+                return 0;
+
+        /* Technically we could just read the first one, but punish
+         * DT writers for invalid form. */
+        if (of_gpio_count(halt_node) != 1)
+                return -EINVAL;
+
+        /* Get the gpio number relative to the dynamic base. */
+        gpio = of_get_gpio_flags(halt_node, 0, &flags);
+        if (!gpio_is_valid(gpio))
+                return -EINVAL;
+
+        err = gpio_request(gpio, "gpio-halt");
+        if (err) {
+                printk(KERN_ERR "gpio-halt: error requesting GPIO %d.\n",
+                       gpio);
+                halt_node = NULL;
+                return err;
+        }
+
+        trigger = (flags == OF_GPIO_ACTIVE_LOW);
+
+        gpio_direction_output(gpio, !trigger);
+
+        /* Now get the IRQ which tells us when the power button is hit */
+        irq = irq_of_parse_and_map(halt_node, 0);
+        err = request_irq(irq, gpio_halt_irq, IRQF_TRIGGER_RISING |
+                          IRQF_TRIGGER_FALLING, "gpio-halt", halt_node);
+        if (err) {
+                printk(KERN_ERR "gpio-halt: error requesting IRQ %d for "
+                       "GPIO %d.\n", irq, gpio);
+                gpio_free(gpio);
+                halt_node = NULL;
+                return err;
+        }
+
+        /* Register our halt function */
+        ppc_md.halt = gpio_halt_cb;
+        ppc_md.power_off = gpio_halt_cb;
+
+        printk(KERN_INFO "gpio-halt: registered GPIO %d (%d trigger, %d"
+               " irq).\n", gpio, trigger, irq);
+
+        return 0;
+}
+
+static int __devexit gpio_halt_remove(struct platform_device *pdev)
+{
+        if (halt_node) {
+                int gpio = of_get_gpio(halt_node, 0);
+                int irq = irq_of_parse_and_map(halt_node, 0);
+
+                free_irq(irq, halt_node);
+
+                ppc_md.halt = NULL;
+                ppc_md.power_off = NULL;
+
+                gpio_free(gpio);
+
+                halt_node = NULL;
+        }
+
+        return 0;
+}
+
+static struct of_device_id gpio_halt_match[] = {
+        /* We match on the gpio bus itself and scan the children since they
+         * wont be matched against us. We know the bus wont match until it
+         * has been registered too. */
+        {
+                .compatible = "fsl,qoriq-gpio",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, gpio_halt_match);
+
+static struct platform_driver gpio_halt_driver = {
+        .driver = {
+                .name           = "gpio-halt",
+                .owner          = THIS_MODULE,
+                .of_match_table = gpio_halt_match,
+        },
+        .probe          = gpio_halt_probe,
+        .remove         = __devexit_p(gpio_halt_remove),
+};
+
+module_platform_driver(gpio_halt_driver);
+
+MODULE_DESCRIPTION("Driver to support GPIO triggered system halt for Servergy CTS-1000 Systems.");
+MODULE_VERSION("1.0");
+MODULE_AUTHOR("Ben Collins <ben.c@servergy.com>");
+MODULE_LICENSE("GPL");
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 48a920d51489..52de8bccfb30 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -352,8 +352,6 @@ config OF_RTC
           Uses information from the OF or flattened device tree to instantiate
           platform devices for direct mapped RTC chips like the DS1742 or DS1743.
 
-source "arch/powerpc/sysdev/bestcomm/Kconfig"
-
 config SIMPLE_GPIO
         bool "Support for simple, memory-mapped GPIO controllers"
         depends on PPC
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 72afd2888cad..cea2f09c4241 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -76,6 +76,7 @@ config PPC_BOOK3E_64
         bool "Embedded processors"
         select PPC_FPU # Make it a choice ?
         select PPC_SMP_MUXED_IPI
+        select PPC_DOORBELL
 
 endchoice
 
@@ -208,6 +209,7 @@ config PPC_FSL_BOOK3E
         select FSL_EMB_PERFMON
         select PPC_SMP_MUXED_IPI
         select SYS_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64
+        select PPC_DOORBELL
         default y if FSL_BOOKE
 
 config PTE_64BIT
@@ -382,4 +384,8 @@ config NOT_COHERENT_CACHE
 config CHECK_CACHE_COHERENCY
         bool
 
+config PPC_DOORBELL
+        bool
+        default n
+
 endmenu
diff --git a/arch/powerpc/platforms/cell/celleb_scc_sio.c b/arch/powerpc/platforms/cell/celleb_scc_sio.c
index 3a16c5b3c464..9c339ec646f5 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_sio.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_sio.c
@@ -42,14 +42,13 @@ static struct {
 static int __init txx9_serial_init(void)
 {
         extern int early_serial_txx9_setup(struct uart_port *port);
-        struct device_node *node = NULL;
+        struct device_node *node;
         int i;
         struct uart_port req;
         struct of_irq irq;
         struct resource res;
 
-        while ((node = of_find_compatible_node(node,
-                                "serial", "toshiba,sio-scc")) != NULL) {
+        for_each_compatible_node(node, "serial", "toshiba,sio-scc") {
                 for (i = 0; i < ARRAY_SIZE(txx9_scc_tab); i++) {
                         if (!(txx9_serial_bitmap & (1<<i)))
                                 continue;
diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c
index 75d613313f10..b0ec78e8ad68 100644
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -60,13 +60,12 @@ long spu_sys_callback(struct spu_syscall_block *s)
 
         syscall = spu_syscall_table[s->nr_ret];
 
-#ifdef DEBUG
-        print_symbol(KERN_DEBUG "SPU-syscall %s:", (unsigned long)syscall);
-        printk("syscall%ld(%lx, %lx, %lx, %lx, %lx, %lx)\n",
-                        s->nr_ret,
-                        s->parm[0], s->parm[1], s->parm[2],
-                        s->parm[3], s->parm[4], s->parm[5]);
-#endif
+        pr_debug("SPU-syscall "
+                 "%pSR:syscall%lld(%llx, %llx, %llx, %llx, %llx, %llx)\n",
+                 syscall,
+                 s->nr_ret,
+                 s->parm[0], s->parm[1], s->parm[2],
+                 s->parm[3], s->parm[4], s->parm[5]);
 
         return syscall(s->parm[0], s->parm[1], s->parm[2],
                        s->parm[3], s->parm[4], s->parm[5]);
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index d00d7b0a3bda..6cc58201db8c 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -27,6 +27,7 @@
 #include <asm/lv1call.h>
 #include <asm/ps3fb.h>
 
+#define PS3_VERBOSE_RESULT
 #include "platform.h"
 
 /**
@@ -75,8 +76,9 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn,
 
         if (result) {
                 /* all entries bolted !*/
-                pr_info("%s:result=%d vpn=%lx pa=%lx ix=%lx v=%llx r=%llx\n",
-                        __func__, result, vpn, pa, hpte_group, hpte_v, hpte_r);
+                pr_info("%s:result=%s vpn=%lx pa=%lx ix=%lx v=%llx r=%llx\n",
+                        __func__, ps3_result(result), vpn, pa, hpte_group,
+                        hpte_v, hpte_r);
                 BUG();
         }
 
@@ -125,8 +127,8 @@ static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
                                        &hpte_rs);
 
         if (result) {
-                pr_info("%s: res=%d read vpn=%lx slot=%lx psize=%d\n",
-                        __func__, result, vpn, slot, psize);
+                pr_info("%s: result=%s read vpn=%lx slot=%lx psize=%d\n",
+                        __func__, ps3_result(result), vpn, slot, psize);
                 BUG();
         }
 
@@ -170,8 +172,8 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long vpn,
         result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, slot, 0, 0);
 
         if (result) {
-                pr_info("%s: res=%d vpn=%lx slot=%lx psize=%d\n",
-                        __func__, result, vpn, slot, psize);
+                pr_info("%s: result=%s vpn=%lx slot=%lx psize=%d\n",
+                        __func__, ps3_result(result), vpn, slot, psize);
                 BUG();
         }
 
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 837cf49357ed..9a0941bc4d31 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -17,6 +17,7 @@ config PPC_PSERIES
         select PPC_NATIVE
         select PPC_PCI_CHOICE if EXPERT
         select ZLIB_DEFLATE
+        select PPC_DOORBELL
         default y
 
 config PPC_SPLPAR
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 890622b87c8f..53866e537a92 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -1,4 +1,4 @@
-ccflags-$(CONFIG_PPC64)                 := -mno-minimal-toc
+ccflags-$(CONFIG_PPC64)                 := $(NO_MINIMAL_TOC)
 ccflags-$(CONFIG_PPC_PSERIES_DEBUG)     += -DDEBUG
 
 obj-y                   := lpar.o hvCall.o nvram.o reconfig.o \
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 9a04322b1736..6b73d6c44f51 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -788,7 +788,6 @@ static void eeh_add_device_late(struct pci_dev *dev)
         dev->dev.archdata.edev = edev;
 
         eeh_addr_cache_insert_dev(dev);
-        eeh_sysfs_add_device(dev);
 }
 
 /**
@@ -815,6 +814,29 @@ void eeh_add_device_tree_late(struct pci_bus *bus)
 EXPORT_SYMBOL_GPL(eeh_add_device_tree_late);
 
 /**
+ * eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus
+ * @bus: PCI bus
+ *
+ * This routine must be used to add EEH sysfs files for PCI
+ * devices which are attached to the indicated PCI bus. The PCI bus
+ * is added after system boot through hotplug or dlpar.
+ */
+void eeh_add_sysfs_files(struct pci_bus *bus)
+{
+        struct pci_dev *dev;
+
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                eeh_sysfs_add_device(dev);
+                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
+                        struct pci_bus *subbus = dev->subordinate;
+                        if (subbus)
+                                eeh_add_sysfs_files(subbus);
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(eeh_add_sysfs_files);
+
+/**
  * eeh_remove_device - Undo EEH setup for the indicated pci device
  * @dev: pci device to be removed
  * @purge_pe: remove the PE or not
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 7b56118f531c..aa3693f7fb27 100644
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -33,6 +33,11 @@ typedef struct {
     char * name;
 } firmware_feature_t;
 
+/*
+ * The names in this table match names in rtas/ibm,hypertas-functions.  If the
+ * entry ends in a '*', only upto the '*' is matched.  Otherwise the entire
+ * string must match.
+ */
 static __initdata firmware_feature_t
 firmware_features_table[FIRMWARE_MAX_FEATURES] = {
         {FW_FEATURE_PFT,                "hcall-pft"},
@@ -57,6 +62,7 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = {
         {FW_FEATURE_SPLPAR,             "hcall-splpar"},
         {FW_FEATURE_VPHN,               "hcall-vphn"},
         {FW_FEATURE_SET_MODE,           "hcall-set-mode"},
+        {FW_FEATURE_BEST_ENERGY,        "hcall-best-energy-1*"},
 };
 
 /* Build up the firmware features bitmask using the contents of
@@ -72,9 +78,20 @@ void __init fw_feature_init(const char *hypertas, unsigned long len)
 
         for (s = hypertas; s < hypertas + len; s += strlen(s) + 1) {
                 for (i = 0; i < FIRMWARE_MAX_FEATURES; i++) {
+                        const char *name = firmware_features_table[i].name;
+                        size_t size;
                         /* check value against table of strings */
-                        if (!firmware_features_table[i].name ||
-                            strcmp(firmware_features_table[i].name, s))
+                        if (!name)
+                                continue;
+                        /*
+                         * If there is a '*' at the end of name, only check
+                         * upto there
+                         */
+                        size = strlen(name);
+                        if (size && name[size - 1] == '*') {
+                                if (strncmp(name, s, size - 1))
+                                        continue;
+                        } else if (strcmp(name, s))
                                 continue;
 
                         /* we have a match */
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index a38956269fbf..217ca5c75b20 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -127,9 +127,16 @@ static void pseries_mach_cpu_die(void)
                         get_lppaca()->donate_dedicated_cpu = 1;
 
                 while (get_preferred_offline_state(cpu) == CPU_STATE_INACTIVE) {
+                        while (!prep_irq_for_idle()) {
+                                local_irq_enable();
+                                local_irq_disable();
+                        }
+
                         extended_cede_processor(cede_latency_hint);
                 }
 
+                local_irq_disable();
+
                 if (!get_lppaca()->shared_proc)
                         get_lppaca()->donate_dedicated_cpu = 0;
                 get_lppaca()->idle = 0;
@@ -137,6 +144,7 @@ static void pseries_mach_cpu_die(void)
                 if (get_preferred_offline_state(cpu) == CPU_STATE_ONLINE) {
                         unregister_slb_shadow(hwcpu);
 
+                        hard_irq_disable();
                         /*
                          * Call to start_secondary_resume() will not return.
                          * Kernel stack will be reset and start_secondary()
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index e2685badb5db..1b2a174e7c59 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -382,6 +382,7 @@ static int tce_clearrange_multi_pSeriesLP(unsigned long start_pfn,
                 rc = plpar_tce_stuff((u64)be32_to_cpu(maprange->liobn),
                                              dma_offset,
                                              0, limit);
+                next += limit * tce_size;
                 num_tce -= limit;
         } while (num_tce > 0 && !rc);
 
@@ -786,33 +787,68 @@ static u64 find_existing_ddw(struct device_node *pdn)
         return dma_addr;
 }
 
+static void __restore_default_window(struct eeh_dev *edev,
+                                                u32 ddw_restore_token)
+{
+        u32 cfg_addr;
+        u64 buid;
+        int ret;
+
+        /*
+         * Get the config address and phb buid of the PE window.
+         * Rely on eeh to retrieve this for us.
+         * Retrieve them from the pci device, not the node with the
+         * dma-window property
+         */
+        cfg_addr = edev->config_addr;
+        if (edev->pe_config_addr)
+                cfg_addr = edev->pe_config_addr;
+        buid = edev->phb->buid;
+
+        do {
+                ret = rtas_call(ddw_restore_token, 3, 1, NULL, cfg_addr,
+                                        BUID_HI(buid), BUID_LO(buid));
+        } while (rtas_busy_delay(ret));
+        pr_info("ibm,reset-pe-dma-windows(%x) %x %x %x returned %d\n",
+                 ddw_restore_token, cfg_addr, BUID_HI(buid), BUID_LO(buid), ret);
+}
+
 static int find_existing_ddw_windows(void)
 {
-        int len;
         struct device_node *pdn;
-        struct direct_window *window;
         const struct dynamic_dma_window_prop *direct64;
+        const u32 *ddw_extensions;
 
         if (!firmware_has_feature(FW_FEATURE_LPAR))
                 return 0;
 
         for_each_node_with_property(pdn, DIRECT64_PROPNAME) {
-                direct64 = of_get_property(pdn, DIRECT64_PROPNAME, &len);
+                direct64 = of_get_property(pdn, DIRECT64_PROPNAME, NULL);
                 if (!direct64)
                         continue;
 
-                window = kzalloc(sizeof(*window), GFP_KERNEL);
-                if (!window || len < sizeof(struct dynamic_dma_window_prop)) {
-                        kfree(window);
-                        remove_ddw(pdn);
-                        continue;
-                }
+                /*
+                 * We need to ensure the IOMMU table is active when we
+                 * return from the IOMMU setup so that the common code
+                 * can clear the table or find the holes. To that end,
+                 * first, remove any existing DDW configuration.
+                 */
+                remove_ddw(pdn);
 
-                window->device = pdn;
-                window->prop = direct64;
-                spin_lock(&direct_window_list_lock);
-                list_add(&window->list, &direct_window_list);
-                spin_unlock(&direct_window_list_lock);
+                /*
+                 * Second, if we are running on a new enough level of
+                 * firmware where the restore API is present, use it to
+                 * restore the 32-bit window, which was removed in
+                 * create_ddw.
+                 * If the API is not present, then create_ddw couldn't
+                 * have removed the 32-bit window in the first place, so
+                 * removing the DDW configuration should be sufficient.
+                 */
+                ddw_extensions = of_get_property(pdn, "ibm,ddw-extensions",
+                                                                        NULL);
+                if (ddw_extensions && ddw_extensions[0] > 0)
+                        __restore_default_window(of_node_to_eeh_dev(pdn),
+                                                        ddw_extensions[1]);
         }
 
         return 0;
@@ -883,32 +919,9 @@ static int create_ddw(struct pci_dev *dev, const u32 *ddw_avail,
 }
 
 static void restore_default_window(struct pci_dev *dev,
-                                u32 ddw_restore_token, unsigned long liobn)
+                                        u32 ddw_restore_token)
 {
-        struct eeh_dev *edev;
-        u32 cfg_addr;
-        u64 buid;
-        int ret;
-
-        /*
-         * Get the config address and phb buid of the PE window.
-         * Rely on eeh to retrieve this for us.
-         * Retrieve them from the pci device, not the node with the
-         * dma-window property
-         */
-        edev = pci_dev_to_eeh_dev(dev);
-        cfg_addr = edev->config_addr;
-        if (edev->pe_config_addr)
-                cfg_addr = edev->pe_config_addr;
-        buid = edev->phb->buid;
-
-        do {
-                ret = rtas_call(ddw_restore_token, 3, 1, NULL, cfg_addr,
-                                        BUID_HI(buid), BUID_LO(buid));
-        } while (rtas_busy_delay(ret));
-        dev_info(&dev->dev,
-                "ibm,reset-pe-dma-windows(%x) %x %x %x returned %d\n",
-                 ddw_restore_token, cfg_addr, BUID_HI(buid), BUID_LO(buid), ret);
+        __restore_default_window(pci_dev_to_eeh_dev(dev), ddw_restore_token);
 }
 
 /*
@@ -1099,7 +1112,7 @@ out_free_prop:
 
 out_restore_window:
         if (ddw_restore_token)
-                restore_default_window(dev, ddw_restore_token, liobn);
+                restore_default_window(dev, ddw_restore_token);
 
 out_unlock:
         mutex_unlock(&direct_window_init_mutex);
@@ -1295,6 +1308,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti
 
         switch (action) {
         case OF_RECONFIG_DETACH_NODE:
+                remove_ddw(np);
                 if (pci && pci->iommu_table)
                         iommu_free_table(pci->iommu_table, np->full_name);
 
@@ -1307,16 +1321,6 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti
                         }
                 }
                 spin_unlock(&direct_window_list_lock);
-
-                /*
-                 * Because the notifier runs after isolation of the
-                 * slot, we are guaranteed any DMA window has already
-                 * been revoked and the TCEs have been marked invalid,
-                 * so we don't need a call to remove_ddw(np). However,
-                 * if an additional notifier action is added before the
-                 * isolate call, we should update this code for
-                 * completeness with such a call.
-                 */
                 break;
         default:
                 err = NOTIFY_DONE;
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 56b864d777ee..0b580f413a9a 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -40,7 +40,8 @@ void pcibios_name_device(struct pci_dev *dev)
          */
         dn = pci_device_to_OF_node(dev);
         if (dn) {
-                const char *loc_code = of_get_property(dn, "ibm,loc-code", 0);
+                const char *loc_code = of_get_property(dn, "ibm,loc-code",
+                                NULL);
                 if (loc_code) {
                         int loc_len = strlen(loc_code);
                         if (loc_len < sizeof(dev->dev.name)) {
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index e6cc34a67053..f368668d97b3 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -2,6 +2,7 @@
 #define _PSERIES_PLPAR_WRAPPERS_H
 
 #include <linux/string.h>
+#include <linux/irqflags.h>
 
 #include <asm/hvcall.h>
 #include <asm/paca.h>
@@ -41,7 +42,14 @@ static inline long extended_cede_processor(unsigned long latency_hint)
         u8 old_latency_hint = get_cede_latency_hint();
 
         set_cede_latency_hint(latency_hint);
+
         rc = cede_processor();
+#ifdef CONFIG_TRACE_IRQFLAGS
+                /* Ensure that H_CEDE returns with IRQs on */
+                if (WARN_ON(!(mfmsr() & MSR_EE)))
+                        __hard_irq_enable();
+#endif
+
         set_cede_latency_hint(old_latency_hint);
 
         return rc;
@@ -304,4 +312,14 @@ static inline long disable_reloc_on_exceptions(void) {
         return plpar_set_mode(0, 3, 0, 0);
 }
 
+static inline long plapr_set_ciabr(unsigned long ciabr)
+{
+        return plpar_set_mode(0, 1, ciabr, 0);
+}
+
+static inline long plapr_set_watchpoint0(unsigned long dawr0, unsigned long dawrx0)
+{
+        return plpar_set_mode(0, 2, dawr0, dawrx0);
+}
+
 #endif /* _PSERIES_PLPAR_WRAPPERS_H */
diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c
index af281dce510a..a91e6dadda2c 100644
--- a/arch/powerpc/platforms/pseries/pseries_energy.c
+++ b/arch/powerpc/platforms/pseries/pseries_energy.c
@@ -21,6 +21,7 @@
 #include <asm/cputhreads.h>
 #include <asm/page.h>
 #include <asm/hvcall.h>
+#include <asm/firmware.h>
 
 
 #define MODULE_VERS "1.0"
@@ -32,40 +33,6 @@ static int sysfs_entries;
 
 /* Helper routines */
 
-/*
- * Routine to detect firmware support for hcall
- * return 1 if H_BEST_ENERGY is supported
- * else return 0
- */
-
-static int check_for_h_best_energy(void)
-{
-        struct device_node *rtas = NULL;
-        const char *hypertas, *s;
-        int length;
-        int rc = 0;
-
-        rtas = of_find_node_by_path("/rtas");
-        if (!rtas)
-                return 0;
-
-        hypertas = of_get_property(rtas, "ibm,hypertas-functions", &length);
-        if (!hypertas) {
-                of_node_put(rtas);
-                return 0;
-        }
-
-        /* hypertas will have list of strings with hcall names */
-        for (s = hypertas; s < hypertas + length; s += strlen(s) + 1) {
-                if (!strncmp("hcall-best-energy-1", s, 19)) {
-                        rc = 1; /* Found the string */
-                        break;
-                }
-        }
-        of_node_put(rtas);
-        return rc;
-}
-
 /* Helper Routines to convert between drc_index to cpu numbers */
 
 static u32 cpu_to_drc_index(int cpu)
@@ -262,7 +229,7 @@ static int __init pseries_energy_init(void)
         int cpu, err;
         struct device *cpu_dev;
 
-        if (!check_for_h_best_energy()) {
+        if (!firmware_has_feature(FW_FEATURE_BEST_ENERGY)) {
                 printk(KERN_INFO "Hypercall H_BEST_ENERGY not supported\n");
                 return 0;
         }
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 527e12c9573b..8bcc9ca6682f 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -65,6 +65,7 @@
 #include <asm/smp.h>
 #include <asm/firmware.h>
 #include <asm/eeh.h>
+#include <asm/reg.h>
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
@@ -375,7 +376,7 @@ static void pSeries_idle(void)
  * to ever be a problem in practice we can move this into a kernel thread to
  * finish off the process later in boot.
  */
-static int __init pSeries_enable_reloc_on_exc(void)
+long pSeries_enable_reloc_on_exc(void)
 {
         long rc;
         unsigned int delay, total_delay = 0;
@@ -397,9 +398,9 @@ static int __init pSeries_enable_reloc_on_exc(void)
                 mdelay(delay);
         }
 }
+EXPORT_SYMBOL(pSeries_enable_reloc_on_exc);
 
-#ifdef CONFIG_KEXEC
-static long pSeries_disable_reloc_on_exc(void)
+long pSeries_disable_reloc_on_exc(void)
 {
         long rc;
 
@@ -410,7 +411,9 @@ static long pSeries_disable_reloc_on_exc(void)
                 mdelay(get_longbusy_msecs(rc));
         }
 }
+EXPORT_SYMBOL(pSeries_disable_reloc_on_exc);
 
+#ifdef CONFIG_KEXEC
 static void pSeries_machine_kexec(struct kimage *image)
 {
         long rc;
@@ -498,6 +501,14 @@ static int pseries_set_xdabr(unsigned long dabr, unsigned long dabrx)
         return plpar_hcall_norets(H_SET_XDABR, dabr, dabrx);
 }
 
+static int pseries_set_dawr(unsigned long dawr, unsigned long dawrx)
+{
+        /* PAPR says we can't set HYP */
+        dawrx &= ~DAWRX_HYP;
+
+        return  plapr_set_watchpoint0(dawr, dawrx);
+}
+
 #define CMO_CHARACTERISTICS_TOKEN 44
 #define CMO_MAXLENGTH 1026
 
@@ -604,6 +615,9 @@ static void __init pSeries_init_early(void)
         else if (firmware_has_feature(FW_FEATURE_DABR))
                 ppc_md.set_dabr = pseries_set_dabr;
 
+        if (firmware_has_feature(FW_FEATURE_SET_MODE))
+                ppc_md.set_dawr = pseries_set_dawr;
+
         pSeries_cmo_feature_init();
         iommu_init_early_pSeries();
 
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 80cd0be71e06..12bc8c3663ad 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -42,6 +42,7 @@
 #include <asm/vdso_datapage.h>
 #include <asm/cputhreads.h>
 #include <asm/xics.h>
+#include <asm/dbell.h>
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
@@ -54,6 +55,11 @@
  */
 static cpumask_var_t of_spin_mask;
 
+/*
+ * If we multiplex IPI mechanisms, store the appropriate XICS IPI mechanism here
+ */
+static void  (*xics_cause_ipi)(int cpu, unsigned long data);
+
 /* Query where a cpu is now.  Return codes #defined in plpar_wrappers.h */
 int smp_query_cpu_stopped(unsigned int pcpu)
 {
@@ -137,6 +143,8 @@ static void smp_xics_setup_cpu(int cpu)
 {
         if (cpu != boot_cpuid)
                 xics_setup_cpu();
+        if (cpu_has_feature(CPU_FTR_DBELL))
+                doorbell_setup_this_cpu();
 
         if (firmware_has_feature(FW_FEATURE_SPLPAR))
                 vpa_init(cpu);
@@ -195,6 +203,27 @@ static int smp_pSeries_cpu_bootable(unsigned int nr)
         return 1;
 }
 
+/* Only used on systems that support multiple IPI mechanisms */
+static void pSeries_cause_ipi_mux(int cpu, unsigned long data)
+{
+        if (cpumask_test_cpu(cpu, cpu_sibling_mask(smp_processor_id())))
+                doorbell_cause_ipi(cpu, data);
+        else
+                xics_cause_ipi(cpu, data);
+}
+
+static __init int pSeries_smp_probe(void)
+{
+        int ret = xics_smp_probe();
+
+        if (cpu_has_feature(CPU_FTR_DBELL)) {
+                xics_cause_ipi = smp_ops->cause_ipi;
+                smp_ops->cause_ipi = pSeries_cause_ipi_mux;
+        }
+
+        return ret;
+}
+
 static struct smp_ops_t pSeries_mpic_smp_ops = {
         .message_pass   = smp_mpic_message_pass,
         .probe          = smp_mpic_probe,
@@ -204,8 +233,8 @@ static struct smp_ops_t pSeries_mpic_smp_ops = {
 
 static struct smp_ops_t pSeries_xics_smp_ops = {
         .message_pass   = NULL, /* Use smp_muxed_ipi_message_pass */
-        .cause_ipi      = NULL, /* Filled at runtime by xics_smp_probe() */
-        .probe          = xics_smp_probe,
+        .cause_ipi      = NULL, /* Filled at runtime by pSeries_smp_probe() */
+        .probe          = pSeries_smp_probe,
         .kick_cpu       = smp_pSeries_kick_cpu,
         .setup_cpu      = smp_xics_setup_cpu,
         .cpu_bootable   = smp_pSeries_cpu_bootable,
diff --git a/arch/powerpc/platforms/wsp/Makefile b/arch/powerpc/platforms/wsp/Makefile
index 56817ac98fc9..162fc60125a2 100644
--- a/arch/powerpc/platforms/wsp/Makefile
+++ b/arch/powerpc/platforms/wsp/Makefile
@@ -1,4 +1,4 @@
-ccflags-y                       += -mno-minimal-toc
+ccflags-y                       += $(NO_MINIMAL_TOC)
 
 obj-y                           += setup.o ics.o wsp.o
 obj-$(CONFIG_PPC_PSR2)          += psr2.o
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index a57600b3a4e3..b0a518e97599 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -1,6 +1,6 @@
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
-ccflags-$(CONFIG_PPC64)         := -mno-minimal-toc
+ccflags-$(CONFIG_PPC64)         := $(NO_MINIMAL_TOC)
 
 mpic-msi-obj-$(CONFIG_PCI_MSI)  += mpic_msi.o mpic_u3msi.o mpic_pasemi_msi.o
 obj-$(CONFIG_MPIC)              += mpic.o $(mpic-msi-obj-y)
@@ -26,7 +26,6 @@ obj-$(CONFIG_SIMPLE_GPIO)	+= simple_gpio.o
 obj-$(CONFIG_FSL_RIO)           += fsl_rio.o fsl_rmu.o
 obj-$(CONFIG_TSI108_BRIDGE)     += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)      += qe_lib/
-obj-$(CONFIG_PPC_BESTCOMM)      += bestcomm/
 mv64x60-$(CONFIG_PCI)           += mv64x60_pci.o
 obj-$(CONFIG_MV64X60)           += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \
                                    mv64x60_udbg.o
@@ -37,6 +36,7 @@ obj-$(CONFIG_PPC_INDIRECT_PCI)	+= indirect_pci.o
 obj-$(CONFIG_PPC_I8259)         += i8259.o
 obj-$(CONFIG_IPIC)              += ipic.o
 obj-$(CONFIG_4xx)               += uic.o
+obj-$(CONFIG_PPC4xx_OCM)        += ppc4xx_ocm.o
 obj-$(CONFIG_4xx_SOC)           += ppc4xx_soc.o
 obj-$(CONFIG_XILINX_VIRTEX)     += xilinx_intc.o
 obj-$(CONFIG_XILINX_PCI)        += xilinx_pci.o
diff --git a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
index 8cf93f029e17..afc2dbf37011 100644
--- a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
+++ b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
@@ -203,6 +203,7 @@ static struct of_device_id mpc85xx_l2ctlr_of_match[] = {
         {       .compatible = "fsl,p1024-l2-cache-controller",},
         {       .compatible = "fsl,p1015-l2-cache-controller",},
         {       .compatible = "fsl,p1010-l2-cache-controller",},
+        {       .compatible = "fsl,bsc9131-l2-cache-controller",},
         {},
 };
 
diff --git a/arch/powerpc/sysdev/fsl_ifc.c b/arch/powerpc/sysdev/fsl_ifc.c
index 2a36fd6a9583..d7fc72239144 100644
--- a/arch/powerpc/sysdev/fsl_ifc.c
+++ b/arch/powerpc/sysdev/fsl_ifc.c
@@ -63,7 +63,7 @@ int fsl_ifc_find(phys_addr_t addr_base)
                 return -ENODEV;
 
         for (i = 0; i < ARRAY_SIZE(fsl_ifc_ctrl_dev->regs->cspr_cs); i++) {
-                __be32 cspr = in_be32(&fsl_ifc_ctrl_dev->regs->cspr_cs[i].cspr);
+                u32 cspr = in_be32(&fsl_ifc_ctrl_dev->regs->cspr_cs[i].cspr);
                 if (cspr & CSPR_V && (cspr & CSPR_BA) ==
                                 convert_ifc_address(addr_base))
                         return i;
diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index 300be2d06a26..6bc5a546d49f 100644
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -74,8 +74,8 @@ int fsl_lbc_find(phys_addr_t addr_base)
 
         lbc = fsl_lbc_ctrl_dev->regs;
         for (i = 0; i < ARRAY_SIZE(lbc->bank); i++) {
-                __be32 br = in_be32(&lbc->bank[i].br);
-                __be32 or = in_be32(&lbc->bank[i].or);
+                u32 br = in_be32(&lbc->bank[i].br);
+                u32 or = in_be32(&lbc->bank[i].or);
 
                 if (br & BR_V && (br & or & BR_BA) == fsl_lbc_addr(addr_base))
                         return i;
@@ -97,7 +97,7 @@ EXPORT_SYMBOL(fsl_lbc_find);
 int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm)
 {
         int bank;
-        __be32 br;
+        u32 br;
         struct fsl_lbc_regs __iomem *lbc;
 
         bank = fsl_lbc_find(addr_base);
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 6e53d97abd3f..178c99427b1c 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -28,7 +28,7 @@
 #include "fsl_msi.h"
 #include "fsl_pci.h"
 
-LIST_HEAD(msi_head);
+static LIST_HEAD(msi_head);
 
 struct fsl_msi_feature {
         u32 fsl_pic_ip;
@@ -130,7 +130,7 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,
         struct pci_controller *hose = pci_bus_to_host(pdev->bus);
         u64 address; /* Physical address of the MSIIR */
         int len;
-        const u64 *reg;
+        const __be64 *reg;
 
         /* If the msi-address-64 property exists, then use it */
         reg = of_get_property(hose->dn, "msi-address-64", &len);
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 92a5915b1827..682084dba19b 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -421,13 +421,16 @@ void fsl_pcibios_fixup_bus(struct pci_bus *bus)
         }
 }
 
-int __init fsl_add_bridge(struct device_node *dev, int is_primary)
+int __init fsl_add_bridge(struct platform_device *pdev, int is_primary)
 {
         int len;
         struct pci_controller *hose;
         struct resource rsrc;
         const int *bus_range;
         u8 hdr_type, progif;
+        struct device_node *dev;
+
+        dev = pdev->dev.of_node;
 
         if (!of_device_is_available(dev)) {
                 pr_warning("%s: disabled\n", dev->full_name);
@@ -453,6 +456,8 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
         if (!hose)
                 return -ENOMEM;
 
+        /* set platform device as the parent */
+        hose->parent = &pdev->dev;
         hose->first_busno = bus_range ? bus_range[0] : 0x0;
         hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
@@ -827,13 +832,18 @@ static const struct of_device_id pci_ids[] = {
         { .compatible = "fsl,mpc8548-pcie", },
         { .compatible = "fsl,mpc8610-pci", },
         { .compatible = "fsl,mpc8641-pcie", },
+        { .compatible = "fsl,qoriq-pcie-v2.1", },
+        { .compatible = "fsl,qoriq-pcie-v2.2", },
+        { .compatible = "fsl,qoriq-pcie-v2.3", },
+        { .compatible = "fsl,qoriq-pcie-v2.4", },
+
+        /*
+         * The following entries are for compatibility with older device
+         * trees.
+         */
         { .compatible = "fsl,p1022-pcie", },
-        { .compatible = "fsl,p1010-pcie", },
-        { .compatible = "fsl,p1023-pcie", },
         { .compatible = "fsl,p4080-pcie", },
-        { .compatible = "fsl,qoriq-pcie-v2.4", },
-        { .compatible = "fsl,qoriq-pcie-v2.3", },
-        { .compatible = "fsl,qoriq-pcie-v2.2", },
+
         {},
 };
 
@@ -880,7 +890,7 @@ static int fsl_pci_probe(struct platform_device *pdev)
 #endif
 
         node = pdev->dev.of_node;
-        ret = fsl_add_bridge(node, fsl_pci_primary == node);
+        ret = fsl_add_bridge(pdev, fsl_pci_primary == node);
 
 #ifdef CONFIG_SWIOTLB
         if (ret == 0) {
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h
index d078537adece..c495c00c8740 100644
--- a/arch/powerpc/sysdev/fsl_pci.h
+++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -91,7 +91,7 @@ struct ccsr_pci {
         __be32  pex_err_cap_r3;         /* 0x.e34 - PCIE error capture register 0 */
 };
 
-extern int fsl_add_bridge(struct device_node *dev, int is_primary);
+extern int fsl_add_bridge(struct platform_device *pdev, int is_primary);
 extern void fsl_pcibios_fixup_bus(struct pci_bus *bus);
 extern int mpc83xx_add_bridge(struct device_node *dev);
 u64 fsl_pci_immrbar_base(struct pci_controller *hose);
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 97118dc3d285..228cf91b91c1 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -58,10 +58,10 @@ phys_addr_t get_immrbase(void)
         if (soc) {
                 int size;
                 u32 naddr;
-                const u32 *prop = of_get_property(soc, "#address-cells", &size);
+                const __be32 *prop = of_get_property(soc, "#address-cells", &size);
 
                 if (prop && size == 4)
-                        naddr = *prop;
+                        naddr = be32_to_cpup(prop);
                 else
                         naddr = 2;
 
diff --git a/arch/powerpc/sysdev/mpc5xxx_clocks.c b/arch/powerpc/sysdev/mpc5xxx_clocks.c
index 96f815a55dfd..5492dc5f56f4 100644
--- a/arch/powerpc/sysdev/mpc5xxx_clocks.c
+++ b/arch/powerpc/sysdev/mpc5xxx_clocks.c
@@ -9,9 +9,9 @@
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/export.h>
+#include <asm/mpc5xxx.h>
 
-unsigned int
-mpc5xxx_get_bus_frequency(struct device_node *node)
+unsigned long mpc5xxx_get_bus_frequency(struct device_node *node)
 {
         struct device_node *np;
         const unsigned int *p_bus_freq = NULL;
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 3b2efd41abf2..d30e6a676c89 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -54,7 +54,7 @@ static DEFINE_RAW_SPINLOCK(mpic_lock);
 
 #ifdef CONFIG_PPC32     /* XXX for now */
 #ifdef CONFIG_IRQ_ALL_CPUS
-#define distribute_irqs (1)
+#define distribute_irqs (!(mpic->flags & MPIC_SINGLE_DEST_CPU))
 #else
 #define distribute_irqs (0)
 #endif
@@ -1182,6 +1182,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         const char *vers;
         const u32 *psrc;
         u32 last_irq;
+        u32 fsl_version = 0;
 
         /* Default MPIC search parameters */
         static const struct of_device_id __initconst mpic_device_id[] = {
@@ -1314,7 +1315,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         mpic_map(mpic, mpic->paddr, &mpic->tmregs, MPIC_INFO(TIMER_BASE), 0x1000);
 
         if (mpic->flags & MPIC_FSL) {
-                u32 brr1, version;
+                u32 brr1;
                 int ret;
 
                 /*
@@ -1327,7 +1328,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
 
                 brr1 = _mpic_read(mpic->reg_type, &mpic->thiscpuregs,
                                 MPIC_FSL_BRR1);
-                version = brr1 & MPIC_FSL_BRR1_VER;
+                fsl_version = brr1 & MPIC_FSL_BRR1_VER;
 
                 /* Error interrupt mask register (EIMR) is required for
                  * handling individual device error interrupts. EIMR
@@ -1342,11 +1343,30 @@ struct mpic * __init mpic_alloc(struct device_node *node,
                  * is the number of vectors which have been consumed by
                  * ipis and timer interrupts.
                  */
-                if (version >= 0x401) {
+                if (fsl_version >= 0x401) {
                         ret = mpic_setup_error_int(mpic, intvec_top - 12);
                         if (ret)
                                 return NULL;
                 }
+
+        }
+
+        /*
+         * EPR is only available starting with v4.0.  To support
+         * platforms that don't know the MPIC version at compile-time,
+         * such as qemu-e500, turn off coreint if this MPIC doesn't
+         * support it.  Note that we never enable it if it wasn't
+         * requested in the first place.
+         *
+         * This is done outside the MPIC_FSL check, so that we
+         * also disable coreint if the MPIC node doesn't have
+         * an "fsl,mpic" compatible at all.  This will be the case
+         * with device trees generated by older versions of QEMU.
+         * fsl_version will be zero if MPIC_FSL is not set.
+         */
+        if (fsl_version < 0x400 && (flags & MPIC_ENABLE_COREINT)) {
+                WARN_ON(ppc_md.get_irq != mpic_get_coreint_irq);
+                ppc_md.get_irq = mpic_get_irq;
         }
 
         /* Reset */
diff --git a/arch/powerpc/sysdev/ppc4xx_ocm.c b/arch/powerpc/sysdev/ppc4xx_ocm.c
new file mode 100644
index 000000000000..1b15f93479c3
--- /dev/null
+++ b/arch/powerpc/sysdev/ppc4xx_ocm.c
@@ -0,0 +1,415 @@
+/*
+ * PowerPC 4xx OCM memory allocation support
+ *
+ * (C) Copyright 2009, Applied Micro Circuits Corporation
+ * Victor Gallardo (vgallardo@amcc.com)
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+#include <asm/rheap.h>
+#include <asm/ppc4xx_ocm.h>
+#include <linux/slab.h>
+#include <linux/debugfs.h>
+
+#define OCM_DISABLED    0
+#define OCM_ENABLED             1
+
+struct ocm_block {
+        struct list_head        list;
+        void __iomem            *addr;
+        int                                     size;
+        const char                      *owner;
+};
+
+/* non-cached or cached region */
+struct ocm_region {
+        phys_addr_t                     phys;
+        void __iomem            *virt;
+
+        int                                     memtotal;
+        int                                     memfree;
+
+        rh_info_t                       *rh;
+        struct list_head        list;
+};
+
+struct ocm_info {
+        int                                     index;
+        int                                     status;
+        int                                     ready;
+
+        phys_addr_t                     phys;
+
+        int                                     alignment;
+        int                                     memtotal;
+        int                                     cache_size;
+
+        struct ocm_region       nc;     /* non-cached region */
+        struct ocm_region       c;      /* cached region */
+};
+
+static struct ocm_info *ocm_nodes;
+static int ocm_count;
+
+static struct ocm_info *ocm_get_node(unsigned int index)
+{
+        if (index >= ocm_count) {
+                printk(KERN_ERR "PPC4XX OCM: invalid index");
+                return NULL;
+        }
+
+        return &ocm_nodes[index];
+}
+
+static int ocm_free_region(struct ocm_region *ocm_reg, const void *addr)
+{
+        struct ocm_block *blk, *tmp;
+        unsigned long offset;
+
+        if (!ocm_reg->virt)
+                return 0;
+
+        list_for_each_entry_safe(blk, tmp, &ocm_reg->list, list) {
+                if (blk->addr == addr) {
+                        offset = addr - ocm_reg->virt;
+                        ocm_reg->memfree += blk->size;
+                        rh_free(ocm_reg->rh, offset);
+                        list_del(&blk->list);
+                        kfree(blk);
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+static void __init ocm_init_node(int count, struct device_node *node)
+{
+        struct ocm_info *ocm;
+
+        const unsigned int *cell_index;
+        const unsigned int *cache_size;
+        int len;
+
+        struct resource rsrc;
+        int ioflags;
+
+        ocm = ocm_get_node(count);
+
+        cell_index = of_get_property(node, "cell-index", &len);
+        if (!cell_index) {
+                printk(KERN_ERR "PPC4XX OCM: missing cell-index property");
+                return;
+        }
+        ocm->index = *cell_index;
+
+        if (of_device_is_available(node))
+                ocm->status = OCM_ENABLED;
+
+        cache_size = of_get_property(node, "cached-region-size", &len);
+        if (cache_size)
+                ocm->cache_size = *cache_size;
+
+        if (of_address_to_resource(node, 0, &rsrc)) {
+                printk(KERN_ERR "PPC4XX OCM%d: could not get resource address\n",
+                        ocm->index);
+                return;
+        }
+
+        ocm->phys = rsrc.start;
+        ocm->memtotal = (rsrc.end - rsrc.start + 1);
+
+        printk(KERN_INFO "PPC4XX OCM%d: %d Bytes (%s)\n",
+                ocm->index, ocm->memtotal,
+                (ocm->status == OCM_DISABLED) ? "disabled" : "enabled");
+
+        if (ocm->status == OCM_DISABLED)
+                return;
+
+        /* request region */
+
+        if (!request_mem_region(ocm->phys, ocm->memtotal, "ppc4xx_ocm")) {
+                printk(KERN_ERR "PPC4XX OCM%d: could not request region\n",
+                        ocm->index);
+                return;
+        }
+
+        /* Configure non-cached and cached regions */
+
+        ocm->nc.phys = ocm->phys;
+        ocm->nc.memtotal = ocm->memtotal - ocm->cache_size;
+        ocm->nc.memfree = ocm->nc.memtotal;
+
+        ocm->c.phys = ocm->phys + ocm->nc.memtotal;
+        ocm->c.memtotal = ocm->cache_size;
+        ocm->c.memfree = ocm->c.memtotal;
+
+        if (ocm->nc.memtotal == 0)
+                ocm->nc.phys = 0;
+
+        if (ocm->c.memtotal == 0)
+                ocm->c.phys = 0;
+
+        printk(KERN_INFO "PPC4XX OCM%d: %d Bytes (non-cached)\n",
+                ocm->index, ocm->nc.memtotal);
+
+        printk(KERN_INFO "PPC4XX OCM%d: %d Bytes (cached)\n",
+                ocm->index, ocm->c.memtotal);
+
+        /* ioremap the non-cached region */
+        if (ocm->nc.memtotal) {
+                ioflags = _PAGE_NO_CACHE | _PAGE_GUARDED | _PAGE_EXEC;
+                ocm->nc.virt = __ioremap(ocm->nc.phys, ocm->nc.memtotal,
+                                          ioflags);
+
+                if (!ocm->nc.virt) {
+                        printk(KERN_ERR
+                               "PPC4XX OCM%d: failed to ioremap non-cached memory\n",
+                               ocm->index);
+                        ocm->nc.memfree = 0;
+                        return;
+                }
+        }
+
+        /* ioremap the cached region */
+
+        if (ocm->c.memtotal) {
+                ioflags = _PAGE_EXEC;
+                ocm->c.virt = __ioremap(ocm->c.phys, ocm->c.memtotal,
+                                         ioflags);
+
+                if (!ocm->c.virt) {
+                        printk(KERN_ERR
+                               "PPC4XX OCM%d: failed to ioremap cached memory\n",
+                               ocm->index);
+                        ocm->c.memfree = 0;
+                        return;
+                }
+        }
+
+        /* Create Remote Heaps */
+
+        ocm->alignment = 4; /* default 4 byte alignment */
+
+        if (ocm->nc.virt) {
+                ocm->nc.rh = rh_create(ocm->alignment);
+                rh_attach_region(ocm->nc.rh, 0, ocm->nc.memtotal);
+        }
+
+        if (ocm->c.virt) {
+                ocm->c.rh = rh_create(ocm->alignment);
+                rh_attach_region(ocm->c.rh, 0, ocm->c.memtotal);
+        }
+
+        INIT_LIST_HEAD(&ocm->nc.list);
+        INIT_LIST_HEAD(&ocm->c.list);
+
+        ocm->ready = 1;
+
+        return;
+}
+
+static int ocm_debugfs_show(struct seq_file *m, void *v)
+{
+        struct ocm_block *blk, *tmp;
+        unsigned int i;
+
+        for (i = 0; i < ocm_count; i++) {
+                struct ocm_info *ocm = ocm_get_node(i);
+
+                if (!ocm || !ocm->ready)
+                        continue;
+
+                seq_printf(m, "PPC4XX OCM   : %d\n", ocm->index);
+                seq_printf(m, "PhysAddr     : 0x%llx\n", ocm->phys);
+                seq_printf(m, "MemTotal     : %d Bytes\n", ocm->memtotal);
+                seq_printf(m, "MemTotal(NC) : %d Bytes\n", ocm->nc.memtotal);
+                seq_printf(m, "MemTotal(C)  : %d Bytes\n", ocm->c.memtotal);
+
+                seq_printf(m, "\n");
+
+                seq_printf(m, "NC.PhysAddr  : 0x%llx\n", ocm->nc.phys);
+                seq_printf(m, "NC.VirtAddr  : 0x%p\n", ocm->nc.virt);
+                seq_printf(m, "NC.MemTotal  : %d Bytes\n", ocm->nc.memtotal);
+                seq_printf(m, "NC.MemFree   : %d Bytes\n", ocm->nc.memfree);
+
+                list_for_each_entry_safe(blk, tmp, &ocm->nc.list, list) {
+                        seq_printf(m, "NC.MemUsed   : %d Bytes (%s)\n",
+                                                        blk->size, blk->owner);
+                }
+
+                seq_printf(m, "\n");
+
+                seq_printf(m, "C.PhysAddr   : 0x%llx\n", ocm->c.phys);
+                seq_printf(m, "C.VirtAddr   : 0x%p\n", ocm->c.virt);
+                seq_printf(m, "C.MemTotal   : %d Bytes\n", ocm->c.memtotal);
+                seq_printf(m, "C.MemFree    : %d Bytes\n", ocm->c.memfree);
+
+                list_for_each_entry_safe(blk, tmp, &ocm->c.list, list) {
+                        seq_printf(m, "C.MemUsed    : %d Bytes (%s)\n",
+                                                blk->size, blk->owner);
+                }
+
+                seq_printf(m, "\n");
+        }
+
+        return 0;
+}
+
+static int ocm_debugfs_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ocm_debugfs_show, NULL);
+}
+
+static const struct file_operations ocm_debugfs_fops = {
+        .open = ocm_debugfs_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+};
+
+static int ocm_debugfs_init(void)
+{
+        struct dentry *junk;
+
+        junk = debugfs_create_dir("ppc4xx_ocm", 0);
+        if (!junk) {
+                printk(KERN_ALERT "debugfs ppc4xx ocm: failed to create dir\n");
+                return -1;
+        }
+
+        if (debugfs_create_file("info", 0644, junk, NULL, &ocm_debugfs_fops)) {
+                printk(KERN_ALERT "debugfs ppc4xx ocm: failed to create file\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+void *ppc4xx_ocm_alloc(phys_addr_t *phys, int size, int align,
+                        int flags, const char *owner)
+{
+        void __iomem *addr = NULL;
+        unsigned long offset;
+        struct ocm_info *ocm;
+        struct ocm_region *ocm_reg;
+        struct ocm_block *ocm_blk;
+        int i;
+
+        for (i = 0; i < ocm_count; i++) {
+                ocm = ocm_get_node(i);
+
+                if (!ocm || !ocm->ready)
+                        continue;
+
+                if (flags == PPC4XX_OCM_NON_CACHED)
+                        ocm_reg = &ocm->nc;
+                else
+                        ocm_reg = &ocm->c;
+
+                if (!ocm_reg->virt)
+                        continue;
+
+                if (align < ocm->alignment)
+                        align = ocm->alignment;
+
+                offset = rh_alloc_align(ocm_reg->rh, size, align, NULL);
+
+                if (IS_ERR_VALUE(offset))
+                        continue;
+
+                ocm_blk = kzalloc(sizeof(struct ocm_block *), GFP_KERNEL);
+                if (!ocm_blk) {
+                        printk(KERN_ERR "PPC4XX OCM: could not allocate ocm block");
+                        rh_free(ocm_reg->rh, offset);
+                        break;
+                }
+
+                *phys = ocm_reg->phys + offset;
+                addr = ocm_reg->virt + offset;
+                size = ALIGN(size, align);
+
+                ocm_blk->addr = addr;
+                ocm_blk->size = size;
+                ocm_blk->owner = owner;
+                list_add_tail(&ocm_blk->list, &ocm_reg->list);
+
+                ocm_reg->memfree -= size;
+
+                break;
+        }
+
+        return addr;
+}
+
+void ppc4xx_ocm_free(const void *addr)
+{
+        int i;
+
+        if (!addr)
+                return;
+
+        for (i = 0; i < ocm_count; i++) {
+                struct ocm_info *ocm = ocm_get_node(i);
+
+                if (!ocm || !ocm->ready)
+                        continue;
+
+                if (ocm_free_region(&ocm->nc, addr) ||
+                        ocm_free_region(&ocm->c, addr))
+                        return;
+        }
+}
+
+static int __init ppc4xx_ocm_init(void)
+{
+        struct device_node *np;
+        int count;
+
+        count = 0;
+        for_each_compatible_node(np, NULL, "ibm,ocm")
+                count++;
+
+        if (!count)
+                return 0;
+
+        ocm_nodes = kzalloc((count * sizeof(struct ocm_info)), GFP_KERNEL);
+        if (!ocm_nodes) {
+                printk(KERN_ERR "PPC4XX OCM: failed to allocate OCM nodes!\n");
+                return -ENOMEM;
+        }
+
+        ocm_count = count;
+        count = 0;
+
+        for_each_compatible_node(np, NULL, "ibm,ocm") {
+                ocm_init_node(count, np);
+                count++;
+        }
+
+        ocm_debugfs_init();
+
+        return 0;
+}
+
+arch_initcall(ppc4xx_ocm_init);
diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
index c782f85cf7e4..936575d99c5c 100644
--- a/arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -213,7 +213,7 @@ static int ics_rtas_host_match(struct ics *ics, struct device_node *node)
         return !of_device_is_compatible(node, "chrp,iic");
 }
 
-int ics_rtas_init(void)
+__init int ics_rtas_init(void)
 {
         ibm_get_xive = rtas_token("ibm,get-xive");
         ibm_set_xive = rtas_token("ibm,set-xive");
diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile
index b49fdbd15808..1278788d96e3 100644
--- a/arch/powerpc/xmon/Makefile
+++ b/arch/powerpc/xmon/Makefile
@@ -4,7 +4,7 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
 GCOV_PROFILE := n
 
-ccflags-$(CONFIG_PPC64) := -mno-minimal-toc
+ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)
 
 obj-y                   += xmon.o nonstdio.o
 
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 1f8d2f10a432..13f85defabed 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -43,6 +43,7 @@
 #include <asm/setjmp.h>
 #include <asm/reg.h>
 #include <asm/debug.h>
+#include <asm/hw_breakpoint.h>
 
 #ifdef CONFIG_PPC64
 #include <asm/hvcall.h>
@@ -607,7 +608,7 @@ static int xmon_sstep(struct pt_regs *regs)
         return 1;
 }
 
-static int xmon_dabr_match(struct pt_regs *regs)
+static int xmon_break_match(struct pt_regs *regs)
 {
         if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) != (MSR_IR|MSR_64BIT))
                 return 0;
@@ -740,8 +741,14 @@ static void insert_bpts(void)
 
 static void insert_cpu_bpts(void)
 {
-        if (dabr.enabled)
-                set_dabr(dabr.address | (dabr.enabled & 7), DABRX_ALL);
+        struct arch_hw_breakpoint brk;
+
+        if (dabr.enabled) {
+                brk.address = dabr.address;
+                brk.type = (dabr.enabled & HW_BRK_TYPE_DABR) | HW_BRK_TYPE_PRIV_ALL;
+                brk.len = 8;
+                set_breakpoint(&brk);
+        }
         if (iabr && cpu_has_feature(CPU_FTR_IABR))
                 mtspr(SPRN_IABR, iabr->address
                          | (iabr->enabled & (BP_IABR|BP_IABR_TE)));
@@ -769,7 +776,7 @@ static void remove_bpts(void)
 
 static void remove_cpu_bpts(void)
 {
-        set_dabr(0, 0);
+        hw_breakpoint_disable();
         if (cpu_has_feature(CPU_FTR_IABR))
                 mtspr(SPRN_IABR, 0);
 }
@@ -1138,7 +1145,7 @@ bpt_cmds(void)
                                 printf(badaddr);
                                 break;
                         }
-                        dabr.address &= ~7;
+                        dabr.address &= ~HW_BRK_TYPE_DABR;
                         dabr.enabled = mode | BP_DABR;
                 }
                 break;
@@ -2917,7 +2924,7 @@ static void xmon_init(int enable)
                 __debugger_bpt = xmon_bpt;
                 __debugger_sstep = xmon_sstep;
                 __debugger_iabr_match = xmon_iabr_match;
-                __debugger_dabr_match = xmon_dabr_match;
+                __debugger_break_match = xmon_break_match;
                 __debugger_fault_handler = xmon_fault_handler;
         } else {
                 __debugger = NULL;
@@ -2925,7 +2932,7 @@ static void xmon_init(int enable)
                 __debugger_bpt = NULL;
                 __debugger_sstep = NULL;
                 __debugger_iabr_match = NULL;
-                __debugger_dabr_match = NULL;
+                __debugger_break_match = NULL;
                 __debugger_fault_handler = NULL;
         }
 }
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ff0e5f3c844e..4ebc7a6e6724 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1054,6 +1054,24 @@ config MICROCODE_OLD_INTERFACE
         def_bool y
         depends on MICROCODE
 
+config MICROCODE_INTEL_LIB
+        def_bool y
+        depends on MICROCODE_INTEL
+
+config MICROCODE_INTEL_EARLY
+        bool "Early load microcode"
+        depends on MICROCODE_INTEL && BLK_DEV_INITRD
+        default y
+        help
+          This option provides functionality to read additional microcode data
+          at the beginning of initrd image. The data tells kernel to load
+          microcode to CPU's as early as possible. No functional change if no
+          microcode data is glued to the initrd, therefore it's safe to say Y.
+
+config MICROCODE_EARLY
+        def_bool y
+        depends on MICROCODE_INTEL_EARLY
+
 config X86_MSR
         tristate "/dev/cpu/*/msr - Model-specific register support"
         ---help---
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 43d921b4752c..6825e2efd1b4 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -57,4 +57,18 @@ static inline struct microcode_ops * __init init_amd_microcode(void)
 static inline void __exit exit_amd_microcode(void) {}
 #endif
 
+#ifdef CONFIG_MICROCODE_EARLY
+#define MAX_UCODE_COUNT 128
+extern void __init load_ucode_bsp(void);
+extern __init void load_ucode_ap(void);
+extern int __init save_microcode_in_initrd(void);
+#else
+static inline void __init load_ucode_bsp(void) {}
+static inline __init void load_ucode_ap(void) {}
+static inline int __init save_microcode_in_initrd(void)
+{
+        return 0;
+}
+#endif
+
 #endif /* _ASM_X86_MICROCODE_H */
diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h
new file mode 100644
index 000000000000..5356f927d411
--- /dev/null
+++ b/arch/x86/include/asm/microcode_intel.h
@@ -0,0 +1,85 @@
+#ifndef _ASM_X86_MICROCODE_INTEL_H
+#define _ASM_X86_MICROCODE_INTEL_H
+
+#include <asm/microcode.h>
+
+struct microcode_header_intel {
+        unsigned int            hdrver;
+        unsigned int            rev;
+        unsigned int            date;
+        unsigned int            sig;
+        unsigned int            cksum;
+        unsigned int            ldrver;
+        unsigned int            pf;
+        unsigned int            datasize;
+        unsigned int            totalsize;
+        unsigned int            reserved[3];
+};
+
+struct microcode_intel {
+        struct microcode_header_intel hdr;
+        unsigned int            bits[0];
+};
+
+/* microcode format is extended from prescott processors */
+struct extended_signature {
+        unsigned int            sig;
+        unsigned int            pf;
+        unsigned int            cksum;
+};
+
+struct extended_sigtable {
+        unsigned int            count;
+        unsigned int            cksum;
+        unsigned int            reserved[3];
+        struct extended_signature sigs[0];
+};
+
+#define DEFAULT_UCODE_DATASIZE  (2000)
+#define MC_HEADER_SIZE          (sizeof(struct microcode_header_intel))
+#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
+#define EXT_HEADER_SIZE         (sizeof(struct extended_sigtable))
+#define EXT_SIGNATURE_SIZE      (sizeof(struct extended_signature))
+#define DWSIZE                  (sizeof(u32))
+
+#define get_totalsize(mc) \
+        (((struct microcode_intel *)mc)->hdr.totalsize ? \
+         ((struct microcode_intel *)mc)->hdr.totalsize : \
+         DEFAULT_UCODE_TOTALSIZE)
+
+#define get_datasize(mc) \
+        (((struct microcode_intel *)mc)->hdr.datasize ? \
+         ((struct microcode_intel *)mc)->hdr.datasize : DEFAULT_UCODE_DATASIZE)
+
+#define sigmatch(s1, s2, p1, p2) \
+        (((s1) == (s2)) && (((p1) & (p2)) || (((p1) == 0) && ((p2) == 0))))
+
+#define exttable_size(et) ((et)->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)
+
+extern int
+get_matching_microcode(unsigned int csig, int cpf, void *mc, int rev);
+extern int microcode_sanity_check(void *mc, int print_err);
+extern int get_matching_sig(unsigned int csig, int cpf, void *mc, int rev);
+extern int
+update_match_revision(struct microcode_header_intel *mc_header, int rev);
+
+#ifdef CONFIG_MICROCODE_INTEL_EARLY
+extern void __init load_ucode_intel_bsp(void);
+extern void __cpuinit load_ucode_intel_ap(void);
+extern void show_ucode_info_early(void);
+#else
+static inline __init void load_ucode_intel_bsp(void) {}
+static inline __cpuinit void load_ucode_intel_ap(void) {}
+static inline void show_ucode_info_early(void) {}
+#endif
+
+#if defined(CONFIG_MICROCODE_INTEL_EARLY) && defined(CONFIG_HOTPLUG_CPU)
+extern int save_mc_for_early(u8 *mc);
+#else
+static inline int save_mc_for_early(u8 *mc)
+{
+        return 0;
+}
+#endif
+
+#endif /* _ASM_X86_MICROCODE_INTEL_H */
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 8277941cbe99..3270116b1488 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -180,6 +180,14 @@ extern void init_amd_cacheinfo(struct cpuinfo_x86 *c);
 extern void detect_extended_topology(struct cpuinfo_x86 *c);
 extern void detect_ht(struct cpuinfo_x86 *c);
 
+#ifdef CONFIG_X86_32
+extern int have_cpuid_p(void);
+#else
+static inline int have_cpuid_p(void)
+{
+        return 1;
+}
+#endif
 static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
                                 unsigned int *ecx, unsigned int *edx)
 {
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h
index 6f414ed88620..6fd3fd769796 100644
--- a/arch/x86/include/asm/proto.h
+++ b/arch/x86/include/asm/proto.h
@@ -5,8 +5,6 @@
 
 /* misc architecture specific prototypes */
 
-void early_idt_handler(void);
-
 void system_call(void);
 void syscall_init(void);
 
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 0fee48e279cc..50a7fc0f824a 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -20,10 +20,20 @@ static inline void __native_flush_tlb(void)
         native_write_cr3(native_read_cr3());
 }
 
+static inline void __native_flush_tlb_global_irq_disabled(void)
+{
+        unsigned long cr4;
+
+        cr4 = native_read_cr4();
+        /* clear PGE */
+        native_write_cr4(cr4 & ~X86_CR4_PGE);
+        /* write old PGE again and flush TLBs */
+        native_write_cr4(cr4);
+}
+
 static inline void __native_flush_tlb_global(void)
 {
         unsigned long flags;
-        unsigned long cr4;
 
         /*
          * Read-modify-write to CR4 - protect it from preemption and
@@ -32,11 +42,7 @@ static inline void __native_flush_tlb_global(void)
          */
         raw_local_irq_save(flags);
 
-        cr4 = native_read_cr4();
-        /* clear PGE */
-        native_write_cr4(cr4 & ~X86_CR4_PGE);
-        /* write old PGE again and flush TLBs */
-        native_write_cr4(cr4);
+        __native_flush_tlb_global_irq_disabled();
 
         raw_local_irq_restore(flags);
 }
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index ac3b3d002833..7bd3bd310106 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -87,6 +87,9 @@ obj-$(CONFIG_PARAVIRT_CLOCK)	+= pvclock.o
 
 obj-$(CONFIG_PCSPKR_PLATFORM)   += pcspeaker.o
 
+obj-$(CONFIG_MICROCODE_EARLY)           += microcode_core_early.o
+obj-$(CONFIG_MICROCODE_INTEL_EARLY)     += microcode_intel_early.o
+obj-$(CONFIG_MICROCODE_INTEL_LIB)       += microcode_intel_lib.o
 microcode-y                             := microcode_core.o
 microcode-$(CONFIG_MICROCODE_INTEL)     += microcode_intel.o
 microcode-$(CONFIG_MICROCODE_AMD)       += microcode_amd.o
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 9c3ab43a6954..d814772c5bed 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -37,6 +37,8 @@
 #include <asm/mce.h>
 #include <asm/msr.h>
 #include <asm/pat.h>
+#include <asm/microcode.h>
+#include <asm/microcode_intel.h>
 
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/uv/uv.h>
@@ -213,7 +215,7 @@ static inline int flag_is_changeable_p(u32 flag)
 }
 
 /* Probe for the CPUID instruction */
-static int __cpuinit have_cpuid_p(void)
+int __cpuinit have_cpuid_p(void)
 {
         return flag_is_changeable_p(X86_EFLAGS_ID);
 }
@@ -249,11 +251,6 @@ static inline int flag_is_changeable_p(u32 flag)
 {
         return 1;
 }
-/* Probe for the CPUID instruction */
-static inline int have_cpuid_p(void)
-{
-        return 1;
-}
 static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
 {
 }
@@ -1223,6 +1220,12 @@ void __cpuinit cpu_init(void)
         int cpu;
         int i;
 
+        /*
+         * Load microcode on this cpu if a valid microcode is available.
+         * This is early microcode loading procedure.
+         */
+        load_ucode_ap();
+
         cpu = stack_smp_processor_id();
         t = &per_cpu(init_tss, cpu);
         oist = &per_cpu(orig_ist, cpu);
@@ -1314,6 +1317,8 @@ void __cpuinit cpu_init(void)
         struct tss_struct *t = &per_cpu(init_tss, cpu);
         struct thread_struct *thread = &curr->thread;
 
+        show_ucode_info_early();
+
         if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
                 printk(KERN_WARNING "CPU#%d already initialized!\n", cpu);
                 for (;;)
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 57334f4cd3af..c5e403f6d869 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -26,6 +26,7 @@
 #include <asm/e820.h>
 #include <asm/bios_ebda.h>
 #include <asm/bootparam_utils.h>
+#include <asm/microcode.h>
 
 /*
  * Manage page tables very early on.
@@ -159,17 +160,17 @@ void __init x86_64_start_kernel(char * real_mode_data)
         /* clear bss before set_intr_gate with early_idt_handler */
         clear_bss();
 
-        for (i = 0; i < NUM_EXCEPTION_VECTORS; i++) {
-#ifdef CONFIG_EARLY_PRINTK
+        for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
                 set_intr_gate(i, &early_idt_handlers[i]);
-#else
-                set_intr_gate(i, early_idt_handler);
-#endif
-        }
         load_idt((const struct desc_ptr *)&idt_descr);
 
         copy_bootdata(__va(real_mode_data));
 
+        /*
+         * Load microcode early on BSP.
+         */
+        load_ucode_bsp();
+
         if (console_loglevel == 10)
                 early_printk("Kernel alive\n");
 
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 3c3f58a0808f..73afd11799ca 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -144,6 +144,11 @@ ENTRY(startup_32)
         movl %eax, pa(olpc_ofw_pgd)
 #endif
 
+#ifdef CONFIG_MICROCODE_EARLY
+        /* Early load ucode on BSP. */
+        call load_ucode_bsp
+#endif
+
 /*
  * Initialize page tables.  This creates a PDE and a set of page
  * tables, which are located immediately beyond __brk_base.  The variable
@@ -299,6 +304,12 @@ ENTRY(startup_32_smp)
         movl %eax,%ss
         leal -__PAGE_OFFSET(%ecx),%esp
 
+#ifdef CONFIG_MICROCODE_EARLY
+        /* Early load ucode on AP. */
+        call load_ucode_ap
+#endif
+
+
 default_entry:
 #define CR0_STATE       (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \
                          X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index d94f6d68be2a..b7de3b25adb5 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -336,6 +336,7 @@ early_idt_handlers:
         i = i + 1
         .endr
 
+/* This is global to keep gas from relaxing the jumps */
 ENTRY(early_idt_handler)
         cld
 
@@ -404,6 +405,7 @@ ENTRY(early_idt_handler)
         addq $16,%rsp           # drop vector number and error code
         decl early_recursion_flag(%rip)
         INTERRUPT_RETURN
+ENDPROC(early_idt_handler)
 
         __INITDATA
 
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 3a04b224d0c0..22db92bbdf1a 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -364,10 +364,7 @@ static struct attribute_group mc_attr_group = {
 
 static void microcode_fini_cpu(int cpu)
 {
-        struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
-
         microcode_ops->microcode_fini_cpu(cpu);
-        uci->valid = 0;
 }
 
 static enum ucode_state microcode_resume_cpu(int cpu)
@@ -383,6 +380,10 @@ static enum ucode_state microcode_resume_cpu(int cpu)
 static enum ucode_state microcode_init_cpu(int cpu, bool refresh_fw)
 {
         enum ucode_state ustate;
+        struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
+
+        if (uci && uci->valid)
+                return UCODE_OK;
 
         if (collect_cpu_info(cpu))
                 return UCODE_ERROR;
diff --git a/arch/x86/kernel/microcode_core_early.c b/arch/x86/kernel/microcode_core_early.c
new file mode 100644
index 000000000000..577db8417d15
--- /dev/null
+++ b/arch/x86/kernel/microcode_core_early.c
@@ -0,0 +1,76 @@
+/*
+ *      X86 CPU microcode early update for Linux
+ *
+ *      Copyright (C) 2012 Fenghua Yu <fenghua.yu@intel.com>
+ *                         H Peter Anvin" <hpa@zytor.com>
+ *
+ *      This driver allows to early upgrade microcode on Intel processors
+ *      belonging to IA-32 family - PentiumPro, Pentium II,
+ *      Pentium III, Xeon, Pentium 4, etc.
+ *
+ *      Reference: Section 9.11 of Volume 3, IA-32 Intel Architecture
+ *      Software Developer's Manual.
+ *
+ *      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/module.h>
+#include <asm/microcode_intel.h>
+#include <asm/processor.h>
+
+#define QCHAR(a, b, c, d) ((a) + ((b) << 8) + ((c) << 16) + ((d) << 24))
+#define CPUID_INTEL1 QCHAR('G', 'e', 'n', 'u')
+#define CPUID_INTEL2 QCHAR('i', 'n', 'e', 'I')
+#define CPUID_INTEL3 QCHAR('n', 't', 'e', 'l')
+#define CPUID_AMD1 QCHAR('A', 'u', 't', 'h')
+#define CPUID_AMD2 QCHAR('e', 'n', 't', 'i')
+#define CPUID_AMD3 QCHAR('c', 'A', 'M', 'D')
+
+#define CPUID_IS(a, b, c, ebx, ecx, edx)        \
+                (!((ebx ^ (a))|(edx ^ (b))|(ecx ^ (c))))
+
+/*
+ * In early loading microcode phase on BSP, boot_cpu_data is not set up yet.
+ * x86_vendor() gets vendor id for BSP.
+ *
+ * In 32 bit AP case, accessing boot_cpu_data needs linear address. To simplify
+ * coding, we still use x86_vendor() to get vendor id for AP.
+ *
+ * x86_vendor() gets vendor information directly through cpuid.
+ */
+static int __cpuinit x86_vendor(void)
+{
+        u32 eax = 0x00000000;
+        u32 ebx, ecx = 0, edx;
+
+        if (!have_cpuid_p())
+                return X86_VENDOR_UNKNOWN;
+
+        native_cpuid(&eax, &ebx, &ecx, &edx);
+
+        if (CPUID_IS(CPUID_INTEL1, CPUID_INTEL2, CPUID_INTEL3, ebx, ecx, edx))
+                return X86_VENDOR_INTEL;
+
+        if (CPUID_IS(CPUID_AMD1, CPUID_AMD2, CPUID_AMD3, ebx, ecx, edx))
+                return X86_VENDOR_AMD;
+
+        return X86_VENDOR_UNKNOWN;
+}
+
+void __init load_ucode_bsp(void)
+{
+        int vendor = x86_vendor();
+
+        if (vendor == X86_VENDOR_INTEL)
+                load_ucode_intel_bsp();
+}
+
+void __cpuinit load_ucode_ap(void)
+{
+        int vendor = x86_vendor();
+
+        if (vendor == X86_VENDOR_INTEL)
+                load_ucode_intel_ap();
+}
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
index 3544aed39338..5fb2cebf556b 100644
--- a/arch/x86/kernel/microcode_intel.c
+++ b/arch/x86/kernel/microcode_intel.c
@@ -79,7 +79,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 
-#include <asm/microcode.h>
+#include <asm/microcode_intel.h>
 #include <asm/processor.h>
 #include <asm/msr.h>
 
@@ -87,59 +87,6 @@ MODULE_DESCRIPTION("Microcode Update Driver");
 MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
 MODULE_LICENSE("GPL");
 
-struct microcode_header_intel {
-        unsigned int            hdrver;
-        unsigned int            rev;
-        unsigned int            date;
-        unsigned int            sig;
-        unsigned int            cksum;
-        unsigned int            ldrver;
-        unsigned int            pf;
-        unsigned int            datasize;
-        unsigned int            totalsize;
-        unsigned int            reserved[3];
-};
-
-struct microcode_intel {
-        struct microcode_header_intel hdr;
-        unsigned int            bits[0];
-};
-
-/* microcode format is extended from prescott processors */
-struct extended_signature {
-        unsigned int            sig;
-        unsigned int            pf;
-        unsigned int            cksum;
-};
-
-struct extended_sigtable {
-        unsigned int            count;
-        unsigned int            cksum;
-        unsigned int            reserved[3];
-        struct extended_signature sigs[0];
-};
-
-#define DEFAULT_UCODE_DATASIZE  (2000)
-#define MC_HEADER_SIZE          (sizeof(struct microcode_header_intel))
-#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
-#define EXT_HEADER_SIZE         (sizeof(struct extended_sigtable))
-#define EXT_SIGNATURE_SIZE      (sizeof(struct extended_signature))
-#define DWSIZE                  (sizeof(u32))
-
-#define get_totalsize(mc) \
-        (((struct microcode_intel *)mc)->hdr.totalsize ? \
-         ((struct microcode_intel *)mc)->hdr.totalsize : \
-         DEFAULT_UCODE_TOTALSIZE)
-
-#define get_datasize(mc) \
-        (((struct microcode_intel *)mc)->hdr.datasize ? \
-         ((struct microcode_intel *)mc)->hdr.datasize : DEFAULT_UCODE_DATASIZE)
-
-#define sigmatch(s1, s2, p1, p2) \
-        (((s1) == (s2)) && (((p1) & (p2)) || (((p1) == 0) && ((p2) == 0))))
-
-#define exttable_size(et) ((et)->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)
-
 static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)
 {
         struct cpuinfo_x86 *c = &cpu_data(cpu_num);
@@ -162,128 +109,25 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)
         return 0;
 }
 
-static inline int update_match_cpu(struct cpu_signature *csig, int sig, int pf)
-{
-        return (!sigmatch(sig, csig->sig, pf, csig->pf)) ? 0 : 1;
-}
-
-static inline int
-update_match_revision(struct microcode_header_intel *mc_header, int rev)
-{
-        return (mc_header->rev <= rev) ? 0 : 1;
-}
-
-static int microcode_sanity_check(void *mc)
-{
-        unsigned long total_size, data_size, ext_table_size;
-        struct microcode_header_intel *mc_header = mc;
-        struct extended_sigtable *ext_header = NULL;
-        int sum, orig_sum, ext_sigcount = 0, i;
-        struct extended_signature *ext_sig;
-
-        total_size = get_totalsize(mc_header);
-        data_size = get_datasize(mc_header);
-
-        if (data_size + MC_HEADER_SIZE > total_size) {
-                pr_err("error! Bad data size in microcode data file\n");
-                return -EINVAL;
-        }
-
-        if (mc_header->ldrver != 1 || mc_header->hdrver != 1) {
-                pr_err("error! Unknown microcode update format\n");
-                return -EINVAL;
-        }
-        ext_table_size = total_size - (MC_HEADER_SIZE + data_size);
-        if (ext_table_size) {
-                if ((ext_table_size < EXT_HEADER_SIZE)
-                 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) {
-                        pr_err("error! Small exttable size in microcode data file\n");
-                        return -EINVAL;
-                }
-                ext_header = mc + MC_HEADER_SIZE + data_size;
-                if (ext_table_size != exttable_size(ext_header)) {
-                        pr_err("error! Bad exttable size in microcode data file\n");
-                        return -EFAULT;
-                }
-                ext_sigcount = ext_header->count;
-        }
-
-        /* check extended table checksum */
-        if (ext_table_size) {
-                int ext_table_sum = 0;
-                int *ext_tablep = (int *)ext_header;
-
-                i = ext_table_size / DWSIZE;
-                while (i--)
-                        ext_table_sum += ext_tablep[i];
-                if (ext_table_sum) {
-                        pr_warning("aborting, bad extended signature table checksum\n");
-                        return -EINVAL;
-                }
-        }
-
-        /* calculate the checksum */
-        orig_sum = 0;
-        i = (MC_HEADER_SIZE + data_size) / DWSIZE;
-        while (i--)
-                orig_sum += ((int *)mc)[i];
-        if (orig_sum) {
-                pr_err("aborting, bad checksum\n");
-                return -EINVAL;
-        }
-        if (!ext_table_size)
-                return 0;
-        /* check extended signature checksum */
-        for (i = 0; i < ext_sigcount; i++) {
-                ext_sig = (void *)ext_header + EXT_HEADER_SIZE +
-                          EXT_SIGNATURE_SIZE * i;
-                sum = orig_sum
-                        - (mc_header->sig + mc_header->pf + mc_header->cksum)
-                        + (ext_sig->sig + ext_sig->pf + ext_sig->cksum);
-                if (sum) {
-                        pr_err("aborting, bad checksum\n");
-                        return -EINVAL;
-                }
-        }
-        return 0;
-}
-
 /*
  * return 0 - no update found
  * return 1 - found update
  */
-static int
-get_matching_microcode(struct cpu_signature *cpu_sig, void *mc, int rev)
+static int get_matching_mc(struct microcode_intel *mc_intel, int cpu)
 {
-        struct microcode_header_intel *mc_header = mc;
-        struct extended_sigtable *ext_header;
-        unsigned long total_size = get_totalsize(mc_header);
-        int ext_sigcount, i;
-        struct extended_signature *ext_sig;
-
-        if (!update_match_revision(mc_header, rev))
-                return 0;
-
-        if (update_match_cpu(cpu_sig, mc_header->sig, mc_header->pf))
-                return 1;
+        struct cpu_signature cpu_sig;
+        unsigned int csig, cpf, crev;
 
-        /* Look for ext. headers: */
-        if (total_size <= get_datasize(mc_header) + MC_HEADER_SIZE)
-                return 0;
+        collect_cpu_info(cpu, &cpu_sig);
 
-        ext_header = mc + get_datasize(mc_header) + MC_HEADER_SIZE;
-        ext_sigcount = ext_header->count;
-        ext_sig = (void *)ext_header + EXT_HEADER_SIZE;
+        csig = cpu_sig.sig;
+        cpf = cpu_sig.pf;
+        crev = cpu_sig.rev;
 
-        for (i = 0; i < ext_sigcount; i++) {
-                if (update_match_cpu(cpu_sig, ext_sig->sig, ext_sig->pf))
-                        return 1;
-                ext_sig++;
-        }
-        return 0;
+        return get_matching_microcode(csig, cpf, mc_intel, crev);
 }
 
-static int apply_microcode(int cpu)
+int apply_microcode(int cpu)
 {
         struct microcode_intel *mc_intel;
         struct ucode_cpu_info *uci;
@@ -300,6 +144,14 @@ static int apply_microcode(int cpu)
         if (mc_intel == NULL)
                 return 0;
 
+        /*
+         * Microcode on this CPU could be updated earlier. Only apply the
+         * microcode patch in mc_intel when it is newer than the one on this
+         * CPU.
+         */
+        if (get_matching_mc(mc_intel, cpu) == 0)
+                return 0;
+
         /* write microcode via MSR 0x79 */
         wrmsr(MSR_IA32_UCODE_WRITE,
               (unsigned long) mc_intel->bits,
@@ -338,6 +190,7 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
         unsigned int leftover = size;
         enum ucode_state state = UCODE_OK;
         unsigned int curr_mc_size = 0;
+        unsigned int csig, cpf;
 
         while (leftover) {
                 struct microcode_header_intel mc_header;
@@ -362,11 +215,13 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
                 }
 
                 if (get_ucode_data(mc, ucode_ptr, mc_size) ||
-                    microcode_sanity_check(mc) < 0) {
+                    microcode_sanity_check(mc, 1) < 0) {
                         break;
                 }
 
-                if (get_matching_microcode(&uci->cpu_sig, mc, new_rev)) {
+                csig = uci->cpu_sig.sig;
+                cpf = uci->cpu_sig.pf;
+                if (get_matching_microcode(csig, cpf, mc, new_rev)) {
                         vfree(new_mc);
                         new_rev = mc_header.rev;
                         new_mc  = mc;
@@ -393,6 +248,13 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
         vfree(uci->mc);
         uci->mc = (struct microcode_intel *)new_mc;
 
+        /*
+         * If early loading microcode is supported, save this mc into
+         * permanent memory. So it will be loaded early when a CPU is hot added
+         * or resumes.
+         */
+        save_mc_for_early(new_mc);
+
         pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n",
                  cpu, new_rev, uci->cpu_sig.rev);
 out:
diff --git a/arch/x86/kernel/microcode_intel_early.c b/arch/x86/kernel/microcode_intel_early.c
new file mode 100644
index 000000000000..7890bc838952
--- /dev/null
+++ b/arch/x86/kernel/microcode_intel_early.c
@@ -0,0 +1,796 @@
+/*
+ *      Intel CPU microcode early update for Linux
+ *
+ *      Copyright (C) 2012 Fenghua Yu <fenghua.yu@intel.com>
+ *                         H Peter Anvin" <hpa@zytor.com>
+ *
+ *      This allows to early upgrade microcode on Intel processors
+ *      belonging to IA-32 family - PentiumPro, Pentium II,
+ *      Pentium III, Xeon, Pentium 4, etc.
+ *
+ *      Reference: Section 9.11 of Volume 3, IA-32 Intel Architecture
+ *      Software Developer's Manual.
+ *
+ *      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/module.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/earlycpio.h>
+#include <linux/initrd.h>
+#include <linux/cpu.h>
+#include <asm/msr.h>
+#include <asm/microcode_intel.h>
+#include <asm/processor.h>
+#include <asm/tlbflush.h>
+#include <asm/setup.h>
+
+unsigned long mc_saved_in_initrd[MAX_UCODE_COUNT];
+struct mc_saved_data {
+        unsigned int mc_saved_count;
+        struct microcode_intel **mc_saved;
+} mc_saved_data;
+
+static enum ucode_state __cpuinit
+generic_load_microcode_early(struct microcode_intel **mc_saved_p,
+                             unsigned int mc_saved_count,
+                             struct ucode_cpu_info *uci)
+{
+        struct microcode_intel *ucode_ptr, *new_mc = NULL;
+        int new_rev = uci->cpu_sig.rev;
+        enum ucode_state state = UCODE_OK;
+        unsigned int mc_size;
+        struct microcode_header_intel *mc_header;
+        unsigned int csig = uci->cpu_sig.sig;
+        unsigned int cpf = uci->cpu_sig.pf;
+        int i;
+
+        for (i = 0; i < mc_saved_count; i++) {
+                ucode_ptr = mc_saved_p[i];
+
+                mc_header = (struct microcode_header_intel *)ucode_ptr;
+                mc_size = get_totalsize(mc_header);
+                if (get_matching_microcode(csig, cpf, ucode_ptr, new_rev)) {
+                        new_rev = mc_header->rev;
+                        new_mc  = ucode_ptr;
+                }
+        }
+
+        if (!new_mc) {
+                state = UCODE_NFOUND;
+                goto out;
+        }
+
+        uci->mc = (struct microcode_intel *)new_mc;
+out:
+        return state;
+}
+
+static void __cpuinit
+microcode_pointer(struct microcode_intel **mc_saved,
+                  unsigned long *mc_saved_in_initrd,
+                  unsigned long initrd_start, int mc_saved_count)
+{
+        int i;
+
+        for (i = 0; i < mc_saved_count; i++)
+                mc_saved[i] = (struct microcode_intel *)
+                              (mc_saved_in_initrd[i] + initrd_start);
+}
+
+#ifdef CONFIG_X86_32
+static void __cpuinit
+microcode_phys(struct microcode_intel **mc_saved_tmp,
+               struct mc_saved_data *mc_saved_data)
+{
+        int i;
+        struct microcode_intel ***mc_saved;
+
+        mc_saved = (struct microcode_intel ***)
+                   __pa_symbol(&mc_saved_data->mc_saved);
+        for (i = 0; i < mc_saved_data->mc_saved_count; i++) {
+                struct microcode_intel *p;
+
+                p = *(struct microcode_intel **)
+                        __pa(mc_saved_data->mc_saved + i);
+                mc_saved_tmp[i] = (struct microcode_intel *)__pa(p);
+        }
+}
+#endif
+
+static enum ucode_state __cpuinit
+load_microcode(struct mc_saved_data *mc_saved_data,
+               unsigned long *mc_saved_in_initrd,
+               unsigned long initrd_start,
+               struct ucode_cpu_info *uci)
+{
+        struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];
+        unsigned int count = mc_saved_data->mc_saved_count;
+
+        if (!mc_saved_data->mc_saved) {
+                microcode_pointer(mc_saved_tmp, mc_saved_in_initrd,
+                                  initrd_start, count);
+
+                return generic_load_microcode_early(mc_saved_tmp, count, uci);
+        } else {
+#ifdef CONFIG_X86_32
+                microcode_phys(mc_saved_tmp, mc_saved_data);
+                return generic_load_microcode_early(mc_saved_tmp, count, uci);
+#else
+                return generic_load_microcode_early(mc_saved_data->mc_saved,
+                                                    count, uci);
+#endif
+        }
+}
+
+static u8 get_x86_family(unsigned long sig)
+{
+        u8 x86;
+
+        x86 = (sig >> 8) & 0xf;
+
+        if (x86 == 0xf)
+                x86 += (sig >> 20) & 0xff;
+
+        return x86;
+}
+
+static u8 get_x86_model(unsigned long sig)
+{
+        u8 x86, x86_model;
+
+        x86 = get_x86_family(sig);
+        x86_model = (sig >> 4) & 0xf;
+
+        if (x86 == 0x6 || x86 == 0xf)
+                x86_model += ((sig >> 16) & 0xf) << 4;
+
+        return x86_model;
+}
+
+/*
+ * Given CPU signature and a microcode patch, this function finds if the
+ * microcode patch has matching family and model with the CPU.
+ */
+static enum ucode_state
+matching_model_microcode(struct microcode_header_intel *mc_header,
+                        unsigned long sig)
+{
+        u8 x86, x86_model;
+        u8 x86_ucode, x86_model_ucode;
+        struct extended_sigtable *ext_header;
+        unsigned long total_size = get_totalsize(mc_header);
+        unsigned long data_size = get_datasize(mc_header);
+        int ext_sigcount, i;
+        struct extended_signature *ext_sig;
+
+        x86 = get_x86_family(sig);
+        x86_model = get_x86_model(sig);
+
+        x86_ucode = get_x86_family(mc_header->sig);
+        x86_model_ucode = get_x86_model(mc_header->sig);
+
+        if (x86 == x86_ucode && x86_model == x86_model_ucode)
+                return UCODE_OK;
+
+        /* Look for ext. headers: */
+        if (total_size <= data_size + MC_HEADER_SIZE)
+                return UCODE_NFOUND;
+
+        ext_header = (struct extended_sigtable *)
+                     mc_header + data_size + MC_HEADER_SIZE;
+        ext_sigcount = ext_header->count;
+        ext_sig = (void *)ext_header + EXT_HEADER_SIZE;
+
+        for (i = 0; i < ext_sigcount; i++) {
+                x86_ucode = get_x86_family(ext_sig->sig);
+                x86_model_ucode = get_x86_model(ext_sig->sig);
+
+                if (x86 == x86_ucode && x86_model == x86_model_ucode)
+                        return UCODE_OK;
+
+                ext_sig++;
+        }
+
+        return UCODE_NFOUND;
+}
+
+static int
+save_microcode(struct mc_saved_data *mc_saved_data,
+               struct microcode_intel **mc_saved_src,
+               unsigned int mc_saved_count)
+{
+        int i, j;
+        struct microcode_intel **mc_saved_p;
+        int ret;
+
+        if (!mc_saved_count)
+                return -EINVAL;
+
+        /*
+         * Copy new microcode data.
+         */
+        mc_saved_p = kmalloc(mc_saved_count*sizeof(struct microcode_intel *),
+                             GFP_KERNEL);
+        if (!mc_saved_p)
+                return -ENOMEM;
+
+        for (i = 0; i < mc_saved_count; i++) {
+                struct microcode_intel *mc = mc_saved_src[i];
+                struct microcode_header_intel *mc_header = &mc->hdr;
+                unsigned long mc_size = get_totalsize(mc_header);
+                mc_saved_p[i] = kmalloc(mc_size, GFP_KERNEL);
+                if (!mc_saved_p[i]) {
+                        ret = -ENOMEM;
+                        goto err;
+                }
+                if (!mc_saved_src[i]) {
+                        ret = -EINVAL;
+                        goto err;
+                }
+                memcpy(mc_saved_p[i], mc, mc_size);
+        }
+
+        /*
+         * Point to newly saved microcode.
+         */
+        mc_saved_data->mc_saved = mc_saved_p;
+        mc_saved_data->mc_saved_count = mc_saved_count;
+
+        return 0;
+
+err:
+        for (j = 0; j <= i; j++)
+                kfree(mc_saved_p[j]);
+        kfree(mc_saved_p);
+
+        return ret;
+}
+
+/*
+ * A microcode patch in ucode_ptr is saved into mc_saved
+ * - if it has matching signature and newer revision compared to an existing
+ *   patch mc_saved.
+ * - or if it is a newly discovered microcode patch.
+ *
+ * The microcode patch should have matching model with CPU.
+ */
+static void _save_mc(struct microcode_intel **mc_saved, u8 *ucode_ptr,
+                     unsigned int *mc_saved_count_p)
+{
+        int i;
+        int found = 0;
+        unsigned int mc_saved_count = *mc_saved_count_p;
+        struct microcode_header_intel *mc_header;
+
+        mc_header = (struct microcode_header_intel *)ucode_ptr;
+        for (i = 0; i < mc_saved_count; i++) {
+                unsigned int sig, pf;
+                unsigned int new_rev;
+                struct microcode_header_intel *mc_saved_header =
+                             (struct microcode_header_intel *)mc_saved[i];
+                sig = mc_saved_header->sig;
+                pf = mc_saved_header->pf;
+                new_rev = mc_header->rev;
+
+                if (get_matching_sig(sig, pf, ucode_ptr, new_rev)) {
+                        found = 1;
+                        if (update_match_revision(mc_header, new_rev)) {
+                                /*
+                                 * Found an older ucode saved before.
+                                 * Replace the older one with this newer
+                                 * one.
+                                 */
+                                mc_saved[i] =
+                                        (struct microcode_intel *)ucode_ptr;
+                                break;
+                        }
+                }
+        }
+        if (i >= mc_saved_count && !found)
+                /*
+                 * This ucode is first time discovered in ucode file.
+                 * Save it to memory.
+                 */
+                mc_saved[mc_saved_count++] =
+                                 (struct microcode_intel *)ucode_ptr;
+
+        *mc_saved_count_p = mc_saved_count;
+}
+
+/*
+ * Get microcode matching with BSP's model. Only CPUs with the same model as
+ * BSP can stay in the platform.
+ */
+static enum ucode_state __init
+get_matching_model_microcode(int cpu, unsigned long start,
+                             void *data, size_t size,
+                             struct mc_saved_data *mc_saved_data,
+                             unsigned long *mc_saved_in_initrd,
+                             struct ucode_cpu_info *uci)
+{
+        u8 *ucode_ptr = data;
+        unsigned int leftover = size;
+        enum ucode_state state = UCODE_OK;
+        unsigned int mc_size;
+        struct microcode_header_intel *mc_header;
+        struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];
+        unsigned int mc_saved_count = mc_saved_data->mc_saved_count;
+        int i;
+
+        while (leftover) {
+                mc_header = (struct microcode_header_intel *)ucode_ptr;
+
+                mc_size = get_totalsize(mc_header);
+                if (!mc_size || mc_size > leftover ||
+                        microcode_sanity_check(ucode_ptr, 0) < 0)
+                        break;
+
+                leftover -= mc_size;
+
+                /*
+                 * Since APs with same family and model as the BSP may boot in
+                 * the platform, we need to find and save microcode patches
+                 * with the same family and model as the BSP.
+                 */
+                if (matching_model_microcode(mc_header, uci->cpu_sig.sig) !=
+                         UCODE_OK) {
+                        ucode_ptr += mc_size;
+                        continue;
+                }
+
+                _save_mc(mc_saved_tmp, ucode_ptr, &mc_saved_count);
+
+                ucode_ptr += mc_size;
+        }
+
+        if (leftover) {
+                state = UCODE_ERROR;
+                goto out;
+        }
+
+        if (mc_saved_count == 0) {
+                state = UCODE_NFOUND;
+                goto out;
+        }
+
+        for (i = 0; i < mc_saved_count; i++)
+                mc_saved_in_initrd[i] = (unsigned long)mc_saved_tmp[i] - start;
+
+        mc_saved_data->mc_saved_count = mc_saved_count;
+out:
+        return state;
+}
+
+#define native_rdmsr(msr, val1, val2)           \
+do {                                            \
+        u64 __val = native_read_msr((msr));     \
+        (void)((val1) = (u32)__val);            \
+        (void)((val2) = (u32)(__val >> 32));    \
+} while (0)
+
+#define native_wrmsr(msr, low, high)            \
+        native_write_msr(msr, low, high);
+
+static int __cpuinit collect_cpu_info_early(struct ucode_cpu_info *uci)
+{
+        unsigned int val[2];
+        u8 x86, x86_model;
+        struct cpu_signature csig;
+        unsigned int eax, ebx, ecx, edx;
+
+        csig.sig = 0;
+        csig.pf = 0;
+        csig.rev = 0;
+
+        memset(uci, 0, sizeof(*uci));
+
+        eax = 0x00000001;
+        ecx = 0;
+        native_cpuid(&eax, &ebx, &ecx, &edx);
+        csig.sig = eax;
+
+        x86 = get_x86_family(csig.sig);
+        x86_model = get_x86_model(csig.sig);
+
+        if ((x86_model >= 5) || (x86 > 6)) {
+                /* get processor flags from MSR 0x17 */
+                native_rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]);
+                csig.pf = 1 << ((val[1] >> 18) & 7);
+        }
+        native_wrmsr(MSR_IA32_UCODE_REV, 0, 0);
+
+        /* As documented in the SDM: Do a CPUID 1 here */
+        sync_core();
+
+        /* get the current revision from MSR 0x8B */
+        native_rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);
+
+        csig.rev = val[1];
+
+        uci->cpu_sig = csig;
+        uci->valid = 1;
+
+        return 0;
+}
+
+#ifdef DEBUG
+static void __ref show_saved_mc(void)
+{
+        int i, j;
+        unsigned int sig, pf, rev, total_size, data_size, date;
+        struct ucode_cpu_info uci;
+
+        if (mc_saved_data.mc_saved_count == 0) {
+                pr_debug("no micorcode data saved.\n");
+                return;
+        }
+        pr_debug("Total microcode saved: %d\n", mc_saved_data.mc_saved_count);
+
+        collect_cpu_info_early(&uci);
+
+        sig = uci.cpu_sig.sig;
+        pf = uci.cpu_sig.pf;
+        rev = uci.cpu_sig.rev;
+        pr_debug("CPU%d: sig=0x%x, pf=0x%x, rev=0x%x\n",
+                 smp_processor_id(), sig, pf, rev);
+
+        for (i = 0; i < mc_saved_data.mc_saved_count; i++) {
+                struct microcode_header_intel *mc_saved_header;
+                struct extended_sigtable *ext_header;
+                int ext_sigcount;
+                struct extended_signature *ext_sig;
+
+                mc_saved_header = (struct microcode_header_intel *)
+                                  mc_saved_data.mc_saved[i];
+                sig = mc_saved_header->sig;
+                pf = mc_saved_header->pf;
+                rev = mc_saved_header->rev;
+                total_size = get_totalsize(mc_saved_header);
+                data_size = get_datasize(mc_saved_header);
+                date = mc_saved_header->date;
+
+                pr_debug("mc_saved[%d]: sig=0x%x, pf=0x%x, rev=0x%x, toal size=0x%x, date = %04x-%02x-%02x\n",
+                         i, sig, pf, rev, total_size,
+                         date & 0xffff,
+                         date >> 24,
+                         (date >> 16) & 0xff);
+
+                /* Look for ext. headers: */
+                if (total_size <= data_size + MC_HEADER_SIZE)
+                        continue;
+
+                ext_header = (struct extended_sigtable *)
+                             mc_saved_header + data_size + MC_HEADER_SIZE;
+                ext_sigcount = ext_header->count;
+                ext_sig = (void *)ext_header + EXT_HEADER_SIZE;
+
+                for (j = 0; j < ext_sigcount; j++) {
+                        sig = ext_sig->sig;
+                        pf = ext_sig->pf;
+
+                        pr_debug("\tExtended[%d]: sig=0x%x, pf=0x%x\n",
+                                 j, sig, pf);
+
+                        ext_sig++;
+                }
+
+        }
+}
+#else
+static inline void show_saved_mc(void)
+{
+}
+#endif
+
+#if defined(CONFIG_MICROCODE_INTEL_EARLY) && defined(CONFIG_HOTPLUG_CPU)
+/*
+ * Save this mc into mc_saved_data. So it will be loaded early when a CPU is
+ * hot added or resumes.
+ *
+ * Please make sure this mc should be a valid microcode patch before calling
+ * this function.
+ */
+int save_mc_for_early(u8 *mc)
+{
+        struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT];
+        unsigned int mc_saved_count_init;
+        unsigned int mc_saved_count;
+        struct microcode_intel **mc_saved;
+        int ret = 0;
+        int i;
+
+        /*
+         * Hold hotplug lock so mc_saved_data is not accessed by a CPU in
+         * hotplug.
+         */
+        cpu_hotplug_driver_lock();
+
+        mc_saved_count_init = mc_saved_data.mc_saved_count;
+        mc_saved_count = mc_saved_data.mc_saved_count;
+        mc_saved = mc_saved_data.mc_saved;
+
+        if (mc_saved && mc_saved_count)
+                memcpy(mc_saved_tmp, mc_saved,
+                       mc_saved_count * sizeof(struct mirocode_intel *));
+        /*
+         * Save the microcode patch mc in mc_save_tmp structure if it's a newer
+         * version.
+         */
+
+        _save_mc(mc_saved_tmp, mc, &mc_saved_count);
+
+        /*
+         * Save the mc_save_tmp in global mc_saved_data.
+         */
+        ret = save_microcode(&mc_saved_data, mc_saved_tmp, mc_saved_count);
+        if (ret) {
+                pr_err("Can not save microcode patch.\n");
+                goto out;
+        }
+
+        show_saved_mc();
+
+        /*
+         * Free old saved microcod data.
+         */
+        if (mc_saved) {
+                for (i = 0; i < mc_saved_count_init; i++)
+                        kfree(mc_saved[i]);
+                kfree(mc_saved);
+        }
+
+out:
+        cpu_hotplug_driver_unlock();
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(save_mc_for_early);
+#endif
+
+static __initdata char ucode_name[] = "kernel/x86/microcode/GenuineIntel.bin";
+static __init enum ucode_state
+scan_microcode(unsigned long start, unsigned long end,
+                struct mc_saved_data *mc_saved_data,
+                unsigned long *mc_saved_in_initrd,
+                struct ucode_cpu_info *uci)
+{
+        unsigned int size = end - start + 1;
+        struct cpio_data cd;
+        long offset = 0;
+#ifdef CONFIG_X86_32
+        char *p = (char *)__pa_symbol(ucode_name);
+#else
+        char *p = ucode_name;
+#endif
+
+        cd.data = NULL;
+        cd.size = 0;
+
+        cd = find_cpio_data(p, (void *)start, size, &offset);
+        if (!cd.data)
+                return UCODE_ERROR;
+
+
+        return get_matching_model_microcode(0, start, cd.data, cd.size,
+                                            mc_saved_data, mc_saved_in_initrd,
+                                            uci);
+}
+
+/*
+ * Print ucode update info.
+ */
+static void __cpuinit
+print_ucode_info(struct ucode_cpu_info *uci, unsigned int date)
+{
+        int cpu = smp_processor_id();
+
+        pr_info("CPU%d microcode updated early to revision 0x%x, date = %04x-%02x-%02x\n",
+                cpu,
+                uci->cpu_sig.rev,
+                date & 0xffff,
+                date >> 24,
+                (date >> 16) & 0xff);
+}
+
+#ifdef CONFIG_X86_32
+
+static int delay_ucode_info;
+static int current_mc_date;
+
+/*
+ * Print early updated ucode info after printk works. This is delayed info dump.
+ */
+void __cpuinit show_ucode_info_early(void)
+{
+        struct ucode_cpu_info uci;
+
+        if (delay_ucode_info) {
+                collect_cpu_info_early(&uci);
+                print_ucode_info(&uci, current_mc_date);
+                delay_ucode_info = 0;
+        }
+}
+
+/*
+ * At this point, we can not call printk() yet. Keep microcode patch number in
+ * mc_saved_data.mc_saved and delay printing microcode info in
+ * show_ucode_info_early() until printk() works.
+ */
+static void __cpuinit print_ucode(struct ucode_cpu_info *uci)
+{
+        struct microcode_intel *mc_intel;
+        int *delay_ucode_info_p;
+        int *current_mc_date_p;
+
+        mc_intel = uci->mc;
+        if (mc_intel == NULL)
+                return;
+
+        delay_ucode_info_p = (int *)__pa_symbol(&delay_ucode_info);
+        current_mc_date_p = (int *)__pa_symbol(&current_mc_date);
+
+        *delay_ucode_info_p = 1;
+        *current_mc_date_p = mc_intel->hdr.date;
+}
+#else
+
+/*
+ * Flush global tlb. We only do this in x86_64 where paging has been enabled
+ * already and PGE should be enabled as well.
+ */
+static inline void __cpuinit flush_tlb_early(void)
+{
+        __native_flush_tlb_global_irq_disabled();
+}
+
+static inline void __cpuinit print_ucode(struct ucode_cpu_info *uci)
+{
+        struct microcode_intel *mc_intel;
+
+        mc_intel = uci->mc;
+        if (mc_intel == NULL)
+                return;
+
+        print_ucode_info(uci, mc_intel->hdr.date);
+}
+#endif
+
+static int apply_microcode_early(struct mc_saved_data *mc_saved_data,
+                                 struct ucode_cpu_info *uci)
+{
+        struct microcode_intel *mc_intel;
+        unsigned int val[2];
+
+        mc_intel = uci->mc;
+        if (mc_intel == NULL)
+                return 0;
+
+        /* write microcode via MSR 0x79 */
+        native_wrmsr(MSR_IA32_UCODE_WRITE,
+              (unsigned long) mc_intel->bits,
+              (unsigned long) mc_intel->bits >> 16 >> 16);
+        native_wrmsr(MSR_IA32_UCODE_REV, 0, 0);
+
+        /* As documented in the SDM: Do a CPUID 1 here */
+        sync_core();
+
+        /* get the current revision from MSR 0x8B */
+        native_rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]);
+        if (val[1] != mc_intel->hdr.rev)
+                return -1;
+
+#ifdef CONFIG_X86_64
+        /* Flush global tlb. This is precaution. */
+        flush_tlb_early();
+#endif
+        uci->cpu_sig.rev = val[1];
+
+        print_ucode(uci);
+
+        return 0;
+}
+
+/*
+ * This function converts microcode patch offsets previously stored in
+ * mc_saved_in_initrd to pointers and stores the pointers in mc_saved_data.
+ */
+int __init save_microcode_in_initrd(void)
+{
+        unsigned int count = mc_saved_data.mc_saved_count;
+        struct microcode_intel *mc_saved[MAX_UCODE_COUNT];
+        int ret = 0;
+
+        if (count == 0)
+                return ret;
+
+        microcode_pointer(mc_saved, mc_saved_in_initrd, initrd_start, count);
+        ret = save_microcode(&mc_saved_data, mc_saved, count);
+        if (ret)
+                pr_err("Can not save microcod patches from initrd");
+
+        show_saved_mc();
+
+        return ret;
+}
+
+static void __init
+_load_ucode_intel_bsp(struct mc_saved_data *mc_saved_data,
+                      unsigned long *mc_saved_in_initrd,
+                      unsigned long initrd_start_early,
+                      unsigned long initrd_end_early,
+                      struct ucode_cpu_info *uci)
+{
+        collect_cpu_info_early(uci);
+        scan_microcode(initrd_start_early, initrd_end_early, mc_saved_data,
+                       mc_saved_in_initrd, uci);
+        load_microcode(mc_saved_data, mc_saved_in_initrd,
+                       initrd_start_early, uci);
+        apply_microcode_early(mc_saved_data, uci);
+}
+
+void __init
+load_ucode_intel_bsp(void)
+{
+        u64 ramdisk_image, ramdisk_size;
+        unsigned long initrd_start_early, initrd_end_early;
+        struct ucode_cpu_info uci;
+#ifdef CONFIG_X86_32
+        struct boot_params *boot_params_p;
+
+        boot_params_p = (struct boot_params *)__pa_symbol(&boot_params);
+        ramdisk_image = boot_params_p->hdr.ramdisk_image;
+        ramdisk_size  = boot_params_p->hdr.ramdisk_size;
+        initrd_start_early = ramdisk_image;
+        initrd_end_early = initrd_start_early + ramdisk_size;
+
+        _load_ucode_intel_bsp(
+                (struct mc_saved_data *)__pa_symbol(&mc_saved_data),
+                (unsigned long *)__pa_symbol(&mc_saved_in_initrd),
+                initrd_start_early, initrd_end_early, &uci);
+#else
+        ramdisk_image = boot_params.hdr.ramdisk_image;
+        ramdisk_size  = boot_params.hdr.ramdisk_size;
+        initrd_start_early = ramdisk_image + PAGE_OFFSET;
+        initrd_end_early = initrd_start_early + ramdisk_size;
+
+        _load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd,
+                              initrd_start_early, initrd_end_early, &uci);
+#endif
+}
+
+void __cpuinit load_ucode_intel_ap(void)
+{
+        struct mc_saved_data *mc_saved_data_p;
+        struct ucode_cpu_info uci;
+        unsigned long *mc_saved_in_initrd_p;
+        unsigned long initrd_start_addr;
+#ifdef CONFIG_X86_32
+        unsigned long *initrd_start_p;
+
+        mc_saved_in_initrd_p =
+                (unsigned long *)__pa_symbol(mc_saved_in_initrd);
+        mc_saved_data_p = (struct mc_saved_data *)__pa_symbol(&mc_saved_data);
+        initrd_start_p = (unsigned long *)__pa_symbol(&initrd_start);
+        initrd_start_addr = (unsigned long)__pa_symbol(*initrd_start_p);
+#else
+        mc_saved_data_p = &mc_saved_data;
+        mc_saved_in_initrd_p = mc_saved_in_initrd;
+        initrd_start_addr = initrd_start;
+#endif
+
+        /*
+         * If there is no valid ucode previously saved in memory, no need to
+         * update ucode on this AP.
+         */
+        if (mc_saved_data_p->mc_saved_count == 0)
+                return;
+
+        collect_cpu_info_early(&uci);
+        load_microcode(mc_saved_data_p, mc_saved_in_initrd_p,
+                       initrd_start_addr, &uci);
+        apply_microcode_early(mc_saved_data_p, &uci);
+}
diff --git a/arch/x86/kernel/microcode_intel_lib.c b/arch/x86/kernel/microcode_intel_lib.c
new file mode 100644
index 000000000000..ce69320d0179
--- /dev/null
+++ b/arch/x86/kernel/microcode_intel_lib.c
@@ -0,0 +1,174 @@
+/*
+ *      Intel CPU Microcode Update Driver for Linux
+ *
+ *      Copyright (C) 2012 Fenghua Yu <fenghua.yu@intel.com>
+ *                         H Peter Anvin" <hpa@zytor.com>
+ *
+ *      This driver allows to upgrade microcode on Intel processors
+ *      belonging to IA-32 family - PentiumPro, Pentium II,
+ *      Pentium III, Xeon, Pentium 4, etc.
+ *
+ *      Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture
+ *      Software Developer's Manual
+ *      Order Number 253668 or free download from:
+ *
+ *      http://developer.intel.com/Assets/PDF/manual/253668.pdf
+ *
+ *      For more information, go to http://www.urbanmyth.org/microcode
+ *
+ *      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/firmware.h>
+#include <linux/uaccess.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include <asm/microcode_intel.h>
+#include <asm/processor.h>
+#include <asm/msr.h>
+
+static inline int
+update_match_cpu(unsigned int csig, unsigned int cpf,
+                 unsigned int sig, unsigned int pf)
+{
+        return (!sigmatch(sig, csig, pf, cpf)) ? 0 : 1;
+}
+
+int
+update_match_revision(struct microcode_header_intel *mc_header, int rev)
+{
+        return (mc_header->rev <= rev) ? 0 : 1;
+}
+
+int microcode_sanity_check(void *mc, int print_err)
+{
+        unsigned long total_size, data_size, ext_table_size;
+        struct microcode_header_intel *mc_header = mc;
+        struct extended_sigtable *ext_header = NULL;
+        int sum, orig_sum, ext_sigcount = 0, i;
+        struct extended_signature *ext_sig;
+
+        total_size = get_totalsize(mc_header);
+        data_size = get_datasize(mc_header);
+
+        if (data_size + MC_HEADER_SIZE > total_size) {
+                if (print_err)
+                        pr_err("error! Bad data size in microcode data file\n");
+                return -EINVAL;
+        }
+
+        if (mc_header->ldrver != 1 || mc_header->hdrver != 1) {
+                if (print_err)
+                        pr_err("error! Unknown microcode update format\n");
+                return -EINVAL;
+        }
+        ext_table_size = total_size - (MC_HEADER_SIZE + data_size);
+        if (ext_table_size) {
+                if ((ext_table_size < EXT_HEADER_SIZE)
+                 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) {
+                        if (print_err)
+                                pr_err("error! Small exttable size in microcode data file\n");
+                        return -EINVAL;
+                }
+                ext_header = mc + MC_HEADER_SIZE + data_size;
+                if (ext_table_size != exttable_size(ext_header)) {
+                        if (print_err)
+                                pr_err("error! Bad exttable size in microcode data file\n");
+                        return -EFAULT;
+                }
+                ext_sigcount = ext_header->count;
+        }
+
+        /* check extended table checksum */
+        if (ext_table_size) {
+                int ext_table_sum = 0;
+                int *ext_tablep = (int *)ext_header;
+
+                i = ext_table_size / DWSIZE;
+                while (i--)
+                        ext_table_sum += ext_tablep[i];
+                if (ext_table_sum) {
+                        if (print_err)
+                                pr_warn("aborting, bad extended signature table checksum\n");
+                        return -EINVAL;
+                }
+        }
+
+        /* calculate the checksum */
+        orig_sum = 0;
+        i = (MC_HEADER_SIZE + data_size) / DWSIZE;
+        while (i--)
+                orig_sum += ((int *)mc)[i];
+        if (orig_sum) {
+                if (print_err)
+                        pr_err("aborting, bad checksum\n");
+                return -EINVAL;
+        }
+        if (!ext_table_size)
+                return 0;
+        /* check extended signature checksum */
+        for (i = 0; i < ext_sigcount; i++) {
+                ext_sig = (void *)ext_header + EXT_HEADER_SIZE +
+                          EXT_SIGNATURE_SIZE * i;
+                sum = orig_sum
+                        - (mc_header->sig + mc_header->pf + mc_header->cksum)
+                        + (ext_sig->sig + ext_sig->pf + ext_sig->cksum);
+                if (sum) {
+                        if (print_err)
+                                pr_err("aborting, bad checksum\n");
+                        return -EINVAL;
+                }
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(microcode_sanity_check);
+
+/*
+ * return 0 - no update found
+ * return 1 - found update
+ */
+int get_matching_sig(unsigned int csig, int cpf, void *mc, int rev)
+{
+        struct microcode_header_intel *mc_header = mc;
+        struct extended_sigtable *ext_header;
+        unsigned long total_size = get_totalsize(mc_header);
+        int ext_sigcount, i;
+        struct extended_signature *ext_sig;
+
+        if (update_match_cpu(csig, cpf, mc_header->sig, mc_header->pf))
+                return 1;
+
+        /* Look for ext. headers: */
+        if (total_size <= get_datasize(mc_header) + MC_HEADER_SIZE)
+                return 0;
+
+        ext_header = mc + get_datasize(mc_header) + MC_HEADER_SIZE;
+        ext_sigcount = ext_header->count;
+        ext_sig = (void *)ext_header + EXT_HEADER_SIZE;
+
+        for (i = 0; i < ext_sigcount; i++) {
+                if (update_match_cpu(csig, cpf, ext_sig->sig, ext_sig->pf))
+                        return 1;
+                ext_sig++;
+        }
+        return 0;
+}
+
+/*
+ * return 0 - no update found
+ * return 1 - found update
+ */
+int get_matching_microcode(unsigned int csig, int cpf, void *mc, int rev)
+{
+        struct microcode_header_intel *mc_header = mc;
+
+        if (!update_match_revision(mc_header, rev))
+                return 0;
+
+        return get_matching_sig(csig, cpf, mc, rev);
+}
+EXPORT_SYMBOL_GPL(get_matching_microcode);
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index d41815265a0b..4903a03ae876 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -16,6 +16,7 @@
 #include <asm/tlb.h>
 #include <asm/proto.h>
 #include <asm/dma.h>            /* for MAX_DMA_PFN */
+#include <asm/microcode.h>
 
 #include "mm_internal.h"
 
@@ -534,6 +535,15 @@ void free_initmem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
+#ifdef CONFIG_MICROCODE_EARLY
+        /*
+         * Remember, initrd memory may contain microcode or other useful things.
+         * Before we lose initrd mem, we need to find a place to hold them
+         * now that normal virtual memory is enabled.
+         */
+        save_microcode_in_initrd();
+#endif
+
         /*
          * end could be not aligned, and We can not align that,
          * decompresser could be confused by aligned initrd_end
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index f5e86eee4e0e..e8e34938c57d 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1408,7 +1408,6 @@ static void __xen_write_cr3(bool kernel, unsigned long cr3)
                 xen_mc_callback(set_current_cr3, (void *)cr3);
         }
 }
-
 static void xen_write_cr3(unsigned long cr3)
 {
         BUG_ON(preemptible());
@@ -1434,6 +1433,45 @@ static void xen_write_cr3(unsigned long cr3)
         xen_mc_issue(PARAVIRT_LAZY_CPU);  /* interrupts restored */
 }
 
+#ifdef CONFIG_X86_64
+/*
+ * At the start of the day - when Xen launches a guest, it has already
+ * built pagetables for the guest. We diligently look over them
+ * in xen_setup_kernel_pagetable and graft as appropiate them in the
+ * init_level4_pgt and its friends. Then when we are happy we load
+ * the new init_level4_pgt - and continue on.
+ *
+ * The generic code starts (start_kernel) and 'init_mem_mapping' sets
+ * up the rest of the pagetables. When it has completed it loads the cr3.
+ * N.B. that baremetal would start at 'start_kernel' (and the early
+ * #PF handler would create bootstrap pagetables) - so we are running
+ * with the same assumptions as what to do when write_cr3 is executed
+ * at this point.
+ *
+ * Since there are no user-page tables at all, we have two variants
+ * of xen_write_cr3 - the early bootup (this one), and the late one
+ * (xen_write_cr3). The reason we have to do that is that in 64-bit
+ * the Linux kernel and user-space are both in ring 3 while the
+ * hypervisor is in ring 0.
+ */
+static void __init xen_write_cr3_init(unsigned long cr3)
+{
+        BUG_ON(preemptible());
+
+        xen_mc_batch();  /* disables interrupts */
+
+        /* Update while interrupts are disabled, so its atomic with
+           respect to ipis */
+        this_cpu_write(xen_cr3, cr3);
+
+        __xen_write_cr3(true, cr3);
+
+        xen_mc_issue(PARAVIRT_LAZY_CPU);  /* interrupts restored */
+
+        pv_mmu_ops.write_cr3 = &xen_write_cr3;
+}
+#endif
+
 static int xen_pgd_alloc(struct mm_struct *mm)
 {
         pgd_t *pgd = mm->pgd;
@@ -2102,11 +2140,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
         .write_cr2 = xen_write_cr2,
 
         .read_cr3 = xen_read_cr3,
-#ifdef CONFIG_X86_32
         .write_cr3 = xen_write_cr3_init,
-#else
-        .write_cr3 = xen_write_cr3,
-#endif
 
         .flush_tlb_user = xen_flush_tlb,
         .flush_tlb_kernel = xen_flush_tlb,
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 3f37520035dd..0880a14834aa 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -477,6 +477,13 @@ config CRYPTO_SHA1_ARM
           SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
           using optimized ARM assembler.
 
+config CRYPTO_SHA1_PPC
+        tristate "SHA1 digest algorithm (powerpc)"
+        depends on PPC
+        help
+          This is the powerpc hardware accelerated implementation of the
+          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
+
 config CRYPTO_SHA256
         tristate "SHA224 and SHA256 digest algorithm"
         select CRYPTO_HASH
diff --git a/drivers/Makefile b/drivers/Makefile
index b359948fc02b..dce39a95fa71 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_PNP)		+= pnp/
 obj-y                           += amba/
 # Many drivers will want to use DMA so this has to be made available
 # really early.
-obj-$(CONFIG_DMA_ENGINE)        += dma/
+obj-$(CONFIG_DMADEVICES)        += dma/
 
 obj-$(CONFIG_VIRTIO)            += virtio/
 obj-$(CONFIG_XEN)               += xen/
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 652f57e83484..3a8fb28b71f2 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -26,9 +26,9 @@
 #include <asm/prom.h>
 #include <asm/mpc52xx.h>
 
-#include <sysdev/bestcomm/bestcomm.h>
-#include <sysdev/bestcomm/bestcomm_priv.h>
-#include <sysdev/bestcomm/ata.h>
+#include <linux/fsl/bestcomm/bestcomm.h>
+#include <linux/fsl/bestcomm/bestcomm_priv.h>
+#include <linux/fsl/bestcomm/ata.h>
 
 #define DRV_NAME        "mpc52xx_ata"
 
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 85e81ec1451e..594bda9dcfc8 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -445,7 +445,7 @@ static struct entropy_store input_pool = {
         .poolinfo = &poolinfo_table[0],
         .name = "input",
         .limit = 1,
-        .lock = __SPIN_LOCK_UNLOCKED(&input_pool.lock),
+        .lock = __SPIN_LOCK_UNLOCKED(input_pool.lock),
         .pool = input_pool_data
 };
 
@@ -454,7 +454,7 @@ static struct entropy_store blocking_pool = {
         .name = "blocking",
         .limit = 1,
         .pull = &input_pool,
-        .lock = __SPIN_LOCK_UNLOCKED(&blocking_pool.lock),
+        .lock = __SPIN_LOCK_UNLOCKED(blocking_pool.lock),
         .pool = blocking_pool_data
 };
 
@@ -462,7 +462,7 @@ static struct entropy_store nonblocking_pool = {
         .poolinfo = &poolinfo_table[1],
         .name = "nonblocking",
         .pull = &input_pool,
-        .lock = __SPIN_LOCK_UNLOCKED(&nonblocking_pool.lock),
+        .lock = __SPIN_LOCK_UNLOCKED(nonblocking_pool.lock),
         .pool = nonblocking_pool_data
 };
 
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index d4c12180c654..40179e749f08 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -125,6 +125,8 @@ config MPC512X_DMA
         ---help---
           Enable support for the Freescale MPC512x built-in DMA engine.
 
+source "drivers/dma/bestcomm/Kconfig"
+
 config MV_XOR
         bool "Marvell XOR engine support"
         depends on PLAT_ORION
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 7428feaa8705..642d96736cf5 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_INTEL_IOATDMA) += ioat/
 obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
 obj-$(CONFIG_FSL_DMA) += fsldma.o
 obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o
+obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
 obj-$(CONFIG_MV_XOR) += mv_xor.o
 obj-$(CONFIG_DW_DMAC) += dw_dmac.o
 obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/drivers/dma/bestcomm/Kconfig
index 29e427085efb..29e427085efb 100644
--- a/arch/powerpc/sysdev/bestcomm/Kconfig
+++ b/drivers/dma/bestcomm/Kconfig
diff --git a/arch/powerpc/sysdev/bestcomm/Makefile b/drivers/dma/bestcomm/Makefile
index aed2df2a6580..aed2df2a6580 100644
--- a/arch/powerpc/sysdev/bestcomm/Makefile
+++ b/drivers/dma/bestcomm/Makefile
diff --git a/arch/powerpc/sysdev/bestcomm/ata.c b/drivers/dma/bestcomm/ata.c
index 901c9f91e5dd..2fd87f83cf90 100644
--- a/arch/powerpc/sysdev/bestcomm/ata.c
+++ b/drivers/dma/bestcomm/ata.c
@@ -18,9 +18,9 @@
 #include <linux/types.h>
 #include <asm/io.h>
 
-#include "bestcomm.h"
-#include "bestcomm_priv.h"
-#include "ata.h"
+#include <linux/fsl/bestcomm/bestcomm.h>
+#include <linux/fsl/bestcomm/bestcomm_priv.h>
+#include <linux/fsl/bestcomm/ata.h>
 
 
 /* ======================================================================== */
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c b/drivers/dma/bestcomm/bcom_ata_task.c
index cc6049a4e469..cc6049a4e469 100644
--- a/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c
+++ b/drivers/dma/bestcomm/bcom_ata_task.c
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c b/drivers/dma/bestcomm/bcom_fec_rx_task.c
index a1ad6a02fcef..a1ad6a02fcef 100644
--- a/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c
+++ b/drivers/dma/bestcomm/bcom_fec_rx_task.c
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c b/drivers/dma/bestcomm/bcom_fec_tx_task.c
index b1c495c3a65a..b1c495c3a65a 100644
--- a/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c
+++ b/drivers/dma/bestcomm/bcom_fec_tx_task.c
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c b/drivers/dma/bestcomm/bcom_gen_bd_rx_task.c
index efee022b0256..efee022b0256 100644
--- a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c
+++ b/drivers/dma/bestcomm/bcom_gen_bd_rx_task.c
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c b/drivers/dma/bestcomm/bcom_gen_bd_tx_task.c
index c605aa42ecbb..c605aa42ecbb 100644
--- a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c
+++ b/drivers/dma/bestcomm/bcom_gen_bd_tx_task.c
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/drivers/dma/bestcomm/bestcomm.c
index 81c331481336..a8c2e2994d2e 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/drivers/dma/bestcomm/bestcomm.c
@@ -23,9 +23,9 @@
 #include <asm/irq.h>
 #include <asm/mpc52xx.h>
 
-#include "sram.h"
-#include "bestcomm_priv.h"
-#include "bestcomm.h"
+#include <linux/fsl/bestcomm/sram.h>
+#include <linux/fsl/bestcomm/bestcomm_priv.h>
+#include "linux/fsl/bestcomm/bestcomm.h"
 
 #define DRIVER_NAME "bestcomm-core"
 
diff --git a/arch/powerpc/sysdev/bestcomm/fec.c b/drivers/dma/bestcomm/fec.c
index 957a988d23ea..7f1fb1c999e4 100644
--- a/arch/powerpc/sysdev/bestcomm/fec.c
+++ b/drivers/dma/bestcomm/fec.c
@@ -16,9 +16,9 @@
 #include <linux/types.h>
 #include <asm/io.h>
 
-#include "bestcomm.h"
-#include "bestcomm_priv.h"
-#include "fec.h"
+#include <linux/fsl/bestcomm/bestcomm.h>
+#include <linux/fsl/bestcomm/bestcomm_priv.h>
+#include <linux/fsl/bestcomm/fec.h>
 
 
 /* ======================================================================== */
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.c b/drivers/dma/bestcomm/gen_bd.c
index e0a53e3147b2..1a5b22d88127 100644
--- a/arch/powerpc/sysdev/bestcomm/gen_bd.c
+++ b/drivers/dma/bestcomm/gen_bd.c
@@ -21,9 +21,9 @@
 #include <asm/mpc52xx.h>
 #include <asm/mpc52xx_psc.h>
 
-#include "bestcomm.h"
-#include "bestcomm_priv.h"
-#include "gen_bd.h"
+#include <linux/fsl/bestcomm/bestcomm.h>
+#include <linux/fsl/bestcomm/bestcomm_priv.h>
+#include <linux/fsl/bestcomm/gen_bd.h>
 
 
 /* ======================================================================== */
diff --git a/arch/powerpc/sysdev/bestcomm/sram.c b/drivers/dma/bestcomm/sram.c
index b6db23e085fb..5e2ed30ba2c4 100644
--- a/arch/powerpc/sysdev/bestcomm/sram.c
+++ b/drivers/dma/bestcomm/sram.c
@@ -23,7 +23,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 
-#include "sram.h"
+#include <linux/fsl/bestcomm/sram.h>
 
 
 /* Struct keeping our 'state' */
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c
index fa080ebd568f..ffeebc7e9f1c 100644
--- a/drivers/idle/i7300_idle.c
+++ b/drivers/idle/i7300_idle.c
@@ -75,7 +75,7 @@ static unsigned long past_skip;
 
 static struct pci_dev *fbd_dev;
 
-static spinlock_t i7300_idle_lock;
+static raw_spinlock_t i7300_idle_lock;
 static int i7300_idle_active;
 
 static u8 i7300_idle_thrtctl_saved;
@@ -457,7 +457,7 @@ static int i7300_idle_notifier(struct notifier_block *nb, unsigned long val,
                 idle_begin_time = ktime_get();
         }
 
-        spin_lock_irqsave(&i7300_idle_lock, flags);
+        raw_spin_lock_irqsave(&i7300_idle_lock, flags);
         if (val == IDLE_START) {
 
                 cpumask_set_cpu(smp_processor_id(), idle_cpumask);
@@ -506,7 +506,7 @@ static int i7300_idle_notifier(struct notifier_block *nb, unsigned long val,
                 }
         }
 end:
-        spin_unlock_irqrestore(&i7300_idle_lock, flags);
+        raw_spin_unlock_irqrestore(&i7300_idle_lock, flags);
         return 0;
 }
 
@@ -548,7 +548,7 @@ struct debugfs_file_info {
 
 static int __init i7300_idle_init(void)
 {
-        spin_lock_init(&i7300_idle_lock);
+        raw_spin_lock_init(&i7300_idle_lock);
         total_us = 0;
 
         if (i7300_idle_platform_probe(&fbd_dev, &ioat_dev, forceload))
diff --git a/drivers/macintosh/windfarm_pm112.c b/drivers/macintosh/windfarm_pm112.c
index 35ef6e2582b8..3024685e4cca 100644
--- a/drivers/macintosh/windfarm_pm112.c
+++ b/drivers/macintosh/windfarm_pm112.c
@@ -681,7 +681,7 @@ static int __init wf_pm112_init(void)
 
         /* Count the number of CPU cores */
         nr_cores = 0;
-        for (cpu = NULL; (cpu = of_find_node_by_type(cpu, "cpu")) != NULL; )
+        for_each_node_by_type(cpu, "cpu")
                 ++nr_cores;
 
         printk(KERN_INFO "windfarm: initializing for dual-core desktop G5\n");
diff --git a/drivers/macintosh/windfarm_pm72.c b/drivers/macintosh/windfarm_pm72.c
index 6e5585357cd3..2f506b9d5a52 100644
--- a/drivers/macintosh/windfarm_pm72.c
+++ b/drivers/macintosh/windfarm_pm72.c
@@ -804,7 +804,7 @@ static int __init wf_pm72_init(void)
 
         /* Count the number of CPU cores */
         nr_chips = 0;
-        for (cpu = NULL; (cpu = of_find_node_by_type(cpu, "cpu")) != NULL; )
+        for_each_node_by_type(cpu, "cpu")
                 ++nr_chips;
         if (nr_chips > NR_CHIPS)
                 nr_chips = NR_CHIPS;
diff --git a/drivers/macintosh/windfarm_rm31.c b/drivers/macintosh/windfarm_rm31.c
index 844003fb4ef0..0b9a79b2f48a 100644
--- a/drivers/macintosh/windfarm_rm31.c
+++ b/drivers/macintosh/windfarm_rm31.c
@@ -696,7 +696,7 @@ static int __init wf_rm31_init(void)
 
         /* Count the number of CPU cores */
         nr_chips = 0;
-        for (cpu = NULL; (cpu = of_find_node_by_type(cpu, "cpu")) != NULL; )
+        for_each_node_by_type(cpu, "cpu")
                 ++nr_chips;
         if (nr_chips > NR_CHIPS)
                 nr_chips = NR_CHIPS;
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index 7f91b0c5c264..77943a6a1b8c 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -41,8 +41,8 @@
 #include <asm/delay.h>
 #include <asm/mpc52xx.h>
 
-#include <sysdev/bestcomm/bestcomm.h>
-#include <sysdev/bestcomm/fec.h>
+#include <linux/fsl/bestcomm/bestcomm.h>
+#include <linux/fsl/bestcomm/fec.h>
 
 #include "fec_mpc52xx.h"
 
diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig
index 620264936341..592de566e72f 100644
--- a/drivers/parisc/Kconfig
+++ b/drivers/parisc/Kconfig
@@ -128,6 +128,7 @@ config SUPERIO
 config CHASSIS_LCD_LED
         bool "Chassis LCD and LED support"
         default y
+        select VM_EVENT_COUNTERS
         help
           Say Y here if you want to enable support for the Heartbeat,
           Disk/Network activities LEDs on some PA-RISC machines,
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 8e4e86b78428..9eae9834bcc7 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -580,15 +580,13 @@ dino_fixup_bus(struct pci_bus *bus)
                                 
                         }
                                         
-                        DBG("DEBUG %s assigning %d [0x%lx,0x%lx]\n",
+                        DBG("DEBUG %s assigning %d [%pR]\n",
                             dev_name(&bus->self->dev), i,
-                            bus->self->resource[i].start,
-                            bus->self->resource[i].end);
+                            &bus->self->resource[i]);
                         WARN_ON(pci_assign_resource(bus->self, i));
-                        DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n",
+                        DBG("DEBUG %s after assign %d [%pR]\n",
                             dev_name(&bus->self->dev), i,
-                            bus->self->resource[i].start,
-                            bus->self->resource[i].end);
+                            &bus->self->resource[i]);
                 }
         }
 
@@ -772,8 +770,7 @@ dino_bridge_init(struct dino_device *dino_dev, const char *name)
                 result = ccio_request_resource(dino_dev->hba.dev, &res[i]);
                 if (result < 0) {
                         printk(KERN_ERR "%s: failed to claim PCI Bus address "
-                               "space %d (0x%lx-0x%lx)!\n", name, i,
-                               (unsigned long)res[i].start, (unsigned long)res[i].end);
+                               "space %d (%pR)!\n", name, i, &res[i]);
                         return result;
                 }
         }
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index 815db175d427..898208e4f302 100644
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -74,10 +74,8 @@ static int hppb_probe(struct parisc_device *dev)
 
         status = ccio_request_resource(dev, &card->mmio_region);
         if(status < 0) {
-                printk(KERN_ERR "%s: failed to claim HP-PB "
-                        "bus space (0x%08llx, 0x%08llx)\n",
-                        __FILE__, (unsigned long long) card->mmio_region.start,
-                        (unsigned long long) card->mmio_region.end);
+                printk(KERN_ERR "%s: failed to claim HP-PB bus space (%pR)\n",
+                        __FILE__, &card->mmio_region);
         }
 
         return 0;
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 246a92f677e4..0f54ab6260df 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -212,12 +212,10 @@ pdcspath_store(struct pdcspath_entry *entry)
                         entry, devpath, entry->addr);
 
         /* addr, devpath and count must be word aligned */
-        if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK) {
-                printk(KERN_ERR "%s: an error occurred when writing to PDC.\n"
+        if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK)
+                WARN(1, KERN_ERR "%s: an error occurred when writing to PDC.\n"
                                 "It is likely that the Stable Storage data has been corrupted.\n"
                                 "Please check it carefully upon next reboot.\n", __func__);
-                WARN_ON(1);
-        }
                 
         /* kobject is already registered */
         entry->ready = 2;
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 5003458980d3..ac6e8e7a02df 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -274,7 +274,7 @@ superio_init(struct pci_dev *pcidev)
         else
                 printk(KERN_ERR PFX "USB regulator not initialized!\n");
 
-        if (request_irq(pdev->irq, superio_interrupt, IRQF_DISABLED,
+        if (request_irq(pdev->irq, superio_interrupt, 0,
                         SUPERIO, (void *)sio)) {
 
                 printk(KERN_ERR PFX "could not get irq\n");
diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
index 3bc244d2636a..a62c4a47d52c 100644
--- a/drivers/usb/chipidea/debug.c
+++ b/drivers/usb/chipidea/debug.c
@@ -222,7 +222,7 @@ static struct {
 } dbg_data = {
         .idx = 0,
         .tty = 0,
-        .lck = __RW_LOCK_UNLOCKED(lck)
+        .lck = __RW_LOCK_UNLOCKED(dbg_data.lck)
 };
 
 /**
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 19cfd7a92563..41fbd9453c5f 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -944,7 +944,7 @@ static u32 fsl_diu_get_pixel_format(unsigned int bits_per_pixel)
 #define PF_COMP_0_MASK          0x0000000F
 #define PF_COMP_0_SHIFT         0
 
-#define MAKE_PF(alpha, red, blue, green, size, c0, c1, c2, c3) \
+#define MAKE_PF(alpha, red, green, blue, size, c0, c1, c2, c3) \
         cpu_to_le32(PF_BYTE_F | (alpha << PF_ALPHA_C_SHIFT) | \
         (blue << PF_BLUE_C_SHIFT) | (green << PF_GREEN_C_SHIFT) | \
         (red << PF_RED_C_SHIFT) | (c3 << PF_COMP_3_SHIFT) | \
@@ -954,10 +954,10 @@ static u32 fsl_diu_get_pixel_format(unsigned int bits_per_pixel)
         switch (bits_per_pixel) {
         case 32:
                 /* 0x88883316 */
-                return MAKE_PF(3, 2, 0, 1, 3, 8, 8, 8, 8);
+                return MAKE_PF(3, 2, 1, 0, 3, 8, 8, 8, 8);
         case 24:
                 /* 0x88082219 */
-                return MAKE_PF(4, 0, 1, 2, 2, 0, 8, 8, 8);
+                return MAKE_PF(4, 0, 1, 2, 2, 8, 8, 8, 0);
         case 16:
                 /* 0x65053118 */
                 return MAKE_PF(4, 2, 1, 0, 1, 5, 6, 5, 0);
@@ -1232,6 +1232,16 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd,
         return 0;
 }
 
+static inline void fsl_diu_enable_interrupts(struct fsl_diu_data *data)
+{
+        u32 int_mask = INT_UNDRUN; /* enable underrun detection */
+
+        if (IS_ENABLED(CONFIG_NOT_COHERENT_CACHE))
+                int_mask |= INT_VSYNC; /* enable vertical sync */
+
+        clrbits32(&data->diu_reg->int_mask, int_mask);
+}
+
 /* turn on fb if count == 1
  */
 static int fsl_diu_open(struct fb_info *info, int user)
@@ -1251,19 +1261,7 @@ static int fsl_diu_open(struct fb_info *info, int user)
                 if (res < 0)
                         mfbi->count--;
                 else {
-                        struct fsl_diu_data *data = mfbi->parent;
-
-#ifdef CONFIG_NOT_COHERENT_CACHE
-                        /*
-                         * Enable underrun detection and vertical sync
-                         * interrupts.
-                         */
-                        clrbits32(&data->diu_reg->int_mask,
-                                  INT_UNDRUN | INT_VSYNC);
-#else
-                        /* Enable underrun detection */
-                        clrbits32(&data->diu_reg->int_mask, INT_UNDRUN);
-#endif
+                        fsl_diu_enable_interrupts(mfbi->parent);
                         fsl_diu_enable_panel(info);
                 }
         }
@@ -1283,9 +1281,18 @@ static int fsl_diu_release(struct fb_info *info, int user)
         mfbi->count--;
         if (mfbi->count == 0) {
                 struct fsl_diu_data *data = mfbi->parent;
+                bool disable = true;
+                int i;
 
-                /* Disable interrupts */
-                out_be32(&data->diu_reg->int_mask, 0xffffffff);
+                /* Disable interrupts only if all AOIs are closed */
+                for (i = 0; i < NUM_AOIS; i++) {
+                        struct mfb_info *mi = data->fsl_diu_info[i].par;
+
+                        if (mi->count)
+                                disable = false;
+                }
+                if (disable)
+                        out_be32(&data->diu_reg->int_mask, 0xffffffff);
                 fsl_diu_disable_panel(info);
         }
 
@@ -1614,14 +1621,6 @@ static int fsl_diu_probe(struct platform_device *pdev)
         out_be32(&data->diu_reg->desc[1], data->dummy_ad.paddr);
         out_be32(&data->diu_reg->desc[2], data->dummy_ad.paddr);
 
-        for (i = 0; i < NUM_AOIS; i++) {
-                ret = install_fb(&data->fsl_diu_info[i]);
-                if (ret) {
-                        dev_err(&pdev->dev, "could not register fb %d\n", i);
-                        goto error;
-                }
-        }
-
         /*
          * Older versions of U-Boot leave interrupts enabled, so disable
          * all of them and clear the status register.
@@ -1630,12 +1629,21 @@ static int fsl_diu_probe(struct platform_device *pdev)
         in_be32(&data->diu_reg->int_status);
 
         ret = request_irq(data->irq, fsl_diu_isr, 0, "fsl-diu-fb",
-                          &data->diu_reg);
+                          data->diu_reg);
         if (ret) {
                 dev_err(&pdev->dev, "could not claim irq\n");
                 goto error;
         }
 
+        for (i = 0; i < NUM_AOIS; i++) {
+                ret = install_fb(&data->fsl_diu_info[i]);
+                if (ret) {
+                        dev_err(&pdev->dev, "could not register fb %d\n", i);
+                        free_irq(data->irq, data->diu_reg);
+                        goto error;
+                }
+        }
+
         sysfs_attr_init(&data->dev_attr.attr);
         data->dev_attr.attr.name = "monitor";
         data->dev_attr.attr.mode = S_IRUGO|S_IWUSR;
@@ -1667,7 +1675,7 @@ static int fsl_diu_remove(struct platform_device *pdev)
         data = dev_get_drvdata(&pdev->dev);
         disable_lcdc(&data->fsl_diu_info[0]);
 
-        free_irq(data->irq, &data->diu_reg);
+        free_irq(data->irq, data->diu_reg);
 
         for (i = 0; i < NUM_AOIS; i++)
                 uninstall_fb(&data->fsl_diu_info[i]);
diff --git a/fs/file.c b/fs/file.c
index 2b3570b7caeb..3906d9577a18 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -516,7 +516,7 @@ struct files_struct init_files = {
                 .close_on_exec  = init_files.close_on_exec_init,
                 .open_fds       = init_files.open_fds_init,
         },
-        .file_lock      = __SPIN_LOCK_UNLOCKED(init_task.file_lock),
+        .file_lock      = __SPIN_LOCK_UNLOCKED(init_files.file_lock),
 };
 
 /*
diff --git a/include/asm-generic/cmpxchg-local.h b/include/asm-generic/cmpxchg-local.h
index 2533fddd34a6..d8d4c898c1bb 100644
--- a/include/asm-generic/cmpxchg-local.h
+++ b/include/asm-generic/cmpxchg-local.h
@@ -21,7 +21,7 @@ static inline unsigned long __cmpxchg_local_generic(volatile void *ptr,
         if (size == 8 && sizeof(unsigned long) != 8)
                 wrong_size_cmpxchg(ptr);
 
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
         switch (size) {
         case 1: prev = *(u8 *)ptr;
                 if (prev == old)
@@ -42,7 +42,7 @@ static inline unsigned long __cmpxchg_local_generic(volatile void *ptr,
         default:
                 wrong_size_cmpxchg(ptr);
         }
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
         return prev;
 }
 
@@ -55,11 +55,11 @@ static inline u64 __cmpxchg64_local_generic(volatile void *ptr,
         u64 prev;
         unsigned long flags;
 
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
         prev = *(u64 *)ptr;
         if (prev == old)
                 *(u64 *)ptr = new;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
         return prev;
 }
 
diff --git a/arch/powerpc/sysdev/bestcomm/ata.h b/include/linux/fsl/bestcomm/ata.h
index 0b2371811334..0b2371811334 100644
--- a/arch/powerpc/sysdev/bestcomm/ata.h
+++ b/include/linux/fsl/bestcomm/ata.h
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.h b/include/linux/fsl/bestcomm/bestcomm.h
index a0e2e6b19b57..a0e2e6b19b57 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.h
+++ b/include/linux/fsl/bestcomm/bestcomm.h
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h b/include/linux/fsl/bestcomm/bestcomm_priv.h
index 3b52f3ffbdf8..3b52f3ffbdf8 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h
+++ b/include/linux/fsl/bestcomm/bestcomm_priv.h
diff --git a/arch/powerpc/sysdev/bestcomm/fec.h b/include/linux/fsl/bestcomm/fec.h
index ee565d94d503..ee565d94d503 100644
--- a/arch/powerpc/sysdev/bestcomm/fec.h
+++ b/include/linux/fsl/bestcomm/fec.h
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.h b/include/linux/fsl/bestcomm/gen_bd.h
index de47260e69da..de47260e69da 100644
--- a/arch/powerpc/sysdev/bestcomm/gen_bd.h
+++ b/include/linux/fsl/bestcomm/gen_bd.h
diff --git a/arch/powerpc/sysdev/bestcomm/sram.h b/include/linux/fsl/bestcomm/sram.h
index b6d668963cce..b6d668963cce 100644
--- a/arch/powerpc/sysdev/bestcomm/sram.h
+++ b/include/linux/fsl/bestcomm/sram.h
diff --git a/include/linux/idr.h b/include/linux/idr.h
index de7e190f1af4..e5eb125effe6 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -136,7 +136,7 @@ struct ida {
         struct ida_bitmap       *free_bitmap;
 };
 
-#define IDA_INIT(name)          { .idr = IDR_INIT(name), .free_bitmap = NULL, }
+#define IDA_INIT(name)          { .idr = IDR_INIT((name).idr), .free_bitmap = NULL, }
 #define DEFINE_IDA(name)        struct ida name = IDA_INIT(name)
 
 int ida_pre_get(struct ida *ida, gfp_t gfp_mask);
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index bfe88c4aa251..f1e877b79ed8 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -412,7 +412,7 @@ struct lock_class_key { };
 
 #define lockdep_depth(tsk)      (0)
 
-#define lockdep_assert_held(l)                  do { } while (0)
+#define lockdep_assert_held(l)                  do { (void)(l); } while (0)
 
 #define lockdep_recursing(tsk)                  (0)
 
diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h
index 94e19ea28fc3..440434df3627 100644
--- a/include/linux/sched/rt.h
+++ b/include/linux/sched/rt.h
@@ -55,4 +55,10 @@ static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
 extern void normalize_rt_tasks(void);
 
 
+/*
+ * default timeslice is 100 msecs (used only for SCHED_RR tasks).
+ * Timeslices get refilled after they expire.
+ */
+#define RR_TIMESLICE            (100 * HZ / 1000)
+
 #endif /* _SCHED_RT_H */
diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
index d2bb0ae979d0..bf8086b2506e 100644
--- a/include/linux/sched/sysctl.h
+++ b/include/linux/sched/sysctl.h
@@ -91,12 +91,6 @@ extern unsigned int sysctl_sched_cfs_bandwidth_slice;
 extern unsigned int sysctl_sched_autogroup_enabled;
 #endif
 
-/*
- * default timeslice is 100 msecs (used only for SCHED_RR tasks).
- * Timeslices get refilled after they expire.
- */
-#define RR_TIMESLICE            (100 * HZ / 1000)
-
 extern int sched_rr_timeslice;
 
 extern int sched_rr_handler(struct ctl_table *table, int write,
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 600060e25ec6..18299057402f 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -30,92 +30,12 @@
 #include <linux/preempt.h>
 #include <asm/processor.h>
 
-typedef struct {
-        unsigned sequence;
-        spinlock_t lock;
-} seqlock_t;
-
-/*
- * These macros triggered gcc-3.x compile-time problems.  We think these are
- * OK now.  Be cautious.
- */
-#define __SEQLOCK_UNLOCKED(lockname) \
-                 { 0, __SPIN_LOCK_UNLOCKED(lockname) }
-
-#define seqlock_init(x)                                 \
-        do {                                            \
-                (x)->sequence = 0;                      \
-                spin_lock_init(&(x)->lock);             \
-        } while (0)
-
-#define DEFINE_SEQLOCK(x) \
-                seqlock_t x = __SEQLOCK_UNLOCKED(x)
-
-/* Lock out other writers and update the count.
- * Acts like a normal spin_lock/unlock.
- * Don't need preempt_disable() because that is in the spin_lock already.
- */
-static inline void write_seqlock(seqlock_t *sl)
-{
-        spin_lock(&sl->lock);
-        ++sl->sequence;
-        smp_wmb();
-}
-
-static inline void write_sequnlock(seqlock_t *sl)
-{
-        smp_wmb();
-        sl->sequence++;
-        spin_unlock(&sl->lock);
-}
-
-static inline int write_tryseqlock(seqlock_t *sl)
-{
-        int ret = spin_trylock(&sl->lock);
-
-        if (ret) {
-                ++sl->sequence;
-                smp_wmb();
-        }
-        return ret;
-}
-
-/* Start of read calculation -- fetch last complete writer token */
-static __always_inline unsigned read_seqbegin(const seqlock_t *sl)
-{
-        unsigned ret;
-
-repeat:
-        ret = ACCESS_ONCE(sl->sequence);
-        if (unlikely(ret & 1)) {
-                cpu_relax();
-                goto repeat;
-        }
-        smp_rmb();
-
-        return ret;
-}
-
-/*
- * Test if reader processed invalid data.
- *
- * If sequence value changed then writer changed data while in section.
- */
-static __always_inline int read_seqretry(const seqlock_t *sl, unsigned start)
-{
-        smp_rmb();
-
-        return unlikely(sl->sequence != start);
-}
-
-
 /*
  * Version using sequence counter only.
  * This can be used when code has its own mutex protecting the
  * updating starting before the write_seqcountbeqin() and ending
  * after the write_seqcount_end().
  */
-
 typedef struct seqcount {
         unsigned sequence;
 } seqcount_t;
@@ -218,7 +138,6 @@ static inline int __read_seqcount_retry(const seqcount_t *s, unsigned start)
 static inline int read_seqcount_retry(const seqcount_t *s, unsigned start)
 {
         smp_rmb();
-
         return __read_seqcount_retry(s, start);
 }
 
@@ -252,31 +171,101 @@ static inline void write_seqcount_barrier(seqcount_t *s)
         s->sequence+=2;
 }
 
+typedef struct {
+        struct seqcount seqcount;
+        spinlock_t lock;
+} seqlock_t;
+
 /*
- * Possible sw/hw IRQ protected versions of the interfaces.
+ * These macros triggered gcc-3.x compile-time problems.  We think these are
+ * OK now.  Be cautious.
  */
-#define write_seqlock_irqsave(lock, flags)                              \
-        do { local_irq_save(flags); write_seqlock(lock); } while (0)
-#define write_seqlock_irq(lock)                                         \
-        do { local_irq_disable();   write_seqlock(lock); } while (0)
-#define write_seqlock_bh(lock)                                          \
-        do { local_bh_disable();    write_seqlock(lock); } while (0)
+#define __SEQLOCK_UNLOCKED(lockname)                    \
+        {                                               \
+                .seqcount = SEQCNT_ZERO,                \
+                .lock = __SPIN_LOCK_UNLOCKED(lockname)  \
+        }
+
+#define seqlock_init(x)                                 \
+        do {                                            \
+                seqcount_init(&(x)->seqcount);          \
+                spin_lock_init(&(x)->lock);             \
+        } while (0)
 
-#define write_sequnlock_irqrestore(lock, flags)                         \
-        do { write_sequnlock(lock); local_irq_restore(flags); } while(0)
-#define write_sequnlock_irq(lock)                                       \
-        do { write_sequnlock(lock); local_irq_enable(); } while(0)
-#define write_sequnlock_bh(lock)                                        \
-        do { write_sequnlock(lock); local_bh_enable(); } while(0)
+#define DEFINE_SEQLOCK(x) \
+                seqlock_t x = __SEQLOCK_UNLOCKED(x)
 
-#define read_seqbegin_irqsave(lock, flags)                              \
-        ({ local_irq_save(flags);   read_seqbegin(lock); })
+/*
+ * Read side functions for starting and finalizing a read side section.
+ */
+static inline unsigned read_seqbegin(const seqlock_t *sl)
+{
+        return read_seqcount_begin(&sl->seqcount);
+}
 
-#define read_seqretry_irqrestore(lock, iv, flags)                       \
-        ({                                                              \
-                int ret = read_seqretry(lock, iv);                      \
-                local_irq_restore(flags);                               \
-                ret;                                                    \
-        })
+static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
+{
+        return read_seqcount_retry(&sl->seqcount, start);
+}
+
+/*
+ * Lock out other writers and update the count.
+ * Acts like a normal spin_lock/unlock.
+ * Don't need preempt_disable() because that is in the spin_lock already.
+ */
+static inline void write_seqlock(seqlock_t *sl)
+{
+        spin_lock(&sl->lock);
+        write_seqcount_begin(&sl->seqcount);
+}
+
+static inline void write_sequnlock(seqlock_t *sl)
+{
+        write_seqcount_end(&sl->seqcount);
+        spin_unlock(&sl->lock);
+}
+
+static inline void write_seqlock_bh(seqlock_t *sl)
+{
+        spin_lock_bh(&sl->lock);
+        write_seqcount_begin(&sl->seqcount);
+}
+
+static inline void write_sequnlock_bh(seqlock_t *sl)
+{
+        write_seqcount_end(&sl->seqcount);
+        spin_unlock_bh(&sl->lock);
+}
+
+static inline void write_seqlock_irq(seqlock_t *sl)
+{
+        spin_lock_irq(&sl->lock);
+        write_seqcount_begin(&sl->seqcount);
+}
+
+static inline void write_sequnlock_irq(seqlock_t *sl)
+{
+        write_seqcount_end(&sl->seqcount);
+        spin_unlock_irq(&sl->lock);
+}
+
+static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&sl->lock, flags);
+        write_seqcount_begin(&sl->seqcount);
+        return flags;
+}
+
+#define write_seqlock_irqsave(lock, flags)                              \
+        do { flags = __write_seqlock_irqsave(lock); } while (0)
+
+static inline void
+write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
+{
+        write_seqcount_end(&sl->seqcount);
+        spin_unlock_irqrestore(&sl->lock, flags);
+}
 
 #endif /* __LINUX_SEQLOCK_H */
diff --git a/kernel/futex.c b/kernel/futex.c
index 9618b6e9fb36..fbc07a29ec53 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2472,8 +2472,6 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
         if (!futex_cmpxchg_enabled)
                 return -ENOSYS;
 
-        WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n");
-
         rcu_read_lock();
 
         ret = -ESRCH;
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index 83e368b005fc..a9642d528630 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -142,8 +142,6 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
         if (!futex_cmpxchg_enabled)
                 return -ENOSYS;
 
-        WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n");
-
         rcu_read_lock();
 
         ret = -ESRCH;
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 7981e5b2350d..8a0efac4f99d 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -3190,9 +3190,14 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
 #endif
         if (unlikely(curr->lockdep_depth >= MAX_LOCK_DEPTH)) {
                 debug_locks_off();
-                printk("BUG: MAX_LOCK_DEPTH too low!\n");
+                printk("BUG: MAX_LOCK_DEPTH too low, depth: %i  max: %lu!\n",
+                       curr->lockdep_depth, MAX_LOCK_DEPTH);
                 printk("turning off the locking correctness validator.\n");
+
+                lockdep_print_held_locks(current);
+                debug_show_all_locks();
                 dump_stack();
+
                 return 0;
         }
 
@@ -3203,7 +3208,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
 }
 
 static int
-print_unlock_inbalance_bug(struct task_struct *curr, struct lockdep_map *lock,
+print_unlock_imbalance_bug(struct task_struct *curr, struct lockdep_map *lock,
                            unsigned long ip)
 {
         if (!debug_locks_off())
@@ -3246,7 +3251,7 @@ static int check_unlock(struct task_struct *curr, struct lockdep_map *lock,
                 return 0;
 
         if (curr->lockdep_depth <= 0)
-                return print_unlock_inbalance_bug(curr, lock, ip);
+                return print_unlock_imbalance_bug(curr, lock, ip);
 
         return 1;
 }
@@ -3317,7 +3322,7 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
                         goto found_it;
                 prev_hlock = hlock;
         }
-        return print_unlock_inbalance_bug(curr, lock, ip);
+        return print_unlock_imbalance_bug(curr, lock, ip);
 
 found_it:
         lockdep_init_map(lock, name, key, 0);
@@ -3384,7 +3389,7 @@ lock_release_non_nested(struct task_struct *curr,
                         goto found_it;
                 prev_hlock = hlock;
         }
-        return print_unlock_inbalance_bug(curr, lock, ip);
+        return print_unlock_imbalance_bug(curr, lock, ip);
 
 found_it:
         if (hlock->instance == lock)
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index b10a42bb0165..072bb066bb7d 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -23,7 +23,7 @@
  * NTP timekeeping variables:
  */
 
-DEFINE_SPINLOCK(ntp_lock);
+DEFINE_RAW_SPINLOCK(ntp_lock);
 
 
 /* USER_HZ period (usecs): */
@@ -348,7 +348,7 @@ void ntp_clear(void)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&ntp_lock, flags);
+        raw_spin_lock_irqsave(&ntp_lock, flags);
 
         time_adjust     = 0;            /* stop active adjtime() */
         time_status     |= STA_UNSYNC;
@@ -362,7 +362,7 @@ void ntp_clear(void)
 
         /* Clear PPS state variables */
         pps_clear();
-        spin_unlock_irqrestore(&ntp_lock, flags);
+        raw_spin_unlock_irqrestore(&ntp_lock, flags);
 
 }
 
@@ -372,9 +372,9 @@ u64 ntp_tick_length(void)
         unsigned long flags;
         s64 ret;
 
-        spin_lock_irqsave(&ntp_lock, flags);
+        raw_spin_lock_irqsave(&ntp_lock, flags);
         ret = tick_length;
-        spin_unlock_irqrestore(&ntp_lock, flags);
+        raw_spin_unlock_irqrestore(&ntp_lock, flags);
         return ret;
 }
 
@@ -395,7 +395,7 @@ int second_overflow(unsigned long secs)
         int leap = 0;
         unsigned long flags;
 
-        spin_lock_irqsave(&ntp_lock, flags);
+        raw_spin_lock_irqsave(&ntp_lock, flags);
 
         /*
          * Leap second processing. If in leap-insert state at the end of the
@@ -479,7 +479,7 @@ int second_overflow(unsigned long secs)
         time_adjust = 0;
 
 out:
-        spin_unlock_irqrestore(&ntp_lock, flags);
+        raw_spin_unlock_irqrestore(&ntp_lock, flags);
 
         return leap;
 }
@@ -672,7 +672,7 @@ int do_adjtimex(struct timex *txc)
 
         getnstimeofday(&ts);
 
-        spin_lock_irq(&ntp_lock);
+        raw_spin_lock_irq(&ntp_lock);
 
         if (txc->modes & ADJ_ADJTIME) {
                 long save_adjust = time_adjust;
@@ -714,7 +714,7 @@ int do_adjtimex(struct timex *txc)
         /* fill PPS status fields */
         pps_fill_timex(txc);
 
-        spin_unlock_irq(&ntp_lock);
+        raw_spin_unlock_irq(&ntp_lock);
 
         txc->time.tv_sec = ts.tv_sec;
         txc->time.tv_usec = ts.tv_nsec;
@@ -912,7 +912,7 @@ void hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
 
         pts_norm = pps_normalize_ts(*phase_ts);
 
-        spin_lock_irqsave(&ntp_lock, flags);
+        raw_spin_lock_irqsave(&ntp_lock, flags);
 
         /* clear the error bits, they will be set again if needed */
         time_status &= ~(STA_PPSJITTER | STA_PPSWANDER | STA_PPSERROR);
@@ -925,7 +925,7 @@ void hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
          * just start the frequency interval */
         if (unlikely(pps_fbase.tv_sec == 0)) {
                 pps_fbase = *raw_ts;
-                spin_unlock_irqrestore(&ntp_lock, flags);
+                raw_spin_unlock_irqrestore(&ntp_lock, flags);
                 return;
         }
 
@@ -940,7 +940,7 @@ void hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
                 time_status |= STA_PPSJITTER;
                 /* restart the frequency calibration interval */
                 pps_fbase = *raw_ts;
-                spin_unlock_irqrestore(&ntp_lock, flags);
+                raw_spin_unlock_irqrestore(&ntp_lock, flags);
                 pr_err("hardpps: PPSJITTER: bad pulse\n");
                 return;
         }
@@ -957,7 +957,7 @@ void hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
 
         hardpps_update_phase(pts_norm.nsec);
 
-        spin_unlock_irqrestore(&ntp_lock, flags);
+        raw_spin_unlock_irqrestore(&ntp_lock, flags);
 }
 EXPORT_SYMBOL(hardpps);
 
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 27689422aa92..4a944676358e 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -113,9 +113,9 @@ static int get_softlockup_thresh(void)
  * resolution, and we don't need to waste time with a big divide when
  * 2^30ns == 1.074s.
  */
-static unsigned long get_timestamp(int this_cpu)
+static unsigned long get_timestamp(void)
 {
-        return cpu_clock(this_cpu) >> 30LL;  /* 2^30 ~= 10^9 */
+        return local_clock() >> 30LL;  /* 2^30 ~= 10^9 */
 }
 
 static void set_sample_period(void)
@@ -133,9 +133,7 @@ static void set_sample_period(void)
 /* Commands for resetting the watchdog */
 static void __touch_watchdog(void)
 {
-        int this_cpu = smp_processor_id();
-
-        __this_cpu_write(watchdog_touch_ts, get_timestamp(this_cpu));
+        __this_cpu_write(watchdog_touch_ts, get_timestamp());
 }
 
 void touch_softlockup_watchdog(void)
@@ -196,7 +194,7 @@ static int is_hardlockup(void)
 
 static int is_softlockup(unsigned long touch_ts)
 {
-        unsigned long now = get_timestamp(smp_processor_id());
+        unsigned long now = get_timestamp();
 
         /* Warn about unreasonable delays: */
         if (time_after(now, touch_ts + get_softlockup_thresh()))
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 7aae0f2a5e0a..c3eb261a7df3 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -47,10 +47,10 @@ __setup("debug_locks_verbose=", setup_debug_locks_verbose);
  * Normal standalone locks, for the circular and irq-context
  * dependency tests:
  */
-static DEFINE_SPINLOCK(lock_A);
-static DEFINE_SPINLOCK(lock_B);
-static DEFINE_SPINLOCK(lock_C);
-static DEFINE_SPINLOCK(lock_D);
+static DEFINE_RAW_SPINLOCK(lock_A);
+static DEFINE_RAW_SPINLOCK(lock_B);
+static DEFINE_RAW_SPINLOCK(lock_C);
+static DEFINE_RAW_SPINLOCK(lock_D);
 
 static DEFINE_RWLOCK(rwlock_A);
 static DEFINE_RWLOCK(rwlock_B);
@@ -73,12 +73,12 @@ static DECLARE_RWSEM(rwsem_D);
  * but X* and Y* are different classes. We do this so that
  * we do not trigger a real lockup:
  */
-static DEFINE_SPINLOCK(lock_X1);
-static DEFINE_SPINLOCK(lock_X2);
-static DEFINE_SPINLOCK(lock_Y1);
-static DEFINE_SPINLOCK(lock_Y2);
-static DEFINE_SPINLOCK(lock_Z1);
-static DEFINE_SPINLOCK(lock_Z2);
+static DEFINE_RAW_SPINLOCK(lock_X1);
+static DEFINE_RAW_SPINLOCK(lock_X2);
+static DEFINE_RAW_SPINLOCK(lock_Y1);
+static DEFINE_RAW_SPINLOCK(lock_Y2);
+static DEFINE_RAW_SPINLOCK(lock_Z1);
+static DEFINE_RAW_SPINLOCK(lock_Z2);
 
 static DEFINE_RWLOCK(rwlock_X1);
 static DEFINE_RWLOCK(rwlock_X2);
@@ -107,10 +107,10 @@ static DECLARE_RWSEM(rwsem_Z2);
  */
 #define INIT_CLASS_FUNC(class)                          \
 static noinline void                                    \
-init_class_##class(spinlock_t *lock, rwlock_t *rwlock, struct mutex *mutex, \
-                 struct rw_semaphore *rwsem)            \
+init_class_##class(raw_spinlock_t *lock, rwlock_t *rwlock, \
+        struct mutex *mutex, struct rw_semaphore *rwsem)\
 {                                                       \
-        spin_lock_init(lock);                           \
+        raw_spin_lock_init(lock);                       \
         rwlock_init(rwlock);                            \
         mutex_init(mutex);                              \
         init_rwsem(rwsem);                              \
@@ -168,10 +168,10 @@ static void init_shared_classes(void)
  * Shortcuts for lock/unlock API variants, to keep
  * the testcases compact:
  */
-#define L(x)                    spin_lock(&lock_##x)
-#define U(x)                    spin_unlock(&lock_##x)
+#define L(x)                    raw_spin_lock(&lock_##x)
+#define U(x)                    raw_spin_unlock(&lock_##x)
 #define LU(x)                   L(x); U(x)
-#define SI(x)                   spin_lock_init(&lock_##x)
+#define SI(x)                   raw_spin_lock_init(&lock_##x)
 
 #define WL(x)                   write_lock(&rwlock_##x)
 #define WU(x)                   write_unlock(&rwlock_##x)
@@ -911,7 +911,7 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)
 
 #define I2(x)                                   \
         do {                                    \
-                spin_lock_init(&lock_##x);      \
+                raw_spin_lock_init(&lock_##x);  \
                 rwlock_init(&rwlock_##x);       \
                 mutex_init(&mutex_##x);         \
                 init_rwsem(&rwsem_##x);         \
diff --git a/lib/rwsem-spinlock.c b/lib/rwsem-spinlock.c
index 7e0d6a58fc83..7542afbb22b3 100644
--- a/lib/rwsem-spinlock.c
+++ b/lib/rwsem-spinlock.c
@@ -73,20 +73,13 @@ __rwsem_do_wake(struct rw_semaphore *sem, int wakewrite)
                 goto dont_wake_writers;
         }
 
-        /* if we are allowed to wake writers try to grant a single write lock
-         * if there's a writer at the front of the queue
-         * - we leave the 'waiting count' incremented to signify potential
-         *   contention
+        /*
+         * as we support write lock stealing, we can't set sem->activity
+         * to -1 here to indicate we get the lock. Instead, we wake it up
+         * to let it go get it again.
          */
         if (waiter->flags & RWSEM_WAITING_FOR_WRITE) {
-                sem->activity = -1;
-                list_del(&waiter->list);
-                tsk = waiter->task;
-                /* Don't touch waiter after ->task has been NULLed */
-                smp_mb();
-                waiter->task = NULL;
-                wake_up_process(tsk);
-                put_task_struct(tsk);
+                wake_up_process(waiter->task);
                 goto out;
         }
 
@@ -121,18 +114,10 @@ static inline struct rw_semaphore *
 __rwsem_wake_one_writer(struct rw_semaphore *sem)
 {
         struct rwsem_waiter *waiter;
-        struct task_struct *tsk;
-
-        sem->activity = -1;
 
         waiter = list_entry(sem->wait_list.next, struct rwsem_waiter, list);
-        list_del(&waiter->list);
+        wake_up_process(waiter->task);
 
-        tsk = waiter->task;
-        smp_mb();
-        waiter->task = NULL;
-        wake_up_process(tsk);
-        put_task_struct(tsk);
         return sem;
 }
 
@@ -204,7 +189,6 @@ int __down_read_trylock(struct rw_semaphore *sem)
 
 /*
  * get a write lock on the semaphore
- * - we increment the waiting count anyway to indicate an exclusive lock
  */
 void __sched __down_write_nested(struct rw_semaphore *sem, int subclass)
 {
@@ -214,37 +198,32 @@ void __sched __down_write_nested(struct rw_semaphore *sem, int subclass)
 
         raw_spin_lock_irqsave(&sem->wait_lock, flags);
 
-        if (sem->activity == 0 && list_empty(&sem->wait_list)) {
-                /* granted */
-                sem->activity = -1;
-                raw_spin_unlock_irqrestore(&sem->wait_lock, flags);
-                goto out;
-        }
-
-        tsk = current;
-        set_task_state(tsk, TASK_UNINTERRUPTIBLE);
-
         /* set up my own style of waitqueue */
+        tsk = current;
         waiter.task = tsk;
         waiter.flags = RWSEM_WAITING_FOR_WRITE;
-        get_task_struct(tsk);
-
         list_add_tail(&waiter.list, &sem->wait_list);
 
-        /* we don't need to touch the semaphore struct anymore */
-        raw_spin_unlock_irqrestore(&sem->wait_lock, flags);
-
-        /* wait to be given the lock */
+        /* wait for someone to release the lock */
         for (;;) {
-                if (!waiter.task)
+                /*
+                 * That is the key to support write lock stealing: allows the
+                 * task already on CPU to get the lock soon rather than put
+                 * itself into sleep and waiting for system woke it or someone
+                 * else in the head of the wait list up.
+                 */
+                if (sem->activity == 0)
                         break;
-                schedule();
                 set_task_state(tsk, TASK_UNINTERRUPTIBLE);
+                raw_spin_unlock_irqrestore(&sem->wait_lock, flags);
+                schedule();
+                raw_spin_lock_irqsave(&sem->wait_lock, flags);
         }
+        /* got the lock */
+        sem->activity = -1;
+        list_del(&waiter.list);
 
-        tsk->state = TASK_RUNNING;
- out:
-        ;
+        raw_spin_unlock_irqrestore(&sem->wait_lock, flags);
 }
 
 void __sched __down_write(struct rw_semaphore *sem)
@@ -262,8 +241,8 @@ int __down_write_trylock(struct rw_semaphore *sem)
 
         raw_spin_lock_irqsave(&sem->wait_lock, flags);
 
-        if (sem->activity == 0 && list_empty(&sem->wait_list)) {
-                /* granted */
+        if (sem->activity == 0) {
+                /* got the lock */
                 sem->activity = -1;
                 ret = 1;
         }
diff --git a/lib/rwsem.c b/lib/rwsem.c
index 8337e1b9bb8d..ad5e0df16ab4 100644
--- a/lib/rwsem.c
+++ b/lib/rwsem.c
@@ -2,6 +2,8 @@
  *
  * Written by David Howells (dhowells@redhat.com).
  * Derived from arch/i386/kernel/semaphore.c
+ *
+ * Writer lock-stealing by Alex Shi <alex.shi@intel.com>
  */
 #include <linux/rwsem.h>
 #include <linux/sched.h>
@@ -60,7 +62,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, int wake_type)
         struct rwsem_waiter *waiter;
         struct task_struct *tsk;
         struct list_head *next;
-        signed long oldcount, woken, loop, adjustment;
+        signed long woken, loop, adjustment;
 
         waiter = list_entry(sem->wait_list.next, struct rwsem_waiter, list);
         if (!(waiter->flags & RWSEM_WAITING_FOR_WRITE))
@@ -72,30 +74,8 @@ __rwsem_do_wake(struct rw_semaphore *sem, int wake_type)
                  */
                 goto out;
 
-        /* There's a writer at the front of the queue - try to grant it the
-         * write lock.  However, we only wake this writer if we can transition
-         * the active part of the count from 0 -> 1
-         */
-        adjustment = RWSEM_ACTIVE_WRITE_BIAS;
-        if (waiter->list.next == &sem->wait_list)
-                adjustment -= RWSEM_WAITING_BIAS;
-
- try_again_write:
-        oldcount = rwsem_atomic_update(adjustment, sem) - adjustment;
-        if (oldcount & RWSEM_ACTIVE_MASK)
-                /* Someone grabbed the sem already */
-                goto undo_write;
-
-        /* We must be careful not to touch 'waiter' after we set ->task = NULL.
-         * It is an allocated on the waiter's stack and may become invalid at
-         * any time after that point (due to a wakeup from another source).
-         */
-        list_del(&waiter->list);
-        tsk = waiter->task;
-        smp_mb();
-        waiter->task = NULL;
-        wake_up_process(tsk);
-        put_task_struct(tsk);
+        /* Wake up the writing waiter and let the task grab the sem: */
+        wake_up_process(waiter->task);
         goto out;
 
  readers_only:
@@ -157,12 +137,40 @@ __rwsem_do_wake(struct rw_semaphore *sem, int wake_type)
 
  out:
         return sem;
+}
+
+/* Try to get write sem, caller holds sem->wait_lock: */
+static int try_get_writer_sem(struct rw_semaphore *sem,
+                                        struct rwsem_waiter *waiter)
+{
+        struct rwsem_waiter *fwaiter;
+        long oldcount, adjustment;
 
-        /* undo the change to the active count, but check for a transition
-         * 1->0 */
- undo_write:
+        /* only steal when first waiter is writing */
+        fwaiter = list_entry(sem->wait_list.next, struct rwsem_waiter, list);
+        if (!(fwaiter->flags & RWSEM_WAITING_FOR_WRITE))
+                return 0;
+
+        adjustment = RWSEM_ACTIVE_WRITE_BIAS;
+        /* Only one waiter in the queue: */
+        if (fwaiter == waiter && waiter->list.next == &sem->wait_list)
+                adjustment -= RWSEM_WAITING_BIAS;
+
+try_again_write:
+        oldcount = rwsem_atomic_update(adjustment, sem) - adjustment;
+        if (!(oldcount & RWSEM_ACTIVE_MASK)) {
+                /* No active lock: */
+                struct task_struct *tsk = waiter->task;
+
+                list_del(&waiter->list);
+                smp_mb();
+                put_task_struct(tsk);
+                tsk->state = TASK_RUNNING;
+                return 1;
+        }
+        /* some one grabbed the sem already */
         if (rwsem_atomic_update(-adjustment, sem) & RWSEM_ACTIVE_MASK)
-                goto out;
+                return 0;
         goto try_again_write;
 }
 
@@ -210,6 +218,15 @@ rwsem_down_failed_common(struct rw_semaphore *sem,
         for (;;) {
                 if (!waiter.task)
                         break;
+
+                raw_spin_lock_irq(&sem->wait_lock);
+                /* Try to get the writer sem, may steal from the head writer: */
+                if (flags == RWSEM_WAITING_FOR_WRITE)
+                        if (try_get_writer_sem(sem, &waiter)) {
+                                raw_spin_unlock_irq(&sem->wait_lock);
+                                return sem;
+                        }
+                raw_spin_unlock_irq(&sem->wait_lock);
                 schedule();
                 set_task_state(tsk, TASK_UNINTERRUPTIBLE);
         }
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 9997c039bb24..2a847ca494b5 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -14,8 +14,8 @@
 
 #include <sound/soc.h>
 
-#include <sysdev/bestcomm/bestcomm.h>
-#include <sysdev/bestcomm/gen_bd.h>
+#include <linux/fsl/bestcomm/bestcomm.h>
+#include <linux/fsl/bestcomm/gen_bd.h>
 #include <asm/mpc52xx_psc.h>
 
 #include "mpc5200_dma.h"