[pve-devel] r4887 - pve-kernel-2.6.32/trunk
svn-commits at proxmox.com
svn-commits at proxmox.com
Mon Jul 12 10:14:30 CEST 2010
Author: dietmar
Date: 2010-07-12 08:14:30 +0000 (Mon, 12 Jul 2010)
New Revision: 4887
Modified:
pve-kernel-2.6.32/trunk/changelog.Debian
pve-kernel-2.6.32/trunk/config-2.6.32.diff
Log:
* Also enable CONFIG_HAVE_INTEL_TXT and CONFIG_INTEL_TXT (required by
DMAR options)
Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian 2010-07-12 08:06:07 UTC (rev 4886)
+++ pve-kernel-2.6.32/trunk/changelog.Debian 2010-07-12 08:14:30 UTC (rev 4887)
@@ -2,6 +2,9 @@
* Support DMA Remapping Devices (CONFIG_DMAR=y, CONFIG_DMAR_DEFAULT_ON=y)
+ * Also enable CONFIG_HAVE_INTEL_TXT and CONFIG_INTEL_TXT (required by
+ DMAR options)
+
-- Proxmox Support Team <support at proxmox.com> Tue, 25 May 2010 12:34:31 +0200
pve-kernel-2.6.32 (2.6.32-7) unstable; urgency=low
Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff 2010-07-12 08:06:07 UTC (rev 4886)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff 2010-07-12 08:14:30 UTC (rev 4887)
@@ -1,5 +1,5 @@
---- config-2.6.32.org 2010-04-15 10:07:16.000000000 +0200
-+++ config-2.6.32 2010-05-25 12:30:21.000000000 +0200
+--- config-2.6.32.org 2010-07-12 10:07:01.000000000 +0200
++++ config-2.6.32 2010-07-12 10:11:42.000000000 +0200
@@ -733,7 +733,7 @@
# CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_HIGHMEM is not set
@@ -9,7 +9,7 @@
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_DEBUG_KOBJECT is not set
-@@ -810,11 +810,12 @@
+@@ -810,11 +810,14 @@
CONFIG_DLCI=m
CONFIG_DLCI_MAX=8
CONFIG_DLM=m
@@ -19,12 +19,14 @@
CONFIG_DM9102=m
CONFIG_DMADEVICES=y
-# CONFIG_DMAR is not set
++CONFIG_HAVE_INTEL_TXT=y
++CONFIG_INTEL_TXT=y
+CONFIG_DMAR=y
+CONFIG_DMAR_DEFAULT_ON=y
# CONFIG_DMATEST is not set
# CONFIG_DMA_API_DEBUG is not set
CONFIG_DMA_ENGINE=y
-@@ -837,24 +838,9 @@
+@@ -837,24 +840,9 @@
CONFIG_DONGLE=y
CONFIG_DOUBLEFAULT=y
CONFIG_DRAGONRISE_FF=y
@@ -52,7 +54,7 @@
CONFIG_DS1682=m
CONFIG_DSCC4=m
CONFIG_DSCC4_PCISYNC=y
-@@ -1171,7 +1157,7 @@
+@@ -1171,7 +1159,7 @@
CONFIG_FB_TRIDENT=m
CONFIG_FB_UDL=m
CONFIG_FB_UVESA=m
@@ -61,7 +63,7 @@
CONFIG_FB_VGA16=m
CONFIG_FB_VIA=m
# CONFIG_FB_VIRTUAL is not set
-@@ -1605,6 +1591,7 @@
+@@ -1605,6 +1593,7 @@
# CONFIG_IKCONFIG is not set
# CONFIG_IMA is not set
CONFIG_INET=y
@@ -69,7 +71,7 @@
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
-@@ -2637,7 +2624,7 @@
+@@ -2637,7 +2626,7 @@
CONFIG_NLS_CODEPAGE_936=m
CONFIG_NLS_CODEPAGE_949=m
CONFIG_NLS_CODEPAGE_950=m
@@ -78,7 +80,7 @@
CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_13=m
CONFIG_NLS_ISO8859_14=m
-@@ -2824,7 +2811,7 @@
+@@ -2824,7 +2813,7 @@
CONFIG_PCI_MSI=y
CONFIG_PCI_OLPC=y
CONFIG_PCI_QUIRKS=y
@@ -87,7 +89,7 @@
CONFIG_PCI_SYSCALL=y
CONFIG_PCMCIA=m
CONFIG_PCMCIA_3C574=m
-@@ -2914,7 +2901,7 @@
+@@ -2914,7 +2903,7 @@
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_PRINTER=m
CONFIG_PRINTK=y
@@ -96,7 +98,7 @@
# CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_PRISM2_USB=m
CONFIG_PRISM54=m
-@@ -4585,7 +4572,7 @@
+@@ -4585,7 +4574,7 @@
CONFIG_FB_SAVAGE=m
# CONFIG_FLATMEM_MANUAL is not set
# CONFIG_FONTS is not set
@@ -105,7 +107,7 @@
CONFIG_FSAM7400=m
CONFIG_FTL=m
CONFIG_GAMEPORT=m
-@@ -4731,8 +4718,8 @@
+@@ -4731,8 +4720,8 @@
# CONFIG_HZ_1000 is not set
CONFIG_MEMORY_HOTPLUG=y
# CONFIG_PREEMPT is not set
@@ -116,7 +118,7 @@
CONFIG_SCSI_SPI_ATTRS=y
CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_VIRTIO=y
-@@ -4740,3 +4727,4 @@
+@@ -4740,3 +4729,4 @@
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_RING=y
More information about the pve-devel
mailing list