svn commit: r228041 - stable/9/sys/boot/ia64/common

[Marcel Moolenaar]

Author: marcel
Date: Sun Nov 27 20:07:30 2011
New Revision: 228041
URL: http://svn.freebsd.org/changeset/base/228041

Log:
  MFC rev. 227629:
  Wire the kernel text RWX, rather than RX. We're not quite ready
  for having kernel text non-writable, because we still need to
  apply relocations. On top of that, the PBVM page table has all
  pages marked as RWX, so it's an inconsistency to begin with.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/boot/ia64/common/exec.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/boot/ia64/common/exec.c
==============================================================================
--- stable/9/sys/boot/ia64/common/exec.c	Sun Nov 27 19:45:41 2011	(r228040)
+++ stable/9/sys/boot/ia64/common/exec.c	Sun Nov 27 20:07:30 2011	(r228041)
@@ -187,7 +187,7 @@ mmu_setup_paged(struct bootinfo *bi)
 	pa = ia64_va2pa(ia64_text_start, &ia64_text_size);
 	ia64_text_size = sz;	/* XXX */
 	shft = sz2shft(ia64_text_start, ia64_text_size);
-	shft = mmu_wire(ia64_text_start, (uintptr_t)pa, shft, PTE_AR_RX);
+	shft = mmu_wire(ia64_text_start, (uintptr_t)pa, shft, PTE_AR_RWX);
 	ia64_copyin(&shft, (uintptr_t)&bi->bi_text_mapped, 4);
 
 	/* Wire as much of the data segment as well. */