diff options
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index be682b62fe58..d39e8b7de6a2 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c | |||
| @@ -107,8 +107,7 @@ stack_trace_call(unsigned long ip, unsigned long parent_ip) | |||
| 107 | if (unlikely(!ftrace_enabled || stack_trace_disabled)) | 107 | if (unlikely(!ftrace_enabled || stack_trace_disabled)) |
| 108 | return; | 108 | return; |
| 109 | 109 | ||
| 110 | resched = need_resched(); | 110 | resched = ftrace_preempt_disable(); |
| 111 | preempt_disable_notrace(); | ||
| 112 | 111 | ||
| 113 | cpu = raw_smp_processor_id(); | 112 | cpu = raw_smp_processor_id(); |
| 114 | /* no atomic needed, we only modify this variable by this cpu */ | 113 | /* no atomic needed, we only modify this variable by this cpu */ |
| @@ -120,10 +119,7 @@ stack_trace_call(unsigned long ip, unsigned long parent_ip) | |||
| 120 | out: | 119 | out: |
| 121 | per_cpu(trace_active, cpu)--; | 120 | per_cpu(trace_active, cpu)--; |
| 122 | /* prevent recursion in schedule */ | 121 | /* prevent recursion in schedule */ |
| 123 | if (resched) | 122 | ftrace_preempt_enable(resched); |
| 124 | preempt_enable_no_resched_notrace(); | ||
| 125 | else | ||
| 126 | preempt_enable_notrace(); | ||
| 127 | } | 123 | } |
| 128 | 124 | ||
| 129 | static struct ftrace_ops trace_ops __read_mostly = | 125 | static struct ftrace_ops trace_ops __read_mostly = |