diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-04-01 12:43:09 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-04-01 12:43:09 -0400 |
| commit | f7212ead95d6ac2afbf930c925fe1148b401fec3 (patch) | |
| tree | bfee66e24b75dc373dd7d41e2051d15d2858ced3 | |
| parent | 6e429107c2fa5b88eabcfda9db729eea93095534 (diff) | |
| download | kernel-f7212ead95d6ac2afbf930c925fe1148b401fec3.tar.gz kernel-f7212ead95d6ac2afbf930c925fe1148b401fec3.tar.xz kernel-f7212ead95d6ac2afbf930c925fe1148b401fec3.zip | |
Enable CONFIG_MCE_INJECT (rhbz 927353)
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic index a7e21efca..7820755c7 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 da5b5104b..d18e1ab2e 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@redhat.com> +- Enable CONFIG_MCE_INJECT (rhbz 927353) + * Mon Apr 01 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git0.1 - Disable debugging options. - Linux v3.9-rc5 |