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

Commit de7f0cba authored by Nathan Fontenot's avatar Nathan Fontenot Committed by Linus Torvalds
Browse files

memory hotplug: release memory regions in PAGES_PER_SECTION chunks 



During hotplug memory remove, memory regions should be released on a
PAGES_PER_SECTION size chunks.  This mirrors the code in add_memory where
resources are requested on a PAGES_PER_SECTION size.

Attempting to release the entire memory region fails because there is not
a single resource for the total number of pages being removed.  Instead
the resources for the pages are split in PAGES_PER_SECTION size chunks as
requested during memory add.

Signed-off-by: default avatarNathan Fontenot <nfont@austin.ibm.com>
Signed-off-by: default avatarBadari Pulavarty <pbadari@us.ibm.com>
Acked-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7a6560e0

mm/memory_hotplug.c

+2 −2
Original line number Diff line number Diff line
@@ -324,11 +324,11 @@ int __remove_pages(struct zone *zone, unsigned long phys_start_pfn, 
	BUG_ON(phys_start_pfn & ~PAGE_SECTION_MASK);

	BUG_ON(nr_pages % PAGES_PER_SECTION);



	release_mem_region(phys_start_pfn << PAGE_SHIFT, nr_pages * PAGE_SIZE);



	sections_to_remove = nr_pages / PAGES_PER_SECTION;

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

		unsigned long pfn = phys_start_pfn + i*PAGES_PER_SECTION;

		release_mem_region(pfn << PAGE_SHIFT,

				   PAGES_PER_SECTION << PAGE_SHIFT);

		ret = __remove_section(zone, __pfn_to_section(pfn));

		if (ret)

			break;