提交 37bd824a 编写于 作者: I Ingo Molnar

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

...@@ -2562,7 +2562,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list) ...@@ -2562,7 +2562,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
static int start_graph_tracing(void) static int start_graph_tracing(void)
{ {
struct ftrace_ret_stack **ret_stack_list; struct ftrace_ret_stack **ret_stack_list;
int ret; int ret, cpu;
ret_stack_list = kmalloc(FTRACE_RETSTACK_ALLOC_SIZE * ret_stack_list = kmalloc(FTRACE_RETSTACK_ALLOC_SIZE *
sizeof(struct ftrace_ret_stack *), sizeof(struct ftrace_ret_stack *),
...@@ -2571,6 +2571,10 @@ static int start_graph_tracing(void) ...@@ -2571,6 +2571,10 @@ static int start_graph_tracing(void)
if (!ret_stack_list) if (!ret_stack_list)
return -ENOMEM; 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 { do {
ret = alloc_retstack_tasklist(ret_stack_list); ret = alloc_retstack_tasklist(ret_stack_list);
} while (ret == -EAGAIN); } while (ret == -EAGAIN);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册