PERFORCE change 110281 for review
Warner Losh
imp at FreeBSD.org
Tue Nov 21 16:20:07 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=110281
Change 110281 by imp at 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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/disklabel.h>
==== //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 <sys/cdefs.h>
-__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:
More information about the p4-projects
mailing list