From owner-p4-projects@FreeBSD.ORG Tue Oct 5 22:16:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AB4616A4D1; Tue, 5 Oct 2004 22:16:00 +0000 (GMT) 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 5CDD316A4CE for ; Tue, 5 Oct 2004 22:16:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31BAC43D41 for ; Tue, 5 Oct 2004 22:16:00 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i95MG01r082312 for ; Tue, 5 Oct 2004 22:16:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i95MFxJZ082307 for perforce@freebsd.org; Tue, 5 Oct 2004 22:15:59 GMT (envelope-from julian@freebsd.org) Date: Tue, 5 Oct 2004 22:15:59 GMT Message-Id: <200410052215.i95MFxJZ082307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 62708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Oct 2004 22:16:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=62708 Change 62708 by julian@julian_ref on 2004/10/05 22:15:28 IFC@62707 loopback some changes Affected files ... .. //depot/projects/nsched/sys/kern/kern_switch.c#39 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#43 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#61 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#40 integrate .. //depot/projects/nsched/sys/sys/param.h#15 integrate .. //depot/projects/nsched/sys/sys/proc.h#38 integrate .. //depot/projects/nsched/sys/sys/runq.h#3 integrate Differences ... ==== //depot/projects/nsched/sys/kern/kern_switch.c#39 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.96 2004/10/05 21:10:43 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.97 2004/10/05 22:03:10 julian Exp $"); #include "opt_sched.h" ==== //depot/projects/nsched/sys/kern/kern_thread.c#43 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.201 2004/10/05 20:39:26 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.202 2004/10/05 22:05:25 julian Exp $"); #include #include ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#61 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.66 2004/10/05 21:10:44 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.67 2004/10/05 22:03:10 julian Exp $"); #define kse td_sched ==== //depot/projects/nsched/sys/kern/sched_ule.c#40 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.132 2004/10/05 21:26:27 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.133 2004/10/05 22:03:10 julian Exp $"); #include ==== //depot/projects/nsched/sys/sys/param.h#15 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.216 2004/09/29 04:54:33 mlaier Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.217 2004/10/05 22:09:12 brooks Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 600004 /* Master, propagated to newvers */ +#define __FreeBSD_version 600005 /* Master, propagated to newvers */ #ifndef LOCORE #include ==== //depot/projects/nsched/sys/sys/proc.h#38 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.407 2004/10/05 20:39:25 julian Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.408 2004/10/05 22:03:09 julian Exp $ */ #ifndef _SYS_PROC_H_ ==== //depot/projects/nsched/sys/sys/runq.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/runq.h,v 1.4 2002/05/25 01:12:23 jake Exp $ + * $FreeBSD: src/sys/sys/runq.h,v 1.5 2004/10/05 22:03:10 julian Exp $ */ #ifndef _RUNQ_H_