[kernel] Enable CONFIG_MCE_INJECT (rhbz 927353)

Josh Boyer jwboyer at fedoraproject.org
Mon Apr 1 16:46:48 UTC 2013


commit f7212ead95d6ac2afbf930c925fe1148b401fec3
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Mon Apr 1 12:43:09 2013 -0400

    Enable CONFIG_MCE_INJECT (rhbz 927353)

 config-x86-generic |    2 +-
 kernel.spec        |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/config-x86-generic b/config-x86-generic
index a7e21ef..7820755 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -352,7 +352,7 @@ CONFIG_PERF_EVENTS=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_MCE_INJECT=m
 
 CONFIG_SFI=y
 
diff --git a/kernel.spec b/kernel.spec
index da5b510..d18e1ab 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,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 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2273,6 +2273,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Apr 01 2013 Josh Boyer <jwboyer at redhat.com>
+- Enable CONFIG_MCE_INJECT (rhbz 927353)
+
 * Mon Apr 01 2013 Justin M. Forbes <jforbes at redhat.com> - 3.9.0-0.rc5.git0.1
 - Disable debugging options.
 - Linux v3.9-rc5


More information about the scm-commits mailing list