diff options
| -rw-r--r-- | include/asm-alpha/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-arm/semaphore.h | 2 | ||||
| -rw-r--r-- | include/asm-arm26/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-cris/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-frv/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-h8300/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-i386/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-ia64/semaphore.h | 2 | ||||
| -rw-r--r-- | include/asm-m32r/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-m68k/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-m68knommu/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-mips/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-parisc/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-ppc/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-ppc64/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-s390/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-sh/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-sh64/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-sparc/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-sparc64/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-v850/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-x86_64/semaphore.h | 3 | ||||
| -rw-r--r-- | include/asm-xtensa/semaphore.h | 3 |
23 files changed, 0 insertions, 67 deletions
diff --git a/include/asm-alpha/semaphore.h b/include/asm-alpha/semaphore.h index eb2cbd97d4..1a6295f2c2 100644 --- a/include/asm-alpha/semaphore.h +++ b/include/asm-alpha/semaphore.h | |||
| @@ -26,9 +26,6 @@ struct semaphore { | |||
| 26 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ | 26 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | #define __MUTEX_INITIALIZER(name) \ | ||
| 30 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 31 | |||
| 32 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 29 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 33 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 30 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 34 | 31 | ||
diff --git a/include/asm-arm/semaphore.h b/include/asm-arm/semaphore.h index 60f33e6eb8..71ca7d4126 100644 --- a/include/asm-arm/semaphore.h +++ b/include/asm-arm/semaphore.h | |||
| @@ -24,8 +24,6 @@ struct semaphore { | |||
| 24 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ | 24 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | #define __MUTEX_INITIALIZER(name) __SEMAPHORE_INIT(name,1) | ||
| 28 | |||
| 29 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 27 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 30 | struct semaphore name = __SEMAPHORE_INIT(name,count) | 28 | struct semaphore name = __SEMAPHORE_INIT(name,count) |
| 31 | 29 | ||
diff --git a/include/asm-arm26/semaphore.h b/include/asm-arm26/semaphore.h index c1b6a1edad..ccf15e7041 100644 --- a/include/asm-arm26/semaphore.h +++ b/include/asm-arm26/semaphore.h | |||
| @@ -25,9 +25,6 @@ struct semaphore { | |||
| 25 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ | 25 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | #define __MUTEX_INITIALIZER(name) \ | ||
| 29 | __SEMAPHORE_INIT(name,1) | ||
| 30 | |||
| 31 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 28 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 32 | struct semaphore name = __SEMAPHORE_INIT(name,count) | 29 | struct semaphore name = __SEMAPHORE_INIT(name,count) |
| 33 | 30 | ||
diff --git a/include/asm-cris/semaphore.h b/include/asm-cris/semaphore.h index 8ed7636ab3..39faf69bcf 100644 --- a/include/asm-cris/semaphore.h +++ b/include/asm-cris/semaphore.h | |||
| @@ -33,9 +33,6 @@ struct semaphore { | |||
| 33 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 33 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | #define __MUTEX_INITIALIZER(name) \ | ||
| 37 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 38 | |||
| 39 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 36 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 40 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 37 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 41 | 38 | ||
diff --git a/include/asm-frv/semaphore.h b/include/asm-frv/semaphore.h index 3935456308..b18396288d 100644 --- a/include/asm-frv/semaphore.h +++ b/include/asm-frv/semaphore.h | |||
| @@ -47,9 +47,6 @@ struct semaphore { | |||
| 47 | #define __SEMAPHORE_INITIALIZER(name,count) \ | 47 | #define __SEMAPHORE_INITIALIZER(name,count) \ |
| 48 | { count, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) __SEM_DEBUG_INIT(name) } | 48 | { count, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) __SEM_DEBUG_INIT(name) } |
| 49 | 49 | ||
| 50 | #define __MUTEX_INITIALIZER(name) \ | ||
| 51 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 52 | |||
| 53 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 50 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 54 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 51 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 55 | 52 | ||
diff --git a/include/asm-h8300/semaphore.h b/include/asm-h8300/semaphore.h index fe6ef37742..81bae2a991 100644 --- a/include/asm-h8300/semaphore.h +++ b/include/asm-h8300/semaphore.h | |||
| @@ -35,9 +35,6 @@ struct semaphore { | |||
| 35 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 35 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | #define __MUTEX_INITIALIZER(name) \ | ||
| 39 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 40 | |||
| 41 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 38 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 42 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 39 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 43 | 40 | ||
diff --git a/include/asm-i386/semaphore.h b/include/asm-i386/semaphore.h index ea563da63e..6a42b2142f 100644 --- a/include/asm-i386/semaphore.h +++ b/include/asm-i386/semaphore.h | |||
| @@ -55,9 +55,6 @@ struct semaphore { | |||
| 55 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 55 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | #define __MUTEX_INITIALIZER(name) \ | ||
| 59 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 60 | |||
| 61 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 58 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 62 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 59 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 63 | 60 | ||
diff --git a/include/asm-ia64/semaphore.h b/include/asm-ia64/semaphore.h index 3a2f0f3f78..bb8906285f 100644 --- a/include/asm-ia64/semaphore.h +++ b/include/asm-ia64/semaphore.h | |||
| @@ -24,8 +24,6 @@ struct semaphore { | |||
| 24 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 24 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | #define __MUTEX_INITIALIZER(name) __SEMAPHORE_INITIALIZER(name,1) | ||
| 28 | |||
| 29 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 27 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 30 | struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) | 28 | struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) |
| 31 | 29 | ||
diff --git a/include/asm-m32r/semaphore.h b/include/asm-m32r/semaphore.h index 53e3c60f21..bf447c52a0 100644 --- a/include/asm-m32r/semaphore.h +++ b/include/asm-m32r/semaphore.h | |||
| @@ -32,9 +32,6 @@ struct semaphore { | |||
| 32 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 32 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | #define __MUTEX_INITIALIZER(name) \ | ||
| 36 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 37 | |||
| 38 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 35 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 39 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 36 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 40 | 37 | ||
diff --git a/include/asm-m68k/semaphore.h b/include/asm-m68k/semaphore.h index ab94cf3ed4..fd4c7cc3d3 100644 --- a/include/asm-m68k/semaphore.h +++ b/include/asm-m68k/semaphore.h | |||
| @@ -36,9 +36,6 @@ struct semaphore { | |||
| 36 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 36 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | #define __MUTEX_INITIALIZER(name) \ | ||
| 40 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 41 | |||
| 42 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 39 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 43 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 40 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 44 | 41 | ||
diff --git a/include/asm-m68knommu/semaphore.h b/include/asm-m68knommu/semaphore.h index febe85add5..17aee15906 100644 --- a/include/asm-m68knommu/semaphore.h +++ b/include/asm-m68knommu/semaphore.h | |||
| @@ -35,9 +35,6 @@ struct semaphore { | |||
| 35 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 35 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | #define __MUTEX_INITIALIZER(name) \ | ||
| 39 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 40 | |||
| 41 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 38 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 42 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 39 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 43 | 40 | ||
diff --git a/include/asm-mips/semaphore.h b/include/asm-mips/semaphore.h index c2c97dec66..3d6aa7c7ea 100644 --- a/include/asm-mips/semaphore.h +++ b/include/asm-mips/semaphore.h | |||
| @@ -45,9 +45,6 @@ struct semaphore { | |||
| 45 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 45 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | #define __MUTEX_INITIALIZER(name) \ | ||
| 49 | __SEMAPHORE_INITIALIZER(name, 1) | ||
| 50 | |||
| 51 | #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ | 48 | #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ |
| 52 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 49 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 53 | 50 | ||
diff --git a/include/asm-parisc/semaphore.h b/include/asm-parisc/semaphore.h index f78bb2e345..c9ee41cd07 100644 --- a/include/asm-parisc/semaphore.h +++ b/include/asm-parisc/semaphore.h | |||
| @@ -49,9 +49,6 @@ struct semaphore { | |||
| 49 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 49 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | #define __MUTEX_INITIALIZER(name) \ | ||
| 53 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 54 | |||
| 55 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 52 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 56 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 53 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 57 | 54 | ||
diff --git a/include/asm-ppc/semaphore.h b/include/asm-ppc/semaphore.h index 89e6e73be0..d592937359 100644 --- a/include/asm-ppc/semaphore.h +++ b/include/asm-ppc/semaphore.h | |||
| @@ -37,9 +37,6 @@ struct semaphore { | |||
| 37 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 37 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | #define __MUTEX_INITIALIZER(name) \ | ||
| 41 | __SEMAPHORE_INITIALIZER(name, 1) | ||
| 42 | |||
| 43 | #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ | 40 | #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ |
| 44 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 41 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 45 | 42 | ||
diff --git a/include/asm-ppc64/semaphore.h b/include/asm-ppc64/semaphore.h index aefe7753ea..d9ecb99692 100644 --- a/include/asm-ppc64/semaphore.h +++ b/include/asm-ppc64/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 | ||
diff --git a/include/asm-s390/semaphore.h b/include/asm-s390/semaphore.h index 873def6f36..702cf43669 100644 --- a/include/asm-s390/semaphore.h +++ b/include/asm-s390/semaphore.h | |||
| @@ -29,9 +29,6 @@ struct semaphore { | |||
| 29 | #define __SEMAPHORE_INITIALIZER(name,count) \ | 29 | #define __SEMAPHORE_INITIALIZER(name,count) \ |
| 30 | { ATOMIC_INIT(count), __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) } | 30 | { ATOMIC_INIT(count), __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) } |
| 31 | 31 | ||
| 32 | #define __MUTEX_INITIALIZER(name) \ | ||
| 33 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 34 | |||
| 35 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 32 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 36 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 33 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 37 | 34 | ||
diff --git a/include/asm-sh/semaphore.h b/include/asm-sh/semaphore.h index b923a77a8a..489f7847c5 100644 --- a/include/asm-sh/semaphore.h +++ b/include/asm-sh/semaphore.h | |||
| @@ -33,9 +33,6 @@ struct semaphore { | |||
| 33 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 33 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | #define __MUTEX_INITIALIZER(name) \ | ||
| 37 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 38 | |||
| 39 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 36 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 40 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 37 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 41 | 38 | ||
diff --git a/include/asm-sh64/semaphore.h b/include/asm-sh64/semaphore.h index fce22bb9a5..4695264591 100644 --- a/include/asm-sh64/semaphore.h +++ b/include/asm-sh64/semaphore.h | |||
| @@ -40,9 +40,6 @@ struct semaphore { | |||
| 40 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 40 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | #define __MUTEX_INITIALIZER(name) \ | ||
| 44 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 45 | |||
| 46 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 43 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 47 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 44 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 48 | 45 | ||
diff --git a/include/asm-sparc/semaphore.h b/include/asm-sparc/semaphore.h index 60ac5fd9eb..f74ba31e26 100644 --- a/include/asm-sparc/semaphore.h +++ b/include/asm-sparc/semaphore.h | |||
| @@ -22,9 +22,6 @@ struct semaphore { | |||
| 22 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 22 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | #define __MUTEX_INITIALIZER(name) \ | ||
| 26 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 27 | |||
| 28 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 25 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 29 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 26 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 30 | 27 | ||
diff --git a/include/asm-sparc64/semaphore.h b/include/asm-sparc64/semaphore.h index 7419dd88b4..093dcc6788 100644 --- a/include/asm-sparc64/semaphore.h +++ b/include/asm-sparc64/semaphore.h | |||
| @@ -22,9 +22,6 @@ struct semaphore { | |||
| 22 | { ATOMIC_INIT(count), \ | 22 | { ATOMIC_INIT(count), \ |
| 23 | __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) } | 23 | __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) } |
| 24 | 24 | ||
| 25 | #define __MUTEX_INITIALIZER(name) \ | ||
| 26 | __SEMAPHORE_INITIALIZER(name, 1) | ||
| 27 | |||
| 28 | #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ | 25 | #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ |
| 29 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 26 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 30 | 27 | ||
diff --git a/include/asm-v850/semaphore.h b/include/asm-v850/semaphore.h index c514062bb6..df6cdecf6c 100644 --- a/include/asm-v850/semaphore.h +++ b/include/asm-v850/semaphore.h | |||
| @@ -18,9 +18,6 @@ struct semaphore { | |||
| 18 | { ATOMIC_INIT (count), 0, \ | 18 | { ATOMIC_INIT (count), 0, \ |
| 19 | __WAIT_QUEUE_HEAD_INITIALIZER ((name).wait) } | 19 | __WAIT_QUEUE_HEAD_INITIALIZER ((name).wait) } |
| 20 | 20 | ||
| 21 | #define __MUTEX_INITIALIZER(name) \ | ||
| 22 | __SEMAPHORE_INITIALIZER (name,1) | ||
| 23 | |||
| 24 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 21 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 25 | struct semaphore name = __SEMAPHORE_INITIALIZER (name,count) | 22 | struct semaphore name = __SEMAPHORE_INITIALIZER (name,count) |
| 26 | 23 | ||
diff --git a/include/asm-x86_64/semaphore.h b/include/asm-x86_64/semaphore.h index f325e39bf3..a389aa6fe8 100644 --- a/include/asm-x86_64/semaphore.h +++ b/include/asm-x86_64/semaphore.h | |||
| @@ -56,9 +56,6 @@ struct semaphore { | |||
| 56 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 56 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | #define __MUTEX_INITIALIZER(name) \ | ||
| 60 | __SEMAPHORE_INITIALIZER(name,1) | ||
| 61 | |||
| 62 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 59 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 63 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 60 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 64 | 61 | ||
diff --git a/include/asm-xtensa/semaphore.h b/include/asm-xtensa/semaphore.h index 09e89ab3eb..2a10e193b9 100644 --- a/include/asm-xtensa/semaphore.h +++ b/include/asm-xtensa/semaphore.h | |||
| @@ -29,9 +29,6 @@ struct semaphore { | |||
| 29 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ | 29 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | #define __MUTEX_INITIALIZER(name) \ | ||
| 33 | __SEMAPHORE_INITIALIZER(name, 1) | ||
| 34 | |||
| 35 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ | 32 | #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ |
| 36 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 33 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
| 37 | 34 | ||
