2 files changed, 22 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d54d0cadcc06..54f31a191b88 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -281,6 +281,27 @@ config CPUSETS
 
           Say N if unsure.
 
+config FAIR_GROUP_SCHED
+        bool "Fair group CPU scheduler"
+        default y
+        depends on EXPERIMENTAL
+        help
+          This feature lets CPU scheduler recognize task groups and control CPU
+          bandwidth allocation to such task groups.
+
+choice
+        depends on FAIR_GROUP_SCHED
+        prompt "Basis for grouping tasks"
+        default FAIR_USER_SCHED
+
+config FAIR_USER_SCHED
+        bool "user id"
+        help
+          This option will choose userid as the basis for grouping
+          tasks, thus providing equal CPU bandwidth to each user.
+
+endchoice
+
 config SYSFS_DEPRECATED
         bool "Create deprecated sysfs files"
         default y
diff --git a/init/calibrate.c b/init/calibrate.c
index 40ff3b404895..2d3d73bd4ce1 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -10,7 +10,7 @@
 
 #include <asm/timex.h>
 
-static unsigned long preset_lpj;
+unsigned long preset_lpj;
 static int __init lpj_setup(char *str)
 {
         preset_lpj = simple_strtoul(str,NULL,0);