Date: Tue, 21 Nov 2006 16:16:56 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 110247 for review Message-ID: <200611211616.kALGGumi045479@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611211616.kALGGumi045479>