2 files changed, 5 insertions, 5 deletions

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index 937ecdfdf258..8ad53c9d38b6 100644
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -75,7 +75,7 @@ void context_tracking_user_enter(void)
         WARN_ON_ONCE(!current->mm);
 
         local_irq_save(flags);
-        if ( __this_cpu_read(context_tracking.state) != IN_USER) {
+        if ( __this_cpu_read(context_tracking.state) != CONTEXT_USER) {
                 if (__this_cpu_read(context_tracking.active)) {
                         trace_user_enter(0);
                         /*
@@ -101,7 +101,7 @@ void context_tracking_user_enter(void)
                  * OTOH we can spare the calls to vtime and RCU when context_tracking.active
                  * is false because we know that CPU is not tickless.
                  */
-                __this_cpu_write(context_tracking.state, IN_USER);
+                __this_cpu_write(context_tracking.state, CONTEXT_USER);
         }
         local_irq_restore(flags);
 }
@@ -129,7 +129,7 @@ void context_tracking_user_exit(void)
                 return;
 
         local_irq_save(flags);
-        if (__this_cpu_read(context_tracking.state) == IN_USER) {
+        if (__this_cpu_read(context_tracking.state) == CONTEXT_USER) {
                 if (__this_cpu_read(context_tracking.active)) {
                         /*
                          * We are going to run code that may use RCU. Inform
@@ -139,7 +139,7 @@ void context_tracking_user_exit(void)
                         vtime_user_exit(current);
                         trace_user_exit(0);
                 }
-                __this_cpu_write(context_tracking.state, IN_KERNEL);
+                __this_cpu_write(context_tracking.state, CONTEXT_KERNEL);
         }
         local_irq_restore(flags);
 }
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f0f831e8a345..06b9a00871e0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2818,7 +2818,7 @@ asmlinkage __visible void __sched schedule_user(void)
          * we find a better solution.
          *
          * NB: There are buggy callers of this function.  Ideally we
-         * should warn if prev_state != IN_USER, but that will trigger
+         * should warn if prev_state != CONTEXT_USER, but that will trigger
          * too frequently to make sense yet.
          */
         enum ctx_state prev_state = exception_enter();