* [PATCH 0/1] tools: liblockdep: move to using tools/include/
@ 2017-05-31 0:38 Levin, Alexander (Sasha Levin)
2017-05-31 0:38 ` [PATCH 1/1] tools: liblockdep: remove private kernel headers Levin, Alexander (Sasha Levin)
2017-06-05 7:31 ` [PATCH 0/1] tools: liblockdep: move to using tools/include/ Ingo Molnar
0 siblings, 2 replies; 4+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-31 0:38 UTC (permalink / raw)
To: acme, mingo; +Cc: linux-kernel, Levin, Alexander (Sasha Levin)
This patch applies on top of the fixes sent a few days ago.
Just delete tools/lib/lockdep/uinclude and move the small bits of
missing functionality (and a few empty headers) into
tools/include/ .
Sasha Levin (1):
tools: liblockdep: remove private kernel headers
tools/include/asm/sections.h | 0
tools/include/linux/compiler.h | 12 +++++
.../uinclude => include}/linux/debug_locks.h | 1 +
tools/include/linux/delay.h | 0
tools/include/linux/ftrace.h | 0
tools/include/linux/gfp.h | 0
.../lockdep/uinclude => include}/linux/hardirq.h | 0
tools/include/linux/interrupt.h | 0
.../lockdep/uinclude => include}/linux/irqflags.h | 0
.../lockdep/uinclude => include}/linux/kallsyms.h | 0
.../uinclude => include}/linux/kern_levels.h | 0
tools/include/linux/kernel.h | 4 ++
.../lockdep/uinclude => include}/linux/kmemcheck.h | 0
tools/include/linux/linkage.h | 0
.../lockdep/uinclude => include}/linux/lockdep.h | 8 +++
.../lockdep/uinclude => include}/linux/module.h | 0
tools/include/linux/mutex.h | 0
tools/include/linux/proc_fs.h | 0
.../{lib/lockdep/uinclude => include}/linux/rcu.h | 1 +
tools/include/linux/seq_file.h | 0
tools/include/linux/spinlock.h | 26 +++++++++
.../uinclude => include}/linux/stacktrace.h | 0
tools/include/trace/events/lock.h | 0
tools/lib/lockdep/lockdep.c | 2 +
tools/lib/lockdep/preload.c | 2 -
tools/lib/lockdep/rbtree.c | 2 +-
tools/lib/lockdep/uinclude/asm/hash.h | 6 ---
tools/lib/lockdep/uinclude/asm/hweight.h | 3 --
tools/lib/lockdep/uinclude/asm/sections.h | 3 --
tools/lib/lockdep/uinclude/linux/compiler.h | 12 -----
tools/lib/lockdep/uinclude/linux/delay.h | 3 --
tools/lib/lockdep/uinclude/linux/ftrace.h | 3 --
tools/lib/lockdep/uinclude/linux/gfp.h | 3 --
tools/lib/lockdep/uinclude/linux/hash.h | 1 -
tools/lib/lockdep/uinclude/linux/interrupt.h | 3 --
tools/lib/lockdep/uinclude/linux/kernel.h | 61 ----------------------
tools/lib/lockdep/uinclude/linux/linkage.h | 3 --
tools/lib/lockdep/uinclude/linux/list.h | 1 -
tools/lib/lockdep/uinclude/linux/mutex.h | 3 --
tools/lib/lockdep/uinclude/linux/poison.h | 1 -
tools/lib/lockdep/uinclude/linux/prefetch.h | 6 ---
tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 --
.../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 -
tools/lib/lockdep/uinclude/linux/seq_file.h | 3 --
tools/lib/lockdep/uinclude/linux/spinlock.h | 25 ---------
tools/lib/lockdep/uinclude/linux/stringify.h | 7 ---
tools/lib/lockdep/uinclude/trace/events/lock.h | 3 --
47 files changed, 55 insertions(+), 158 deletions(-)
create mode 100644 tools/include/asm/sections.h
rename tools/{lib/lockdep/uinclude => include}/linux/debug_locks.h (91%)
create mode 100644 tools/include/linux/delay.h
create mode 100644 tools/include/linux/ftrace.h
create mode 100644 tools/include/linux/gfp.h
rename tools/{lib/lockdep/uinclude => include}/linux/hardirq.h (100%)
create mode 100644 tools/include/linux/interrupt.h
rename tools/{lib/lockdep/uinclude => include}/linux/irqflags.h (100%)
rename tools/{lib/lockdep/uinclude => include}/linux/kallsyms.h (100%)
rename tools/{lib/lockdep/uinclude => include}/linux/kern_levels.h (100%)
rename tools/{lib/lockdep/uinclude => include}/linux/kmemcheck.h (100%)
create mode 100644 tools/include/linux/linkage.h
rename tools/{lib/lockdep/uinclude => include}/linux/lockdep.h (81%)
rename tools/{lib/lockdep/uinclude => include}/linux/module.h (100%)
create mode 100644 tools/include/linux/mutex.h
create mode 100644 tools/include/linux/proc_fs.h
rename tools/{lib/lockdep/uinclude => include}/linux/rcu.h (89%)
create mode 100644 tools/include/linux/seq_file.h
rename tools/{lib/lockdep/uinclude => include}/linux/stacktrace.h (100%)
create mode 100644 tools/include/trace/events/lock.h
delete mode 100644 tools/lib/lockdep/uinclude/asm/hash.h
delete mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h
delete mode 100644 tools/lib/lockdep/uinclude/asm/sections.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/delay.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/hash.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/list.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/poison.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h
delete mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
--
2.11.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] tools: liblockdep: remove private kernel headers
2017-05-31 0:38 [PATCH 0/1] tools: liblockdep: move to using tools/include/ Levin, Alexander (Sasha Levin)
@ 2017-05-31 0:38 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:13 ` [tip:locking/core] tools/lib/lockdep: Remove " tip-bot for Levin, Alexander (Sasha Levin)
2017-06-05 7:31 ` [PATCH 0/1] tools: liblockdep: move to using tools/include/ Ingo Molnar
1 sibling, 1 reply; 4+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-31 0:38 UTC (permalink / raw)
To: acme, mingo; +Cc: linux-kernel, Levin, Alexander (Sasha Levin)
Move to using tools/include/ instead.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/include/asm/sections.h | 0
tools/include/linux/compiler.h | 12 +++++
.../uinclude => include}/linux/debug_locks.h | 1 +
tools/include/linux/delay.h | 0
tools/include/linux/ftrace.h | 0
tools/include/linux/gfp.h | 0
.../lockdep/uinclude => include}/linux/hardirq.h | 0
tools/include/linux/interrupt.h | 0
.../lockdep/uinclude => include}/linux/irqflags.h | 0
.../lockdep/uinclude => include}/linux/kallsyms.h | 0
.../uinclude => include}/linux/kern_levels.h | 0
tools/include/linux/kernel.h | 4 ++
.../lockdep/uinclude => include}/linux/kmemcheck.h | 0
tools/include/linux/linkage.h | 0
.../lockdep/uinclude => include}/linux/lockdep.h | 8 +++
.../lockdep/uinclude => include}/linux/module.h | 0
tools/include/linux/mutex.h | 0
tools/include/linux/proc_fs.h | 0
.../{lib/lockdep/uinclude => include}/linux/rcu.h | 1 +
tools/include/linux/seq_file.h | 0
tools/include/linux/spinlock.h | 26 +++++++++
.../uinclude => include}/linux/stacktrace.h | 0
tools/include/trace/events/lock.h | 0
tools/lib/lockdep/lockdep.c | 2 +
tools/lib/lockdep/preload.c | 2 -
tools/lib/lockdep/rbtree.c | 2 +-
tools/lib/lockdep/uinclude/asm/hash.h | 6 ---
tools/lib/lockdep/uinclude/asm/hweight.h | 3 --
tools/lib/lockdep/uinclude/asm/sections.h | 3 --
tools/lib/lockdep/uinclude/linux/compiler.h | 12 -----
tools/lib/lockdep/uinclude/linux/delay.h | 3 --
tools/lib/lockdep/uinclude/linux/ftrace.h | 3 --
tools/lib/lockdep/uinclude/linux/gfp.h | 3 --
tools/lib/lockdep/uinclude/linux/hash.h | 1 -
tools/lib/lockdep/uinclude/linux/interrupt.h | 3 --
tools/lib/lockdep/uinclude/linux/kernel.h | 61 ----------------------
tools/lib/lockdep/uinclude/linux/linkage.h | 3 --
tools/lib/lockdep/uinclude/linux/list.h | 1 -
tools/lib/lockdep/uinclude/linux/mutex.h | 3 --
tools/lib/lockdep/uinclude/linux/poison.h | 1 -
tools/lib/lockdep/uinclude/linux/prefetch.h | 6 ---
tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 --
.../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 -
tools/lib/lockdep/uinclude/linux/seq_file.h | 3 --
tools/lib/lockdep/uinclude/linux/spinlock.h | 25 ---------
tools/lib/lockdep/uinclude/linux/stringify.h | 7 ---
tools/lib/lockdep/uinclude/trace/events/lock.h | 3 --
47 files changed, 55 insertions(+), 158 deletions(-)
create mode 100644 tools/include/asm/sections.h
rename tools/{lib/lockdep/uinclude => include}/linux/debug_locks.h (91%)
create mode 100644 tools/include/linux/delay.h
create mode 100644 tools/include/linux/ftrace.h
create mode 100644 tools/include/linux/gfp.h
rename tools/{lib/lockdep/uinclude => include}/linux/hardirq.h (100%)
create mode 100644 tools/include/linux/interrupt.h
rename tools/{lib/lockdep/uinclude => include}/linux/irqflags.h (100%)
rename tools/{lib/lockdep/uinclude => include}/linux/kallsyms.h (100%)
rename tools/{lib/lockdep/uinclude => include}/linux/kern_levels.h (100%)
rename tools/{lib/lockdep/uinclude => include}/linux/kmemcheck.h (100%)
create mode 100644 tools/include/linux/linkage.h
rename tools/{lib/lockdep/uinclude => include}/linux/lockdep.h (81%)
rename tools/{lib/lockdep/uinclude => include}/linux/module.h (100%)
create mode 100644 tools/include/linux/mutex.h
create mode 100644 tools/include/linux/proc_fs.h
rename tools/{lib/lockdep/uinclude => include}/linux/rcu.h (89%)
create mode 100644 tools/include/linux/seq_file.h
rename tools/{lib/lockdep/uinclude => include}/linux/stacktrace.h (100%)
create mode 100644 tools/include/trace/events/lock.h
delete mode 100644 tools/lib/lockdep/uinclude/asm/hash.h
delete mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h
delete mode 100644 tools/lib/lockdep/uinclude/asm/sections.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/delay.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/hash.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/list.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/poison.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h
delete mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
diff --git a/tools/include/asm/sections.h b/tools/include/asm/sections.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
index 23299d7e7160..ef6ab908a42f 100644
--- a/tools/include/linux/compiler.h
+++ b/tools/include/linux/compiler.h
@@ -45,6 +45,10 @@
# define __maybe_unused __attribute__((unused))
#endif
+#ifndef __used
+# define __used __attribute__((__unused__))
+#endif
+
#ifndef __packed
# define __packed __attribute__((__packed__))
#endif
@@ -65,6 +69,14 @@
# define unlikely(x) __builtin_expect(!!(x), 0)
#endif
+#ifndef __init
+# define __init
+#endif
+
+#ifndef noinline
+# define noinline
+#endif
+
#define uninitialized_var(x) x = *(&(x))
#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
diff --git a/tools/lib/lockdep/uinclude/linux/debug_locks.h b/tools/include/linux/debug_locks.h
similarity index 91%
rename from tools/lib/lockdep/uinclude/linux/debug_locks.h
rename to tools/include/linux/debug_locks.h
index 1d4fbec5c649..61cc7f501168 100644
--- a/tools/lib/lockdep/uinclude/linux/debug_locks.h
+++ b/tools/include/linux/debug_locks.h
@@ -3,6 +3,7 @@
#include <stddef.h>
#include <linux/compiler.h>
+#include <asm/bug.h>
#define DEBUG_LOCKS_WARN_ON(x) WARN_ON(x)
diff --git a/tools/include/linux/delay.h b/tools/include/linux/delay.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/include/linux/ftrace.h b/tools/include/linux/ftrace.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/include/linux/gfp.h b/tools/include/linux/gfp.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/lib/lockdep/uinclude/linux/hardirq.h b/tools/include/linux/hardirq.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/hardirq.h
rename to tools/include/linux/hardirq.h
diff --git a/tools/include/linux/interrupt.h b/tools/include/linux/interrupt.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/lib/lockdep/uinclude/linux/irqflags.h b/tools/include/linux/irqflags.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/irqflags.h
rename to tools/include/linux/irqflags.h
diff --git a/tools/lib/lockdep/uinclude/linux/kallsyms.h b/tools/include/linux/kallsyms.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/kallsyms.h
rename to tools/include/linux/kallsyms.h
diff --git a/tools/lib/lockdep/uinclude/linux/kern_levels.h b/tools/include/linux/kern_levels.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/kern_levels.h
rename to tools/include/linux/kern_levels.h
diff --git a/tools/include/linux/kernel.h b/tools/include/linux/kernel.h
index 73ccc48126bb..801b927499f2 100644
--- a/tools/include/linux/kernel.h
+++ b/tools/include/linux/kernel.h
@@ -32,6 +32,7 @@
(type *)((char *)__mptr - offsetof(type, member)); })
#endif
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
#ifndef max
@@ -89,4 +90,7 @@ int scnprintf(char * buf, size_t size, const char * fmt, ...);
#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
#define round_down(x, y) ((x) & ~__round_mask(x, y))
+#define current_gfp_context(k) 0
+#define synchronize_sched()
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/kmemcheck.h b/tools/include/linux/kmemcheck.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/kmemcheck.h
rename to tools/include/linux/kmemcheck.h
diff --git a/tools/include/linux/linkage.h b/tools/include/linux/linkage.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/include/linux/lockdep.h
similarity index 81%
rename from tools/lib/lockdep/uinclude/linux/lockdep.h
rename to tools/include/linux/lockdep.h
index f026d4545e97..8da3e8effafa 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/include/linux/lockdep.h
@@ -7,6 +7,12 @@
#include <limits.h>
#include <linux/utsname.h>
#include <linux/compiler.h>
+#include <linux/export.h>
+#include <linux/kern_levels.h>
+#include <linux/err.h>
+#include <linux/rcu.h>
+#include <linux/list.h>
+#include <linux/hardirq.h>
#include <unistd.h>
#define MAX_LOCK_DEPTH 63UL
@@ -39,6 +45,8 @@ static inline int debug_locks_off(void)
#define KSYM_NAME_LEN 128
#define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
+#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+#define pr_warn pr_err
#define list_del_rcu list_del
diff --git a/tools/lib/lockdep/uinclude/linux/module.h b/tools/include/linux/module.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/module.h
rename to tools/include/linux/module.h
diff --git a/tools/include/linux/mutex.h b/tools/include/linux/mutex.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/include/linux/proc_fs.h b/tools/include/linux/proc_fs.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/lib/lockdep/uinclude/linux/rcu.h b/tools/include/linux/rcu.h
similarity index 89%
rename from tools/lib/lockdep/uinclude/linux/rcu.h
rename to tools/include/linux/rcu.h
index 6f0332324a6d..5080649dad04 100644
--- a/tools/lib/lockdep/uinclude/linux/rcu.h
+++ b/tools/include/linux/rcu.h
@@ -19,5 +19,6 @@ static inline bool rcu_is_watching(void)
}
#define rcu_assign_pointer(p, v) ((p) = (v))
+#define RCU_INIT_POINTER(p, v) p=(v)
#endif
diff --git a/tools/include/linux/seq_file.h b/tools/include/linux/seq_file.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/include/linux/spinlock.h b/tools/include/linux/spinlock.h
index 58397dcb19d6..417cda4f793f 100644
--- a/tools/include/linux/spinlock.h
+++ b/tools/include/linux/spinlock.h
@@ -1,5 +1,31 @@
+#ifndef __LINUX_SPINLOCK_H_
+#define __LINUX_SPINLOCK_H_
+
+#include <pthread.h>
+#include <stdbool.h>
+
#define spinlock_t pthread_mutex_t
#define DEFINE_SPINLOCK(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER;
#define spin_lock_irqsave(x, f) (void)f, pthread_mutex_lock(x)
#define spin_unlock_irqrestore(x, f) (void)f, pthread_mutex_unlock(x)
+
+#define arch_spinlock_t pthread_mutex_t
+#define __ARCH_SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER
+
+static inline void arch_spin_lock(arch_spinlock_t *mutex)
+{
+ pthread_mutex_lock(mutex);
+}
+
+static inline void arch_spin_unlock(arch_spinlock_t *mutex)
+{
+ pthread_mutex_unlock(mutex);
+}
+
+static inline bool arch_spin_is_locked(arch_spinlock_t *mutex)
+{
+ return true;
+}
+
+#endif
diff --git a/tools/lib/lockdep/uinclude/linux/stacktrace.h b/tools/include/linux/stacktrace.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/stacktrace.h
rename to tools/include/linux/stacktrace.h
diff --git a/tools/include/trace/events/lock.h b/tools/include/trace/events/lock.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
index 209f967dedaa..ced6d7443cea 100644
--- a/tools/lib/lockdep/lockdep.c
+++ b/tools/lib/lockdep/lockdep.c
@@ -5,6 +5,8 @@
#define hlist_for_each_entry_rcu hlist_for_each_entry
#define hlist_add_head_rcu hlist_add_head
#define hlist_del_rcu hlist_del
+#define list_for_each_entry_rcu list_for_each_entry
+#define list_add_tail_rcu list_add_tail
u32 prandom_u32(void)
{
diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c
index 226aa26198a9..6a2d3c5d4e92 100644
--- a/tools/lib/lockdep/preload.c
+++ b/tools/lib/lockdep/preload.c
@@ -123,8 +123,6 @@ static struct rb_node **__get_lock_node(void *lock, struct rb_node **parent)
#define LIBLOCKDEP_STATIC_ENTRIES 1024
#endif
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
static struct lock_lookup __locks[LIBLOCKDEP_STATIC_ENTRIES];
static int __locks_nr;
diff --git a/tools/lib/lockdep/rbtree.c b/tools/lib/lockdep/rbtree.c
index f7f43033c8b7..297c304571f8 100644
--- a/tools/lib/lockdep/rbtree.c
+++ b/tools/lib/lockdep/rbtree.c
@@ -1 +1 @@
-#include "../../../lib/rbtree.c"
+#include "../../lib/rbtree.c"
diff --git a/tools/lib/lockdep/uinclude/asm/hash.h b/tools/lib/lockdep/uinclude/asm/hash.h
deleted file mode 100644
index d82b170bb216..000000000000
--- a/tools/lib/lockdep/uinclude/asm/hash.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_GENERIC_HASH_H
-#define __ASM_GENERIC_HASH_H
-
-/* Stub */
-
-#endif /* __ASM_GENERIC_HASH_H */
diff --git a/tools/lib/lockdep/uinclude/asm/hweight.h b/tools/lib/lockdep/uinclude/asm/hweight.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/asm/hweight.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/asm/sections.h b/tools/lib/lockdep/uinclude/asm/sections.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/asm/sections.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/compiler.h b/tools/lib/lockdep/uinclude/linux/compiler.h
deleted file mode 100644
index fba5e022cee7..000000000000
--- a/tools/lib/lockdep/uinclude/linux/compiler.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _LIBLOCKDEP_LINUX_COMPILER_H_
-#define _LIBLOCKDEP_LINUX_COMPILER_H_
-
-#define __used __attribute__((__unused__))
-#define unlikely
-#define READ_ONCE(x) (x)
-#define WRITE_ONCE(x, val) x=(val)
-#define RCU_INIT_POINTER(p, v) p=(v)
-
-#define __packed __attribute__((packed))
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/linux/delay.h b/tools/lib/lockdep/uinclude/linux/delay.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/delay.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/ftrace.h b/tools/lib/lockdep/uinclude/linux/ftrace.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/ftrace.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/gfp.h b/tools/lib/lockdep/uinclude/linux/gfp.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/gfp.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/hash.h b/tools/lib/lockdep/uinclude/linux/hash.h
deleted file mode 100644
index 0f8479858dc0..000000000000
--- a/tools/lib/lockdep/uinclude/linux/hash.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/hash.h"
diff --git a/tools/lib/lockdep/uinclude/linux/interrupt.h b/tools/lib/lockdep/uinclude/linux/interrupt.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/interrupt.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
deleted file mode 100644
index 4a31ebe1a377..000000000000
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _LIBLOCKDEP_LINUX_KERNEL_H_
-#define _LIBLOCKDEP_LINUX_KERNEL_H_
-
-#include <linux/export.h>
-#include <linux/types.h>
-#include <linux/rcu.h>
-#include <linux/hardirq.h>
-#include <linux/kern_levels.h>
-#include <linux/err.h>
-
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-#ifndef container_of
-#define container_of(ptr, type, member) ({ \
- const typeof(((type *)0)->member) * __mptr = (ptr); \
- (type *)((char *)__mptr - offsetof(type, member)); })
-#endif
-
-#define max(x, y) ({ \
- typeof(x) _max1 = (x); \
- typeof(y) _max2 = (y); \
- (void) (&_max1 == &_max2); \
- _max1 > _max2 ? _max1 : _max2; })
-
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-
-static inline int lockdep_warn(int condition)
-{
- return condition;
-}
-#define WARN_ON(x) lockdep_warn(x)
-#define WARN_ON_ONCE(x) WARN_ON(x)
-#define WARN(x, y...) WARN_ON(x)
-
-#define likely(x) (x)
-#define uninitialized_var(x) x
-#define __init
-#define noinline
-#define list_add_tail_rcu list_add_tail
-#define list_for_each_entry_rcu list_for_each_entry
-#define barrier()
-#define synchronize_sched()
-
-#ifndef CALLER_ADDR0
-#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
-#endif
-
-#ifndef _RET_IP_
-#define _RET_IP_ CALLER_ADDR0
-#endif
-
-#ifndef _THIS_IP_
-#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
-#endif
-
-#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
-#define pr_warn pr_err
-
-#define current_gfp_context(k) 0
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/linux/linkage.h b/tools/lib/lockdep/uinclude/linux/linkage.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/linkage.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/list.h b/tools/lib/lockdep/uinclude/linux/list.h
deleted file mode 100644
index 6e9ef31ed82e..000000000000
--- a/tools/lib/lockdep/uinclude/linux/list.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/list.h"
diff --git a/tools/lib/lockdep/uinclude/linux/mutex.h b/tools/lib/lockdep/uinclude/linux/mutex.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/mutex.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/poison.h b/tools/lib/lockdep/uinclude/linux/poison.h
deleted file mode 100644
index 0c27bdf14233..000000000000
--- a/tools/lib/lockdep/uinclude/linux/poison.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/poison.h"
diff --git a/tools/lib/lockdep/uinclude/linux/prefetch.h b/tools/lib/lockdep/uinclude/linux/prefetch.h
deleted file mode 100644
index d73fe6f850ac..000000000000
--- a/tools/lib/lockdep/uinclude/linux/prefetch.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _LIBLOCKDEP_LINUX_PREFETCH_H_
-#define _LIBLOCKDEP_LINUX_PREFETCH_H
-
-static inline void prefetch(void *a __attribute__((unused))) { }
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/linux/proc_fs.h b/tools/lib/lockdep/uinclude/linux/proc_fs.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/proc_fs.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h b/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
deleted file mode 100644
index c3759477379c..000000000000
--- a/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define __always_inline
-#include "../../../include/linux/rbtree_augmented.h"
diff --git a/tools/lib/lockdep/uinclude/linux/seq_file.h b/tools/lib/lockdep/uinclude/linux/seq_file.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/seq_file.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/spinlock.h b/tools/lib/lockdep/uinclude/linux/spinlock.h
deleted file mode 100644
index 68c1aa2bcba5..000000000000
--- a/tools/lib/lockdep/uinclude/linux/spinlock.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _LIBLOCKDEP_SPINLOCK_H_
-#define _LIBLOCKDEP_SPINLOCK_H_
-
-#include <pthread.h>
-#include <stdbool.h>
-
-#define arch_spinlock_t pthread_mutex_t
-#define __ARCH_SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER
-
-static inline void arch_spin_lock(arch_spinlock_t *mutex)
-{
- pthread_mutex_lock(mutex);
-}
-
-static inline void arch_spin_unlock(arch_spinlock_t *mutex)
-{
- pthread_mutex_unlock(mutex);
-}
-
-static inline bool arch_spin_is_locked(arch_spinlock_t *mutex)
-{
- return true;
-}
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/linux/stringify.h b/tools/lib/lockdep/uinclude/linux/stringify.h
deleted file mode 100644
index 05dfcd1ac118..000000000000
--- a/tools/lib/lockdep/uinclude/linux/stringify.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _LIBLOCKDEP_LINUX_STRINGIFY_H_
-#define _LIBLOCKDEP_LINUX_STRINGIFY_H_
-
-#define __stringify_1(x...) #x
-#define __stringify(x...) __stringify_1(x)
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/trace/events/lock.h b/tools/lib/lockdep/uinclude/trace/events/lock.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/trace/events/lock.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] tools: liblockdep: move to using tools/include/
2017-05-31 0:38 [PATCH 0/1] tools: liblockdep: move to using tools/include/ Levin, Alexander (Sasha Levin)
2017-05-31 0:38 ` [PATCH 1/1] tools: liblockdep: remove private kernel headers Levin, Alexander (Sasha Levin)
@ 2017-06-05 7:31 ` Ingo Molnar
1 sibling, 0 replies; 4+ messages in thread
From: Ingo Molnar @ 2017-06-05 7:31 UTC (permalink / raw)
To: Levin, Alexander (Sasha Levin)
Cc: acme, mingo, linux-kernel, Peter Zijlstra, Thomas Gleixner,
Paul E. McKenney
* Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com> wrote:
> This patch applies on top of the fixes sent a few days ago.
>
> Just delete tools/lib/lockdep/uinclude and move the small bits of
> missing functionality (and a few empty headers) into
> tools/include/ .
>
> Sasha Levin (1):
> tools: liblockdep: remove private kernel headers
>
> tools/include/asm/sections.h | 0
> tools/include/linux/compiler.h | 12 +++++
> .../uinclude => include}/linux/debug_locks.h | 1 +
> tools/include/linux/delay.h | 0
> tools/include/linux/ftrace.h | 0
> tools/include/linux/gfp.h | 0
Ok, the new liblockdep code looks pretty clean and compact now - I've applied your
earlier series plus this patch, will push out after a bit of testing.
There's one change I did: instead of the many zero size header files (which are
hard to distinguish from empty files that tools like Quilt sometimes leave around)
I've added explicit header guards to those otherwise empty files.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:locking/core] tools/lib/lockdep: Remove private kernel headers
2017-05-31 0:38 ` [PATCH 1/1] tools: liblockdep: remove private kernel headers Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:13 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:13 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, linux-kernel, tglx, alexander.levin, torvalds, peterz, mingo
Commit-ID: e58e871becec2d3b04ed91c0c16fe8deac9c9dfa
Gitweb: http://git.kernel.org/tip/e58e871becec2d3b04ed91c0c16fe8deac9c9dfa
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Wed, 31 May 2017 00:38:09 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:14 +0200
tools/lib/lockdep: Remove private kernel headers
Move to using tools/include/ instead.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: acme@redhat.com
Link: http://lkml.kernel.org/r/20170531003747.10557-2-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/include/asm/sections.h | 4 ++
tools/include/linux/compiler.h | 12 +++++
.../uinclude => include}/linux/debug_locks.h | 1 +
tools/include/linux/delay.h | 4 ++
tools/include/linux/ftrace.h | 4 ++
tools/include/linux/gfp.h | 4 ++
.../lockdep/uinclude => include}/linux/hardirq.h | 0
tools/include/linux/interrupt.h | 4 ++
.../lockdep/uinclude => include}/linux/irqflags.h | 0
.../lockdep/uinclude => include}/linux/kallsyms.h | 0
.../uinclude => include}/linux/kern_levels.h | 0
tools/include/linux/kernel.h | 4 ++
.../lockdep/uinclude => include}/linux/kmemcheck.h | 0
tools/include/linux/linkage.h | 4 ++
.../lockdep/uinclude => include}/linux/lockdep.h | 8 +++
.../lockdep/uinclude => include}/linux/module.h | 0
tools/include/linux/mutex.h | 4 ++
tools/include/linux/proc_fs.h | 4 ++
.../{lib/lockdep/uinclude => include}/linux/rcu.h | 1 +
tools/include/linux/sched/clock.h | 4 ++
tools/include/linux/sched/task.h | 4 ++
tools/include/linux/seq_file.h | 4 ++
tools/include/linux/spinlock.h | 26 +++++++++
.../uinclude => include}/linux/stacktrace.h | 0
tools/include/trace/events/lock.h | 4 ++
tools/lib/lockdep/lockdep.c | 2 +
tools/lib/lockdep/preload.c | 2 -
tools/lib/lockdep/rbtree.c | 2 +-
tools/lib/lockdep/uinclude/asm/hash.h | 6 ---
tools/lib/lockdep/uinclude/asm/hweight.h | 3 --
tools/lib/lockdep/uinclude/asm/sections.h | 3 --
tools/lib/lockdep/uinclude/linux/compiler.h | 12 -----
tools/lib/lockdep/uinclude/linux/delay.h | 3 --
tools/lib/lockdep/uinclude/linux/ftrace.h | 3 --
tools/lib/lockdep/uinclude/linux/gfp.h | 3 --
tools/lib/lockdep/uinclude/linux/hash.h | 1 -
tools/lib/lockdep/uinclude/linux/interrupt.h | 3 --
tools/lib/lockdep/uinclude/linux/kernel.h | 61 ----------------------
tools/lib/lockdep/uinclude/linux/linkage.h | 3 --
tools/lib/lockdep/uinclude/linux/list.h | 1 -
tools/lib/lockdep/uinclude/linux/mutex.h | 3 --
tools/lib/lockdep/uinclude/linux/poison.h | 1 -
tools/lib/lockdep/uinclude/linux/prefetch.h | 6 ---
tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 --
.../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 -
tools/lib/lockdep/uinclude/linux/seq_file.h | 3 --
tools/lib/lockdep/uinclude/linux/spinlock.h | 25 ---------
tools/lib/lockdep/uinclude/linux/stringify.h | 7 ---
tools/lib/lockdep/uinclude/trace/events/lock.h | 3 --
49 files changed, 103 insertions(+), 158 deletions(-)
diff --git a/tools/include/asm/sections.h b/tools/include/asm/sections.h
new file mode 100644
index 0000000..a80643d
--- /dev/null
+++ b/tools/include/asm/sections.h
@@ -0,0 +1,4 @@
+#ifndef __TOOLS_INCLUDE_LINUX_ASM_SECTIONS_H
+#define __TOOLS_INCLUDE_LINUX_ASM_SECTIONS_H
+
+#endif /* __TOOLS_INCLUDE_LINUX_ASM_SECTIONS_H */
diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
index 23299d7..ef6ab90 100644
--- a/tools/include/linux/compiler.h
+++ b/tools/include/linux/compiler.h
@@ -45,6 +45,10 @@
# define __maybe_unused __attribute__((unused))
#endif
+#ifndef __used
+# define __used __attribute__((__unused__))
+#endif
+
#ifndef __packed
# define __packed __attribute__((__packed__))
#endif
@@ -65,6 +69,14 @@
# define unlikely(x) __builtin_expect(!!(x), 0)
#endif
+#ifndef __init
+# define __init
+#endif
+
+#ifndef noinline
+# define noinline
+#endif
+
#define uninitialized_var(x) x = *(&(x))
#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
diff --git a/tools/lib/lockdep/uinclude/linux/debug_locks.h b/tools/include/linux/debug_locks.h
similarity index 91%
rename from tools/lib/lockdep/uinclude/linux/debug_locks.h
rename to tools/include/linux/debug_locks.h
index 1d4fbec..61cc7f5 100644
--- a/tools/lib/lockdep/uinclude/linux/debug_locks.h
+++ b/tools/include/linux/debug_locks.h
@@ -3,6 +3,7 @@
#include <stddef.h>
#include <linux/compiler.h>
+#include <asm/bug.h>
#define DEBUG_LOCKS_WARN_ON(x) WARN_ON(x)
diff --git a/tools/include/linux/delay.h b/tools/include/linux/delay.h
new file mode 100644
index 0000000..55aa417
--- /dev/null
+++ b/tools/include/linux/delay.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_LINUX_DELAY_H
+#define _TOOLS_INCLUDE_LINUX_DELAY_H
+
+#endif /* _TOOLS_INCLUDE_LINUX_DELAY_H */
diff --git a/tools/include/linux/ftrace.h b/tools/include/linux/ftrace.h
new file mode 100644
index 0000000..949f541
--- /dev/null
+++ b/tools/include/linux/ftrace.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_LINUX_FTRACE_H
+#define _TOOLS_INCLUDE_LINUX_FTRACE_H
+
+#endif /* _TOOLS_INCLUDE_LINUX_FTRACE_H */
diff --git a/tools/include/linux/gfp.h b/tools/include/linux/gfp.h
new file mode 100644
index 0000000..2203075
--- /dev/null
+++ b/tools/include/linux/gfp.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_LINUX_GFP_H
+#define _TOOLS_INCLUDE_LINUX_GFP_H
+
+#endif /* _TOOLS_INCLUDE_LINUX_GFP_H */
diff --git a/tools/lib/lockdep/uinclude/linux/hardirq.h b/tools/include/linux/hardirq.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/hardirq.h
rename to tools/include/linux/hardirq.h
diff --git a/tools/include/linux/interrupt.h b/tools/include/linux/interrupt.h
new file mode 100644
index 0000000..6be25bb
--- /dev/null
+++ b/tools/include/linux/interrupt.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_LINUX_INTERRUPT_H
+#define _TOOLS_INCLUDE_LINUX_INTERRUPT_H
+
+#endif /* _TOOLS_INCLUDE_LINUX_INTERRUPT_H */
diff --git a/tools/lib/lockdep/uinclude/linux/irqflags.h b/tools/include/linux/irqflags.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/irqflags.h
rename to tools/include/linux/irqflags.h
diff --git a/tools/lib/lockdep/uinclude/linux/kallsyms.h b/tools/include/linux/kallsyms.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/kallsyms.h
rename to tools/include/linux/kallsyms.h
diff --git a/tools/lib/lockdep/uinclude/linux/kern_levels.h b/tools/include/linux/kern_levels.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/kern_levels.h
rename to tools/include/linux/kern_levels.h
diff --git a/tools/include/linux/kernel.h b/tools/include/linux/kernel.h
index 73ccc48..801b927 100644
--- a/tools/include/linux/kernel.h
+++ b/tools/include/linux/kernel.h
@@ -32,6 +32,7 @@
(type *)((char *)__mptr - offsetof(type, member)); })
#endif
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
#ifndef max
@@ -89,4 +90,7 @@ int scnprintf(char * buf, size_t size, const char * fmt, ...);
#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
#define round_down(x, y) ((x) & ~__round_mask(x, y))
+#define current_gfp_context(k) 0
+#define synchronize_sched()
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/kmemcheck.h b/tools/include/linux/kmemcheck.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/kmemcheck.h
rename to tools/include/linux/kmemcheck.h
diff --git a/tools/include/linux/linkage.h b/tools/include/linux/linkage.h
new file mode 100644
index 0000000..bc763d5
--- /dev/null
+++ b/tools/include/linux/linkage.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_LINUX_LINKAGE_H
+#define _TOOLS_INCLUDE_LINUX_LINKAGE_H
+
+#endif /* _TOOLS_INCLUDE_LINUX_LINKAGE_H */
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/include/linux/lockdep.h
similarity index 81%
rename from tools/lib/lockdep/uinclude/linux/lockdep.h
rename to tools/include/linux/lockdep.h
index f026d45..8da3e8e 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/include/linux/lockdep.h
@@ -7,6 +7,12 @@
#include <limits.h>
#include <linux/utsname.h>
#include <linux/compiler.h>
+#include <linux/export.h>
+#include <linux/kern_levels.h>
+#include <linux/err.h>
+#include <linux/rcu.h>
+#include <linux/list.h>
+#include <linux/hardirq.h>
#include <unistd.h>
#define MAX_LOCK_DEPTH 63UL
@@ -39,6 +45,8 @@ static inline int debug_locks_off(void)
#define KSYM_NAME_LEN 128
#define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
+#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+#define pr_warn pr_err
#define list_del_rcu list_del
diff --git a/tools/lib/lockdep/uinclude/linux/module.h b/tools/include/linux/module.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/module.h
rename to tools/include/linux/module.h
diff --git a/tools/include/linux/mutex.h b/tools/include/linux/mutex.h
new file mode 100644
index 0000000..a8180d2
--- /dev/null
+++ b/tools/include/linux/mutex.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_LINUX_MUTEX_H
+#define _TOOLS_INCLUDE_LINUX_MUTEX_H
+
+#endif /* _TOOLS_INCLUDE_LINUX_MUTEX_H */
diff --git a/tools/include/linux/proc_fs.h b/tools/include/linux/proc_fs.h
new file mode 100644
index 0000000..8b3b03b
--- /dev/null
+++ b/tools/include/linux/proc_fs.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_LINUX_PROC_FS_H
+#define _TOOLS_INCLUDE_LINUX_PROC_FS_H
+
+#endif /* _TOOLS_INCLUDE_LINUX_PROC_FS_H */
diff --git a/tools/lib/lockdep/uinclude/linux/rcu.h b/tools/include/linux/rcu.h
similarity index 89%
rename from tools/lib/lockdep/uinclude/linux/rcu.h
rename to tools/include/linux/rcu.h
index 6f03323..5080649 100644
--- a/tools/lib/lockdep/uinclude/linux/rcu.h
+++ b/tools/include/linux/rcu.h
@@ -19,5 +19,6 @@ static inline bool rcu_is_watching(void)
}
#define rcu_assign_pointer(p, v) ((p) = (v))
+#define RCU_INIT_POINTER(p, v) p=(v)
#endif
diff --git a/tools/include/linux/sched/clock.h b/tools/include/linux/sched/clock.h
new file mode 100644
index 0000000..5837d17
--- /dev/null
+++ b/tools/include/linux/sched/clock.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_PERF_LINUX_SCHED_CLOCK_H
+#define _TOOLS_PERF_LINUX_SCHED_CLOCK_H
+
+#endif /* _TOOLS_PERF_LINUX_SCHED_CLOCK_H */
diff --git a/tools/include/linux/sched/task.h b/tools/include/linux/sched/task.h
new file mode 100644
index 0000000..a97890ec
--- /dev/null
+++ b/tools/include/linux/sched/task.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_PERF_LINUX_SCHED_TASK_H
+#define _TOOLS_PERF_LINUX_SCHED_TASK_H
+
+#endif /* _TOOLS_PERF_LINUX_SCHED_TASK_H */
diff --git a/tools/include/linux/seq_file.h b/tools/include/linux/seq_file.h
new file mode 100644
index 0000000..102fd92
--- /dev/null
+++ b/tools/include/linux/seq_file.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_LINUX_SEQ_FILE_H
+#define _TOOLS_INCLUDE_LINUX_SEQ_FILE_H
+
+#endif /* _TOOLS_INCLUDE_LINUX_SEQ_FILE_H */
diff --git a/tools/include/linux/spinlock.h b/tools/include/linux/spinlock.h
index 58397dc..417cda4 100644
--- a/tools/include/linux/spinlock.h
+++ b/tools/include/linux/spinlock.h
@@ -1,5 +1,31 @@
+#ifndef __LINUX_SPINLOCK_H_
+#define __LINUX_SPINLOCK_H_
+
+#include <pthread.h>
+#include <stdbool.h>
+
#define spinlock_t pthread_mutex_t
#define DEFINE_SPINLOCK(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER;
#define spin_lock_irqsave(x, f) (void)f, pthread_mutex_lock(x)
#define spin_unlock_irqrestore(x, f) (void)f, pthread_mutex_unlock(x)
+
+#define arch_spinlock_t pthread_mutex_t
+#define __ARCH_SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER
+
+static inline void arch_spin_lock(arch_spinlock_t *mutex)
+{
+ pthread_mutex_lock(mutex);
+}
+
+static inline void arch_spin_unlock(arch_spinlock_t *mutex)
+{
+ pthread_mutex_unlock(mutex);
+}
+
+static inline bool arch_spin_is_locked(arch_spinlock_t *mutex)
+{
+ return true;
+}
+
+#endif
diff --git a/tools/lib/lockdep/uinclude/linux/stacktrace.h b/tools/include/linux/stacktrace.h
similarity index 100%
rename from tools/lib/lockdep/uinclude/linux/stacktrace.h
rename to tools/include/linux/stacktrace.h
diff --git a/tools/include/trace/events/lock.h b/tools/include/trace/events/lock.h
new file mode 100644
index 0000000..5b15fd5
--- /dev/null
+++ b/tools/include/trace/events/lock.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_INCLUDE_TRACE_EVENTS_LOCK_H
+#define _TOOLS_INCLUDE_TRACE_EVENTS_LOCK_H
+
+#endif /* _TOOLS_INCLUDE_TRACE_EVENTS_LOCK_H */
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
index 209f967..ced6d74 100644
--- a/tools/lib/lockdep/lockdep.c
+++ b/tools/lib/lockdep/lockdep.c
@@ -5,6 +5,8 @@
#define hlist_for_each_entry_rcu hlist_for_each_entry
#define hlist_add_head_rcu hlist_add_head
#define hlist_del_rcu hlist_del
+#define list_for_each_entry_rcu list_for_each_entry
+#define list_add_tail_rcu list_add_tail
u32 prandom_u32(void)
{
diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c
index 226aa26..6a2d3c5 100644
--- a/tools/lib/lockdep/preload.c
+++ b/tools/lib/lockdep/preload.c
@@ -123,8 +123,6 @@ static struct rb_node **__get_lock_node(void *lock, struct rb_node **parent)
#define LIBLOCKDEP_STATIC_ENTRIES 1024
#endif
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
static struct lock_lookup __locks[LIBLOCKDEP_STATIC_ENTRIES];
static int __locks_nr;
diff --git a/tools/lib/lockdep/rbtree.c b/tools/lib/lockdep/rbtree.c
index f7f4303..297c304 100644
--- a/tools/lib/lockdep/rbtree.c
+++ b/tools/lib/lockdep/rbtree.c
@@ -1 +1 @@
-#include "../../../lib/rbtree.c"
+#include "../../lib/rbtree.c"
diff --git a/tools/lib/lockdep/uinclude/asm/hash.h b/tools/lib/lockdep/uinclude/asm/hash.h
deleted file mode 100644
index d82b170b..0000000
--- a/tools/lib/lockdep/uinclude/asm/hash.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_GENERIC_HASH_H
-#define __ASM_GENERIC_HASH_H
-
-/* Stub */
-
-#endif /* __ASM_GENERIC_HASH_H */
diff --git a/tools/lib/lockdep/uinclude/asm/hweight.h b/tools/lib/lockdep/uinclude/asm/hweight.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/asm/hweight.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/asm/sections.h b/tools/lib/lockdep/uinclude/asm/sections.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/asm/sections.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/compiler.h b/tools/lib/lockdep/uinclude/linux/compiler.h
deleted file mode 100644
index fba5e02..0000000
--- a/tools/lib/lockdep/uinclude/linux/compiler.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _LIBLOCKDEP_LINUX_COMPILER_H_
-#define _LIBLOCKDEP_LINUX_COMPILER_H_
-
-#define __used __attribute__((__unused__))
-#define unlikely
-#define READ_ONCE(x) (x)
-#define WRITE_ONCE(x, val) x=(val)
-#define RCU_INIT_POINTER(p, v) p=(v)
-
-#define __packed __attribute__((packed))
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/linux/delay.h b/tools/lib/lockdep/uinclude/linux/delay.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/delay.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/ftrace.h b/tools/lib/lockdep/uinclude/linux/ftrace.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/ftrace.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/gfp.h b/tools/lib/lockdep/uinclude/linux/gfp.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/gfp.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/hash.h b/tools/lib/lockdep/uinclude/linux/hash.h
deleted file mode 100644
index 0f84798..0000000
--- a/tools/lib/lockdep/uinclude/linux/hash.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/hash.h"
diff --git a/tools/lib/lockdep/uinclude/linux/interrupt.h b/tools/lib/lockdep/uinclude/linux/interrupt.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/interrupt.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
deleted file mode 100644
index 4a31ebe..0000000
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _LIBLOCKDEP_LINUX_KERNEL_H_
-#define _LIBLOCKDEP_LINUX_KERNEL_H_
-
-#include <linux/export.h>
-#include <linux/types.h>
-#include <linux/rcu.h>
-#include <linux/hardirq.h>
-#include <linux/kern_levels.h>
-#include <linux/err.h>
-
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-#ifndef container_of
-#define container_of(ptr, type, member) ({ \
- const typeof(((type *)0)->member) * __mptr = (ptr); \
- (type *)((char *)__mptr - offsetof(type, member)); })
-#endif
-
-#define max(x, y) ({ \
- typeof(x) _max1 = (x); \
- typeof(y) _max2 = (y); \
- (void) (&_max1 == &_max2); \
- _max1 > _max2 ? _max1 : _max2; })
-
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-
-static inline int lockdep_warn(int condition)
-{
- return condition;
-}
-#define WARN_ON(x) lockdep_warn(x)
-#define WARN_ON_ONCE(x) WARN_ON(x)
-#define WARN(x, y...) WARN_ON(x)
-
-#define likely(x) (x)
-#define uninitialized_var(x) x
-#define __init
-#define noinline
-#define list_add_tail_rcu list_add_tail
-#define list_for_each_entry_rcu list_for_each_entry
-#define barrier()
-#define synchronize_sched()
-
-#ifndef CALLER_ADDR0
-#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
-#endif
-
-#ifndef _RET_IP_
-#define _RET_IP_ CALLER_ADDR0
-#endif
-
-#ifndef _THIS_IP_
-#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
-#endif
-
-#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
-#define pr_warn pr_err
-
-#define current_gfp_context(k) 0
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/linux/linkage.h b/tools/lib/lockdep/uinclude/linux/linkage.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/linkage.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/list.h b/tools/lib/lockdep/uinclude/linux/list.h
deleted file mode 100644
index 6e9ef31..0000000
--- a/tools/lib/lockdep/uinclude/linux/list.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/list.h"
diff --git a/tools/lib/lockdep/uinclude/linux/mutex.h b/tools/lib/lockdep/uinclude/linux/mutex.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/mutex.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/poison.h b/tools/lib/lockdep/uinclude/linux/poison.h
deleted file mode 100644
index 0c27bdf..0000000
--- a/tools/lib/lockdep/uinclude/linux/poison.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../include/linux/poison.h"
diff --git a/tools/lib/lockdep/uinclude/linux/prefetch.h b/tools/lib/lockdep/uinclude/linux/prefetch.h
deleted file mode 100644
index d73fe6f..0000000
--- a/tools/lib/lockdep/uinclude/linux/prefetch.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _LIBLOCKDEP_LINUX_PREFETCH_H_
-#define _LIBLOCKDEP_LINUX_PREFETCH_H
-
-static inline void prefetch(void *a __attribute__((unused))) { }
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/linux/proc_fs.h b/tools/lib/lockdep/uinclude/linux/proc_fs.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/proc_fs.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h b/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
deleted file mode 100644
index c375947..0000000
--- a/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define __always_inline
-#include "../../../include/linux/rbtree_augmented.h"
diff --git a/tools/lib/lockdep/uinclude/linux/seq_file.h b/tools/lib/lockdep/uinclude/linux/seq_file.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/seq_file.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/spinlock.h b/tools/lib/lockdep/uinclude/linux/spinlock.h
deleted file mode 100644
index 68c1aa2..0000000
--- a/tools/lib/lockdep/uinclude/linux/spinlock.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _LIBLOCKDEP_SPINLOCK_H_
-#define _LIBLOCKDEP_SPINLOCK_H_
-
-#include <pthread.h>
-#include <stdbool.h>
-
-#define arch_spinlock_t pthread_mutex_t
-#define __ARCH_SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER
-
-static inline void arch_spin_lock(arch_spinlock_t *mutex)
-{
- pthread_mutex_lock(mutex);
-}
-
-static inline void arch_spin_unlock(arch_spinlock_t *mutex)
-{
- pthread_mutex_unlock(mutex);
-}
-
-static inline bool arch_spin_is_locked(arch_spinlock_t *mutex)
-{
- return true;
-}
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/linux/stringify.h b/tools/lib/lockdep/uinclude/linux/stringify.h
deleted file mode 100644
index 05dfcd1..0000000
--- a/tools/lib/lockdep/uinclude/linux/stringify.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _LIBLOCKDEP_LINUX_STRINGIFY_H_
-#define _LIBLOCKDEP_LINUX_STRINGIFY_H_
-
-#define __stringify_1(x...) #x
-#define __stringify(x...) __stringify_1(x)
-
-#endif
diff --git a/tools/lib/lockdep/uinclude/trace/events/lock.h b/tools/lib/lockdep/uinclude/trace/events/lock.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/trace/events/lock.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-05 9:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-31 0:38 [PATCH 0/1] tools: liblockdep: move to using tools/include/ Levin, Alexander (Sasha Levin)
2017-05-31 0:38 ` [PATCH 1/1] tools: liblockdep: remove private kernel headers Levin, Alexander (Sasha Levin)
2017-06-05 9:13 ` [tip:locking/core] tools/lib/lockdep: Remove " tip-bot for Levin, Alexander (Sasha Levin)
2017-06-05 7:31 ` [PATCH 0/1] tools: liblockdep: move to using tools/include/ Ingo Molnar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.