projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'external-indirect' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
include
/
linux
/
ftrace_event.h
diff --git
a/include/linux/ftrace_event.h
b/include/linux/ftrace_event.h
index 1a99e7939c2b7274cc6d8efec7f3e93d1035f232..22b32af1b5ec3d1aa81ddebbc2de1ace29c17cc6 100644
(file)
--- a/
include/linux/ftrace_event.h
+++ b/
include/linux/ftrace_event.h
@@
-37,7
+37,6
@@
struct trace_entry {
unsigned char flags;
unsigned char preempt_count;
int pid;
- int lock_depth;
};
#define FTRACE_MAX_EVENT \