diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-31 19:11:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-31 19:11:50 -0700 |
| commit | e10994ff38ded64e4cd2267a6e404a4c8632bcf5 (patch) | |
| tree | d930979f3df479a2a913d810bbef016bb145bf16 /tools/lib/lockdep/preload.c | |
| parent | 5757bd6157f523ff0d448a4ec93938523ca441a9 (diff) | |
| parent | 33fef662d20a8a98bafa6b2430b845def30f616a (diff) | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull liblockdep fixes from Ingo Molnar:
"Three liblockdep fixes left over from the v4.2 cycle"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools/liblockdep: Use the rbtree header provided by common tools headers
tools/liblockdep: Correct macro for WARN
tools: Restore export.h
Diffstat (limited to 'tools/lib/lockdep/preload.c')
| -rw-r--r-- | tools/lib/lockdep/preload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c index 0b0112c80f22..21cdf869a01b 100644 --- a/tools/lib/lockdep/preload.c +++ b/tools/lib/lockdep/preload.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <sysexits.h> #include "include/liblockdep/mutex.h" -#include "../../../include/linux/rbtree.h" +#include "../../include/linux/rbtree.h" /** * struct lock_lookup - liblockdep's view of a single unique lock |