diff options
author | Daniel Walker <dwalker@mvista.com> | 2008-02-05 02:35:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-19 22:10:19 -0400 |
commit | da19cbcf71cde3c09587b5924d113f0c7f1fd23a (patch) | |
tree | f1731d6a0f8606afcc283c5540055d8e56bb7309 /include/linux/memory.h | |
parent | 610ad5064cb90aec35f5837bbde3d316fe02aca7 (diff) |
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.h | 5 |
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 @@ | |||
18 | #include <linux/sysdev.h> | 18 | #include <linux/sysdev.h> |
19 | #include <linux/node.h> | 19 | #include <linux/node.h> |
20 | #include <linux/compiler.h> | 20 | #include <linux/compiler.h> |
21 | 21 | #include <linux/mutex.h> | |
22 | #include <asm/semaphore.h> | ||
23 | 22 | ||
24 | struct memory_block { | 23 | struct memory_block { |
25 | unsigned long phys_index; | 24 | unsigned long phys_index; |
@@ -30,7 +29,7 @@ struct memory_block { | |||
30 | * created long after the critical areas during | 29 | * created long after the critical areas during |
31 | * initialization. | 30 | * initialization. |
32 | */ | 31 | */ |
33 | struct semaphore state_sem; | 32 | struct mutex state_mutex; |
34 | int phys_device; /* to which fru does this belong? */ | 33 | int phys_device; /* to which fru does this belong? */ |
35 | void *hw; /* optional pointer to fw/hw data */ | 34 | void *hw; /* optional pointer to fw/hw data */ |
36 | int (*phys_callback)(struct memory_block *); | 35 | int (*phys_callback)(struct memory_block *); |