History

tools/lib/lockdep: Remove private kernel headers

Move to using tools/include/ instead.

Levin, Alexander (Sasha Levin) committed 9 years ago

Commit e58e8711 parent 4ea4b3c49 files · +103 −158Browse files

Unified · Split

49 files
  1. tools/include/asm/sections.h +4 −0
  2. tools/include/linux/compiler.h +12 −0
  3. tools/include/linux/debug_locks.h +1 −0
  4. tools/include/linux/delay.h +4 −0
  5. tools/include/linux/ftrace.h +4 −0
  6. tools/include/linux/gfp.h +4 −0
  7. tools/include/linux/hardirq.h +0 −0
  8. tools/include/linux/interrupt.h +4 −0
  9. tools/include/linux/irqflags.h +0 −0
  10. tools/include/linux/kallsyms.h +0 −0
  11. tools/include/linux/kern_levels.h +0 −0
  12. tools/include/linux/kernel.h +4 −0
  13. tools/include/linux/kmemcheck.h +0 −0
  14. tools/include/linux/linkage.h +4 −0
  15. tools/include/linux/lockdep.h +8 −0
  16. tools/include/linux/module.h +0 −0
  17. tools/include/linux/mutex.h +4 −0
  18. tools/include/linux/proc_fs.h +4 −0
  19. tools/include/linux/rcu.h +1 −0
  20. tools/include/linux/sched/clock.h +4 −0
  21. tools/include/linux/sched/task.h +4 −0
  22. tools/include/linux/seq_file.h +4 −0
  23. tools/include/linux/spinlock.h +26 −0
  24. tools/include/linux/stacktrace.h +0 −0
  25. tools/include/trace/events/lock.h +4 −0
  26. tools/lib/lockdep/lockdep.c +2 −0
  27. tools/lib/lockdep/preload.c +0 −2
  28. tools/lib/lockdep/rbtree.c +1 −1
  29. tools/lib/lockdep/uinclude/asm/hash.h +0 −6
  30. tools/lib/lockdep/uinclude/asm/hweight.h +0 −3
  31. tools/lib/lockdep/uinclude/asm/sections.h +0 −3
  32. tools/lib/lockdep/uinclude/linux/compiler.h +0 −12
  33. tools/lib/lockdep/uinclude/linux/delay.h +0 −3
  34. tools/lib/lockdep/uinclude/linux/ftrace.h +0 −3
  35. tools/lib/lockdep/uinclude/linux/gfp.h +0 −3
  36. tools/lib/lockdep/uinclude/linux/hash.h +0 −1
  37. tools/lib/lockdep/uinclude/linux/interrupt.h +0 −3
  38. tools/lib/lockdep/uinclude/linux/kernel.h +0 −61
  39. tools/lib/lockdep/uinclude/linux/linkage.h +0 −3
  40. tools/lib/lockdep/uinclude/linux/list.h +0 −1
  41. tools/lib/lockdep/uinclude/linux/mutex.h +0 −3
  42. tools/lib/lockdep/uinclude/linux/poison.h +0 −1
  43. tools/lib/lockdep/uinclude/linux/prefetch.h +0 −6
  44. tools/lib/lockdep/uinclude/linux/proc_fs.h +0 −3
  45. tools/lib/lockdep/uinclude/linux/rbtree_augmented.h +0 −2
  46. tools/lib/lockdep/uinclude/linux/seq_file.h +0 −3
  47. tools/lib/lockdep/uinclude/linux/spinlock.h +0 −25
  48. tools/lib/lockdep/uinclude/linux/stringify.h +0 −7
  49. tools/lib/lockdep/uinclude/trace/events/lock.h +0 −3
