diff --git a/config-x86-generic b/config-x86-generic index f7df9a114..1d0840435 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -29,7 +29,7 @@ CONFIG_PNP=y CONFIG_MTRR=y CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_X86_PM_TIMER=y diff --git a/kernel.spec b/kernel.spec index efd0e9d52..c014dc9d8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2288,6 +2288,9 @@ fi # ||----w | # || || %changelog +* Tue Jun 18 2013 Dave Jones +- Disable MTRR sanitizer by default. + * Tue Jun 18 2013 Justin M. Forbes - 3.10.0-0.rc6.git0.4 - Testing the test harness