diff --git a/[refs] b/[refs] index c8797edb1fd7..6ec756d12ec9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2351ec533ed0dd56052ab96988d2161d5ecc8ed9 +refs/heads/master: b552068999b0b05087c454e525b30b785c79dc9b diff --git a/trunk/include/linux/semaphore.h b/trunk/include/linux/semaphore.h index 9cae64b00d6b..7415839ac890 100644 --- a/trunk/include/linux/semaphore.h +++ b/trunk/include/linux/semaphore.h @@ -26,10 +26,8 @@ struct semaphore { .wait_list = LIST_HEAD_INIT((name).wait_list), \ } -#define __DECLARE_SEMAPHORE_GENERIC(name, count) \ - struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) - -#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) +#define DECLARE_MUTEX(name) \ + struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1) static inline void sema_init(struct semaphore *sem, int val) {