diff --git a/[refs] b/[refs] index 2156fc6507f4..c97f6c3a4d56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bd2c92cf07cc4a373bf316c75b78ac465fefd35 +refs/heads/master: cc189d2513d1f45cde87a9043fe3be28559c7490 diff --git a/trunk/arch/x86/include/asm/mutex.h b/trunk/arch/x86/include/asm/mutex.h index bc2a0b0dcea6..7d3a48275394 100644 --- a/trunk/arch/x86/include/asm/mutex.h +++ b/trunk/arch/x86/include/asm/mutex.h @@ -3,13 +3,3 @@ #else # include #endif - -#ifndef __ASM_MUTEX_H -#define __ASM_MUTEX_H -/* - * For the x86 architecture, it allows any negative number (besides -1) in - * the mutex count to indicate that some other threads are waiting on the - * mutex. - */ -#define __ARCH_ALLOW_ANY_NEGATIVE_MUTEX_COUNT 1 -#endif diff --git a/trunk/kernel/mutex.c b/trunk/kernel/mutex.c index 1dbd4210baef..ad53a664f113 100644 --- a/trunk/kernel/mutex.c +++ b/trunk/kernel/mutex.c @@ -38,15 +38,10 @@ #endif /* - * A mutex count of -1 indicates that waiters are sleeping waiting for the - * mutex. Some architectures can allow any negative number, not just -1, for - * this purpose. + * A negative mutex count indicates that waiters are sleeping waiting for the + * mutex. */ -#ifdef __ARCH_ALLOW_ANY_NEGATIVE_MUTEX_COUNT #define MUTEX_SHOW_NO_WAITER(mutex) (atomic_read(&(mutex)->count) >= 0) -#else -#define MUTEX_SHOW_NO_WAITER(mutex) (atomic_read(&(mutex)->count) != -1) -#endif void __mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key)