From owner-svn-src-head@FreeBSD.ORG  Mon Jul  2 21:21:13 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3CE9B106566B;
	Mon,  2 Jul 2012 21:21:13 +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 2A62D8FC17;
	Mon,  2 Jul 2012 21:21:13 +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 q62LLDxX000403;
	Mon, 2 Jul 2012 21:21:13 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q62LLCPq000401;
	Mon, 2 Jul 2012 21:21:12 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201207022121.q62LLCPq000401@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 2 Jul 2012 21:21:12 +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: r238033 - head/sys/powerpc/booke
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 21:21:13 -0000

Author: marcel
Date: Mon Jul  2 21:21:12 2012
New Revision: 238033
URL: http://svn.freebsd.org/changeset/base/238033

Log:
  Fix a typo that resulted in or-ing PTE_UW twice whrn PTE_SW was needed.
  Note that setting the PTE_MODIFIED bit based on whether write is possible
  is incorrect. We should set PTE_MODIFIED based on whether the access
  is a write operation.

Modified:
  head/sys/powerpc/booke/trap_subr.S

Modified: head/sys/powerpc/booke/trap_subr.S
==============================================================================
--- head/sys/powerpc/booke/trap_subr.S	Mon Jul  2 21:18:09 2012	(r238032)
+++ head/sys/powerpc/booke/trap_subr.S	Mon Jul  2 21:21:12 2012	(r238033)
@@ -668,7 +668,7 @@ tlb_fill_entry:
 	lwarx	%r21, %r23, %r25		/* get pte->flags */
 	oris	%r21, %r21, PTE_REFERENCED@h	/* set referenced bit */
 
-	andi.	%r22, %r21, (PTE_UW | PTE_UW)@l	/* check if writable */
+	andi.	%r22, %r21, (PTE_SW | PTE_UW)@l	/* check if writable */
 	beq	2f
 	oris	%r21, %r21, PTE_MODIFIED@h	/* set modified bit */
 2: