summaryrefslogtreecommitdiffstats
path: root/kernel/tools/lib/lockdep/uinclude
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-11 10:41:07 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-13 08:17:18 +0300
commite09b41010ba33a20a87472ee821fa407a5b8da36 (patch)
treed10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/tools/lib/lockdep/uinclude
parentf93b97fd65072de626c074dbe099a1fff05ce060 (diff)
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page. During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/tools/lib/lockdep/uinclude')
-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
4 files changed, 5 insertions, 3 deletions
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"