summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authormaxv <maxv@NetBSD.org>2016-06-04 10:48:11 +0000
committermaxv <maxv@NetBSD.org>2016-06-04 10:48:11 +0000
commit5a0ce4fcdfcf617f54f053aef4bf6d36ad388ca2 (patch)
treef09750137b95ad615cba0548258851099f69f1ac /sys
parent50b5133a958a5bcf4d5a8f691c89f9d9487d9169 (diff)
The ISA I/O MEM does not need to be executable. Remove the X permission
on it.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/amd64/locore.S6
-rw-r--r--sys/arch/i386/i386/locore.S8
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S
index ad42cc84e88..c742c5f6aec 100644
--- a/sys/arch/amd64/amd64/locore.S
+++ b/sys/arch/amd64/amd64/locore.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.101 2016/06/04 10:19:09 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.102 2016/06/04 10:48:11 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -718,12 +718,12 @@ no_NOX:
orl $(PG_V|PG_KW),%eax
fillkpt_nox
- /* We are on (4). Map ISA I/O MEM RWX. */
+ /* We are on (4). Map ISA I/O MEM RW. */
movl $IOM_BEGIN,%eax
movl $IOM_SIZE,%ecx /* size of ISA I/O MEM */
shrl $PGSHIFT,%ecx
orl $(PG_V|PG_KW/*|PG_N*/),%eax
- fillkpt
+ fillkpt_nox
/*
* Build L2. Linked to L1.
diff --git a/sys/arch/i386/i386/locore.S b/sys/arch/i386/i386/locore.S
index febe31490bf..1a535b47eda 100644
--- a/sys/arch/i386/i386/locore.S
+++ b/sys/arch/i386/i386/locore.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.130 2016/06/04 10:19:09 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.131 2016/06/04 10:48:11 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.130 2016/06/04 10:19:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.131 2016/06/04 10:48:11 maxv Exp $");
#include "opt_compat_oldboot.h"
#include "opt_copy_symtab.h"
@@ -753,12 +753,12 @@ no_NOX:
orl $(PG_V|PG_KW),%eax
fillkpt_nox
- /* We are on (4). Map ISA I/O MEM RWX. */
+ /* We are on (4). Map ISA I/O MEM RW. */
movl $IOM_BEGIN,%eax
movl $IOM_SIZE,%ecx /* size of ISA I/O MEM */
shrl $PGSHIFT,%ecx
orl $(PG_V|PG_KW/*|PG_N*/),%eax
- fillkpt
+ fillkpt_nox
/*
* Build L2 for identity mapping. Linked to L1.