From owner-p4-projects@FreeBSD.ORG Mon Aug 14 15:21:28 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 EEB5316A4E1; Mon, 14 Aug 2006 15:21:27 +0000 (UTC) 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 ADC5E16A4DE for ; Mon, 14 Aug 2006 15:21:27 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BF9D43D77 for ; Mon, 14 Aug 2006 15:21:27 +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 k7EFLRho093241 for ; Mon, 14 Aug 2006 15:21:27 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EFLRwp093238 for perforce@freebsd.org; Mon, 14 Aug 2006 15:21:27 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 15:21:27 GMT Message-Id: <200608141521.k7EFLRwp093238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103857 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: Mon, 14 Aug 2006 15:21:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=103857 Change 103857 by rdivacky@rdivacky_witten on 2006/08/14 15:21:01 Backout the LINUX_NPTL change. It never worked in the first place (I made a typo) and its sufficient to set osrelease=2.4.2 to get working linuxolator. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#7 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#13 edit .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.amd64#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.i386#4 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#7 (text+ko) ==== @@ -81,11 +81,7 @@ 0, 0, linux_sysctl_osname, "A", "Linux kernel OS name"); -#ifdef LINUX_NPTL static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.6.16"; -#else -static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2"; -#endif static int linux_sysctl_osrelease(SYSCTL_HANDLER_ARGS) ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#13 (text+ko) ==== @@ -1334,7 +1334,6 @@ int linux_getpid(struct thread *td, struct linux_getpid_args *args) { -#ifdef LINUX_NTPL struct linux_emuldata *em; em = em_find(td->td_proc, EMUL_UNLOCKED); @@ -1343,9 +1342,6 @@ td->td_retval[0] = em->shared->group_pid; EMUL_UNLOCK(&emul_lock); -#else - td->td_retval[0] = td->td_proc->p_pid; -#endif return (0); } @@ -1365,7 +1361,6 @@ int linux_getppid(struct thread *td, struct linux_getppid_args *args) { -#ifdef LINUX_NTPL struct linux_emuldata *em; struct proc *p, *pp; @@ -1400,9 +1395,6 @@ PROC_UNLOCK(pp); return (0); -#else - return getppid(td, (struct getppid_args *) args); -#endif } int ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options.amd64#4 (text+ko) ==== @@ -20,7 +20,6 @@ LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h -LINUX_NPTL opt_compat.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options.i386#4 (text+ko) ==== @@ -29,7 +29,6 @@ NDISAPI opt_dontuse.h PECOFF_DEBUG opt_pecoff.h PECOFF_SUPPORT opt_dontuse.h -LINUX_NPTL opt_compat.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h