summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2008-10-31 12:57:20 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-04 17:14:02 +0100
commit71566a0d161edec70361b7f90f6e54af6a6d5d05 (patch)
tree78d2d790ed4e20c179d2f61f2ed50ecbb6d5a451 /init
parent7a895f53cda9d9362c30144e42c124a1ae996b9e (diff)
downloadlinux-71566a0d161edec70361b7f90f6e54af6a6d5d05.tar.gz
linux-71566a0d161edec70361b7f90f6e54af6a6d5d05.tar.bz2
linux-71566a0d161edec70361b7f90f6e54af6a6d5d05.zip
tracing/fastboot: Enable boot tracing only during initcalls
Impact: modify boot tracer We used to disable the initcall tracing at a specified time (IE: end of builtin initcalls). But we don't need it anymore. It will be stopped when initcalls are finished. However we want two things: _Start this tracing only after pre-smp initcalls are finished. _Since we are planning to trace sched_switches at the same time, we want to enable them only during the initcall execution. For this purpose, this patch introduce two functions to enable/disable the sched_switch tracing during boot. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
-rw-r--r--init/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index 7e117a231af1..4b03cd5656ca 100644
--- a/init/main.c
+++ b/init/main.c
@@ -711,6 +711,7 @@ int do_one_initcall(initcall_t fn)
it.caller = task_pid_nr(current);
printk("calling %pF @ %i\n", fn, it.caller);
it.calltime = ktime_get();
+ enable_boot_trace();
}
it.result = fn();
@@ -722,6 +723,7 @@ int do_one_initcall(initcall_t fn)
printk("initcall %pF returned %d after %Ld usecs\n", fn,
it.result, it.duration);
trace_boot(&it, fn);
+ disable_boot_trace();
}
msgbuf[0] = 0;
@@ -882,7 +884,7 @@ static int __init kernel_init(void * unused)
* we're essentially up and running. Get rid of the
* initmem segments and start the user-mode stuff..
*/
- stop_boot_trace();
+
init_post();
return 0;
}