From owner-p4-projects@FreeBSD.ORG Sat Feb 11 14:00:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE4DC16A423; Sat, 11 Feb 2006 14:00:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AADF16A422 for ; Sat, 11 Feb 2006 14:00:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AC8443D4C for ; Sat, 11 Feb 2006 14:00:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BE0lUq049543 for ; Sat, 11 Feb 2006 14:00:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BE0lMh049536 for perforce@freebsd.org; Sat, 11 Feb 2006 14:00:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 11 Feb 2006 14:00:47 GMT Message-Id: <200602111400.k1BE0lMh049536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 14:00:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=91570 Change 91570 by rwatson@rwatson_zoo on 2006/02/11 14:00:10 Correct integration merge mistake. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#44 (text+ko) ==== @@ -1019,7 +1019,7 @@ error = mac_thread_syscall_enter(td, args, code); if (error == 0) #endif - error = (*callp->sy_call)(td, argp); + error = (*callp->sy_call)(td, args); #ifdef MAC mac_thread_syscall_exit(td, args, code, error); #endif