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

Commit b5c91fa0 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 a84a5a18 49ab4919
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -1025,10 +1025,8 @@ bool try_online_one_block(int nid)
	struct zone *zone = &NODE_DATA(nid)->node_zones[ZONE_MOVABLE];
	unsigned long zone_start, zone_size;
	bool onlined_block = false;
	int ret = lock_device_hotplug_sysfs();

	if (ret)
		return false;
	lock_device_hotplug();

	zone_start = PFN_PHYS(zone->zone_start_pfn);
	zone_size = zone->spanned_pages << PAGE_SHIFT;