Loading drivers/base/memory.c +4 −3 Original line number Diff line number Diff line Loading @@ -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> Loading Loading @@ -205,7 +206,7 @@ static int memory_block_change_state(struct memory_block *mem, 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; Loading @@ -217,7 +218,7 @@ static int memory_block_change_state(struct memory_block *mem, mem->state = to_state; out: up(&mem->state_sem); mutex_unlock(&mem->state_mutex); return ret; } Loading Loading @@ -341,7 +342,7 @@ static int add_memory_block(unsigned long node_id, struct mem_section *section, 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); Loading include/linux/memory.h +2 −3 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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 *); Loading mm/memory_hotplug.c +1 −1 Original line number Diff line number Diff line Loading @@ -208,7 +208,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages) /* * This doesn't need a lock to do pfn_to_page(). * The section can't be removed here because of the * memory_block->state_sem. * memory_block->state_mutex. */ zone = page_zone(pfn_to_page(pfn)); pgdat_resize_lock(zone->zone_pgdat, &flags); Loading Loading
drivers/base/memory.c +4 −3 Original line number Diff line number Diff line Loading @@ -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> Loading Loading @@ -205,7 +206,7 @@ static int memory_block_change_state(struct memory_block *mem, 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; Loading @@ -217,7 +218,7 @@ static int memory_block_change_state(struct memory_block *mem, mem->state = to_state; out: up(&mem->state_sem); mutex_unlock(&mem->state_mutex); return ret; } Loading Loading @@ -341,7 +342,7 @@ static int add_memory_block(unsigned long node_id, struct mem_section *section, 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); Loading
include/linux/memory.h +2 −3 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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 *); Loading
mm/memory_hotplug.c +1 −1 Original line number Diff line number Diff line Loading @@ -208,7 +208,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages) /* * This doesn't need a lock to do pfn_to_page(). * The section can't be removed here because of the * memory_block->state_sem. * memory_block->state_mutex. */ zone = page_zone(pfn_to_page(pfn)); pgdat_resize_lock(zone->zone_pgdat, &flags); Loading