OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Driver core / MM: Drop offline_memory_block() 

Since offline_memory_block(mem) is functionally equivalent to
device_offline(&mem->dev), make the only caller of the former use
the latter instead and drop offline_memory_block() entirely.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
This commit is contained in:
Rafael J. Wysocki 2013-05-23 10:41:50 +02:00
parent be547436c2
commit ea50be5934
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/base/memory.c
View File

@ -728,27 +728,6 @@ int unregister_memory_section(struct mem_section *section)
} }
#endif /* CONFIG_MEMORY_HOTREMOVE */ #endif /* CONFIG_MEMORY_HOTREMOVE */
/*
* offline one memory block. If the memory block has been offlined, do nothing.
*
* Call under device_hotplug_lock.
*/
int offline_memory_block(struct memory_block *mem)
{
int ret = 0;
mutex_lock(&mem->state_mutex);
if (mem->state != MEM_OFFLINE) {
ret = __memory_block_change_state_uevent(mem, MEM_OFFLINE,
MEM_ONLINE, -1);
if (!ret)
mem->dev.offline = true;
}
mutex_unlock(&mem->state_mutex);
return ret;
}
/* return true if the memory block is offlined, otherwise, return false */ /* return true if the memory block is offlined, otherwise, return false */
bool is_memblock_offlined(struct memory_block *mem) bool is_memblock_offlined(struct memory_block *mem)
{ {

1
include/linux/memory_hotplug.h
View File

@ -251,7 +251,6 @@ extern int mem_online_node(int nid);
extern int add_memory(int nid, u64 start, u64 size); extern int add_memory(int nid, u64 start, u64 size);
extern int arch_add_memory(int nid, u64 start, u64 size); extern int arch_add_memory(int nid, u64 start, u64 size);
extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
extern int offline_memory_block(struct memory_block *mem);
extern bool is_memblock_offlined(struct memory_block *mem); extern bool is_memblock_offlined(struct memory_block *mem);
extern int remove_memory(int nid, u64 start, u64 size); extern int remove_memory(int nid, u64 start, u64 size);
extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn, extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,

2
mm/memory_hotplug.c
View File

@ -1680,7 +1680,7 @@ int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
static int offline_memory_block_cb(struct memory_block *mem, void *arg) static int offline_memory_block_cb(struct memory_block *mem, void *arg)
{ {
int *ret = arg; int *ret = arg;
int error = offline_memory_block(mem); int error = device_offline(&mem->dev);
if (error != 0 && *ret == 0) if (error != 0 && *ret == 0)
*ret = error; *ret = error;