Commit-ID: fab0398231a1fff5a3d0ded5f7416c9d2e3d48d1 Gitweb: http://git.kernel.org/tip/fab0398231a1fff5a3d0ded5f7416c9d2e3d48d1 Author: Sasha Levin <sasha.levin@xxxxxxxxxx> AuthorDate: Sat, 9 Feb 2013 19:39:38 -0500 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Mon, 11 Feb 2013 10:12:40 +0100 liblockdep: Keep header declarations even if the library is disabled We need the public headers in the core module code for the preload thing. Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx> Cc: jamie.iles@xxxxxxxxxx Cc: penberg@xxxxxxxxxx Cc: acme@xxxxxxxxxxxxxxxxxx Cc: paulus@xxxxxxxxx Cc: namhyung@xxxxxxxxxx Cc: peterz@xxxxxxxxxxxxx Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: http://lkml.kernel.org/r/1360456781-32462-8-git-send-email-sasha.levin@xxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- tools/lib/lockdep/include/liblockdep/mutex.h | 4 ++-- tools/lib/lockdep/include/liblockdep/rwlock.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/lib/lockdep/include/liblockdep/mutex.h b/tools/lib/lockdep/include/liblockdep/mutex.h index 5154a9d..6ebe733 100644 --- a/tools/lib/lockdep/include/liblockdep/mutex.h +++ b/tools/lib/lockdep/include/liblockdep/mutex.h @@ -1,8 +1,6 @@ #ifndef _LIBLOCKDEP_MUTEX_H #define _LIBLOCKDEP_MUTEX_H -#ifdef __USE_LIBLOCKDEP - #include <pthread.h> #include "common.h" @@ -61,6 +59,8 @@ static inline int liblockdep_pthread_mutex_destroy(liblockdep_pthread_mutex_t *l return pthread_mutex_destroy(&lock->mutex); } +#ifdef __USE_LIBLOCKDEP + #define pthread_mutex_t liblockdep_pthread_mutex_t #define pthread_mutex_init liblockdep_pthread_mutex_init #define pthread_mutex_lock liblockdep_pthread_mutex_lock diff --git a/tools/lib/lockdep/include/liblockdep/rwlock.h b/tools/lib/lockdep/include/liblockdep/rwlock.h index 26f9a68..a1d820b 100644 --- a/tools/lib/lockdep/include/liblockdep/rwlock.h +++ b/tools/lib/lockdep/include/liblockdep/rwlock.h @@ -1,8 +1,6 @@ #ifndef _LIBLOCKDEP_RWLOCK_H #define _LIBLOCKDEP_RWLOCK_H -#ifdef __USE_LIBLOCKDEP - #include <pthread.h> #include "common.h" @@ -77,6 +75,8 @@ static inline int liblockdep_rwlock_destroy(liblockdep_pthread_rwlock_t *lock) return pthread_rwlock_destroy(&lock->rwlock); } +#ifdef __USE_LIBLOCKDEP + #define pthread_rwlock_t liblockdep_pthread_rwlock_t #define pthread_rwlock_init liblockdep_pthread_rwlock_init #define pthread_rwlock_rdlock liblockdep_pthread_rwlock_rdlock -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|