Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

* master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: (116 commits)
  [POWERPC] Add export of vgacon_remap_base
  [POWERPC] Remove bogus comment about page_is_ram
  [POWERPC] windfarm: don't die on suspend thread signal
  [POWERPC] Fix comment in kernel/irq.c
  [POWERPC] ppc: Fix booke watchdog initialization
  [POWERPC] PPC: Use ARRAY_SIZE macro when appropriate
  [POWERPC] Use ARRAY_SIZE macro when appropriate
  [POWERPC] Fix ppc64's writing to struct file_operations
  [POWERPC] ppc: use syslog macro for the printk log level
  [POWERPC] ppc: cs4218_tdm remove extra brace
  [POWERPC] Add mpc52xx/lite5200 PCI support
  [POWERPC] Only use H_BULK_REMOVE if the firmware supports it
  [POWERPC] Fixup error handling when emulating a floating point instruction
  [POWERPC] Enable interrupts if we are doing fp math emulation
  [POWERPC] Added kprobes support to ppc32
  [POWERPC] Make pSeries use the H_BULK_REMOVE hypervisor call
  [POWERPC] Clear RI bit in MSR before restoring r13 when returning to userspace
  [POWERPC] Fix performance monitor exception
  [POWERPC] Compile fixes for arch/powerpc dcr code
  [POWERPC] Maple: use mmio nvram
  ...

1 files changed, 44 insertions, 5 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c1e01b22addc..f08e80a0bf0a 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -173,6 +173,11 @@ config PPC_86xx
         help
           The Freescale E600 SoCs have 74xx cores.
 
+config PPC_8xx
+        bool "Freescale 8xx"
+        select FSL_SOC
+        select 8xx
+
 config 40x
         bool "AMCC 40x"
         select PPC_DCR_NATIVE
@@ -181,8 +186,6 @@ config 44x
         bool "AMCC 44x"
         select PPC_DCR_NATIVE
 
-config 8xx
-        bool "Freescale 8xx"
 
 config E200
         bool "Freescale e200"
@@ -211,6 +214,10 @@ config 6xx
         bool
 
 # this is temp to handle compat with arch=ppc
+config 8xx
+        bool
+
+# this is temp to handle compat with arch=ppc
 config 83xx
         bool
 
@@ -429,6 +436,21 @@ config PPC_MPC52xx
         bool
         default n
 
+config PPC_MPC5200
+        bool
+        select PPC_MPC52xx
+        default n
+
+config PPC_MPC5200_BUGFIX
+        bool "MPC5200 (L25R) bugfix support"
+        depends on PPC_MPC5200
+        default n
+        help
+          Enable workarounds for original MPC5200 errata.  This is not required
+          for MPC5200B based boards.
+
+          It is safe to say 'Y' here
+
 config PPC_EFIKA
         bool "bPlan Efika 5k2. MPC5200B based computer"
         depends on PPC_MULTIPLATFORM && PPC32
@@ -441,7 +463,7 @@ config PPC_EFIKA
 config PPC_LITE5200
         bool "Freescale Lite5200 Eval Board"
         depends on PPC_MULTIPLATFORM && PPC32
-        select PPC_MPC52xx
+        select PPC_MPC5200
         default n
 
 config PPC_PMAC
@@ -484,6 +506,7 @@ config PPC_MAPLE
         select PPC_970_NAP
         select PPC_NATIVE
         select PPC_RTAS
+        select MMIO_NVRAM
         select ATA_NONSTANDARD if ATA
         default n
         help
@@ -541,6 +564,16 @@ config PPC_PS3
           enabling this will not result in a bootable kernel on a
           PS3 system.
 
+config PPC_CELLEB
+        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
+        depends on PPC_MULTIPLATFORM && PPC64
+        select PPC_CELL
+        select PPC_OF_PLATFORM_PCI
+        select HAS_TXX9_SERIAL
+        select PPC_UDBG_BEAT
+        select USB_OHCI_BIG_ENDIAN_MMIO
+        select USB_EHCI_BIG_ENDIAN_MMIO
+
 config PPC_NATIVE
         bool
         depends on PPC_MULTIPLATFORM
@@ -554,6 +587,11 @@ config UDBG_RTAS_CONSOLE
         depends on PPC_RTAS
         default n
 
+config PPC_UDBG_BEAT
+        bool "BEAT based debug console"
+        depends on PPC_CELLEB
+        default n
+
 config XICS
         depends on PPC_PSERIES
         bool
@@ -707,6 +745,7 @@ source arch/powerpc/platforms/86xx/Kconfig
 source arch/powerpc/platforms/8xx/Kconfig
 source arch/powerpc/platforms/cell/Kconfig
 source arch/powerpc/platforms/ps3/Kconfig
+source arch/powerpc/platforms/pasemi/Kconfig
 
 menu "Kernel options"
 
@@ -729,7 +768,7 @@ config FORCE_MAX_ZONEORDER
 
 config MATH_EMULATION
         bool "Math emulation"
-        depends on 4xx || 8xx || E200 || PPC_83xx || E500
+        depends on 4xx || 8xx || E200 || PPC_MPC832x || E500
         ---help---
           Some PowerPC chips designed for embedded applications do not have
           a floating-point unit and therefore do not implement the
@@ -1187,7 +1226,7 @@ source "arch/powerpc/oprofile/Kconfig"
 
 config KPROBES
         bool "Kprobes (EXPERIMENTAL)"
-        depends on PPC64 && KALLSYMS && EXPERIMENTAL && MODULES
+        depends on !BOOKE && !4xx && KALLSYMS && EXPERIMENTAL && MODULES
         help
           Kprobes allows you to trap at almost any kernel address and
           execute a callback function.  register_kprobe() establishes