update to vzkernel-2.6.32-042stab105.6.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 c436144c3cf3b7fb96f5ec518bcf53d3f5f470fb..b0615cd52fc9c28faeed6ff3da62339fc98686a4 100644 (file)
--- a/config-2.6.32.diff
+++ b/config-2.6.32.diff
@@ -1,15 +1,6 @@
---- config-2.6.32-042stab035.1.x86_64  2011-08-31 07:39:11.000000000 +0200
-+++ config-2.6.32      2011-08-31 16:20:33.000000000 +0200
-@@ -101,7 +101,7 @@
- CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
- CONFIG_GROUP_SCHED=y
- CONFIG_FAIR_GROUP_SCHED=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
-@@ -206,7 +206,7 @@
+--- config-2.6.32-042stab090.4.x86_64  2014-06-18 08:38:14.000000000 +0200
++++ config-2.6.32      2014-06-21 18:59:08.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
-@@ -1323,10 +1323,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,20 +57,40 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1524,7 +1524,7 @@
- # CONFIG_MULTICORE_RAID456 is not set
+@@ -1430,7 +1430,7 @@
+ CONFIG_SCSI_HPSA=m
+ CONFIG_SCSI_3W_9XXX=m
+ CONFIG_SCSI_3W_SAS=m
+-# CONFIG_SCSI_ACARD is not set
++CONFIG_SCSI_ACARD=m
+ CONFIG_SCSI_AACRAID=m
+ CONFIG_SCSI_AIC7XXX=m
+ CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+@@ -1475,7 +1475,7 @@
+ # CONFIG_SCSI_DMX3191D is not set
+ # CONFIG_SCSI_EATA is not set
+ # CONFIG_SCSI_FUTURE_DOMAIN is not set
+-# CONFIG_SCSI_GDTH is not set
++CONFIG_SCSI_GDTH=m
+ CONFIG_SCSI_ISCI=m
+ CONFIG_SCSI_IPS=m
+ CONFIG_SCSI_INITIO=m
+@@ -1593,8 +1593,8 @@
+ CONFIG_MD_RAID456=m
  # CONFIG_MD_MULTIPATH is not set
  CONFIG_MD_FAULTY=m
+ CONFIG_BLK_DEV_DM_BUILTIN=y
 -CONFIG_BLK_DEV_DM=m
 +CONFIG_BLK_DEV_DM=y
  CONFIG_DM_DEBUG=y
- CONFIG_DM_CRYPT=m
- CONFIG_DM_SNAPSHOT=m
-@@ -3093,6 +3093,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
 +#
@@ -52,7 +98,42 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -4049,7 +4054,7 @@
+@@ -3927,7 +3931,9 @@
+ # CONFIG_SLICOSS is not set
+ # CONFIG_VIDEO_GO7007 is not set
+ # CONFIG_VIDEO_CX25821 is not set
+-# CONFIG_USB_IP_COMMON is not set
++CONFIG_USB_IP_COMMON=m
++CONFIG_USB_IP_VHCI_HCD=m
++CONFIG_USB_IP_HOST=m
+ # CONFIG_W35UND is not set
+ # CONFIG_PRISM2_USB is not set
+ # CONFIG_ECHO is not set
+@@ -4050,7 +4056,11 @@
+ CONFIG_REISERFS_FS_XATTR=y
+ CONFIG_REISERFS_FS_POSIX_ACL=y
+ CONFIG_REISERFS_FS_SECURITY=y
+-# CONFIG_JFS_FS is not set
++CONFIG_JFS_FS=m
++CONFIG_JFS_POSIX_ACL=y
++CONFIG_JFS_SECURITY=y
++# CONFIG_JFS_DEBUG is not set
++# CONFIG_JFS_STATISTICS is not set
+ CONFIG_FS_POSIX_ACL=y
+ CONFIG_XFS_FS=m
+ CONFIG_XFS_QUOTA=y
+@@ -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
@@ -61,7 +142,7 @@
  # CONFIG_ENABLE_WARN_DEPRECATED is not set
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4093,7 +4098,7 @@
+@@ -4333,7 +4343,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -70,7 +151,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4322,8 +4327,8 @@
+@@ -4567,8 +4577,8 @@
  #
  CONFIG_CRYPTO_ANSI_CPRNG=m
  CONFIG_CRYPTO_MPILIB=y