summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2016-06-08 15:37:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2016-06-08 15:37:21 +0000
commit9e3b85c4193de62595f933a613d07bf924aeb855 (patch)
tree855eaddb456ba830f8ffce19010a0064625e6d67 /sys
parent33adb515deb7486c19523f415ae0cc5bb4789405 (diff)
hppa & mips64 now can do the full W^X check. (Make sure you have
a new kernel before this change, and ld.so updated)
Diffstat (limited to 'sys')
-rw-r--r--sys/uvm/uvm_mmap.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 7497c983a9e..1078f9a757d 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_mmap.c,v 1.132 2016/06/04 16:43:43 sthen Exp $ */
+/* $OpenBSD: uvm_mmap.c,v 1.133 2016/06/08 15:37:20 deraadt Exp $ */
/* $NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $ */
/*
@@ -314,10 +314,6 @@ int uvm_wxabort;
static inline int
uvm_wxcheck(struct proc *p, char *call)
{
-#if (defined(__mips64__) || defined(__hppa))
- /* XXX got/plt repairs still needed */
- return 0;
-#endif
int wxallowed = (p->p_p->ps_textvp->v_mount &&
(p->p_p->ps_textvp->v_mount->mnt_flag & MNT_WXALLOWED));