[kernel] r12772 - in dists/trunk/linux-2.6/debian: . config/i386

[Maximilian Attems]

Author: maks
Date: Thu Feb 12 17:43:23 2009
New Revision: 12772

Log:
x86_32 set MTRR_SANITIZER too

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Feb 12 17:43:23 2009
@@ -48,8 +48,8 @@
     CRC_T10DIF, STAGING, ET131X, CRYPTO_ANSI_CPRNG, PRISM2_USB, HID_COMPAT,
     SYSCTL_SYSCALL_CHECK, BOOT_TRACER.
   * [x86] set MOUSE_BCM5974, X86_RESERVE_LOW_64K, OPROFILE_IBS,
-    MICROCODE_INTEL, MICROCODE_AMD, X86_VERBOSE_BOOTUP.
-  * [x86_64] set AMD_IOMMU, MTRR_SANITIZER, DMAR, DMAR_GFX_WA,
+    MICROCODE_INTEL, MICROCODE_AMD, X86_VERBOSE_BOOTUP, MTRR_SANITIZER.
+  * [x86_64] set AMD_IOMMU, DMAR, DMAR_GFX_WA,
     DMAR_FLOPPY_WA, INTR_REMAP, CRYPTO_CRC32C_INTEL.
   * Add stable releases 2.6.28.1-4.
   * Turn off SYSFS_DEPRECATED* for newer udev and proper /sys/.

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Thu Feb 12 17:43:23 2009
@@ -52,6 +52,9 @@
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 # CONFIG_X86_PAT is not set
 CONFIG_EFI=y
 # CONFIG_IRQBALANCE is not set