[PATCH 1/3] tools: restore export.h

[PATCH 1/3] tools: restore export.h

[Sasha Levin]

Commit 3f735377b ("tools: Copy lib/rbtree.c to tools/lib/") has removed
export.h, which was still in use by liblockdep. Restore it.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
 tools/include/linux/export.h | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tools/include/linux/export.h

diff --git a/tools/include/linux/export.h b/tools/include/linux/export.h
new file mode 100644
index 0000000..d07e586
--- /dev/null
+++ b/tools/include/linux/export.h
@@ -0,0 +1,10 @@
+#ifndef _TOOLS_LINUX_EXPORT_H_
+#define _TOOLS_LINUX_EXPORT_H_
+
+#define EXPORT_SYMBOL(sym)
+#define EXPORT_SYMBOL_GPL(sym)
+#define EXPORT_SYMBOL_GPL_FUTURE(sym)
+#define EXPORT_UNUSED_SYMBOL(sym)
+#define EXPORT_UNUSED_SYMBOL_GPL(sym)
+
+#endif
-- 
2.1.4

[PATCH 2/3] tools/liblockdep: correct macro for WARN

[Sasha Levin]

As Peter Zijlstra pointed out, the varargs for WARN() are optional, so we
need to correctly handle the case where they don't exist.

This would cause a compilation error.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
 tools/lib/lockdep/uinclude/linux/kernel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index cd2cc59..276c7a8 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -23,7 +23,7 @@
 #define WARN_ON(x) (x)
 #define WARN_ON_ONCE(x) (x)
 #define likely(x) (x)
-#define WARN(x, y, z) (x)
+#define WARN(x, y...) (x)
 #define uninitialized_var(x) x
 #define __init
 #define noinline
-- 
2.1.4

[tip:locking/urgent] tools/liblockdep: Correct macro for WARN

[tip-bot for Sasha Levin]

Commit-ID:  62b989de598c486df65a14dfd9bb4a9953c75568
Gitweb:     http://git.kernel.org/tip/62b989de598c486df65a14dfd9bb4a9953c75568
Author:     Sasha Levin <sasha.levin@oracle.com>
AuthorDate: Tue, 25 Aug 2015 01:19:44 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 25 Aug 2015 09:44:22 +0200

tools/liblockdep: Correct macro for WARN

As Peter Zijlstra pointed out, the varargs for WARN() are
optional, so we need to correctly handle the case where they
don't exist.

This would cause a compilation error.

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-2-git-send-email-sasha.levin@oracle.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 tools/lib/lockdep/uinclude/linux/kernel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index cd2cc59..276c7a8 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -23,7 +23,7 @@
 #define WARN_ON(x) (x)
 #define WARN_ON_ONCE(x) (x)
 #define likely(x) (x)
-#define WARN(x, y, z) (x)
+#define WARN(x, y...) (x)
 #define uninitialized_var(x) x
 #define __init
 #define noinline

[PATCH 3/3] tools/liblockdep: use the rbtree header provided by common tools headers

[Sasha Levin]

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>
---
 tools/lib/lockdep/preload.c               | 2 +-
 tools/lib/lockdep/uinclude/linux/rbtree.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h

diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c
index 0b0112c..21cdf86 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 965901d..0000000
--- a/tools/lib/lockdep/uinclude/linux/rbtree.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/rbtree.h"
-- 
2.1.4

[tip:locking/urgent] tools/liblockdep: Use the rbtree header provided by common tools headers

[tip-bot for Sasha Levin]

Commit-ID:  33fef662d20a8a98bafa6b2430b845def30f616a
Gitweb:     http://git.kernel.org/tip/33fef662d20a8a98bafa6b2430b845def30f616a
Author:     Sasha Levin <sasha.levin@oracle.com>
AuthorDate: Tue, 25 Aug 2015 01:19:45 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 25 Aug 2015 09:44:23 +0200

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>
---
 tools/lib/lockdep/preload.c               | 2 +-
 tools/lib/lockdep/uinclude/linux/rbtree.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c
index 0b0112c..21cdf86 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 965901d..0000000
--- a/tools/lib/lockdep/uinclude/linux/rbtree.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/rbtree.h"

[tip:locking/urgent] tools: Restore export.h

[tip-bot for Sasha Levin]

Commit-ID:  92e25fd9be82a37247e587415ff9a9e773008d56
Gitweb:     http://git.kernel.org/tip/92e25fd9be82a37247e587415ff9a9e773008d56
Author:     Sasha Levin <sasha.levin@oracle.com>
AuthorDate: Tue, 25 Aug 2015 01:19:43 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 25 Aug 2015 09:44:22 +0200

tools: Restore export.h

Commit 3f735377b ("tools: Copy lib/rbtree.c to tools/lib/") has
removed export.h, which was still in use by liblockdep. Restore
it.

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-1-git-send-email-sasha.levin@oracle.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 tools/include/linux/export.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/include/linux/export.h b/tools/include/linux/export.h
new file mode 100644
index 0000000..d07e586
--- /dev/null
+++ b/tools/include/linux/export.h
@@ -0,0 +1,10 @@
+#ifndef _TOOLS_LINUX_EXPORT_H_
+#define _TOOLS_LINUX_EXPORT_H_
+
+#define EXPORT_SYMBOL(sym)
+#define EXPORT_SYMBOL_GPL(sym)
+#define EXPORT_SYMBOL_GPL_FUTURE(sym)
+#define EXPORT_UNUSED_SYMBOL(sym)
+#define EXPORT_UNUSED_SYMBOL_GPL(sym)
+
+#endif