Re: CVS commit: src/usr.sbin/vnconfig
Hi, On Sun, 09 Jun 2013 09:25:41 -0400, Christos Zoulas wrote: Module Name: src Committed By: christos Date: Sun Jun 9 13:25:41 UTC 2013 Modified Files: src/usr.sbin/vnconfig: vnconfig.c Log Message: Now that we grow vnd's dynamically we cannot depend on the kernel returning ENXIO when we exceed the number of configured vnds, so in the -l case, print info for all vnds we can find device nodes for in /dev. Is it worth pulling this to netbsd-6, together with sys/dev/vnd.c 1.225? Cheers, -- khorben
Re: CVS commit: src/usr.sbin/vnconfig
In article kp300r$umj$1...@ger.gmane.org, Pierre Pronchery khor...@defora.org wrote: Hi, On Sun, 09 Jun 2013 09:25:41 -0400, Christos Zoulas wrote: Module Name: src Committed By:christos Date:Sun Jun 9 13:25:41 UTC 2013 Modified Files: src/usr.sbin/vnconfig: vnconfig.c Log Message: Now that we grow vnd's dynamically we cannot depend on the kernel returning ENXIO when we exceed the number of configured vnds, so in the -l case, print info for all vnds we can find device nodes for in /dev. Is it worth pulling this to netbsd-6, together with sys/dev/vnd.c 1.225? 6- does not have dynamically allocated vnds. christos
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sun Jun 9 06:28:16 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: OVERO Log Message: Add omapdma. Fix typo. s/expantion/expansion/. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/OVERO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/OVERO diff -u src/sys/arch/evbarm/conf/OVERO:1.29 src/sys/arch/evbarm/conf/OVERO:1.30 --- src/sys/arch/evbarm/conf/OVERO:1.29 Wed Jun 5 23:08:00 2013 +++ src/sys/arch/evbarm/conf/OVERO Sun Jun 9 06:28:16 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: OVERO,v 1.29 2013/06/05 23:08:00 christos Exp $ +# $NetBSD: OVERO,v 1.30 2013/06/09 06:28:16 kiyohara Exp $ # # OVERO -- Gumstix. Inc. Overo COMS platforms kernel # @@ -212,6 +212,9 @@ options OMAP_MPU_TIMER_CLOCK_FREQ=12 omapwdt32k* at obio1 addr 0x48314000 size 0x1000 # WDT2 #omapwdt32k* at obio2 addr 0x4903 size 0x1000 # WDT3 +# onboard DMA +omapdma0 at obio0 addr 0x48056000 size 0x1000 + # Power, Reset and Clock Management prcm* at obio1 addr 0x48306000 size 0x2000 # PRM Module @@ -228,7 +231,7 @@ options HWCLOCK options HWCLOCK_MACHINE=arch/arm/omap/hwclock_omap1.h options OMAP_CK_REF_SPEED=1200 -# overo expantion boards +# overo expansion boards # SMSC LAN9221 smsh0 at gpmc? addr 0x0100 intr 272 # Tobi, Chestnut43
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sun Jun 9 06:29:01 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Comment-out options IPSEC*. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/ARMADAXP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/ARMADAXP diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.3 src/sys/arch/evbarm/conf/ARMADAXP:1.4 --- src/sys/arch/evbarm/conf/ARMADAXP:1.3 Wed Jun 5 23:08:00 2013 +++ src/sys/arch/evbarm/conf/ARMADAXP Sun Jun 9 06:29:01 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: ARMADAXP,v 1.3 2013/06/05 23:08:00 christos Exp $ +# $NetBSD: ARMADAXP,v 1.4 2013/06/09 06:29:01 kiyohara Exp $ # # ARMADA XP DEV BOARD # @@ -57,8 +57,8 @@ options WAPBL # File system journaling options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 -options IPSEC # IP security -options IPSEC_DEBUG # debug for IP security +#options IPSEC # IP security +#options IPSEC_DEBUG # debug for IP security options MROUTING # IP multicast routing options PIM # Protocol Independent Multicast options NETATALK # AppleTalk networking
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 08:42:16 UTC 2013
Modified Files:
src/sys/dev/mii: atphy.c ciphy.c ihphy.c rgephy.c
Log Message:
atphy, ciphy, ihphy and rgephy are gigabit PHY, so not only check IFM_AUTO
for autonegotiation but also check IFM_1000_T, too.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/rgephy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.13 src/sys/dev/mii/atphy.c:1.14
--- src/sys/dev/mii/atphy.c:1.13 Thu Jun 6 03:10:48 2013
+++ src/sys/dev/mii/atphy.c Sun Jun 9 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.13 2013/06/06 03:10:48 msaitoh Exp $ */
+/* $NetBSD: atphy.c,v 1.14 2013/06/09 08:42:16 msaitoh Exp $ */
/* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atphy.c,v 1.13 2013/06/06 03:10:48 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: atphy.c,v 1.14 2013/06/09 08:42:16 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -264,7 +264,8 @@ done:
/*
* Only used for autonegotiation.
*/
- if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO) {
+ if ((IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
+ (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T)) {
sc-mii_ticks = 0;
break;
}
Index: src/sys/dev/mii/ciphy.c
diff -u src/sys/dev/mii/ciphy.c:1.20 src/sys/dev/mii/ciphy.c:1.21
--- src/sys/dev/mii/ciphy.c:1.20 Thu Jun 6 03:10:48 2013
+++ src/sys/dev/mii/ciphy.c Sun Jun 9 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.20 2013/06/06 03:10:48 msaitoh Exp $ */
+/* $NetBSD: ciphy.c,v 1.21 2013/06/09 08:42:16 msaitoh Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ciphy.c,v 1.20 2013/06/06 03:10:48 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ciphy.c,v 1.21 2013/06/09 08:42:16 msaitoh Exp $);
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -257,7 +257,8 @@ setit:
/*
* Only used for autonegotiation.
*/
- if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
+ if ((IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
+ (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T))
break;
/*
Index: src/sys/dev/mii/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.2 src/sys/dev/mii/ihphy.c:1.3
--- src/sys/dev/mii/ihphy.c:1.2 Fri May 20 06:06:59 2011
+++ src/sys/dev/mii/ihphy.c Sun Jun 9 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ihphy.c,v 1.2 2011/05/20 06:06:59 msaitoh Exp $ */
+/* $NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ihphy.c,v 1.2 2011/05/20 06:06:59 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -217,7 +217,8 @@ ihphy_service(struct mii_softc *sc, stru
/*
* Only used for autonegotiation.
*/
- if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
+ if ((IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
+ (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T))
return 0;
if (mii_phy_tick(sc) == EJUSTRETURN)
Index: src/sys/dev/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.30 src/sys/dev/mii/rgephy.c:1.31
--- src/sys/dev/mii/rgephy.c:1.30 Thu Jun 6 03:10:48 2013
+++ src/sys/dev/mii/rgephy.c Sun Jun 9 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.30 2013/06/06 03:10:48 msaitoh Exp $ */
+/* $NetBSD: rgephy.c,v 1.31 2013/06/09 08:42:16 msaitoh Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.30 2013/06/06 03:10:48 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.31 2013/06/09 08:42:16 msaitoh Exp $);
/*
@@ -288,7 +288,8 @@ rgephy_service(struct mii_softc *sc, str
/*
* Only used for autonegotiation.
*/
- if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
+ if ((IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
+ (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T))
break;
/*
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 08:45:32 UTC 2013 Modified Files: src/sys/dev/mii: ciphy.c Log Message: ciphy is gigabit PHY, so use MII_ANEGTICKS_GIGE instead of MII_ANEGTICKS. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/mii/ciphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/ciphy.c diff -u src/sys/dev/mii/ciphy.c:1.21 src/sys/dev/mii/ciphy.c:1.22 --- src/sys/dev/mii/ciphy.c:1.21 Sun Jun 9 08:42:16 2013 +++ src/sys/dev/mii/ciphy.c Sun Jun 9 08:45:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ciphy.c,v 1.21 2013/06/09 08:42:16 msaitoh Exp $ */ +/* $NetBSD: ciphy.c,v 1.22 2013/06/09 08:45:32 msaitoh Exp $ */ /*- * Copyright (c) 2004 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ciphy.c,v 1.21 2013/06/09 08:42:16 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: ciphy.c,v 1.22 2013/06/09 08:45:32 msaitoh Exp $); /* * Driver for the Cicada CS8201 10/100/1000 copper PHY. @@ -271,9 +271,9 @@ setit: break; /* - * Only retry autonegotiation every 5 seconds. + * Only retry autonegotiation every N seconds. */ - if (++sc-mii_ticks = MII_ANEGTICKS) + if (++sc-mii_ticks = MII_ANEGTICKS_GIGE) break; mii_phy_auto(sc, 0);
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 09:15:51 UTC 2013 Modified Files: src/sys/dev/mii: exphy.c ihphy.c tlphy.c ukphy.c urlphy.c Log Message: Don't return but break in MII_TICK when the interface isn't doing autonegotiaton or the link is up to update the status. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/dev/mii/exphy.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mii/ihphy.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/mii/tlphy.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mii/ukphy.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/mii/urlphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/exphy.c diff -u src/sys/dev/mii/exphy.c:1.52 src/sys/dev/mii/exphy.c:1.53 --- src/sys/dev/mii/exphy.c:1.52 Mon Oct 19 18:41:13 2009 +++ src/sys/dev/mii/exphy.c Sun Jun 9 09:15:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: exphy.c,v 1.52 2009/10/19 18:41:13 bouyer Exp $ */ +/* $NetBSD: exphy.c,v 1.53 2013/06/09 09:15:51 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: exphy.c,v 1.52 2009/10/19 18:41:13 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: exphy.c,v 1.53 2013/06/09 09:15:51 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -180,7 +180,7 @@ exphy_service(struct mii_softc *sc, stru * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO) - return (0); + break; if (mii_phy_tick(sc) == EJUSTRETURN) return (0); Index: src/sys/dev/mii/ihphy.c diff -u src/sys/dev/mii/ihphy.c:1.3 src/sys/dev/mii/ihphy.c:1.4 --- src/sys/dev/mii/ihphy.c:1.3 Sun Jun 9 08:42:16 2013 +++ src/sys/dev/mii/ihphy.c Sun Jun 9 09:15:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh Exp $ */ +/* $NetBSD: ihphy.c,v 1.4 2013/06/09 09:15:51 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: ihphy.c,v 1.4 2013/06/09 09:15:51 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -219,7 +219,7 @@ ihphy_service(struct mii_softc *sc, stru */ if ((IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO) (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T)) - return 0; + break; if (mii_phy_tick(sc) == EJUSTRETURN) return 0; Index: src/sys/dev/mii/tlphy.c diff -u src/sys/dev/mii/tlphy.c:1.59 src/sys/dev/mii/tlphy.c:1.60 --- src/sys/dev/mii/tlphy.c:1.59 Mon Oct 19 18:41:14 2009 +++ src/sys/dev/mii/tlphy.c Sun Jun 9 09:15:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: tlphy.c,v 1.59 2009/10/19 18:41:14 bouyer Exp $ */ +/* $NetBSD: tlphy.c,v 1.60 2013/06/09 09:15:51 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tlphy.c,v 1.59 2009/10/19 18:41:14 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: tlphy.c,v 1.60 2013/06/09 09:15:51 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -261,16 +261,16 @@ tlphy_service(struct mii_softc *sc, stru return (0); /* - * Only used for autonegotiation. + * Is the interface even up? */ - if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO) + if ((mii-mii_ifp-if_flags IFF_UP) == 0) return (0); /* - * Is the interface even up? + * Only used for autonegotiation. */ - if ((mii-mii_ifp-if_flags IFF_UP) == 0) - return (0); + if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO) + break; /* * XXX WHAT ABOUT CHECKING LINK ON THE BNC/AUI?! Index: src/sys/dev/mii/ukphy.c diff -u src/sys/dev/mii/ukphy.c:1.43 src/sys/dev/mii/ukphy.c:1.44 --- src/sys/dev/mii/ukphy.c:1.43 Sun Jun 6 18:58:22 2010 +++ src/sys/dev/mii/ukphy.c Sun Jun 9 09:15:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ukphy.c,v 1.43 2010/06/06 18:58:22 pgoyette Exp $ */ +/* $NetBSD: ukphy.c,v 1.44 2013/06/09 09:15:51 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ukphy.c,v 1.43 2010/06/06 18:58:22 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: ukphy.c,v 1.44 2013/06/09 09:15:51 msaitoh Exp $); #include opt_mii.h @@ -192,7 +192,7 @@ ukphy_service(struct mii_softc *sc, stru * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO) - return (0); + break; if (mii_phy_tick(sc) == EJUSTRETURN) return (0); Index: src/sys/dev/mii/urlphy.c diff -u src/sys/dev/mii/urlphy.c:1.26 src/sys/dev/mii/urlphy.c:1.27 --- src/sys/dev/mii/urlphy.c:1.26 Thu Jun 6 03:10:48 2013 +++ src/sys/dev/mii/urlphy.c Sun Jun 9 09:15:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: urlphy.c,v 1.26 2013/06/06 03:10:48 msaitoh Exp $ */ +/* $NetBSD: urlphy.c,v 1.27 2013/06/09
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 09:24:29 UTC 2013 Modified Files: src/sys/dev/mii: ukphy.c Log Message: Tabify. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/mii/ukphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/ukphy.c diff -u src/sys/dev/mii/ukphy.c:1.44 src/sys/dev/mii/ukphy.c:1.45 --- src/sys/dev/mii/ukphy.c:1.44 Sun Jun 9 09:15:51 2013 +++ src/sys/dev/mii/ukphy.c Sun Jun 9 09:24:29 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ukphy.c,v 1.44 2013/06/09 09:15:51 msaitoh Exp $ */ +/* $NetBSD: ukphy.c,v 1.45 2013/06/09 09:24:29 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ukphy.c,v 1.44 2013/06/09 09:15:51 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: ukphy.c,v 1.45 2013/06/09 09:24:29 msaitoh Exp $); #include opt_mii.h @@ -192,7 +192,7 @@ ukphy_service(struct mii_softc *sc, stru * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO) - break; + break; if (mii_phy_tick(sc) == EJUSTRETURN) return (0);
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 09:23:35 UTC 2013
Modified Files:
src/sys/dev/sbus: be.c
Log Message:
Don't return but break in MII_TICK when the interface isn't doing
autonegotiaton or the link is up to update the status.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/sbus/be.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/be.c
diff -u src/sys/dev/sbus/be.c:1.79 src/sys/dev/sbus/be.c:1.80
--- src/sys/dev/sbus/be.c:1.79 Sun Jul 22 14:33:05 2012
+++ src/sys/dev/sbus/be.c Sun Jun 9 09:23:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.79 2012/07/22 14:33:05 matt Exp $ */
+/* $NetBSD: be.c,v 1.80 2013/06/09 09:23:35 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: be.c,v 1.79 2012/07/22 14:33:05 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: be.c,v 1.80 2013/06/09 09:23:35 msaitoh Exp $);
#include opt_ddb.h
#include opt_inet.h
@@ -1516,14 +1516,14 @@ be_intphy_service(struct be_softc *sc, s
if (IFM_INST(ife-ifm_media) != sc-sc_mii_inst)
return 0;
- /* Only used for automatic media selection */
- if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
- return 0;
-
/* Is the interface even up? */
if ((mii-mii_ifp-if_flags IFF_UP) == 0)
return 0;
+ /* Only used for automatic media selection */
+ if (IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
+ break;
+
/*
* Check link status; if we don't have a link, try another
* speed. We can't detect duplex mode, so half-duplex is
@@ -1555,7 +1555,7 @@ be_intphy_service(struct be_softc *sc, s
device_xname(self),
(bmcr BMCR_S100) ? 100 : 10);
}
- return 0;
+ break;
}
if ((sc-sc_mii_flags MIIF_DOINGAUTO) == 0) {
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 09:31:32 UTC 2013
Modified Files:
src/sys/dev/mii: ciphy.c ihphy.c mii_physubr.c rgephy.c urlphy.c
Log Message:
Update link status quickly. This change is a part of FreeBSD's mii_physubr.c
r158649.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mii/urlphy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/ciphy.c
diff -u src/sys/dev/mii/ciphy.c:1.22 src/sys/dev/mii/ciphy.c:1.23
--- src/sys/dev/mii/ciphy.c:1.22 Sun Jun 9 08:45:32 2013
+++ src/sys/dev/mii/ciphy.c Sun Jun 9 09:31:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.22 2013/06/09 08:45:32 msaitoh Exp $ */
+/* $NetBSD: ciphy.c,v 1.23 2013/06/09 09:31:32 msaitoh Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ciphy.c,v 1.22 2013/06/09 08:45:32 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ciphy.c,v 1.23 2013/06/09 09:31:32 msaitoh Exp $);
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -258,8 +258,14 @@ setit:
* Only used for autonegotiation.
*/
if ((IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
- (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T))
+ (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T)) {
+ /*
+ * Reset autonegotiation timer to 0 just to make sure
+ * the future autonegotiation start with 0.
+ */
+ sc-mii_ticks = 0;
break;
+ }
/*
* Check to see if we have link. If we do, we don't
@@ -267,8 +273,15 @@ setit:
* the BMSR twice in case it's latched.
*/
reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR);
- if (reg BMSR_LINK)
+ if (reg BMSR_LINK) {
+ /*
+ * Reset autonegotiation timer to 0 in case the link
+ * goes down in the next tick.
+ */
+ sc-mii_ticks = 0;
+ /* See above. */
break;
+ }
/*
* Only retry autonegotiation every N seconds.
Index: src/sys/dev/mii/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.4 src/sys/dev/mii/ihphy.c:1.5
--- src/sys/dev/mii/ihphy.c:1.4 Sun Jun 9 09:15:51 2013
+++ src/sys/dev/mii/ihphy.c Sun Jun 9 09:31:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ihphy.c,v 1.4 2013/06/09 09:15:51 msaitoh Exp $ */
+/* $NetBSD: ihphy.c,v 1.5 2013/06/09 09:31:32 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ihphy.c,v 1.4 2013/06/09 09:15:51 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ihphy.c,v 1.5 2013/06/09 09:31:32 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -218,8 +218,14 @@ ihphy_service(struct mii_softc *sc, stru
* Only used for autonegotiation.
*/
if ((IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
- (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T))
+ (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T)) {
+ /*
+ * Reset autonegotiation timer to 0 just to make sure
+ * the future autonegotiation start with 0.
+ */
+ sc-mii_ticks = 0;
break;
+ }
if (mii_phy_tick(sc) == EJUSTRETURN)
return 0;
Index: src/sys/dev/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.76 src/sys/dev/mii/mii_physubr.c:1.77
--- src/sys/dev/mii/mii_physubr.c:1.76 Thu Jun 6 03:10:48 2013
+++ src/sys/dev/mii/mii_physubr.c Sun Jun 9 09:31:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.76 2013/06/06 03:10:48 msaitoh Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.77 2013/06/09 09:31:32 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mii_physubr.c,v 1.76 2013/06/06 03:10:48 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: mii_physubr.c,v 1.77 2013/06/09 09:31:32 msaitoh Exp $);
#include sys/param.h
#include sys/device.h
@@ -324,27 +324,47 @@ mii_phy_tick(struct mii_softc *sc)
/*
* If we're not doing autonegotiation, we don't need to do
* any extra work here. However, we need to check the link
- * status so we can generate an announcement if the status
- * changes.
+ * status so we can generate an announcement by returning
+ * with 0 if the status changes.
*/
if ((IFM_SUBTYPE(ife-ifm_media) != IFM_AUTO)
- (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T))
+ (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T)) {
+ /*
+ * Reset autonegotiation timer to 0 just to make sure
+ * the future autonegotiation start with 0.
+ */
+ sc-mii_ticks = 0;
return (0);
+ }
/* Read the status register twice; BMSR_LINK is latch-low. */
reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR);
if (reg BMSR_LINK) {
/*
- * See above.
+ * Reset autonegotiation timer to 0 in case the link
+ * goes
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: njoly
Date: Sun Jun 9 09:44:51 UTC 2013
Modified Files:
src/sys/dev/ic: siisata.c
Log Message:
Add missing parenthesis.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/siisata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.24 src/sys/dev/ic/siisata.c:1.25
--- src/sys/dev/ic/siisata.c:1.24 Wed Apr 3 17:15:07 2013
+++ src/sys/dev/ic/siisata.c Sun Jun 9 09:44:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.24 2013/04/03 17:15:07 bouyer Exp $ */
+/* $NetBSD: siisata.c,v 1.25 2013/06/09 09:44:51 njoly Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: siisata.c,v 1.24 2013/04/03 17:15:07 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: siisata.c,v 1.25 2013/06/09 09:44:51 njoly Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -118,7 +118,7 @@ int siisata_debug_mask = 0;
static inline uint32_t
bus_space_read_stream_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
{
- return htole32(bus_space_read_4(t, h, o);
+ return htole32(bus_space_read_4(t, h, o));
}
static inline void
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 09:56:17 UTC 2013 Modified Files: src/sys/dev/mii: mii_physubr.c urlphy.c Log Message: Fix a bug in last commit that mii_ticks isn't inclemented. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/mii/mii_physubr.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/urlphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/mii_physubr.c diff -u src/sys/dev/mii/mii_physubr.c:1.77 src/sys/dev/mii/mii_physubr.c:1.78 --- src/sys/dev/mii/mii_physubr.c:1.77 Sun Jun 9 09:31:32 2013 +++ src/sys/dev/mii/mii_physubr.c Sun Jun 9 09:56:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: mii_physubr.c,v 1.77 2013/06/09 09:31:32 msaitoh Exp $ */ +/* $NetBSD: mii_physubr.c,v 1.78 2013/06/09 09:56:17 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mii_physubr.c,v 1.77 2013/06/09 09:31:32 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: mii_physubr.c,v 1.78 2013/06/09 09:56:17 msaitoh Exp $); #include sys/param.h #include sys/device.h @@ -350,16 +350,13 @@ mii_phy_tick(struct mii_softc *sc) } /* - * mii_tick == 0 means it's the first tick after changing the media or + * mii_ticks == 0 means it's the first tick after changing the media or * the link became down since the last tick (see above), so return with * 0 to update the status. */ - if (sc-mii_ticks == 0) + if (sc-mii_ticks++ == 0) return (0); - /* Now increment the tick */ - sc-mii_ticks++; - /* * Only retry autonegotiation every N seconds. */ Index: src/sys/dev/mii/urlphy.c diff -u src/sys/dev/mii/urlphy.c:1.28 src/sys/dev/mii/urlphy.c:1.29 --- src/sys/dev/mii/urlphy.c:1.28 Sun Jun 9 09:31:32 2013 +++ src/sys/dev/mii/urlphy.c Sun Jun 9 09:56:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: urlphy.c,v 1.28 2013/06/09 09:31:32 msaitoh Exp $ */ +/* $NetBSD: urlphy.c,v 1.29 2013/06/09 09:56:17 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002 * Shingo WATANABE n...@nabechan.org. All rights reserved. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: urlphy.c,v 1.28 2013/06/09 09:31:32 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: urlphy.c,v 1.29 2013/06/09 09:56:17 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -197,16 +197,13 @@ urlphy_service(struct mii_softc *sc, str } /* - * mii_tick == 0 means it's the first tick after changing the + * mii_ticks == 0 means it's the first tick after changing the * media or the link became down since the last tick (see * above), so break to update the status. */ - if (sc-mii_ticks == 0) + if (sc-mii_ticks++ == 0) break; - /* Now increment the tick */ - sc-mii_ticks++; - /* * Only retry autonegotiation every N seconds. */
CVS commit: [netbsd-5] src/etc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 10:57:45 UTC 2013 Modified Files: src/etc [netbsd-5]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by apb in ticket #1848): etc/MAKEDEV.tmpl: revision 1.161 The console major number is not always 0; when creating a temporary console while populating a memory disk, use %CONSOLE_CMAJOR% instead of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent major number. This fixes a bug that I introduced in revision 1.82 dated 2007-03-11. To generate a diff of this commit: cvs rdiff -u -r1.113.2.8 -r1.113.2.9 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.113.2.8 src/etc/MAKEDEV.tmpl:1.113.2.9 --- src/etc/MAKEDEV.tmpl:1.113.2.8 Fri May 20 19:21:32 2011 +++ src/etc/MAKEDEV.tmpl Sun Jun 9 10:57:45 2013 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.113.2.8 2011/05/20 19:21:32 bouyer Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.113.2.9 2013/06/09 10:57:45 msaitoh Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -2129,7 +2129,7 @@ create_mfs_dev() if $do_redirect; then # Redirect stdout and stderr to console - mknod -m 600 -g 0 -u 0 temp_console c 0 0 + mknod -m 600 -g 0 -u 0 temp_console c %CONSOLE_CMAJOR% 0 exec temp_console 21 rm temp_console fi
CVS commit: [netbsd-5] src/etc/rc.d
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:01:41 UTC 2013 Modified Files: src/etc/rc.d [netbsd-5]: wpa_supplicant Log Message: Pull up following revision(s) (requested by tron in ticket #1849): etc/rc.d/wpa_supplicant: revision 1.4 Make custom reload target work. Before this fix it would have tried to send a HUP signal to wpa_supplicant instead. To generate a diff of this commit: cvs rdiff -u -r1.1.26.1 -r1.1.26.2 src/etc/rc.d/wpa_supplicant Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/wpa_supplicant diff -u src/etc/rc.d/wpa_supplicant:1.1.26.1 src/etc/rc.d/wpa_supplicant:1.1.26.2 --- src/etc/rc.d/wpa_supplicant:1.1.26.1 Tue Nov 18 02:30:35 2008 +++ src/etc/rc.d/wpa_supplicant Sun Jun 9 11:01:41 2013 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: wpa_supplicant,v 1.1.26.1 2008/11/18 02:30:35 snj Exp $ +# $NetBSD: wpa_supplicant,v 1.1.26.2 2013/06/09 11:01:41 msaitoh Exp $ # # PROVIDE: wpa_supplicant @@ -12,7 +12,7 @@ $_rc_subr_loaded . /etc/rc.subr name=wpa_supplicant rcvar=$name command=/usr/sbin/wpa_supplicant -reload_command=/usr/sbin/wpa_cli reconfigure +reload_cmd=/usr/sbin/wpa_cli reconfigure extra_commands=reload load_rc_config $name
CVS commit: [netbsd-5] src/bin/sh
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 11:13:11 UTC 2013
Modified Files:
src/bin/sh [netbsd-5]: expand.c expand.h
Log Message:
Pull up following revision(s) (requested by gdt in ticket #1851):
bin/sh/expand.c: revision 1.88
bin/sh/expand.h: revision 1.19
Fix the expansion of $(foo-$bar} so that IFS isn't applied when
expanding $bar.
Noted by Greg Troxel on tech-userlevel running some 'git' tests.
Should fix PR bin/47361
To generate a diff of this commit:
cvs rdiff -u -r1.79.2.1 -r1.79.2.2 src/bin/sh/expand.c
cvs rdiff -u -r1.17 -r1.17.18.1 src/bin/sh/expand.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.79.2.1 src/bin/sh/expand.c:1.79.2.2
--- src/bin/sh/expand.c:1.79.2.1 Wed Nov 2 19:31:19 2011
+++ src/bin/sh/expand.c Sun Jun 9 11:13:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.79.2.1 2011/11/02 19:31:19 riz Exp $ */
+/* $NetBSD: expand.c,v 1.79.2.2 2013/06/09 11:13:11 msaitoh Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)expand.c 8.5 (Berkeley) 5/15/95;
#else
-__RCSID($NetBSD: expand.c,v 1.79.2.1 2011/11/02 19:31:19 riz Exp $);
+__RCSID($NetBSD: expand.c,v 1.79.2.2 2013/06/09 11:13:11 msaitoh Exp $);
#endif
#endif /* not lint */
@@ -246,7 +246,7 @@ argstr(char *p, int flag)
break;
default:
STPUTC(c, expdest);
- if (flag EXP_IFS_SPLIT ifs_split strchr(ifs, c) != NULL) {
+ if (flag ifs_split strchr(ifs, c) != NULL) {
/* We need to get the output split here... */
recordregion(expdest - stackblock() - 1,
expdest - stackblock(), 0);
@@ -690,8 +690,21 @@ again: /* jump here after setting a vari
}
- apply_ifs = ((varflags VSQUOTE) == 0 ||
- (*var == '@' shellparam.nparam != 1));
+ if (flag EXP_IN_QUOTES)
+ apply_ifs = 0;
+ else if (varflags VSQUOTE) {
+ if (*var == '@' shellparam.nparam != 1)
+ apply_ifs = 1;
+ else {
+ /*
+ * Mark so that we don't apply IFS if we recurse through
+ * here expanding $bar from ${foo-$bar}.
+ */
+ flag |= EXP_IN_QUOTES;
+ apply_ifs = 0;
+ }
+ } else
+ apply_ifs = 1;
switch (subtype) {
case VSLENGTH:
Index: src/bin/sh/expand.h
diff -u src/bin/sh/expand.h:1.17 src/bin/sh/expand.h:1.17.18.1
--- src/bin/sh/expand.h:1.17 Sun Mar 25 06:29:27 2007
+++ src/bin/sh/expand.h Sun Jun 9 11:13:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.h,v 1.17 2007/03/25 06:29:27 apb Exp $ */
+/* $NetBSD: expand.h,v 1.17.18.1 2013/06/09 11:13:11 msaitoh Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -56,6 +56,7 @@ struct arglist {
#define EXP_REDIR 0x8 /* file glob for a redirection (1 match only) */
#define EXP_CASE 0x10 /* keeps quotes around for CASE pattern */
#define EXP_IFS_SPLIT 0x20 /* need to record arguments for ifs breakup */
+#define EXP_IN_QUOTES 0x40 /* don't set EXP_IFS_SPLIT again */
union node;
CVS commit: [netbsd-5] src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 11:29:43 UTC 2013
Modified Files:
src/sys/dev [netbsd-5]: fss.c
Log Message:
Pull up following revision(s) (requested by gdt in ticket #1853):
sys/dev/fss.c: revision 1.84
Take fss_device_lock first when closing a fss device.
Fixes PR kern/47514 (Multiple dump -X triggers kernel panic in fss_ioctl)
To generate a diff of this commit:
cvs rdiff -u -r1.60.4.6 -r1.60.4.7 src/sys/dev/fss.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.60.4.6 src/sys/dev/fss.c:1.60.4.7
--- src/sys/dev/fss.c:1.60.4.6 Thu Aug 23 08:59:47 2012
+++ src/sys/dev/fss.c Sun Jun 9 11:29:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.60.4.6 2012/08/23 08:59:47 bouyer Exp $ */
+/* $NetBSD: fss.c,v 1.60.4.7 2013/06/09 11:29:43 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.60.4.6 2012/08/23 08:59:47 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.60.4.7 2013/06/09 11:29:43 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -221,11 +221,13 @@ fss_close(dev_t dev, int flags, int mode
mflag = (mode == S_IFCHR ? FSS_CDEV_OPEN : FSS_BDEV_OPEN);
error = 0;
+ mutex_enter(fss_device_lock);
restart:
mutex_enter(sc-sc_slock);
if ((sc-sc_flags (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) != mflag) {
sc-sc_flags = ~mflag;
mutex_exit(sc-sc_slock);
+ mutex_exit(fss_device_lock);
return 0;
}
if ((sc-sc_flags FSS_ACTIVE) != 0
@@ -237,12 +239,9 @@ restart:
}
if ((sc-sc_flags FSS_ACTIVE) != 0) {
mutex_exit(sc-sc_slock);
+ mutex_exit(fss_device_lock);
return error;
}
- if (! mutex_tryenter(fss_device_lock)) {
- mutex_exit(sc-sc_slock);
- goto restart;
- }
KASSERT((sc-sc_flags FSS_ACTIVE) == 0);
KASSERT((sc-sc_flags (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) == mflag);
CVS commit: [netbsd-5] src/sys/arch
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:44:04 UTC 2013 Modified Files: src/sys/arch/amd64/conf [netbsd-5]: XEN3_DOMU src/sys/arch/i386/conf [netbsd-5]: XEN2_DOMU Log Message: Apply patch (requested by sborrill in ticket #1858): sys/arch/amd64/conf/XEN3_DOMU sys/arch/i386/conf/Attic/XEN2_DOMU Add wedge support in DOMU kernels. To generate a diff of this commit: cvs rdiff -u -r1.13.4.3 -r1.13.4.4 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.19.4.3 -r1.19.4.4 src/sys/arch/i386/conf/XEN2_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.3 src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.4 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.3 Sun Jan 13 16:46:22 2013 +++ src/sys/arch/amd64/conf/XEN3_DOMU Sun Jun 9 11:44:04 2013 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.13.4.3 2013/01/13 16:46:22 bouyer Exp $ +# $NetBSD: XEN3_DOMU,v 1.13.4.4 2013/06/09 11:44:04 msaitoh Exp $ include arch/amd64/conf/std.xen @@ -68,6 +68,13 @@ options COMPAT_LINUX32 # req. COMPAT_LI options EXEC_ELF32 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux) Index: src/sys/arch/i386/conf/XEN2_DOMU diff -u src/sys/arch/i386/conf/XEN2_DOMU:1.19.4.3 src/sys/arch/i386/conf/XEN2_DOMU:1.19.4.4 --- src/sys/arch/i386/conf/XEN2_DOMU:1.19.4.3 Sun Jan 13 16:46:22 2013 +++ src/sys/arch/i386/conf/XEN2_DOMU Sun Jun 9 11:44:04 2013 @@ -1,4 +1,4 @@ -# $NetBSD: XEN2_DOMU,v 1.19.4.3 2013/01/13 16:46:22 bouyer Exp $ +# $NetBSD: XEN2_DOMU,v 1.19.4.4 2013/06/09 11:44:04 msaitoh Exp $ include arch/xen/conf/std.xen @@ -86,6 +86,13 @@ options COMPAT_FREEBSD # binary compati #options COMPAT_PECOFF # kernel support to run Win32 apps options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux)
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 11:51:40 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-5]: if_vioif.c
Log Message:
Pull up following revision(s) (requested by minoura in ticket #1861):
sys/dev/pci/if_vioif.c: revision 1.4
Fix a typo, and remove an unused member.
This should fix the problem that recent Qemu dies during configuring a vioif.
Fixes PR#47780.
To generate a diff of this commit:
cvs rdiff -u -r1.2.6.2 -r1.2.6.3 src/sys/dev/pci/if_vioif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.2.6.2 src/sys/dev/pci/if_vioif.c:1.2.6.3
--- src/sys/dev/pci/if_vioif.c:1.2.6.2 Wed Jan 25 21:18:15 2012
+++ src/sys/dev/pci/if_vioif.c Sun Jun 9 11:51:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.2.6.2 2012/01/25 21:18:15 riz Exp $ */
+/* $NetBSD: if_vioif.c,v 1.2.6.3 2013/06/09 11:51:40 msaitoh Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.2.6.2 2012/01/25 21:18:15 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.2.6.3 2013/06/09 11:51:40 msaitoh Exp $);
#include bpfilter.h
@@ -155,7 +155,6 @@ struct vioif_softc {
uint8_t sc_mac[ETHER_ADDR_LEN];
struct ethercom sc_ethercom;
- uint32_t sc_features;
short sc_ifflags;
/* bus_dmamem */
@@ -658,7 +657,7 @@ vioif_stop(struct ifnet *ifp, int disabl
vioif_rx_drain(sc);
virtio_reinit_start(vsc);
- virtio_negotiate_features(vsc, sc-sc_features);
+ virtio_negotiate_features(vsc, vsc-sc_features);
virtio_start_vq_intr(vsc, sc-sc_vq[0]);
virtio_stop_vq_intr(vsc, sc-sc_vq[1]);
if (vsc-sc_nvqs = 3)
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:56:20 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1848, 1849, 1851, 1853, 1858 and 1861. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.10 src/doc/CHANGES-5.3:1.1.2.11 --- src/doc/CHANGES-5.3:1.1.2.10 Thu Jun 6 16:49:42 2013 +++ src/doc/CHANGES-5.3 Sun Jun 9 11:56:20 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.10 2013/06/06 16:49:42 riz Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.11 2013/06/09 11:56:20 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -280,3 +280,45 @@ external/mit/xorg/lib/libXi/Makefile p Silence gcc 4.1 warnings from ticket #1865. [mrg, ticket #1866] +etc/MAKEDEV.tmpl1.161 + + The console major number is not always 0; when creating a temporary + console while populating a memory disk, use %CONSOLE_CMAJOR% instead + of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent + major number. + + This fixes a bug that I introduced in revision 1.82 dated 2007-03-11. + [apb, ticket #1848] + +etc/rc.d/wpa_supplicant1.4 + + Make custom reload target work. Before this fix it would have tried + to send a HUP signal to wpa_supplicant instead. + [tron, ticket #1849] + +bin/sh/expand.c 1.88 +bin/sh/expand.h revision 1.19 + + Fix the expansion of $(foo-$bar} so that IFS isn't applied when + expanding $bar. Noted by Greg Troxel on tech-userlevel running some + 'git' tests. Should fix PR bin/47361. + + [gdt, ticket #1851] + +sys/dev/fss.c 1.84 + + Don't crash when running multiple dump -X. PR#47514. + [gdt, ticket #1853] + +sys/arch/amd64/conf/XEN3_DOMU patch +sys/arch/i386/conf/Attic/XEN2_DOMU patch + + Add wedge support in DOMU kernels. + [sborrill, ticket #1858] + +sys/dev/pci/if_vioif.c1.4 + + Fix a typo, and remove an unused member. + This should fix the problem that recent Qemu dies during configuring + a vioif. Fixes PR#47780. + [minoura, ticket #1861]
CVS commit: src/sys/arch/powerpc/isa
Module Name:src
Committed By: kiyohara
Date: Sun Jun 9 12:52:33 UTC 2013
Modified Files:
src/sys/arch/powerpc/isa: isadma_machdep.c
Log Message:
Call kmem_intr_free() with kmem_intr_alloc-ed memory instead of free().
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/isa/isadma_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/isa/isadma_machdep.c
diff -u src/sys/arch/powerpc/isa/isadma_machdep.c:1.8 src/sys/arch/powerpc/isa/isadma_machdep.c:1.9
--- src/sys/arch/powerpc/isa/isadma_machdep.c:1.8 Wed Feb 1 09:54:02 2012
+++ src/sys/arch/powerpc/isa/isadma_machdep.c Sun Jun 9 12:52:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.8 2012/02/01 09:54:02 matt Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.9 2013/06/09 12:52:33 kiyohara Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isadma_machdep.c,v 1.8 2012/02/01 09:54:02 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: isadma_machdep.c,v 1.9 2013/06/09 12:52:33 kiyohara Exp $);
#define ISA_DMA_STATS
@@ -245,7 +245,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t,
out:
if (error) {
if (map-_dm_cookie != NULL)
- free(map-_dm_cookie, M_DMAMAP);
+ kmem_intr_free(cookiestore, cookiesize);
_bus_dmamap_destroy(t, map);
}
return (error);
CVS commit: src/usr.sbin/vnconfig
Module Name:src
Committed By: christos
Date: Sun Jun 9 13:25:41 UTC 2013
Modified Files:
src/usr.sbin/vnconfig: vnconfig.c
Log Message:
Now that we grow vnd's dynamically we cannot depend on the kernel returning
ENXIO when we exceed the number of configured vnds, so in the -l case, print
info for all vnds we can find device nodes for in /dev.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/vnconfig/vnconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/vnconfig/vnconfig.c
diff -u src/usr.sbin/vnconfig/vnconfig.c:1.40 src/usr.sbin/vnconfig/vnconfig.c:1.41
--- src/usr.sbin/vnconfig/vnconfig.c:1.40 Tue Aug 30 16:54:18 2011
+++ src/usr.sbin/vnconfig/vnconfig.c Sun Jun 9 09:25:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vnconfig.c,v 1.40 2011/08/30 20:54:18 joerg Exp $ */
+/* $NetBSD: vnconfig.c,v 1.41 2013/06/09 13:25:40 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -73,11 +73,13 @@
#include sys/buf.h
#include sys/disklabel.h
#include sys/disk.h
+#include sys/bitops.h
#include dev/vndvar.h
#include disktab.h
#include err.h
+#include dirent.h
#include errno.h
#include fcntl.h
#include stddef.h
@@ -86,6 +88,7 @@
#include string.h
#include unistd.h
#include util.h
+#include paths.h
#define VND_CONFIG 1
#define VND_UNCONFIG 2
@@ -97,6 +100,7 @@ static int force = 0;
static int compressed = 0;
static char *tabname;
+static void show(int, int);
static int config(char *, char *, char *, int);
static int getgeom(struct vndgeom *, char *);
__dead static void usage(void);
@@ -157,10 +161,9 @@ main(int argc, char *argv[])
usage();
rv = config(argv[0], NULL, NULL, action);
} else { /* VND_GET */
+ int n, v;
const char *vn;
char path[64];
- struct vnd_user vnu;
- int v, n;
if (argc != 0 argc != 1)
usage();
@@ -171,66 +174,83 @@ main(int argc, char *argv[])
if (v == -1)
err(1, open: %s, vn);
- for (n = 0; ; n++) {
- vnu.vnu_unit = argc ? -1 : n;
- rv = ioctl(v, VNDIOCGET, vnu);
- if (rv == -1) {
-if (errno == ENXIO)
- break;
-err(1, VNDIOCGET);
+ if (argc)
+ show(v, -1);
+ else {
+ DIR *dirp;
+ struct dirent *dp;
+ __BITMAP_TYPE(, uint32_t, 65536) bm;
+
+ __BITMAP_ZERO(bm);
+
+ if ((dirp = opendir(_PATH_DEV)) == NULL)
+err(1, opendir: %s, _PATH_DEV);
+
+ while ((dp = readdir(dirp)) != NULL) {
+if (strncmp(dp-d_name, rvnd, 4) != 0)
+ continue;
+n = atoi(dp-d_name + 4);
+if (__BITMAP_ISSET(n, bm))
+ continue;
+__BITMAP_SET(n, bm);
+show(v, n);
}
- if (vnu.vnu_ino == 0)
-printf(vnd%d: not in use\n,
-vnu.vnu_unit);
- else {
-char *dev;
-struct statvfs *mnt = NULL;
-int i, nmount;
-
-nmount = 0; /* XXXGCC -Wuninitialized */
-
-printf(vnd%d: , vnu.vnu_unit);
-
-dev = devname(vnu.vnu_dev, S_IFBLK);
-if (dev != NULL)
- nmount = getmntinfo(mnt, MNT_NOWAIT);
-else
- mnt = NULL;
-if (mnt != NULL) {
- for (i = 0; i nmount; i++) {
- if (strncmp(
- mnt[i].f_mntfromname,
- /dev/, 5) == 0
- strcmp(
- mnt[i].f_mntfromname + 5,
- dev) == 0)
- break;
- }
- if (i nmount)
- printf(%s (%s) ,
- mnt[i].f_mntonname,
- mnt[i].f_mntfromname);
- else
- printf(%s , dev);
-}
-else if (dev != NULL)
- printf(%s , dev);
-else
- printf(dev %llu,%llu ,
- (unsigned long long)major(vnu.vnu_dev),
- (unsigned long long)minor(vnu.vnu_dev));
+ closedir(dirp);
+ }
+ close(v);
+ rv = 0;
+ }
+ return rv;
+}
-printf(inode %llu\n,
-(unsigned long long)vnu.vnu_ino);
- }
+static void
+show(int v, int n)
+{
+ struct vnd_user vnu;
+ char *dev;
+ struct statvfs *mnt;
+ int i, nmount;
+
+ vnu.vnu_unit = n;
+ if (ioctl(v, VNDIOCGET, vnu) == -1)
+ err(1, VNDIOCGET);
+
+ if (vnu.vnu_ino == 0) {
+ printf(vnd%d: not in use\n, vnu.vnu_unit);
+ return;
+ }
- if (argc)
+ printf(vnd%d: , vnu.vnu_unit);
+
+ dev = devname(vnu.vnu_dev, S_IFBLK);
+ if (dev != NULL)
+ nmount = getmntinfo(mnt, MNT_NOWAIT);
+ else {
+ mnt = NULL;
+ nmount = 0;
+ }
+
+ if (mnt != NULL) {
+ for (i = 0; i nmount; i++) {
+ if (strncmp(mnt[i].f_mntfromname, /dev/, 5) == 0
+ strcmp(mnt[i].f_mntfromname + 5, dev) == 0)
break;
}
- close(v);
+ if (i nmount)
+ printf(%s (%s) , mnt[i].f_mntonname,
+ mnt[i].f_mntfromname);
+ else
+ printf(%s , dev);
}
- exit(rv);
+ else if (dev != NULL)
+ printf(%s , dev);
+ else
+ printf(dev %llu,%llu ,
+ (unsigned long long)major(vnu.vnu_dev),
+ (unsigned long long)minor(vnu.vnu_dev));
+
+ printf(inode %llu\n, (unsigned long long)vnu.vnu_ino);
}
static int
CVS commit: src/sys/dev
Module Name:src Committed By: christos Date: Sun Jun 9 13:26:25 UTC 2013 Modified Files: src/sys/dev: vnd.c Log Message: Never return ENXIO in ioctl anymore. We don't have a fixed number of vnd's configured. To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/sys/dev/vnd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/vnd.c diff -u src/sys/dev/vnd.c:1.224 src/sys/dev/vnd.c:1.225 --- src/sys/dev/vnd.c:1.224 Mon Jun 3 17:01:18 2013 +++ src/sys/dev/vnd.c Sun Jun 9 09:26:25 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vnd.c,v 1.224 2013/06/03 21:01:18 christos Exp $ */ +/* $NetBSD: vnd.c,v 1.225 2013/06/09 13:26:25 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. @@ -91,7 +91,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vnd.c,v 1.224 2013/06/03 21:01:18 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: vnd.c,v 1.225 2013/06/09 13:26:25 christos Exp $); #if defined(_KERNEL_OPT) #include opt_vnd.h @@ -953,7 +953,7 @@ vnd_cget(struct lwp *l, int unit, int *u vnd = device_lookup_private(vnd_cd, *un); if (vnd == NULL) - return (*un = vnd_cd.cd_ndevs) ? ENXIO : -1; + return -1; if ((vnd-sc_flags VNF_INITED) == 0) return -1;
CVS commit: [netbsd-5] src/dist/nvi/common
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 16:03:04 UTC 2013
Modified Files:
src/dist/nvi/common [netbsd-5]: conv.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1845):
dist/nvi/common/conv.c: revision 1.7
It is ridiculous to truncate files on character conversions without
warning and a chance for recovery. This patch sets the handler to
copy the character, clear the error and proceed instead of bailing
out.
To replicate:
- unset LANG
- Create a file that has ~1000 lines. Put a single bad character
- '\344' in it, around 2/3rds of the file down. Save it.
- export LANG=en_US.UTF-8
- edit the file. Notice there is no error for input conversion,
since nvi reads the file opportunistically.
- :w Boom, the file is truncated.
Alternatively, you can put that character in the first line of the file,
and watch the fireworks. If you like to restore the previous behavior
compile with -DERROR_ON_CONVERT
XXX: Pullup to 6, 5 etc.
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.2 -r1.3.6.3 src/dist/nvi/common/conv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/common/conv.c
diff -u src/dist/nvi/common/conv.c:1.3.6.2 src/dist/nvi/common/conv.c:1.3.6.3
--- src/dist/nvi/common/conv.c:1.3.6.2 Tue Jan 20 02:47:43 2009
+++ src/dist/nvi/common/conv.c Sun Jun 9 16:03:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: conv.c,v 1.3.6.2 2009/01/20 02:47:43 snj Exp $ */
+/* $NetBSD: conv.c,v 1.3.6.3 2013/06/09 16:03:04 msaitoh Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -62,6 +62,21 @@ raw2int(SCR *sp, const char * str, ssize
return 0;
}
+#ifndef ERROR_ON_CONVERT
+#define HANDLE_ICONV_ERROR(o, i, ol, il) do {\
+ *o++ = *i++; \
+ ol--; il--; \
+ } while (/*CONSTCOND*/0)
+#define HANDLE_MBR_ERROR(n, mbs, d, s) do {\
+ d = s; \
+ MEMSET(mbs, 0, 1); \
+ n = 1; \
+ } while (/*CONSTCOND*/0)
+#else
+#define HANDLE_ICONV_ERROR goto err
+#define HANDLE_MBR_ERROR goto err
+#endif
+
#define CONV_BUFFER_SIZE512
/* fill the buffer with codeset encoding of string pointed to by str
* left has the number of bytes left in str and is adjusted
@@ -74,9 +89,9 @@ raw2int(SCR *sp, const char * str, ssize
char *bp = buffer; \
outleft = CONV_BUFFER_SIZE; \
errno = 0; \
- if (iconv(id, (const char **)str, left, bp, outleft) == -1 \
- /* errno != E2BIG */)\
- goto err; \
+ if (iconv(id, (const char **)str, left, bp, outleft) \
+ == (size_t)-1 /* errno != E2BIG */) \
+ HANDLE_ICONV_ERROR(bp, str, outleft, left); \
if ((len = CONV_BUFFER_SIZE - outleft) == 0) { \
error = -left; \
goto err; \
@@ -118,8 +133,9 @@ default_char2int(SCR *sp, const char * s
for (i = 0, j = 0; j len; ) {
n = mbrtowc((*tostr)+i, src+j, len-j, mbs);
/* NULL character converted */
- if (n == -2) error = -(len-j);
- if (n == -1 || n == -2) goto err;
+ if (n == (size_t)-2) error = -(len-j);
+ if (n == (size_t)-1 || n == (size_t)-2)
+ HANDLE_MBR_ERROR(n, mbs, (*tostr)[i], src[j]);
if (n == 0) n = 1;
j += n;
if (++i = *blen) {
@@ -242,8 +258,8 @@ default_int2char(SCR *sp, const CHAR_T *
} \
errno = 0; \
if (iconv(id, bp, len, obp, outleft) == -1 \
- errno != E2BIG) \
- goto err; \
+ errno != E2BIG) \
+ HANDLE_ICONV_ERROR(obp, bp, outleft, len); \
offset = cw-blen1 - outleft; \
} \
} while (0)
@@ -267,7 +283,8 @@ default_int2char(SCR *sp, const CHAR_T *
for (i = 0, j = 0; i len; ++i) {
n = wcrtomb(dst+j, str[i], mbs);
- if (n == -1) goto err;
+ if (n == (size_t)-1)
+ HANDLE_MBR_ERROR(n, mbs, dst[j], str[i]);
j += n;
if (buflen j + MB_CUR_MAX) {
if (id != (iconv_t)-1) {
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:04:40 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1845 cleanup. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.11 src/doc/CHANGES-5.3:1.1.2.12 --- src/doc/CHANGES-5.3:1.1.2.11 Sun Jun 9 11:56:20 2013 +++ src/doc/CHANGES-5.3 Sun Jun 9 16:04:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.11 2013/06/09 11:56:20 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.12 2013/06/09 16:04:40 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -297,7 +297,7 @@ etc/rc.d/wpa_supplicant1.4 [tron, ticket #1849] bin/sh/expand.c 1.88 -bin/sh/expand.h revision 1.19 +bin/sh/expand.h 1.19 Fix the expansion of $(foo-$bar} so that IFS isn't applied when expanding $bar. Noted by Greg Troxel on tech-userlevel running some @@ -322,3 +322,9 @@ sys/dev/pci/if_vioif.c1.4 This should fix the problem that recent Qemu dies during configuring a vioif. Fixes PR#47780. [minoura, ticket #1861] + +dist/nvi/common/conv.c1.7 via patch + + Don't truncate files on character conversions without warning + and a chance for recovery. + [christos, ticket #1845]
CVS commit: [netbsd-5-1] src/etc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:12:46 UTC 2013 Modified Files: src/etc [netbsd-5-1]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by apb in ticket #1848): etc/MAKEDEV.tmpl: revision 1.161 The console major number is not always 0; when creating a temporary console while populating a memory disk, use %CONSOLE_CMAJOR% instead of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent major number. This fixes a bug that I introduced in revision 1.82 dated 2007-03-11. To generate a diff of this commit: cvs rdiff -u -r1.113.2.7 -r1.113.2.7.2.1 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.113.2.7 src/etc/MAKEDEV.tmpl:1.113.2.7.2.1 --- src/etc/MAKEDEV.tmpl:1.113.2.7 Sat Sep 26 19:52:09 2009 +++ src/etc/MAKEDEV.tmpl Sun Jun 9 16:12:46 2013 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.113.2.7 2009/09/26 19:52:09 snj Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.113.2.7.2.1 2013/06/09 16:12:46 msaitoh Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -2129,7 +2129,7 @@ create_mfs_dev() if $do_redirect; then # Redirect stdout and stderr to console - mknod -m 600 -g 0 -u 0 temp_console c 0 0 + mknod -m 600 -g 0 -u 0 temp_console c %CONSOLE_CMAJOR% 0 exec temp_console 21 rm temp_console fi
CVS commit: [netbsd-5-2] src/etc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:14:49 UTC 2013 Modified Files: src/etc [netbsd-5-2]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by apb in ticket #1848): etc/MAKEDEV.tmpl: revision 1.161 The console major number is not always 0; when creating a temporary console while populating a memory disk, use %CONSOLE_CMAJOR% instead of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent major number. This fixes a bug that I introduced in revision 1.82 dated 2007-03-11. To generate a diff of this commit: cvs rdiff -u -r1.113.2.8 -r1.113.2.8.2.1 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.113.2.8 src/etc/MAKEDEV.tmpl:1.113.2.8.2.1 --- src/etc/MAKEDEV.tmpl:1.113.2.8 Fri May 20 19:21:32 2011 +++ src/etc/MAKEDEV.tmpl Sun Jun 9 16:14:49 2013 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.113.2.8 2011/05/20 19:21:32 bouyer Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.113.2.8.2.1 2013/06/09 16:14:49 msaitoh Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -2129,7 +2129,7 @@ create_mfs_dev() if $do_redirect; then # Redirect stdout and stderr to console - mknod -m 600 -g 0 -u 0 temp_console c 0 0 + mknod -m 600 -g 0 -u 0 temp_console c %CONSOLE_CMAJOR% 0 exec temp_console 21 rm temp_console fi
CVS commit: [netbsd-5-1] src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 16:18:57 UTC 2013
Modified Files:
src/sys/dev [netbsd-5-1]: fss.c
Log Message:
Pull up following revision(s) (requested by gdt in ticket #1853):
sys/dev/fss.c: revision 1.84
Take fss_device_lock first when closing a fss device.
Fixes PR kern/47514 (Multiple dump -X triggers kernel panic in fss_ioctl)
To generate a diff of this commit:
cvs rdiff -u -r1.60.4.3 -r1.60.4.3.2.1 src/sys/dev/fss.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.60.4.3 src/sys/dev/fss.c:1.60.4.3.2.1
--- src/sys/dev/fss.c:1.60.4.3 Sun Mar 28 17:26:26 2010
+++ src/sys/dev/fss.c Sun Jun 9 16:18:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.60.4.3 2010/03/28 17:26:26 snj Exp $ */
+/* $NetBSD: fss.c,v 1.60.4.3.2.1 2013/06/09 16:18:57 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.60.4.3 2010/03/28 17:26:26 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.60.4.3.2.1 2013/06/09 16:18:57 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -220,11 +220,13 @@ fss_close(dev_t dev, int flags, int mode
mflag = (mode == S_IFCHR ? FSS_CDEV_OPEN : FSS_BDEV_OPEN);
error = 0;
+ mutex_enter(fss_device_lock);
restart:
mutex_enter(sc-sc_slock);
if ((sc-sc_flags (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) != mflag) {
sc-sc_flags = ~mflag;
mutex_exit(sc-sc_slock);
+ mutex_exit(fss_device_lock);
return 0;
}
if ((sc-sc_flags FSS_ACTIVE) != 0
@@ -236,12 +238,9 @@ restart:
}
if ((sc-sc_flags FSS_ACTIVE) != 0) {
mutex_exit(sc-sc_slock);
+ mutex_exit(fss_device_lock);
return error;
}
- if (! mutex_tryenter(fss_device_lock)) {
- mutex_exit(sc-sc_slock);
- goto restart;
- }
KASSERT((sc-sc_flags FSS_ACTIVE) == 0);
KASSERT((sc-sc_flags (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) == mflag);
CVS commit: [netbsd-5-2] src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 16:20:29 UTC 2013
Modified Files:
src/sys/dev [netbsd-5-2]: fss.c
Log Message:
Pull up following revision(s) (requested by gdt in ticket #1853):
sys/dev/fss.c: revision 1.84
Take fss_device_lock first when closing a fss device.
Fixes PR kern/47514 (Multiple dump -X triggers kernel panic in fss_ioctl)
To generate a diff of this commit:
cvs rdiff -u -r1.60.4.6 -r1.60.4.6.2.1 src/sys/dev/fss.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.60.4.6 src/sys/dev/fss.c:1.60.4.6.2.1
--- src/sys/dev/fss.c:1.60.4.6 Thu Aug 23 08:59:47 2012
+++ src/sys/dev/fss.c Sun Jun 9 16:20:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.60.4.6 2012/08/23 08:59:47 bouyer Exp $ */
+/* $NetBSD: fss.c,v 1.60.4.6.2.1 2013/06/09 16:20:29 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.60.4.6 2012/08/23 08:59:47 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.60.4.6.2.1 2013/06/09 16:20:29 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -221,11 +221,13 @@ fss_close(dev_t dev, int flags, int mode
mflag = (mode == S_IFCHR ? FSS_CDEV_OPEN : FSS_BDEV_OPEN);
error = 0;
+ mutex_enter(fss_device_lock);
restart:
mutex_enter(sc-sc_slock);
if ((sc-sc_flags (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) != mflag) {
sc-sc_flags = ~mflag;
mutex_exit(sc-sc_slock);
+ mutex_exit(fss_device_lock);
return 0;
}
if ((sc-sc_flags FSS_ACTIVE) != 0
@@ -237,12 +239,9 @@ restart:
}
if ((sc-sc_flags FSS_ACTIVE) != 0) {
mutex_exit(sc-sc_slock);
+ mutex_exit(fss_device_lock);
return error;
}
- if (! mutex_tryenter(fss_device_lock)) {
- mutex_exit(sc-sc_slock);
- goto restart;
- }
KASSERT((sc-sc_flags FSS_ACTIVE) == 0);
KASSERT((sc-sc_flags (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) == mflag);
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:21:44 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Ticket 1848 and 1853. To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-5.2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.8 src/doc/CHANGES-5.2.1:1.1.2.9 --- src/doc/CHANGES-5.2.1:1.1.2.8 Thu Jun 6 16:48:02 2013 +++ src/doc/CHANGES-5.2.1 Sun Jun 9 16:21:44 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.8 2013/06/06 16:48:02 riz Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.9 2013/06/09 16:21:44 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -166,3 +166,12 @@ external/mit/xorg/lib/libXi/Makefile p Silence gcc 4.1 warnings from ticket #1865. [mrg, ticket #1866] +etc/MAKEDEV.tmpl1.161 + + The console major number is not always 0. + [apb, ticket #1848] + +sys/dev/fss.c 1.84 + + Don't crash when running multiple dump -X. PR#47514. + [gdt, ticket #1853]
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:21:16 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1848 and 1853 To generate a diff of this commit: cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.40 src/doc/CHANGES-5.1.3:1.1.2.41 --- src/doc/CHANGES-5.1.3:1.1.2.40 Thu Jun 6 16:48:58 2013 +++ src/doc/CHANGES-5.1.3 Sun Jun 9 16:21:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.40 2013/06/06 16:48:58 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.41 2013/06/09 16:21:16 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2452,3 +2452,12 @@ external/mit/xorg/lib/libXi/Makefile p Silence gcc 4.1 warnings from ticket #1865. [mrg, ticket #1866] +etc/MAKEDEV.tmpl1.161 + + The console major number is not always 0. + [apb, ticket #1848] + +sys/dev/fss.c 1.84 + + Don't crash when running multiple dump -X. PR#47514. + [gdt, ticket #1853]
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:31:55 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Cleanup. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.12 src/doc/CHANGES-5.3:1.1.2.13 --- src/doc/CHANGES-5.3:1.1.2.12 Sun Jun 9 16:04:40 2013 +++ src/doc/CHANGES-5.3 Sun Jun 9 16:31:55 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.12 2013/06/09 16:04:40 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.13 2013/06/09 16:31:55 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -282,12 +282,7 @@ external/mit/xorg/lib/libXi/Makefile p etc/MAKEDEV.tmpl1.161 - The console major number is not always 0; when creating a temporary - console while populating a memory disk, use %CONSOLE_CMAJOR% instead - of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent - major number. - - This fixes a bug that I introduced in revision 1.82 dated 2007-03-11. + The console major number is not always 0. [apb, ticket #1848] etc/rc.d/wpa_supplicant1.4 @@ -302,7 +297,6 @@ bin/sh/expand.h 1.19 Fix the expansion of $(foo-$bar} so that IFS isn't applied when expanding $bar. Noted by Greg Troxel on tech-userlevel running some 'git' tests. Should fix PR bin/47361. - [gdt, ticket #1851] sys/dev/fss.c 1.84
CVS commit: src/gnu/dist/groff/tmac
Module Name:src Committed By: wiz Date: Sun Jun 9 16:32:43 UTC 2013 Modified Files: src/gnu/dist/groff/tmac: groff_mdoc.man Log Message: Describe another use for .Cm. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/gnu/dist/groff/tmac/groff_mdoc.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/groff/tmac/groff_mdoc.man diff -u src/gnu/dist/groff/tmac/groff_mdoc.man:1.17 src/gnu/dist/groff/tmac/groff_mdoc.man:1.18 --- src/gnu/dist/groff/tmac/groff_mdoc.man:1.17 Tue Feb 21 10:43:46 2012 +++ src/gnu/dist/groff/tmac/groff_mdoc.man Sun Jun 9 16:32:43 2013 @@ -44,7 +44,7 @@ .\ for an already extremely slow package. .\ . -.Dd November 17, 2009 +.Dd June 9, 2013 .Os .Dt GROFF_MDOC 7 . @@ -1272,7 +1272,8 @@ macro does not assert a dash in front of Traditionally flags are marked by the preceding dash, however, some commands or subsets of commands do not use them. Command modifiers may also be specified in conjunction with interactive -commands such as editor commands. +commands such as editor commands, or used for fixed command strings given +on the command line to change program behaviour. See .Sx Flags . .Pp
CVS commit: [netbsd-5] src/sys/netinet
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 16:39:43 UTC 2013
Modified Files:
src/sys/netinet [netbsd-5]: ip_icmp.c
Log Message:
Pull up following revision(s) (requested by fair in ticket #1855):
sys/netinet/ip_icmp.c: revision 1.130
PR/47693: Erik E. Fair: Add missing code to icmp handling.
- While there, add the rest of the missing codes
- Merge groups
- Fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.120.6.1 src/sys/netinet/ip_icmp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.120 src/sys/netinet/ip_icmp.c:1.120.6.1
--- src/sys/netinet/ip_icmp.c:1.120 Wed Jun 18 09:06:28 2008
+++ src/sys/netinet/ip_icmp.c Sun Jun 9 16:39:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.120 2008/06/18 09:06:28 yamt Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.120.6.1 2013/06/09 16:39:43 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,7 +94,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_icmp.c,v 1.120 2008/06/18 09:06:28 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_icmp.c,v 1.120.6.1 2013/06/09 16:39:43 msaitoh Exp $);
#include opt_ipsec.h
@@ -451,45 +451,42 @@ icmp_input(struct mbuf *m, ...)
case ICMP_UNREACH:
switch (code) {
- case ICMP_UNREACH_NET:
-code = PRC_UNREACH_NET;
-break;
-
- case ICMP_UNREACH_HOST:
-code = PRC_UNREACH_HOST;
-break;
-
- case ICMP_UNREACH_PROTOCOL:
-code = PRC_UNREACH_PROTOCOL;
-break;
+ case ICMP_UNREACH_PROTOCOL:
+ code = PRC_UNREACH_PROTOCOL;
+ break;
- case ICMP_UNREACH_PORT:
-code = PRC_UNREACH_PORT;
-break;
+ case ICMP_UNREACH_PORT:
+ code = PRC_UNREACH_PORT;
+ break;
- case ICMP_UNREACH_SRCFAIL:
-code = PRC_UNREACH_SRCFAIL;
-break;
+ case ICMP_UNREACH_SRCFAIL:
+ code = PRC_UNREACH_SRCFAIL;
+ break;
- case ICMP_UNREACH_NEEDFRAG:
-code = PRC_MSGSIZE;
-break;
+ case ICMP_UNREACH_NEEDFRAG:
+ code = PRC_MSGSIZE;
+ break;
- case ICMP_UNREACH_NET_UNKNOWN:
- case ICMP_UNREACH_NET_PROHIB:
- case ICMP_UNREACH_TOSNET:
-code = PRC_UNREACH_NET;
-break;
+ case ICMP_UNREACH_NET:
+ case ICMP_UNREACH_NET_UNKNOWN:
+ case ICMP_UNREACH_NET_PROHIB:
+ case ICMP_UNREACH_TOSNET:
+ code = PRC_UNREACH_NET;
+ break;
- case ICMP_UNREACH_HOST_UNKNOWN:
- case ICMP_UNREACH_ISOLATED:
- case ICMP_UNREACH_HOST_PROHIB:
- case ICMP_UNREACH_TOSHOST:
-code = PRC_UNREACH_HOST;
-break;
+ case ICMP_UNREACH_HOST:
+ case ICMP_UNREACH_HOST_UNKNOWN:
+ case ICMP_UNREACH_ISOLATED:
+ case ICMP_UNREACH_HOST_PROHIB:
+ case ICMP_UNREACH_TOSHOST:
+ case ICMP_UNREACH_ADMIN_PROHIBIT:
+ case ICMP_UNREACH_HOST_PREC:
+ case ICMP_UNREACH_PREC_CUTOFF:
+ code = PRC_UNREACH_HOST;
+ break;
- default:
-goto badcode;
+ default:
+ goto badcode;
}
goto deliver;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:42:06 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1855. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.13 src/doc/CHANGES-5.3:1.1.2.14 --- src/doc/CHANGES-5.3:1.1.2.13 Sun Jun 9 16:31:55 2013 +++ src/doc/CHANGES-5.3 Sun Jun 9 16:42:06 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.13 2013/06/09 16:31:55 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.14 2013/06/09 16:42:06 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -322,3 +322,8 @@ dist/nvi/common/conv.c1.7 via patch Don't truncate files on character conversions without warning and a chance for recovery. [christos, ticket #1845] + +sys/netinet/ip_icmp.c1.130 + + Add missing codes to ICMP handling. PR#47693. + [fair, ticket #1855]
CVS commit: src/sys/ufs
Module Name:src
Committed By: dholland
Date: Sun Jun 9 17:55:46 UTC 2013
Modified Files:
src/sys/ufs/ffs: ffs_bswap.c
src/sys/ufs/ufs: dinode.h inode.h
Log Message:
Remove lfs-only inumber field (and its supporting union) from struct
ufs1_dinode.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/ufs/ffs/ffs_bswap.c
cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/ufs/dinode.h
cvs rdiff -u -r1.64 -r1.65 src/sys/ufs/ufs/inode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_bswap.c
diff -u src/sys/ufs/ffs/ffs_bswap.c:1.36 src/sys/ufs/ffs/ffs_bswap.c:1.37
--- src/sys/ufs/ffs/ffs_bswap.c:1.36 Tue Jan 22 09:39:16 2013
+++ src/sys/ufs/ffs/ffs_bswap.c Sun Jun 9 17:55:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_bswap.c,v 1.36 2013/01/22 09:39:16 dholland Exp $ */
+/* $NetBSD: ffs_bswap.c,v 1.37 2013/06/09 17:55:46 dholland Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -30,7 +30,7 @@
#endif
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_bswap.c,v 1.36 2013/01/22 09:39:16 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_bswap.c,v 1.37 2013/06/09 17:55:46 dholland Exp $);
#include sys/param.h
#if defined(_KERNEL)
@@ -119,8 +119,8 @@ ffs_dinode1_swap(struct ufs1_dinode *o,
n-di_mode = bswap16(o-di_mode);
n-di_nlink = bswap16(o-di_nlink);
- n-di_u.oldids[0] = bswap16(o-di_u.oldids[0]);
- n-di_u.oldids[1] = bswap16(o-di_u.oldids[1]);
+ n-di_oldids[0] = bswap16(o-di_oldids[0]);
+ n-di_oldids[1] = bswap16(o-di_oldids[1]);
n-di_size = bswap64(o-di_size);
n-di_atime = bswap32(o-di_atime);
n-di_atimensec = bswap32(o-di_atimensec);
Index: src/sys/ufs/ufs/dinode.h
diff -u src/sys/ufs/ufs/dinode.h:1.23 src/sys/ufs/ufs/dinode.h:1.24
--- src/sys/ufs/ufs/dinode.h:1.23 Sun Jun 9 00:10:55 2013
+++ src/sys/ufs/ufs/dinode.h Sun Jun 9 17:55:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dinode.h,v 1.23 2013/06/09 00:10:55 dholland Exp $ */
+/* $NetBSD: dinode.h,v 1.24 2013/06/09 17:55:46 dholland Exp $ */
/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -82,10 +82,7 @@
struct ufs1_dinode {
u_int16_t di_mode; /* 0: IFMT, permissions; see below. */
int16_t di_nlink; /* 2: File link count. */
- union {
- u_int16_t oldids[2]; /* 4: Ffs: old user and group ids. */
- u_int32_t inumber; /* 4: Lfs: inode number. */
- } di_u;
+ u_int16_t di_oldids[2]; /* 4: Ffs: old user and group ids. */
u_int64_t di_size; /* 8: File byte count. */
int32_t di_atime; /* 16: Last access time. */
int32_t di_atimensec; /* 20: Last access time. */
@@ -137,8 +134,8 @@ struct ufs2_dinode {
* dev_t value. Short symbolic links place their path in the
* di_db area.
*/
-#define di_ogid di_u.oldids[1]
-#define di_ouid di_u.oldids[0]
+#define di_ogid di_oldids[1]
+#define di_ouid di_oldids[0]
#define di_rdev di_db[0]
#define UFS1_MAXSYMLINKLEN ((UFS_NDADDR + UFS_NIADDR) * sizeof(int32_t))
#define UFS2_MAXSYMLINKLEN ((UFS_NDADDR + UFS_NIADDR) * sizeof(int64_t))
Index: src/sys/ufs/ufs/inode.h
diff -u src/sys/ufs/ufs/inode.h:1.64 src/sys/ufs/ufs/inode.h:1.65
--- src/sys/ufs/ufs/inode.h:1.64 Mon Nov 19 00:36:21 2012
+++ src/sys/ufs/ufs/inode.h Sun Jun 9 17:55:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.h,v 1.64 2012/11/19 00:36:21 jakllsch Exp $ */
+/* $NetBSD: inode.h,v 1.65 2013/06/09 17:55:46 dholland Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -182,8 +182,8 @@ struct inode {
#define i_ffs1_rdev i_din.ffs1_din-di_rdev
#define i_ffs1_size i_din.ffs1_din-di_size
#define i_ffs1_uid i_din.ffs1_din-di_uid
-#define i_ffs1_ouid i_din.ffs1_din-di_u.oldids[0]
-#define i_ffs1_ogid i_din.ffs1_din-di_u.oldids[1]
+#define i_ffs1_ouid i_din.ffs1_din-di_oldids[0]
+#define i_ffs1_ogid i_din.ffs1_din-di_oldids[1]
#define i_ffs2_atime i_din.ffs2_din-di_atime
#define i_ffs2_atimensec i_din.ffs2_din-di_atimensec
CVS commit: src/sys/kern
Module Name:src Committed By: dholland Date: Sun Jun 9 18:29:26 UTC 2013 Modified Files: src/sys/kern: vfs_getcwd.c Log Message: Stick UFS_ in front of these symbols: DIRBLKSIZ DIRECTSIZ DIRSIZ OLDDIRFMT NEWDIRFMT Part of PR 47909. (two stragglers in this commit; oops) To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/kern/vfs_getcwd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/vfs_getcwd.c diff -u src/sys/kern/vfs_getcwd.c:1.48 src/sys/kern/vfs_getcwd.c:1.49 --- src/sys/kern/vfs_getcwd.c:1.48 Mon Nov 5 17:24:11 2012 +++ src/sys/kern/vfs_getcwd.c Sun Jun 9 18:29:25 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_getcwd.c,v 1.48 2012/11/05 17:24:11 dholland Exp $ */ +/* $NetBSD: vfs_getcwd.c,v 1.49 2013/06/09 18:29:25 dholland Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_getcwd.c,v 1.48 2012/11/05 17:24:11 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_getcwd.c,v 1.49 2013/06/09 18:29:25 dholland Exp $); #include sys/param.h #include sys/systm.h @@ -153,7 +153,8 @@ getcwd_scandir(struct vnode **lvpp, stru fileno = va.va_fileid; - dirbuflen = DIRBLKSIZ; + /* I guess UFS_DIRBLKSIZ is a good guess at a good size to use? */ + dirbuflen = UFS_DIRBLKSIZ; if (dirbuflen va.va_blocksize) dirbuflen = va.va_blocksize; dirbuf = kmem_alloc(dirbuflen, KM_SLEEP);
CVS commit: src/sbin/newfs
Module Name:src
Committed By: dholland
Date: Sun Jun 9 18:29:41 UTC 2013
Modified Files:
src/sbin/newfs: mkfs.c
Log Message:
Stick UFS_ in front of these symbols:
DIRBLKSIZ
DIRECTSIZ
DIRSIZ
OLDDIRFMT
NEWDIRFMT
Part of PR 47909.
(two stragglers in this commit; oops)
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sbin/newfs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.114 src/sbin/newfs/mkfs.c:1.115
--- src/sbin/newfs/mkfs.c:1.114 Sun Mar 17 12:25:36 2013
+++ src/sbin/newfs/mkfs.c Sun Jun 9 18:29:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.114 2013/03/17 12:25:36 mlelstv Exp $ */
+/* $NetBSD: mkfs.c,v 1.115 2013/06/09 18:29:41 dholland Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = @(#)mkfs.c 8.11 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: mkfs.c,v 1.114 2013/03/17 12:25:36 mlelstv Exp $);
+__RCSID($NetBSD: mkfs.c,v 1.115 2013/06/09 18:29:41 dholland Exp $);
#endif
#endif /* not lint */
@@ -1253,14 +1253,14 @@ makedir(struct direct *protodir, int ent
{
char *cp;
int i, spcleft;
- int dirblksiz = DIRBLKSIZ;
+ int dirblksiz = UFS_DIRBLKSIZ;
if (isappleufs)
dirblksiz = APPLEUFS_DIRBLKSIZ;
- memset(buf, 0, DIRBLKSIZ);
+ memset(buf, 0, UFS_DIRBLKSIZ);
spcleft = dirblksiz;
for (cp = buf, i = 0; i entries - 1; i++) {
- protodir[i].d_reclen = DIRSIZ(Oflag == 0, protodir[i], 0);
+ protodir[i].d_reclen = UFS_DIRSIZ(Oflag == 0, protodir[i], 0);
copy_dir(protodir[i], (struct direct*)cp);
cp += protodir[i].d_reclen;
spcleft -= protodir[i].d_reclen;
@@ -1539,7 +1539,7 @@ setblock(struct fs *fs, unsigned char *c
static void
copy_dir(struct direct *dir, struct direct *dbuf)
{
- memcpy(dbuf, dir, DIRSIZ(Oflag == 0, dir, 0));
+ memcpy(dbuf, dir, UFS_DIRSIZ(Oflag == 0, dir, 0));
if (needswap) {
dbuf-d_ino = bswap32(dir-d_ino);
dbuf-d_reclen = bswap16(dir-d_reclen);
CVS commit: src/sbin/cgdconfig
Module Name:src
Committed By: christos
Date: Sun Jun 9 18:37:40 UTC 2013
Modified Files:
src/sbin/cgdconfig: cgdconfig.c
Log Message:
List all cgd's no matter if they are not contiguously allocated
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sbin/cgdconfig/cgdconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.34 src/sbin/cgdconfig/cgdconfig.c:1.35
--- src/sbin/cgdconfig/cgdconfig.c:1.34 Tue Dec 4 21:23:20 2012
+++ src/sbin/cgdconfig/cgdconfig.c Sun Jun 9 14:37:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.34 2012/12/05 02:23:20 christos Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.35 2013/06/09 18:37:40 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: cgdconfig.c,v 1.34 2012/12/05 02:23:20 christos Exp $);
+__RCSID($NetBSD: cgdconfig.c,v 1.35 2013/06/09 18:37:40 christos Exp $);
#endif
#include err.h
@@ -45,6 +45,8 @@ __RCSID($NetBSD: cgdconfig.c,v 1.34 201
#include string.h
#include unistd.h
#include util.h
+#include paths.h
+#include dirent.h
#include sys/ioctl.h
#include sys/disklabel.h
@@ -52,6 +54,7 @@ __RCSID($NetBSD: cgdconfig.c,v 1.34 201
#include sys/param.h
#include sys/resource.h
#include sys/statvfs.h
+#include sys/bitops.h
#include dev/cgdvar.h
@@ -999,68 +1002,91 @@ iv_method(int mode)
}
}
+
+static void
+show(const char *dev) {
+ char path[64];
+ struct cgd_user cgu;
+ int fd;
+
+ fd = opendisk(dev, O_RDONLY, path, sizeof(path), 0);
+ if (fd == -1) {
+ warn(open: %s, dev);
+ return;
+ }
+
+ cgu.cgu_unit = -1;
+ if (prog_ioctl(fd, CGDIOCGET, cgu) == -1) {
+ close(fd);
+ err(1, CGDIOCGET);
+ }
+
+ printf(%s: , dev);
+
+ if (cgu.cgu_dev == 0) {
+ printf(not in use);
+ goto out;
+ }
+
+ dev = devname(cgu.cgu_dev, S_IFBLK);
+ if (dev != NULL)
+ printf(%s , dev);
+ else
+ printf(dev %llu,%llu , (unsigned long long)major(cgu.cgu_dev),
+ (unsigned long long)minor(cgu.cgu_dev));
+
+ if (verbose)
+ printf(%s , cgu.cgu_alg);
+ if (verbose 1) {
+ printf(keylen %d , cgu.cgu_keylen);
+ printf(blksize %zd , cgu.cgu_blocksize);
+ printf(%s , iv_method(cgu.cgu_mode));
+ }
+
+out:
+ putchar('\n');
+ close(fd);
+}
+
static int
do_list(int argc, char **argv)
{
- char path[64], buf[16];
- struct cgd_user cgu;
- const char *fn;
- int fd, n, rv;
if (argc != 0 argc != 1)
usage();
- fn = argc ? argv[0] : cgd0;
- n = 0;
- for (;;) {
- fd = opendisk(fn, O_RDONLY, path, sizeof(path), 0);
- if (fd == -1) {
- if (argc)
-err(1, open: %s, fn);
- break;
- }
-
- cgu.cgu_unit = argc ? -1 : n;
- rv = prog_ioctl(fd, CGDIOCGET, cgu);
- if (rv == -1) {
- close(fd);
- err(1, CGDIOCGET);
- }
-
- printf(%s: , fn);
+ if (argc) {
+ show(argv[0]);
+ return 0;
+ }
- if (cgu.cgu_dev == 0)
- printf(not in use);
- else {
- char *dev;
-
- dev = devname(cgu.cgu_dev, S_IFBLK);
- if (dev != NULL)
-printf(%s , dev);
- else
-printf(dev %llu,%llu ,
-(unsigned long long)major(cgu.cgu_dev),
-(unsigned long long)minor(cgu.cgu_dev));
-
- if (verbose)
-printf(%s , cgu.cgu_alg);
- if (verbose 1) {
-printf(keylen %d , cgu.cgu_keylen);
-printf(blksize %zd , cgu.cgu_blocksize);
-printf(%s , iv_method(cgu.cgu_mode));
- }
+ DIR *dirp;
+ struct dirent *dp;
+ __BITMAP_TYPE(, uint32_t, 65536) bm;
+
+ __BITMAP_ZERO(bm);
+
+ if ((dirp = opendir(_PATH_DEV)) == NULL)
+ err(1, opendir: %s, _PATH_DEV);
+
+ while ((dp = readdir(dirp)) != NULL) {
+ char *ep;
+ if (strncmp(dp-d_name, rcgd, 4) != 0)
+ continue;
+ errno = 0;
+ int n = (int)strtol(dp-d_name + 4, ep, 0);
+ if (ep == dp-d_name + 4 || errno != 0) {
+ warnx(bad name %s, dp-d_name);
+ continue;
}
- putchar('\n');
- close(fd);
-
- if (argc)
- break;
-
- n++;
- snprintf(buf, sizeof(buf), cgd%d, n);
- fn = buf;
+ *ep = '\0';
+ if (__BITMAP_ISSET(n, bm))
+ continue;
+ __BITMAP_SET(n, bm);
+ show(dp-d_name + 1);
}
+ closedir(dirp);
return 0;
}
CVS commit: src/usr.sbin/vnconfig
Module Name:src
Committed By: christos
Date: Sun Jun 9 18:39:05 UTC 2013
Modified Files:
src/usr.sbin/vnconfig: Makefile vnconfig.8
Log Message:
Alias this to vndconfig for symmetry.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/vnconfig/Makefile
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/vnconfig/vnconfig.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/vnconfig/Makefile
diff -u src/usr.sbin/vnconfig/Makefile:1.6 src/usr.sbin/vnconfig/Makefile:1.7
--- src/usr.sbin/vnconfig/Makefile:1.6 Sat Nov 30 01:04:57 2002
+++ src/usr.sbin/vnconfig/Makefile Sun Jun 9 14:39:05 2013
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2002/11/30 06:04:57 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2013/06/09 18:39:05 christos Exp $
PROG= vnconfig
MAN= vnconfig.8
DPADD+= ${LIBUTIL}
LDADD+= -lutil
+LINKS+= vnconfig vndconfig
+MLINKS+= vnconfig.8 vndconfig.8
.include bsd.prog.mk
Index: src/usr.sbin/vnconfig/vnconfig.8
diff -u src/usr.sbin/vnconfig/vnconfig.8:1.37 src/usr.sbin/vnconfig/vnconfig.8:1.38
--- src/usr.sbin/vnconfig/vnconfig.8:1.37 Sun Jul 8 18:49:55 2012
+++ src/usr.sbin/vnconfig/vnconfig.8 Sun Jun 9 14:39:05 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: vnconfig.8,v 1.37 2012/07/08 22:49:55 wiz Exp $
+.\ $NetBSD: vnconfig.8,v 1.38 2013/06/09 18:39:05 christos Exp $
.\
.\ Copyright (c) 1997 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -62,10 +62,10 @@
.\ @(#)vnconfig.8 8.1 (Berkeley) 6/5/93
.\
.Dd July 9, 2012
-.Dt VNCONFIG 8
+.Dt VNDCONFIG 8
.Os
.Sh NAME
-.Nm vnconfig
+.Nm vndconfig
.Nd configure vnode disks
.Sh SYNOPSIS
.Nm
@@ -182,23 +182,23 @@ is assumed.
.It Pa /etc/disktab
.El
.Sh EXAMPLES
-.Dl vnconfig vnd0 /tmp/diskimage
+.Dl vndconfig vnd0 /tmp/diskimage
or
-.Dl vnconfig /dev/rvnd0c /tmp/diskimage
+.Dl vndconfig /dev/rvnd0c /tmp/diskimage
.Pp
Configures the vnode disk
.Pa vnd0 .
Please note that use of the second form of the command is discouraged because
it requires knowledge of the raw partition which varies between architectures.
.Pp
-.Dl vnconfig vnd0 /tmp/floppy.img 512/18/2/80
+.Dl vndconfig vnd0 /tmp/floppy.img 512/18/2/80
.Pp
Configures the vnode disk
.Pa vnd0
emulating the geometry of 512 bytes per sector, 18 sectors per track,
2 tracks per cylinder, and 80 cylinders total.
.Pp
-.Dl vnconfig -t floppy vnd0 /tmp/floppy.img
+.Dl vndconfig -t floppy vnd0 /tmp/floppy.img
.Pp
Configures the vnode disk
.Pa vnd0
@@ -207,7 +207,7 @@ using the geometry specified in the
entry in
.Pa /etc/disktab .
.Pp
-.Dl vnconfig -u vnd0
+.Dl vndconfig -u vnd0
.Pp
Unconfigures the
.Pa vnd0
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: christos Date: Sun Jun 9 18:39:31 UTC 2013 Modified Files: src/usr.sbin/vnconfig: vnconfig.8 Log Message: bump date. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/vnconfig/vnconfig.8 diff -u src/usr.sbin/vnconfig/vnconfig.8:1.38 src/usr.sbin/vnconfig/vnconfig.8:1.39 --- src/usr.sbin/vnconfig/vnconfig.8:1.38 Sun Jun 9 14:39:05 2013 +++ src/usr.sbin/vnconfig/vnconfig.8 Sun Jun 9 14:39:31 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: vnconfig.8,v 1.38 2013/06/09 18:39:05 christos Exp $ +.\ $NetBSD: vnconfig.8,v 1.39 2013/06/09 18:39:31 christos Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -61,7 +61,7 @@ .\ .\ @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\ -.Dd July 9, 2012 +.Dd June 9, 2013 .Dt VNDCONFIG 8 .Os .Sh NAME
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Jun 9 18:40:51 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi Log Message: alias vnconfig - vndconfig To generate a diff of this commit: cvs rdiff -u -r1.1030 -r1.1031 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1428 -r1.1429 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1030 src/distrib/sets/lists/base/mi:1.1031 --- src/distrib/sets/lists/base/mi:1.1030 Tue May 28 13:37:33 2013 +++ src/distrib/sets/lists/base/mi Sun Jun 9 14:40:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1030 2013/05/28 17:37:33 joerg Exp $ +# $NetBSD: mi,v 1.1031 2013/06/09 18:40:50 christos Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -1566,6 +1566,7 @@ ./usr/sbin/veriexecgenbase-sysutil-bin ./usr/sbin/vipw base-sysutil-bin ./usr/sbin/vnconfigbase-sysutil-bin +./usr/sbin/vndconfigbase-sysutil-bin ./usr/sbin/wake base-obsolete obsolete ./usr/sbin/wakeonlanbase-netutil-bin ./usr/sbin/wiconfigbase-sysutil-bin Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1428 src/distrib/sets/lists/man/mi:1.1429 --- src/distrib/sets/lists/man/mi:1.1428 Tue May 7 18:51:54 2013 +++ src/distrib/sets/lists/man/mi Sun Jun 9 14:40:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1428 2013/05/07 22:51:54 rkujawa Exp $ +# $NetBSD: mi,v 1.1429 2013/06/09 18:40:50 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3038,6 +3038,7 @@ ./usr/share/man/cat8/virtual.0 man-postfix-catman postfix,.cat ./usr/share/man/cat8/vmstat.0 man-obsolete obsolete ./usr/share/man/cat8/vnconfig.0 man-sysutil-catman .cat +./usr/share/man/cat8/vndconfig.0 man-sysutil-catman .cat ./usr/share/man/cat8/wake.0 man-obsolete obsolete ./usr/share/man/cat8/wakeonlan.0 man-netutil-catman .cat ./usr/share/man/cat8/walnut/MAKEDEV.0 man-obsolete obsolete @@ -5699,6 +5700,7 @@ ./usr/share/man/html8/virecover.html man-sysutil-htmlman html ./usr/share/man/html8/virtual.html man-postfix-htmlman postfix,html ./usr/share/man/html8/vnconfig.html man-sysutil-htmlman html +./usr/share/man/html8/vndconfig.html man-sysutil-htmlman html ./usr/share/man/html8/wake.html man-obsolete obsolete ./usr/share/man/html8/wakeonlan.html man-netutil-htmlman html ./usr/share/man/html8/wdogctl.html man-sysutil-htmlman html @@ -8731,6 +8733,7 @@ ./usr/share/man/man8/virtual.8 man-postfix-man postfix,.man ./usr/share/man/man8/vmstat.8 man-obsolete obsolete ./usr/share/man/man8/vnconfig.8 man-sysutil-man .man +./usr/share/man/man8/vndconfig.8 man-sysutil-man .man ./usr/share/man/man8/wake.8 man-obsolete obsolete ./usr/share/man/man8/wakeonlan.8 man-netutil-man .man ./usr/share/man/man8/walnut/MAKEDEV.8 man-obsolete obsolete
CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: christos
Date: Sun Jun 9 18:54:05 UTC 2013
Modified Files:
src/sys/ufs/ufs: ufs_vnops.c
Log Message:
the speed limit is 80
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/sys/ufs/ufs/ufs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/ufs_vnops.c
diff -u src/sys/ufs/ufs/ufs_vnops.c:1.214 src/sys/ufs/ufs/ufs_vnops.c:1.215
--- src/sys/ufs/ufs/ufs_vnops.c:1.214 Sun Jun 9 13:57:09 2013
+++ src/sys/ufs/ufs/ufs_vnops.c Sun Jun 9 14:54:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vnops.c,v 1.214 2013/06/09 17:57:09 dholland Exp $ */
+/* $NetBSD: ufs_vnops.c,v 1.215 2013/06/09 18:54:05 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.214 2013/06/09 17:57:09 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.215 2013/06/09 18:54:05 christos Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -503,7 +503,8 @@ ufs_setattr(void *v)
action |= KAUTH_VNODE_HAS_SYSFLAGS;
}
- if ((vap-va_flags SF_SETTABLE) != (ip-i_flags SF_SETTABLE)) {
+ if ((vap-va_flags SF_SETTABLE) !=
+ (ip-i_flags SF_SETTABLE)) {
action |= KAUTH_VNODE_WRITE_SYSFLAGS;
changing_sysflags = true;
}
CVS commit: src/common/lib/libc/hash/sha2
Module Name:src
Committed By: christos
Date: Sun Jun 9 19:46:57 UTC 2013
Modified Files:
src/common/lib/libc/hash/sha2: sha2.c
Log Message:
no need for the local defs of he enc functions; compat_defs.h provides them.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/common/lib/libc/hash/sha2/sha2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/hash/sha2/sha2.c
diff -u src/common/lib/libc/hash/sha2/sha2.c:1.23 src/common/lib/libc/hash/sha2/sha2.c:1.24
--- src/common/lib/libc/hash/sha2/sha2.c:1.23 Sat Jun 8 22:58:58 2013
+++ src/common/lib/libc/hash/sha2/sha2.c Sun Jun 9 15:46:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.23 2013/06/09 02:58:58 christos Exp $ */
+/* $NetBSD: sha2.c,v 1.24 2013/06/09 19:46:56 christos Exp $ */
/* $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $ */
/*
@@ -43,7 +43,7 @@
#include sys/cdefs.h
#if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, $NetBSD: sha2.c,v 1.23 2013/06/09 02:58:58 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sha2.c,v 1.24 2013/06/09 19:46:56 christos Exp $);
#include sys/param.h /* XXX: to pull machine/macros.h for vax memset(9) */
#include lib/libkern/libkern.h
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, $NetBSD: sha2.c,v 1.2
#else
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: sha2.c,v 1.23 2013/06/09 02:58:58 christos Exp $);
+__RCSID($NetBSD: sha2.c,v 1.24 2013/06/09 19:46:56 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -62,29 +62,8 @@ __RCSID($NetBSD: sha2.c,v 1.23 2013/06/
#include sys/types.h
#include sys/sha2.h
-#if HAVE_NBTOOL_CONFIG_H
-# if HAVE_SYS_ENDIAN_H
-# include sys/endian.h
-# else
-# undef be32dec
-# undef be64dec
-
-static __inline uint32_t __unused
-be32dec(const void *buf)
-{
- const uint8_t *p = __CAST(const uint8_t *, buf);
-
- return ((p[0] 24) | (p[1] 16) | (p[2] 8) | p[3]);
-}
-
-static __inline uint64_t __unused
-be64dec(const void *buf)
-{
- const uint8_t *p = (const uint8_t *)buf;
-
- return ((__CAST(uint64_t, be32dec(p)) 32) | be32dec(p + 4));
-}
-# endif
+#if HAVE_SYS_ENDIAN_H
+# include sys/endian.h
#endif
/*** SHA-256/384/512 Various Length Definitions ***/
CVS commit: src/usr.sbin/vnconfig
Module Name:src
Committed By: jmmv
Date: Sun Jun 9 22:00:50 UTC 2013
Modified Files:
src/usr.sbin/vnconfig: Makefile
Log Message:
Fix LINKS spec.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/vnconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/vnconfig/Makefile
diff -u src/usr.sbin/vnconfig/Makefile:1.7 src/usr.sbin/vnconfig/Makefile:1.8
--- src/usr.sbin/vnconfig/Makefile:1.7 Sun Jun 9 18:39:05 2013
+++ src/usr.sbin/vnconfig/Makefile Sun Jun 9 22:00:50 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2013/06/09 18:39:05 christos Exp $
+# $NetBSD: Makefile,v 1.8 2013/06/09 22:00:50 jmmv Exp $
PROG= vnconfig
MAN= vnconfig.8
DPADD+= ${LIBUTIL}
LDADD+= -lutil
-LINKS+= vnconfig vndconfig
+LINKS+= ${BINDIR}/vnconfig ${BINDIR}/vndconfig
MLINKS+= vnconfig.8 vndconfig.8
.include bsd.prog.mk
CVS commit: [netbsd-5] src/sys/netinet
Module Name:src
Committed By: msaitoh
Date: Sun Jun 9 22:21:23 UTC 2013
Modified Files:
src/sys/netinet [netbsd-5]: ip_icmp.h
Log Message:
Apply patch (in ticket #1855):
Add some macros. This is a part of ip_icmp.h rev. 1.32.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.4.1 src/sys/netinet/ip_icmp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_icmp.h
diff -u src/sys/netinet/ip_icmp.h:1.25 src/sys/netinet/ip_icmp.h:1.25.4.1
--- src/sys/netinet/ip_icmp.h:1.25 Mon Sep 8 23:36:55 2008
+++ src/sys/netinet/ip_icmp.h Sun Jun 9 22:21:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.h,v 1.25 2008/09/08 23:36:55 gmcgarry Exp $ */
+/* $NetBSD: ip_icmp.h,v 1.25.4.1 2013/06/09 22:21:22 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -144,6 +144,9 @@ struct icmp {
#define ICMP_UNREACH_ADMIN_PROHIBIT 13 /* communication
administratively
prohibited */
+#define ICMP_UNREACH_HOST_PREC 14 /* host precedence
+ violation */
+#define ICMP_UNREACH_PREC_CUTOFF 15 /* precedence cutoff */
#define ICMP_SOURCEQUENCH 4 /* packet lost, slow down */
#define ICMP_REDIRECT 5 /* shorter route, codes: */
#define ICMP_REDIRECT_NET 0 /* for network */
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 22:50:45 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Update ticket 1855. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.14 src/doc/CHANGES-5.3:1.1.2.15 --- src/doc/CHANGES-5.3:1.1.2.14 Sun Jun 9 16:42:06 2013 +++ src/doc/CHANGES-5.3 Sun Jun 9 22:50:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.14 2013/06/09 16:42:06 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.15 2013/06/09 22:50:45 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -324,6 +324,7 @@ dist/nvi/common/conv.c1.7 via patch [christos, ticket #1845] sys/netinet/ip_icmp.c1.130 +sys/netinet/ip_icmp.hpatch Add missing codes to ICMP handling. PR#47693. [fair, ticket #1855]
CVS commit: src/sys/arch/acorn32/stand/nbfs
Module Name:src
Committed By: mrg
Date: Mon Jun 10 02:21:10 UTC 2013
Modified Files:
src/sys/arch/acorn32/stand/nbfs: nbfs.c
Log Message:
s/DIRBLKSIZE/UFS_/.
HI DH! :-)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn32/stand/nbfs/nbfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/stand/nbfs/nbfs.c
diff -u src/sys/arch/acorn32/stand/nbfs/nbfs.c:1.9 src/sys/arch/acorn32/stand/nbfs/nbfs.c:1.10
--- src/sys/arch/acorn32/stand/nbfs/nbfs.c:1.9 Thu May 10 11:03:22 2012
+++ src/sys/arch/acorn32/stand/nbfs/nbfs.c Mon Jun 10 02:21:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nbfs.c,v 1.9 2012/05/10 11:03:22 skrll Exp $ */
+/* $NetBSD: nbfs.c,v 1.10 2013/06/10 02:21:10 mrg Exp $ */
/*-
* Copyright (c) 2006 Ben Harris
@@ -354,7 +354,7 @@ nbfs_func_dirents(struct nbfs_reg *r)
size_t skip = r-r4;
ssize_t off = 0;
size_t buflen = r-r5;
- char dirbuf[DIRBLKSIZ];
+ char dirbuf[UFS_DIRBLKSIZ];
char *outp = (char *)r-r2;
err = nbfs_fopen(f, special, fname);
@@ -367,12 +367,12 @@ nbfs_func_dirents(struct nbfs_reg *r)
err = ENOTDIR;
goto fail;
}
- while (FS_READ(f.f_ops)(f, dirbuf, DIRBLKSIZ, resid) == 0
+ while (FS_READ(f.f_ops)(f, dirbuf, UFS_DIRBLKSIZ, resid) == 0
resid == 0) {
struct direct *dp, *edp;
dp = (struct direct *) dirbuf;
- edp = (struct direct *) (dirbuf + DIRBLKSIZ);
+ edp = (struct direct *) (dirbuf + UFS_DIRBLKSIZ);
for (; dp edp; dp = (void *)((char *)dp + dp-d_reclen)) {
size_t entsiz = 0;
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: mrg
Date: Mon Jun 10 05:01:44 UTC 2013
Modified Files:
src/external/mit/xorg/server: Makefile
Log Message:
check (new) MKXORG_DRIVERS to see if we should build drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/Makefile
diff -u src/external/mit/xorg/server/Makefile:1.6 src/external/mit/xorg/server/Makefile:1.7
--- src/external/mit/xorg/server/Makefile:1.6 Sat Feb 14 12:42:48 2009
+++ src/external/mit/xorg/server/Makefile Mon Jun 10 05:01:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/14 12:42:48 abs Exp $
+# $NetBSD: Makefile,v 1.7 2013/06/10 05:01:44 mrg Exp $
# Makefile for modular-xorg-server and drivers
@@ -7,7 +7,7 @@
.include xorg-server/Makefile.common
SUBDIR= xorg-server
-.if ${XSERVER_XFREE86} != no
+.if ${MKXORG_DRIVERS} != no
SUBDIR+= drivers
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Jun 10 05:02:38 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add a new MKXORG_DRIVERS that defaults to yes on MKXORG platforms
besides acorn26. useful for sets, and avoids overloading the
value of XFREE86_SERVERS.
To generate a diff of this commit:
cvs rdiff -u -r1.732 -r1.733 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.732 src/share/mk/bsd.own.mk:1.733
--- src/share/mk/bsd.own.mk:1.732 Wed Jun 5 07:41:56 2013
+++ src/share/mk/bsd.own.mk Mon Jun 10 05:02:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.732 2013/06/05 07:41:56 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.733 2013/06/10 05:02:38 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -922,6 +922,17 @@ X11FLAVOUR?= Xorg
.endif
#
+# Which platforms build the xorg-server drivers (as opposed
+# to just Xnest and Xvfb.)
+#
+.if ${X11FLAVOUR} == Xorg \
+${MACHINE} == acorn26
+MKXORG_DRIVERS?=no
+.else
+MKXORG_DRIVERS?=yes
+.endif
+
+#
# Force some options off if their dependencies are off.
#
CVS commit: src/distrib/sets
Module Name:src
Committed By: mrg
Date: Mon Jun 10 05:03:20 UTC 2013
Modified Files:
src/distrib/sets: checkflist
Log Message:
also look in ./usr/X11R7/ for x.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/checkflist
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/checkflist
diff -u src/distrib/sets/checkflist:1.43 src/distrib/sets/checkflist:1.44
--- src/distrib/sets/checkflist:1.43 Tue Jan 15 02:46:41 2013
+++ src/distrib/sets/checkflist Mon Jun 10 05:03:20 2013
@@ -1,6 +1,6 @@
#! /bin/sh --
#
-# $NetBSD: checkflist,v 1.43 2013/01/15 02:46:41 christos Exp $
+# $NetBSD: checkflist,v 1.44 2013/06/10 05:03:20 mrg Exp $
#
# Verify output of makeflist against contents of ${DESTDIR} and ${metalog}.
@@ -55,7 +55,7 @@ while getopts xybL:M:em ch; do
case ${ch} in
x)
xargs=-x
- origin=./etc/X11 ./etc/fonts ./usr/X11R6
+ origin=./etc/X11 ./etc/fonts ./usr/X11R6 ./usr/X11R7
;;
y)
xargs=-y
CVS commit: src/distrib/sets
Module Name:src
Committed By: mrg
Date: Mon Jun 10 05:04:01 UTC 2013
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/xcomp: mi
Log Message:
add support for MKXORG_DRIVERS/xorg_drivers keyword, and use it to
mark the xf86-input-mouse files not all platforms use.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/sets.subr
cvs rdiff -u -r1.141 -r1.142 src/distrib/sets/lists/xcomp/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.10 src/distrib/sets/mkvars.mk:1.11
--- src/distrib/sets/mkvars.mk:1.10 Tue Apr 30 20:54:22 2013
+++ src/distrib/sets/mkvars.mk Mon Jun 10 05:04:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.10 2013/04/30 20:54:22 matt Exp $
+# $NetBSD: mkvars.mk,v 1.11 2013/06/10 05:04:00 mrg Exp $
MKEXTRAVARS= \
MACHINE \
@@ -19,6 +19,7 @@ MKEXTRAVARS= \
MKSLJIT \
MKSOFTFLOAT \
MKXORG \
+ MKXORG_DRIVERS \
X11FLAVOR \
USE_INET6 \
USE_KERBEROS \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.149 src/distrib/sets/sets.subr:1.150
--- src/distrib/sets/sets.subr:1.149 Mon May 6 20:38:42 2013
+++ src/distrib/sets/sets.subr Mon Jun 10 05:04:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.149 2013/05/06 20:38:42 joerg Exp $
+# $NetBSD: sets.subr,v 1.150 2013/06/10 05:04:00 mrg Exp $
#
#
@@ -179,7 +179,7 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.149 2013/05/06 20:38:42 joerg Exp $
+# # $NetBSD: sets.subr,v 1.150 2013/06/10 05:04:00 mrg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -257,6 +257,7 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# tpm ${MKTPM} != no
# x11 ${MKX11} != no ${X11FLAVOUR} != Xorg
# xorg ${MKX11} != no ${X11FLAVOUR} == Xorg
+# xorg_drivers ${MKXORG_DRIVERS} != no
# yp ${MKYP} != no
# zfs ${MKZFS} != no
#
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.141 src/distrib/sets/lists/xcomp/mi:1.142
--- src/distrib/sets/lists/xcomp/mi:1.141 Wed Jun 5 09:06:21 2013
+++ src/distrib/sets/lists/xcomp/mi Mon Jun 10 05:04:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.141 2013/06/05 09:06:21 mrg Exp $
+# $NetBSD: mi,v 1.142 2013/06/10 05:04:00 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -5934,7 +5934,7 @@
./usr/X11R7/include/xorg/xaarop.h -unknown- xorg
./usr/X11R7/include/xorg/xf1bpp.h -unknown- obsolete
./usr/X11R7/include/xorg/xf4bpp.h -unknown- obsolete
-./usr/X11R7/include/xorg/xf86-mouse-properties.h -unknown- xorg
+./usr/X11R7/include/xorg/xf86-mouse-properties.h -unknown- xorg,xorg_drivers
./usr/X11R7/include/xorg/xf86.h-unknown- xorg
./usr/X11R7/include/xorg/xf86Crtc.h -unknown- xorg
./usr/X11R7/include/xorg/xf86Cursor.h -unknown- xorg
@@ -6371,7 +6371,7 @@
./usr/X11R7/lib/pkgconfig/xkeyboard-config.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xmu.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xmuu.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/xorg-mouse.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xorg-mouse.pc -unknown- xorg,xorg_drivers
./usr/X11R7/lib/pkgconfig/xorg-server.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xp.pc-obsolete- obsolete
./usr/X11R7/lib/pkgconfig/xpm.pc -unknown- xorg
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Mon Jun 10 05:09:34 UTC 2013 Modified Files: src/etc/mtree: NetBSD.dist.Xorg Log Message: remove xorg directories now marked obsolete. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/etc/mtree/NetBSD.dist.Xorg Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.Xorg diff -u src/etc/mtree/NetBSD.dist.Xorg:1.11 src/etc/mtree/NetBSD.dist.Xorg:1.12 --- src/etc/mtree/NetBSD.dist.Xorg:1.11 Sat Jul 23 12:13:17 2011 +++ src/etc/mtree/NetBSD.dist.Xorg Mon Jun 10 05:09:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.Xorg,v 1.11 2011/07/23 12:13:17 mrg Exp $ +# $NetBSD: NetBSD.dist.Xorg,v 1.12 2013/06/10 05:09:34 mrg Exp $ ./usr/X11R7 ./usr/X11R7/bin @@ -80,8 +80,6 @@ ./usr/X11R7/lib/X11/locale/ja ./usr/X11R7/lib/X11/locale/ja.JIS ./usr/X11R7/lib/X11/locale/ja.SJIS -./usr/X11R7/lib/X11/locale/ja.S90 -./usr/X11R7/lib/X11/locale/ja.U90 ./usr/X11R7/lib/X11/locale/ja_JP.UTF-8 ./usr/X11R7/lib/X11/locale/ko ./usr/X11R7/lib/X11/locale/ko_KR.UTF-8 @@ -124,12 +122,7 @@ ./usr/X11R7/lib/X11/xkb/keycodes ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr ./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr -./usr/X11R7/lib/X11/xkb/keymap -./usr/X11R7/lib/X11/xkb/keymap/digital_vndr -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr -./usr/X11R7/lib/X11/xkb/keymap/sun_vndr ./usr/X11R7/lib/X11/xkb/rules -./usr/X11R7/lib/X11/xkb/semantics ./usr/X11R7/lib/X11/xkb/symbols ./usr/X11R7/lib/X11/xkb/symbols/digital_vndr ./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr
CVS commit: src/share/man/man9
Module Name:src Committed By: mrg Date: Mon Jun 10 05:11:21 UTC 2013 Modified Files: src/share/man/man9: usbdi.9 Log Message: mark several interfaces as internal, most of which have other exported APIs for their use. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/share/man/man9/usbdi.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/usbdi.9 diff -u src/share/man/man9/usbdi.9:1.26 src/share/man/man9/usbdi.9:1.27 --- src/share/man/man9/usbdi.9:1.26 Tue Jan 22 15:52:17 2013 +++ src/share/man/man9/usbdi.9 Mon Jun 10 05:11:20 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: usbdi.9,v 1.26 2013/01/22 15:52:17 wiz Exp $ +.\ $NetBSD: usbdi.9,v 1.27 2013/06/10 05:11:20 mrg Exp $ .\ .\ Copyright (c) 2012 Matthew R. Green .\ All rights reserved. @@ -150,8 +150,9 @@ .Ft int .Fn usbd_get_no_alts usb_config_descriptor_t *iface int ifaceno .Ft usbd_status -.Fn usbd_get_interface usbd_interface_handle iface uint8_t *aiface -.Ft void +.\ unused, delete? +.\ .Fn usbd_get_interface usbd_interface_handle iface uint8_t *aiface +.\ .Ft void .Fn usbd_fill_deviceinfo usbd_device_handle dev struct usb_device_info *di .Ft int .Fn usbd_get_interface_altindex usbd_interface_handle iface @@ -253,8 +254,9 @@ through .Ft usbd_status .Fn usbd_alloc_report_desc usbd_interface_handle ifc void **descp \ int *sizep int mem -.Ft usbd_status -.Fn usbd_get_config usbd_device_handle dev uint8_t *conf +.\ private API between ugen(4) and usbdi(9) +.\ .Ft usbd_status +.\ .Fn usbd_get_config usbd_device_handle dev uint8_t *conf .Ft usbd_status .Fn usbd_get_string_desc usbd_device_handle dev int sindex int langid \ usb_string_descriptor_t *sdesc @@ -388,8 +390,8 @@ macro can be used to match any USB produ .\ .Fn usbd_get_interface_descriptor usbd_interface_handle iface .\ .Fn usbd_get_config_descriptor usbd_device_handle dev .\ .Fn usbd_get_device_descriptor usbd_device_handle dev -.\ .Fn usbd_set_interface usbd_interface_handle iface int altidx .\ .Fn usbd_get_no_alts usb_config_descriptor_t *iface int ifaceno +.\ unused, delete? .\ .Fn usbd_get_interface usbd_interface_handle iface uint8_t *aiface .\ .Fn usbd_fill_deviceinfo usbd_device_handle dev struct usb_device_info *di .\ .Fn usbd_get_interface_altindex usbd_interface_handle iface @@ -465,8 +467,6 @@ macro can be used to match any USB produ .\ .Fn usbd_alloc_report_desc usbd_interface_handle ifc void **descp \ .\ int *sizep int mem .\ .Ft usbd_status -.\ .Fn usbd_get_config usbd_device_handle dev uint8_t *conf -.\ .Ft usbd_status .\ .Fn usbd_get_string_desc usbd_device_handle dev int sindex int langid \ .\ usb_string_descriptor_t *sdesc .\ .Ft void @@ -776,11 +776,15 @@ The available values are: .It Dv UR_SET_ADDRESS .It Dv UR_GET_DESCRIPTOR .It Dv UR_SET_DESCRIPTOR -.It Dv UR_GET_CONFIG -.It Dv UR_SET_CONFIG -.It Dv UR_GET_INTERFACE -.It Dv UR_SET_INTERFACE -.It Dv UR_SYNCH_FRAME +.\ these have API front ends +.\ .It Dv UR_GET_CONFIG +.\ api usbd_get_config() (ugen private) +.\ .It Dv UR_SET_CONFIG +.\ static api usbd_set_config() (usb_subr private) +.\ .It Dv UR_GET_INTERFACE +.\ .It Dv UR_SET_INTERFACE +.\ this isn't supported +.\ .It Dv UR_SYNCH_FRAME .El .Pp The @@ -870,14 +874,13 @@ member may be one of the following value .It Dv UDESC_CS_ENDPOINT .It Dv UDESC_HUB .El -.\.Pp -.\ these have API front ends -.\ .It Dv UR_GET_CONFIG -.\ .It Dv UR_SET_CONFIG -.\ .It Dv UR_GET_INTERFACE -.\ .It Dv UR_SET_INTERFACE -.\ this isn't supported -.\ .It Dv UR_SYNCH_FRAME +.Pp +The +.\ XXXMRG is the below even remotely valid? +.Fn usbd_set_interface +function can be used to change the index used for transfers on this +interface as obtained via +.Fn usbd_device2interface_handle . .Sh USB DEVICE DETACHMENT There are two functions available to ease the detach of active devices. Typically a reference count is maintained on syscall activity.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sun Jun 9 06:28:16 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: OVERO Log Message: Add omapdma. Fix typo. s/expantion/expansion/. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/OVERO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sun Jun 9 06:29:01 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: ARMADAXP Log Message: Comment-out options IPSEC*. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/ARMADAXP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 08:42:16 UTC 2013 Modified Files: src/sys/dev/mii: atphy.c ciphy.c ihphy.c rgephy.c Log Message: atphy, ciphy, ihphy and rgephy are gigabit PHY, so not only check IFM_AUTO for autonegotiation but also check IFM_1000_T, too. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/mii/atphy.c cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mii/ciphy.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/ihphy.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/rgephy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 08:45:32 UTC 2013 Modified Files: src/sys/dev/mii: ciphy.c Log Message: ciphy is gigabit PHY, so use MII_ANEGTICKS_GIGE instead of MII_ANEGTICKS. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/mii/ciphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 09:15:51 UTC 2013 Modified Files: src/sys/dev/mii: exphy.c ihphy.c tlphy.c ukphy.c urlphy.c Log Message: Don't return but break in MII_TICK when the interface isn't doing autonegotiaton or the link is up to update the status. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/dev/mii/exphy.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mii/ihphy.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/mii/tlphy.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mii/ukphy.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/mii/urlphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sbus
Module Name:src Committed By: msaitoh Date: Sun Jun 9 09:23:35 UTC 2013 Modified Files: src/sys/dev/sbus: be.c Log Message: Don't return but break in MII_TICK when the interface isn't doing autonegotiaton or the link is up to update the status. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/dev/sbus/be.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 09:24:29 UTC 2013 Modified Files: src/sys/dev/mii: ukphy.c Log Message: Tabify. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/mii/ukphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 09:31:32 UTC 2013 Modified Files: src/sys/dev/mii: ciphy.c ihphy.c mii_physubr.c rgephy.c urlphy.c Log Message: Update link status quickly. This change is a part of FreeBSD's mii_physubr.c r158649. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/mii/ciphy.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/ihphy.c cvs rdiff -u -r1.76 -r1.77 src/sys/dev/mii/mii_physubr.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/mii/rgephy.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mii/urlphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: njoly Date: Sun Jun 9 09:44:51 UTC 2013 Modified Files: src/sys/dev/ic: siisata.c Log Message: Add missing parenthesis. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/siisata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Jun 9 09:56:17 UTC 2013 Modified Files: src/sys/dev/mii: mii_physubr.c urlphy.c Log Message: Fix a bug in last commit that mii_ticks isn't inclemented. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/mii/mii_physubr.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/urlphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/etc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 10:57:45 UTC 2013 Modified Files: src/etc [netbsd-5]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by apb in ticket #1848): etc/MAKEDEV.tmpl: revision 1.161 The console major number is not always 0; when creating a temporary console while populating a memory disk, use %CONSOLE_CMAJOR% instead of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent major number. This fixes a bug that I introduced in revision 1.82 dated 2007-03-11. To generate a diff of this commit: cvs rdiff -u -r1.113.2.8 -r1.113.2.9 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/etc/rc.d
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:01:41 UTC 2013 Modified Files: src/etc/rc.d [netbsd-5]: wpa_supplicant Log Message: Pull up following revision(s) (requested by tron in ticket #1849): etc/rc.d/wpa_supplicant: revision 1.4 Make custom reload target work. Before this fix it would have tried to send a HUP signal to wpa_supplicant instead. To generate a diff of this commit: cvs rdiff -u -r1.1.26.1 -r1.1.26.2 src/etc/rc.d/wpa_supplicant Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/bin/sh
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:13:11 UTC 2013 Modified Files: src/bin/sh [netbsd-5]: expand.c expand.h Log Message: Pull up following revision(s) (requested by gdt in ticket #1851): bin/sh/expand.c: revision 1.88 bin/sh/expand.h: revision 1.19 Fix the expansion of $(foo-$bar} so that IFS isn't applied when expanding $bar. Noted by Greg Troxel on tech-userlevel running some 'git' tests. Should fix PR bin/47361 To generate a diff of this commit: cvs rdiff -u -r1.79.2.1 -r1.79.2.2 src/bin/sh/expand.c cvs rdiff -u -r1.17 -r1.17.18.1 src/bin/sh/expand.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:29:43 UTC 2013 Modified Files: src/sys/dev [netbsd-5]: fss.c Log Message: Pull up following revision(s) (requested by gdt in ticket #1853): sys/dev/fss.c: revision 1.84 Take fss_device_lock first when closing a fss device. Fixes PR kern/47514 (Multiple dump -X triggers kernel panic in fss_ioctl) To generate a diff of this commit: cvs rdiff -u -r1.60.4.6 -r1.60.4.7 src/sys/dev/fss.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/arch
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:44:04 UTC 2013 Modified Files: src/sys/arch/amd64/conf [netbsd-5]: XEN3_DOMU src/sys/arch/i386/conf [netbsd-5]: XEN2_DOMU Log Message: Apply patch (requested by sborrill in ticket #1858): sys/arch/amd64/conf/XEN3_DOMU sys/arch/i386/conf/Attic/XEN2_DOMU Add wedge support in DOMU kernels. To generate a diff of this commit: cvs rdiff -u -r1.13.4.3 -r1.13.4.4 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.19.4.3 -r1.19.4.4 src/sys/arch/i386/conf/XEN2_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:51:40 UTC 2013 Modified Files: src/sys/dev/pci [netbsd-5]: if_vioif.c Log Message: Pull up following revision(s) (requested by minoura in ticket #1861): sys/dev/pci/if_vioif.c: revision 1.4 Fix a typo, and remove an unused member. This should fix the problem that recent Qemu dies during configuring a vioif. Fixes PR#47780. To generate a diff of this commit: cvs rdiff -u -r1.2.6.2 -r1.2.6.3 src/sys/dev/pci/if_vioif.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 11:56:20 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1848, 1849, 1851, 1853, 1858 and 1861. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/isa
Module Name:src Committed By: kiyohara Date: Sun Jun 9 12:52:33 UTC 2013 Modified Files: src/sys/arch/powerpc/isa: isadma_machdep.c Log Message: Call kmem_intr_free() with kmem_intr_alloc-ed memory instead of free(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/isa/isadma_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: christos Date: Sun Jun 9 13:25:41 UTC 2013 Modified Files: src/usr.sbin/vnconfig: vnconfig.c Log Message: Now that we grow vnd's dynamically we cannot depend on the kernel returning ENXIO when we exceed the number of configured vnds, so in the -l case, print info for all vnds we can find device nodes for in /dev. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/vnconfig/vnconfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: christos Date: Sun Jun 9 13:26:25 UTC 2013 Modified Files: src/sys/dev: vnd.c Log Message: Never return ENXIO in ioctl anymore. We don't have a fixed number of vnd's configured. To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/sys/dev/vnd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/dist/nvi/common
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:03:04 UTC 2013 Modified Files: src/dist/nvi/common [netbsd-5]: conv.c Log Message: Pull up following revision(s) (requested by christos in ticket #1845): dist/nvi/common/conv.c: revision 1.7 It is ridiculous to truncate files on character conversions without warning and a chance for recovery. This patch sets the handler to copy the character, clear the error and proceed instead of bailing out. To replicate: - unset LANG - Create a file that has ~1000 lines. Put a single bad character - '\344' in it, around 2/3rds of the file down. Save it. - export LANG=en_US.UTF-8 - edit the file. Notice there is no error for input conversion, since nvi reads the file opportunistically. - :w Boom, the file is truncated. Alternatively, you can put that character in the first line of the file, and watch the fireworks. If you like to restore the previous behavior compile with -DERROR_ON_CONVERT XXX: Pullup to 6, 5 etc. To generate a diff of this commit: cvs rdiff -u -r1.3.6.2 -r1.3.6.3 src/dist/nvi/common/conv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:04:40 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1845 cleanup. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/etc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:14:49 UTC 2013 Modified Files: src/etc [netbsd-5-2]: MAKEDEV.tmpl Log Message: Pull up following revision(s) (requested by apb in ticket #1848): etc/MAKEDEV.tmpl: revision 1.161 The console major number is not always 0; when creating a temporary console while populating a memory disk, use %CONSOLE_CMAJOR% instead of 0, and let MAKEDEV.awk substitute the appropriate machine-dependent major number. This fixes a bug that I introduced in revision 1.82 dated 2007-03-11. To generate a diff of this commit: cvs rdiff -u -r1.113.2.8 -r1.113.2.8.2.1 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/sys/dev
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:18:57 UTC 2013 Modified Files: src/sys/dev [netbsd-5-1]: fss.c Log Message: Pull up following revision(s) (requested by gdt in ticket #1853): sys/dev/fss.c: revision 1.84 Take fss_device_lock first when closing a fss device. Fixes PR kern/47514 (Multiple dump -X triggers kernel panic in fss_ioctl) To generate a diff of this commit: cvs rdiff -u -r1.60.4.3 -r1.60.4.3.2.1 src/sys/dev/fss.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/sys/dev
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:20:29 UTC 2013 Modified Files: src/sys/dev [netbsd-5-2]: fss.c Log Message: Pull up following revision(s) (requested by gdt in ticket #1853): sys/dev/fss.c: revision 1.84 Take fss_device_lock first when closing a fss device. Fixes PR kern/47514 (Multiple dump -X triggers kernel panic in fss_ioctl) To generate a diff of this commit: cvs rdiff -u -r1.60.4.6 -r1.60.4.6.2.1 src/sys/dev/fss.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:21:44 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Ticket 1848 and 1853. To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-5.2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:21:16 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1848 and 1853 To generate a diff of this commit: cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:31:55 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Cleanup. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/gnu/dist/groff/tmac
Module Name:src Committed By: wiz Date: Sun Jun 9 16:32:43 UTC 2013 Modified Files: src/gnu/dist/groff/tmac: groff_mdoc.man Log Message: Describe another use for .Cm. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/gnu/dist/groff/tmac/groff_mdoc.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/netinet
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:39:43 UTC 2013 Modified Files: src/sys/netinet [netbsd-5]: ip_icmp.c Log Message: Pull up following revision(s) (requested by fair in ticket #1855): sys/netinet/ip_icmp.c: revision 1.130 PR/47693: Erik E. Fair: Add missing code to icmp handling. - While there, add the rest of the missing codes - Merge groups - Fix indentation To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.120.6.1 src/sys/netinet/ip_icmp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 16:42:06 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1855. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs
Module Name:src Committed By: dholland Date: Sun Jun 9 17:55:46 UTC 2013 Modified Files: src/sys/ufs/ffs: ffs_bswap.c src/sys/ufs/ufs: dinode.h inode.h Log Message: Remove lfs-only inumber field (and its supporting union) from struct ufs1_dinode. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/ufs/ffs/ffs_bswap.c cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/ufs/dinode.h cvs rdiff -u -r1.64 -r1.65 src/sys/ufs/ufs/inode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: dholland Date: Sun Jun 9 17:57:09 UTC 2013 Modified Files: src/sbin/fsck_ext2fs: dir.c src/sbin/fsck_ffs: dir.c pass2.c setup.c src/sbin/fsdb: fsdb.c src/sbin/restore: dirs.c src/sys/lib/libsa: ufs.c src/sys/ufs/ffs: ffs_vfsops.c src/sys/ufs/ufs: dir.h dirhash.h ufs_dirhash.c ufs_extattr.c ufs_lookup.c ufs_rename.c ufs_vnops.c src/usr.sbin/makefs: ffs.c Log Message: Stick UFS_ in front of these symbols: DIRBLKSIZ DIRECTSIZ DIRSIZ OLDDIRFMT NEWDIRFMT Part of PR 47909. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_ext2fs/dir.c cvs rdiff -u -r1.54 -r1.55 src/sbin/fsck_ffs/dir.c cvs rdiff -u -r1.49 -r1.50 src/sbin/fsck_ffs/pass2.c cvs rdiff -u -r1.96 -r1.97 src/sbin/fsck_ffs/setup.c cvs rdiff -u -r1.45 -r1.46 src/sbin/fsdb/fsdb.c cvs rdiff -u -r1.49 -r1.50 src/sbin/restore/dirs.c cvs rdiff -u -r1.59 -r1.60 src/sys/lib/libsa/ufs.c cvs rdiff -u -r1.282 -r1.283 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/ufs/dir.h cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/ufs/dirhash.h \ src/sys/ufs/ufs/ufs_rename.c cvs rdiff -u -r1.34 -r1.35 src/sys/ufs/ufs/ufs_dirhash.c cvs rdiff -u -r1.41 -r1.42 src/sys/ufs/ufs/ufs_extattr.c cvs rdiff -u -r1.122 -r1.123 src/sys/ufs/ufs/ufs_lookup.c cvs rdiff -u -r1.213 -r1.214 src/sys/ufs/ufs/ufs_vnops.c cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/makefs/ffs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: dholland Date: Sun Jun 9 18:29:26 UTC 2013 Modified Files: src/sys/kern: vfs_getcwd.c Log Message: Stick UFS_ in front of these symbols: DIRBLKSIZ DIRECTSIZ DIRSIZ OLDDIRFMT NEWDIRFMT Part of PR 47909. (two stragglers in this commit; oops) To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/kern/vfs_getcwd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs
Module Name:src Committed By: dholland Date: Sun Jun 9 18:29:41 UTC 2013 Modified Files: src/sbin/newfs: mkfs.c Log Message: Stick UFS_ in front of these symbols: DIRBLKSIZ DIRECTSIZ DIRSIZ OLDDIRFMT NEWDIRFMT Part of PR 47909. (two stragglers in this commit; oops) To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sbin/newfs/mkfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: christos Date: Sun Jun 9 18:37:40 UTC 2013 Modified Files: src/sbin/cgdconfig: cgdconfig.c Log Message: List all cgd's no matter if they are not contiguously allocated To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sbin/cgdconfig/cgdconfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: christos Date: Sun Jun 9 18:39:31 UTC 2013 Modified Files: src/usr.sbin/vnconfig: vnconfig.8 Log Message: bump date. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: christos Date: Sun Jun 9 18:39:05 UTC 2013 Modified Files: src/usr.sbin/vnconfig: Makefile vnconfig.8 Log Message: Alias this to vndconfig for symmetry. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/vnconfig/Makefile cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Jun 9 18:40:51 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi Log Message: alias vnconfig - vndconfig To generate a diff of this commit: cvs rdiff -u -r1.1030 -r1.1031 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1428 -r1.1429 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: christos Date: Sun Jun 9 18:54:05 UTC 2013 Modified Files: src/sys/ufs/ufs: ufs_vnops.c Log Message: the speed limit is 80 To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/sys/ufs/ufs/ufs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/hash/sha2
Module Name:src Committed By: christos Date: Sun Jun 9 19:46:57 UTC 2013 Modified Files: src/common/lib/libc/hash/sha2: sha2.c Log Message: no need for the local defs of he enc functions; compat_defs.h provides them. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/common/lib/libc/hash/sha2/sha2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: jmmv Date: Sun Jun 9 22:00:50 UTC 2013 Modified Files: src/usr.sbin/vnconfig: Makefile Log Message: Fix LINKS spec. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/vnconfig/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/netinet
Module Name:src Committed By: msaitoh Date: Sun Jun 9 22:21:23 UTC 2013 Modified Files: src/sys/netinet [netbsd-5]: ip_icmp.h Log Message: Apply patch (in ticket #1855): Add some macros. This is a part of ip_icmp.h rev. 1.32. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.4.1 src/sys/netinet/ip_icmp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Sun Jun 9 22:50:45 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Update ticket 1855. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/acorn32/stand/nbfs
Module Name:src Committed By: mrg Date: Mon Jun 10 02:21:10 UTC 2013 Modified Files: src/sys/arch/acorn32/stand/nbfs: nbfs.c Log Message: s/DIRBLKSIZE/UFS_/. HI DH! :-) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn32/stand/nbfs/nbfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server
Module Name:src Committed By: mrg Date: Mon Jun 10 05:01:44 UTC 2013 Modified Files: src/external/mit/xorg/server: Makefile Log Message: check (new) MKXORG_DRIVERS to see if we should build drivers. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Mon Jun 10 05:02:38 UTC 2013 Modified Files: src/share/mk: bsd.own.mk Log Message: add a new MKXORG_DRIVERS that defaults to yes on MKXORG platforms besides acorn26. useful for sets, and avoids overloading the value of XFREE86_SERVERS. To generate a diff of this commit: cvs rdiff -u -r1.732 -r1.733 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
