summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 17:21:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 17:21:00 -0700
commitf74b9444192c60603020c61d7915b72893137edc (patch)
tree8b1d16d373234038c2b045c9ceb3c33b93059e8a /include/trace
parent7a6362800cb7d1d618a697a650c7aaed3eb39320 (diff)
parent4ba8216cd90560bc402f52076f64d8546e8aefcb (diff)
downloadlinux-f74b9444192c60603020c61d7915b72893137edc.tar.bz2
Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: BKL: That's all, folks fs/locks.c: Remove stale FIXME left over from BKL conversion ipx: remove the BKL appletalk: remove the BKL x25: remove the BKL ufs: remove the BKL hpfs: remove the BKL drivers: remove extraneous includes of smp_lock.h tracing: don't trace the BKL adfs: remove the big kernel lock
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/bkl.h61
1 files changed, 0 insertions, 61 deletions
diff --git a/include/trace/events/bkl.h b/include/trace/events/bkl.h
deleted file mode 100644
index 1af72dc24278..000000000000
--- 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>