summaryrefslogtreecommitdiff
path: root/usr/src/uts/i86pc/vm/kboot_mmu.c
diff options
context:
space:
mode:
authorDan McDonald <danmcd@mnx.io>2022-05-13 17:20:24 -0400
committerGitHub <noreply@github.com>2022-05-13 17:20:24 -0400
commitbb7d6c9b47695f41cbacbcf6662baf3d0e152fdf (patch)
tree75f2d0cab5fb92f97f2ab2c3186a0b5d1579a33a /usr/src/uts/i86pc/vm/kboot_mmu.c
parent8ca5534c77e93c25d2c1f777499b12da0f7cc0cd (diff)
parent402559e299331588f209b3a9693e3bcd6a83d22c (diff)
downloadillumos-joyent-OS-8149.tar.gz
Merge branch 'master' into OS-8149OS-8149
Diffstat (limited to 'usr/src/uts/i86pc/vm/kboot_mmu.c')
-rw-r--r--usr/src/uts/i86pc/vm/kboot_mmu.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/usr/src/uts/i86pc/vm/kboot_mmu.c b/usr/src/uts/i86pc/vm/kboot_mmu.c
index 76193b3d86..6ff8d5c810 100644
--- a/usr/src/uts/i86pc/vm/kboot_mmu.c
+++ b/usr/src/uts/i86pc/vm/kboot_mmu.c
@@ -101,11 +101,7 @@ kbm_init(struct xboot_info *bi)
ptes_per_table = 512;
pte_size = 8;
lpagesize = TWO_MEG;
-#ifdef __amd64
top_level = 3;
-#else
- top_level = 2;
-#endif
} else {
shift_amt = shift_amt_nopae;
ptes_per_table = 1024;
@@ -268,7 +264,7 @@ restart_new_va:
probe_va = mmu.hole_end;
if (IN_HYPERVISOR_VA(probe_va))
-#if defined(__amd64) && defined(__xpv)
+#if defined(__xpv)
probe_va = HYPERVISOR_VIRT_END;
#else
return (0);