From owner-svn-src-stable@FreeBSD.ORG  Mon Nov 22 17:01:41 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4BCAB1065693;
	Mon, 22 Nov 2010 17:01:41 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 39F768FC14;
	Mon, 22 Nov 2010 17:01:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAMH1fAv098658;
	Mon, 22 Nov 2010 17:01:41 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAMH1fk2098656;
	Mon, 22 Nov 2010 17:01:41 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201011221701.oAMH1fk2098656@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 22 Nov 2010 17:01:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215689 - stable/8/sys/powerpc/aim
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Nov 2010 17:01:41 -0000

Author: nwhitehorn
Date: Mon Nov 22 17:01:40 2010
New Revision: 215689
URL: http://svn.freebsd.org/changeset/base/215689

Log:
  MFC r214610:
  Map userland copyin/copyout segment no-execute while it is mapped into the
  kernel.

Modified:
  stable/8/sys/powerpc/aim/copyinout.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/powerpc/aim/copyinout.c
==============================================================================
--- stable/8/sys/powerpc/aim/copyinout.c	Mon Nov 22 16:58:07 2010	(r215688)
+++ stable/8/sys/powerpc/aim/copyinout.c	Mon Nov 22 17:01:40 2010	(r215689)
@@ -76,6 +76,9 @@ static __inline void
 set_user_sr(register_t vsid)
 {
 
+	/* Mark segment no-execute */
+	vsid |= SR_N;
+
 	isync();
 	__asm __volatile ("mtsr %0,%1" :: "n"(USER_SR), "r"(vsid));
 	isync();