[kernel/f21] Enable early microcode loading (rhbz 1083716)

[Josh Boyer]

commit a357c223627a0fe704e38e5c4eb4aa39869cd114
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Fri Sep 26 08:54:12 2014 -0400

    Enable early microcode loading (rhbz 1083716)

 config-x86-generic |    4 +++-
 kernel.spec        |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/config-x86-generic b/config-x86-generic
index 7968fda..fb84c0a 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -10,10 +10,12 @@ CONFIG_HPET_TIMER=y
 
 CONFIG_I8K=m
 CONFIG_SONYPI_COMPAT=y
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_EARLY=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_INTEL_EARLY=y
 CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_AMD_EARLY=y
 
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
diff --git a/kernel.spec b/kernel.spec
index c7f34fe..2369384 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 300
+%global baserelease 301
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2261,6 +2261,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Sep 25 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Enable early microcode loading (rhbz 1083716)
+
 * Tue Sep 23 2014 Josh Boyer <jwboyer at fedoraproject.org>
 - Add patch to fix XPS 13 touchpad issue (rhbz 1123584)