Messages in this thread Patch in this message | | | Date | Wed, 12 Dec 2007 00:00:02 -0800 | Subject | [PATCH 2/3] driver base: memory: semaphore to mutex | From | Daniel Walker <> |
| |
Signed-off-by: Daniel Walker <dwalker@mvista.com>
--- drivers/base/memory.c | 7 ++++--- include/linux/memory.h | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-)
Index: linux-2.6.23/drivers/base/memory.c =================================================================== --- linux-2.6.23.orig/drivers/base/memory.c +++ linux-2.6.23/drivers/base/memory.c @@ -20,6 +20,7 @@ #include <linux/kobject.h> #include <linux/memory_hotplug.h> #include <linux/mm.h> +#include <linux/mutex.h> #include <asm/atomic.h> #include <asm/uaccess.h> @@ -220,7 +221,7 @@ static int memory_block_change_state(str unsigned long to_state, unsigned long from_state_req) { int ret = 0; - down(&mem->state_sem); + mutex_lock(&mem->state_mutex); if (mem->state != from_state_req) { ret = -EINVAL; @@ -232,7 +233,7 @@ static int memory_block_change_state(str mem->state = to_state; out: - up(&mem->state_sem); + mutex_unlock(&mem->state_mutex); return ret; } @@ -357,7 +358,7 @@ static int add_memory_block(unsigned lon mem->phys_index = __section_nr(section); mem->state = state; - init_MUTEX(&mem->state_sem); + mutex_init(&mem->state_mutex); mem->phys_device = phys_device; ret = register_memory(mem, section, NULL); Index: linux-2.6.23/include/linux/memory.h =================================================================== --- linux-2.6.23.orig/include/linux/memory.h +++ linux-2.6.23/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 *); --
| |