sizes.h: add SZ_8G/SZ_16G/SZ_32G macros

[linux-2.6-microblaze.git] / kernel / context_tracking.c

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index ce43088..36a98c4 100644 (file)
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -31,7 +31,7 @@ EXPORT_SYMBOL_GPL(context_tracking_key);
 DEFINE_PER_CPU(struct context_tracking, context_tracking);
 EXPORT_SYMBOL_GPL(context_tracking);
 
-static bool context_tracking_recursion_enter(void)
+static noinstr bool context_tracking_recursion_enter(void)
 {
        int recursion;
 
@@ -45,7 +45,7 @@ static bool context_tracking_recursion_enter(void)
        return false;
 }
 
-static void context_tracking_recursion_exit(void)
+static __always_inline void context_tracking_recursion_exit(void)
 {
        __this_cpu_dec(context_tracking.recursion);
 }
@@ -59,7 +59,7 @@ static void context_tracking_recursion_exit(void)
  * instructions to execute won't use any RCU read side critical section
  * because this function sets RCU in extended quiescent state.
  */
-void __context_tracking_enter(enum ctx_state state)
+void noinstr __context_tracking_enter(enum ctx_state state)
 {
        /* Kernel threads aren't supposed to go to userspace */
        WARN_ON_ONCE(!current->mm);
@@ -77,8 +77,10 @@ void __context_tracking_enter(enum ctx_state state)
                         * on the tick.
                         */
                        if (state == CONTEXT_USER) {
+                               instrumentation_begin();
                                trace_user_enter(0);
                                vtime_user_enter(current);
+                               instrumentation_end();
                        }
                        rcu_user_enter();
                }
@@ -99,7 +101,6 @@ void __context_tracking_enter(enum ctx_state state)
        }
        context_tracking_recursion_exit();
 }
-NOKPROBE_SYMBOL(__context_tracking_enter);
 EXPORT_SYMBOL_GPL(__context_tracking_enter);
 
 void context_tracking_enter(enum ctx_state state)
@@ -142,7 +143,7 @@ NOKPROBE_SYMBOL(context_tracking_user_enter);
  * This call supports re-entrancy. This way it can be called from any exception
  * handler without needing to know if we came from userspace or not.
  */
-void __context_tracking_exit(enum ctx_state state)
+void noinstr __context_tracking_exit(enum ctx_state state)
 {
        if (!context_tracking_recursion_enter())
                return;
@@ -155,15 +156,16 @@ void __context_tracking_exit(enum ctx_state state)
                         */
                        rcu_user_exit();
                        if (state == CONTEXT_USER) {
+                               instrumentation_begin();
                                vtime_user_exit(current);
                                trace_user_exit(0);
+                               instrumentation_end();
                        }
                }
                __this_cpu_write(context_tracking.state, CONTEXT_KERNEL);
        }
        context_tracking_recursion_exit();
 }
-NOKPROBE_SYMBOL(__context_tracking_exit);
 EXPORT_SYMBOL_GPL(__context_tracking_exit);
 
 void context_tracking_exit(enum ctx_state state)