Commit e10994ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

tools/include/linux/export.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include "../../../include/linux/rbtree.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE