diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-03-26 04:37:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:56:55 -0500 |
commit | 5f921ae96f1529a55966f25cd5c70fab11d38be7 (patch) | |
tree | d8b3fecae1b36a99c0dbf544b30933a727bc7178 /ipc/util.h | |
parent | 14cc3e2b633bb64063698980974df4535368e98f (diff) |
[PATCH] sem2mutex: ipc, id.sem
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'ipc/util.h')
-rw-r--r-- | ipc/util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/util.h b/ipc/util.h index efaff3ee7de7..0181553d31d8 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -25,7 +25,7 @@ struct ipc_ids { | |||
25 | int max_id; | 25 | int max_id; |
26 | unsigned short seq; | 26 | unsigned short seq; |
27 | unsigned short seq_max; | 27 | unsigned short seq_max; |
28 | struct semaphore sem; | 28 | struct mutex mutex; |
29 | struct ipc_id_ary nullentry; | 29 | struct ipc_id_ary nullentry; |
30 | struct ipc_id_ary* entries; | 30 | struct ipc_id_ary* entries; |
31 | }; | 31 | }; |
@@ -40,7 +40,7 @@ void __init ipc_init_proc_interface(const char *path, const char *header, | |||
40 | #define ipc_init_proc_interface(path, header, ids, show) do {} while (0) | 40 | #define ipc_init_proc_interface(path, header, ids, show) do {} while (0) |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | /* must be called with ids->sem acquired.*/ | 43 | /* must be called with ids->mutex acquired.*/ |
44 | int ipc_findkey(struct ipc_ids* ids, key_t key); | 44 | int ipc_findkey(struct ipc_ids* ids, key_t key); |
45 | int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size); | 45 | int ipc_addid(struct ipc_ids* ids, struct kern_ipc_perm* new, int size); |
46 | 46 | ||