aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2012-12-23 21:23:47 +0000
committerBen Hutchings <benh@debian.org>2012-12-23 21:23:47 +0000
commit1c21ce56f16a69e43161827b8257e103e590f402 (patch)
treef7caf6c3152681cbafe2d9fabb29003358bbe98c
parent04bd09967bd0f8be377a6be76352d4d15e5e7b52 (diff)
downloadkernel_replicant_linux-1c21ce56f16a69e43161827b8257e103e590f402.tar.gz
kernel_replicant_linux-1c21ce56f16a69e43161827b8257e103e590f402.tar.bz2
kernel_replicant_linux-1c21ce56f16a69e43161827b8257e103e590f402.zip
Explicitly set defaults for some new scheduler and mm config variables
svn path=/dists/trunk/linux/; revision=19638
-rw-r--r--debian/config/config12
1 files changed, 12 insertions, 0 deletions
diff --git a/debian/config/config b/debian/config/config
index 840c607db9ec..b0767bb7c8a9 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3926,9 +3926,11 @@ CONFIG_MEMCG_DISABLED=y
CONFIG_MEMCG_SWAP=y
# CONFIG_MEMCG_SWAP_ENABLED is not set
# CONFIG_MEMCG_KMEM is not set
+# CONFIG_CGROUP_HUGETLB is not set
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_CFS_BANDWIDTH is not set
# CONFIG_RT_GROUP_SCHED is not set
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
@@ -3990,11 +3992,18 @@ CONFIG_HZ_250=y
## end choice
##
+## file: kernel/irq/Kconfig
+##
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+
+##
## file: kernel/power/Kconfig
##
CONFIG_SUSPEND=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
CONFIG_PM_RUNTIME=y
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
@@ -4139,6 +4148,9 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
## choice: Transparent Hugepage Support sysfs defaults
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
## end choice
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
##
## file: net/Kconfig