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

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

Merge "mm, memory_hotplug: enable kernel mappings during online pages"

parents ba729d23 04b76965

mm/memory_hotplug.c

+1 −0
Original line number Diff line number Diff line
@@ -709,6 +709,7 @@ static void __free_pages_memory(unsigned long start, 
			> bootloader_memory_limit)

			order--;



		kernel_map_pages(page, 1 << order, 1);

		__free_pages_hotplug(page, order);

		onlined_pages += (1UL << order);

	}

mm/page_alloc.c

+0 −1
Original line number Diff line number Diff line
@@ -8473,7 +8473,6 @@ __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn) 
		zone->free_area[order].nr_free--;

		for (i = 0; i < (1 << order); i++)

			SetPageReserved((page+i));

		post_alloc_hook(page, order, GFP_NOWAIT);

		pfn += (1 << order);

	}

	spin_unlock_irqrestore(&zone->lock, flags);