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

Commit 4c627477 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm/memory_hotplug: Reduce migration re-try timeout value"

parents 5f89524a 0800fc3a

include/linux/memory_hotplug.h

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ struct mem_section; 
struct memory_block;

struct resource;



/* Timeout for migration re-tries in seconds */

#define MIGRATE_TIMEOUT_SEC		60



#ifdef CONFIG_MEMORY_HOTPLUG

/*

 * Return page for the valid pfn only if the page is online. All pfn

mm/memory_hotplug.c

+2 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,8 @@ static int __ref __offline_pages(unsigned long start_pfn, 
/* Must be protected by mem_hotplug_begin() or a device_lock */

int offline_pages(unsigned long start_pfn, unsigned long nr_pages)

{

	return __offline_pages(start_pfn, start_pfn + nr_pages, 120 * HZ);

	return __offline_pages(start_pfn, start_pfn + nr_pages,

						MIGRATE_TIMEOUT_SEC * HZ);

}

#endif /* CONFIG_MEMORY_HOTREMOVE */