|
@@ -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
|