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

Commit 4375c299 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Ingo Molnar
Browse files

x86/xen: Provide pre-built page tables only for CONFIG_XEN_PV=y and CONFIG_XEN_PVH=y 



Looks like we only need pre-built page tables in the CONFIG_XEN_PV=y and
CONFIG_XEN_PVH=y cases.

Let's not provide them for other configurations.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@suse.de>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20170929140821.37654-5-kirill.shutemov@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 12a8cc7f

arch/x86/kernel/head_64.S

+6 −5
Original line number Diff line number Diff line
@@ -37,11 +37,12 @@ 
 *

 */



#define p4d_index(x)	(((x) >> P4D_SHIFT) & (PTRS_PER_P4D-1))

#define pud_index(x)	(((x) >> PUD_SHIFT) & (PTRS_PER_PUD-1))



#if defined(CONFIG_XEN_PV) || defined(CONFIG_XEN_PVH)

PGD_PAGE_OFFSET = pgd_index(__PAGE_OFFSET_BASE)

PGD_START_KERNEL = pgd_index(__START_KERNEL_map)

#endif

L3_START_KERNEL = pud_index(__START_KERNEL_map)



	.text
@@ -361,10 +362,7 @@ NEXT_PAGE(early_dynamic_pgts) 


	.data



#ifndef CONFIG_XEN

NEXT_PAGE(init_top_pgt)

	.fill	512,8,0

#else

#if defined(CONFIG_XEN_PV) || defined(CONFIG_XEN_PVH)

NEXT_PAGE(init_top_pgt)

	.quad   level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE_NOENC

	.org    init_top_pgt + PGD_PAGE_OFFSET*8, 0
@@ -381,6 +379,9 @@ NEXT_PAGE(level2_ident_pgt) 
	 * Don't set NX because code runs from these pages.

	 */

	PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)

#else

NEXT_PAGE(init_top_pgt)

	.fill	512,8,0

#endif



#ifdef CONFIG_X86_5LEVEL