context_tracking: Rename context_tracking_active() to context_tracking_cpu_is_enabled()

fweisbec · fweisbec · commit d0df09ebfc12 · 2013-12-02T20:43:15.000+01:00
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: Frederic Weisbecker &lt;fweisbec@gmail.com&gt;
Cc: Thomas Gleixner &lt;tglx@linutronix.de&gt;
Cc: Ingo Molnar &lt;mingo@kernel.org&gt;
Cc: Peter Zijlstra &lt;peterz@infradead.org&gt;
Cc: Oleg Nesterov &lt;oleg@redhat.com&gt;
Cc: Steven Rostedt &lt;rostedt@goodmis.org&gt;
diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h
@@ -26,14 +26,15 @@ static inline bool context_tracking_is_enabled(void)
 {
 	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
 static inline bool context_tracking_in_user(void) { return false; }
diff --git a/include/linux/vtime.h b/include/linux/vtime.h
@@ -20,7 +20,7 @@ static inline bool vtime_accounting_enabled(void) { return true; }
 static inline bool vtime_accounting_enabled(void)
 {
 	if (context_tracking_is_enabled()) {
-		if (context_tracking_active())
+		if (context_tracking_cpu_is_enabled())
 			return true;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,15 @@ static inline bool context_tracking_is_enabled(void)`
`26`	`26`	`{`
`27`	`27`	`return static_key_false(&context_tracking_enabled);`
`28`	`28`	`}`
`29`		`-static inline bool context_tracking_in_user(void)`
	`29`	`+`
	`30`	`+static inline bool context_tracking_cpu_is_enabled(void)`
`30`	`31`	`{`
`31`		`- return __this_cpu_read(context_tracking.state) == IN_USER;`
	`32`	`+ return __this_cpu_read(context_tracking.active);`
`32`	`33`	`}`
`33`	`34`
`34`		`-static inline bool context_tracking_active(void)`
	`35`	`+static inline bool context_tracking_in_user(void)`
`35`	`36`	`{`
`36`		`- return __this_cpu_read(context_tracking.active);`
	`37`	`+ return __this_cpu_read(context_tracking.state) == IN_USER;`
`37`	`38`	`}`
`38`	`39`	`#else`
`39`	`40`	`static inline bool context_tracking_in_user(void) { return false; }`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ static inline bool vtime_accounting_enabled(void) { return true; }`
`20`	`20`	`static inline bool vtime_accounting_enabled(void)`
`21`	`21`	`{`
`22`	`22`	`if (context_tracking_is_enabled()) {`
`23`		`- if (context_tracking_active())`
	`23`	`+ if (context_tracking_cpu_is_enabled())`
`24`	`24`	`return true;`
`25`	`25`	`}`
`26`	`26`