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

Pull x86 microcode loading update from Ingo Molnar:
 "Two main changes that improve microcode loading on AMD CPUs:

   - Add support for all-in-one binary microcode files that concatenate
     the microcode images of multiple processor families, by Jacob Shin

   - Add early microcode loading (embedded in the initrd) support, also
     by Jacob Shin"

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, microcode, amd: Another early loading fixup
  x86, microcode, amd: Allow multiple families' bin files appended together
  x86, microcode, amd: Make find_ucode_in_initrd() __init
  x86, microcode, amd: Fix warnings and errors on with CONFIG_MICROCODE=m
  x86, microcode, amd: Early microcode patch loading support for AMD
  x86, microcode, amd: Refactor functions to prepare for early loading
  x86, microcode: Vendor abstract out save_microcode_in_initrd()
  x86, microcode, intel: Correct typo in printk

diff --combined arch/x86/Kconfig
index c49b4dc8ffe03ad37b93e716d59c63161453460c,2705532662975f5363fb42b0b11f5395b1fb1596..34d1db1e7f4026aab0dfebb370bd37d50af9a0d4
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -1058,8 -1058,16 +1058,16 @@@ config MICROCODE_INTEL_LI
        depends on MICROCODE_INTEL
  
  config MICROCODE_INTEL_EARLY
+       def_bool n
+ 
+ config MICROCODE_AMD_EARLY
+       def_bool n
+ 
+ config MICROCODE_EARLY
        bool "Early load microcode"
-       depends on MICROCODE_INTEL && BLK_DEV_INITRD
+       depends on MICROCODE=y && BLK_DEV_INITRD
+       select MICROCODE_INTEL_EARLY if MICROCODE_INTEL
+       select MICROCODE_AMD_EARLY if MICROCODE_AMD
        default y
        help
          This option provides functionality to read additional microcode data
@@@ -1067,10 -1075,6 +1075,6 @@@
          microcode to CPU's as early as possible. No functional change if no
          microcode data is glued to the initrd, therefore it's safe to say Y.
  
- config MICROCODE_EARLY
-       def_bool y
-       depends on MICROCODE_INTEL_EARLY
- 
  config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        ---help---
@@@ -1725,7 -1729,7 +1729,7 @@@ config PHYSICAL_ALIG
  
  config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
 -      depends on SMP && HOTPLUG
 +      depends on SMP
        ---help---
          Say Y here to allow turning CPUs off and on. CPUs can be
          controlled through /sys/devices/system/cpu.
@@@ -2265,7 -2269,6 +2269,7 @@@ source "fs/Kconfig.binfmt
  config IA32_EMULATION
        bool "IA32 Emulation"
        depends on X86_64
 +      select BINFMT_ELF
        select COMPAT_BINFMT_ELF
        select HAVE_UID16
        ---help---

diff --combined arch/x86/kernel/Makefile
index 4ce822ed58f5f528059012c956d5b855d6cd5c6c,6c3fceaf8ff3971629e30a418d297726efb42ec1..612ed3435c0d90364d17fc2ba8a0ebdcc912ddf2
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -67,7 -67,7 +67,7 @@@ obj-$(CONFIG_KEXEC)           += relocate_kernel
  obj-$(CONFIG_CRASH_DUMP)      += crash_dump_$(BITS).o
  obj-y                         += kprobes/
  obj-$(CONFIG_MODULES)         += module.o
 -obj-$(CONFIG_DOUBLEFAULT)     += doublefault_32.o
 +obj-$(CONFIG_DOUBLEFAULT)     += doublefault.o
  obj-$(CONFIG_KGDB)            += kgdb.o
  obj-$(CONFIG_VM86)            += vm86_32.o
  obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
@@@ -93,6 -93,7 +93,7 @@@ obj-$(CONFIG_MICROCODE_INTEL_LIB)     += mi
  microcode-y                           := microcode_core.o
  microcode-$(CONFIG_MICROCODE_INTEL)   += microcode_intel.o
  microcode-$(CONFIG_MICROCODE_AMD)     += microcode_amd.o
+ obj-$(CONFIG_MICROCODE_AMD_EARLY)     += microcode_amd_early.o
  obj-$(CONFIG_MICROCODE)                       += microcode.o
  
  obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o