Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc update from Benjamin Herrenschmidt:
 "The main highlights this time around are:

   - A pile of addition POWER8 bits and nits, such as updated
     performance counter support (Michael Ellerman), new branch history
     buffer support (Anshuman Khandual), base support for the new PCI
     host bridge when not using the hypervisor (Gavin Shan) and other
     random related bits and fixes from various contributors.

   - Some rework of our page table format by Aneesh Kumar which fixes a
     thing or two and paves the way for THP support.  THP itself will
     not make it this time around however.

   - More Freescale updates, including Altivec support on the new e6500
     cores, new PCI controller support, and a pile of new boards support
     and updates.

   - The usual batch of trivial cleanups & fixes"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
  powerpc: Fix build error for book3e
  powerpc: Context switch the new EBB SPRs
  powerpc: Turn on the EBB H/FSCR bits
  powerpc: Replace CPU_FTR_BCTAR with CPU_FTR_ARCH_207S
  powerpc: Setup BHRB instructions facility in HFSCR for POWER8
  powerpc: Fix interrupt range check on debug exception
  powerpc: Update tlbie/tlbiel as per ISA doc
  powerpc: Print page size info during boot
  powerpc: print both base and actual page size on hash failure
  powerpc: Fix hpte_decode to use the correct decoding for page sizes
  powerpc: Decode the pte-lp-encoding bits correctly.
  powerpc: Use encode avpn where we need only avpn values
  powerpc: Reduce PTE table memory wastage
  powerpc: Move the pte free routines from common header
  powerpc: Reduce the PTE_INDEX_SIZE
  powerpc: Switch 16GB and 16MB explicit hugepages to a different page table format
  powerpc: New hugepage directory format
  powerpc: Don't truncate pgd_index wrongly
  powerpc: Don't hard code the size of pte page
  powerpc: Save DAR and DSISR in pt_regs on MCE
  ...

1 files changed, 4 insertions, 16 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a0259edae5c9..bbbe02197afb 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -427,11 +427,6 @@ config NODES_SHIFT
         default "4"
         depends on NEED_MULTIPLE_NODES
 
-config MAX_ACTIVE_REGIONS
-        int
-        default "256" if PPC64
-        default "32"
-
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
         depends on PPC64
@@ -646,14 +641,14 @@ menu "Bus options"
 
 config ISA
         bool "Support for ISA-bus hardware"
-        depends on PPC_PREP || PPC_CHRP
+        depends on PPC_CHRP
         select PPC_I8259
         help
           Find out whether you have ISA slots on your motherboard.  ISA is the
           name of a bus system, i.e. the way the CPU talks to the other stuff
           inside your box.  If you have an Apple machine, say N here; if you
-          have an IBM RS/6000 or pSeries machine or a PReP machine, say Y.  If
-          you have an embedded board, consult your board documentation.
+          have an IBM RS/6000 or pSeries machine, say Y.  If you have an
+          embedded board, consult your board documentation.
 
 config ZONE_DMA
         bool
@@ -685,7 +680,6 @@ config SBUS
 config FSL_SOC
         bool
         select HAVE_CAN_FLEXCAN if NET && CAN
-        select PPC_CLOCK
 
 config FSL_PCI
         bool
@@ -744,7 +738,6 @@ config PCI
         bool "PCI support" if PPC_PCI_CHOICE
         default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                 && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
-        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
         select ARCH_SUPPORTS_MSI
         select GENERIC_PCI_IOMAP
@@ -774,11 +767,6 @@ config PCI_8260
         select PPC_INDIRECT_PCI
         default y
 
-config 8260_PCI9
-        bool "Enable workaround for MPC826x erratum PCI 9"
-        depends on PCI_8260 && !8272
-        default y
-
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"
@@ -968,7 +956,7 @@ config TASK_SIZE_BOOL
 
 config TASK_SIZE
         hex "Size of user task space" if TASK_SIZE_BOOL
-        default "0x80000000" if PPC_PREP || PPC_8xx
+        default "0x80000000" if PPC_8xx
         default "0xc0000000"
 
 config CONSISTENT_SIZE_BOOL