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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-08 11:13:35 +0000 (Fri, 08 Oct 2010)
New Revision: 5245

Modified:
   pve-kernel-2.6.35/trunk/README
   pve-kernel-2.6.35/trunk/changelog.Debian
   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-08 10:43:23 UTC (rev 5244)
+++ pve-kernel-2.6.35/trunk/README	2010-10-08 11:13:35 UTC (rev 5245)
@@ -68,7 +68,7 @@
   device naming (/dev/cciss/c*d* vs /dev/sd*). This can lead to race
   conditions during boot with unexpected device names.
 
-- enable CONFIG_BLK_CGROUP=y
+- enable CONFIG_BLK_CGROUP=y and CONFIG_CFQ_GROUP_IOSCHED=y
 
   
 Testing final kernel with kvm

Modified: pve-kernel-2.6.35/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.35/trunk/changelog.Debian	2010-10-08 10:43:23 UTC (rev 5244)
+++ pve-kernel-2.6.35/trunk/changelog.Debian	2010-10-08 11:13:35 UTC (rev 5245)
@@ -1,6 +1,8 @@
 pve-kernel-2.6.35 (2.6.35-4) unstable; urgency=low
 
   * bug fix: really enable CONFIG_BLK_CGROUP
+  
+  * enable CONFIG_CFQ_GROUP_IOSCHED
 
   * remove default initrd image (no longer needed)
 

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-08 10:43:23 UTC (rev 5244)
+++ pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-10-08 11:13:35 UTC (rev 5245)
@@ -1,15 +1,16 @@
---- config-2.6.35.org	2010-10-08 08:14:42.000000000 +0200
-+++ config-2.6.35	2010-10-08 08:15:38.000000000 +0200
-@@ -411,7 +411,7 @@
+--- config-2.6.35.org	2010-10-08 12:56:31.000000000 +0200
++++ config-2.6.35	2010-10-08 13:10:23.000000000 +0200
+@@ -411,7 +411,8 @@
  CONFIG_BINFMT_ELF=y
  CONFIG_BINFMT_MISC=m
  CONFIG_BITREVERSE=y
 -# CONFIG_BLK_CGROUP is not set
 +CONFIG_BLK_CGROUP=y
++# CONFIG_DEBUG_BLK_CGROUP is not set
  CONFIG_BLK_CPQ_CISS_DA=m
  CONFIG_BLK_CPQ_DA=m
  CONFIG_BLK_DEV=y
-@@ -928,7 +928,7 @@
+@@ -928,7 +929,7 @@
  # CONFIG_DEBUG_GPIO is not set
  # CONFIG_DEBUG_HIGHMEM is not set
  # CONFIG_DEBUG_ICEDCC is not set
@@ -18,7 +19,7 @@
  CONFIG_DEBUG_KERNEL=y
  # CONFIG_DEBUG_KMEMLEAK is not set
  # CONFIG_DEBUG_KOBJECT is not set
-@@ -1007,12 +1007,15 @@
+@@ -1007,12 +1008,15 @@
  CONFIG_DLCI=m
  CONFIG_DLCI_MAX=8
  CONFIG_DLM=m
@@ -36,7 +37,15 @@
  # CONFIG_DMATEST is not set
  # CONFIG_DMA_API_DEBUG is not set
  CONFIG_DMA_ENGINE=y
-@@ -2998,7 +3001,7 @@
+@@ -1980,6 +1984,7 @@
+ # CONFIG_IOMMU_DEBUG is not set
+ # CONFIG_IOMMU_STRESS is not set
+ CONFIG_IOSCHED_CFQ=y
++CONFIG_CFQ_GROUP_IOSCHED=y
+ CONFIG_IOSCHED_DEADLINE=y
+ CONFIG_IOSCHED_NOOP=y
+ # CONFIG_IO_DELAY_0X80 is not set
+@@ -2998,7 +3003,7 @@
  CONFIG_NLS_CODEPAGE_936=m
  CONFIG_NLS_CODEPAGE_949=m
  CONFIG_NLS_CODEPAGE_950=m
@@ -45,7 +54,7 @@
  CONFIG_NLS_ISO8859_1=m
  CONFIG_NLS_ISO8859_13=m
  CONFIG_NLS_ISO8859_14=m
-@@ -3226,7 +3229,7 @@
+@@ -3226,7 +3231,7 @@
  CONFIG_PCI_MSI=y
  CONFIG_PCI_OLPC=y
  CONFIG_PCI_QUIRKS=y
@@ -54,7 +63,7 @@
  CONFIG_PCMCIA=m
  CONFIG_PCMCIA_3C574=m
  CONFIG_PCMCIA_3C589=m
-@@ -3316,7 +3319,7 @@
+@@ -3316,7 +3321,7 @@
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_PRINTER=m
  CONFIG_PRINTK=y
@@ -63,7 +72,7 @@
  CONFIG_PRISM54=m
  CONFIG_PROC_EVENTS=y
  CONFIG_PROC_FS=y
-@@ -3616,7 +3619,7 @@
+@@ -3616,7 +3621,7 @@
  CONFIG_SCSI_GENERIC_NCR5380=m
  CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
  CONFIG_SCSI_GENERIC_NCR53C400=y
@@ -72,7 +81,7 @@
  CONFIG_SCSI_HPTIOP=m
  CONFIG_SCSI_IBMMCA=m
  CONFIG_SCSI_IMM=m
-@@ -5347,12 +5350,12 @@
+@@ -5347,12 +5352,12 @@
  #
  # Config options for config.flavour.server automatically generated by splitconfig.pl
  #
@@ -90,7 +99,7 @@
  CONFIG_SCSI_SPI_ATTRS=y
  CONFIG_SCSI_SYM53C8XX_2=y
  CONFIG_VIRTIO=y
-@@ -5362,3 +5365,7 @@
+@@ -5362,3 +5367,7 @@
  CONFIG_VIRTIO_RING=y
  CONFIG_XEN_BLKDEV_FRONTEND=m
  CONFIG_XEN_NETDEV_FRONTEND=m