diff options
-rw-r--r-- | drivers/usb/storage/libusual.c | 4 | ||||
-rw-r--r-- | include/asm-alpha/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-arm/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-avr32/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-blackfin/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-cris/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-frv/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-h8300/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-ia64/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-m32r/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-m68knommu/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-mips/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-parisc/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-s390/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-sh/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-sh64/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-sparc/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-v850/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-x86/semaphore_32.h | 1 | ||||
-rw-r--r-- | include/asm-x86/semaphore_64.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/semaphore.h | 1 |
24 files changed, 3 insertions, 24 deletions
diff --git a/drivers/usb/storage/libusual.c b/drivers/usb/storage/libusual.c index 06d1107dbd47..55b952084f0c 100644 --- a/drivers/usb/storage/libusual.c +++ b/drivers/usb/storage/libusual.c | |||
@@ -30,7 +30,7 @@ static atomic_t usu_bias = ATOMIC_INIT(USB_US_DEFAULT_BIAS); | |||
30 | #define BIAS_NAME_SIZE (sizeof("usb-storage")) | 30 | #define BIAS_NAME_SIZE (sizeof("usb-storage")) |
31 | static const char *bias_names[3] = { "none", "usb-storage", "ub" }; | 31 | static const char *bias_names[3] = { "none", "usb-storage", "ub" }; |
32 | 32 | ||
33 | static DECLARE_MUTEX_LOCKED(usu_init_notify); | 33 | static struct semaphore usu_init_notify; |
34 | static DECLARE_COMPLETION(usu_end_notify); | 34 | static DECLARE_COMPLETION(usu_end_notify); |
35 | static atomic_t total_threads = ATOMIC_INIT(0); | 35 | static atomic_t total_threads = ATOMIC_INIT(0); |
36 | 36 | ||
@@ -204,6 +204,8 @@ static int __init usb_usual_init(void) | |||
204 | { | 204 | { |
205 | int rc; | 205 | int rc; |
206 | 206 | ||
207 | sema_init(&usu_init_notify, 0); | ||
208 | |||
207 | rc = usb_register(&usu_driver); | 209 | rc = usb_register(&usu_driver); |
208 | up(&usu_init_notify); | 210 | up(&usu_init_notify); |
209 | return rc; | 211 | return rc; |
diff --git a/include/asm-alpha/semaphore.h b/include/asm-alpha/semaphore.h index 1a6295f2c2d4..f1e9278a9fe2 100644 --- a/include/asm-alpha/semaphore.h +++ b/include/asm-alpha/semaphore.h | |||
@@ -30,7 +30,6 @@ struct semaphore { | |||
30 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 30 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
31 | 31 | ||
32 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 32 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
33 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
34 | 33 | ||
35 | static inline void sema_init(struct semaphore *sem, int val) | 34 | static inline void sema_init(struct semaphore *sem, int val) |
36 | { | 35 | { |
diff --git a/include/asm-arm/semaphore.h b/include/asm-arm/semaphore.h index d5dc624f452a..1c8b441f89e3 100644 --- a/include/asm-arm/semaphore.h +++ b/include/asm-arm/semaphore.h | |||
@@ -28,7 +28,6 @@ struct semaphore { | |||
28 | struct semaphore name = __SEMAPHORE_INIT(name,count) | 28 | struct semaphore name = __SEMAPHORE_INIT(name,count) |
29 | 29 | ||
30 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 30 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
31 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
32 | 31 | ||
33 | static inline void sema_init(struct semaphore *sem, int val) | 32 | static inline void sema_init(struct semaphore *sem, int val) |
34 | { | 33 | { |
diff --git a/include/asm-avr32/semaphore.h b/include/asm-avr32/semaphore.h index ef99ddccc10c..feaf1d453386 100644 --- a/include/asm-avr32/semaphore.h +++ b/include/asm-avr32/semaphore.h | |||
@@ -36,7 +36,6 @@ struct semaphore { | |||
36 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 36 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
37 | 37 | ||
38 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 38 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
39 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
40 | 39 | ||
41 | static inline void sema_init (struct semaphore *sem, int val) | 40 | static inline void sema_init (struct semaphore *sem, int val) |
42 | { | 41 | { |
diff --git a/include/asm-blackfin/semaphore.h b/include/asm-blackfin/semaphore.h index 94c04d7ab23e..533f90fb2e4e 100644 --- a/include/asm-blackfin/semaphore.h +++ b/include/asm-blackfin/semaphore.h | |||
@@ -35,7 +35,6 @@ struct semaphore { | |||
35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
36 | 36 | ||
37 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 37 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
38 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
39 | 38 | ||
40 | static inline void sema_init(struct semaphore *sem, int val) | 39 | static inline void sema_init(struct semaphore *sem, int val) |
41 | { | 40 | { |
diff --git a/include/asm-cris/semaphore.h b/include/asm-cris/semaphore.h index 53f548b791c1..31a4ac448195 100644 --- a/include/asm-cris/semaphore.h +++ b/include/asm-cris/semaphore.h | |||
@@ -35,7 +35,6 @@ struct semaphore { | |||
35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
36 | 36 | ||
37 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 37 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
38 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
39 | 38 | ||
40 | static inline void sema_init(struct semaphore *sem, int val) | 39 | static inline void sema_init(struct semaphore *sem, int val) |
41 | { | 40 | { |
diff --git a/include/asm-frv/semaphore.h b/include/asm-frv/semaphore.h index 09586528e007..d7aaa1911a1a 100644 --- a/include/asm-frv/semaphore.h +++ b/include/asm-frv/semaphore.h | |||
@@ -49,7 +49,6 @@ struct semaphore { | |||
49 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 49 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
50 | 50 | ||
51 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 51 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
52 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
53 | 52 | ||
54 | static inline void sema_init (struct semaphore *sem, int val) | 53 | static inline void sema_init (struct semaphore *sem, int val) |
55 | { | 54 | { |
diff --git a/include/asm-h8300/semaphore.h b/include/asm-h8300/semaphore.h index 81bae2a99192..f3ffff83ff09 100644 --- a/include/asm-h8300/semaphore.h +++ b/include/asm-h8300/semaphore.h | |||
@@ -39,7 +39,6 @@ struct semaphore { | |||
39 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 39 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
40 | 40 | ||
41 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 41 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
42 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
43 | 42 | ||
44 | static inline void sema_init (struct semaphore *sem, int val) | 43 | static inline void sema_init (struct semaphore *sem, int val) |
45 | { | 44 | { |
diff --git a/include/asm-ia64/semaphore.h b/include/asm-ia64/semaphore.h index f483eeb95dd1..d8393d11288d 100644 --- a/include/asm-ia64/semaphore.h +++ b/include/asm-ia64/semaphore.h | |||
@@ -28,7 +28,6 @@ struct semaphore { | |||
28 | struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) | 28 | struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) |
29 | 29 | ||
30 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) | 30 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) |
31 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) | ||
32 | 31 | ||
33 | static inline void | 32 | static inline void |
34 | sema_init (struct semaphore *sem, int val) | 33 | sema_init (struct semaphore *sem, int val) |
diff --git a/include/asm-m32r/semaphore.h b/include/asm-m32r/semaphore.h index 41e45d7b87ef..b5bf95a6f2b4 100644 --- a/include/asm-m32r/semaphore.h +++ b/include/asm-m32r/semaphore.h | |||
@@ -35,7 +35,6 @@ struct semaphore { | |||
35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
36 | 36 | ||
37 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 37 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
38 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
39 | 38 | ||
40 | static inline void sema_init (struct semaphore *sem, int val) | 39 | static inline void sema_init (struct semaphore *sem, int val) |
41 | { | 40 | { |
diff --git a/include/asm-m68k/semaphore.h b/include/asm-m68k/semaphore.h index fd4c7cc3d3be..64d6b119bb0a 100644 --- a/include/asm-m68k/semaphore.h +++ b/include/asm-m68k/semaphore.h | |||
@@ -40,7 +40,6 @@ struct semaphore { | |||
40 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 40 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
41 | 41 | ||
42 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 42 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
43 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
44 | 43 | ||
45 | static inline void sema_init(struct semaphore *sem, int val) | 44 | static inline void sema_init(struct semaphore *sem, int val) |
46 | { | 45 | { |
diff --git a/include/asm-m68knommu/semaphore.h b/include/asm-m68knommu/semaphore.h index 5cc1fdd86f50..5779eb6c0689 100644 --- a/include/asm-m68knommu/semaphore.h +++ b/include/asm-m68knommu/semaphore.h | |||
@@ -39,7 +39,6 @@ struct semaphore { | |||
39 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 39 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
40 | 40 | ||
41 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 41 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
42 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
43 | 42 | ||
44 | static inline void sema_init (struct semaphore *sem, int val) | 43 | static inline void sema_init (struct semaphore *sem, int val) |
45 | { | 44 | { |
diff --git a/include/asm-mips/semaphore.h b/include/asm-mips/semaphore.h index 080daa77f867..fdf8042b784b 100644 --- a/include/asm-mips/semaphore.h +++ b/include/asm-mips/semaphore.h | |||
@@ -49,7 +49,6 @@ struct semaphore { | |||
49 | struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) | 49 | struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) |
50 | 50 | ||
51 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) | 51 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) |
52 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) | ||
53 | 52 | ||
54 | static inline void sema_init(struct semaphore *sem, int val) | 53 | static inline void sema_init(struct semaphore *sem, int val) |
55 | { | 54 | { |
diff --git a/include/asm-parisc/semaphore.h b/include/asm-parisc/semaphore.h index d45827a21f94..b771dcfcfdd1 100644 --- a/include/asm-parisc/semaphore.h +++ b/include/asm-parisc/semaphore.h | |||
@@ -53,7 +53,6 @@ struct semaphore { | |||
53 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 53 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
54 | 54 | ||
55 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 55 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
56 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
57 | 56 | ||
58 | extern inline void sema_init (struct semaphore *sem, int val) | 57 | extern inline void sema_init (struct semaphore *sem, int val) |
59 | { | 58 | { |
diff --git a/include/asm-powerpc/semaphore.h b/include/asm-powerpc/semaphore.h index 57369d2cadef..48dd32e07749 100644 --- a/include/asm-powerpc/semaphore.h +++ b/include/asm-powerpc/semaphore.h | |||
@@ -35,7 +35,6 @@ struct semaphore { | |||
35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 35 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
36 | 36 | ||
37 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) | 37 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) |
38 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) | ||
39 | 38 | ||
40 | static inline void sema_init (struct semaphore *sem, int val) | 39 | static inline void sema_init (struct semaphore *sem, int val) |
41 | { | 40 | { |
diff --git a/include/asm-s390/semaphore.h b/include/asm-s390/semaphore.h index dbce058aefa9..0e7001ad8392 100644 --- a/include/asm-s390/semaphore.h +++ b/include/asm-s390/semaphore.h | |||
@@ -33,7 +33,6 @@ struct semaphore { | |||
33 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 33 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
34 | 34 | ||
35 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 35 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
36 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
37 | 36 | ||
38 | static inline void sema_init (struct semaphore *sem, int val) | 37 | static inline void sema_init (struct semaphore *sem, int val) |
39 | { | 38 | { |
diff --git a/include/asm-sh/semaphore.h b/include/asm-sh/semaphore.h index 489f7847c5d9..9e5a37c4dce2 100644 --- a/include/asm-sh/semaphore.h +++ b/include/asm-sh/semaphore.h | |||
@@ -37,7 +37,6 @@ struct semaphore { | |||
37 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 37 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
38 | 38 | ||
39 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 39 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
40 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
41 | 40 | ||
42 | static inline void sema_init (struct semaphore *sem, int val) | 41 | static inline void sema_init (struct semaphore *sem, int val) |
43 | { | 42 | { |
diff --git a/include/asm-sh64/semaphore.h b/include/asm-sh64/semaphore.h index 469526459149..f027cc14b55b 100644 --- a/include/asm-sh64/semaphore.h +++ b/include/asm-sh64/semaphore.h | |||
@@ -44,7 +44,6 @@ struct semaphore { | |||
44 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 44 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
45 | 45 | ||
46 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 46 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
47 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
48 | 47 | ||
49 | static inline void sema_init (struct semaphore *sem, int val) | 48 | static inline void sema_init (struct semaphore *sem, int val) |
50 | { | 49 | { |
diff --git a/include/asm-sparc/semaphore.h b/include/asm-sparc/semaphore.h index f74ba31e265b..8018f9f4d497 100644 --- a/include/asm-sparc/semaphore.h +++ b/include/asm-sparc/semaphore.h | |||
@@ -26,7 +26,6 @@ struct semaphore { | |||
26 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 26 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
27 | 27 | ||
28 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 28 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
29 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
30 | 29 | ||
31 | static inline void sema_init (struct semaphore *sem, int val) | 30 | static inline void sema_init (struct semaphore *sem, int val) |
32 | { | 31 | { |
diff --git a/include/asm-sparc64/semaphore.h b/include/asm-sparc64/semaphore.h index 093dcc6788db..7f7c0c4e024f 100644 --- a/include/asm-sparc64/semaphore.h +++ b/include/asm-sparc64/semaphore.h | |||
@@ -26,7 +26,6 @@ struct semaphore { | |||
26 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 26 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
27 | 27 | ||
28 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) | 28 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) |
29 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) | ||
30 | 29 | ||
31 | static inline void sema_init (struct semaphore *sem, int val) | 30 | static inline void sema_init (struct semaphore *sem, int val) |
32 | { | 31 | { |
diff --git a/include/asm-v850/semaphore.h b/include/asm-v850/semaphore.h index 735baaf3a16e..10ed0ccf37df 100644 --- a/include/asm-v850/semaphore.h +++ b/include/asm-v850/semaphore.h | |||
@@ -22,7 +22,6 @@ struct semaphore { | |||
22 | struct semaphore name = __SEMAPHORE_INITIALIZER (name,count) | 22 | struct semaphore name = __SEMAPHORE_INITIALIZER (name,count) |
23 | 23 | ||
24 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC (name,1) | 24 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC (name,1) |
25 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC (name,0) | ||
26 | 25 | ||
27 | static inline void sema_init (struct semaphore *sem, int val) | 26 | static inline void sema_init (struct semaphore *sem, int val) |
28 | { | 27 | { |
diff --git a/include/asm-x86/semaphore_32.h b/include/asm-x86/semaphore_32.h index 4e34a468c383..835c1d751a9f 100644 --- a/include/asm-x86/semaphore_32.h +++ b/include/asm-x86/semaphore_32.h | |||
@@ -59,7 +59,6 @@ struct semaphore { | |||
59 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 59 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
60 | 60 | ||
61 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 61 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
62 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
63 | 62 | ||
64 | static inline void sema_init (struct semaphore *sem, int val) | 63 | static inline void sema_init (struct semaphore *sem, int val) |
65 | { | 64 | { |
diff --git a/include/asm-x86/semaphore_64.h b/include/asm-x86/semaphore_64.h index 1194888536b9..79694306bf7d 100644 --- a/include/asm-x86/semaphore_64.h +++ b/include/asm-x86/semaphore_64.h | |||
@@ -60,7 +60,6 @@ struct semaphore { | |||
60 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 60 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
61 | 61 | ||
62 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 62 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
63 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
64 | 63 | ||
65 | static inline void sema_init (struct semaphore *sem, int val) | 64 | static inline void sema_init (struct semaphore *sem, int val) |
66 | { | 65 | { |
diff --git a/include/asm-xtensa/semaphore.h b/include/asm-xtensa/semaphore.h index f10c3487cd4c..3e04167cd9dc 100644 --- a/include/asm-xtensa/semaphore.h +++ b/include/asm-xtensa/semaphore.h | |||
@@ -33,7 +33,6 @@ struct semaphore { | |||
33 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) | 33 | struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) |
34 | 34 | ||
35 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) | 35 | #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) |
36 | #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) | ||
37 | 36 | ||
38 | static inline void sema_init (struct semaphore *sem, int val) | 37 | static inline void sema_init (struct semaphore *sem, int val) |
39 | { | 38 | { |