• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 1d508f8a
    Linus Torvalds authored
    Pull more powerpc updates from Ben Herrenschmidt:
     "Here are some more powerpc bits for 3.17, essentially fixes.
    
      The biggest series, also aimed at -stable, is from Aneesh and is the
      result of weeks and weeks of debugging to find out why the heck or THP
      implementation was occasionally triggering multi-hit errors in our
      level 1 TLB.  It ended up being a combination of issues including
      subtleties as to how we should invalidate those special 'MPSS' pages
      we use to allow the use of 16M pages inside 4K/64K "base page size"
      segments (you really have to love our MMU !)
    
      Another interesting one in the "OMG" category is the series from
      Michael adding memory barriers to spin_is_locked().  That's also the
      result of many days of debugging to figure out why the semaphore code
      would occasionally crash in ways that made no sense.  It ended up
      being some creative lock stacking that was defeated by the fact that
      our locks allow a load inside the locked section to be re-ordered with
      the load of the lock value itself (I'm still of two mind about whether
      to kill that once and for all by putting a heavier barrier back into
      our lock implementation...).  The fixes come with a long explanation
      in the cset comments, feel free to read it if you feel like having a
      headache today"
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (25 commits)
      powerpc/thp: Add tracepoints to track hugepage invalidate
      powerpc/mm: Use read barrier when creating real_pte
      powerpc/thp: Use ACCESS_ONCE when loading pmdp
      powerpc/thp: Invalidate with vpn in loop
      powerpc/thp: Handle combo pages in invalidate
      powerpc/thp: Invalidate old 64K based hash page mapping before insert of 4k pte
      powerpc/thp: Don't recompute vsid and ssize in loop on invalidate
      powerpc/thp: Add write barrier after updating the valid bit
      powerpc: reorder per-cpu NUMA information's initialization
      powerpc/perf/hv-24x7: Use kmem_cache_free
      powerpc/pseries/hvcserver: Fix endian issue in hvcs_get_partner_info
      powerpc: Hard disable interrupts in xmon
      powerpc: remove duplicate definition of TEXASR_FS
      powerpc/pseries: Avoid deadlock on removing ddw
      powerpc/pseries: Failure on removing device node
      powerpc/boot: Use correct zlib types for comparison
      powerpc/powernv: Interface to register/unregister opal dump region
      printk: Add function to return log buffer address and size
      powerpc: Add POWER8 features to CPU_FTRS_POSSIBLE/ALWAYS
      powerpc/ppc476: Disable BTAC
      ...
    1d508f8a
hotplug-memory.c 6.21 KB