Enable preempt by default and make people steer away from voluntary.

-ck

---
 kernel/Kconfig.preempt |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Index: linux-3.16-ck1/kernel/Kconfig.preempt
===================================================================
--- linux-3.16-ck1.orig/kernel/Kconfig.preempt	2014-08-16 14:46:12.208916818 +1000
+++ linux-3.16-ck1/kernel/Kconfig.preempt	2014-08-16 14:46:12.206916818 +1000
@@ -1,7 +1,7 @@
 
 choice
 	prompt "Preemption Model"
-	default PREEMPT_NONE
+	default PREEMPT
 
 config PREEMPT_NONE
 	bool "No Forced Preemption (Server)"
@@ -17,7 +17,7 @@ config PREEMPT_NONE
 	  latencies.
 
 config PREEMPT_VOLUNTARY
-	bool "Voluntary Kernel Preemption (Desktop)"
+	bool "Voluntary Kernel Preemption (Nothing)"
 	help
 	  This option reduces the latency of the kernel by adding more
 	  "explicit preemption points" to the kernel code. These new
@@ -31,7 +31,8 @@ config PREEMPT_VOLUNTARY
 	  applications to run more 'smoothly' even when the system is
 	  under load.
 
-	  Select this if you are building a kernel for a desktop system.
+	  Select this for no system in particular (choose Preemptible
+	  instead on a desktop if you know what's good for you).
 
 config PREEMPT
 	bool "Preemptible Kernel (Low-Latency Desktop)"
