[pve-devel] r5206 - pve-kernel-2.6.35/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-04 14:05:35 +0000 (Mon, 04 Oct 2010)
New Revision: 5206

Modified:
   pve-kernel-2.6.35/trunk/README
   pve-kernel-2.6.35/trunk/config-2.6.35.diff
Log:


Modified: pve-kernel-2.6.35/trunk/README
===================================================================
--- pve-kernel-2.6.35/trunk/README	2010-10-04 13:47:16 UTC (rev 5205)
+++ pve-kernel-2.6.35/trunk/README	2010-10-04 14:05:35 UTC (rev 5206)
@@ -43,12 +43,20 @@
 	CONFIG_FRAMEBUFFER_CONSOLE=Y 
 	CONFIG_BOOTSPLASH=y
 
+- enable DLM debug
+  	 CONFIG_DLM_DEBUG=y
+
+- enable options for PCI pass through for KVM
+  	 CONFIG_HAVE_INTEL_TXT=y
+	 CONFIG_INTEL_TXT=y
+	 CONFIG_DMAR=y
+	 CONFIG_DMAR_DEFAULT_ON=y
+	 CONFIG_PCI_STUB=y
+
 - disable CONFIG_DEBUG_INFO
 
 - disable CONFIG_PRINTK_TIME
 
-- disable CONFIG_DRM*
-
 - set CONFIG_NLS_DEFAULT="iso8859-1"
 
 Testing final kernel with kvm

Modified: pve-kernel-2.6.35/trunk/config-2.6.35.diff
===================================================================
--- pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-10-04 13:47:16 UTC (rev 5205)
+++ pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-10-04 14:05:35 UTC (rev 5206)
@@ -1,5 +1,5 @@
---- config-2.6.35.org	2010-10-04 13:44:20.000000000 +0200
-+++ config-2.6.35	2010-10-04 14:44:53.000000000 +0200
+--- config-2.6.35.org	2010-10-04 16:01:52.000000000 +0200
++++ config-2.6.35	2010-10-04 16:02:29.000000000 +0200
 @@ -928,7 +928,7 @@
  # CONFIG_DEBUG_GPIO is not set
  # CONFIG_DEBUG_HIGHMEM is not set
@@ -9,7 +9,34 @@
  CONFIG_DEBUG_KERNEL=y
  # CONFIG_DEBUG_KMEMLEAK is not set
  # CONFIG_DEBUG_KOBJECT is not set
-@@ -3226,7 +3226,7 @@
+@@ -1007,12 +1007,15 @@
+ CONFIG_DLCI=m
+ CONFIG_DLCI_MAX=8
+ CONFIG_DLM=m
+-# CONFIG_DLM_DEBUG is not set
++CONFIG_DLM_DEBUG=y
+ # CONFIG_DM9000 is not set
+ CONFIG_DM9102=m
+ CONFIG_DMADEVICES=y
+ # CONFIG_DMADEVICES_DEBUG is not set
+-# 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
+@@ -2998,7 +3001,7 @@
+ CONFIG_NLS_CODEPAGE_936=m
+ CONFIG_NLS_CODEPAGE_949=m
+ CONFIG_NLS_CODEPAGE_950=m
+-CONFIG_NLS_DEFAULT="cp437"
++CONFIG_NLS_DEFAULT="iso8859-1"
+ CONFIG_NLS_ISO8859_1=m
+ CONFIG_NLS_ISO8859_13=m
+ CONFIG_NLS_ISO8859_14=m
+@@ -3226,7 +3229,7 @@
  CONFIG_PCI_MSI=y
  CONFIG_PCI_OLPC=y
  CONFIG_PCI_QUIRKS=y
@@ -18,7 +45,7 @@
  CONFIG_PCMCIA=m
  CONFIG_PCMCIA_3C574=m
  CONFIG_PCMCIA_3C589=m
-@@ -3316,7 +3316,7 @@
+@@ -3316,7 +3319,7 @@
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_PRINTER=m
  CONFIG_PRINTK=y
@@ -27,7 +54,25 @@
  CONFIG_PRISM54=m
  CONFIG_PROC_EVENTS=y
  CONFIG_PROC_FS=y
-@@ -5362,3 +5362,7 @@
+@@ -5347,12 +5350,12 @@
+ #
+ # Config options for config.flavour.server automatically generated by splitconfig.pl
+ #
+-# CONFIG_DEFAULT_CFQ is not set
+-CONFIG_DEFAULT_DEADLINE=y
+-CONFIG_DEFAULT_IOSCHED="deadline"
++CONFIG_DEFAULT_CFQ=y
++# CONFIG_DEFAULT_DEADLINE is not set
++CONFIG_DEFAULT_IOSCHED="cfq"
+ CONFIG_MEMORY_HOTPLUG=y
+-CONFIG_PREEMPT_NONE=y
+-# CONFIG_PREEMPT_VOLUNTARY is not set
++# CONFIG_PREEMPT_NONE is not set
++CONFIG_PREEMPT_VOLUNTARY=y
+ CONFIG_SCSI_SPI_ATTRS=y
+ CONFIG_SCSI_SYM53C8XX_2=y
+ CONFIG_VIRTIO=y
+@@ -5362,3 +5365,7 @@
  CONFIG_VIRTIO_RING=y
  CONFIG_XEN_BLKDEV_FRONTEND=m
  CONFIG_XEN_NETDEV_FRONTEND=m