diff options
| -rw-r--r-- | init/Kconfig | 14 | ||||
| -rw-r--r-- | kernel/sched_debug.c | 8 |
2 files changed, 9 insertions, 13 deletions
diff --git a/init/Kconfig b/init/Kconfig index faed9a0b6f24..54f31a191b88 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -282,11 +282,11 @@ config CPUSETS Say N if unsure. config FAIR_GROUP_SCHED - bool "Fair group cpu scheduler" + bool "Fair group CPU scheduler" default y depends on EXPERIMENTAL help - This feature lets cpu scheduler recognize task groups and control cpu + This feature lets CPU scheduler recognize task groups and control CPU bandwidth allocation to such task groups. choice @@ -294,11 +294,11 @@ choice 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. +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 diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index 995bbd384a97..48748d04144d 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c @@ -239,11 +239,7 @@ static int root_user_share_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) { - int len; - - len = sprintf(page, "%d\n", init_task_grp_load); - - return len; + return sprintf(page, "%d\n", init_task_grp_load); } static int @@ -297,7 +293,7 @@ static int __init init_sched_debug_procfs(void) pe->proc_fops = &sched_debug_fops; #ifdef CONFIG_FAIR_USER_SCHED - pe = create_proc_entry("root_user_share", 0644, NULL); + pe = create_proc_entry("root_user_cpu_share", 0644, NULL); if (!pe) return -ENOMEM; |