From 731fd4b63c686b00b5a173ecd8bce1b17da0a47f Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Wed, 10 Sep 2008 09:35:45 +0000 Subject: [PATCH] x86_64 set AMD_IOMMU see 8d283c35a293e6091fdf7ef86842c1174c48a941 for details svn path=/dists/trunk/linux-2.6/; revision=12218 --- debian/changelog | 3 ++- debian/config/amd64/config | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 064618bec..faee9a579 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,8 @@ linux-2.6 (2.6.27~rc6-1~experimental.1) UNRELEASED; urgency=low VIRTIO_CONSOLE, VIDEO_ZORAN_ZR36060, USB_VIDEO_CLASS_INPUT_EVDEV, USB_GSPCA, USB_S2255, OCFS2_FS_STATS, OMFS_FS, CRYPTO_RMD128, CRYPTO_RMD160, CRYPTO_RMD256, CRYPTO_RMD320. - * x86 set MOUSE_BCM5974. + * [x86] set MOUSE_BCM5974. + * [x86_64] set AMD_IOMMU. [ Martin Michlmayr ] * [mips/r4k-ip22, mips/sb1-bcm91250a] Don't build in ISO9660. diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 72faee6c9..4b5655041 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -20,6 +20,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_DEBUG is not set CONFIG_MEMTEST_BOOTPARAM=y CONFIG_MEMTEST_BOOTPARAM_VALUE=0 +CONFIG_AMD_IOMMU=y CONFIG_HPET_TIMER=y CONFIG_CALGARY_IOMMU=y CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y