diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:24:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:24:40 -0700 |
| commit | 7540081c6b16dc941895bca840749cabfd0d3b48 (patch) | |
| tree | 9e6b2270d700bf99489b570aa2b4c2c0b6cd0ead /include/linux | |
| parent | 3fde80e94c2bbffbb13f5faa3340cf438440ebea (diff) | |
| parent | b552068999b0b05087c454e525b30b785c79dc9b (diff) | |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Remove __DECLARE_SEMAPHORE_GENERIC
Remove asm/semaphore.h
Remove use of asm/semaphore.h
Add missing semaphore.h includes
Remove mention of semaphores from kernel-locking
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/semaphore.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h index 9cae64b00d6..7415839ac89 100644 --- a/include/linux/semaphore.h +++ b/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) { |