[Openmcl-cvs-notifications] r14486 - in /release/1.6/source: ./ lisp-kernel/pmcl-kernel.c

[rme at clozure.com]

Author: rme
Date: Wed Dec 15 11:41:51 2010
New Revision: 14486

Log:
Merge r14482 from trunk: x86 spjump table doesn't need to be executable.

See https://bugzilla.redhat.com/show_bug.cgi?id=3D562226#c17 for the
issue this is meant to address.

Modified:
    release/1.6/source/   (props changed)
    release/1.6/source/lisp-kernel/pmcl-kernel.c

Propchange: release/1.6/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 15 11:41:51 2010
@@ -4,4 +4,4 @@
 /branches/rme-logops:13875-13886
 /branches/working-0711/ccl:7970-13192,13197-13198,13202,13208,13214,13235-=
13236,13239,13263,13277-13278,13290,13293-13294,13302-13306,13331-13332,133=
39,13361-13364,13379,13383,13386,13388,13409,13435-13436,13438,13440-13442,=
13460-13461,13465,13467,13476,13487,13490,13492-13493,13502-13528,13545-135=
47,13549,13557-13558
 /release/1.5/source:13667
-/trunk/source:14361-14404,14422-14423,14425-14432,14435,14437-14438,14440-=
14441,14444-14445,14451,14457,14460-14464,14472,14478-14479
+/trunk/source:14361-14404,14422-14423,14425-14432,14435,14437-14438,14440-=
14441,14444-14445,14451,14457,14460-14464,14472,14478-14479,14482

Modified: release/1.6/source/lisp-kernel/pmcl-kernel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/pmcl-kernel.c (original)
+++ release/1.6/source/lisp-kernel/pmcl-kernel.c Wed Dec 15 11:41:51 2010
@@ -1414,7 +1414,7 @@
   if ((void *)(&spjump_start) !=3D (void *) SPJUMP_TARGET_ADDRESS) {
     if (!VirtualProtect((pc) SPJUMP_TARGET_ADDRESS,
                         0x1000,
-                        PAGE_EXECUTE_READWRITE,
+                        PAGE_READWRITE,
                         &old_protect)) {
       wperror("VirtualProtect spjump");
       _exit(1);
@@ -1429,7 +1429,7 @@
   extern opcode spjump_start;
   pc new =3D mmap((pc) SPJUMP_TARGET_ADDRESS,
                 0x1000,
-                PROT_READ | PROT_WRITE | PROT_EXEC,
+                PROT_READ | PROT_WRITE,
                 MAP_PRIVATE | MAP_ANON | MAP_FIXED,
                 -1,
                 0),