Commit e10994ff authored by Linus Torvalds's avatar Linus Torvalds

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
parents 5757bd61 33fef662
#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
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sysexits.h> #include <sysexits.h>
#include "include/liblockdep/mutex.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 * struct lock_lookup - liblockdep's view of a single unique lock
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#define WARN_ON(x) (x) #define WARN_ON(x) (x)
#define WARN_ON_ONCE(x) (x) #define WARN_ON_ONCE(x) (x)
#define likely(x) (x) #define likely(x) (x)
#define WARN(x, y, z) (x) #define WARN(x, y...) (x)
#define uninitialized_var(x) x #define uninitialized_var(x) x
#define __init #define __init
#define noinline #define noinline
......
#include "../../../include/linux/rbtree.h"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment