提交 dfaa9c94 编写于 作者: W William Lee Irwin III 提交者: Linus Torvalds

[PATCH] profile.c: `schedule' parsing fix

profile=schedule parsing is not quite what it should be.  First, str[7] is
'e', not ',', but then even if it did fall through, prof_on =
SCHED_PROFILING would be clobbered inside if (get_option(...)) So a small
amount of rearrangement is done in this patch to correct it.
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 5418b692
...@@ -49,15 +49,19 @@ static DECLARE_MUTEX(profile_flip_mutex); ...@@ -49,15 +49,19 @@ static DECLARE_MUTEX(profile_flip_mutex);
static int __init profile_setup(char * str) static int __init profile_setup(char * str)
{ {
static char __initdata schedstr[] = "schedule";
int par; int par;
if (!strncmp(str, "schedule", 8)) { if (!strncmp(str, schedstr, strlen(schedstr))) {
prof_on = SCHED_PROFILING; prof_on = SCHED_PROFILING;
printk(KERN_INFO "kernel schedule profiling enabled\n"); if (str[strlen(schedstr)] == ',')
if (str[7] == ',') str += strlen(schedstr) + 1;
str += 8; if (get_option(&str, &par))
} prof_shift = par;
if (get_option(&str,&par)) { printk(KERN_INFO
"kernel schedule profiling enabled (shift: %ld)\n",
prof_shift);
} else if (get_option(&str, &par)) {
prof_shift = par; prof_shift = par;
prof_on = CPU_PROFILING; prof_on = CPU_PROFILING;
printk(KERN_INFO "kernel profiling enabled (shift: %ld)\n", printk(KERN_INFO "kernel profiling enabled (shift: %ld)\n",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册