From 18357802730e8a080b455d2f1a444009645a9b0f Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 12 Feb 2009 17:43:23 +0000 Subject: [PATCH] x86_32 set MTRR_SANITIZER too svn path=/dists/trunk/linux-2.6/; revision=12772 --- debian/changelog | 4 ++-- debian/config/i386/config | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 320a92121..66986ab1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,8 +48,8 @@ linux-2.6 (2.6.28-1~experimental.1) UNRELEASED; urgency=low 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/. diff --git a/debian/config/i386/config b/debian/config/i386/config index 4ab2159a3..100c57c72 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -52,6 +52,9 @@ CONFIG_VMSPLIT_3G_OPT=y # 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