update to vzkernel-2.6.32-042stab088.4.src.rpm

[pve-kernel-2.6.32.git] / config-2.6.32.diff

diff --git a/config-2.6.32.diff b/config-2.6.32.diff
index b986e9de4ac203301a557b99fb27e27b623a00b7..7002c1119064198cab90e58f150d7fc1b758bc8c 100644 (file)
--- a/config-2.6.32.diff
+++ b/config-2.6.32.diff
@@ -1,15 +1,6 @@
---- config-2.6.32-042stab049.6.x86_64  2012-02-13 07:18:08.000000000 +0100
-+++ config-2.6.32      2012-02-16 08:44:34.000000000 +0100
-@@ -103,7 +103,7 @@
- CONFIG_FAIR_GROUP_SCHED=y
- CONFIG_CFS_BANDWIDTH=y
- CONFIG_CFS_CPULIMIT=y
--CONFIG_RT_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
- # CONFIG_USER_SCHED is not set
- CONFIG_CGROUP_SCHED=y
- CONFIG_VZ_FAIRSCHED=y
-@@ -207,7 +207,7 @@
+--- config-2.6.32-042stab085.17.x86_64 2014-03-12 19:23:02.000000000 +0100
++++ config-2.6.32      2014-04-10 08:18:48.000000000 +0200
+@@ -212,7 +212,7 @@
  CONFIG_MODVERSIONS=y
  CONFIG_MODULE_SRCVERSION_ALL=y
  CONFIG_MODULE_VERIFY_ELF=y
@@ -18,7 +9,42 @@
  # CONFIG_MODULE_SIG_FORCE is not set
  CONFIG_MODULE_VERIFY=y
  CONFIG_STOP_MACHINE=y
-@@ -1344,10 +1344,10 @@
+@@ -232,10 +232,10 @@
+ CONFIG_IOSCHED_CFQ=y
+ CONFIG_CFQ_GROUP_IOSCHED=y
+ # CONFIG_DEFAULT_AS is not set
+-# CONFIG_DEFAULT_DEADLINE is not set
+-CONFIG_DEFAULT_CFQ=y
++CONFIG_DEFAULT_DEADLINE=y
++# CONFIG_DEFAULT_CFQ is not set
+ # CONFIG_DEFAULT_NOOP is not set
+-CONFIG_DEFAULT_IOSCHED="cfq"
++CONFIG_DEFAULT_IOSCHED="deadline"
+ CONFIG_PREEMPT_NOTIFIERS=y
+ CONFIG_FREEZER=y
+ 
+@@ -487,9 +487,9 @@
+ CONFIG_CPU_FREQ_DEBUG=y
+ CONFIG_CPU_FREQ_STAT=m
+ CONFIG_CPU_FREQ_STAT_DETAILS=y
+-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
++CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
++# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+@@ -961,7 +961,7 @@
+ # CONFIG_ATM_BR2684_IPFILTER is not set
+ CONFIG_STP=m
+ CONFIG_GARP=m
+-CONFIG_BRIDGE=m
++CONFIG_BRIDGE=y
+ CONFIG_BRIDGE_IGMP_SNOOPING=y
+ CONFIG_NET_DSA=y
+ CONFIG_NET_DSA_TAG_DSA=y
+@@ -1391,10 +1391,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -31,7 +57,7 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1425,7 +1425,7 @@
+@@ -1475,7 +1475,7 @@
  # CONFIG_SCSI_DMX3191D is not set
  # CONFIG_SCSI_EATA is not set
  # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -40,20 +66,21 @@
  CONFIG_SCSI_ISCI=m
  CONFIG_SCSI_IPS=m
  CONFIG_SCSI_INITIO=m
-@@ -1542,7 +1542,7 @@
- # CONFIG_MULTICORE_RAID456 is not set
+@@ -1593,7 +1593,7 @@
+ CONFIG_MD_RAID456=m
  # CONFIG_MD_MULTIPATH is not set
  CONFIG_MD_FAULTY=m
 -CONFIG_BLK_DEV_DM=m
 +CONFIG_BLK_DEV_DM=y
  CONFIG_DM_DEBUG=y
- CONFIG_DM_CRYPT=m
- CONFIG_DM_SNAPSHOT=m
-@@ -3121,6 +3121,11 @@
+ CONFIG_DM_BUFIO=m
+ CONFIG_DM_BIO_PRISON=m
+@@ -3310,7 +3310,11 @@
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
  CONFIG_LOGO_LINUX_CLUT224=y
-+
+-CONFIG_LOGO_PSBM_CLUT224=y
++# CONFIG_LOGO_PSBM_CLUT224 is not set
 +#
 +# Bootsplash configuration
 +#
@@ -61,7 +88,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -3719,7 +3724,9 @@
+@@ -3927,7 +3931,9 @@
  # CONFIG_SLICOSS is not set
  # CONFIG_VIDEO_GO7007 is not set
  # CONFIG_VIDEO_CX25821 is not set
@@ -72,7 +99,7 @@
  # CONFIG_W35UND is not set
  # CONFIG_PRISM2_USB is not set
  # CONFIG_ECHO is not set
-@@ -3851,7 +3858,11 @@
+@@ -4050,7 +4056,11 @@
  CONFIG_REISERFS_FS_XATTR=y
  CONFIG_REISERFS_FS_POSIX_ACL=y
  CONFIG_REISERFS_FS_SECURITY=y
@@ -85,7 +112,18 @@
  CONFIG_FS_POSIX_ACL=y
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
-@@ -4087,7 +4098,7 @@
+@@ -4140,8 +4150,8 @@
+ # CONFIG_ADFS_FS is not set
+ # CONFIG_AFFS_FS is not set
+ CONFIG_ECRYPT_FS=m
+-# CONFIG_HFS_FS is not set
+-# CONFIG_HFSPLUS_FS is not set
++CONFIG_HFS_FS=m
++CONFIG_HFSPLUS_FS=m
+ # CONFIG_BEFS_FS is not set
+ # CONFIG_BFS_FS is not set
+ # CONFIG_EFS_FS is not set
+@@ -4289,7 +4299,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -94,7 +132,7 @@
  # CONFIG_ENABLE_WARN_DEPRECATED is not set
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4131,7 +4142,7 @@
+@@ -4333,7 +4343,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -103,7 +141,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4360,8 +4371,8 @@
+@@ -4567,8 +4577,8 @@
  #
  CONFIG_CRYPTO_ANSI_CPRNG=m
  CONFIG_CRYPTO_MPILIB=y