Commit d0df09eb authored by Frederic Weisbecker's avatar Frederic Weisbecker

context_tracking: Rename context_tracking_active() to context_tracking_cpu_is_enabled()

We currently have a confusing couple of API naming with the existing
context_tracking_active() and context_tracking_is_enabled().

Lets keep the latter one, context_tracking_is_enabled(), for global
context tracking state check and use context_tracking_cpu_is_enabled()
for local state check.
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
parent 58135f57
...@@ -26,14 +26,15 @@ static inline bool context_tracking_is_enabled(void) ...@@ -26,14 +26,15 @@ static inline bool context_tracking_is_enabled(void)
{ {
return static_key_false(&context_tracking_enabled); return static_key_false(&context_tracking_enabled);
} }
static inline bool context_tracking_in_user(void)
static inline bool context_tracking_cpu_is_enabled(void)
{ {
return __this_cpu_read(context_tracking.state) == IN_USER; return __this_cpu_read(context_tracking.active);
} }
static inline bool context_tracking_active(void) static inline bool context_tracking_in_user(void)
{ {
return __this_cpu_read(context_tracking.active); return __this_cpu_read(context_tracking.state) == IN_USER;
} }
#else #else
static inline bool context_tracking_in_user(void) { return false; } static inline bool context_tracking_in_user(void) { return false; }
......
...@@ -20,7 +20,7 @@ static inline bool vtime_accounting_enabled(void) { return true; } ...@@ -20,7 +20,7 @@ static inline bool vtime_accounting_enabled(void) { return true; }
static inline bool vtime_accounting_enabled(void) static inline bool vtime_accounting_enabled(void)
{ {
if (context_tracking_is_enabled()) { if (context_tracking_is_enabled()) {
if (context_tracking_active()) if (context_tracking_cpu_is_enabled())
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment