From owner-p4-projects@FreeBSD.ORG Fri Mar 2 00:41:49 2007 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 F096516A403; Fri, 2 Mar 2007 00:41:48 +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 9486216A400 for ; Fri, 2 Mar 2007 00:41:48 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 82C7313C47E for ; Fri, 2 Mar 2007 00:41:48 +0000 (UTC) (envelope-from jkim@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 l220fml8044497 for ; Fri, 2 Mar 2007 00:41:48 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l220fmim044494 for perforce@freebsd.org; Fri, 2 Mar 2007 00:41:48 GMT (envelope-from jkim@freebsd.org) Date: Fri, 2 Mar 2007 00:41:48 GMT Message-Id: <200703020041.l220fmim044494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 115233 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: Fri, 02 Mar 2007 00:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=115233 Change 115233 by jkim@jkim_hammer on 2007/03/02 00:40:58 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#24 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#46 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#41 integrate .. //depot/projects/linuxolator/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#20 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#37 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#24 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.13 2007/02/24 16:49:24 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.14 2007/03/02 00:08:47 jkim Exp $ */ #ifndef _AMD64_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#46 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.35 2007/02/27 02:08:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.36 2007/03/02 00:08:47 jkim Exp $"); #include #include @@ -602,7 +602,7 @@ if (error) return (error); - if (args->flags & (LINUX_CLONE_PARENT|LINUX_CLONE_THREAD)) { + if (args->flags & (LINUX_CLONE_PARENT | LINUX_CLONE_THREAD)) { sx_xlock(&proctree_lock); PROC_LOCK(p2); proc_reparent(p2, td->td_proc->p_pptr); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#41 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.18 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.19 2007/03/02 00:08:47 jkim Exp $"); #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/fs/fifofs/fifo_vnops.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.134 2006/03/15 10:15:35 rwatson Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.135 2007/03/02 00:10:11 mpp Exp $ */ #include @@ -447,6 +447,10 @@ { register struct fifoinfo *fip = vp->v_fifoinfo; + if (fip == NULL){ + printf(", NULL v_fifoinfo"); + return (0); + } printf(", fifo with %ld readers and %ld writers", fip->fi_readers, fip->fi_writers); return (0); ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#20 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/linux.h,v 1.75 2007/02/24 16:49:24 netchild Exp $ + * $FreeBSD: src/sys/i386/linux/linux.h,v 1.76 2007/03/02 00:08:47 jkim Exp $ */ #ifndef _I386_LINUX_H_ @@ -737,7 +737,7 @@ }; struct l_desc_struct { - unsigned long a,b; + unsigned long a, b; }; ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#37 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.73 2007/02/27 02:08:01 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.74 2007/03/02 00:08:47 jkim Exp $"); #include #include @@ -431,7 +431,7 @@ if (error) return (error); - if (args->flags & (LINUX_CLONE_PARENT|LINUX_CLONE_THREAD)) { + if (args->flags & (LINUX_CLONE_PARENT | LINUX_CLONE_THREAD)) { sx_xlock(&proctree_lock); PROC_LOCK(p2); proc_reparent(p2, td->td_proc->p_pptr);