Module Name: src
Committed By: maxv
Date: Sat Jun 4 10:48:12 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/i386/i386: locore.S
Log Message:
The ISA I/O MEM does not need to be executable. Remove the X permission
on it.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/i386/i386/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.101 src/sys/arch/amd64/amd64/locore.S:1.102
--- src/sys/arch/amd64/amd64/locore.S:1.101 Sat Jun 4 10:19:09 2016
+++ src/sys/arch/amd64/amd64/locore.S Sat Jun 4 10:48:11 2016
@@ -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.
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.130 src/sys/arch/i386/i386/locore.S:1.131
--- src/sys/arch/i386/i386/locore.S:1.130 Sat Jun 4 10:19:09 2016
+++ src/sys/arch/i386/i386/locore.S Sat Jun 4 10:48:11 2016
@@ -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.
