From owner-p4-projects@FreeBSD.ORG Tue Nov 21 16:20:07 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 9498816AA64; Tue, 21 Nov 2006 16:20:07 +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 71C3A16AA5F for ; Tue, 21 Nov 2006 16:20:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB76043DF0 for ; Tue, 21 Nov 2006 16:18:45 +0000 (GMT) (envelope-from imp@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 kALGIxY5045818 for ; Tue, 21 Nov 2006 16:18:59 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kALGIvk6045813 for perforce@freebsd.org; Tue, 21 Nov 2006 16:18:57 GMT (envelope-from imp@freebsd.org) Date: Tue, 21 Nov 2006 16:18:57 GMT Message-Id: <200611211618.kALGIvk6045813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 110281 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: Tue, 21 Nov 2006 16:20:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=110281 Change 110281 by imp@imp_paco-paco on 2006/11/20 05:58:36 IFC @@110280 (-i for extra goodness) Affected files ... .. //depot/projects/arm/src/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff#2 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#26 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#7 integrate .. //depot/projects/arm/src/sys/arm/conf/AVILA#9 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#12 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#8 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#6 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#8 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#25 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#9 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#7 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#19 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#8 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#7 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#16 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#9 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_timer.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#7 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#8 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/std.ixp425#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#6 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#15 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/board.h#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#31 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ee.c#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ee.h#2 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/memcmp.c#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/memcpy.c#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/memset.c#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/strcmp.c#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/strcpy.c#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/strcvt.c#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/strlen.c#3 integrate .. //depot/projects/arm/src/sys/dev/mmc/bridge.h#6 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#22 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcbr_if.m#6 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcbrvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.m#6 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#15 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#11 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#12 integrate Differences ... ==== //depot/projects/arm/src/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#26 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#7 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/conf/AVILA#9 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#12 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#8 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#6 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#8 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#25 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#9 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#7 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#19 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_intr.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#8 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#7 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#16 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#9 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_timer.c#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_wdog.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#7 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#8 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/std.avila#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/std.ixp425#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#6 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot2/Makefile,v 1.3 2006/11/16 00:48:04 imp Exp $ .PATH: ${.CURDIR}/../libat91 ${.CURDIR}/../bootspi ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/board.h#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#31 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.79 2005/11/03 07:35:36 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.3 2006/11/16 00:47:31 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ee.c#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ee.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/memcmp.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/memcpy.c#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/memset.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/strcmp.c#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/strcpy.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/strcvt.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/strlen.c#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/mmc/bridge.h#6 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#22 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/mmc/mmcbr_if.m#6 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/mmc/mmcbrvar.h#4 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.m#6 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#15 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#11 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/mmc/mmcvar.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/kern/kern_resource.c#12 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.162 2006/11/06 13:42:00 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.163 2006/11/20 05:50:59 davidxu Exp $"); #include "opt_compat.h" @@ -545,6 +545,7 @@ rtp_to_pri(struct rtprio *rtp, struct thread *td) #endif { + u_char newpri; mtx_assert(&sched_lock, MA_OWNED); if (rtp->prio > RTP_PRIO_MAX) @@ -552,23 +553,23 @@ switch (RTP_PRIO_BASE(rtp->type)) { case RTP_PRIO_REALTIME: #ifdef KSE - kg->kg_user_pri = PRI_MIN_REALTIME + rtp->prio; + newpri = PRI_MIN_REALTIME + rtp->prio; #else - td->td_user_pri = PRI_MIN_REALTIME + rtp->prio; + newpri = PRI_MIN_REALTIME + rtp->prio; #endif break; case RTP_PRIO_NORMAL: #ifdef KSE - kg->kg_user_pri = PRI_MIN_TIMESHARE + rtp->prio; + newpri = PRI_MIN_TIMESHARE + rtp->prio; #else - td->td_user_pri = PRI_MIN_TIMESHARE + rtp->prio; + newpri = PRI_MIN_TIMESHARE + rtp->prio; #endif break; case RTP_PRIO_IDLE: #ifdef KSE - kg->kg_user_pri = PRI_MIN_IDLE + rtp->prio; + newpri = PRI_MIN_IDLE + rtp->prio; #else - td->td_user_pri = PRI_MIN_IDLE + rtp->prio; + newpri = PRI_MIN_IDLE + rtp->prio; #endif break; default: @@ -576,11 +577,13 @@ } #ifdef KSE sched_class(kg, rtp->type); + sched_user_prio(kg, newpri); if (curthread->td_ksegrp == kg) { sched_prio(curthread, kg->kg_user_pri); /* XXX dubious */ } #else sched_class(td, rtp->type); /* XXX fix */ + sched_user_prio(td, newpri); if (curthread == td) sched_prio(curthread, td->td_user_pri); /* XXX dubious */ #endif @@ -603,23 +606,23 @@ #endif case PRI_REALTIME: #ifdef KSE - rtp->prio = kg->kg_user_pri - PRI_MIN_REALTIME; + rtp->prio = kg->kg_base_user_pri - PRI_MIN_REALTIME; #else - rtp->prio = td->td_user_pri - PRI_MIN_REALTIME; + rtp->prio = td->td_base_user_pri - PRI_MIN_REALTIME; #endif break; case PRI_TIMESHARE: #ifdef KSE - rtp->prio = kg->kg_user_pri - PRI_MIN_TIMESHARE; + rtp->prio = kg->kg_base_user_pri - PRI_MIN_TIMESHARE; #else - rtp->prio = td->td_user_pri - PRI_MIN_TIMESHARE; + rtp->prio = td->td_base_user_pri - PRI_MIN_TIMESHARE; #endif break; case PRI_IDLE: #ifdef KSE - rtp->prio = kg->kg_user_pri - PRI_MIN_IDLE; + rtp->prio = kg->kg_base_user_pri - PRI_MIN_IDLE; #else - rtp->prio = td->td_user_pri - PRI_MIN_IDLE; + rtp->prio = td->td_base_user_pri - PRI_MIN_IDLE; #endif break; default: