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

Commit ee408b42 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip-x86-mm' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent 



Pull boot printout fix from Borislav Petkov.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f5ecb005 f15e0518

arch/x86/mm/init.c

+26 −2
Original line number Diff line number Diff line
@@ -238,6 +238,31 @@ static void __init_refok adjust_range_page_size_mask(struct map_range *mr, 
	}

}



static const char *page_size_string(struct map_range *mr)

{

	static const char str_1g[] = "1G";

	static const char str_2m[] = "2M";

	static const char str_4m[] = "4M";

	static const char str_4k[] = "4k";



	if (mr->page_size_mask & (1<<PG_LEVEL_1G))

		return str_1g;

	/*

	 * 32-bit without PAE has a 4M large page size.

	 * PG_LEVEL_2M is misnamed, but we can at least

	 * print out the right size in the string.

	 */

	if (IS_ENABLED(CONFIG_X86_32) &&

	    !IS_ENABLED(CONFIG_X86_PAE) &&

	    mr->page_size_mask & (1<<PG_LEVEL_2M))

		return str_4m;



	if (mr->page_size_mask & (1<<PG_LEVEL_2M))

		return str_2m;



	return str_4k;

}



static int __meminit split_mem_range(struct map_range *mr, int nr_range,

				     unsigned long start,

				     unsigned long end)
@@ -333,8 +358,7 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range, 
	for (i = 0; i < nr_range; i++)

		printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n",

				mr[i].start, mr[i].end - 1,

			(mr[i].page_size_mask & (1<<PG_LEVEL_1G))?"1G":(

			 (mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k"));

				page_size_string(&mr[i]));



	return nr_range;

}