PERFORCE change 150083 for review
Warner Losh
imp at FreeBSD.org
Fri Sep 19 03:58:04 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=150083
Change 150083 by imp at imp_paco-paco on 2008/09/19 03:57:53
IFC @150082
Affected files ...
.. //depot/projects/mips2/src/gnu/lib/libgcc/Makefile#8 integrate
.. //depot/projects/mips2/src/gnu/lib/libgomp/Makefile#4 integrate
.. //depot/projects/mips2/src/sys/conf/ldscript.mips#9 integrate
.. //depot/projects/mips2/src/sys/conf/options.mips#9 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 integrate
.. //depot/projects/mips2/src/sys/i386/i386/pmap.c#21 integrate
.. //depot/projects/mips2/src/sys/mips/conf/IDT#11 integrate
.. //depot/projects/mips2/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate
Differences ...
==== //depot/projects/mips2/src/gnu/lib/libgcc/Makefile#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.60 2008/09/01 18:46:03 obrien Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.62 2008/09/19 03:09:36 imp Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
==== //depot/projects/mips2/src/gnu/lib/libgomp/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgomp/Makefile,v 1.3 2008/09/01 18:46:03 obrien Exp $
+# $FreeBSD: src/gnu/lib/libgomp/Makefile,v 1.4 2008/09/19 02:30:22 imp Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
==== //depot/projects/mips2/src/sys/conf/ldscript.mips#9 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD: src/sys/conf/ldscript.mips,v 1.2 2008/04/30 12:44:58 gonzo Exp $
+ * $FreeBSD: src/sys/conf/ldscript.mips,v 1.3 2008/09/19 03:36:37 imp Exp $
*/
OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips",
==== //depot/projects/mips2/src/sys/conf/options.mips#9 (text+ko) ====
@@ -26,7 +26,7 @@
# SUCH DAMAGE.
#
# JNPR: options.mips,v 1.2 2006/09/15 12:52:34
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.mips,v 1.2 2008/09/19 03:36:37 imp Exp $
CPU_MIPS4KC opt_global.h
CPU_MIPS32 opt_global.h
==== //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.20 2008/09/17 15:49:44 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.21 2008/09/18 23:56:42 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1733,10 +1733,9 @@
return (err);
inp = so_sotoinpcb(so);
+ inp_wlock(inp);
tp = inp_inpcbtotcpcb(inp);
-
- inp_wlock(inp);
-
+
oldval = tp->t_flags;
if (optval)
tp->t_flags |= TF_NODELAY;
@@ -3251,6 +3250,7 @@
/*
* Fill out information for entering us into the syncache
*/
+ bzero(&inc, sizeof(inc));
inc.inc_fport = th.th_sport = req->peer_port;
inc.inc_lport = th.th_dport = req->local_port;
th.th_seq = req->rcv_isn;
@@ -3595,6 +3595,7 @@
/*
* Fill out information for entering us into the syncache
*/
+ bzero(&inc, sizeof(inc));
inc.inc_fport = th.th_sport = req->peer_port;
inc.inc_lport = th.th_dport = req->local_port;
th.th_seq = req->rcv_isn;
==== //depot/projects/mips2/src/sys/i386/i386/pmap.c#21 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.627 2008/08/04 08:04:09 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.628 2008/09/19 03:33:49 alc Exp $");
/*
* Manages physical address maps.
@@ -2883,9 +2883,8 @@
PMAP_LOCK_ASSERT(pmap, MA_OWNED);
firstpte = vtopte(trunc_4mpage(va));
- KASSERT((*firstpte & PG_V) != 0,
- ("pmap_promote_pde: firstpte is missing PG_V"));
- if ((*firstpte & PG_A) == 0) {
+ newpde = *firstpte;
+ if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) {
pmap_pde_p_failures++;
CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#x"
" in pmap %p", va, pmap);
@@ -2897,14 +2896,13 @@
" in pmap %p", va, pmap);
return;
}
- pa = *firstpte & PG_PS_FRAME;
- newpde = *firstpte;
if ((newpde & (PG_M | PG_RW)) == PG_RW)
newpde &= ~PG_RW;
/*
* Check all the ptes before promotion
*/
+ pa = newpde & PG_PS_FRAME;
for (pte = firstpte; pte < firstpte + NPTEPG; pte++) {
retry:
oldpte = *pte;
==== //depot/projects/mips2/src/sys/mips/conf/IDT#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/mips/conf/IDT,v 1.4 2008/09/03 18:49:54 obrien Exp $
+# $FreeBSD: src/sys/mips/conf/IDT,v 1.5 2008/09/19 03:47:29 imp Exp $
machine mips
cpu CPU_MIPS4KC
==== //depot/projects/mips2/src/sys/powerpc/ofw/ofw_syscons.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/ofw/ofw_syscons.c,v 1.9 2005/09/28 14:54:07 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/ofw/ofw_syscons.c,v 1.10 2008/09/19 03:22:47 sobomax Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -235,8 +235,16 @@
OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
node = OF_instance_to_package(stdout);
OF_getprop(node, "device_type", type, sizeof(type));
- if (strcmp(type, "display") != 0)
- return (0);
+ if (strcmp(type, "display") != 0) {
+ /*
+ * Attaching to "/chosen/stdout" has failed, try
+ * using "screen" directly.
+ */
+ node = OF_finddevice("screen");
+ OF_getprop(node, "device_type", type, sizeof(type));
+ if (strcmp(type, "display") != 0)
+ return (0);
+ }
/* Only support 8 and 32-bit framebuffers */
OF_getprop(node, "depth", &depth, sizeof(depth));
More information about the p4-projects
mailing list