Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / linux / context_tracking_state.h

diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h
index 97a8122..6b7b96a 100644 (file)
--- a/include/linux/context_tracking_state.h
+++ b/include/linux/context_tracking_state.h
@@ -13,8 +13,9 @@ struct context_tracking {
         */
        bool active;
        enum ctx_state {
-               IN_KERNEL = 0,
-               IN_USER,
+               CONTEXT_KERNEL = 0,
+               CONTEXT_USER,
+               CONTEXT_GUEST,
        } state;
 };
 
@@ -34,11 +35,13 @@ static inline bool context_tracking_cpu_is_enabled(void)
 
 static inline bool context_tracking_in_user(void)
 {
-       return __this_cpu_read(context_tracking.state) == IN_USER;
+       return __this_cpu_read(context_tracking.state) == CONTEXT_USER;
 }
 #else
 static inline bool context_tracking_in_user(void) { return false; }
 static inline bool context_tracking_active(void) { return false; }
+static inline bool context_tracking_is_enabled(void) { return false; }
+static inline bool context_tracking_cpu_is_enabled(void) { return false; }
 #endif /* CONFIG_CONTEXT_TRACKING */
 
 #endif