From owner-trustedbsd-cvs@FreeBSD.ORG  Mon Dec 11 22:47:54 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 09D1B16A505
	for <trustedbsd-cvs@freebsd.org>; Mon, 11 Dec 2006 22:47:54 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1933343DC4
	for <trustedbsd-cvs@freebsd.org>; Mon, 11 Dec 2006 22:36:59 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53])
	by cyrus.watson.org (Postfix) with ESMTP id 0DD8746B17
	for <trustedbsd-cvs@trustedbsd.org>;
	Mon, 11 Dec 2006 17:10:34 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54])
	by mx2.freebsd.org (Postfix) with ESMTP id DCE9414BD80;
	Mon, 11 Dec 2006 22:06:09 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E23B316A57F; Mon, 11 Dec 2006 22:06:13 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A813216A500
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 22:06:13 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9A28B44562
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 21:44:35 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLjY2m097787
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 21:45:34 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLjYZT097784
	for perforce@freebsd.org; Mon, 11 Dec 2006 21:45:34 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 11 Dec 2006 21:45:34 GMT
Message-Id: <200612112145.kBBLjYZT097784@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111491 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Dec 2006 22:47:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=111491

Change 111491 by millert@millert_g5tower on 2006/12/11 21:45:10

	Disable call to mac_thread_userret() at the end of Mach
	syscalls until we can be sure it is correct.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/hw_exception.s#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/hw_exception.s#4 (text+ko) ====

@@ -625,7 +625,7 @@
 			stw		r0, saver3(r30)					; stash the high part of the return code
 			stw		r3,saver3+4(r30)				; Stash the low part of the return code
 			beq--	cr0,.L_mach_invalid_ret			; otherwise fall through into the normal return path
-#ifdef MAC
+#ifdef MACXXX
 	mr r3,r31
 	bl EXT(mac_thread_userret)
 #endif