drivers: base: move mutex lock out of add_memory_section()
There is no point in releasing the mutex for each section that is added
during boot time. Just hold it over the entire initialization loop.
Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index ddd14ce..ed3ada2 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -613,8 +613,6 @@
int scn_nr = __section_nr(section);
int ret = 0;
- mutex_lock(&mem_sysfs_mutex);
-
if (context == BOOT) {
/* same memory block ? */
if (mem_p && *mem_p)
@@ -643,7 +641,6 @@
ret = register_mem_sect_under_node(mem, nid);
}
- mutex_unlock(&mem_sysfs_mutex);
return ret;
}
@@ -653,7 +650,13 @@
*/
int register_new_memory(int nid, struct mem_section *section)
{
- return add_memory_section(nid, section, NULL, MEM_OFFLINE, HOTPLUG);
+ int ret;
+
+ mutex_lock(&mem_sysfs_mutex);
+ ret = add_memory_section(nid, section, NULL, MEM_OFFLINE, HOTPLUG);
+ mutex_unlock(&mem_sysfs_mutex);
+
+ return ret;
}
#ifdef CONFIG_MEMORY_HOTREMOVE
@@ -746,6 +749,7 @@
* Create entries for memory sections that were found
* during boot and have been initialized
*/
+ mutex_lock(&mem_sysfs_mutex);
for (i = 0; i < NR_MEM_SECTIONS; i++) {
if (!present_section_nr(i))
continue;
@@ -757,6 +761,7 @@
if (!ret)
ret = err;
}
+ mutex_unlock(&mem_sysfs_mutex);
out:
if (ret)