---

yaml
---
r: 69085
b: refs/heads/master
c: fb61558
h: refs/heads/master
i:
  69083: a7bd7dc
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b39c5dd7f938775fd0a1df5b4b1c26f854d15231
+refs/heads/master: fb615581c78efee25e4d04f1145e8fa8ec705dc3

trunk/init/Kconfig

@@ -282,23 +282,23 @@ 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
 	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.
+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
 

trunk/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;