summaryrefslogtreecommitdiff
path: root/kernel/profile.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2004-10-18 08:55:12 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-18 08:55:12 -0700
commit0105467f1b4a7545f2a2c38a82e0b283bb3bc9b1 (patch)
tree5c71a77bbe5053c7a3b82c008bb48f861276c894 /kernel/profile.c
parent5f50cce9fce62c24f0d7bb911860b1e59e9c0349 (diff)
[PATCH] fix the prof=schedule feature
Fix mismerge of the "prof=schedule" feature. Without this patch the output is a boring empty profile. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/profile.c')
-rw-r--r--kernel/profile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/profile.c b/kernel/profile.c
index cab14764cea0..1c4375fad923 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -22,14 +22,14 @@ static int __init profile_setup(char * str)
int par;
if (!strncmp(str, "schedule", 8)) {
- prof_on = 2;
+ prof_on = SCHED_PROFILING;
printk(KERN_INFO "kernel schedule profiling enabled\n");
if (str[7] == ',')
str += 8;
}
if (get_option(&str,&par)) {
prof_shift = par;
- prof_on = 1;
+ prof_on = CPU_PROFILING;
printk(KERN_INFO "kernel profiling enabled (shift: %ld)\n",
prof_shift);
}