diff options
-rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index ca9b7dfed8ef..07888e15c694 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -1344,7 +1344,7 @@ static void __ftrace_trace_stack(struct ring_buffer *buffer, | |||
1344 | */ | 1344 | */ |
1345 | preempt_disable_notrace(); | 1345 | preempt_disable_notrace(); |
1346 | 1346 | ||
1347 | use_stack = ++__get_cpu_var(ftrace_stack_reserve); | 1347 | use_stack = __this_cpu_inc_return(ftrace_stack_reserve); |
1348 | /* | 1348 | /* |
1349 | * We don't need any atomic variables, just a barrier. | 1349 | * We don't need any atomic variables, just a barrier. |
1350 | * If an interrupt comes in, we don't care, because it would | 1350 | * If an interrupt comes in, we don't care, because it would |
@@ -1398,7 +1398,7 @@ static void __ftrace_trace_stack(struct ring_buffer *buffer, | |||
1398 | out: | 1398 | out: |
1399 | /* Again, don't let gcc optimize things here */ | 1399 | /* Again, don't let gcc optimize things here */ |
1400 | barrier(); | 1400 | barrier(); |
1401 | __get_cpu_var(ftrace_stack_reserve)--; | 1401 | __this_cpu_dec(ftrace_stack_reserve); |
1402 | preempt_enable_notrace(); | 1402 | preempt_enable_notrace(); |
1403 | 1403 | ||
1404 | } | 1404 | } |