diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-18 01:08:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-18 01:08:13 +0100 |
| commit | 37bd824a35a60abc73e5fa8816bd5f50c913d69b (patch) | |
| tree | e6f718191893ccb713f854fc8bf4a5866a41fe2b | |
| parent | 73d3fd96e77745742f3750b7b19ee42204adc210 (diff) | |
| parent | 5b058bcde961bf28678a70e44c079107313543b6 (diff) | |
| download | linux-37bd824a35a60abc73e5fa8816bd5f50c913d69b.tar.gz linux-37bd824a35a60abc73e5fa8816bd5f50c913d69b.tar.bz2 linux-37bd824a35a60abc73e5fa8816bd5f50c913d69b.zip | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
| -rw-r--r-- | kernel/trace/ftrace.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 4e6c87ecf1bf..aee95aea57e4 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2562,7 +2562,7 @@ free: static int start_graph_tracing(void) { struct ftrace_ret_stack **ret_stack_list; - int ret; + int ret, cpu; ret_stack_list = kmalloc(FTRACE_RETSTACK_ALLOC_SIZE * sizeof(struct ftrace_ret_stack *), @@ -2571,6 +2571,10 @@ static int start_graph_tracing(void) if (!ret_stack_list) return -ENOMEM; + /* The cpu_boot init_task->ret_stack will never be freed */ + for_each_online_cpu(cpu) + ftrace_graph_init_task(idle_task(cpu)); + do { ret = alloc_retstack_tasklist(ret_stack_list); } while (ret == -EAGAIN); |