Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1eaef3d authored by Seth Jennings's avatar Seth Jennings Committed by Greg Kroah-Hartman
Browse files

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: default avatarSeth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 65f44679

drivers/base/memory.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -613,8 +613,6 @@ static int add_memory_section(int nid, struct mem_section *section, 
	int scn_nr = __section_nr(section);

	int scn_nr = __section_nr(section);

	int ret = 0;

	int ret = 0;





	mutex_lock(&mem_sysfs_mutex);



	if (context == BOOT) {

	if (context == BOOT) {

		/* same memory block ? */

		/* same memory block ? */

		if (mem_p && *mem_p)

		if (mem_p && *mem_p)
@@ -643,7 +641,6 @@ static int add_memory_section(int nid, struct mem_section *section, 
			ret = register_mem_sect_under_node(mem, nid);

			ret = register_mem_sect_under_node(mem, nid);

	}

	}





	mutex_unlock(&mem_sysfs_mutex);

	return ret;

	return ret;

}

}
@@ -653,7 +650,13 @@ static int add_memory_section(int nid, struct mem_section *section, 
 */

 */

int register_new_memory(int nid, struct mem_section *section)

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

#ifdef CONFIG_MEMORY_HOTREMOVE
@@ -746,6 +749,7 @@ int __init memory_dev_init(void) 
	 * Create entries for memory sections that were found

	 * Create entries for memory sections that were found

	 * during boot and have been initialized

	 * during boot and have been initialized

	 */

	 */

	mutex_lock(&mem_sysfs_mutex);

	for (i = 0; i < NR_MEM_SECTIONS; i++) {

	for (i = 0; i < NR_MEM_SECTIONS; i++) {

		if (!present_section_nr(i))

		if (!present_section_nr(i))

			continue;

			continue;
@@ -757,6 +761,7 @@ int __init memory_dev_init(void) 
		if (!ret)

		if (!ret)

			ret = err;

			ret = err;

	}

	}

	mutex_unlock(&mem_sysfs_mutex);





out:

out:

	if (ret)

	if (ret)