Module Name: src
Committed By: maxv
Date: Fri Jul 8 09:15:38 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/i386/i386: locore.S
Log Message:
The preloaded modules are now reallocated dynamically by the kernel. This
area does not need to be executable anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.133 -r1.134 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.104 src/sys/arch/amd64/amd64/locore.S:1.105
--- src/sys/arch/amd64/amd64/locore.S:1.104 Mon Jul 4 07:56:07 2016
+++ src/sys/arch/amd64/amd64/locore.S Fri Jul 8 09:15:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.104 2016/07/04 07:56:07 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.105 2016/07/08 09:15:38 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -703,13 +703,13 @@ no_NOX:
orl $(PG_V|PG_KW),%eax
fillkpt_nox
- /* Map [SYMS]+[PRELOADED MODULES] RWX. */
+ /* Map [SYMS]+[PRELOADED MODULES] RW. */
movl $RELOC(__kernel_end),%eax
movl %esi,%ecx /* start of BOOTSTRAP TABLES */
subl %eax,%ecx
shrl $PGSHIFT,%ecx
orl $(PG_V|PG_KW),%eax
- fillkpt
+ fillkpt_nox
/* Map the BOOTSTRAP TABLES RW. */
movl %esi,%eax /* start of BOOTSTRAP TABLES */
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.133 src/sys/arch/i386/i386/locore.S:1.134
--- src/sys/arch/i386/i386/locore.S:1.133 Mon Jul 4 07:56:07 2016
+++ src/sys/arch/i386/i386/locore.S Fri Jul 8 09:15:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.133 2016/07/04 07:56:07 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.134 2016/07/08 09:15:38 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.133 2016/07/04 07:56:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.134 2016/07/08 09:15:38 maxv Exp $");
#include "opt_compat_oldboot.h"
#include "opt_copy_symtab.h"
@@ -738,13 +738,13 @@ no_NOX:
orl $(PG_V|PG_KW),%eax
fillkpt_nox
- /* Map [SYMS]+[PRELOADED MODULES] RWX. */
+ /* Map [SYMS]+[PRELOADED MODULES] RW. */
movl $RELOC(__kernel_end),%eax
movl %esi,%ecx /* start of BOOTSTRAP TABLES */
subl %eax,%ecx
shrl $PGSHIFT,%ecx
orl $(PG_V|PG_KW),%eax
- fillkpt
+ fillkpt_nox
/* Map the BOOTSTRAP TABLES RW. */
movl %esi,%eax /* start of BOOTSTRAP TABLES */