tools/include/asm/sections.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef __TOOLS_INCLUDE_LINUX_ASM_SECTIONS_H
2+#define __TOOLS_INCLUDE_LINUX_ASM_SECTIONS_H
3+
4+#endif /* __TOOLS_INCLUDE_LINUX_ASM_SECTIONS_H */
tools/include/linux/compiler.h+12−0
@@ -45,6 +45,10 @@ · 44 unmodified lines
4545 # define __maybe_unused __attribute__((unused))
4646 #endif
4747
48+#ifndef __used
49+# define __used __attribute__((__unused__))
50+#endif
51+
4852 #ifndef __packed
4953 # define __packed __attribute__((__packed__))
5054 #endif
@@ -65,6 +69,14 @@ · 14 unmodified lines
6569 # define unlikely(x) __builtin_expect(!!(x), 0)
6670 #endif
6771
72+#ifndef __init
73+# define __init
74+#endif
75+
76+#ifndef noinline
77+# define noinline
78+#endif
79+
6880 #define uninitialized_var(x) x = *(&(x))
6981
7082 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
tools/include/linux/debug_locks.hrenamed from tools/lib/lockdep/uinclude/linux/debug_locks.h+1−0
@@ -3,6 +3,7 @@ · 2 unmodified lines
33
44 #include <stddef.h>
55 #include <linux/compiler.h>
6+#include <asm/bug.h>
67
78 #define DEBUG_LOCKS_WARN_ON(x) WARN_ON(x)
89
tools/include/linux/delay.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_LINUX_DELAY_H
2+#define _TOOLS_INCLUDE_LINUX_DELAY_H
3+
4+#endif /* _TOOLS_INCLUDE_LINUX_DELAY_H */
tools/include/linux/ftrace.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_LINUX_FTRACE_H
2+#define _TOOLS_INCLUDE_LINUX_FTRACE_H
3+
4+#endif /* _TOOLS_INCLUDE_LINUX_FTRACE_H */
tools/include/linux/gfp.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_LINUX_GFP_H
2+#define _TOOLS_INCLUDE_LINUX_GFP_H
3+
4+#endif /* _TOOLS_INCLUDE_LINUX_GFP_H */
tools/include/linux/hardirq.hrenamed from tools/lib/lockdep/uinclude/linux/hardirq.h+0−0

File renamed without changes.

tools/include/linux/interrupt.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_LINUX_INTERRUPT_H
2+#define _TOOLS_INCLUDE_LINUX_INTERRUPT_H
3+
4+#endif /* _TOOLS_INCLUDE_LINUX_INTERRUPT_H */
tools/include/linux/irqflags.hrenamed from tools/lib/lockdep/uinclude/linux/irqflags.h+0−0

File renamed without changes.

tools/include/linux/kallsyms.hrenamed from tools/lib/lockdep/uinclude/linux/kallsyms.h+0−0

File renamed without changes.

tools/include/linux/kern_levels.hrenamed from tools/lib/lockdep/uinclude/linux/kern_levels.h+0−0

File renamed without changes.

tools/include/linux/kernel.h+4−0
@@ -32,6 +32,7 @@ · 31 unmodified lines
3232 (type *)((char *)__mptr - offsetof(type, member)); })
3333 #endif
3434
35+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
3536 #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
3637
3738 #ifndef max
@@ -89,4 +90,7 @@ int scnprintf(char * buf, size_t size, const char * fmt, ...); · 51 unmodified lines
8990 #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
9091 #define round_down(x, y) ((x) & ~__round_mask(x, y))
9192
93+#define current_gfp_context(k) 0
94+#define synchronize_sched()
95+
9296 #endif
tools/include/linux/kmemcheck.hrenamed from tools/lib/lockdep/uinclude/linux/kmemcheck.h+0−0

File renamed without changes.

tools/include/linux/linkage.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_LINUX_LINKAGE_H
2+#define _TOOLS_INCLUDE_LINUX_LINKAGE_H
3+
4+#endif /* _TOOLS_INCLUDE_LINUX_LINKAGE_H */
tools/include/linux/lockdep.hrenamed from tools/lib/lockdep/uinclude/linux/lockdep.h+8−0
@@ -7,6 +7,12 @@ · 6 unmodified lines
77 #include <limits.h>
88 #include <linux/utsname.h>
99 #include <linux/compiler.h>
10+#include <linux/export.h>
11+#include <linux/kern_levels.h>
12+#include <linux/err.h>
13+#include <linux/rcu.h>
14+#include <linux/list.h>
15+#include <linux/hardirq.h>
1016 #include <unistd.h>
1117
1218 #define MAX_LOCK_DEPTH 63UL
@@ -39,6 +45,8 @@ static inline int debug_locks_off(void) · 26 unmodified lines
3945
4046 #define KSYM_NAME_LEN 128
4147 #define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
48+#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
49+#define pr_warn pr_err
4250
4351 #define list_del_rcu list_del
4452
tools/include/linux/module.hrenamed from tools/lib/lockdep/uinclude/linux/module.h+0−0

File renamed without changes.

