diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-10 15:20:36 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:02:19 -0500 |
commit | 7fe908dd11e0c947bb72baa5b001d7abe5a420d5 (patch) | |
tree | dbd6db7a79476aee256a453f33bbe08c6b3a0cc1 /include/pcmcia | |
parent | cbbddd1046d44d90d31c7f246ed0207117602b89 (diff) |
[PATCH] pcmcia: use mutexes instead of semaphores
Use mutexes in the PCMICA core, as they suffice for what needs to be done.
Includes a bugfix from and Signed-off-by Andrew Morton.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r-- | include/pcmcia/ss.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 6529ccc76514..fa527c2ef5ec 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/config.h> | 18 | #include <linux/config.h> |
19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
20 | #include <linux/sched.h> /* task_struct, completion */ | 20 | #include <linux/sched.h> /* task_struct, completion */ |
21 | #include <linux/mutex.h> | ||
21 | 22 | ||
22 | #include <pcmcia/cs_types.h> | 23 | #include <pcmcia/cs_types.h> |
23 | #include <pcmcia/cs.h> | 24 | #include <pcmcia/cs.h> |
@@ -240,7 +241,7 @@ struct pcmcia_socket { | |||
240 | #endif | 241 | #endif |
241 | 242 | ||
242 | /* state thread */ | 243 | /* state thread */ |
243 | struct semaphore skt_sem; /* protects socket h/w state */ | 244 | struct mutex skt_mutex; /* protects socket h/w state */ |
244 | 245 | ||
245 | struct task_struct *thread; | 246 | struct task_struct *thread; |
246 | struct completion thread_done; | 247 | struct completion thread_done; |