From owner-svn-src-projects@FreeBSD.ORG  Mon Nov 16 06:12:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0896E106566B;
	Mon, 16 Nov 2009 06:12:50 +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 EBD9F8FC08;
	Mon, 16 Nov 2009 06:12:49 +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 nAG6Cnx3059902;
	Mon, 16 Nov 2009 06:12:49 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAG6Cnw4059900;
	Mon, 16 Nov 2009 06:12:49 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200911160612.nAG6Cnw4059900@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 16 Nov 2009 06:12:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199313 - projects/ppc64/sys/powerpc/aim
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Nov 2009 06:12:50 -0000

Author: nwhitehorn
Date: Mon Nov 16 06:12:49 2009
New Revision: 199313
URL: http://svn.freebsd.org/changeset/base/199313

Log:
  Fix AST delivery -- td_flags is a 32-bit quantity. There is still a
  strange bug where the first time the userland thread is switched out,
  it is never again switched back in.

Modified:
  projects/ppc64/sys/powerpc/aim/trap_subr64.S

Modified: projects/ppc64/sys/powerpc/aim/trap_subr64.S
==============================================================================
--- projects/ppc64/sys/powerpc/aim/trap_subr64.S	Mon Nov 16 06:10:24 2009	(r199312)
+++ projects/ppc64/sys/powerpc/aim/trap_subr64.S	Mon Nov 16 06:12:49 2009	(r199313)
@@ -492,13 +492,13 @@ CNAME(trapexit):
 	andi.	%r3,%r3,~PSL_EE@l
 	mtmsr	%r3
 /* Test AST pending: */
-	ld	%r5,FRAME_SRR1+8(%r1)
+	ld	%r5,FRAME_SRR1+48(%r1)
 	mtcr	%r5
 	bf	17,1f			/* branch if PSL_PR is false */
 
 	GET_CPUINFO(%r3)		/* get per-CPU pointer */
 	ld	%r4, PC_CURTHREAD(%r3)	/* deref to get curthread */
-	ld	%r4, TD_FLAGS(%r4)	/* get thread flags value */
+	lwz	%r4, TD_FLAGS(%r4)	/* get thread flags value */
 	lis	%r5, (TDF_ASTPENDING|TDF_NEEDRESCHED)@h
 	ori	%r5,%r5, (TDF_ASTPENDING|TDF_NEEDRESCHED)@l
 	and.	%r4,%r4,%r5