From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 12 17:23:26 2010
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 CAE79106566B;
	Fri, 12 Mar 2010 17:23:26 +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 BA94A8FC2A;
	Fri, 12 Mar 2010 17:23:26 +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 o2CHNQEc063854;
	Fri, 12 Mar 2010 17:23:26 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2CHNQ5v063851;
	Fri, 12 Mar 2010 17:23:26 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201003121723.o2CHNQ5v063851@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 12 Mar 2010 17:23:26 +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: r205088 - in projects/ppc64/sys: amd64/ia32 ia64/ia64
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: Fri, 12 Mar 2010 17:23:26 -0000

Author: nwhitehorn
Date: Fri Mar 12 17:23:26 2010
New Revision: 205088
URL: http://svn.freebsd.org/changeset/base/205088

Log:
  Missed some s/ps_strings/imgp->ps_strings that broke the amd64 and ia64
  builds.

Modified:
  projects/ppc64/sys/amd64/ia32/ia32_signal.c
  projects/ppc64/sys/ia64/ia64/machdep.c

Modified: projects/ppc64/sys/amd64/ia32/ia32_signal.c
==============================================================================
--- projects/ppc64/sys/amd64/ia32/ia32_signal.c	Fri Mar 12 17:15:44 2010	(r205087)
+++ projects/ppc64/sys/amd64/ia32/ia32_signal.c	Fri Mar 12 17:23:26 2010	(r205088)
@@ -722,7 +722,7 @@ ia32_setregs(struct thread *td, struct i
 	regs->tf_rflags = PSL_USER | (regs->tf_rflags & PSL_T);
 	regs->tf_ss = _udatasel;
 	regs->tf_cs = _ucode32sel;
-	regs->tf_rbx = ps_strings;
+	regs->tf_rbx = imgp->ps_strings;
 	regs->tf_ds = _udatasel;
 	regs->tf_es = _udatasel;
 	regs->tf_fs = _ufssel;

Modified: projects/ppc64/sys/ia64/ia64/machdep.c
==============================================================================
--- projects/ppc64/sys/ia64/ia64/machdep.c	Fri Mar 12 17:15:44 2010	(r205087)
+++ projects/ppc64/sys/ia64/ia64/machdep.c	Fri Mar 12 17:23:26 2010	(r205088)
@@ -1366,7 +1366,7 @@ exec_setregs(struct thread *td, struct i
 		*kst-- = 0;
 		if (((uintptr_t)kst & 0x1ff) == 0x1f8)
 			*kst-- = 0;
-		*kst-- = ps_strings;
+		*kst-- = imgp->ps_strings;
 		if (((uintptr_t)kst & 0x1ff) == 0x1f8)
 			*kst-- = 0;
 		*kst = stack;