tracing: don't trace the BKL

No reason to trace it when the last user is gone.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>

diff --git a/include/trace/events/bkl.h b/include/trace/events/bkl.h
deleted file mode 100644 (file)
index 1af72dc..0000000
--- a/include/trace/events/bkl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM bkl
-
-#if !defined(_TRACE_BKL_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_BKL_H
-
-#include <linux/tracepoint.h>
-
-TRACE_EVENT(lock_kernel,
-
-       TP_PROTO(const char *func, const char *file, int line),
-
-       TP_ARGS(func, file, line),
-
-       TP_STRUCT__entry(
-               __field(        int,            depth                   )
-               __field_ext(    const char *,   func, FILTER_PTR_STRING )
-               __field_ext(    const char *,   file, FILTER_PTR_STRING )
-               __field(        int,            line                    )
-       ),
-
-       TP_fast_assign(
-               /* We want to record the lock_depth after lock is acquired */
-               __entry->depth = current->lock_depth + 1;
-               __entry->func = func;
-               __entry->file = file;
-               __entry->line = line;
-       ),
-
-       TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth,
-                 __entry->file, __entry->line, __entry->func)
-);
-
-TRACE_EVENT(unlock_kernel,
-
-       TP_PROTO(const char *func, const char *file, int line),
-
-       TP_ARGS(func, file, line),
-
-       TP_STRUCT__entry(
-               __field(int,            depth           )
-               __field(const char *,   func            )
-               __field(const char *,   file            )
-               __field(int,            line            )
-       ),
-
-       TP_fast_assign(
-               __entry->depth = current->lock_depth;
-               __entry->func = func;
-               __entry->file = file;
-               __entry->line = line;
-       ),
-
-       TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth,
-                 __entry->file, __entry->line, __entry->func)
-);
-
-#endif /* _TRACE_BKL_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>

diff --git a/lib/kernel_lock.c b/lib/kernel_lock.c
index b135d04..d80e122 100644 (file)
--- a/lib/kernel_lock.c
+++ b/lib/kernel_lock.c
@@ -10,9 +10,6 @@
 #include <linux/semaphore.h>
 #include <linux/smp_lock.h>
 
-#define CREATE_TRACE_POINTS
-#include <trace/events/bkl.h>
-
 /*
  * The 'big kernel lock'
  *
@@ -120,8 +117,6 @@ void __lockfunc _lock_kernel(const char *func, const char *file, int line)
 {
        int depth = current->lock_depth + 1;
 
-       trace_lock_kernel(func, file, line);
-
        if (likely(!depth)) {
                might_sleep();
                __lock_kernel();
@@ -134,8 +129,6 @@ void __lockfunc _unlock_kernel(const char *func, const char *file, int line)
        BUG_ON(current->lock_depth < 0);
        if (likely(--current->lock_depth < 0))
                __unlock_kernel();
-
-       trace_unlock_kernel(func, file, line);
 }
 
 EXPORT_SYMBOL(_lock_kernel);