summaryrefslogtreecommitdiffstats
path: root/kernel/tools/lib/lockdep
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/tools/lib/lockdep')
-rw-r--r--kernel/tools/lib/lockdep/Makefile6
-rw-r--r--kernel/tools/lib/lockdep/common.c2
-rw-r--r--kernel/tools/lib/lockdep/include/liblockdep/common.h2
-rw-r--r--kernel/tools/lib/lockdep/preload.c2
-rw-r--r--kernel/tools/lib/lockdep/uinclude/linux/compiler.h2
-rw-r--r--kernel/tools/lib/lockdep/uinclude/linux/kernel.h2
-rw-r--r--kernel/tools/lib/lockdep/uinclude/linux/lockdep.h3
-rw-r--r--kernel/tools/lib/lockdep/uinclude/linux/rbtree.h1
8 files changed, 13 insertions, 7 deletions
diff --git a/kernel/tools/lib/lockdep/Makefile b/kernel/tools/lib/lockdep/Makefile
index 18ffccf00..7e319afac 100644
--- a/kernel/tools/lib/lockdep/Makefile
+++ b/kernel/tools/lib/lockdep/Makefile
@@ -93,8 +93,10 @@ else
print_install = echo ' INSTALL '$1' to $(DESTDIR_SQ)$2';
endif
+all:
+
export srctree OUTPUT CC LD CFLAGS V
-build := -f $(srctree)/tools/build/Makefile.build dir=. obj
+include $(srctree)/tools/build/Makefile.include
do_compile_shared_library = \
($(print_shared_lib_compile) \
@@ -109,7 +111,7 @@ CMD_TARGETS = $(LIB_FILE)
TARGETS = $(CMD_TARGETS)
-all: all_cmd
+all: fixdep all_cmd
all_cmd: $(CMD_TARGETS)
diff --git a/kernel/tools/lib/lockdep/common.c b/kernel/tools/lib/lockdep/common.c
index 8ef602f18..9be663340 100644
--- a/kernel/tools/lib/lockdep/common.c
+++ b/kernel/tools/lib/lockdep/common.c
@@ -18,7 +18,7 @@ __attribute__((constructor)) static void liblockdep_init(void)
__attribute__((destructor)) static void liblockdep_exit(void)
{
- debug_check_no_locks_held(&current_obj);
+ debug_check_no_locks_held();
}
struct task_struct *__curr(void)
diff --git a/kernel/tools/lib/lockdep/include/liblockdep/common.h b/kernel/tools/lib/lockdep/include/liblockdep/common.h
index 0bda63002..a60c14b96 100644
--- a/kernel/tools/lib/lockdep/include/liblockdep/common.h
+++ b/kernel/tools/lib/lockdep/include/liblockdep/common.h
@@ -43,6 +43,8 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass,
struct lockdep_map *nest_lock, unsigned long ip);
void lock_release(struct lockdep_map *lock, int nested,
unsigned long ip);
+extern void debug_check_no_locks_freed(const void *from, unsigned long len);
+extern void lockdep_init(void);
#define STATIC_LOCKDEP_MAP_INIT(_name, _key) \
{ .name = (_name), .key = (void *)(_key), }
diff --git a/kernel/tools/lib/lockdep/preload.c b/kernel/tools/lib/lockdep/preload.c
index 0b0112c80..21cdf869a 100644
--- a/kernel/tools/lib/lockdep/preload.c
+++ b/kernel/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/kernel/tools/lib/lockdep/uinclude/linux/compiler.h b/kernel/tools/lib/lockdep/uinclude/linux/compiler.h
index 7ac838a1f..6386dc318 100644
--- a/kernel/tools/lib/lockdep/uinclude/linux/compiler.h
+++ b/kernel/tools/lib/lockdep/uinclude/linux/compiler.h
@@ -3,5 +3,7 @@
#define __used __attribute__((__unused__))
#define unlikely
+#define WRITE_ONCE(x, val) x=(val)
+#define RCU_INIT_POINTER(p, v) p=(v)
#endif
diff --git a/kernel/tools/lib/lockdep/uinclude/linux/kernel.h b/kernel/tools/lib/lockdep/uinclude/linux/kernel.h
index cd2cc59a5..276c7a8b2 100644
--- a/kernel/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/kernel/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
diff --git a/kernel/tools/lib/lockdep/uinclude/linux/lockdep.h b/kernel/tools/lib/lockdep/uinclude/linux/lockdep.h
index c1552c285..c808c7d02 100644
--- a/kernel/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/kernel/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -6,7 +6,7 @@
#include <string.h>
#include <limits.h>
#include <linux/utsname.h>
-
+#include <linux/compiler.h>
#define MAX_LOCK_DEPTH 2000UL
@@ -54,5 +54,6 @@ static struct new_utsname *init_utsname(void)
#define static_obj(x) 1
#define debug_show_all_locks()
+extern void debug_check_no_locks_held(void);
#endif
diff --git a/kernel/tools/lib/lockdep/uinclude/linux/rbtree.h b/kernel/tools/lib/lockdep/uinclude/linux/rbtree.h
deleted file mode 100644
index 965901db4..000000000
--- a/kernel/tools/lib/lockdep/uinclude/linux/rbtree.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/rbtree.h"