Merge branch 'master' into for-next

[mv-sheeva.git] / kernel / perf_event.c

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 2870feee81dd7a046703645c9ec50022d4339f39..83d8fd991c860a26a7a13eb6fba9e355b2258b97 100644 (file)
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4518,7 +4518,7 @@ int perf_swevent_get_recursion_context(void)
 }
 EXPORT_SYMBOL_GPL(perf_swevent_get_recursion_context);
 
-void inline perf_swevent_put_recursion_context(int rctx)
+inline void perf_swevent_put_recursion_context(int rctx)
 {
        struct swevent_htable *swhash = &__get_cpu_var(swevent_htable);