Merge tag 'amd_ucode_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/microcode

Pull x86 microcode loader updates from Borislav Petkov:

 - AMD microcode early loading fixes
 - Some microcode loader source files reorganization

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

1 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/kernel/cpu/microcode/Makefile b/arch/x86/kernel/cpu/microcode/Makefile
new file mode 100644
index 000000000000..285c85427c32
--- /dev/null
+++ b/arch/x86/kernel/cpu/microcode/Makefile
@@ -0,0 +1,7 @@
+microcode-y                             := core.o
+obj-$(CONFIG_MICROCODE)                 += microcode.o
+microcode-$(CONFIG_MICROCODE_INTEL)     += intel.o intel_lib.o
+microcode-$(CONFIG_MICROCODE_AMD)       += amd.o
+obj-$(CONFIG_MICROCODE_EARLY)           += core_early.o
+obj-$(CONFIG_MICROCODE_INTEL_EARLY)     += intel_early.o
+obj-$(CONFIG_MICROCODE_AMD_EARLY)       += amd_early.o