projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc4a41f
)
ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able
author
Zev Weiss
<zev@bewilderbeest.net>
Wed, 30 Aug 2017 10:36:38 +0000
(
05:36
-0500)
committer
Steven Rostedt (VMware)
<rostedt@goodmis.org>
Thu, 31 Aug 2017 19:49:11 +0000
(15:49 -0400)
stack_tracer_disable()/stack_tracer_enable() had been using the wrong
name for the config symbol to enable their preempt-debugging checks --
fix with a word swap.
Link:
http://lkml.kernel.org/r/20170831154036.4xldyakmmhuts5x7@hatter.bewilderbeest.net
Cc: stable@vger.kernel.org
Fixes:
8aaf1ee70e
("tracing: Rename trace_active to disable_stack_tracer and inline its modification")
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
include/linux/ftrace.h
patch
|
blob
|
blame
|
history
diff --git
a/include/linux/ftrace.h
b/include/linux/ftrace.h
index 6383115e9d2c5c6459973a1d2d74609aeb438b9f..2e028854bac779c1282b5c7201904ef7194f89a0 100644
(file)
--- a/
include/linux/ftrace.h
+++ b/
include/linux/ftrace.h
@@
-307,7
+307,7
@@
DECLARE_PER_CPU(int, disable_stack_tracer);
static inline void stack_tracer_disable(void)
{
/* Preemption or interupts must be disabled */
- if (IS_ENABLED(CONFIG_
PREEMPT_DEBUG
))
+ if (IS_ENABLED(CONFIG_
DEBUG_PREEMPT
))
WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
this_cpu_inc(disable_stack_tracer);
}
@@
-320,7
+320,7
@@
static inline void stack_tracer_disable(void)
*/
static inline void stack_tracer_enable(void)
{
- if (IS_ENABLED(CONFIG_
PREEMPT_DEBUG
))
+ if (IS_ENABLED(CONFIG_
DEBUG_PREEMPT
))
WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
this_cpu_dec(disable_stack_tracer);
}