mm/mempool.c: kasan: poison mempool elements

[firefly-linux-kernel-4.4.55.git] / kernel / context_tracking.c

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index 17715d811b71c147b619d2de7d0ab3a3595a2712..72d59a1a6eb66f54985aa8711e0d55ed46150628 100644 (file)
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -77,7 +77,6 @@ void context_tracking_enter(enum ctx_state state)
        local_irq_save(flags);
        if ( __this_cpu_read(context_tracking.state) != state) {
                if (__this_cpu_read(context_tracking.active)) {
-                       trace_user_enter(0);
                        /*
                         * At this stage, only low level arch entry code remains and
                         * then we'll run in userspace. We can assume there won't be
@@ -85,7 +84,10 @@ void context_tracking_enter(enum ctx_state state)
                         * user_exit() or rcu_irq_enter(). Let's remove RCU's dependency
                         * on the tick.
                         */
-                       vtime_user_enter(current);
+                       if (state == CONTEXT_USER) {
+                               trace_user_enter(0);
+                               vtime_user_enter(current);
+                       }
                        rcu_user_enter();
                }
                /*
@@ -106,6 +108,7 @@ void context_tracking_enter(enum ctx_state state)
        local_irq_restore(flags);
 }
 NOKPROBE_SYMBOL(context_tracking_enter);
+EXPORT_SYMBOL_GPL(context_tracking_enter);
 
 void context_tracking_user_enter(void)
 {
@@ -143,14 +146,17 @@ void context_tracking_exit(enum ctx_state state)
                         * RCU core about that (ie: we may need the tick again).
                         */
                        rcu_user_exit();
-                       vtime_user_exit(current);
-                       trace_user_exit(0);
+                       if (state == CONTEXT_USER) {
+                               vtime_user_exit(current);
+                               trace_user_exit(0);
+                       }
                }
                __this_cpu_write(context_tracking.state, CONTEXT_KERNEL);
        }
        local_irq_restore(flags);
 }
 NOKPROBE_SYMBOL(context_tracking_exit);
+EXPORT_SYMBOL_GPL(context_tracking_exit);
 
 void context_tracking_user_exit(void)
 {