OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/build' into locking/core, to pick up dependent patches and unify...
[uclinux-h8/linux.git]
/
kernel
/
locking
/
lockdep.c
diff --git
a/kernel/locking/lockdep.c
b/kernel/locking/lockdep.c
index
8a732c8
..
be76f47
100644
(file)
--- a/
kernel/locking/lockdep.c
+++ b/
kernel/locking/lockdep.c
@@
-55,7
+55,6
@@
#include "lockdep_internals.h"
-#include <trace/events/preemptirq.h>
#define CREATE_TRACE_POINTS
#include <trace/events/lock.h>