Merge tag 'f2fs-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

[linux.git] / include / linux / context_tracking.h

diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index d05609ad329d46373e875f7cabb77f3e30924572..64ec82851aa38a36bab4780e7f5a87df573f23cd 100644 (file)
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -22,26 +22,26 @@ extern void context_tracking_user_exit(void);
 
 static inline void user_enter(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                context_tracking_enter(CONTEXT_USER);
 
 }
 static inline void user_exit(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                context_tracking_exit(CONTEXT_USER);
 }
 
 /* Called with interrupts disabled.  */
 static inline void user_enter_irqoff(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                __context_tracking_enter(CONTEXT_USER);
 
 }
 static inline void user_exit_irqoff(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                __context_tracking_exit(CONTEXT_USER);
 }
 
@@ -49,7 +49,7 @@ static inline enum ctx_state exception_enter(void)
 {
        enum ctx_state prev_ctx;
 
-       if (!context_tracking_is_enabled())
+       if (!context_tracking_enabled())
                return 0;
 
        prev_ctx = this_cpu_read(context_tracking.state);
@@ -61,7 +61,7 @@ static inline enum ctx_state exception_enter(void)
 
 static inline void exception_exit(enum ctx_state prev_ctx)
 {
-       if (context_tracking_is_enabled()) {
+       if (context_tracking_enabled()) {
                if (prev_ctx != CONTEXT_KERNEL)
                        context_tracking_enter(prev_ctx);
        }
@@ -77,7 +77,7 @@ static inline void exception_exit(enum ctx_state prev_ctx)
  */
 static inline enum ctx_state ct_state(void)
 {
-       return context_tracking_is_enabled() ?
+       return context_tracking_enabled() ?
                this_cpu_read(context_tracking.state) : CONTEXT_DISABLED;
 }
 #else
@@ -90,7 +90,7 @@ static inline void exception_exit(enum ctx_state prev_ctx) { }
 static inline enum ctx_state ct_state(void) { return CONTEXT_DISABLED; }
 #endif /* !CONFIG_CONTEXT_TRACKING */
 
-#define CT_WARN_ON(cond) WARN_ON(context_tracking_is_enabled() && (cond))
+#define CT_WARN_ON(cond) WARN_ON(context_tracking_enabled() && (cond))
 
 #ifdef CONFIG_CONTEXT_TRACKING_FORCE
 extern void context_tracking_init(void);
@@ -103,12 +103,12 @@ static inline void context_tracking_init(void) { }
 /* must be called with irqs disabled */
 static inline void guest_enter_irqoff(void)
 {
-       if (vtime_accounting_cpu_enabled())
+       if (vtime_accounting_enabled_this_cpu())
                vtime_guest_enter(current);
        else
                current->flags |= PF_VCPU;
 
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                __context_tracking_enter(CONTEXT_GUEST);
 
        /* KVM does not hold any references to rcu protected data when it
@@ -118,16 +118,16 @@ static inline void guest_enter_irqoff(void)
         * one time slice). Lets treat guest mode as quiescent state, just like
         * we do with user-mode execution.
         */
-       if (!context_tracking_cpu_is_enabled())
+       if (!context_tracking_enabled_this_cpu())
                rcu_virt_note_context_switch(smp_processor_id());
 }
 
 static inline void guest_exit_irqoff(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                __context_tracking_exit(CONTEXT_GUEST);
 
-       if (vtime_accounting_cpu_enabled())
+       if (vtime_accounting_enabled_this_cpu())
                vtime_guest_exit(current);
        else
                current->flags &= ~PF_VCPU;
@@ -141,7 +141,7 @@ static inline void guest_enter_irqoff(void)
         * to assume that it's the stime pending cputime
         * to flush.
         */
-       vtime_account_system(current);
+       vtime_account_kernel(current);
        current->flags |= PF_VCPU;
        rcu_virt_note_context_switch(smp_processor_id());
 }
@@ -149,7 +149,7 @@ static inline void guest_enter_irqoff(void)
 static inline void guest_exit_irqoff(void)
 {
        /* Flush the guest cputime we spent on the guest */
-       vtime_account_system(current);
+       vtime_account_kernel(current);
        current->flags &= ~PF_VCPU;
 }
 #endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */