Merge tag 'v3.12' into core/locking to pick up mutex upates

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/x86/Kconfig
index a92572de2ac119e0156c6fe46e7d1ec81491606d,f67e839f06c845e406d81c8b2be285ced8b57448..e22d7f5f9837f7288d393a9af4a412afa35d49ff
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -638,10 -638,10 +638,10 @@@ config PARAVIRT_SPINLOCK
          spinlock implementation with something virtualization-friendly
          (for example, block the virtual CPU rather than spinning).
  
 -        Unfortunately the downside is an up to 5% performance hit on
 -        native kernels, with various workloads.
 +        It has a minimal impact on native kernels and gives a nice performance
 +        benefit on paravirtualized KVM / Xen kernels.
  
 -        If you are unsure how to answer this question, answer N.
 +        If you are unsure how to answer this question, answer Y.
  
  source "arch/x86/xen/Kconfig"
  
@@@ -860,7 -860,7 +860,7 @@@ source "kernel/Kconfig.preempt
  
  config X86_UP_APIC
        bool "Local APIC support on uniprocessors"
-       depends on X86_32 && !SMP && !X86_32_NON_STANDARD
+       depends on X86_32 && !SMP && !X86_32_NON_STANDARD && !PCI_MSI
        ---help---
          A local APIC (Advanced Programmable Interrupt Controller) is an
          integrated interrupt controller in the CPU. If you have a single-CPU
@@@ -885,11 -885,11 +885,11 @@@ config X86_UP_IOAPI
  
  config X86_LOCAL_APIC
        def_bool y
-       depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
+       depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI
  
  config X86_IO_APIC
        def_bool y
-       depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC
+       depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI
  
  config X86_VISWS_APIC
        def_bool y
@@@ -1033,6 -1033,7 +1033,7 @@@ config X86_REBOOTFIXUP
  
  config MICROCODE
        tristate "CPU microcode loading support"
+       depends on CPU_SUP_AMD || CPU_SUP_INTEL
        select FW_LOADER
        ---help---