tools/include/linux/mutex.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_LINUX_MUTEX_H
2+#define _TOOLS_INCLUDE_LINUX_MUTEX_H
3+
4+#endif /* _TOOLS_INCLUDE_LINUX_MUTEX_H */
tools/include/linux/proc_fs.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_LINUX_PROC_FS_H
2+#define _TOOLS_INCLUDE_LINUX_PROC_FS_H
3+
4+#endif /* _TOOLS_INCLUDE_LINUX_PROC_FS_H */
tools/include/linux/rcu.hrenamed from tools/lib/lockdep/uinclude/linux/rcu.h+1−0
@@ -19,5 +19,6 @@ static inline bool rcu_is_watching(void) · 18 unmodified lines
1919 }
2020
2121 #define rcu_assign_pointer(p, v) ((p) = (v))
22+#define RCU_INIT_POINTER(p, v) p=(v)
2223
2324 #endif
tools/include/linux/sched/clock.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_PERF_LINUX_SCHED_CLOCK_H
2+#define _TOOLS_PERF_LINUX_SCHED_CLOCK_H
3+
4+#endif /* _TOOLS_PERF_LINUX_SCHED_CLOCK_H */
tools/include/linux/sched/task.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_PERF_LINUX_SCHED_TASK_H
2+#define _TOOLS_PERF_LINUX_SCHED_TASK_H
3+
4+#endif /* _TOOLS_PERF_LINUX_SCHED_TASK_H */
tools/include/linux/seq_file.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_LINUX_SEQ_FILE_H
2+#define _TOOLS_INCLUDE_LINUX_SEQ_FILE_H
3+
4+#endif /* _TOOLS_INCLUDE_LINUX_SEQ_FILE_H */
tools/include/linux/spinlock.h+26−0
@@ -1,5 +1,31 @@
1+#ifndef __LINUX_SPINLOCK_H_
2+#define __LINUX_SPINLOCK_H_
3+
4+#include <pthread.h>
5+#include <stdbool.h>
6+
17 #define spinlock_t pthread_mutex_t
28 #define DEFINE_SPINLOCK(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER;
39
410 #define spin_lock_irqsave(x, f) (void)f, pthread_mutex_lock(x)
511 #define spin_unlock_irqrestore(x, f) (void)f, pthread_mutex_unlock(x)
12+
13+#define arch_spinlock_t pthread_mutex_t
14+#define __ARCH_SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER
15+
16+static inline void arch_spin_lock(arch_spinlock_t *mutex)
17+{
18+ pthread_mutex_lock(mutex);
19+}
20+
21+static inline void arch_spin_unlock(arch_spinlock_t *mutex)
22+{
23+ pthread_mutex_unlock(mutex);
24+}
25+
26+static inline bool arch_spin_is_locked(arch_spinlock_t *mutex)
27+{
28+ return true;
29+}
30+
31+#endif
tools/include/linux/stacktrace.hrenamed from tools/lib/lockdep/uinclude/linux/stacktrace.h+0−0

File renamed without changes.

