aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>2007-10-15 11:00:12 -0400
committerIngo Molnar <mingo@elte.hu>2007-10-15 11:00:12 -0400
commitfb615581c78efee25e4d04f1145e8fa8ec705dc3 (patch)
tree551be6606b62d8205672c4cc55884f6825171801
parentb39c5dd7f938775fd0a1df5b4b1c26f854d15231 (diff)
sched: group scheduler, fix coding style issues
Fix coding style issues reported by Randy Dunlap and others Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com> Signed-off-by: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--init/Kconfig14
-rw-r--r--kernel/sched_debug.c8
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
282 Say N if unsure. 282 Say N if unsure.
283 283
284config FAIR_GROUP_SCHED 284config FAIR_GROUP_SCHED
285 bool "Fair group cpu scheduler" 285 bool "Fair group CPU scheduler"
286 default y 286 default y
287 depends on EXPERIMENTAL 287 depends on EXPERIMENTAL
288 help 288 help
289 This feature lets cpu scheduler recognize task groups and control cpu 289 This feature lets CPU scheduler recognize task groups and control CPU
290 bandwidth allocation to such task groups. 290 bandwidth allocation to such task groups.
291 291
292choice 292choice
@@ -294,11 +294,11 @@ choice
294 prompt "Basis for grouping tasks" 294 prompt "Basis for grouping tasks"
295 default FAIR_USER_SCHED 295 default FAIR_USER_SCHED
296 296
297 config FAIR_USER_SCHED 297config FAIR_USER_SCHED
298 bool "user id" 298 bool "user id"
299 help 299 help
300 This option will choose userid as the basis for grouping 300 This option will choose userid as the basis for grouping
301 tasks, thus providing equal cpu bandwidth to each user. 301 tasks, thus providing equal CPU bandwidth to each user.
302 302
303endchoice 303endchoice
304 304
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
239root_user_share_read_proc(char *page, char **start, off_t off, int count, 239root_user_share_read_proc(char *page, char **start, off_t off, int count,
240 int *eof, void *data) 240 int *eof, void *data)
241{ 241{
242 int len; 242 return sprintf(page, "%d\n", init_task_grp_load);
243
244 len = sprintf(page, "%d\n", init_task_grp_load);
245
246 return len;
247} 243}
248 244
249static int 245static int
@@ -297,7 +293,7 @@ static int __init init_sched_debug_procfs(void)
297 pe->proc_fops = &sched_debug_fops; 293 pe->proc_fops = &sched_debug_fops;
298 294
299#ifdef CONFIG_FAIR_USER_SCHED 295#ifdef CONFIG_FAIR_USER_SCHED
300 pe = create_proc_entry("root_user_share", 0644, NULL); 296 pe = create_proc_entry("root_user_cpu_share", 0644, NULL);
301 if (!pe) 297 if (!pe)
302 return -ENOMEM; 298 return -ENOMEM;
303 299