Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull more locking changes from Ingo Molnar:
 "This is the second round of locking tree updates for v3.16, offering
  large system scalability improvements:

 - optimistic spinning for rwsems, from Davidlohr Bueso.

 - 'qrwlocks' core code and x86 enablement, from Waiman Long and PeterZ"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, locking/rwlocks: Enable qrwlocks on x86
  locking/rwlocks: Introduce 'qrwlocks' - fair, queued rwlocks
  locking/mutexes: Documentation update/rewrite
  locking/rwsem: Fix checkpatch.pl warnings
  locking/rwsem: Fix warnings for CONFIG_RWSEM_GENERIC_SPINLOCK
  locking/rwsem: Support optimistic spinning

diff --combined arch/x86/Kconfig
index b660088c220d6c8996c348b2b6578314bc3878ea,bf7626fcd363fbe53ef233dd7958e411359b2866..fcefdda5136dde37c2a8893519912286f6551cf5
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -26,7 -26,7 +26,7 @@@ config X8
        select ARCH_MIGHT_HAVE_PC_SERIO
        select HAVE_AOUT if X86_32
        select HAVE_UNSTABLE_SCHED_CLOCK
 -      select ARCH_SUPPORTS_NUMA_BALANCING
 +      select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
        select ARCH_SUPPORTS_INT128 if X86_64
        select ARCH_WANTS_PROT_NUMA_PROT_NONE
        select HAVE_IDE
@@@ -41,7 -41,7 +41,7 @@@
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_FRAME_POINTERS
        select HAVE_DMA_ATTRS
 -      select HAVE_DMA_CONTIGUOUS if !SWIOTLB
 +      select HAVE_DMA_CONTIGUOUS
        select HAVE_KRETPROBES
        select GENERIC_EARLY_IOREMAP
        select HAVE_OPTPROBES
@@@ -105,7 -105,7 +105,7 @@@
        select HAVE_ARCH_SECCOMP_FILTER
        select BUILDTIME_EXTABLE_SORT
        select GENERIC_CMOS_UPDATE
 -      select HAVE_ARCH_SOFT_DIRTY
 +      select HAVE_ARCH_SOFT_DIRTY if X86_64
        select CLOCKSOURCE_WATCHDOG
        select GENERIC_CLOCKEVENTS
        select ARCH_CLOCKSOURCE_DATA
@@@ -121,6 -121,7 +121,7 @@@
        select MODULES_USE_ELF_RELA if X86_64
        select CLONE_BACKWARDS if X86_32
        select ARCH_USE_BUILTIN_BSWAP
+       select ARCH_USE_QUEUE_RWLOCK
        select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
        select OLD_SIGACTION if X86_32
        select COMPAT_OLD_SIGACTION if IA32_EMULATION
@@@ -261,9 -262,6 +262,9 @@@ config ARCH_HWEIGHT_CFLAG
  config ARCH_SUPPORTS_UPROBES
        def_bool y
  
 +config FIX_EARLYCON_MEM
 +      def_bool y
 +
  source "init/Kconfig"
  source "kernel/Kconfig.freezer"
  
@@@ -418,6 -416,7 +419,6 @@@ config X86_U
  
  config X86_GOLDFISH
         bool "Goldfish (Virtual Platform)"
 -       depends on X86_32
         depends on X86_EXTENDED_PLATFORM
         ---help---
         Enable support for the Goldfish virtual platform used primarily
@@@ -833,7 -832,6 +834,7 @@@ config X86_LOCAL_API
  config X86_IO_APIC
        def_bool y
        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI
 +      select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
  
  config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
        bool "Reroute for broken boot IRQs"
@@@ -912,27 -910,10 +913,27 @@@ config VM8
        default y
        depends on X86_32
        ---help---
 -        This option is required by programs like DOSEMU to run 16-bit legacy
 -        code on X86 processors. It also may be needed by software like
 -        XFree86 to initialize some video cards via BIOS. Disabling this
 -        option saves about 6k.
 +        This option is required by programs like DOSEMU to run
 +        16-bit real mode legacy code on x86 processors. It also may
 +        be needed by software like XFree86 to initialize some video
 +        cards via BIOS. Disabling this option saves about 6K.
 +
 +config X86_16BIT
 +      bool "Enable support for 16-bit segments" if EXPERT
 +      default y
 +      ---help---
 +        This option is required by programs like Wine to run 16-bit
 +        protected mode legacy code on x86 processors.  Disabling
 +        this option saves about 300 bytes on i386, or around 6K text
 +        plus 16K runtime memory on x86-64,
 +
 +config X86_ESPFIX32
 +      def_bool y
 +      depends on X86_16BIT && X86_32
 +
 +config X86_ESPFIX64
 +      def_bool y
 +      depends on X86_16BIT && X86_64
  
  config TOSHIBA
        tristate "Toshiba Laptop support"
@@@ -1891,10 -1872,6 +1892,10 @@@ config ARCH_ENABLE_SPLIT_PMD_PTLOC
        def_bool y
        depends on X86_64 || X86_PAE
  
 +config ARCH_ENABLE_HUGEPAGE_MIGRATION
 +      def_bool y
 +      depends on X86_64 && HUGETLB_PAGE && MIGRATION
 +
  menu "Power management and ACPI options"
  
  config ARCH_HIBERNATION_HEADER
@@@ -2399,9 -2376,12 +2400,9 @@@ config X86_DMA_REMA
        depends on STA2X11
  
  config IOSF_MBI
 -      bool
 +      tristate
 +      default m
        depends on PCI
 -      ---help---
 -        To be selected by modules requiring access to the Intel OnChip System
 -        Fabric (IOSF) Sideband MailBox Interface (MBI). For MBI platforms
 -        enumerable by PCI.
  
  source "net/Kconfig"