aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lib/lockdep
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2015-08-25 01:19:45 -0400
committerIngo Molnar <mingo@kernel.org>2015-08-25 09:44:23 +0200
commit33fef662d20a8a98bafa6b2430b845def30f616a (patch)
treebc1a9983b71cac497a948d5419dc5686e9b2f521 /tools/lib/lockdep
parenttools/liblockdep: Correct macro for WARN (diff)
downloadlinux-dev-33fef662d20a8a98bafa6b2430b845def30f616a.tar.xz
linux-dev-33fef662d20a8a98bafa6b2430b845def30f616a.zip
tools/liblockdep: Use the rbtree header provided by common tools headers
Recent changes to rbtree.h may break compilation. There is no reason to use a liblockdep specific header to begin with, so we'll use the one shared with all other tools/. Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1440479985-6696-3-git-send-email-sasha.levin@oracle.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib/lockdep')
-rw-r--r--tools/lib/lockdep/preload.c2
-rw-r--r--tools/lib/lockdep/uinclude/linux/rbtree.h1
2 files changed, 1 insertions, 2 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
diff --git a/tools/lib/lockdep/uinclude/linux/rbtree.h b/tools/lib/lockdep/uinclude/linux/rbtree.h
deleted file mode 100644
index 965901db4862..000000000000
--- a/tools/lib/lockdep/uinclude/linux/rbtree.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/rbtree.h"