aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2015-08-20 12:58:04 -0400
committerRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2015-08-20 12:58:04 -0400
commit8ab909fe44b7db1ddc17e81d21dec53d4ce2c0b4 (patch)
treea2dda706cc6e22cc0e2cb0ba4016c6350b6a35df /arch
parentdisable optimize for size on x86/x86_64 bug #474724 (diff)
downloadgenkernel-8ab909fe44b7db1ddc17e81d21dec53d4ce2c0b4.tar.gz
genkernel-8ab909fe44b7db1ddc17e81d21dec53d4ce2c0b4.tar.bz2
genkernel-8ab909fe44b7db1ddc17e81d21dec53d4ce2c0b4.zip
kernel config parts of bug #557278 fix
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel-config7
-rw-r--r--arch/x86_64/kernel-config7
2 files changed, 11 insertions, 3 deletions
diff --git a/arch/x86/kernel-config b/arch/x86/kernel-config
index 2a39c5b..a3076f9 100644
--- a/arch/x86/kernel-config
+++ b/arch/x86/kernel-config
@@ -219,8 +219,13 @@ CONFIG_VM86=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE_INTEL_EARLY=y
+CONFIG_MICROCODE_AMD_EARLY=y
+CONFIG_MICROCODE_EARLY=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
# CONFIG_NOHIGHMEM is not set
diff --git a/arch/x86_64/kernel-config b/arch/x86_64/kernel-config
index 36b1317..2f539a8 100644
--- a/arch/x86_64/kernel-config
+++ b/arch/x86_64/kernel-config
@@ -305,10 +305,13 @@ CONFIG_X86_MCE_THRESHOLD=y
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_THERMAL_VECTOR=y
# CONFIG_I8K is not set
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
CONFIG_MICROCODE_INTEL=y
-# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE_INTEL_EARLY=y
+CONFIG_MICROCODE_AMD_EARLY=y
+CONFIG_MICROCODE_EARLY=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y