CVS commit: src/lib/libbluetooth
Module Name:src Committed By: joerg Date: Thu Mar 22 23:46:49 UTC 2012 Modified Files: src/lib/libbluetooth: sdp_data.c Log Message: Use __printflike. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libbluetooth/sdp_data.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libbluetooth/sdp_data.c diff -u src/lib/libbluetooth/sdp_data.c:1.3 src/lib/libbluetooth/sdp_data.c:1.4 --- src/lib/libbluetooth/sdp_data.c:1.3 Thu Sep 15 17:51:57 2011 +++ src/lib/libbluetooth/sdp_data.c Thu Mar 22 23:46:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: sdp_data.c,v 1.3 2011/09/15 17:51:57 plunky Exp $ */ +/* $NetBSD: sdp_data.c,v 1.4 2012/03/22 23:46:49 joerg Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__RCSID("$NetBSD: sdp_data.c,v 1.3 2011/09/15 17:51:57 plunky Exp $"); +__RCSID("$NetBSD: sdp_data.c,v 1.4 2012/03/22 23:46:49 joerg Exp $"); #include #include @@ -325,7 +325,7 @@ sdp_data_valid(const sdp_data_t *data) * * print out a SDP data element list in human readable format */ -static void +static __printflike(3, 4) void _sdp_put(int indent, const char *type, const char *fmt, ...) { va_list ap;
CVS commit: src/external/mit/xorg
Module Name:src Committed By: joerg Date: Thu Mar 22 23:46:28 UTC 2012 Modified Files: src/external/mit/xorg/bin/xsetwallpaper: Makefile src/external/mit/xorg/bin/xterm: Makefile src/external/mit/xorg/bin/xvinfo: Makefile src/external/mit/xorg/lib/dri/i965: Makefile src/external/mit/xorg/lib/dri/libmesa: Makefile src/external/mit/xorg/lib/fontconfig/src: Makefile src/external/mit/xorg/lib/libGL: Makefile src/external/mit/xorg/lib/libOSMesa: Makefile src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile src/external/mit/xorg/server/xorg-server/dix: Makefile Log Message: Disable a bunch of additional warnings for now for the clang build. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/xsetwallpaper/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xterm/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xvinfo/Makefile cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/dri/i965/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/libmesa/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/fontconfig/src/Makefile cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/libGL/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libOSMesa/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/dix/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/bin/xsetwallpaper/Makefile diff -u src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.1 src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.2 --- src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.1 Sat Oct 22 22:06:17 2011 +++ src/external/mit/xorg/bin/xsetwallpaper/Makefile Thu Mar 22 23:46:26 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/10/22 22:06:17 jmcneill Exp $ +# $NetBSD: Makefile,v 1.2 2012/03/22 23:46:26 joerg Exp $ NOMAN= # defined @@ -25,5 +25,7 @@ CPPFLAGS.stb_image.c+= -Wno-sign-compare CPPFLAGS.stb_image.c+= -Wno-missing-prototypes CPPFLAGS.stb_image.c+= -Wno-missing-field-initializers +CWARNFLAGS.clang+= -Wno-missing-noreturn -Wno-self-assign + .include .include Index: src/external/mit/xorg/bin/xterm/Makefile diff -u src/external/mit/xorg/bin/xterm/Makefile:1.8 src/external/mit/xorg/bin/xterm/Makefile:1.9 --- src/external/mit/xorg/bin/xterm/Makefile:1.8 Sun Oct 3 22:06:43 2010 +++ src/external/mit/xorg/bin/xterm/Makefile Thu Mar 22 23:46:26 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/10/03 22:06:43 christos Exp $ +# $NetBSD: Makefile,v 1.9 2012/03/22 23:46:26 joerg Exp $ .include @@ -17,6 +17,8 @@ CPPFLAGS+= -I${X11SRCDIR.${PROG}} \ -D_REENTRANT \ ${X11FLAGS.VERSION} +CWARNFLAGS.clang+= -Wno-empty-body + APPDEFS=XTerm.ad XTerm-color.ad BUILDSYMLINKS= XTerm-col.ad XTerm-color.ad Index: src/external/mit/xorg/bin/xvinfo/Makefile diff -u src/external/mit/xorg/bin/xvinfo/Makefile:1.1.1.1 src/external/mit/xorg/bin/xvinfo/Makefile:1.2 --- src/external/mit/xorg/bin/xvinfo/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xvinfo/Makefile Thu Mar 22 23:46:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2012/03/22 23:46:27 joerg Exp $ .include @@ -9,5 +9,7 @@ DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11} .PATH: ${X11SRCDIR.${PROG}} +CWARNFLAGS.clang+= -Wno-dangling-else + .include .include Index: src/external/mit/xorg/lib/dri/i965/Makefile diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.13 src/external/mit/xorg/lib/dri/i965/Makefile:1.14 --- src/external/mit/xorg/lib/dri/i965/Makefile:1.13 Thu Aug 11 23:15:36 2011 +++ src/external/mit/xorg/lib/dri/i965/Makefile Thu Mar 22 23:46:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2011/08/11 23:15:36 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2012/03/22 23:46:27 joerg Exp $ MODULE= i965 @@ -102,7 +102,7 @@ SRCS= \ gen6_wm_state.c COPTS.brw_draw_upload.c= -Wno-error -CWARNFLAGS.clang+= -Wno-format +CWARNFLAGS.clang+= -Wno-format -Wno-switch LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel Index: src/external/mit/xorg/lib/dri/libmesa/Makefile diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.9 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.10 --- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.9 Thu Aug 11 23:15:36 2011 +++ src/external/mit/xorg/lib/dri/libmesa/Makefile Thu Mar 22 23:46:27 2012 @
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Mar 22 23:05:17 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 126, 134-138. To generate a diff of this commit: cvs rdiff -u -r1.1.2.58 -r1.1.2.59 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.58 src/doc/CHANGES-6.0:1.1.2.59 --- src/doc/CHANGES-6.0:1.1.2.58 Wed Mar 21 16:16:00 2012 +++ src/doc/CHANGES-6.0 Thu Mar 22 23:05:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.58 2012/03/21 16:16:00 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.59 2012/03/22 23:05:17 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -1466,3 +1466,40 @@ sys/dev/raidframe/rf_netbsdkintf.c 1.29 Add the ability to autoconfigure raid components on raw disks. [buhrow, ticket #133] +sys/arch/amd64/amd64/machdep.c 1.180 via patch +sys/arch/i386/i386/machdep.c 1.724 + + Make i386 and amd64 cpu_reboot() more similar, and avoid + triggering an assert in the umass code. + [mrg, ticket #126] + +sys/dev/pci/if_iwi.c1.90 + + Fix iwi(4) firmware decoding on bigendian machines. + [nisimura, ticket #134] + +sys/kern/kern_sysctl.c1.234 + + Fix query of sysctl IMMEDIATE bool values. + [martin, ticket #135] + +sys/dev/ic/mfi.c1.37 + + Fix potential deadlock during autoconf with mfi(4). + [sborrill, ticket #136] + +sys/dev/pci/pcidevs1.1107 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + Add some Symbios SAS devices. + [sborrill, ticket #137] + +sys/dev/ic/mfi.c1.38 +sys/dev/ic/mfireg.h1.5 +sys/dev/ic/mfivar.h1.15 +sys/dev/pci/mfi_pci.c1.13 + + Add support to mfi(4) for skinny variants (e.g. IBM ServeRAID M1015). + [sborrill, ticket #138] +
CVS commit: [netbsd-6] src/sys/dev
Module Name:src Committed By: riz Date: Thu Mar 22 23:04:27 UTC 2012 Modified Files: src/sys/dev/ic [netbsd-6]: mfi.c mfireg.h mfivar.h src/sys/dev/pci [netbsd-6]: mfi_pci.c Log Message: Pull up following revision(s) (requested by sborrill in ticket #138): sys/dev/pci/mfi_pci.c: revision 1.13 sys/dev/ic/mfi.c: revision 1.38 sys/dev/ic/mfivar.h: revision 1.15 sys/dev/ic/mfireg.h: revision 1.5 Add support for skinny variants (e.g. IBM ServeRAID M1015). Based on OpenBSD changes with some improvements. Tested on IBM x3550M3 with RAID0 and RAID1 volumes including bioctl(8) operation. To generate a diff of this commit: cvs rdiff -u -r1.36.8.1 -r1.36.8.2 src/sys/dev/ic/mfi.c cvs rdiff -u -r1.4 -r1.4.16.1 src/sys/dev/ic/mfireg.h cvs rdiff -u -r1.14 -r1.14.16.1 src/sys/dev/ic/mfivar.h cvs rdiff -u -r1.12 -r1.12.16.1 src/sys/dev/pci/mfi_pci.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/mfi.c diff -u src/sys/dev/ic/mfi.c:1.36.8.1 src/sys/dev/ic/mfi.c:1.36.8.2 --- src/sys/dev/ic/mfi.c:1.36.8.1 Thu Mar 22 22:58:23 2012 +++ src/sys/dev/ic/mfi.c Thu Mar 22 23:04:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mfi.c,v 1.36.8.1 2012/03/22 22:58:23 riz Exp $ */ +/* $NetBSD: mfi.c,v 1.36.8.2 2012/03/22 23:04:27 riz Exp $ */ /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom @@ -17,7 +17,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.36.8.1 2012/03/22 22:58:23 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.36.8.2 2012/03/22 23:04:27 riz Exp $"); #include "bio.h" @@ -151,6 +151,20 @@ static const struct mfi_iop_ops mfi_iop_ mfi_gen2_post }; +u_int32_t mfi_skinny_fw_state(struct mfi_softc *); +void mfi_skinny_intr_dis(struct mfi_softc *); +void mfi_skinny_intr_ena(struct mfi_softc *); +int mfi_skinny_intr(struct mfi_softc *); +void mfi_skinny_post(struct mfi_softc *, struct mfi_ccb *); + +static const struct mfi_iop_ops mfi_iop_skinny = { + mfi_skinny_fw_state, + mfi_skinny_intr_dis, + mfi_skinny_intr_ena, + mfi_skinny_intr, + mfi_skinny_post +}; + #define mfi_fw_state(_s) ((_s)->sc_iop->mio_fw_state(_s)) #define mfi_intr_enable(_s) ((_s)->sc_iop->mio_intr_ena(_s)) #define mfi_intr_disable(_s) ((_s)->sc_iop->mio_intr_dis(_s)) @@ -402,11 +416,17 @@ mfi_transition_firmware(struct mfi_softc printf("%s: firmware fault\n", DEVNAME(sc)); return 1; case MFI_STATE_WAIT_HANDSHAKE: - mfi_write(sc, MFI_IDB, MFI_INIT_CLEAR_HANDSHAKE); + if (sc->sc_flags & MFI_IOP_SKINNY) +mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_CLEAR_HANDSHAKE); + else +mfi_write(sc, MFI_IDB, MFI_INIT_CLEAR_HANDSHAKE); max_wait = 2; break; case MFI_STATE_OPERATIONAL: - mfi_write(sc, MFI_IDB, MFI_INIT_READY); + if (sc->sc_flags & MFI_IOP_SKINNY) +mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_READY); + else +mfi_write(sc, MFI_IDB, MFI_INIT_READY); max_wait = 10; break; case MFI_STATE_UNDEFINED: @@ -730,6 +750,9 @@ mfi_attach(struct mfi_softc *sc, enum mf case MFI_IOP_GEN2: sc->sc_iop = &mfi_iop_gen2; break; + case MFI_IOP_SKINNY: + sc->sc_iop = &mfi_iop_skinny; + break; default: panic("%s: unknown iop %d", DEVNAME(sc), iop); } @@ -2233,3 +2256,44 @@ mfi_gen2_post(struct mfi_softc *sc, stru mfi_write(sc, MFI_IQP, 0x1 | ccb->ccb_pframe | (ccb->ccb_extra_frames << 1)); } + +u_int32_t +mfi_skinny_fw_state(struct mfi_softc *sc) +{ + return (mfi_read(sc, MFI_OSP)); +} + +void +mfi_skinny_intr_dis(struct mfi_softc *sc) +{ + mfi_write(sc, MFI_OMSK, 0); +} + +void +mfi_skinny_intr_ena(struct mfi_softc *sc) +{ + mfi_write(sc, MFI_OMSK, ~0x0001); +} + +int +mfi_skinny_intr(struct mfi_softc *sc) +{ + u_int32_t status; + + status = mfi_read(sc, MFI_OSTS); + if (!ISSET(status, MFI_OSTS_SKINNY_INTR_VALID)) + return (0); + + /* write status back to acknowledge interrupt */ + mfi_write(sc, MFI_OSTS, status); + + return (1); +} + +void +mfi_skinny_post(struct mfi_softc *sc, struct mfi_ccb *ccb) +{ + mfi_write(sc, MFI_IQPL, 0x1 | ccb->ccb_pframe | + (ccb->ccb_extra_frames << 1)); + mfi_write(sc, MFI_IQPH, 0x); +} Index: src/sys/dev/ic/mfireg.h diff -u src/sys/dev/ic/mfireg.h:1.4 src/sys/dev/ic/mfireg.h:1.4.16.1 --- src/sys/dev/ic/mfireg.h:1.4 Tue Feb 9 00:05:18 2010 +++ src/sys/dev/ic/mfireg.h Thu Mar 22 23:04:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mfireg.h,v 1.4 2010/02/09 00:05:18 msaitoh Exp $ */ +/* $NetBSD: mfireg.h,v 1.4.16.1 2012/03/22 23:04:27 riz Exp $ */ /* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */ /* * Copyright (c) 2006 Marco Peereboom @@ -46,6 +46,14 @@ #define MFI_ODC 0xa0 /* outbound doorbell clr */ #define MFI_OSP 0xb0 /* outbound scratch pad */ +/* + * skinny specific changes +*/ +#define MFI_SKINNY_IDB0x00 /* Inbound doorbell is at 0x00 for skinny */ +#define MFI_IQPL0x00c0 +#defi
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src Committed By: riz Date: Thu Mar 22 23:01:06 UTC 2012 Modified Files: src/sys/dev/pci [netbsd-6]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #137. To generate a diff of this commit: cvs rdiff -u -r1.1097 -r1.1097.2.1 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1096 -r1.1096.2.1 src/sys/dev/pci/pcidevs_data.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/dev/pci/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.1097 src/sys/dev/pci/pcidevs.h:1.1097.2.1 --- src/sys/dev/pci/pcidevs.h:1.1097 Wed Feb 15 16:27:23 2012 +++ src/sys/dev/pci/pcidevs.h Thu Mar 22 23:01:03 2012 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.1097 2012/02/15 16:27:23 tsutsui Exp $ */ +/* $NetBSD: pcidevs.h,v 1.1097.2.1 2012/03/22 23:01:03 riz Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1102 2012/02/15 16:26:00 tsutsui Exp + * NetBSD */ /* @@ -3402,6 +3402,10 @@ #define PCI_PRODUCT_SYMBIOS_SAS1078 0x0060 /* SAS1078 PCI */ #define PCI_PRODUCT_SYMBIOS_SAS1078_PCIE 0x0062 /* SAS1078 PCI Express */ #define PCI_PRODUCT_SYMBIOS_SAS2008 0x0072 /* SAS2008 */ +#define PCI_PRODUCT_SYMBIOS_SAS2008_1 0x0073 /* MegaRAID SAS2008 */ +#define PCI_PRODUCT_SYMBIOS_SAS2108_3 0x0074 /* SAS2108 */ +#define PCI_PRODUCT_SYMBIOS_SAS2108_4 0x0076 /* SAS2108 */ +#define PCI_PRODUCT_SYMBIOS_SAS2108_5 0x0077 /* SAS2108 */ #define PCI_PRODUCT_SYMBIOS_SAS2108_1 0x0078 /* MegaRAID SAS2108 CRYPTO GEN2 */ #define PCI_PRODUCT_SYMBIOS_SAS2108_2 0x0079 /* MegaRAID SAS2108 GEN2 */ #define PCI_PRODUCT_SYMBIOS_SAS1078DE 0x007c /* SAS1078DE */ Index: src/sys/dev/pci/pcidevs_data.h diff -u src/sys/dev/pci/pcidevs_data.h:1.1096 src/sys/dev/pci/pcidevs_data.h:1.1096.2.1 --- src/sys/dev/pci/pcidevs_data.h:1.1096 Wed Feb 15 16:27:24 2012 +++ src/sys/dev/pci/pcidevs_data.h Thu Mar 22 23:01:03 2012 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs_data.h,v 1.1096 2012/02/15 16:27:24 tsutsui Exp $ */ +/* $NetBSD: pcidevs_data.h,v 1.1096.2.1 2012/03/22 23:01:03 riz Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1102 2012/02/15 16:26:00 tsutsui Exp + * NetBSD */ /* @@ -5424,6 +5424,14 @@ static const uint16_t pci_products[] = { 20564, 615, 4329, 0, PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2008, 20572, 0, + PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2008_1, + 8112, 20572, 0, + PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_3, + 20580, 0, + PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_4, + 20580, 0, + PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_5, + 20580, 0, PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_1, 8112, 20580, 20588, 20595, 0, PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_2, @@ -8994,7 +9002,7 @@ static const char pci_words[] = { "." "(port\0" /* 3 refs @ 8100 */ "1)\0" /* 1 refs @ 8106 */ "2)\0" /* 1 refs @ 8109 */ - "MegaRAID\0" /* 7 refs @ 8112 */ + "MegaRAID\0" /* 8 refs @ 8112 */ "Crypto\0" /* 2 refs @ 8121 */ "Accelerator\0" /* 17 refs @ 8128 */ "ADSP-2141\0" /* 1 refs @ 8140 */ @@ -10717,8 +10725,8 @@ static const char pci_words[] = { "." "SAS1064A\0" /* 1 refs @ 20547 */ "SAS1066\0" /* 1 refs @ 20556 */ "SAS1078\0" /* 2 refs @ 20564 */ - "SAS2008\0" /* 1 refs @ 20572 */ - "SAS2108\0" /* 2 refs @ 20580 */ + "SAS2008\0" /* 2 refs @ 20572 */ + "SAS2108\0" /* 5 refs @ 20580 */ "CRYPTO\0" /* 1 refs @ 20588 */ "GEN2\0" /* 2 refs @ 20595 */ "SAS1078DE\0" /* 1 refs @ 20600 */
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src Committed By: riz Date: Thu Mar 22 23:00:29 UTC 2012 Modified Files: src/sys/dev/pci [netbsd-6]: pcidevs Log Message: Pull up following revision(s) (requested by sborrill in ticket #137): sys/dev/pci/pcidevs: revision 1.1107 Add some Symbios SAS2108 devices. Add new Symbios SAS2008 device (as used by IBM ServeRAID M1015). To generate a diff of this commit: cvs rdiff -u -r1.1102 -r1.1102.2.1 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1102 src/sys/dev/pci/pcidevs:1.1102.2.1 --- src/sys/dev/pci/pcidevs:1.1102 Wed Feb 15 16:26:00 2012 +++ src/sys/dev/pci/pcidevs Thu Mar 22 23:00:28 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1102 2012/02/15 16:26:00 tsutsui Exp $ +$NetBSD: pcidevs,v 1.1102.2.1 2012/03/22 23:00:28 riz Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3395,6 +3395,10 @@ product SYMBIOS SAS1066 0x005E SAS1066 product SYMBIOS SAS1078 0x0060 SAS1078 PCI product SYMBIOS SAS1078_PCIE 0x0062 SAS1078 PCI Express product SYMBIOS SAS2008 0x0072 SAS2008 +product SYMBIOS SAS2008_1 0x0073 MegaRAID SAS2008 +product SYMBIOS SAS2108_3 0x0074 SAS2108 +product SYMBIOS SAS2108_4 0x0076 SAS2108 +product SYMBIOS SAS2108_5 0x0077 SAS2108 product SYMBIOS SAS2108_1 0x0078 MegaRAID SAS2108 CRYPTO GEN2 product SYMBIOS SAS2108_2 0x0079 MegaRAID SAS2108 GEN2 product SYMBIOS SAS1078DE 0x007c SAS1078DE
CVS commit: src
Module Name:src Committed By: joerg Date: Thu Mar 22 22:59:43 UTC 2012 Modified Files: src/dist/bzip2: bzlib_private.h src/lib/csu/common: crt0-common.c src/lib/libskey: skeysubr.c src/lib/libwrap: options.c rfc931.c shell_cmd.c tcpd.h Log Message: Add some more __dead as exposed by the recent WARN bumps. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/dist/bzip2/bzlib_private.h cvs rdiff -u -r1.7 -r1.8 src/lib/csu/common/crt0-common.c cvs rdiff -u -r1.27 -r1.28 src/lib/libskey/skeysubr.c cvs rdiff -u -r1.15 -r1.16 src/lib/libwrap/options.c cvs rdiff -u -r1.9 -r1.10 src/lib/libwrap/rfc931.c cvs rdiff -u -r1.6 -r1.7 src/lib/libwrap/shell_cmd.c cvs rdiff -u -r1.13 -r1.14 src/lib/libwrap/tcpd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/bzip2/bzlib_private.h diff -u src/dist/bzip2/bzlib_private.h:1.1.1.3 src/dist/bzip2/bzlib_private.h:1.2 --- src/dist/bzip2/bzlib_private.h:1.1.1.3 Tue Mar 18 14:41:47 2008 +++ src/dist/bzip2/bzlib_private.h Thu Mar 22 22:59:43 2012 @@ -55,7 +55,7 @@ typedef unsigned short UInt16; #ifndef BZ_NO_STDIO -extern void BZ2_bz__AssertH__fail ( int errcode ); +__dead void BZ2_bz__AssertH__fail ( int errcode ); #define AssertH(cond,errcode) \ { if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); } Index: src/lib/csu/common/crt0-common.c diff -u src/lib/csu/common/crt0-common.c:1.7 src/lib/csu/common/crt0-common.c:1.8 --- src/lib/csu/common/crt0-common.c:1.7 Thu Jun 30 20:07:35 2011 +++ src/lib/csu/common/crt0-common.c Thu Mar 22 22:59:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: crt0-common.c,v 1.7 2011/06/30 20:07:35 matt Exp $ */ +/* $NetBSD: crt0-common.c,v 1.8 2012/03/22 22:59:43 joerg Exp $ */ /* * Copyright (c) 1998 Christos Zoulas @@ -36,7 +36,7 @@ */ #include -__RCSID("$NetBSD: crt0-common.c,v 1.7 2011/06/30 20:07:35 matt Exp $"); +__RCSID("$NetBSD: crt0-common.c,v 1.8 2012/03/22 22:59:43 joerg Exp $"); #include #include @@ -74,7 +74,7 @@ struct ps_strings *__ps_strings = 0; static char empty_string[] = ""; char *__progname = empty_string; -__dso_hidden void ___start(void (*)(void), const Obj_Entry *, +__dead __dso_hidden void ___start(void (*)(void), const Obj_Entry *, struct ps_strings *); #define write(fd, s, n) __syscall(SYS_write, (fd), (s), (n)) Index: src/lib/libskey/skeysubr.c diff -u src/lib/libskey/skeysubr.c:1.27 src/lib/libskey/skeysubr.c:1.28 --- src/lib/libskey/skeysubr.c:1.27 Wed Mar 21 10:10:37 2012 +++ src/lib/libskey/skeysubr.c Thu Mar 22 22:59:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: skeysubr.c,v 1.27 2012/03/21 10:10:37 matt Exp $ */ +/* $NetBSD: skeysubr.c,v 1.28 2012/03/22 22:59:43 joerg Exp $ */ /* S/KEY v1.1b (skeysubr.c) * @@ -15,7 +15,7 @@ */ #include -__RCSID("$NetBSD: skeysubr.c,v 1.27 2012/03/21 10:10:37 matt Exp $"); +__RCSID("$NetBSD: skeysubr.c,v 1.28 2012/03/22 22:59:43 joerg Exp $"); #include #include @@ -46,7 +46,7 @@ static int keycrunch_sha1(char *, const /* static int keycrunch_rmd160(char *, const char *, const char *); */ static void lowcase(char *); static void skey_echo(int); -static void trapped(int); +static void trapped(int) __dead; static char *mkSeedPassword(const char *, const char *, size_t *); /* Current hash type (index into skey_hash_types array) */ Index: src/lib/libwrap/options.c diff -u src/lib/libwrap/options.c:1.15 src/lib/libwrap/options.c:1.16 --- src/lib/libwrap/options.c:1.15 Wed Mar 21 10:10:37 2012 +++ src/lib/libwrap/options.c Thu Mar 22 22:59:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: options.c,v 1.15 2012/03/21 10:10:37 matt Exp $ */ +/* $NetBSD: options.c,v 1.16 2012/03/22 22:59:43 joerg Exp $ */ /* * General skeleton for adding options to the access control language. The @@ -35,7 +35,7 @@ #if 0 static char sccsid[] = "@(#) options.c 1.17 96/02/11 17:01:31"; #else -__RCSID("$NetBSD: options.c,v 1.15 2012/03/21 10:10:37 matt Exp $"); +__RCSID("$NetBSD: options.c,v 1.16 2012/03/22 22:59:43 joerg Exp $"); #endif #endif @@ -103,9 +103,9 @@ static void nice_option /* execute "ni (char *, struct request_info *); static void severity_option /* execute "severity value" */ (char *, struct request_info *); -static void allow_option /* execute "allow" option */ +__dead static void allow_option /* execute "allow" option */ (char *, struct request_info *); -static void deny_option /* execute "deny" option */ +__dead static void deny_option /* execute "deny" option */ (char *, struct request_info *); static void banners_option /* execute "banners path" option */ (char *, struct request_info *); Index: src/lib/libwrap/rfc931.c diff -u src/lib/libwrap/rfc931.c:1.9 src/lib/libwrap/rfc931.c:1.10 --- src/lib/libwrap/rfc931.c:1.9 Wed Mar 21 10:10:37 2012 +++ src/lib/libwrap/rfc931.c Thu Mar 22 22:59:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rfc931.c,v 1.9 2012/03/21 10:10:37
CVS commit: [netbsd-6] src/sys/dev/ic
Module Name:src Committed By: riz Date: Thu Mar 22 22:58:24 UTC 2012 Modified Files: src/sys/dev/ic [netbsd-6]: mfi.c Log Message: Pull up following revision(s) (requested by sborrill in ticket #136): sys/dev/ic/mfi.c: revision 1.37 >From OpenBSD. Fixes a deadlock during autoconf. scrub more fields in the ccb when returning them to the free list after theyve been used, in particular the mfi header flags which has a bit that specifies if a command should be completed via the interrupt path. if we use a ccb during boot we set that bit, but it isnt necessarily cleared by things that use it later on. this means a ccb we expected to complete via an interrupt never actually generates an interrupt or appears in the reply queue. this obviously stalls the io. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/dev/ic/mfi.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/mfi.c diff -u src/sys/dev/ic/mfi.c:1.36 src/sys/dev/ic/mfi.c:1.36.8.1 --- src/sys/dev/ic/mfi.c:1.36 Mon Jun 20 22:02:55 2011 +++ src/sys/dev/ic/mfi.c Thu Mar 22 22:58:23 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mfi.c,v 1.36 2011/06/20 22:02:55 pgoyette Exp $ */ +/* $NetBSD: mfi.c,v 1.36.8.1 2012/03/22 22:58:23 riz Exp $ */ /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom @@ -17,7 +17,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.36 2011/06/20 22:02:55 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.36.8.1 2012/03/22 22:58:23 riz Exp $"); #include "bio.h" @@ -180,11 +180,13 @@ static void mfi_put_ccb(struct mfi_ccb *ccb) { struct mfi_softc *sc = ccb->ccb_sc; + struct mfi_frame_header *hdr = &ccb->ccb_frame->mfr_header; int s; DNPRINTF(MFI_D_CCB, "%s: mfi_put_ccb: %p\n", DEVNAME(sc), ccb); - s = splbio(); + hdr->mfh_cmd_status = 0x0; + hdr->mfh_flags = 0x0; ccb->ccb_state = MFI_CCB_FREE; ccb->ccb_xs = NULL; ccb->ccb_flags = 0; @@ -195,6 +197,8 @@ mfi_put_ccb(struct mfi_ccb *ccb) ccb->ccb_sgl = NULL; ccb->ccb_data = NULL; ccb->ccb_len = 0; + + s = splbio(); TAILQ_INSERT_TAIL(&sc->sc_ccb_freeq, ccb, ccb_link); splx(s); }
CVS commit: src/lib/libwrap
Module Name:src Committed By: joerg Date: Thu Mar 22 22:58:15 UTC 2012 Modified Files: src/lib/libwrap: diag.c Log Message: Format the diagnostic with vasprintf once and use plain syslog instead of messing with format strings. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libwrap/diag.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libwrap/diag.c diff -u src/lib/libwrap/diag.c:1.9 src/lib/libwrap/diag.c:1.10 --- src/lib/libwrap/diag.c:1.9 Wed Mar 21 10:10:37 2012 +++ src/lib/libwrap/diag.c Thu Mar 22 22:58:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: diag.c,v 1.9 2012/03/21 10:10:37 matt Exp $ */ +/* $NetBSD: diag.c,v 1.10 2012/03/22 22:58:15 joerg Exp $ */ /* * Routines to report various classes of problems. Each report is decorated @@ -16,7 +16,7 @@ #if 0 static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20"; #else -__RCSID("$NetBSD: diag.c,v 1.9 2012/03/21 10:10:37 matt Exp $"); +__RCSID("$NetBSD: diag.c,v 1.10 2012/03/22 22:58:15 joerg Exp $"); #endif #endif @@ -25,6 +25,7 @@ __RCSID("$NetBSD: diag.c,v 1.9 2012/03/2 #include #include #include +#include #include #include #include @@ -37,46 +38,33 @@ struct tcpd_context tcpd_context; jmp_buf tcpd_buf; static void tcpd_diag(int, const char *, const char *, va_list) - __attribute__((__format__(__printf__, 3, 0))); +__printflike(3,0); /* tcpd_diag - centralize error reporter */ static void -tcpd_diag(int severity, const char *tag, const char *format, va_list ap) +tcpd_diag(int severity, const char *tag, const char *fmt, va_list ap) { -charfmt[BUFSIZ]; -charbuf[BUFSIZ]; -size_t i, o; +char *buf; int oerrno; /* save errno in case we need it */ oerrno = errno; +if (vasprintf(&buf, fmt, ap) == -1) + buf = __UNCONST(fmt); + +errno = oerrno; + /* contruct the tag for the log entry */ if (tcpd_context.file) - (void)snprintf(buf, sizeof buf, "%s: %s, line %d: ", - tag, tcpd_context.file, tcpd_context.line); + syslog(severity, "%s: %s, line %d: %s", + tag, tcpd_context.file, tcpd_context.line, buf); else - (void)snprintf(buf, sizeof buf, "%s: ", tag); + syslog(severity, "%s: %s", tag, buf); -/* change % to %% in tag before appending the format */ -for (i = 0, o = 0; buf[i] != '\0'; ) { - if (buf[i] == '%') { - fmt[o] = '%'; - if (o < sizeof(fmt) - 1) - o++; - } - fmt[o] = buf[i++]; - if (o < sizeof(fmt) - 1) - o++; -} - -/* append format and force null termination */ -fmt[o] = '\0'; -(void)strlcat(fmt, format, sizeof(fmt) - o); - -errno = oerrno; -vsyslog(severity, fmt, ap); +if (buf != fmt) +free(buf); } /* tcpd_warn - report problem of some sort and proceed */
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: riz Date: Thu Mar 22 22:56:55 UTC 2012 Modified Files: src/sys/kern [netbsd-6]: kern_sysctl.c Log Message: Pull up following revision(s) (requested by martin in ticket #135): sys/kern/kern_sysctl.c: revision 1.234 Fix query of IMMEDIATE bool values (copy & pasto). To generate a diff of this commit: cvs rdiff -u -r1.233 -r1.233.4.1 src/sys/kern/kern_sysctl.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/kern_sysctl.c diff -u src/sys/kern/kern_sysctl.c:1.233 src/sys/kern/kern_sysctl.c:1.233.4.1 --- src/sys/kern/kern_sysctl.c:1.233 Sat Nov 19 22:51:25 2011 +++ src/sys/kern/kern_sysctl.c Thu Mar 22 22:56:54 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_sysctl.c,v 1.233 2011/11/19 22:51:25 tls Exp $ */ +/* $NetBSD: kern_sysctl.c,v 1.233.4.1 2012/03/22 22:56:54 riz Exp $ */ /*- * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.233 2011/11/19 22:51:25 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.233.4.1 2012/03/22 22:56:54 riz Exp $"); #include "opt_defcorename.h" #include "ksyms.h" @@ -1182,7 +1182,7 @@ sysctl_create(SYSCTLFN_ARGS) } else if (flags & CTLFLAG_IMMEDIATE) { switch (type) { case CTLTYPE_BOOL: - node->sysctl_idata = nnode.sysctl_bdata; + node->sysctl_bdata = nnode.sysctl_bdata; break; case CTLTYPE_INT: node->sysctl_idata = nnode.sysctl_idata;
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src Committed By: riz Date: Thu Mar 22 22:55:18 UTC 2012 Modified Files: src/sys/dev/pci [netbsd-6]: if_iwi.c Log Message: Pull up following revision(s) (requested by nisimura in ticket #134): sys/dev/pci/if_iwi.c: revision 1.90 Unbreak the endian issue in firmware header decoding. Comfirmed good and running by a powerpc machine. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/dev/pci/if_iwi.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_iwi.c diff -u src/sys/dev/pci/if_iwi.c:1.89 src/sys/dev/pci/if_iwi.c:1.89.2.1 --- src/sys/dev/pci/if_iwi.c:1.89 Mon Jan 30 19:41:20 2012 +++ src/sys/dev/pci/if_iwi.c Thu Mar 22 22:55:18 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwi.c,v 1.89 2012/01/30 19:41:20 drochner Exp $ */ +/* $NetBSD: if_iwi.c,v 1.89.2.1 2012/03/22 22:55:18 riz Exp $ */ /* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */ /*- @@ -19,7 +19,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.89 2012/01/30 19:41:20 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.89.2.1 2012/03/22 22:55:18 riz Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -2154,7 +2154,7 @@ iwi_cache_firmware(struct iwi_softc *sc) { struct iwi_firmware *kfw = &sc->fw; firmware_handle_t fwh; - const struct iwi_firmware_hdr *hdr; + struct iwi_firmware_hdr *hdr; off_t size; char *fw; int error; @@ -2192,8 +2192,12 @@ iwi_cache_firmware(struct iwi_softc *sc) if (error != 0) goto fail2; + hdr = (struct iwi_firmware_hdr *)sc->sc_blob; + hdr->version = le32toh(hdr->version); + hdr->bsize = le32toh(hdr->bsize); + hdr->usize = le32toh(hdr->usize); + hdr->fsize = le32toh(hdr->fsize); - hdr = (const struct iwi_firmware_hdr *)sc->sc_blob; if (size < sizeof(struct iwi_firmware_hdr) + hdr->bsize + hdr->usize + hdr->fsize) { aprint_error_dev(sc->sc_dev, "image '%s' too small\n", sc->sc_fwname); @@ -2201,14 +2205,13 @@ iwi_cache_firmware(struct iwi_softc *sc) goto fail2; } - hdr = (const struct iwi_firmware_hdr *)sc->sc_blob; - DPRINTF(("firmware version = %d\n", le32toh(hdr->version))); - if ((IWI_FW_GET_MAJOR(le32toh(hdr->version)) != IWI_FW_REQ_MAJOR) || - (IWI_FW_GET_MINOR(le32toh(hdr->version)) != IWI_FW_REQ_MINOR)) { + DPRINTF(("firmware version = %d\n", hdr->version)); + if ((IWI_FW_GET_MAJOR(hdr->version) != IWI_FW_REQ_MAJOR) || + (IWI_FW_GET_MINOR(hdr->version) != IWI_FW_REQ_MINOR)) { aprint_error_dev(sc->sc_dev, "version for '%s' %d.%d != %d.%d\n", sc->sc_fwname, - IWI_FW_GET_MAJOR(le32toh(hdr->version)), - IWI_FW_GET_MINOR(le32toh(hdr->version)), + IWI_FW_GET_MAJOR(hdr->version), + IWI_FW_GET_MINOR(hdr->version), IWI_FW_REQ_MAJOR, IWI_FW_REQ_MINOR); error = EIO; goto fail2;
CVS commit: [netbsd-6] src/sys/arch
Module Name:src Committed By: riz Date: Thu Mar 22 22:50:49 UTC 2012 Modified Files: src/sys/arch/amd64/amd64 [netbsd-6]: machdep.c src/sys/arch/i386/i386 [netbsd-6]: machdep.c Log Message: Pull up following revision(s) (requested by mrg in ticket #126): sys/arch/amd64/amd64/machdep.c: revision 1.180 sys/arch/i386/i386/machdep.c: revision 1.724 make i386 and amd64 cpu_reboot() more similar. in particular, bring in the unmount/sync code from i386 to amd64, and call doshutdownhooks() for i386. the amd64 changes avoid umass triggering an assert later when sd@umass is trying to sync the cache. XXX merge x86 cpu_reboot(), but there's non-trivially different still. To generate a diff of this commit: cvs rdiff -u -r1.175.2.2 -r1.175.2.3 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.717.2.5 -r1.717.2.6 src/sys/arch/i386/i386/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/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.175.2.2 src/sys/arch/amd64/amd64/machdep.c:1.175.2.3 --- src/sys/arch/amd64/amd64/machdep.c:1.175.2.2 Mon Mar 5 20:18:01 2012 +++ src/sys/arch/amd64/amd64/machdep.c Thu Mar 22 22:50:48 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.175.2.2 2012/03/05 20:18:01 sborrill Exp $ */ +/* $NetBSD: machdep.c,v 1.175.2.3 2012/03/22 22:50:48 riz Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -111,7 +111,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175.2.2 2012/03/05 20:18:01 sborrill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175.2.3 2012/03/22 22:50:48 riz Exp $"); /* #define XENDEBUG_LOW */ @@ -316,6 +316,8 @@ u_long cpu_dump_mempagecnt(void); void dodumpsys(void); void dumpsys(void); +extern int time_adjusted; /* XXX no common header */ + void dump_misc_init(void); void dump_seg_prep(void); int dump_seg_iter(int (*)(paddr_t, paddr_t)); @@ -751,12 +753,12 @@ cpu_upcall(struct lwp *l, int type, int l->l_md.md_flags |= MDP_IRET; } -int waittime = -1; struct pcb dumppcb; void cpu_reboot(int howto, char *bootstr) { + static bool syncdone = false; int s = IPL_NONE; if (cold) { @@ -765,15 +767,37 @@ cpu_reboot(int howto, char *bootstr) } boothowto = howto; - if ((howto & RB_NOSYNC) == 0 && waittime < 0) { - waittime = 0; - vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now. - */ - resettodr(); - } + + /* i386 maybe_dump() */ + + /* + * If we've panic'd, don't make the situation potentially + * worse by syncing or unmounting the file systems. + */ + if ((howto & RB_NOSYNC) == 0 && panicstr == NULL) { + if (!syncdone) { + syncdone = true; + /* XXX used to force unmount as well, here */ + vfs_sync_all(curlwp); + /* + * If we've been adjusting the clock, the todr + * will be out of synch; adjust it now. + * + * XXX used to do this after unmounting all + * filesystems with vfs_shutdown(). + */ + if (time_adjusted != 0) +resettodr(); + } + + while (vfs_unmountall1(curlwp, false, false) || + config_detach_all(boothowto) || + vfs_unmount_forceone(curlwp)) + ; /* do nothing */ + } else + suspendsched(); + + pmf_system_shutdown(boothowto); /* Disable interrupts. */ s = splhigh(); @@ -785,8 +809,6 @@ cpu_reboot(int howto, char *bootstr) haltsys: doshutdownhooks(); - pmf_system_shutdown(boothowto); - if ((howto & RB_POWERDOWN) == RB_POWERDOWN) { #ifndef XEN #if NACPICA > 0 Index: src/sys/arch/i386/i386/machdep.c diff -u src/sys/arch/i386/i386/machdep.c:1.717.2.5 src/sys/arch/i386/i386/machdep.c:1.717.2.6 --- src/sys/arch/i386/i386/machdep.c:1.717.2.5 Wed Mar 7 23:31:41 2012 +++ src/sys/arch/i386/i386/machdep.c Thu Mar 22 22:50:48 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.717.2.5 2012/03/07 23:31:41 riz Exp $ */ +/* $NetBSD: machdep.c,v 1.717.2.6 2012/03/22 22:50:48 riz Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009 @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.717.2.5 2012/03/07 23:31:41 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.717.2.6 2012/03/22 22:50:48 riz Exp $"); #include "opt_beep.h" #include "opt_compat_ibcs2.h" @@ -884,11 +884,7 @@ void cpu_reboot(int howto, char *bootstr) { static bool syncdone = false; - struct lwp *l; - int s; - - s = IPL_NONE; - l = (curlwp == NULL) ? &lwp0 : curlwp; + int s = IPL_NONE; if (cold) { howto |= RB_HALT; @@ -910,7 +906,7 @@ cpu_reboot(int howto, char *bootstr) if (!syncdone) { syncdone = true; /* XXX used to force unmount as well, here */ - vfs_sync_all(l); + vfs_sync_all(curlwp); /* * If we've been adjusting the clock, the todr * will be out of synch; adjust it now. @@ -922,9 +918,9 @@ cpu_reboot(int howto, char *boot
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: njoly Date: Thu Mar 22 22:48:56 UTC 2012 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: Use the appropriates vop_*_args structures. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/librump/rumpvfs/rumpfs.c diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.108 src/sys/rump/librump/rumpvfs/rumpfs.c:1.109 --- src/sys/rump/librump/rumpvfs/rumpfs.c:1.108 Thu Mar 15 12:42:28 2012 +++ src/sys/rump/librump/rumpvfs/rumpfs.c Thu Mar 22 22:48:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfs.c,v 1.108 2012/03/15 12:42:28 njoly Exp $ */ +/* $NetBSD: rumpfs.c,v 1.109 2012/03/22 22:48:56 njoly Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.108 2012/03/15 12:42:28 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.109 2012/03/22 22:48:56 njoly Exp $"); #include #include @@ -887,7 +887,7 @@ rump_vop_getattr(void *v) static int rump_vop_setattr(void *v) { - struct vop_getattr_args /* { + struct vop_setattr_args /* { struct vnode *a_vp; struct vattr *a_vap; kauth_cred_t a_cred; @@ -1055,7 +1055,7 @@ out: static int rump_vop_remove(void *v) { -struct vop_rmdir_args /* { +struct vop_remove_args /* { struct vnode *a_dvp; struct vnode *a_vp; struct componentname *a_cnp; @@ -1424,7 +1424,7 @@ etwrite(struct rumpfs_node *rn, struct u static int rump_vop_write(void *v) { - struct vop_read_args /* { + struct vop_write_args /* { struct vnode *a_vp; struct uio *a_uio; int ioflags a_ioflag;
CVS commit: src/sys/fs/v7fs
Module Name:src Committed By: njoly Date: Thu Mar 22 22:16:21 UTC 2012 Modified Files: src/sys/fs/v7fs: v7fs_vnops.c Log Message: Pass operations flags to genfs_can_chtimes(), not file ones. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/fs/v7fs/v7fs_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/fs/v7fs/v7fs_vnops.c diff -u src/sys/fs/v7fs/v7fs_vnops.c:1.8 src/sys/fs/v7fs/v7fs_vnops.c:1.9 --- src/sys/fs/v7fs/v7fs_vnops.c:1.8 Tue Mar 13 18:40:51 2012 +++ src/sys/fs/v7fs/v7fs_vnops.c Thu Mar 22 22:16:21 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: v7fs_vnops.c,v 1.8 2012/03/13 18:40:51 elad Exp $ */ +/* $NetBSD: v7fs_vnops.c,v 1.9 2012/03/22 22:16:21 njoly Exp $ */ /*- * Copyright (c) 2004, 2011 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: v7fs_vnops.c,v 1.8 2012/03/13 18:40:51 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: v7fs_vnops.c,v 1.9 2012/03/22 22:16:21 njoly Exp $"); #if defined _KERNEL_OPT #include "opt_v7fs.h" #endif @@ -536,7 +536,7 @@ v7fs_setattr(void *v) (vap->va_mtime.tv_sec != VNOVAL) || (vap->va_ctime.tv_sec != VNOVAL)) { error = kauth_authorize_vnode(cred, KAUTH_VNODE_WRITE_TIMES, vp, - NULL, genfs_can_chtimes(vp, vap->va_flags, inode->uid, + NULL, genfs_can_chtimes(vp, vap->va_vaflags, inode->uid, cred)); if (error) return error;
CVS commit: src/sbin/mount_kernfs
Module Name:src Committed By: wiz Date: Thu Mar 22 21:47:20 UTC 2012 Modified Files: src/sbin/mount_kernfs: mount_kernfs.8 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sbin/mount_kernfs/mount_kernfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_kernfs/mount_kernfs.8 diff -u src/sbin/mount_kernfs/mount_kernfs.8:1.17 src/sbin/mount_kernfs/mount_kernfs.8:1.18 --- src/sbin/mount_kernfs/mount_kernfs.8:1.17 Thu Mar 22 20:34:37 2012 +++ src/sbin/mount_kernfs/mount_kernfs.8 Thu Mar 22 21:47:20 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_kernfs.8,v 1.17 2012/03/22 20:34:37 drochner Exp $ +.\" $NetBSD: mount_kernfs.8,v 1.18 2012/03/22 21:47:20 wiz Exp $ .\" .\" Copyright (c) 1992, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" .\" @(#)mount_kernfs.8 8.2 (Berkeley) 3/27/94 .\" -.Dd September 8, 2003 +.Dd March 22, 2012 .Dt MOUNT_KERNFS 8 .Os .Sh NAME
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: drochner Date: Thu Mar 22 20:52:47 UTC 2012 Modified Files: src/distrib/sets/lists/man: mi Log Message: obsolete kame_ipsec(4) To generate a diff of this commit: cvs rdiff -u -r1.1383 -r1.1384 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1383 src/distrib/sets/lists/man/mi:1.1384 --- src/distrib/sets/lists/man/mi:1.1383 Sun Mar 4 16:12:24 2012 +++ src/distrib/sets/lists/man/mi Thu Mar 22 20:52:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1383 2012/03/04 16:12:24 tron Exp $ +# $NetBSD: mi,v 1.1384 2012/03/22 20:52:47 drochner Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1240,7 +1240,7 @@ ./usr/share/man/cat4/jme.0 man-sys-catman .cat ./usr/share/man/cat4/jmide.0 man-sys-catman .cat ./usr/share/man/cat4/joy.0 man-sys-catman .cat -./usr/share/man/cat4/kame_ipsec.0 man-sys-catman .cat +./usr/share/man/cat4/kame_ipsec.0 man-obsolete obsolete ./usr/share/man/cat4/kloader.0 man-sys-catman .cat ./usr/share/man/cat4/kse.0 man-sys-catman .cat ./usr/share/man/cat4/ksyms.0 man-sys-catman .cat @@ -4074,7 +4074,7 @@ ./usr/share/man/html4/jme.html man-sys-htmlman html ./usr/share/man/html4/jmide.html man-sys-htmlman html ./usr/share/man/html4/joy.html man-sys-htmlman html -./usr/share/man/html4/kame_ipsec.html man-sys-htmlman html +./usr/share/man/html4/kame_ipsec.html man-obsolete obsolete ./usr/share/man/html4/kloader.html man-sys-htmlman html ./usr/share/man/html4/kse.html man-sys-htmlman html ./usr/share/man/html4/ksyms.html man-sys-htmlman html @@ -6751,7 +6751,7 @@ ./usr/share/man/man4/jme.4 man-sys-man .man ./usr/share/man/man4/jmide.4 man-sys-man .man ./usr/share/man/man4/joy.4 man-sys-man .man -./usr/share/man/man4/kame_ipsec.4 man-sys-man .man +./usr/share/man/man4/kame_ipsec.4 man-obsolete obsolete ./usr/share/man/man4/kloader.4 man-sys-man .man ./usr/share/man/man4/kse.4 man-sys-man .man ./usr/share/man/man4/ksyms.4 man-sys-man .man
CVS commit: src/external/gpl2/xcvs/dist/src
Module Name:src Committed By: christos Date: Thu Mar 22 20:49:55 UTC 2012 Modified Files: src/external/gpl2/xcvs/dist/src: sanity.sh Log Message: >From Garo Taft: - Add a -w flag which will make the sanity script sleep for a second before and after checkouts, commits, and updates. - Fix expected output to look for the right default action on empty log message. It's now "abort". - Add new requests "Checkin-prog" and "Update-prog" to expectation values. - Add new "access"�and "group" files to CVSROOT admin database expectation values. - All tests pass except client-20, which hangs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/src/sanity.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/xcvs/dist/src/sanity.sh diff -u src/external/gpl2/xcvs/dist/src/sanity.sh:1.2 src/external/gpl2/xcvs/dist/src/sanity.sh:1.3 --- src/external/gpl2/xcvs/dist/src/sanity.sh:1.2 Thu Mar 8 15:42:21 2012 +++ src/external/gpl2/xcvs/dist/src/sanity.sh Thu Mar 22 16:49:53 2012 @@ -22,7 +22,7 @@ usage () { echo "Usage: `basename $0` --help" -echo "Usage: `basename $0` [--eklr] [-c CONFIG-FILE] [-f FROM-TEST] \\" +echo "Usage: `basename $0` [--eklrw] [-c CONFIG-FILE] [-f FROM-TEST] \\" echo " [-h HOSTNAME] [-s CVS-FOR-CVS-SERVER] CVS-TO-TEST \\" echo " [TESTS-TO-RUN...]" } @@ -69,6 +69,11 @@ exit_help () echo "-p|--proxy test a secondary/primary CVS server (writeproxy)" echo " configuration (implies --remote)." echo "-r|--remote test client/server, as opposed to local, CVS" +echo "-w|--wait automatically sleep for a second before and after" +echo " checkouts, commits, and updates. Use this option" +echo " if you have fast cores and a slow disk. (For example," +echo " you may need this flag if you see tests fail because" +echo " they think they have nothing to commit.)" echo "-s CVS-FOR-CVS-SERVER" echo "--server=CVS-FOR-CVS-SERVER" echo " use CVS-FOR-CVS-SERVER as the path to the CVS SERVER" @@ -132,7 +137,8 @@ proxy=false remote=false servercvs=false skipfail=false -while getopts Hc:ef:h:klnprs:-: option ; do +waitforslowdisk=false +while getopts Hc:ef:h:klnprs:w-: option ; do # convert the long opts to short opts if test x$option = x-; then # remove any argument @@ -198,6 +204,10 @@ while getopts Hc:ef:h:klnprs:-: option ; option=e OPTARG= ;; + w|wa|wai|wait) + option=w + OPTARG= + ;; *) option=\? OPTARG= @@ -250,6 +260,9 @@ while getopts Hc:ef:h:klnprs:-: option ; servercvs="$OPTARG" remote=: ;; + w) + waitforslowdisk=: + ;; \?) exit_usage ;; @@ -1488,6 +1501,17 @@ run_filter () fi } +maybe_sleep_if_ci_co_or_up () +{ + if $waitforslowdisk; then +case "$@" in +*" ci "*|*" ci"|*" commit "*|*" commit") sleep 1;; +*" co "*|*" co"|*" checkout "*|*" checkout") sleep 1;; +*" up "*|*" up"|*" update "*|*" update") sleep 1;; +esac + fi +} + # Usage: # dotest TESTNAME COMMAND OUTPUT [OUTPUT2] # TESTNAME is the name used in the log to identify the test. @@ -1503,6 +1527,7 @@ run_filter () # lack \|). dotest () { + maybe_sleep_if_ci_co_or_up "$2" rm -f $TESTDIR/dotest.ex? 2>&1 eval "$2" >$TESTDIR/dotest.tmp 2>&1 status=$? @@ -1512,12 +1537,14 @@ dotest () echo "exit status was $status" >>${LOGFILE} fail "$1" fi + maybe_sleep_if_ci_co_or_up "$2" dotest_internal "$@" } # Like dotest except only 2 args and result must exactly match stdin dotest_lit () { + maybe_sleep_if_ci_co_or_up "$2" rm -f $TESTDIR/dotest.ex? 2>&1 eval "$2" >$TESTDIR/dotest.tmp 2>&1 status=$? @@ -1527,6 +1554,7 @@ dotest_lit () echo "exit status was $status" >>$LOGFILE fail "$1" fi + maybe_sleep_if_ci_co_or_up "$2" cat >$TESTDIR/dotest.exp if cmp $TESTDIR/dotest.exp $TESTDIR/dotest.tmp >/dev/null 2>&1; then pass "$1" @@ -1543,6 +1571,7 @@ dotest_lit () # Like dotest except exitstatus should be nonzero. dotest_fail () { + maybe_sleep_if_ci_co_or_up "$2" rm -f $TESTDIR/dotest.ex? 2>&1 eval "$2" >$TESTDIR/dotest.tmp 2>&1 status=$? @@ -1552,12 +1581,14 @@ dotest_fail () echo "exit status was $status" >>$LOGFILE fail "$1" fi + maybe_sleep_if_ci_co_or_up "$2" dotest_internal "$@" } # Like dotest except output is sorted. dotest_sort () { + maybe_sleep_if_ci_co_or_up "$2" rm -f $TESTDIR/dotest.ex? 2>&1 eval "$2" >$TESTDIR/dotest.tmp1 2>&1 status=$? @@ -1568,12 +1599,14 @@ dotest_sort () fail "$1" fi $TR ' ' ' ' < $TESTDIR/dotest.tmp1 | sort > $TESTDIR/dotest.tmp + maybe_sleep_if_ci_co_or_up "$2" dotest_internal "$@" } # Like dotest_fail except output is sorted. dotest_fail_sort () { + maybe_sleep_if_ci_co_or_up "$2" rm -f $TEST
CVS commit: src/lib/libpthread
Module Name:src Committed By: drochner Date: Thu Mar 22 20:01:19 UTC 2012 Modified Files: src/lib/libpthread: pthread.c Log Message: don't reuse a dynamically allocated stack if a fixed one is requested To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.133 src/lib/libpthread/pthread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpthread/pthread.c diff -u src/lib/libpthread/pthread.c:1.132 src/lib/libpthread/pthread.c:1.133 --- src/lib/libpthread/pthread.c:1.132 Mon Mar 12 20:16:52 2012 +++ src/lib/libpthread/pthread.c Thu Mar 22 20:01:18 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread.c,v 1.132 2012/03/12 20:16:52 joerg Exp $ */ +/* $NetBSD: pthread.c,v 1.133 2012/03/22 20:01:18 drochner Exp $ */ /*- * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__RCSID("$NetBSD: pthread.c,v 1.132 2012/03/12 20:16:52 joerg Exp $"); +__RCSID("$NetBSD: pthread.c,v 1.133 2012/03/22 20:01:18 drochner Exp $"); #define __EXPOSE_STACK 1 @@ -333,7 +333,8 @@ pthread__getstack(pthread_t newthread, c stacksize = pthread__stacksize; if (newthread->pt_stack_allocated) { - if (newthread->pt_stack.ss_size == stacksize) + if (stackbase == NULL && + newthread->pt_stack.ss_size == stacksize) return 0; stackbase2 = newthread->pt_stack.ss_sp; #ifndef __MACHINE_STACK_GROWS_UP
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: christos Date: Thu Mar 22 18:20:46 UTC 2012 Modified Files: src/tests/lib/libc/sys: t_getitimer.c Log Message: dholland fixed PR/44927 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_getitimer.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/sys/t_getitimer.c diff -u src/tests/lib/libc/sys/t_getitimer.c:1.1 src/tests/lib/libc/sys/t_getitimer.c:1.2 --- src/tests/lib/libc/sys/t_getitimer.c:1.1 Thu Jul 7 02:57:53 2011 +++ src/tests/lib/libc/sys/t_getitimer.c Thu Mar 22 14:20:46 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: t_getitimer.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */ +/* $NetBSD: t_getitimer.c,v 1.2 2012/03/22 18:20:46 christos Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__RCSID("$NetBSD: t_getitimer.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $"); +__RCSID("$NetBSD: t_getitimer.c,v 1.2 2012/03/22 18:20:46 christos Exp $"); #include @@ -146,7 +146,8 @@ ATF_TC_BODY(setitimer_basic, tc) ATF_TC(setitimer_err); ATF_TC_HEAD(setitimer_err, tc) { - atf_tc_set_md_var(tc, "descr", "Test errors from setitimer(2)"); + atf_tc_set_md_var(tc, "descr", "Test errors from setitimer(2)" + " (PR standards/44927)"); } ATF_TC_BODY(setitimer_err, tc) @@ -159,11 +160,6 @@ ATF_TC_BODY(setitimer_err, tc) errno = 0; ATF_REQUIRE_ERRNO(EINVAL, setitimer(INT_MAX, &it, &ot) == -1); - /* - * This fails incorrectly with EPERM. - */ - atf_tc_expect_fail("PR standards/44927"); - errno = 0; ATF_REQUIRE_ERRNO(EFAULT, setitimer(ITIMER_REAL,(void*)-1, &ot) == -1); }
CVS commit: src/sys/kern
Module Name:src Committed By: dholland Date: Thu Mar 22 17:46:07 UTC 2012 Modified Files: src/sys/kern: kern_time.c Log Message: Misplaced parenthesis; fixes PR 44927 To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/sys/kern/kern_time.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/kern_time.c diff -u src/sys/kern/kern_time.c:1.173 src/sys/kern/kern_time.c:1.174 --- src/sys/kern/kern_time.c:1.173 Mon Feb 20 01:12:42 2012 +++ src/sys/kern/kern_time.c Thu Mar 22 17:46:07 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_time.c,v 1.173 2012/02/20 01:12:42 rmind Exp $ */ +/* $NetBSD: kern_time.c,v 1.174 2012/03/22 17:46:07 dholland Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.173 2012/02/20 01:12:42 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.174 2012/03/22 17:46:07 dholland Exp $"); #include #include @@ -1063,7 +1063,7 @@ sys___setitimer50(struct lwp *l, const s return (EINVAL); itvp = SCARG(uap, itv); if (itvp && - (error = copyin(itvp, &aitv, sizeof(struct itimerval)) != 0)) + (error = copyin(itvp, &aitv, sizeof(struct itimerval))) != 0) return (error); if (SCARG(uap, oitv) != NULL) { SCARG(&getargs, which) = which;
CVS commit: src/lib/libc
Module Name:src Committed By: christos Date: Thu Mar 22 17:32:22 UTC 2012 Modified Files: src/lib/libc/arch/vax/gen: _lwp.c makecontext.c src/lib/libc/rpc: xdr_float.c Log Message: vax-specific lint fixes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/vax/gen/_lwp.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/vax/gen/makecontext.c cvs rdiff -u -r1.35 -r1.36 src/lib/libc/rpc/xdr_float.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/vax/gen/_lwp.c diff -u src/lib/libc/arch/vax/gen/_lwp.c:1.2 src/lib/libc/arch/vax/gen/_lwp.c:1.3 --- src/lib/libc/arch/vax/gen/_lwp.c:1.2 Sat Jan 7 11:47:42 2012 +++ src/lib/libc/arch/vax/gen/_lwp.c Thu Mar 22 13:32:22 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _lwp.c,v 1.2 2012/01/07 16:47:42 chs Exp $ */ +/* $NetBSD: _lwp.c,v 1.3 2012/03/22 17:32:22 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: _lwp.c,v 1.2 2012/01/07 16:47:42 chs Exp $"); +__RCSID("$NetBSD: _lwp.c,v 1.3 2012/03/22 17:32:22 christos Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -68,20 +68,20 @@ _lwp_makecontext(ucontext_t *u, void (*s sp[1] = 0x2000; /* make this a CALLS frame */ sp[2] = 0; /* saved argument pointer */ sp[3] = 0; /* saved frame pointer */ - sp[4] = (intptr_t)_lwp_exit + 2;/* return via _lwp_exit */ + sp[4] = (int)(uintptr_t)_lwp_exit + 2;/* return via _lwp_exit */ sp[5] = 1; /* argc */ - sp[6] = (intptr_t)arg; /* argv */ + sp[6] = (int)(uintptr_t)arg; /* argv */ - gr[_REG_AP] = (__greg_t)(sp + 5); - gr[_REG_SP] = (__greg_t)sp; - gr[_REG_FP] = (__greg_t)sp; - gr[_REG_PC] = (__greg_t)start + 2; + gr[_REG_AP] = (__greg_t)(uintptr_t)(sp + 5); + gr[_REG_SP] = (__greg_t)(uintptr_t)sp; + gr[_REG_FP] = (__greg_t)(uintptr_t)sp; + gr[_REG_PC] = (__greg_t)(uintptr_t)start + 2; /* * Push the TLS pointer onto the new stack also. * The _UC_TLSBASE flag tells the kernel to pop it and use it. */ - *--sp = (intptr_t)private; - gr[_REG_SP] = (__greg_t)sp; + *--sp = (int)(intptr_t)private; + gr[_REG_SP] = (__greg_t)(uintptr_t)sp; u->uc_flags |= _UC_TLSBASE; } Index: src/lib/libc/arch/vax/gen/makecontext.c diff -u src/lib/libc/arch/vax/gen/makecontext.c:1.3 src/lib/libc/arch/vax/gen/makecontext.c:1.4 --- src/lib/libc/arch/vax/gen/makecontext.c:1.3 Mon Apr 28 16:22:57 2008 +++ src/lib/libc/arch/vax/gen/makecontext.c Thu Mar 22 13:32:22 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:57 martin Exp $ */ +/* $NetBSD: makecontext.c,v 1.4 2012/03/22 17:32:22 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:57 martin Exp $"); +__RCSID("$NetBSD: makecontext.c,v 1.4 2012/03/22 17:32:22 christos Exp $"); #endif #include @@ -69,11 +69,11 @@ makecontext(ucontext_t *ucp, void (*func sp[1] = 0x2000; /* make this a CALLS frame */ sp[2] = 0; /* saved argument pointer */ sp[3] = 0; /* saved frame pointer */ - sp[4] = (int)_resumecontext+2; /* return via trampoline code */ + sp[4] = (int)(uintptr_t)_resumecontext+2;/* return via trampoline code */ - gr[_REG_AP] = (__greg_t)(sp + 5); - gr[_REG_SP] = (__greg_t)sp; - gr[_REG_FP] = (__greg_t)sp; - gr[_REG_PC] = (__greg_t)func+2; + gr[_REG_AP] = (__greg_t)(uintptr_t)(sp + 5); + gr[_REG_SP] = (__greg_t)(uintptr_t)sp; + gr[_REG_FP] = (__greg_t)(uintptr_t)sp; + gr[_REG_PC] = (__greg_t)(uintptr_t)func+2; } Index: src/lib/libc/rpc/xdr_float.c diff -u src/lib/libc/rpc/xdr_float.c:1.35 src/lib/libc/rpc/xdr_float.c:1.36 --- src/lib/libc/rpc/xdr_float.c:1.35 Sat Feb 14 01:26:42 2009 +++ src/lib/libc/rpc/xdr_float.c Thu Mar 22 13:32:21 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: xdr_float.c,v 1.35 2009/02/14 06:26:42 lukem Exp $ */ +/* $NetBSD: xdr_float.c,v 1.36 2012/03/22 17:32:21 christos Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -35,7 +35,7 @@ static char *sccsid = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC"; #else -__RCSID("$NetBSD: xdr_float.c,v 1.35 2009/02/14 06:26:42 lukem Exp $"); +__RCSID("$NetBSD: xdr_float.c,v 1.36 2012/03/22 17:32:21 christos Exp $"); #endif #endif @@ -125,7 +125,7 @@ xdr_float(xdrs, fp) #ifdef IEEEFP return (XDR_PUTINT32(xdrs, (int32_t *)(void *)fp)); #else - vs = *((struct vax_single *)fp); + vs = *((struct vax_single *)(void *)fp); for (i = 0, lim = sgl_limits; i < sizeof(sgl_limits)/sizeof(struct sgl_limits); i++, lim++) { @@ -147,7 +147,7 @@ xdr_float(xdrs, fp) #ifdef IEEEFP return (XDR_GETINT32(xdrs, (int32_t *)(void *)fp)); #else - vsp = (struct vax_single *)fp; +
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu Mar 22 16:06:02 UTC 2012 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-thread.c Log Message: only +1 for the 0'th thread (if we did not find any other) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/dist/gdb/nbsd-thread.c diff -u src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.11 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.12 --- src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.11 Thu Mar 22 11:26:32 2012 +++ src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Thu Mar 22 12:06:01 2012 @@ -328,13 +328,15 @@ find_active_thread (void) while ((val != -1) && (pl.pl_lwpid != 0) && (pl.pl_event != PL_EVENT_SIGNAL)) val = ptrace (PT_LWPINFO, GET_PID(inferior_ptid), (void *)&pl, sizeof(pl)); + if (pl.pl_lwpid == 0) + pl.pl_lwpid = 1; } else { return inferior_ptid; } - cached_thread = BUILD_LWP (pl.pl_lwpid + 1, main_ptid); + cached_thread = BUILD_LWP (pl.pl_lwpid, main_ptid); return cached_thread; }
CVS commit: src/common/lib/libc/stdlib
Module Name:src Committed By: christos Date: Thu Mar 22 15:57:29 UTC 2012 Modified Files: src/common/lib/libc/stdlib: _strtoul.h Log Message: bring the casts to the operands, not the operation results. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/stdlib/_strtoul.h 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/stdlib/_strtoul.h diff -u src/common/lib/libc/stdlib/_strtoul.h:1.2 src/common/lib/libc/stdlib/_strtoul.h:1.3 --- src/common/lib/libc/stdlib/_strtoul.h:1.2 Fri Mar 9 10:41:16 2012 +++ src/common/lib/libc/stdlib/_strtoul.h Thu Mar 22 11:57:29 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _strtoul.h,v 1.2 2012/03/09 15:41:16 christos Exp $ */ +/* $NetBSD: _strtoul.h,v 1.3 2012/03/22 15:57:29 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -91,8 +91,8 @@ _FUNCNAME(const char *nptr, char **endpt /* * See strtol for comments as to the logic used. */ - cutoff = (__UINT)(__UINT_MAX / (__UINT)base); - cutlim = (int)(__UINT_MAX % (__UINT)base); + cutoff = ((__UINT)__UINT_MAX / (__UINT)base); + cutlim = (int)((__UINT)__UINT_MAX % (__UINT)base); for (acc = 0, any = 0;; c = *s++) { if (isdigit(c)) i = c - '0';
CVS commit: src/share/man/man4
Module Name:src Committed By: sborrill Date: Thu Mar 22 15:43:37 UTC 2012 Modified Files: src/share/man/man4: mfi.4 Log Message: Add IBM ServeRAID M1015 and M5014 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/mfi.4 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/man4/mfi.4 diff -u src/share/man/man4/mfi.4:1.10 src/share/man/man4/mfi.4:1.11 --- src/share/man/man4/mfi.4:1.10 Tue Feb 9 06:48:28 2010 +++ src/share/man/man4/mfi.4 Thu Mar 22 15:43:37 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: mfi.4,v 1.10 2010/02/09 06:48:28 wiz Exp $ +.\" $NetBSD: mfi.4,v 1.11 2012/03/22 15:43:37 sborrill Exp $ .\" $OpenBSD: mfi.4,v 1.7 2006/09/01 09:58:09 jmc Exp $ .\" .\" Written by Marco Peereboom @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 9, 2010 +.Dd March 22, 2012 .Dt MFI 4 .Os .Sh NAME @@ -59,6 +59,9 @@ MegaRAID SAS 8708ELP, MegaRAID SAS ELP, MegaRAID SAS 8880EM2, MegaRAID SAS 9260-8i +.It +IBM ServeRAID M1015, +ServeRAID M5014 .El .Pp These controllers support RAID 0, RAID 1, RAID 5, RAID 6, RAID 10, RAID 50 and
CVS commit: src/lib/libc/gdtoa
Module Name:src Committed By: christos Date: Thu Mar 22 15:34:14 UTC 2012 Modified Files: src/lib/libc/gdtoa: strtod.c Log Message: add constcond, make shifts unsigned To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gdtoa/strtod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gdtoa/strtod.c diff -u src/lib/libc/gdtoa/strtod.c:1.10 src/lib/libc/gdtoa/strtod.c:1.11 --- src/lib/libc/gdtoa/strtod.c:1.10 Thu Mar 22 09:15:48 2012 +++ src/lib/libc/gdtoa/strtod.c Thu Mar 22 11:34:14 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: strtod.c,v 1.10 2012/03/22 13:15:48 he Exp $ */ +/* $NetBSD: strtod.c,v 1.11 2012/03/22 15:34:14 christos Exp $ */ / @@ -554,10 +554,10 @@ strtod if (j >= 53) word0(&rv) = (P+2)*Exp_msk1; else - word0(&rv) &= 0x << (j-32); + word0(&rv) &= 0xU << (j-32); } else - word1(&rv) &= 0x << j; + word1(&rv) &= 0xU << j; } #else for(j = 0; e1 > 1; j++, e1 = (unsigned int)e1 >> 1) @@ -956,6 +956,7 @@ strtod aadj *= 0.5; dval(&aadj1) = dsign ? aadj : -aadj; #ifdef Check_FLT_ROUNDS + /* CONSTCOND */ switch(Rounding) { case 2: /* towards +infinity */ dval(&aadj1) -= 0.5;
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Thu Mar 22 15:26:32 UTC 2012 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-thread.c Log Message: complete the mapping of the lwp -> (lwp - 1), by adding 1 where appropriate. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/dist/gdb/nbsd-thread.c diff -u src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.10 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.11 --- src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.10 Wed Mar 21 19:20:58 2012 +++ src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Thu Mar 22 11:26:32 2012 @@ -84,7 +84,7 @@ static ptid_t find_active_thread (void); static void nbsd_find_new_threads (struct target_ops *); #define GET_PID(ptid) ptid_get_pid (ptid) -#define GET_LWP(ptid) ptid_get_lwp (ptid) +#define GET_LWP(ptid) (ptid_get_lwp (ptid) + 1) #define GET_THREAD(ptid) ptid_get_tid (ptid) #define IS_LWP(ptid) (GET_LWP (ptid) != 0) @@ -334,7 +334,7 @@ find_active_thread (void) return inferior_ptid; } - cached_thread = BUILD_LWP (pl.pl_lwpid, main_ptid); + cached_thread = BUILD_LWP (pl.pl_lwpid + 1, main_ptid); return cached_thread; }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: sborrill Date: Thu Mar 22 15:05:37 UTC 2012 Modified Files: src/sys/dev/pci: mfi_pci.c Log Message: Add IBM ServeRAID M5014 as subtype To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/mfi_pci.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/mfi_pci.c diff -u src/sys/dev/pci/mfi_pci.c:1.13 src/sys/dev/pci/mfi_pci.c:1.14 --- src/sys/dev/pci/mfi_pci.c:1.13 Wed Mar 21 14:22:35 2012 +++ src/sys/dev/pci/mfi_pci.c Thu Mar 22 15:05:36 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mfi_pci.c,v 1.13 2012/03/21 14:22:35 sborrill Exp $ */ +/* $NetBSD: mfi_pci.c,v 1.14 2012/03/22 15:05:36 sborrill Exp $ */ /* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */ /* * Copyright (c) 2006 Marco Peereboom @@ -17,7 +17,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.13 2012/03/21 14:22:35 sborrill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.14 2012/03/22 15:05:36 sborrill Exp $"); #include #include @@ -85,6 +85,7 @@ static const struct mfi_pci_subtype mfi_ static const struct mfi_pci_subtype mfi_gen2_subtypes[] = { { PCI_VENDOR_SYMBIOS, 0x9261, "SAS 9260-8i" }, + { PCI_VENDOR_IBM, 0x03c7, "IBM ServeRAID M5014 SAS/SATA" }, { 0x0, 0, "" } };
CVS commit: src/lib/libc/gen
Module Name:src Committed By: christos Date: Thu Mar 22 14:18:34 UTC 2012 Modified Files: src/lib/libc/gen: nlist_coff.c Log Message: get rid of the cheesy BAD macros To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gen/nlist_coff.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/nlist_coff.c diff -u src/lib/libc/gen/nlist_coff.c:1.10 src/lib/libc/gen/nlist_coff.c:1.11 --- src/lib/libc/gen/nlist_coff.c:1.10 Thu Mar 22 09:42:36 2012 +++ src/lib/libc/gen/nlist_coff.c Thu Mar 22 10:18:34 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: nlist_coff.c,v 1.10 2012/03/22 13:42:36 he Exp $ */ +/* $NetBSD: nlist_coff.c,v 1.11 2012/03/22 14:18:34 christos Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou @@ -36,7 +36,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: nlist_coff.c,v 1.10 2012/03/22 13:42:36 he Exp $"); +__RCSID("$NetBSD: nlist_coff.c,v 1.11 2012/03/22 14:18:34 christos Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -58,10 +58,6 @@ __RCSID("$NetBSD: nlist_coff.c,v 1.10 20 #endif #ifdef NLIST_COFF -#define BAD do { rv = -1; goto out; } \ - /* NOTREACHED */ while (/*CONSTCOND*/0) -#define BADUNMAP do { rv = -1; goto unmap; } \ - /* NOTREACHED */ while (/*CONSTCOND*/0) #define ES_LEN 18 struct coff_extsym { @@ -103,20 +99,20 @@ __fdnlist_coff(int fd, struct nlist *lis * If we can't fstat() the file, something bad is going on. */ if (fstat(fd, &st) < 0) - BAD; + goto out; /* * Map the file in its entirety. */ if ((uintmax_t)st.st_size > (uintmax_t)SIZE_T_MAX) { errno = EFBIG; - BAD; + goto out; } mappedsize = (size_t)st.st_size; mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_PRIVATE|MAP_FILE, fd, 0); - if (mappedfile == (char *)-1) - BAD; + if (mappedfile == MAP_FAILED) + goto out; /* * Make sure we can access the executable's header @@ -124,11 +120,11 @@ __fdnlist_coff(int fd, struct nlist *lis * as an COFF binary. */ if (mappedsize < sizeof (struct coff_filehdr)) - BADUNMAP; + goto unmap; filehdrp = (void *)&mappedfile[0]; if (COFF_BADMAG(filehdrp)) - BADUNMAP; + goto unmap; /* * Find the symbol list. @@ -137,7 +133,7 @@ __fdnlist_coff(int fd, struct nlist *lis nesyms = filehdrp->f_nsyms; if (symoff + ES_LEN * nesyms > mappedsize) - BADUNMAP; + goto unmap; extstroff = symoff + ES_LEN * nesyms; nent = 0; @@ -193,7 +189,7 @@ done: unmap: munmap(mappedfile, mappedsize); out: - return (rv); + return rv; } #endif /* NLIST_COFF */
CVS commit: src/lib/libc/gen
Module Name:src Committed By: he Date: Thu Mar 22 13:42:36 UTC 2012 Modified Files: src/lib/libc/gen: nlist_coff.c Log Message: Make this lint-free (only built for real for the __sh__ ports): * Mark some code after goto as /* NOTREACHED */ * Add a cast for file size (off_t) to size_t to avoid warning about possibly losing bits. * Avoid a "pointer casts may be troublesome" warning from lint by doing a cast via "void *" instead of directly to "struct coff_filehdr *". To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gen/nlist_coff.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/nlist_coff.c diff -u src/lib/libc/gen/nlist_coff.c:1.9 src/lib/libc/gen/nlist_coff.c:1.10 --- src/lib/libc/gen/nlist_coff.c:1.9 Wed Mar 21 15:32:26 2012 +++ src/lib/libc/gen/nlist_coff.c Thu Mar 22 13:42:36 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: nlist_coff.c,v 1.9 2012/03/21 15:32:26 christos Exp $ */ +/* $NetBSD: nlist_coff.c,v 1.10 2012/03/22 13:42:36 he Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou @@ -36,7 +36,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: nlist_coff.c,v 1.9 2012/03/21 15:32:26 christos Exp $"); +__RCSID("$NetBSD: nlist_coff.c,v 1.10 2012/03/22 13:42:36 he Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -58,8 +58,10 @@ __RCSID("$NetBSD: nlist_coff.c,v 1.9 201 #endif #ifdef NLIST_COFF -#define BAD do { rv = -1; goto out; } while (/*CONSTCOND*/0) -#define BADUNMAP do { rv = -1; goto unmap; } while (/*CONSTCOND*/0) +#define BAD do { rv = -1; goto out; } \ + /* NOTREACHED */ while (/*CONSTCOND*/0) +#define BADUNMAP do { rv = -1; goto unmap; } \ + /* NOTREACHED */ while (/*CONSTCOND*/0) #define ES_LEN 18 struct coff_extsym { @@ -110,7 +112,7 @@ __fdnlist_coff(int fd, struct nlist *lis errno = EFBIG; BAD; } - mappedsize = st.st_size; + mappedsize = (size_t)st.st_size; mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_PRIVATE|MAP_FILE, fd, 0); if (mappedfile == (char *)-1) @@ -123,7 +125,7 @@ __fdnlist_coff(int fd, struct nlist *lis */ if (mappedsize < sizeof (struct coff_filehdr)) BADUNMAP; - filehdrp = (struct coff_filehdr *)&mappedfile[0]; + filehdrp = (void *)&mappedfile[0]; if (COFF_BADMAG(filehdrp)) BADUNMAP;
CVS commit: src/lib/libc/gen
Module Name:src Committed By: he Date: Thu Mar 22 13:25:45 UTC 2012 Modified Files: src/lib/libc/gen: modf_ieee754.c Log Message: Add a pair of casts to silence lint about conversion possibly losing bits. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/gen/modf_ieee754.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/modf_ieee754.c diff -u src/lib/libc/gen/modf_ieee754.c:1.3 src/lib/libc/gen/modf_ieee754.c:1.4 --- src/lib/libc/gen/modf_ieee754.c:1.3 Wed Jan 27 14:10:41 2010 +++ src/lib/libc/gen/modf_ieee754.c Thu Mar 22 13:25:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: modf_ieee754.c,v 1.3 2010/01/27 14:10:41 drochner Exp $ */ +/* $NetBSD: modf_ieee754.c,v 1.4 2012/03/22 13:25:45 he Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -92,8 +92,8 @@ modf(double val, double *iptr) frac = ((u_int64_t)v.dblu_dbl.dbl_frach << 32) + v.dblu_dbl.dbl_fracl; frac >>= DBL_FRACBITS - (u.dblu_dbl.dbl_exp - DBL_EXP_BIAS); frac <<= DBL_FRACBITS - (u.dblu_dbl.dbl_exp - DBL_EXP_BIAS); - v.dblu_dbl.dbl_fracl = frac & 0x; - v.dblu_dbl.dbl_frach = frac >> 32; + v.dblu_dbl.dbl_fracl = (u_int) (frac & 0xULL); + v.dblu_dbl.dbl_frach = (u_int) (frac >> 32); *iptr = v.dblu_d; u.dblu_d -= v.dblu_d;
CVS commit: src/lib/libc/gdtoa
Module Name:src Committed By: he Date: Thu Mar 22 13:15:48 UTC 2012 Modified Files: src/lib/libc/gdtoa: strtod.c Log Message: A few modifications to make this build for vax: * The decpt variable is only used if INFNAN_CHECK, which isn't defined for vax. * Use a cast to avoid warning about shift of a signed variable. * Mark a condition as (potentially) a constant condition. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gdtoa/strtod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gdtoa/strtod.c diff -u src/lib/libc/gdtoa/strtod.c:1.9 src/lib/libc/gdtoa/strtod.c:1.10 --- src/lib/libc/gdtoa/strtod.c:1.9 Tue Mar 13 21:13:34 2012 +++ src/lib/libc/gdtoa/strtod.c Thu Mar 22 13:15:48 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: strtod.c,v 1.9 2012/03/13 21:13:34 christos Exp $ */ +/* $NetBSD: strtod.c,v 1.10 2012/03/22 13:15:48 he Exp $ */ / @@ -97,7 +97,10 @@ strtod #ifdef Avoid_Underflow int scale; #endif - int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, decpt, dsign, +#ifdef INFNAN_CHECK + int decpt; +#endif + int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; CONST char *s, *s0, *s1; double aadj; @@ -148,7 +151,10 @@ strtod #endif /*}}*/ #endif /*}*/ - sign = nz0 = nz = decpt = 0; +#ifdef INFNAN_CHECK + decpt = 0; +#endif + sign = nz0 = nz = 0; dval(&rv) = 0.; for(s = s00;;s++) switch(*s) { case '-': @@ -229,7 +235,9 @@ strtod if (c == '.') { c = *++s; #endif +#ifdef INFNAN_CHECK decpt = 1; +#endif if (!nd) { for(; c == '0'; c = *++s) nz++; @@ -552,7 +560,7 @@ strtod word1(&rv) &= 0x << j; } #else - for(j = 0; e1 > 1; j++, e1 >>= 1) + for(j = 0; e1 > 1; j++, e1 = (unsigned int)e1 >> 1) if (e1 & 1) dval(&rv) *= tinytens[j]; /* The last multiplication could underflow. */ @@ -957,6 +965,7 @@ strtod dval(&aadj1) += 0.5; } #else + /* CONSTCOND */ if (Flt_Rounds == 0) dval(&aadj1) += 0.5; #endif /*Check_FLT_ROUNDS*/
CVS commit: src/lib/libc/gdtoa
Module Name:src Committed By: he Date: Thu Mar 22 13:09:13 UTC 2012 Modified Files: src/lib/libc/gdtoa: strtodg.c Log Message: A few fixes to make this build for vax: * The fivesbits[] variable is not used for vax * The decpt variable is only used if INFNAN_CHECK, which isn't defined for vax To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gdtoa/strtodg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gdtoa/strtodg.c diff -u src/lib/libc/gdtoa/strtodg.c:1.9 src/lib/libc/gdtoa/strtodg.c:1.10 --- src/lib/libc/gdtoa/strtodg.c:1.9 Tue Mar 13 21:13:34 2012 +++ src/lib/libc/gdtoa/strtodg.c Thu Mar 22 13:09:12 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: strtodg.c,v 1.9 2012/03/13 21:13:34 christos Exp $ */ +/* $NetBSD: strtodg.c,v 1.10 2012/03/22 13:09:12 he Exp $ */ / @@ -37,14 +37,13 @@ THIS SOFTWARE. #include "locale.h" #endif +#ifndef VAX static CONST int fivesbits[] = { 0, 3, 5, 7, 10, 12, 14, 17, 19, 21, 24, 26, 28, 31, 33, 35, 38, 40, 42, 45, 47, 49, 52 -#ifdef VAX - , 54, 56 -#endif }; +#endif Bigint * #ifdef KR_headers @@ -329,7 +328,10 @@ strtodg #endif { int abe, abits, asub; - int bb0, bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, decpt, denorm; +#ifdef INFNAN_CHECK + int decpt; +#endif + int bb0, bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, denorm; int dsign, e, e1, e2, emin, esign, finished, i, inex, irv; int j, k, nbits, nd, nd0, nf, nz, nz0, rd, rvbits, rve, rve1, sign; int sudden_underflow = 0; /* pacify gcc */ @@ -413,7 +415,10 @@ strtodg sudden_underflow = fpi->sudden_underflow; s0 = s; y = z = 0; - for(decpt = nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++) +#ifdef INFNAN_CHECK + decpt = 0; +#endif + for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++) if (nd < 9) y = 10*y + c - '0'; else if (nd < 16) @@ -430,7 +435,9 @@ strtodg if (c == '.') { c = *++s; #endif +#ifdef INFNAN_CHECK decpt = 1; +#endif if (!nd) { for(; c == '0'; c = *++s) nz++;
CVS commit: src/lib/csu/alpha
Module Name:src Committed By: he Date: Thu Mar 22 13:02:16 UTC 2012 Modified Files: src/lib/csu/alpha: crt0.c Log Message: Convert to use c89 function declaration. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/csu/alpha/crt0.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/alpha/crt0.c diff -u src/lib/csu/alpha/crt0.c:1.26 src/lib/csu/alpha/crt0.c:1.27 --- src/lib/csu/alpha/crt0.c:1.26 Mon Mar 7 05:09:09 2011 +++ src/lib/csu/alpha/crt0.c Thu Mar 22 13:02:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: crt0.c,v 1.26 2011/03/07 05:09:09 joerg Exp $ */ +/* $NetBSD: crt0.c,v 1.27 2012/03/22 13:02:15 he Exp $ */ /* * Copyright (c) 1995 Christopher G. Demetriou @@ -40,11 +40,8 @@ void __start __P((char **, void (*cleanu struct ps_strings *)); void -__start(sp, cleanup, obj, ps_strings) - char **sp; - void (*cleanup) __P((void)); /* from shared loader */ - const Obj_Entry *obj; /* from shared loader */ - struct ps_strings *ps_strings; +__start(char **sp, void (*cleanup)(void), + const Obj_Entry *obj, struct ps_strings *ps_strings) { long argc; char **argv, *namep; @@ -86,7 +83,7 @@ __start(sp, cleanup, obj, ps_strings) * NOTE: Leave the RCS ID _after_ __start(), in case it gets placed in .text. */ #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: crt0.c,v 1.26 2011/03/07 05:09:09 joerg Exp $"); +__RCSID("$NetBSD: crt0.c,v 1.27 2012/03/22 13:02:15 he Exp $"); #endif /* LIBC_SCCS and not lint */ #include "common.c"
CVS commit: src/sys/net
Module Name:src Committed By: wiz Date: Thu Mar 22 12:59:33 UTC 2012 Modified Files: src/sys/net: if_bridge.c Log Message: Fix typo in kauth name. From PR 46234 by Matthew Mondor. Tested by Geoff Adams and Ryo ONODERA. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/net/if_bridge.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/net/if_bridge.c diff -u src/sys/net/if_bridge.c:1.75 src/sys/net/if_bridge.c:1.76 --- src/sys/net/if_bridge.c:1.75 Tue Mar 13 18:40:58 2012 +++ src/sys/net/if_bridge.c Thu Mar 22 12:59:33 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bridge.c,v 1.75 2012/03/13 18:40:58 elad Exp $ */ +/* $NetBSD: if_bridge.c,v 1.76 2012/03/22 12:59:33 wiz Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -80,7 +80,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.75 2012/03/13 18:40:58 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.76 2012/03/22 12:59:33 wiz Exp $"); #ifdef _KERNEL_OPT #include "opt_bridge_ipf.h" @@ -467,7 +467,7 @@ bridge_ioctl(struct ifnet *ifp, u_long c KAUTH_NETWORK_INTERFACE_BRIDGE, cmd == SIOCGDRVSPEC ? KAUTH_REQ_NETWORK_INTERFACE_BRIDGE_GETPRIV : - KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, + KAUTH_REQ_NETWORK_INTERFACE_BRIDGE_SETPRIV, ifd, NULL, NULL); if (error) return (error);
CVS commit: src/lib/libc/arch/hppa/gen
Module Name:src Committed By: skrll Date: Thu Mar 22 12:31:32 UTC 2012 Modified Files: src/lib/libc/arch/hppa/gen: __longjmp14.c makecontext.c Log Message: Shut lint up about dp. >From he@ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/hppa/gen/__longjmp14.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/hppa/gen/makecontext.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/hppa/gen/__longjmp14.c diff -u src/lib/libc/arch/hppa/gen/__longjmp14.c:1.4 src/lib/libc/arch/hppa/gen/__longjmp14.c:1.5 --- src/lib/libc/arch/hppa/gen/__longjmp14.c:1.4 Mon Apr 28 20:22:55 2008 +++ src/lib/libc/arch/hppa/gen/__longjmp14.c Thu Mar 22 12:31:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: __longjmp14.c,v 1.4 2008/04/28 20:22:55 martin Exp $ */ +/* $NetBSD: __longjmp14.c,v 1.5 2012/03/22 12:31:32 skrll Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -81,6 +81,7 @@ __longjmp14(jmp_buf env, int val) uc.uc_mcontext.__gregs[18] = regs[18]; /* Preserve the current value of DP */ + /* LINTED dp is r27, so is "initialized" */ uc.uc_mcontext.__gregs[27] = dp; /* Set the desired return value. */ Index: src/lib/libc/arch/hppa/gen/makecontext.c diff -u src/lib/libc/arch/hppa/gen/makecontext.c:1.5 src/lib/libc/arch/hppa/gen/makecontext.c:1.6 --- src/lib/libc/arch/hppa/gen/makecontext.c:1.5 Tue Sep 20 08:42:29 2011 +++ src/lib/libc/arch/hppa/gen/makecontext.c Thu Mar 22 12:31:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: makecontext.c,v 1.5 2011/09/20 08:42:29 joerg Exp $ */ +/* $NetBSD: makecontext.c,v 1.6 2012/03/22 12:31:32 skrll Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: makecontext.c,v 1.5 2011/09/20 08:42:29 joerg Exp $"); +__RCSID("$NetBSD: makecontext.c,v 1.6 2012/03/22 12:31:32 skrll Exp $"); #endif #include @@ -81,6 +81,7 @@ makecontext(ucontext_t *ucp, void (*func } gr[_REG_PCOQH] = fp | HPPA_PC_PRIV_USER; gr[_REG_PCOQT] = (fp + 4) | HPPA_PC_PRIV_USER; + /* LINTED dp is reg27, ref. above, so initialized */ gr[_REG_DP] = dp; /* Construct argument list. */
CVS commit: src/lib/libc/arch
Module Name:src Committed By: he Date: Thu Mar 22 09:32:04 UTC 2012 Modified Files: src/lib/libc/arch/arm/gen: _lwp.c src/lib/libc/arch/sh3/gen: _lwp.c Log Message: Follow the pattern from powerpc, make lint happy. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/arm/gen/_lwp.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/sh3/gen/_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/arm/gen/_lwp.c diff -u src/lib/libc/arch/arm/gen/_lwp.c:1.7 src/lib/libc/arch/arm/gen/_lwp.c:1.8 --- src/lib/libc/arch/arm/gen/_lwp.c:1.7 Wed Mar 21 14:03:06 2012 +++ src/lib/libc/arch/arm/gen/_lwp.c Thu Mar 22 09:32:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _lwp.c,v 1.7 2012/03/21 14:03:06 christos Exp $ */ +/* $NetBSD: _lwp.c,v 1.8 2012/03/22 09:32:04 he Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -37,7 +37,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: _lwp.c,v 1.7 2012/03/21 14:03:06 christos Exp $"); +__RCSID("$NetBSD: _lwp.c,v 1.8 2012/03/22 09:32:04 he Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -50,7 +50,7 @@ void _lwp_makecontext(ucontext_t *u, void (*start)(void *), void *arg, void *private, caddr_t stack_base, size_t stack_size) { - void **sp; + uintptr_t sp; getcontext(u); u->uc_link = NULL; @@ -58,13 +58,13 @@ _lwp_makecontext(ucontext_t *u, void (*s u->uc_stack.ss_sp = stack_base; u->uc_stack.ss_size = stack_size; - sp = (void *) (stack_base + stack_size); + sp = (uintptr_t)stack_base + stack_size; /* * Note: We make sure the stack is 8-byte aligned, here. */ u->uc_mcontext.__gregs[_REG_R0] = (__greg_t)(uintptr_t)arg; - u->uc_mcontext.__gregs[_REG_SP] = ((__greg_t)(uintptr_t)sp) & ~7; + u->uc_mcontext.__gregs[_REG_SP] = ((__greg_t)sp) & ~7; u->uc_mcontext.__gregs[_REG_LR] = (__greg_t)(uintptr_t)_lwp_exit; u->uc_mcontext.__gregs[_REG_PC] = (__greg_t)(uintptr_t)start; u->uc_mcontext._mc_tlsbase = (__greg_t)(uintptr_t)private; Index: src/lib/libc/arch/sh3/gen/_lwp.c diff -u src/lib/libc/arch/sh3/gen/_lwp.c:1.5 src/lib/libc/arch/sh3/gen/_lwp.c:1.6 --- src/lib/libc/arch/sh3/gen/_lwp.c:1.5 Thu Feb 24 04:28:42 2011 +++ src/lib/libc/arch/sh3/gen/_lwp.c Thu Mar 22 09:32:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _lwp.c,v 1.5 2011/02/24 04:28:42 joerg Exp $ */ +/* $NetBSD: _lwp.c,v 1.6 2012/03/22 09:32:04 he Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -37,7 +37,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: _lwp.c,v 1.5 2011/02/24 04:28:42 joerg Exp $"); +__RCSID("$NetBSD: _lwp.c,v 1.6 2012/03/22 09:32:04 he Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -50,7 +50,7 @@ void _lwp_makecontext(ucontext_t *u, void (*start)(void *), void *arg, void *private, caddr_t stack_base, size_t stack_size) { - void **sp; + uintptr_t sp; getcontext(u); u->uc_link = NULL; @@ -58,7 +58,7 @@ _lwp_makecontext(ucontext_t *u, void (*s u->uc_stack.ss_sp = stack_base; u->uc_stack.ss_size = stack_size; - sp = (void **) (stack_base + stack_size); + sp = (uintptr_t)stack_base + stack_size; u->uc_mcontext.__gregs[_REG_R4] = (__greg_t) arg; u->uc_mcontext.__gregs[_REG_SP] = ((__greg_t) sp) & ~3;
CVS commit: src/lib/libc/arch/sh3/gen
Module Name:src Committed By: he Date: Thu Mar 22 08:58:39 UTC 2012 Modified Files: src/lib/libc/arch/sh3/gen: flt_rounds.c Log Message: Add a void to make function declaration c89. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sh3/gen/flt_rounds.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/sh3/gen/flt_rounds.c diff -u src/lib/libc/arch/sh3/gen/flt_rounds.c:1.4 src/lib/libc/arch/sh3/gen/flt_rounds.c:1.5 --- src/lib/libc/arch/sh3/gen/flt_rounds.c:1.4 Wed Jan 17 23:24:22 2007 +++ src/lib/libc/arch/sh3/gen/flt_rounds.c Thu Mar 22 08:58:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: flt_rounds.c,v 1.4 2007/01/17 23:24:22 hubertf Exp $ */ +/* $NetBSD: flt_rounds.c,v 1.5 2012/03/22 08:58:39 he Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe @@ -33,7 +33,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: flt_rounds.c,v 1.4 2007/01/17 23:24:22 hubertf Exp $"); +__RCSID("$NetBSD: flt_rounds.c,v 1.5 2012/03/22 08:58:39 he Exp $"); #endif /* LIBC_SCCS and not lint */ #include @@ -75,7 +75,7 @@ static const int map[] = { extern int __flt_rounds __P((void)); int -__flt_rounds() +__flt_rounds(void) { return(map[fpgetround()]); }
CVS commit: src/dist/pdisk
Module Name:src Committed By: he Date: Thu Mar 22 08:56:52 UTC 2012 Modified Files: src/dist/pdisk: dump.c Log Message: Add a void to make function declaration c89. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/dist/pdisk/dump.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/pdisk/dump.c diff -u src/dist/pdisk/dump.c:1.10 src/dist/pdisk/dump.c:1.11 --- src/dist/pdisk/dump.c:1.10 Sun May 10 22:03:22 2009 +++ src/dist/pdisk/dump.c Thu Mar 22 08:56:52 2012 @@ -390,7 +390,7 @@ dump_partition_entry(partition_map *entr void -list_all_disks() +list_all_disks(void) { MEDIA_ITERATOR iter; MEDIA m;
CVS commit: src/lib/libarch/alpha
Module Name:src Committed By: he Date: Thu Mar 22 08:54:48 UTC 2012 Modified Files: src/lib/libarch/alpha: alpha_pci_io.c Log Message: Add a cast of the shift count to int32_t, so that we don't try to do int32_t << long, since ANSI C doesn't perform "balancing" before the shift operation according to lint. Should not make a difference, offset is limited to 0..3 anyway. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libarch/alpha/alpha_pci_io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libarch/alpha/alpha_pci_io.c diff -u src/lib/libarch/alpha/alpha_pci_io.c:1.5 src/lib/libarch/alpha/alpha_pci_io.c:1.6 --- src/lib/libarch/alpha/alpha_pci_io.c:1.5 Mon Apr 28 20:22:55 2008 +++ src/lib/libarch/alpha/alpha_pci_io.c Thu Mar 22 08:54:48 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: alpha_pci_io.c,v 1.5 2008/04/28 20:22:55 martin Exp $ */ +/* $NetBSD: alpha_pci_io.c,v 1.6 2012/03/22 08:54:48 he Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -195,7 +195,7 @@ alpha_pci_io_swiz_outb(bus_addr_t ioaddr { uint32_t *port = alpha_pci_io_swiz(ioaddr, 0); bus_addr_t offset = ioaddr & 3; - uint32_t nval = ((uint32_t)val) << (8 * offset); + uint32_t nval = ((uint32_t)val) << (uint32_t)(8 * offset); *port = nval; alpha_mb(); @@ -206,7 +206,7 @@ alpha_pci_io_swiz_outw(bus_addr_t ioaddr { uint32_t *port = alpha_pci_io_swiz(ioaddr, 1); bus_addr_t offset = ioaddr & 3; - uint32_t nval = ((uint32_t)val) << (8 * offset); + uint32_t nval = ((uint32_t)val) << (uint32_t)(8 * offset); *port = nval; alpha_mb();
CVS commit: src/lib/libarch/alpha
Module Name:src Committed By: he Date: Thu Mar 22 08:52:22 UTC 2012 Modified Files: src/lib/libarch/alpha: alpha_bus_window.c Log Message: Make 'i' unsigned to avoid signed/unsigned comparison warnings from lint. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libarch/alpha/alpha_bus_window.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libarch/alpha/alpha_bus_window.c diff -u src/lib/libarch/alpha/alpha_bus_window.c:1.3 src/lib/libarch/alpha/alpha_bus_window.c:1.4 --- src/lib/libarch/alpha/alpha_bus_window.c:1.3 Mon Apr 28 20:22:55 2008 +++ src/lib/libarch/alpha/alpha_bus_window.c Thu Mar 22 08:52:22 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: alpha_bus_window.c,v 1.3 2008/04/28 20:22:55 martin Exp $ */ +/* $NetBSD: alpha_bus_window.c,v 1.4 2012/03/22 08:52:22 he Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ alpha_bus_getwindows(int type, struct al struct alpha_bus_get_window_count_args count_args; struct alpha_bus_get_window_args window_args; struct alpha_bus_window *abw; - int i; + unsigned int i; count_args.type = type; if (sysarch(ALPHA_BUS_GET_WINDOW_COUNT, &count_args) != 0)
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: he Date: Thu Mar 22 08:39:44 UTC 2012 Modified Files: src/sys/arch/arm/include: limits.h Log Message: Make sure that the UQUAD_MAX constant is marked as unsigned, to avoid "ANSI C treats constant as unsigned" warning from lint. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/include/limits.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/arch/arm/include/limits.h diff -u src/sys/arch/arm/include/limits.h:1.10 src/sys/arch/arm/include/limits.h:1.11 --- src/sys/arch/arm/include/limits.h:1.10 Mon Jun 7 13:52:30 2010 +++ src/sys/arch/arm/include/limits.h Thu Mar 22 08:39:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: limits.h,v 1.10 2010/06/07 13:52:30 tnozaki Exp $ */ +/* $NetBSD: limits.h,v 1.11 2012/03/22 08:39:43 he Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -71,7 +71,7 @@ #if defined(_NETBSD_SOURCE) #define SIZE_T_MAX LONG_MAX /* max value for a size_t */ -#define UQUAD_MAX 0xLL /* max unsigned quad */ +#define UQUAD_MAX 0xULL /* max unsigned quad */ #define QUAD_MAX 0x7fffLL /* max signed quad */ #define QUAD_MIN (-0x7fffLL-1) /* min signed quad */
CVS commit: src
Module Name:src Committed By: wiz Date: Thu Mar 22 07:58:20 UTC 2012 Modified Files: src/bin/csh: csh.1 src/bin/kill: kill.1 src/bin/ln: ln.1 src/bin/mkdir: mkdir.1 src/bin/mv: mv.1 src/bin/pax: tar.1 src/bin/rcp: rcp.1 src/distrib/utils/more: more.1 src/share/man/man4/man4.mac68k: ae.4 src/share/man/man4/man4.vax: dh.4 dmf.4 dmz.4 src/share/man/man7: hostname.7 sysctl.7 src/usr.bin/chpass: chpass.1 src/usr.bin/col: col.1 src/usr.bin/find: find.1 src/usr.bin/fpr: fpr.1 src/usr.bin/ftp: ftp.1 src/usr.bin/gcore: gcore.1 src/usr.bin/logger: logger.1 src/usr.bin/lorder: lorder.1 src/usr.bin/msgs: msgs.1 src/usr.bin/nice: nice.1 src/usr.bin/rdist: rdist.1 src/usr.bin/rusers: rusers.1 src/usr.bin/shar: shar.1 src/usr.bin/systat: systat.1 src/usr.bin/telnet: telnet.1 src/usr.bin/tip: tip.1 src/usr.bin/xinstall: install.1 src/usr.sbin/lpr/lpq: lpq.1 src/usr.sbin/lpr/lprm: lprm.1 Log Message: Fix whitespace nits. Suggested by Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/bin/csh/csh.1 cvs rdiff -u -r1.21 -r1.22 src/bin/kill/kill.1 cvs rdiff -u -r1.24 -r1.25 src/bin/ln/ln.1 cvs rdiff -u -r1.16 -r1.17 src/bin/mkdir/mkdir.1 cvs rdiff -u -r1.25 -r1.26 src/bin/mv/mv.1 cvs rdiff -u -r1.32 -r1.33 src/bin/pax/tar.1 cvs rdiff -u -r1.21 -r1.22 src/bin/rcp/rcp.1 cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/more/more.1 cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/man4.mac68k/ae.4 cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/man4.vax/dh.4 cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.vax/dmf.4 cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.vax/dmz.4 cvs rdiff -u -r1.11 -r1.12 src/share/man/man7/hostname.7 cvs rdiff -u -r1.68 -r1.69 src/share/man/man7/sysctl.7 cvs rdiff -u -r1.23 -r1.24 src/usr.bin/chpass/chpass.1 cvs rdiff -u -r1.9 -r1.10 src/usr.bin/col/col.1 cvs rdiff -u -r1.71 -r1.72 src/usr.bin/find/find.1 cvs rdiff -u -r1.11 -r1.12 src/usr.bin/fpr/fpr.1 cvs rdiff -u -r1.131 -r1.132 src/usr.bin/ftp/ftp.1 cvs rdiff -u -r1.13 -r1.14 src/usr.bin/gcore/gcore.1 cvs rdiff -u -r1.12 -r1.13 src/usr.bin/logger/logger.1 cvs rdiff -u -r1.7 -r1.8 src/usr.bin/lorder/lorder.1 cvs rdiff -u -r1.17 -r1.18 src/usr.bin/msgs/msgs.1 cvs rdiff -u -r1.14 -r1.15 src/usr.bin/nice/nice.1 cvs rdiff -u -r1.19 -r1.20 src/usr.bin/rdist/rdist.1 cvs rdiff -u -r1.14 -r1.15 src/usr.bin/rusers/rusers.1 cvs rdiff -u -r1.11 -r1.12 src/usr.bin/shar/shar.1 cvs rdiff -u -r1.41 -r1.42 src/usr.bin/systat/systat.1 cvs rdiff -u -r1.31 -r1.32 src/usr.bin/telnet/telnet.1 cvs rdiff -u -r1.31 -r1.32 src/usr.bin/tip/tip.1 cvs rdiff -u -r1.45 -r1.46 src/usr.bin/xinstall/install.1 cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/lpr/lpq/lpq.1 cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/lpr/lprm/lprm.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/csh/csh.1 diff -u src/bin/csh/csh.1:1.49 src/bin/csh/csh.1:1.50 --- src/bin/csh/csh.1:1.49 Wed Mar 9 22:26:36 2011 +++ src/bin/csh/csh.1 Thu Mar 22 07:58:16 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: csh.1,v 1.49 2011/03/09 22:26:36 njoly Exp $ +.\" $NetBSD: csh.1,v 1.50 2012/03/22 07:58:16 wiz Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -171,7 +171,7 @@ It is typical for users on crt's to put in their .Pa \&.login file, and to also invoke -.Xr tset 1 +.Xr tset 1 there. .Pp In the normal case, the shell will begin reading commands from the @@ -277,7 +277,7 @@ when it is typed. There is another special key .Ic ^Y that does not generate a STOP signal until a program attempts to -.Xr read 2 +.Xr read 2 it. This request can usefully be typed ahead when you have prepared some commands for a job that you wish to stop after it has read them. @@ -299,7 +299,7 @@ Similarly saying `%1 \*[Am]' resumes job Jobs can also be named by prefixes of the string typed in to start them, if these prefixes are unambiguous, thus `%ex' would normally restart a suspended -.Xr ex 1 +.Xr ex 1 job, if there were only one suspended job whose name began with the string `ex'. It is also possible to say `%?string' @@ -1190,14 +1190,14 @@ statements below. .Pp .It Ic eval Ar arg ... (As in -.Xr sh 1 . ) +.Xr sh 1 . ) The arguments are read as input to the shell and the resulting command(s) executed in the context of the current shell. This is usually used to execute commands generated as the result of command or variable substitution, since parsing occurs before these substitutions. See -.Xr tset 1 +.Xr tset 1 for an example of using .Ic eval . .Pp @@ -1411,7 +1411,7 @@ The maximum number of CPU-seconds to be The largest single file (in bytes) that can be created. .It Ar datasi