[kernel] r17071 - in dists/trunk/linux-2.6/debian: . config patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Wed Mar 16 03:17:06 2011
New Revision: 17071

Log:
sched: Build with SCHED_AUTOGROUP, but do not enable autogrouping by default

Added:
   dists/trunk/linux-2.6/debian/patches/debian/sched-autogroup-disabled.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Mar 15 05:45:21 2011	(r17070)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Mar 16 03:17:06 2011	(r17071)
@@ -12,6 +12,8 @@
     - hpfs: Disable HPFS_FS
   * ext4: Disable FS_IOC_FIEMAP ioctl temporarily (together with fixes
     for btrfs in 2.6.38, closes: #615035)
+  * sched: Build with SCHED_AUTOGROUP, but do not enable autogrouping by
+    default (use sysctl kernel.sched_autogroup_enabled=1)
 
   [ Aurelien Jarno]
   * mips/malta-[45]kc: 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Mar 15 05:45:21 2011	(r17070)
+++ dists/trunk/linux-2.6/debian/config/config	Wed Mar 16 03:17:06 2011	(r17071)
@@ -3448,6 +3448,7 @@
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_RELAY=y

Added: dists/trunk/linux-2.6/debian/patches/debian/sched-autogroup-disabled.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/sched-autogroup-disabled.patch	Wed Mar 16 03:17:06 2011	(r17071)
@@ -0,0 +1,13 @@
+diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
+index 9fb6562..96abaaf 100644
+--- a/kernel/sched_autogroup.c
++++ b/kernel/sched_autogroup.c
+@@ -5,7 +5,7 @@
+ #include <linux/kallsyms.h>
+ #include <linux/utsname.h>
+ 
+-unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
++unsigned int __read_mostly sysctl_sched_autogroup_enabled = 0;
+ static struct autogroup autogroup_default;
+ static atomic_t autogroup_seq_nr;
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Tue Mar 15 05:45:21 2011	(r17070)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Wed Mar 16 03:17:06 2011	(r17071)
@@ -56,3 +56,4 @@
 + features/all/staging-usbip-convert-to-kthread.patch
 + features/all/ufs-remove-the-BKL.patch
 + debian/ext4-Disable-FS_IOC_FIEMAP-ioctl-temporarily.patch
++ debian/sched-autogroup-disabled.patch