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
  ...

diff --combined arch/powerpc/Kconfig
index c1e01b22addc8182193a12dca7a1fd3700ec0888,abc6bd2f858e37077dac5f5cf3a4ced91e1d6fd3..f08e80a0bf0addaf3a33d95f30238a6064f4a53e
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -173,6 -173,11 +173,11 @@@ config PPC_86x
        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 +186,6 @@@ config 44
        bool "AMCC 44x"
        select PPC_DCR_NATIVE
  
- config 8xx
-       bool "Freescale 8xx"
  
  config E200
        bool "Freescale e200"
@@@ -210,6 -213,10 +213,10 @@@ config POWER
  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 +436,21 @@@ config PPC_MPC52x
        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 +463,7 @@@
  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 +506,7 @@@ config PPC_MAPL
        select PPC_970_NAP
        select PPC_NATIVE
        select PPC_RTAS
+       select MMIO_NVRAM
        select ATA_NONSTANDARD if ATA
        default n
        help
@@@ -529,11 -552,6 +552,11 @@@ config PPC_PS
        bool "Sony PS3 (incomplete)"
        depends on PPC_MULTIPLATFORM && PPC64
        select PPC_CELL
 +      select USB_ARCH_HAS_OHCI
 +      select USB_OHCI_LITTLE_ENDIAN
 +      select USB_OHCI_BIG_ENDIAN_MMIO
 +      select USB_ARCH_HAS_EHCI
 +      select USB_EHCI_BIG_ENDIAN_MMIO
        help
          This option enables support for the Sony PS3 game console
          and other platforms using the PS3 hypervisor.
@@@ -541,6 -559,16 +564,16 @@@
          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 -582,11 +587,11 @@@ config UDBG_RTAS_CONSOL
        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 -740,7 +745,7 @@@ source arch/powerpc/platforms/86xx/Kcon
  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 -763,7 +768,7 @@@ config FORCE_MAX_ZONEORDE
  
  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 -1221,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

diff --combined arch/powerpc/kernel/pci_64.c
index 2b52b087aaa8cd49dccc18146987029739bd24ff,6828df4afd999600d66467168eb6eb42daf3bf28..7e97d71a5f8fa17f08d04e01b623bca7534c1044
--- 1/arch/powerpc/kernel/pci_64.c
--- 2/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@@ -381,6 -381,8 +381,6 @@@ struct pci_dev *of_create_pci_dev(struc
  
        pci_device_add(dev, bus);
  
 -      /* XXX pci_scan_msi_device(dev); */
 -
        return dev;
  }
  EXPORT_SYMBOL(of_create_pci_dev);
@@@ -1323,7 -1325,6 +1323,6 @@@ int pci_read_irq_line(struct pci_dev *p
        DBG(" -> mapped to linux irq %d\n", virq);
  
        pci_dev->irq = virq;
-       pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, virq);
  
        return 0;
  }