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

Commit f7232154 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: don't drop a partial page in a zone's memory map size 



In a zone's present pages number, account for all pages occupied by the
memory map, including a partial.

Signed-off-by: default avatarJohannes Weiner <hannes@saeurebad.de>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f899b0ad

mm/page_alloc.c

+2 −1
Original line number Diff line number Diff line
@@ -3378,7 +3378,8 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat, 
		 * is used by this zone for memmap. This affects the watermark

		 * and per-cpu initialisations

		 */

		memmap_pages = (size * sizeof(struct page)) >> PAGE_SHIFT;

		memmap_pages =

			PAGE_ALIGN(size * sizeof(struct page)) >> PAGE_SHIFT;

		if (realsize >= memmap_pages) {

			realsize -= memmap_pages;

			printk(KERN_DEBUG