summaryrefslogtreecommitdiff
path: root/include/linux/memory.h
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@mvista.com>2008-02-05 10:35:47 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-20 06:10:19 +0400
commitda19cbcf71cde3c09587b5924d113f0c7f1fd23a (patch)
treef1731d6a0f8606afcc283c5540055d8e56bb7309 /include/linux/memory.h
parent610ad5064cb90aec35f5837bbde3d316fe02aca7 (diff)
downloadlinux-da19cbcf71cde3c09587b5924d113f0c7f1fd23a.tar.xz
driver core: memory: semaphore to mutex
Signed-off-by: Daniel Walker <dwalker@mvista.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/memory.h')
-rw-r--r--include/linux/memory.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 33f0ff0cf634..f80e0e331cb7 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -18,8 +18,7 @@
#include <linux/sysdev.h>
#include <linux/node.h>
#include <linux/compiler.h>
-
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
struct memory_block {
unsigned long phys_index;
@@ -30,7 +29,7 @@ struct memory_block {
* created long after the critical areas during
* initialization.
*/
- struct semaphore state_sem;
+ struct mutex state_mutex;
int phys_device; /* to which fru does this belong? */
void *hw; /* optional pointer to fw/hw data */
int (*phys_callback)(struct memory_block *);