diff options
| author | Andrey Ryabinin <aryabinin@virtuozzo.com> | 2016-02-04 14:29:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-09 06:03:25 -0500 |
| commit | 06bea3dbfe6a4c333c4333362c46bdf4d9e43504 (patch) | |
| tree | b06cdf5f34a8b2c5cbbbf6e7535893f46ddc3307 /tools/lib | |
| parent | a63f38cc4ccfa076f87fc3d0c276ee62e710f953 (diff) | |
locking/lockdep: Eliminate lockdep_init()
Lockdep is initialized at compile time now. Get rid of lockdep_init().
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Krinkin <krinkin.m.u@gmail.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Cc: mm-commits@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/lockdep/common.c | 5 | ||||
| -rw-r--r-- | tools/lib/lockdep/include/liblockdep/common.h | 1 | ||||
| -rw-r--r-- | tools/lib/lockdep/preload.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/tools/lib/lockdep/common.c b/tools/lib/lockdep/common.c index 9be663340f0a..d1c89cc06f5f 100644 --- a/tools/lib/lockdep/common.c +++ b/tools/lib/lockdep/common.c | |||
| @@ -11,11 +11,6 @@ static __thread struct task_struct current_obj; | |||
| 11 | bool debug_locks = true; | 11 | bool debug_locks = true; |
| 12 | bool debug_locks_silent; | 12 | bool debug_locks_silent; |
| 13 | 13 | ||
| 14 | __attribute__((constructor)) static void liblockdep_init(void) | ||
| 15 | { | ||
| 16 | lockdep_init(); | ||
| 17 | } | ||
| 18 | |||
| 19 | __attribute__((destructor)) static void liblockdep_exit(void) | 14 | __attribute__((destructor)) static void liblockdep_exit(void) |
| 20 | { | 15 | { |
| 21 | debug_check_no_locks_held(); | 16 | debug_check_no_locks_held(); |
diff --git a/tools/lib/lockdep/include/liblockdep/common.h b/tools/lib/lockdep/include/liblockdep/common.h index a60c14b9662a..6e66277ec437 100644 --- a/tools/lib/lockdep/include/liblockdep/common.h +++ b/tools/lib/lockdep/include/liblockdep/common.h | |||
| @@ -44,7 +44,6 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, | |||
| 44 | void lock_release(struct lockdep_map *lock, int nested, | 44 | void lock_release(struct lockdep_map *lock, int nested, |
| 45 | unsigned long ip); | 45 | unsigned long ip); |
| 46 | extern void debug_check_no_locks_freed(const void *from, unsigned long len); | 46 | extern void debug_check_no_locks_freed(const void *from, unsigned long len); |
| 47 | extern void lockdep_init(void); | ||
| 48 | 47 | ||
| 49 | #define STATIC_LOCKDEP_MAP_INIT(_name, _key) \ | 48 | #define STATIC_LOCKDEP_MAP_INIT(_name, _key) \ |
| 50 | { .name = (_name), .key = (void *)(_key), } | 49 | { .name = (_name), .key = (void *)(_key), } |
diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c index 21cdf869a01b..52844847569c 100644 --- a/tools/lib/lockdep/preload.c +++ b/tools/lib/lockdep/preload.c | |||
| @@ -439,7 +439,5 @@ __attribute__((constructor)) static void init_preload(void) | |||
| 439 | ll_pthread_rwlock_unlock = dlsym(RTLD_NEXT, "pthread_rwlock_unlock"); | 439 | ll_pthread_rwlock_unlock = dlsym(RTLD_NEXT, "pthread_rwlock_unlock"); |
| 440 | #endif | 440 | #endif |
| 441 | 441 | ||
| 442 | lockdep_init(); | ||
| 443 | |||
| 444 | __init_state = done; | 442 | __init_state = done; |
| 445 | } | 443 | } |
