From 25e71bd23902b424ec9457244db24faad8b4359f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 16 Mar 2011 03:17:06 +0000 Subject: [PATCH] sched: Build with SCHED_AUTOGROUP, but do not enable autogrouping by default svn path=/dists/trunk/linux-2.6/; revision=17071 --- debian/changelog | 2 ++ debian/config/config | 1 + .../patches/debian/sched-autogroup-disabled.patch | 13 +++++++++++++ debian/patches/series/base | 1 + 4 files changed, 17 insertions(+) create mode 100644 debian/patches/debian/sched-autogroup-disabled.patch diff --git a/debian/changelog b/debian/changelog index 17b8d0e0a..bb61db625 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ linux-2.6 (2.6.38-1) UNRELEASED; urgency=low - 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: diff --git a/debian/config/config b/debian/config/config index 81911cb8e..795cd69a1 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3448,6 +3448,7 @@ CONFIG_IPC_NS=y 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 diff --git a/debian/patches/debian/sched-autogroup-disabled.patch b/debian/patches/debian/sched-autogroup-disabled.patch new file mode 100644 index 000000000..61d7a539b --- /dev/null +++ b/debian/patches/debian/sched-autogroup-disabled.patch @@ -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 + #include + +-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; + diff --git a/debian/patches/series/base b/debian/patches/series/base index 795cfeec0..2a19764f3 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -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