Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfaa9c94 authored by William Lee Irwin III's avatar William Lee Irwin III Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5418b692

kernel/profile.c

+10 −6
Original line number Diff line number Diff line
@@ -49,15 +49,19 @@ static DECLARE_MUTEX(profile_flip_mutex); 


static int __init profile_setup(char * str)

{

	static char __initdata schedstr[] = "schedule";

	int par;



	if (!strncmp(str, "schedule", 8)) {

	if (!strncmp(str, schedstr, strlen(schedstr))) {

		prof_on = SCHED_PROFILING;

		printk(KERN_INFO "kernel schedule profiling enabled\n");

		if (str[7] == ',')

			str += 8;

	}

	if (get_option(&str,&par)) {

		if (str[strlen(schedstr)] == ',')

			str += strlen(schedstr) + 1;

		if (get_option(&str, &par))

			prof_shift = par;

		printk(KERN_INFO

			"kernel schedule profiling enabled (shift: %ld)\n",

			prof_shift);

	} else if (get_option(&str, &par)) {

		prof_shift = par;

		prof_on = CPU_PROFILING;

		printk(KERN_INFO "kernel profiling enabled (shift: %ld)\n",