diff options
| author | Daniel Walker <dwalker@mvista.com> | 2008-02-04 23:35:47 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-19 19:10:19 -0700 |
| commit | da19cbcf71cde3c09587b5924d113f0c7f1fd23a (patch) | |
| tree | f1731d6a0f8606afcc283c5540055d8e56bb7309 /include/linux/memory.h | |
| parent | 610ad5064cb90aec35f5837bbde3d316fe02aca7 (diff) | |
| download | op-kernel-dev-da19cbcf71cde3c09587b5924d113f0c7f1fd23a.zip op-kernel-dev-da19cbcf71cde3c09587b5924d113f0c7f1fd23a.tar.gz | |
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 33f0ff0..f80e0e3 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 *); |
