From: Suresh Jayaraman <sjayaraman@suse.de>
Subject: [PATCH] automate config options for kernel-desktop
References: FATE#305694
Patch-mainline: Never

Automate the desktop only kernel configuration options with the new
CONFIG_KERNEL_DESKTOP.

Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
---
 init/Kconfig           |    5 ++++-
 kernel/Kconfig.hz      |    1 +
 kernel/Kconfig.preempt |    1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

--- a/init/Kconfig
+++ b/init/Kconfig
@@ -537,6 +537,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
 menuconfig CGROUPS
 	boolean "Control Group support"
 	depends on EVENTFD
+	default !KERNEL_DESKTOP
 	help
 	  This option adds support for grouping sets of processes together, for
 	  use with process control subsystems such as Cpusets, CFS, memory
@@ -651,7 +653,7 @@ config CGROUP_MEM_RES_CTLR_SWAP
 menuconfig CGROUP_SCHED
 	bool "Group CPU scheduler"
 	depends on EXPERIMENTAL
-	default n
+	default !KERNEL_DESKTOP
 	help
 	  This feature lets CPU scheduler recognize task groups and control CPU
 	  bandwidth allocation to such task groups. It uses cgroups to group
--- a/kernel/Kconfig.hz
+++ b/kernel/Kconfig.hz
@@ -4,6 +4,7 @@
 
 choice
 	prompt "Timer frequency"
+	default HZ_1000 if KERNEL_DESKTOP
 	default HZ_250
 	help
 	 Allows the configuration of the timer frequency. It is customary
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -1,6 +1,7 @@
 
 choice
 	prompt "Preemption Model"
+	default PREEMPT if KERNEL_DESKTOP
 	default PREEMPT_NONE
 
 config PREEMPT_NONE
