CVS commit: src/sys
Module Name:src Committed By: hannken Date: Thu Feb 6 10:57:12 UTC 2014 Modified Files: src/sys/miscfs/genfs: genfs_rename.c src/sys/ufs/lfs: lfs_rename.c src/sys/ufs/ufs: ufs_rename.c Log Message: Move fstrans_start()/fstrans_done() into genfs_insane_rename() to protect the complete rename operation like we do for all other vnode operations. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/miscfs/genfs/genfs_rename.c cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/lfs/lfs_rename.c cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/ufs/ufs_rename.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/miscfs/genfs/genfs_rename.c diff -u src/sys/miscfs/genfs/genfs_rename.c:1.1 src/sys/miscfs/genfs/genfs_rename.c:1.2 --- src/sys/miscfs/genfs/genfs_rename.c:1.1 Tue May 8 23:53:26 2012 +++ src/sys/miscfs/genfs/genfs_rename.c Thu Feb 6 10:57:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: genfs_rename.c,v 1.1 2012/05/08 23:53:26 riastradh Exp $ */ +/* $NetBSD: genfs_rename.c,v 1.2 2014/02/06 10:57:12 hannken Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfs_rename.c,v 1.1 2012/05/08 23:53:26 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: genfs_rename.c,v 1.2 2014/02/06 10:57:12 hannken Exp $); #include sys/param.h #include sys/kauth.h @@ -45,6 +45,7 @@ __KERNEL_RCSID(0, $NetBSD: genfs_rename #include sys/namei.h #include sys/stat.h #include sys/vnode.h +#include sys/fstrans.h #include sys/types.h #include miscfs/genfs/genfs.h @@ -176,6 +177,7 @@ genfs_insane_rename(void *v, struct componentname *fcnp = ap-a_fcnp; struct vnode *tdvp = ap-a_tdvp; struct vnode *tvp = ap-a_tvp; + struct mount *mp = fdvp-v_mount; struct componentname *tcnp = ap-a_tcnp; kauth_cred_t cred; int error; @@ -194,6 +196,8 @@ genfs_insane_rename(void *v, KASSERT(fdvp-v_type == VDIR); KASSERT(tdvp-v_type == VDIR); + fstrans_start(mp, FSTRANS_SHARED); + cred = fcnp-cn_cred; /* @@ -228,6 +232,8 @@ genfs_insane_rename(void *v, vrele(fdvp); vrele(tdvp); + fstrans_done(mp); + return error; } Index: src/sys/ufs/lfs/lfs_rename.c diff -u src/sys/ufs/lfs/lfs_rename.c:1.5 src/sys/ufs/lfs/lfs_rename.c:1.6 --- src/sys/ufs/lfs/lfs_rename.c:1.5 Tue Jan 28 13:12:22 2014 +++ src/sys/ufs/lfs/lfs_rename.c Thu Feb 6 10:57:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_rename.c,v 1.5 2014/01/28 13:12:22 martin Exp $ */ +/* $NetBSD: lfs_rename.c,v 1.6 2014/02/06 10:57:12 hannken Exp $ */ /* from NetBSD: ufs_rename.c,v 1.6 2013/01/22 09:39:18 dholland Exp */ /*- @@ -89,7 +89,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lfs_rename.c,v 1.5 2014/01/28 13:12:22 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: lfs_rename.c,v 1.6 2014/02/06 10:57:12 hannken Exp $); #include sys/param.h #include sys/systm.h @@ -108,7 +108,6 @@ __KERNEL_RCSID(0, $NetBSD: lfs_rename.c #include sys/signalvar.h #include sys/kauth.h #include sys/syslog.h -#include sys/fstrans.h #include uvm/uvm.h #include uvm/uvm_pmap.h @@ -518,8 +517,6 @@ ulfs_gro_remove(struct mount *mp, kauth_ KASSERT(VOP_ISLOCKED(vp) == LK_EXCLUSIVE); KASSERT(cnp-cn_nameiop == DELETE); - fstrans_start(mp, FSTRANS_SHARED); - /* XXX ulfs_dirremove decrements vp's link count for us. */ error = ulfs_dirremove(dvp, ulr, VTOI(vp), cnp-cn_flags, 0); if (error) @@ -529,7 +526,6 @@ ulfs_gro_remove(struct mount *mp, kauth_ VN_KNOTE(vp, (VTOI(vp)-i_nlink? NOTE_LINK : NOTE_DELETE)); out1: - fstrans_done(mp); return error; } @@ -831,7 +827,6 @@ ulfs_gro_rename(struct mount *mp, kauth_ * Commence hacking of the data on disk. */ - fstrans_start(mp, FSTRANS_SHARED); error = 0; /* @@ -1046,7 +1041,6 @@ whymustithurtsomuch: arghmybrainhurts: /*ihateyou:*/ - fstrans_done(mp); return error; } Index: src/sys/ufs/ufs/ufs_rename.c diff -u src/sys/ufs/ufs/ufs_rename.c:1.9 src/sys/ufs/ufs/ufs_rename.c:1.10 --- src/sys/ufs/ufs/ufs_rename.c:1.9 Mon Nov 4 19:58:02 2013 +++ src/sys/ufs/ufs/ufs_rename.c Thu Feb 6 10:57:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_rename.c,v 1.9 2013/11/04 19:58:02 christos Exp $ */ +/* $NetBSD: ufs_rename.c,v 1.10 2014/02/06 10:57:12 hannken Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -34,12 +34,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_rename.c,v 1.9 2013/11/04 19:58:02 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_rename.c,v 1.10 2014/02/06 10:57:12 hannken Exp $); #include sys/param.h #include sys/buf.h #include sys/errno.h -#include sys/fstrans.h #include sys/kauth.h #include sys/mount.h #include sys/namei.h @@ -334,7 +333,6 @@ ufs_gro_rename(struct mount *mp, kauth_c * Commence hacking of the data on disk. */ - fstrans_start(mp, FSTRANS_SHARED); error = UFS_WAPBL_BEGIN(mp); if (error) goto ihateyou; @@
CVS commit: src/tests/usr.bin/nbperf
Module Name:src
Committed By: joerg
Date: Thu Feb 6 14:57:17 UTC 2014
Modified Files:
src/tests/usr.bin/nbperf: hash_driver.c
Log Message:
Pass the correct buffer size.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/nbperf/hash_driver.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/usr.bin/nbperf/hash_driver.c
diff -u src/tests/usr.bin/nbperf/hash_driver.c:1.2 src/tests/usr.bin/nbperf/hash_driver.c:1.3
--- src/tests/usr.bin/nbperf/hash_driver.c:1.2 Tue Sep 25 20:53:46 2012
+++ src/tests/usr.bin/nbperf/hash_driver.c Thu Feb 6 14:57:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hash_driver.c,v 1.2 2012/09/25 20:53:46 joerg Exp $ */
+/* $NetBSD: hash_driver.c,v 1.3 2014/02/06 14:57:16 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -43,7 +43,7 @@ main(void)
size_t buflen;
ssize_t len;
- while ((len = getline(line, len, stdin)) 0) {
+ while ((len = getline(line, buflen, stdin)) 0) {
if (len line[len - 1] == '\n')
--len;
printf(% PRId32 \n, hash(line, len));
CVS commit: src/external/gpl3/binutils/dist/ld/emulparams
Module Name:src
Committed By: matt
Date: Thu Feb 6 15:40:47 UTC 2014
Modified Files:
src/external/gpl3/binutils/dist/ld/emulparams: armelf_nbsd_eabi.sh
armelf_nbsd_eabihf.sh
Log Message:
Don't unset LIB_PATH, just override it.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.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/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.4 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.5
--- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.4 Fri Jan 31 07:32:54 2014
+++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh Thu Feb 6 15:40:47 2014
@@ -7,8 +7,6 @@ OTHER_READONLY_SECTIONS=
.ARM.exidx ${RELOCATING-0} : { *(.ARM.exidx${RELOCATING+* .gnu.linkonce.armexidx.*}) }
${RELOCATING+ PROVIDE_HIDDEN (__exidx_end = .); }
-unset LIB_PATH
-
case $target in
arm*-*-netbsdelf*-*eabihf*)
LIB_PATH='=/usr/lib/eabi'
Index: src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.1 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.2
--- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.1 Fri Jan 31 03:26:50 2014
+++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh Thu Feb 6 15:40:47 2014
@@ -7,8 +7,6 @@ OTHER_READONLY_SECTIONS=
.ARM.exidx ${RELOCATING-0} : { *(.ARM.exidx${RELOCATING+* .gnu.linkonce.armexidx.*}) }
${RELOCATING+ PROVIDE_HIDDEN (__exidx_end = .); }
-unset LIB_PATH
-
case $target in
arm*-*-netbsdelf*-*eabihf*)
;;
CVS commit: src/lib/libc/cdb
Module Name:src Committed By: rmind Date: Thu Feb 6 15:47:20 UTC 2014 Modified Files: src/lib/libc/cdb: cdbw.3 Log Message: cdbw(3) man page: fix the header file name and use .Fa for function arguments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/cdb/cdbw.3 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/cdb/cdbw.3 diff -u src/lib/libc/cdb/cdbw.3:1.6 src/lib/libc/cdb/cdbw.3:1.7 --- src/lib/libc/cdb/cdbw.3:1.6 Sat Jul 20 21:39:56 2013 +++ src/lib/libc/cdb/cdbw.3 Thu Feb 6 15:47:20 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: cdbw.3,v 1.6 2013/07/20 21:39:56 wiz Exp $ +.\ $NetBSD: cdbw.3,v 1.7 2014/02/06 15:47:20 rmind Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -41,7 +41,7 @@ .Nm cdbw_close .Nd create constant databases .Sh SYNOPSIS -.In archive_entry.h +.In cdbw.h .Ft struct cdbw * .Fn cdbw_open void .Ft int @@ -112,10 +112,10 @@ On success it adds the given key. computes the database file and writes it to the given descriptor. The function returns an error if the file cannot be written correctly. The -.Fn descr +.Fa descr parameter provides a human readable description of the database content. The -.Fn seedgen +.Fa seedgen parameter can be used to override the default PRNG. The bitwise layout of the output depends on the chosen seed. The function should return a different value for each invocation.
CVS commit: src/lib/libc/cdb
Module Name:src Committed By: rmind Date: Thu Feb 6 15:50:40 UTC 2014 Modified Files: src/lib/libc/cdb: cdbw.3 Log Message: bump the date To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/cdb/cdbw.3 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/cdb/cdbw.3 diff -u src/lib/libc/cdb/cdbw.3:1.7 src/lib/libc/cdb/cdbw.3:1.8 --- src/lib/libc/cdb/cdbw.3:1.7 Thu Feb 6 15:47:20 2014 +++ src/lib/libc/cdb/cdbw.3 Thu Feb 6 15:50:40 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: cdbw.3,v 1.7 2014/02/06 15:47:20 rmind Exp $ +.\ $NetBSD: cdbw.3,v 1.8 2014/02/06 15:50:40 rmind Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,7 +28,7 @@ .\ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT .\ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. -.Dd June 3, 2012 +.Dd February 6, 2014 .Dt CDBW 3 .Os .Sh NAME
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: hannken
Date: Thu Feb 6 16:18:38 UTC 2014
Modified Files:
src/sys/fs/tmpfs: tmpfs_vfsops.c
Log Message:
Remove an annoying printf. And to answer the question: VFS_VGET() gets
used by NFS V3 server for readdirplus.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/fs/tmpfs/tmpfs_vfsops.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/tmpfs/tmpfs_vfsops.c
diff -u src/sys/fs/tmpfs/tmpfs_vfsops.c:1.56 src/sys/fs/tmpfs/tmpfs_vfsops.c:1.57
--- src/sys/fs/tmpfs/tmpfs_vfsops.c:1.56 Sat Jan 4 12:36:49 2014
+++ src/sys/fs/tmpfs/tmpfs_vfsops.c Thu Feb 6 16:18:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vfsops.c,v 1.56 2014/01/04 12:36:49 hannken Exp $ */
+/* $NetBSD: tmpfs_vfsops.c,v 1.57 2014/02/06 16:18:38 hannken Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_vfsops.c,v 1.56 2014/01/04 12:36:49 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_vfsops.c,v 1.57 2014/02/06 16:18:38 hannken Exp $);
#include sys/param.h
#include sys/types.h
@@ -272,7 +272,6 @@ static int
tmpfs_vget(struct mount *mp, ino_t ino, vnode_t **vpp)
{
- printf(tmpfs_vget called; need for it unknown yet\n);
return EOPNOTSUPP;
}
CVS commit: src/external/gpl3/binutils/dist/ld/emulparams
Module Name:src Committed By: matt Date: Thu Feb 6 18:28:28 UTC 2014 Modified Files: src/external/gpl3/binutils/dist/ld/emulparams: armelf_nbsd_eabi.sh armelf_nbsd_eabihf.sh Log Message: Always supply LIB_PATH in case one of the included scripts set it to something inappropriate. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.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/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.5 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.6 --- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.5 Thu Feb 6 15:40:47 2014 +++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh Thu Feb 6 18:28:28 2014 @@ -12,6 +12,7 @@ case $target in LIB_PATH='=/usr/lib/eabi' ;; arm*-*-netbsdelf*-*eabi*) +LIB_PATH='=/usr/lib' ;; arm*-*-netbsdelf*) LIB_PATH='=/usr/lib/eabi' Index: src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.2 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.3 --- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.2 Thu Feb 6 15:40:47 2014 +++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh Thu Feb 6 18:28:28 2014 @@ -9,6 +9,7 @@ OTHER_READONLY_SECTIONS= case $target in arm*-*-netbsdelf*-*eabihf*) +LIB_PATH='=/usr/lib' ;; arm*-*-netbsdelf*) LIB_PATH='=/usr/lib/eabihf'
CVS commit: src/distrib/cats/ramdisk
Module Name:src
Committed By: christos
Date: Thu Feb 6 18:36:16 UTC 2014
Modified Files:
src/distrib/cats/ramdisk: Makefile
Log Message:
bump
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/cats/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cats/ramdisk/Makefile
diff -u src/distrib/cats/ramdisk/Makefile:1.20 src/distrib/cats/ramdisk/Makefile:1.21
--- src/distrib/cats/ramdisk/Makefile:1.20 Thu Feb 11 04:06:47 2010
+++ src/distrib/cats/ramdisk/Makefile Thu Feb 6 13:36:15 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2010/02/11 09:06:47 roy Exp $
+# $NetBSD: Makefile,v 1.21 2014/02/06 18:36:15 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2100k
+IMAGESIZE= 2200k
MAKEFS_FLAGS= -f 14
WARNS= 1
CVS commit: src/sys/arch/mipsco/stand/common
Module Name:src Committed By: christos Date: Thu Feb 6 18:45:35 UTC 2014 Modified Files: src/sys/arch/mipsco/stand/common: saio.c Log Message: fix the second copy of this file. XXX: merge them. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mipsco/stand/common/saio.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/mipsco/stand/common/saio.c diff -u src/sys/arch/mipsco/stand/common/saio.c:1.13 src/sys/arch/mipsco/stand/common/saio.c:1.14 --- src/sys/arch/mipsco/stand/common/saio.c:1.13 Sun Jul 17 16:54:44 2011 +++ src/sys/arch/mipsco/stand/common/saio.c Thu Feb 6 13:45:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: saio.c,v 1.13 2011/07/17 20:54:44 joerg Exp $ */ +/* $NetBSD: saio.c,v 1.14 2014/02/06 18:45:35 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -150,7 +150,7 @@ saioopen(struct open_file *f, ...) int i; char *msg; char buf[DEV_BSIZE]; - int cnt; + size_t cnt; static char device[] = dksd(0,0,10); va_list ap;
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: christos
Date: Thu Feb 6 18:48:09 UTC 2014
Modified Files:
src/usr.sbin/npf/npfctl: npf_build.c
Log Message:
fix vax build.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/npf/npfctl/npf_build.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_build.c
diff -u src/usr.sbin/npf/npfctl/npf_build.c:1.33 src/usr.sbin/npf/npfctl/npf_build.c:1.34
--- src/usr.sbin/npf/npfctl/npf_build.c:1.33 Wed Feb 5 21:51:28 2014
+++ src/usr.sbin/npf/npfctl/npf_build.c Thu Feb 6 13:48:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_build.c,v 1.33 2014/02/06 02:51:28 rmind Exp $ */
+/* $NetBSD: npf_build.c,v 1.34 2014/02/06 18:48:09 christos Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_build.c,v 1.33 2014/02/06 02:51:28 rmind Exp $);
+__RCSID($NetBSD: npf_build.c,v 1.34 2014/02/06 18:48:09 christos Exp $);
#include sys/types.h
#include sys/mman.h
@@ -638,7 +638,7 @@ npfctl_build_natseg(int sd, int type, co
static void
npfctl_fill_table(nl_table_t *tl, u_int type, const char *fname)
{
- struct cdbw *cdbw;
+ struct cdbw *cdbw = NULL; /* XXX: gcc */
char *buf = NULL;
int l = 0;
FILE *fp;
CVS commit: src/sys/arch/emips/stand/common
Module Name:src Committed By: christos Date: Thu Feb 6 18:43:41 UTC 2014 Modified Files: src/sys/arch/emips/stand/common: common.h Log Message: add missing prototype; remove names from args To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/stand/common/common.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/emips/stand/common/common.h diff -u src/sys/arch/emips/stand/common/common.h:1.1 src/sys/arch/emips/stand/common/common.h:1.2 --- src/sys/arch/emips/stand/common/common.h:1.1 Tue Jan 25 20:18:54 2011 +++ src/sys/arch/emips/stand/common/common.h Thu Feb 6 13:43:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: common.h,v 1.1 2011/01/26 01:18:54 pooka Exp $ */ +/* $NetBSD: common.h,v 1.2 2014/02/06 18:43:41 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -58,15 +58,16 @@ extern int getsysid(void); /* prom_iface.c */ extern int init_usart(void); extern int init_memory(void); -extern void call_kernel(uint32_t addr, char *kname, char *kargs, u_int bim, char *bip); +extern void call_kernel(uint32_t, char *, char *, u_int, char *); /* ace.c */ -extern int aceprobe(int unit); +extern int aceprobe(int); /* enic.c */ -extern int enic_present(int unit); +extern int enic_present(int); -/* - * vers.c (generated by newvers.sh) - */ +/* print.c */ +extern void xputchar(int); + +/* vers.c (generated by newvers.sh) */ extern const char bootprog_rev[];
CVS commit: src/sys/arch/emips/stand/common
Module Name:src Committed By: matt Date: Thu Feb 6 19:20:12 UTC 2014 Modified Files: src/sys/arch/emips/stand/common: start.S Log Message: If we just want _end, load it directly and skip the gp To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/stand/common/start.S 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/emips/stand/common/start.S diff -u src/sys/arch/emips/stand/common/start.S:1.2 src/sys/arch/emips/stand/common/start.S:1.3 --- src/sys/arch/emips/stand/common/start.S:1.2 Thu Mar 10 18:18:00 2011 +++ src/sys/arch/emips/stand/common/start.S Thu Feb 6 19:20:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: start.S,v 1.2 2011/03/10 18:18:00 pooka Exp $ */ +/* $NetBSD: start.S,v 1.3 2014/02/06 19:20:11 matt Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -522,10 +522,8 @@ END(PutChar) LEAF(switch_stack_and_call) /* Get a stack and jump. It would be a very bad idea to return but.. */ -#ifdef __GP_SUPPORT__ -la gp, _C_LABEL (_gp) -#endif -lasp,_end +lui sp,%hi(_end) +addiu sp,%lo(_end) jra1 addiu sp,sp,(2*1024) /* BUGBUG arbitrary */
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: joerg
Date: Fri Feb 7 00:25:45 UTC 2014
Modified Files:
src/sys/arch/i386/conf: Makefile.i386
Log Message:
Like amd64, use -msoft-float.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/arch/i386/conf/Makefile.i386
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/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.180 src/sys/arch/i386/conf/Makefile.i386:1.181
--- src/sys/arch/i386/conf/Makefile.i386:1.180 Wed Feb 5 18:52:22 2014
+++ src/sys/arch/i386/conf/Makefile.i386 Fri Feb 7 00:25:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.180 2014/02/05 18:52:22 dsl Exp $
+# $NetBSD: Makefile.i386,v 1.181 2014/02/07 00:25:45 joerg Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,7 @@ GENASSYM_CONF= ${I386}/i386/genassym.cf
## (2) compile settings
##
CPPFLAGS+= -Di386
-CFLAGS+=-mno-80387 -mno-fp-ret-in-387
+CFLAGS+= -msoft-float
## no-sse implies no-sse2 but not no-avx
CFLAGS+= -mno-mmx -mno-sse -mno-avx
CVS commit: src/lib/libc/net
Module Name:src
Committed By: christos
Date: Fri Feb 7 02:36:06 UTC 2014
Modified Files:
src/lib/libc/net: ip6opt.c
Log Message:
RFC 3542 (section 10.1) states that optlen should only be checked when
opt != NULL (Eitan Adler)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/net/ip6opt.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/net/ip6opt.c
diff -u src/lib/libc/net/ip6opt.c:1.14 src/lib/libc/net/ip6opt.c:1.15
--- src/lib/libc/net/ip6opt.c:1.14 Tue Mar 20 13:44:18 2012
+++ src/lib/libc/net/ip6opt.c Thu Feb 6 21:36:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6opt.c,v 1.14 2012/03/20 17:44:18 matt Exp $ */
+/* $NetBSD: ip6opt.c,v 1.15 2014/02/07 02:36:06 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: ip6opt.c,v 1.14 2012/03/20 17:44:18 matt Exp $);
+__RCSID($NetBSD: ip6opt.c,v 1.15 2014/02/07 02:36:06 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -442,11 +442,8 @@ inet6_opt_init(void *extbuf, socklen_t e
{
struct ip6_ext *ext = (struct ip6_ext *)extbuf;
- if (extlen % 8)
- return (-1);
-
if (ext) {
- if (extlen == 0)
+ if (extlen == 0 || (extlen % 8))
return (-1);
ext-ip6e_len = (extlen 3) - 1;
}
