summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2015-04-24 19:53:44 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2015-04-24 19:53:44 +0000
commite17ec0a78e0c17231d41c15bbb1b7421eb83618c (patch)
treefd2e7e9dcaa0bdd21552567e27e475a66a49d2ae /sys
parent5fdec7cc17f1bb36dcb4ecc044923d80e273a218 (diff)
Enable PAE mode for those CPUs that support it. This allows us to use the
NX bit for userland and kernel W^X. Unlike the previous c.2008 PAE experiment, this does not provide > 4GB phys ram on i386 - PAE is solely being used for NX capability this time. If you need > 4GB phys, use amd64. Userland W^X was committed yesterday by kettenis@, and we will shortly start reworking the kernel like we did for amd64 a few months back to get kernel W^X. This has been in snaps for a few days and tested by kettenis and myself as well. ok deraadt@, kettenis@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/autoconf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index a2f2b2958c3..e58b77a4248 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.93 2015/04/12 18:37:53 mlarkin Exp $ */
+/* $OpenBSD: autoconf.c,v 1.94 2015/04/24 19:53:43 mlarkin Exp $ */
/* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */
/*-
@@ -127,9 +127,7 @@ cpu_configure(void)
#ifdef KVM86
kvm86_init();
#endif
-#ifdef notyet
pmap_bootstrap_pae();
-#endif
#if defined(MULTIPROCESSOR) || \
(NACPI > 0 && !defined(SMALL_KERNEL))