diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-09-23 17:08:43 -0400 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-09-23 17:08:43 -0400 |
commit | d7a4b414eed51f1653bb05ebe84122bf9a7ae18b (patch) | |
tree | bd6603a0c27de4c138a1767871897e9cd3e1a1d2 /include/linux/dtlk.h | |
parent | 1f0ab40976460bc4673fa204ce917a725185d8f2 (diff) | |
parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) |
Merge commit 'linus/master' into tracing/kprobes
Conflicts:
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_types.h
kernel/trace/trace_export.c
Merge reason:
Sync with latest significant tracing core changes.
Diffstat (limited to 'include/linux/dtlk.h')
-rw-r--r-- | include/linux/dtlk.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/dtlk.h b/include/linux/dtlk.h index 2896d90118a9..22a7b9a5f5d1 100644 --- a/include/linux/dtlk.h +++ b/include/linux/dtlk.h | |||
@@ -1,22 +1,3 @@ | |||
1 | #if 0 | ||
2 | |||
3 | #define TRACE_TXT(text) \ | ||
4 | { \ | ||
5 | if(dtlk_trace) \ | ||
6 | { \ | ||
7 | console_print(text); \ | ||
8 | console_print("\n"); \ | ||
9 | } \ | ||
10 | } | ||
11 | |||
12 | #define TRACE_CHR(chr) \ | ||
13 | { \ | ||
14 | if(dtlk_trace) \ | ||
15 | console_print(chr); \ | ||
16 | } \ | ||
17 | |||
18 | #endif | ||
19 | |||
20 | #define DTLK_MINOR 0 | 1 | #define DTLK_MINOR 0 |
21 | #define DTLK_IO_EXTENT 0x02 | 2 | #define DTLK_IO_EXTENT 0x02 |
22 | 3 | ||