diff -NurpP --minimal linux-2.6.38-vs2.3.0.37-rc6/kernel/vserver/Kconfig linux-2.6.38-vs2.3.0.37-rc7/kernel/vserver/Kconfig
--- linux-2.6.38-vs2.3.0.37-rc6/kernel/vserver/Kconfig	2011-01-29 02:01:07.000000000 +0100
+++ linux-2.6.38-vs2.3.0.37-rc7/kernel/vserver/Kconfig	2011-03-15 21:32:33.000000000 +0100
@@ -63,43 +63,6 @@ config	VSERVER_PROC_SECURE
 
 	  (note: on 1.2x the entries were visible by default)
 
-config	VSERVER_HARDCPU
-	bool	"Enable Hard CPU Limits"
-	default y
-	help
-	  Activate the Hard CPU Limits
-
-	  This will compile in code that allows the Token Bucket
-	  Scheduler to put processes on hold when a context's
-	  tokens are depleted (provided that its per-context
-	  sched_hard flag is set).
-
-	  Processes belonging to that context will not be able
-	  to consume CPU resources again until a per-context
-	  configured minimum of tokens has been reached.
-
-config	VSERVER_IDLETIME
-	bool	"Avoid idle CPUs by skipping Time"
-	depends on VSERVER_HARDCPU
-	default y
-	help
-	  This option allows the scheduler to artificially
-	  advance time (per cpu) when otherwise the idle
-	  task would be scheduled, thus keeping the cpu
-	  busy and sharing the available resources among
-	  certain contexts.
-
-config	VSERVER_IDLELIMIT
-	bool	"Limit the IDLE task"
-	depends on VSERVER_HARDCPU
-	default n
-	help
-	  Limit the idle slices, so the the next context
-	  will be scheduled as soon as possible.
-
-	  This might improve interactivity and latency, but
-	  will also marginally increase scheduling overhead.
-
 choice
 	prompt	"Persistent Inode Tagging"
 	default	TAGGING_ID24
diff -NurpP --minimal linux-2.6.38-vs2.3.0.37-rc6/kernel/vserver/vci_config.h linux-2.6.38-vs2.3.0.37-rc7/kernel/vserver/vci_config.h
--- linux-2.6.38-vs2.3.0.37-rc6/kernel/vserver/vci_config.h	2011-01-29 02:01:07.000000000 +0100
+++ linux-2.6.38-vs2.3.0.37-rc7/kernel/vserver/vci_config.h	2011-03-15 21:34:31.000000000 +0100
@@ -8,9 +8,9 @@ enum {
 	VCI_KCBIT_NO_DYNAMIC = 0,
 
 	VCI_KCBIT_PROC_SECURE = 4,
-	VCI_KCBIT_HARDCPU = 5,
-	VCI_KCBIT_IDLELIMIT = 6,
-	VCI_KCBIT_IDLETIME = 7,
+	/* VCI_KCBIT_HARDCPU = 5, */
+	/* VCI_KCBIT_IDLELIMIT = 6, */
+	/* VCI_KCBIT_IDLETIME = 7, */
 
 	VCI_KCBIT_COWBL = 8,
 	VCI_KCBIT_FULLCOWBL = 9,
@@ -36,12 +36,6 @@ static inline uint32_t vci_kernel_config
 #ifdef	CONFIG_VSERVER_PROC_SECURE
 	(1 << VCI_KCBIT_PROC_SECURE) |
 #endif
-#ifdef	CONFIG_VSERVER_IDLELIMIT
-	(1 << VCI_KCBIT_IDLELIMIT) |
-#endif
-#ifdef	CONFIG_VSERVER_IDLETIME
-	(1 << VCI_KCBIT_IDLETIME) |
-#endif
 #ifdef	CONFIG_VSERVER_COWBL
 	(1 << VCI_KCBIT_COWBL) |
 	(1 << VCI_KCBIT_FULLCOWBL) |