tools/include/trace/events/lock.h+4−0
@@ -0,0 +1,4 @@
1+#ifndef _TOOLS_INCLUDE_TRACE_EVENTS_LOCK_H
2+#define _TOOLS_INCLUDE_TRACE_EVENTS_LOCK_H
3+
4+#endif /* _TOOLS_INCLUDE_TRACE_EVENTS_LOCK_H */
tools/lib/lockdep/lockdep.c+2−0
@@ -5,6 +5,8 @@ · 4 unmodified lines
55 #define hlist_for_each_entry_rcu hlist_for_each_entry
66 #define hlist_add_head_rcu hlist_add_head
77 #define hlist_del_rcu hlist_del
8+#define list_for_each_entry_rcu list_for_each_entry
9+#define list_add_tail_rcu list_add_tail
810
911 u32 prandom_u32(void)
1012 {
tools/lib/lockdep/preload.c+0−2
@@ -123,8 +123,6 @@ static struct rb_node **__get_lock_node(void *lock, struct rb_node **parent) · 122 unmodified lines
123123 #define LIBLOCKDEP_STATIC_ENTRIES 1024
124124 #endif
125125
126−#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
127−
128126 static struct lock_lookup __locks[LIBLOCKDEP_STATIC_ENTRIES];
129127 static int __locks_nr;
130128
tools/lib/lockdep/rbtree.c+1−1
@@ -1 +1 @@
1−#include "../../../lib/rbtree.c"
1+#include "../../lib/rbtree.c"
tools/lib/lockdep/uinclude/asm/hash.h+0−6
@@ -1,6 +0,0 @@
1−#ifndef __ASM_GENERIC_HASH_H
2−#define __ASM_GENERIC_HASH_H
3−
4−/* Stub */
5−
6−#endif /* __ASM_GENERIC_HASH_H */
tools/lib/lockdep/uinclude/asm/hweight.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/asm/sections.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/compiler.h+0−12
@@ -1,12 +0,0 @@
1−#ifndef _LIBLOCKDEP_LINUX_COMPILER_H_
2−#define _LIBLOCKDEP_LINUX_COMPILER_H_
3−
4−#define __used __attribute__((__unused__))
5−#define unlikely
6−#define READ_ONCE(x) (x)
7−#define WRITE_ONCE(x, val) x=(val)
8−#define RCU_INIT_POINTER(p, v) p=(v)
9−
10−#define __packed __attribute__((packed))
11−
12−#endif
tools/lib/lockdep/uinclude/linux/delay.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/ftrace.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/gfp.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/hash.h+0−1
@@ -1 +0,0 @@
1−#include "../../../include/linux/hash.h"
tools/lib/lockdep/uinclude/linux/interrupt.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/kernel.h+0−61
@@ -1,61 +0,0 @@
1−#ifndef _LIBLOCKDEP_LINUX_KERNEL_H_
2−#define _LIBLOCKDEP_LINUX_KERNEL_H_
3−
4−#include <linux/export.h>
5−#include <linux/types.h>
6−#include <linux/rcu.h>
7−#include <linux/hardirq.h>
8−#include <linux/kern_levels.h>
9−#include <linux/err.h>
10−
11−#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
12−
13−#ifndef container_of
14−#define container_of(ptr, type, member) ({ \
15− const typeof(((type *)0)->member) * __mptr = (ptr); \
16− (type *)((char *)__mptr - offsetof(type, member)); })
17−#endif
18−
19−#define max(x, y) ({ \
20− typeof(x) _max1 = (x); \
21− typeof(y) _max2 = (y); \
22− (void) (&_max1 == &_max2); \
23− _max1 > _max2 ? _max1 : _max2; })
24−
25−#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
26−
27−static inline int lockdep_warn(int condition)
28−{
29− return condition;
30−}
31−#define WARN_ON(x) lockdep_warn(x)
32−#define WARN_ON_ONCE(x) WARN_ON(x)
33−#define WARN(x, y...) WARN_ON(x)
34−
35−#define likely(x) (x)
36−#define uninitialized_var(x) x
37−#define __init
38−#define noinline
39−#define list_add_tail_rcu list_add_tail
40−#define list_for_each_entry_rcu list_for_each_entry
41−#define barrier()
42−#define synchronize_sched()
43−
44−#ifndef CALLER_ADDR0
45−#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
46−#endif
47−
48−#ifndef _RET_IP_
49−#define _RET_IP_ CALLER_ADDR0
50−#endif
51−
52−#ifndef _THIS_IP_
53−#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
54−#endif
55−
56−#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
57−#define pr_warn pr_err
58−
59−#define current_gfp_context(k) 0
60−
61−#endif
tools/lib/lockdep/uinclude/linux/linkage.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/list.h+0−1
@@ -1 +0,0 @@
1−#include "../../../include/linux/list.h"
tools/lib/lockdep/uinclude/linux/mutex.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/poison.h+0−1
@@ -1 +0,0 @@
1−#include "../../../include/linux/poison.h"
tools/lib/lockdep/uinclude/linux/prefetch.h+0−6
@@ -1,6 +0,0 @@
1−#ifndef _LIBLOCKDEP_LINUX_PREFETCH_H_
2−#define _LIBLOCKDEP_LINUX_PREFETCH_H
3−
4−static inline void prefetch(void *a __attribute__((unused))) { }
5−
6−#endif
tools/lib/lockdep/uinclude/linux/proc_fs.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/rbtree_augmented.h+0−2
@@ -1,2 +0,0 @@
1−#define __always_inline
2−#include "../../../include/linux/rbtree_augmented.h"
tools/lib/lockdep/uinclude/linux/seq_file.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−
tools/lib/lockdep/uinclude/linux/spinlock.h+0−25
@@ -1,25 +0,0 @@
1−#ifndef _LIBLOCKDEP_SPINLOCK_H_
2−#define _LIBLOCKDEP_SPINLOCK_H_
3−
4−#include <pthread.h>
5−#include <stdbool.h>
6−
7−#define arch_spinlock_t pthread_mutex_t
8−#define __ARCH_SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER
9−
10−static inline void arch_spin_lock(arch_spinlock_t *mutex)
11−{
12− pthread_mutex_lock(mutex);
13−}
14−
15−static inline void arch_spin_unlock(arch_spinlock_t *mutex)
16−{
17− pthread_mutex_unlock(mutex);
18−}
19−
20−static inline bool arch_spin_is_locked(arch_spinlock_t *mutex)
21−{
22− return true;
23−}
24−
25−#endif
tools/lib/lockdep/uinclude/linux/stringify.h+0−7
@@ -1,7 +0,0 @@
1−#ifndef _LIBLOCKDEP_LINUX_STRINGIFY_H_
2−#define _LIBLOCKDEP_LINUX_STRINGIFY_H_
3−
4−#define __stringify_1(x...) #x
5−#define __stringify(x...) __stringify_1(x)
6−
7−#endif
tools/lib/lockdep/uinclude/trace/events/lock.h+0−3
@@ -1,3 +0,0 @@
1−
2−/* empty file */
3−

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t