diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 09:17:26 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 09:17:26 +0300 |
| commit | e161183ba674f97fce748384f5bb037d07bdc5c9 (patch) | |
| tree | 5b3bd4b995f6435ee977b71082244fa1a647f717 /kernel/trace/ftrace.c | |
| parent | 2ef7f0dab6b3d171b6aff00a47077385ae3155b5 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
| download | linux-e161183ba674f97fce748384f5bb037d07bdc5c9.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/trace/ftrace.c')
| -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 9a236ffe2aa4..fdf913dfc7e8 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2033,7 +2033,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 *), @@ -2042,6 +2042,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); |