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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-12-16 05:48:00 +0100 (Thu, 16 Dec 2010)
New Revision: 5344

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


Modified: pve-kernel-2.6.35/trunk/config-2.6.35.diff
===================================================================
--- pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-12-16 04:39:03 UTC (rev 5343)
+++ pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-12-16 04:48:00 UTC (rev 5344)
@@ -1,5 +1,5 @@
---- config-2.6.35.org	2010-10-08 14:16:39.000000000 +0200
-+++ config-2.6.35	2010-10-11 07:56:06.000000000 +0200
+--- config-2.6.35.org	2010-12-16 05:44:55.000000000 +0100
++++ config-2.6.35	2010-12-16 05:47:12.000000000 +0100
 @@ -411,7 +411,8 @@
  CONFIG_BINFMT_ELF=y
  CONFIG_BINFMT_MISC=m
@@ -33,7 +33,7 @@
  # CONFIG_DEFAULT_SECURITY_SMACK is not set
  # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
  # CONFIG_DEFAULT_SECURITY_YAMA is not set
-@@ -1007,12 +1008,15 @@
+@@ -1008,12 +1009,15 @@
  CONFIG_DLCI=m
  CONFIG_DLCI_MAX=8
  CONFIG_DLM=m
@@ -51,7 +51,7 @@
  # CONFIG_DMATEST is not set
  # CONFIG_DMA_API_DEBUG is not set
  CONFIG_DMA_ENGINE=y
-@@ -1980,6 +1984,7 @@
+@@ -1979,6 +1983,7 @@
  # CONFIG_IOMMU_DEBUG is not set
  # CONFIG_IOMMU_STRESS is not set
  CONFIG_IOSCHED_CFQ=y
@@ -59,7 +59,7 @@
  CONFIG_IOSCHED_DEADLINE=y
  CONFIG_IOSCHED_NOOP=y
  # CONFIG_IO_DELAY_0X80 is not set
-@@ -2998,7 +3003,7 @@
+@@ -2997,7 +3002,7 @@
  CONFIG_NLS_CODEPAGE_936=m
  CONFIG_NLS_CODEPAGE_949=m
  CONFIG_NLS_CODEPAGE_950=m
@@ -68,7 +68,7 @@
  CONFIG_NLS_ISO8859_1=m
  CONFIG_NLS_ISO8859_13=m
  CONFIG_NLS_ISO8859_14=m
-@@ -3226,7 +3231,7 @@
+@@ -3225,7 +3230,7 @@
  CONFIG_PCI_MSI=y
  CONFIG_PCI_OLPC=y
  CONFIG_PCI_QUIRKS=y
@@ -77,7 +77,7 @@
  CONFIG_PCMCIA=m
  CONFIG_PCMCIA_3C574=m
  CONFIG_PCMCIA_3C589=m
-@@ -3316,7 +3321,7 @@
+@@ -3315,7 +3320,7 @@
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_PRINTER=m
  CONFIG_PRINTK=y
@@ -86,7 +86,7 @@
  CONFIG_PRISM54=m
  CONFIG_PROC_EVENTS=y
  CONFIG_PROC_FS=y
-@@ -3616,7 +3621,7 @@
+@@ -3615,7 +3620,7 @@
  CONFIG_SCSI_GENERIC_NCR5380=m
  CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
  CONFIG_SCSI_GENERIC_NCR53C400=y
@@ -95,7 +95,7 @@
  CONFIG_SCSI_HPTIOP=m
  CONFIG_SCSI_IBMMCA=m
  CONFIG_SCSI_IMM=m
-@@ -3702,9 +3707,7 @@
+@@ -3701,9 +3706,7 @@
  CONFIG_SECCOMP=y
  CONFIG_SECURITY=y
  CONFIG_SECURITYFS=y
@@ -106,7 +106,7 @@
  CONFIG_SECURITY_NETWORK=y
  # CONFIG_SECURITY_NETWORK_XFRM is not set
  CONFIG_SECURITY_PATH=y
-@@ -5074,7 +5077,7 @@
+@@ -5072,7 +5075,7 @@
  CONFIG_B43LEGACY=m
  CONFIG_B44=m
  CONFIG_BT=m
@@ -115,7 +115,7 @@
  CONFIG_CDROM_PKTCDVD=y
  CONFIG_CEPH_FS=m
  CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-@@ -5347,12 +5350,12 @@
+@@ -5347,13 +5350,13 @@
  #
  # Config options for config.flavour.server automatically generated by splitconfig.pl
  #
@@ -125,6 +125,7 @@
 +CONFIG_DEFAULT_CFQ=y
 +# CONFIG_DEFAULT_DEADLINE is not set
 +CONFIG_DEFAULT_IOSCHED="cfq"
+ CONFIG_INTEL_IDLE=y
  CONFIG_MEMORY_HOTPLUG=y
 -CONFIG_PREEMPT_NONE=y
 -# CONFIG_PREEMPT_VOLUNTARY is not set
@@ -133,7 +134,7 @@
  CONFIG_SCSI_SPI_ATTRS=y
  CONFIG_SCSI_SYM53C8XX_2=y
  CONFIG_VIRTIO=y
-@@ -5362,3 +5365,7 @@
+@@ -5363,3 +5366,7 @@
  CONFIG_VIRTIO_RING=y
  CONFIG_XEN_BLKDEV_FRONTEND=m
  CONFIG_XEN_NETDEV_FRONTEND=m