diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /include/asm-powerpc/semaphore.h | |
parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) |
Merge ../linux-2.6 by hand
Diffstat (limited to 'include/asm-powerpc/semaphore.h')
-rw-r--r-- | include/asm-powerpc/semaphore.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-powerpc/semaphore.h b/include/asm-powerpc/semaphore.h index fd42fe97158f..57369d2cadef 100644 --- a/include/asm-powerpc/semaphore.h +++ b/include/asm-powerpc/semaphore.h | |||
@@ -31,9 +31,6 @@ struct semaphore { | |||
31 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 31 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
32 | } | 32 | } |
33 | 33 | ||
34 | #define __MUTEX_INITIALIZER(name) \ | ||
35 | __SEMAPHORE_INITIALIZER(name, 1) | ||
36 | |||
37 | #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ | 34 | #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ |
38 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
39 | 36 | ||