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

Commit 654ed5a2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: memory_hotplug: wait on device_hotplug_lock in OOM path"

parents 76487c46 a82a02a3

mm/memory_hotplug.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1120,10 +1120,8 @@ bool try_online_one_block(int nid) 
{

{

	struct zone *zone = &NODE_DATA(nid)->node_zones[ZONE_MOVABLE];

	struct zone *zone = &NODE_DATA(nid)->node_zones[ZONE_MOVABLE];

	bool onlined_block = false;

	bool onlined_block = false;

	int ret = lock_device_hotplug_sysfs();





	if (ret)

	lock_device_hotplug();

		return false;





	walk_memory_range(zone->zone_start_pfn, zone_end_pfn(zone),

	walk_memory_range(zone->zone_start_pfn, zone_end_pfn(zone),

			  &onlined_block, online_memory_one_block);

			  &onlined_block, online_memory_one_block);