locking fixes left over from v4.2
Linus,
Please pull the latest locking-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-for-linus
# HEAD: 33fef662d20a8a98bafa6b2430b845def30f616a tools/liblockdep: Use the rbtree header provided by common tools headers
Three liblockdep fixes left over from the v4.2 cycle.
Thanks,
Ingo
------------------>
Sasha Levin (3):
tools: Restore export.h
tools/liblockdep: Correct macro for WARN
tools/liblockdep: Use the rbtree header provided by common tools headers
tools/include/linux/export.h | 10 ++++++++++ tools/lib/lockdep/preload.c | 2 +- tools/lib/lockdep/uinclude/linux/kernel.h | 2 +- tools/lib/lockdep/uinclude/linux/rbtree.h | 1 - 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 tools/include/linux/export.h delete mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h
tools/include/linux/export.h new file +10 -0
@@ -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
tools/lib/lockdep/preload.c +1 -1
@@ -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
tools/lib/lockdep/uinclude/linux/kernel.h +1 -1
@@ -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
tools/lib/lockdep/uinclude/linux/rbtree.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../../../include/linux/rbtree.h"