From owner-svn-src-all@FreeBSD.ORG  Thu Nov 17 15:51:03 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6CD8E1065675;
	Thu, 17 Nov 2011 15:51:03 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C83A8FC25;
	Thu, 17 Nov 2011 15:51:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAHFp33A015805;
	Thu, 17 Nov 2011 15:51:03 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAHFp3Og015803;
	Thu, 17 Nov 2011 15:51:03 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201111171551.pAHFp3Og015803@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 17 Nov 2011 15:51:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227629 - head/sys/boot/ia64/common
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Nov 2011 15:51:03 -0000

Author: marcel
Date: Thu Nov 17 15:51:03 2011
New Revision: 227629
URL: http://svn.freebsd.org/changeset/base/227629

Log:
  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.

Modified:
  head/sys/boot/ia64/common/exec.c

Modified: head/sys/boot/ia64/common/exec.c
==============================================================================
--- head/sys/boot/ia64/common/exec.c	Thu Nov 17 15:49:42 2011	(r227628)
+++ head/sys/boot/ia64/common/exec.c	Thu Nov 17 15:51:03 2011	(r227629)
@@ -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. */