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

[Maximilian Attems]

Author: maks
Date: Wed May  6 12:05:07 2009
New Revision: 13579

Log:
x86 enable DMAR

disable DMAR_DEFAULT_ON, intel_iommu=on bootparam is needed
to have it enabled. KMS guys will easily find out.

seen same optionset in fedora.

Reported-by: Julien Cristau <jcristau at debian.org>

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed May  6 11:55:04 2009	(r13578)
+++ dists/trunk/linux-2.6/debian/changelog	Wed May  6 12:05:07 2009	(r13579)
@@ -20,7 +20,7 @@
     UIO_AEC, CRYPTO_ZLIB, REGULATOR_FIXED_VOLTAGE, NOP_USB_XCEIV,
     POHMELFS, FSCACHE, CACHEFILES, EXOFS, NFS_FSCACHE, AFS_FSCACHE,
     MTD_NAND_NANDSIM.
-  * [x86] set new DELL_WMI, EDAC_AMD8131, EDAC_AMD8111, X86_PAT.
+  * [x86] set new DELL_WMI, EDAC_AMD8131, EDAC_AMD8111, X86_PAT, DMAR.
   * [x86_64] set new CRYPTO_AES_NI_INTEL.
 
   [ Ben Hutchings ]

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed May  6 11:55:04 2009	(r13578)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed May  6 12:05:07 2009	(r13579)
@@ -60,7 +60,10 @@
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_PCI=y
 CONFIG_PCI_MMCONFIG=y
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_GFX_WA=y
+CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_INTR_REMAP=y
 CONFIG_IA32_EMULATION=y
 CONFIG_IA32_AOUT=y

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed May  6 11:55:04 2009	(r13578)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed May  6 12:05:07 2009	(r13579)
@@ -86,7 +86,10 @@
 CONFIG_PCI_GOANY=y
 ## end choice
 CONFIG_PCI_MMCONFIG=y
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_GFX_WA=y
+CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_ISA=y
 CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m