• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 83c7f722
    Linus Torvalds authored
    Pull powerpc updates from Benjamin Herrenschmidt:
     "Notable highlights:
    
       - iommu improvements from Anton removing the per-iommu global lock in
         favor of dividing the DMA space into pools, each with its own lock,
         and hashed on the CPU number.  Along with making the locking more
         fine grained, this gives significant improvements in multiqueue
         networking scalability.
    
       - Still from Anton, we know provide a vdso based variant of getcpu
         which makes sched_getcpu with the appropriate glibc patch something
         like 18 times faster.
    
       - More anton goodness (he's been busy !) in other areas such as a
         faster __clear_user and copy_page on P7, various perf fixes to
         improve sampling quality, etc...
    
       - One more step toward removing legacy i2c interfaces by using new
         device-tree based probing of platform devices for the AOA audio
         drivers
    
       - A nice series of patches from Michael Neuling that helps avoiding
         confusion between register numbers and litterals in assembly code,
         trying to enforce the use of "%rN" register names in gas rather
         than plain numbers.
    
       - A pile of FSL updates
    
       - The usual bunch of small fixes, cleanups etc...
    
      You may spot a change to drivers/char/mem.  The patch got no comment
      or ack from outside, it's a trivial patch to allow the architecture to
      skip creating /dev/port, which we use to disable it on ppc64 that
      don't have a legacy brige.  On those, IO ports 0...64K are not mapped
      in kernel space at all, so accesses to /dev/port cause oopses (and
      yes, distros -still- ship userspace that bangs hard coded ports such
      as kbdrate)."
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
      powerpc/mpic: Create a revmap with enough entries for IPIs and timers
      Remove stale .rej file
      powerpc/iommu: Fix iommu pool initialization
      powerpc/eeh: Check handle_eeh_events() return value
      powerpc/85xx: Add phy nodes in SGMII mode for MPC8536/44/72DS & P2020DS
      powerpc/e500: add paravirt QEMU platform
      powerpc/mpc85xx_ds: convert to unified PCI init
      powerpc/fsl-pci: get PCI init out of board files
      powerpc/85xx: Update corenet64_smp_defconfig
      powerpc/85xx: Update corenet32_smp_defconfig
      powerpc/85xx: Rename P1021RDB-PC device trees to be consistent
      powerpc/watchdog: move booke watchdog param related code to setup-common.c
      sound/aoa: Adapt to new i2c probing scheme
      i2c/powermac: Improve detection of devices from device-tree
      powerpc: Disable /dev/port interface on systems without an ISA bridge
      of: Improve prom_update_property() function
      powerpc: Add "memory" attribute for mfmsr()
      powerpc/ftrace: Fix assembly trampoline register usage
      powerpc/hw_breakpoints: Fix incorrect pointer access
      powerpc: Put the gpr save/restore functions in their own section
      ...
    83c7f722
base.c 33.6 KB