From owner-p4-projects@FreeBSD.ORG  Tue Nov 21 17:18:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3C66A16B9F4; Tue, 21 Nov 2006 17:18:01 +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 99ACF16B830
	for <perforce@FreeBSD.org>; Tue, 21 Nov 2006 17:18:00 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B4B1E44200
	for <perforce@FreeBSD.org>; Tue, 21 Nov 2006 17:08:56 +0000 (GMT)
	(envelope-from rdivacky@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 kALH8pxT065239
	for <perforce@FreeBSD.org>; Tue, 21 Nov 2006 17:08:51 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kALH8pTj065234
	for perforce@freebsd.org; Tue, 21 Nov 2006 17:08:51 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Tue, 21 Nov 2006 17:08:51 GMT
Message-Id: <200611211708.kALH8pTj065234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 110247 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Nov 2006 17:18:05 -0000

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

Change 110247 by rdivacky@rdivacky_witten on 2006/11/19 16:46:00

	Attempt to fix the mismerge of p4 integrate.

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#37 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#37 (text+ko) ====

@@ -1413,11 +1413,6 @@
 		printf(ARGS(getpid, ""));
 #endif
 
-#ifdef DEBUG
-	if (ldebug(getpid))
-		printf(ARGS(getpid, ""));
-#endif
-
 	if (linux_use26(td)) {
    	   	em = em_find(td->td_proc, EMUL_UNLOCKED);
 		KASSERT(em != NULL, ("getpid: emuldata not found.\n"));
@@ -1454,11 +1449,6 @@
 		printf(ARGS(getppid, ""));
 #endif
 
-#ifdef DEBUG
-	if (ldebug(getppid))
-		printf(ARGS(getppid, ""));
-#endif
-
 	if (!linux_use26(td)) {
 	   	PROC_LOCK(td->td_proc);
 	   	td->td_retval[0] = td->td_proc->p_pptr->p_pid;
@@ -1505,10 +1495,6 @@
 int
 linux_getgid(struct thread *td, struct linux_getgid_args *args)
 {
-#ifdef DEBUG
-	if (ldebug(getgid))
-		printf(ARGS(getgid, ""));
-#endif
 
 #ifdef DEBUG
 	if (ldebug(getgid))
@@ -1522,10 +1508,6 @@
 int
 linux_getuid(struct thread *td, struct linux_getuid_args *args)
 {
-#ifdef DEBUG
-	if (ldebug(getuid))
-		printf(ARGS(getuid, ""));
-#endif
 
 #ifdef DEBUG
 	if (ldebug(getuid))