CVS commit: src/distrib/sets
Module Name:src Committed By: matt Date: Tue Jan 28 02:54:02 UTC 2014 Modified Files: src/distrib/sets: sets.subr Log Message: HAVE_GDB can trigger a false positive if MKGDB=no so add a check for it like we do for HAVE_GCC. To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/sets.subr 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/sets.subr diff -u src/distrib/sets/sets.subr:1.158 src/distrib/sets/sets.subr:1.159 --- src/distrib/sets/sets.subr:1.158 Sun Jan 26 21:33:53 2014 +++ src/distrib/sets/sets.subr Tue Jan 28 02:54:02 2014 @@ -1,4 +1,4 @@ -# $NetBSD: sets.subr,v 1.158 2014/01/26 21:33:53 joerg Exp $ +# $NetBSD: sets.subr,v 1.159 2014/01/28 02:54:02 matt Exp $ # # @@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g # In each file, a record consists of a path and a System Package name, # separated by whitespace. E.g., # -# # $NetBSD: sets.subr,v 1.158 2014/01/26 21:33:53 joerg Exp $ +# # $NetBSD: sets.subr,v 1.159 2014/01/28 02:54:02 matt Exp $ # . base-sys-root [keyword[,...]] # ./altroot base-sys-root # ./bin base-sys-root @@ -300,7 +300,7 @@ list_set_files() sub(/^mk/, "", kw) sub(/^have_/, "", kw) sub(/^target_endianness/, "endian", kw) -if (nv != "HAVE_GCC" && ENVIRON[nv] != "no") +if (nv != "HAVE_GCC" && nv != "HAVE_GDB" && ENVIRON[nv] != "no") wanted[kw] = 1 }
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: christos Date: Tue Jan 28 02:51:34 UTC 2014 Modified Files: src/sys/arch/i386/include: vmparam.h Log Message: Cut down MAXDSIZE from 3G to 2.5G otherwise bottomup allocation ends up supplying an out of bounds hint for sigcode (c001e000 > bf00). Makes a.out binaries work again. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/arch/i386/include/vmparam.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/i386/include/vmparam.h diff -u src/sys/arch/i386/include/vmparam.h:1.77 src/sys/arch/i386/include/vmparam.h:1.78 --- src/sys/arch/i386/include/vmparam.h:1.77 Sat Jan 25 10:16:50 2014 +++ src/sys/arch/i386/include/vmparam.h Mon Jan 27 21:51:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.77 2014/01/25 15:16:50 christos Exp $ */ +/* $NetBSD: vmparam.h,v 1.78 2014/01/28 02:51:34 christos Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -68,7 +68,8 @@ #define DFLDSIZ (256*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (3U*1024*1024*1024) /* max data size */ +#define MAXDSIZ (2U*1024*1024*1024 + \ + 1U* 512*1024*1024) /* 2.5G max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (2*1024*1024) /* initial stack size limit */
CVS commit: src/sys/compat/sys
Module Name:src Committed By: christos Date: Tue Jan 28 01:29:35 UTC 2014 Modified Files: src/sys/compat/sys: dirent.h Log Message: add a struct for the 4.3BSD struct direct To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/compat/sys/dirent.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/compat/sys/dirent.h diff -u src/sys/compat/sys/dirent.h:1.2 src/sys/compat/sys/dirent.h:1.3 --- src/sys/compat/sys/dirent.h:1.2 Sun Dec 11 07:20:29 2005 +++ src/sys/compat/sys/dirent.h Mon Jan 27 20:29:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dirent.h,v 1.2 2005/12/11 12:20:29 christos Exp $ */ +/* $NetBSD: dirent.h,v 1.3 2014/01/28 01:29:35 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -34,6 +34,13 @@ #ifndef _COMPAT_SYS_DIRENT_H_ #define _COMPAT_SYS_DIRENT_H_ +struct dirent43 { + u_int32_t d_fileno; /* file number of entry */ + u_int16_t d_reclen; /* length of this record */ + u_int16_t d_namlen; /* length of string in d_name */ + char d_name[255 + 1]; /* name must be no longer than this */ +}; + struct dirent12 { u_int32_t d_fileno; /* file number of entry */ u_int16_t d_reclen; /* length of this record */
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Tue Jan 28 01:29:04 UTC 2014 Modified Files: src/sys/compat/common: vfs_syscalls_43.c Log Message: Fix the compat-4.3 getdirentries call (pre d_type). This is used in NetBSD-0.9. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/compat/common/vfs_syscalls_43.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/compat/common/vfs_syscalls_43.c diff -u src/sys/compat/common/vfs_syscalls_43.c:1.55 src/sys/compat/common/vfs_syscalls_43.c:1.56 --- src/sys/compat/common/vfs_syscalls_43.c:1.55 Wed Feb 20 20:39:54 2013 +++ src/sys/compat/common/vfs_syscalls_43.c Mon Jan 27 20:29:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_syscalls_43.c,v 1.55 2013/02/21 01:39:54 pgoyette Exp $ */ +/* $NetBSD: vfs_syscalls_43.c,v 1.56 2014/01/28 01:29:04 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.55 2013/02/21 01:39:54 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.56 2014/01/28 01:29:04 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -70,6 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_syscalls #include #include +#include #include #include @@ -348,112 +349,139 @@ compat_43_sys_getdirentries(struct lwp * syscallarg(u_int) count; syscallarg(long *) basep; } */ + struct dirent *bdp; struct vnode *vp; + char *inp, *tbuf; /* Current-format */ + int len, reclen; /* Current-format */ + char *outp; /* Dirent12-format */ + int resid, old_reclen = 0; /* Dirent12-format */ struct file *fp; - struct uio auio, kuio; - struct iovec aiov, kiov; - struct dirent *dp, *edp; - char *dirbuf; - size_t count = min(MAXBSIZE, (size_t)SCARG(uap, count)); - - int error, eofflag, readcnt; + struct uio auio; + struct iovec aiov; + struct dirent43 idb; + off_t off; /* true file offset */ + int buflen, error, eofflag, nbytes; + struct vattr va; + off_t *cookiebuf = NULL, *cookie; + int ncookies; long loff; - + /* fd_getvnode() will use the descriptor for us */ if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0) return (error); + if ((fp->f_flag & FREAD) == 0) { error = EBADF; - goto out; + goto out1; } + vp = (struct vnode *)fp->f_data; -unionread: if (vp->v_type != VDIR) { - error = EINVAL; - goto out; + error = ENOTDIR; + goto out1; } - aiov.iov_base = SCARG(uap, buf); - aiov.iov_len = count; + + vn_lock(vp, LK_SHARED | LK_RETRY); + error = VOP_GETATTR(vp, &va, l->l_cred); + VOP_UNLOCK(vp); + if (error) + goto out1; + + loff = fp->f_offset; + nbytes = SCARG(uap, count); + buflen = min(MAXBSIZE, nbytes); + if (buflen < va.va_blocksize) + buflen = va.va_blocksize; + tbuf = malloc(buflen, M_TEMP, M_WAITOK); + + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + off = fp->f_offset; +again: + aiov.iov_base = tbuf; + aiov.iov_len = buflen; auio.uio_iov = &aiov; auio.uio_iovcnt = 1; auio.uio_rw = UIO_READ; - auio.uio_resid = count; - KASSERT(l == curlwp); - auio.uio_vmspace = curproc->p_vmspace; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - loff = auio.uio_offset = fp->f_offset; -# if (BYTE_ORDER != LITTLE_ENDIAN) - if ((vp->v_mount->mnt_iflag & IMNT_DTYPE) == 0) { - error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, - (off_t **)0, (int *)0); - fp->f_offset = auio.uio_offset; - } else -# endif - { - kuio = auio; - kuio.uio_iov = &kiov; - kiov.iov_len = count; - dirbuf = malloc(count, M_TEMP, M_WAITOK); - kiov.iov_base = dirbuf; - UIO_SETUP_SYSSPACE(&kuio); - error = VOP_READDIR(vp, &kuio, fp->f_cred, &eofflag, - (off_t **)0, (int *)0); - fp->f_offset = kuio.uio_offset; - if (error == 0) { - readcnt = count - kuio.uio_resid; - edp = (struct dirent *)&dirbuf[readcnt]; - for (dp = (struct dirent *)dirbuf; dp < edp; ) { -#if (BYTE_ORDER == LITTLE_ENDIAN) - /* - * The expected low byte of - * dp->d_namlen is our dp->d_type. - * The high MBZ byte of dp->d_namlen - * is our dp->d_namlen. - */ - dp->d_type = dp->d_namlen; - dp->d_namlen = 0; -#else - /* - * The dp->d_type is the high byte - * of the expected dp->d_namlen, - * so must be zero'ed. - */ - dp->d_type = 0; -#endif -if (dp->d_reclen > 0) { - dp = (struct dirent *) - ((char *)dp + dp->d_reclen); -} else { - error = EIO; - break; -} - } - if (dp >= edp) -error = uiomove(dirbuf, readcnt, &auio); - } - free(dirbuf, M_TEMP); - } - VOP_UNLOCK(vp); + auio.uio_resid = buflen; + auio.uio_offset = off; + UIO_SETUP_SYSSPACE(&auio); + /* + * First we read into the malloc'ed buffer, then + * we massage it into user space, one record at a time. + */ + error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &cookiebuf, + &ncookies); if (error) goto out; - if ((count =
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: jakllsch Date: Mon Jan 27 23:11:50 UTC 2014 Modified Files: src/sys/arch/x86/pci: pci_machdep.c Log Message: Stopgap to prevent genfb from stealing console. Revisit later. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x86/pci/pci_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/x86/pci/pci_machdep.c diff -u src/sys/arch/x86/pci/pci_machdep.c:1.64 src/sys/arch/x86/pci/pci_machdep.c:1.65 --- src/sys/arch/x86/pci/pci_machdep.c:1.64 Sun Jan 26 10:54:24 2014 +++ src/sys/arch/x86/pci/pci_machdep.c Mon Jan 27 23:11:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.64 2014/01/26 10:54:24 msaitoh Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.65 2014/01/27 23:11:50 jakllsch Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.64 2014/01/26 10:54:24 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.65 2014/01/27 23:11:50 jakllsch Exp $"); #include #include @@ -938,6 +938,13 @@ device_pci_register(device_t dev, void * } #endif } +#if 1 && NWSDISPLAY > 0 && NGENFB > 0 + /* XXX */ + if (device_is_a(dev, "genfb")) { +prop_dictionary_set_bool(dict, "is_console", +genfb_is_console()); + } else +#endif prop_dictionary_set_bool(dict, "is_console", true); prop_dictionary_set_bool(dict, "clear-screen", false);
CVS commit: src
Module Name:src Committed By: apb Date: Mon Jan 27 21:37:17 UTC 2014 Modified Files: src/distrib/common/bootimage: Makefile.bootimage src/distrib/sets: Makefile src/etc: Makefile src/libexec/httpd: Makefile src/sys/arch/cobalt/stand/boot: Makefile src/sys/arch/evbppc/conf: Makefile.obs405.inc src/sys/arch/ews4800mips/stand/boot: Makefile Log Message: Pass the -n flag to gzip invocations. This prevents it from embedding a timestamp in the output. We pass "-n" unconditionally, not conditional on MKREPRO, because many other invocations of gzip already passed the -n flag unconditionally. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/common/bootimage/Makefile.bootimage cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/Makefile cvs rdiff -u -r1.411 -r1.412 src/etc/Makefile cvs rdiff -u -r1.18 -r1.19 src/libexec/httpd/Makefile cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cobalt/stand/boot/Makefile cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/conf/Makefile.obs405.inc cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ews4800mips/stand/boot/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/common/bootimage/Makefile.bootimage diff -u src/distrib/common/bootimage/Makefile.bootimage:1.7 src/distrib/common/bootimage/Makefile.bootimage:1.8 --- src/distrib/common/bootimage/Makefile.bootimage:1.7 Thu Jan 16 01:15:32 2014 +++ src/distrib/common/bootimage/Makefile.bootimage Mon Jan 27 21:37:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootimage,v 1.7 2014/01/16 01:15:32 christos Exp $ +# $NetBSD: Makefile.bootimage,v 1.8 2014/01/27 21:37:17 apb Exp $ # # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved. # @@ -390,7 +390,7 @@ ${IMGBASE}.img: ${TARGETFS} ${WORKLABEL} CLEANFILES+= ${IMGBASE}.img.gz ${IMGBASE}.img.gz.tmp ${IMGBASE}.img.gz: ${IMGBASE}.img - ${TOOL_GZIP} -9c ${IMGBASE}.img > ${.TARGET}.tmp + ${TOOL_GZIP} -9nc ${IMGBASE}.img > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} clean: Index: src/distrib/sets/Makefile diff -u src/distrib/sets/Makefile:1.93 src/distrib/sets/Makefile:1.94 --- src/distrib/sets/Makefile:1.93 Mon Jan 27 08:18:07 2014 +++ src/distrib/sets/Makefile Mon Jan 27 21:37:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.94 2014/01/27 21:37:17 apb Exp $ # Experimental RCS METALOG versioning # (Needs host's rcs(1) commands) @@ -16,6 +16,7 @@ all: .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" COMPRESS_PROGRAM=${TOOL_GZIP} +GZIP_FLAGS= -n SETSENV= DESTDIR=${DESTDIR:Q} \ MACHINE=${MACHINE:Q} \ @@ -29,6 +30,7 @@ SETSENV= DESTDIR=${DESTDIR:Q} \ MTREE=${TOOL_MTREE:Q} \ PAX=${TOOL_PAX:Q} \ COMPRESS_PROGRAM=${COMPRESS_PROGRAM:Q} \ + GZIP=${GZIP_FLAGS:Q} \ PKG_CREATE=${TOOL_PKG_CREATE:Q} \ SED=${TOOL_SED:Q} \ TSORT=${TSORT:Q} Index: src/etc/Makefile diff -u src/etc/Makefile:1.411 src/etc/Makefile:1.412 --- src/etc/Makefile:1.411 Thu Jan 16 01:15:33 2014 +++ src/etc/Makefile Mon Jan 27 21:37:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.411 2014/01/16 01:15:33 christos Exp $ +# $NetBSD: Makefile,v 1.412 2014/01/27 21:37:17 apb Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -194,7 +194,7 @@ etc-release: .EXEC .MAKE cat ${NETBSDSRCDIR}/sys/conf/copyright; \ echo ; \ echo "Build settings:"; \ - printf "%20s %s\n" "Build date" "$$(date -u)"; \ + printf "%20s %s\n" "Build date" "$$(date -u)"; \ printf "%20s %s\n" "Built by" "$${USER-root}@$$(hostname)"; \ echo ; \ ${PRINT_PARAMS} ; \ @@ -580,7 +580,7 @@ kernset-${configfile}: .PHONY build_kern kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \ kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \ kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \ - pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9 ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \ + pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9n ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \ cd $${kerndir} && { \ kernels=; newest=; \ for kernel in $${kernlist}; do \ @@ -625,8 +625,8 @@ releasekern-${configfile}: .PHONY build_ knl_gz="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${kernel}-${configfile:C/.*\///}$${s}.gz"; \ [ $${knl_gz} -nt $${ks} ] && continue; \ rm -f $${knl_gz}; \ -echo "${TOOL_GZIP} -c -9 < $${kerndir}/$${ks} > $${knl_gz}"; \ -${TOOL_GZIP} -c -9 < $${ks} > $${knl_gz}; \ +echo "${TOOL_GZIP} -nc -9 < $${kerndir}/$${ks} > $${knl_gz}"; \ +${TOOL_GZIP} -nc -9 < $${ks} > $${knl_gz}; \ done; \ done; \ } Index: src/libexec/httpd/Makefile diff -u src/libexec/httpd/Makefile:1.18 src/libexec/httpd/Makefile:1.19 --- src/libexec/httpd/Makefile:1.18 Mon Jan 27 08:18:08 2014 +++ src/libexec/httpd/Ma
CVS commit: [netbsd-6-1] src/sys/sys
Module Name:src Committed By: bouyer Date: Mon Jan 27 21:32:03 UTC 2014 Modified Files: src/sys/sys [netbsd-6-1]: param.h Log Message: This is 6.1.3_PATCH, not (yet) 6.1.4 To generate a diff of this commit: cvs rdiff -u -r1.408.2.12.2.7 -r1.408.2.12.2.8 src/sys/sys/param.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/sys/param.h diff -u src/sys/sys/param.h:1.408.2.12.2.7 src/sys/sys/param.h:1.408.2.12.2.8 --- src/sys/sys/param.h:1.408.2.12.2.7 Mon Jan 27 21:27:50 2014 +++ src/sys/sys/param.h Mon Jan 27 21:32:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.12.2.7 2014/01/27 21:27:50 bouyer Exp $ */ +/* $NetBSD: param.h,v 1.408.2.12.2.8 2014/01/27 21:32:03 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 601000301 /* NetBSD 6.1.4 */ +#define __NetBSD_Version__ 601000301 /* NetBSD 6.1.3_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: bouyer Date: Mon Jan 27 21:30:24 UTC 2014 Modified Files: src/doc [netbsd-5-2]: README.files Log Message: Welcome to 5.2.2_PATCH (missing bits) To generate a diff of this commit: cvs rdiff -u -r1.4.10.4.2.4 -r1.4.10.4.2.5 src/doc/README.files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.4.2.4 src/doc/README.files:1.4.10.4.2.5 --- src/doc/README.files:1.4.10.4.2.4 Mon Jan 27 21:21:24 2014 +++ src/doc/README.files Mon Jan 27 21:30:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.4.2.4 2014/01/27 21:21:24 bouyer Exp $ +# $NetBSD: README.files,v 1.4.10.4.2.5 2014/01/27 21:30:24 bouyer Exp $ What's in this directory: @@ -30,7 +30,7 @@ source/sets/ Source distribution sets; s In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 5.2.2 has a binary distribution. The contents of each +NetBSD 5.2.3 has a binary distribution. The contents of each architecture's directory are described in an "INSTALL" file found in that directory.
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Mon Jan 27 21:29:14 UTC 2014 Modified Files: src/doc [netbsd-5-1]: README.files Log Message: Welcome to 5.1.4_PATCH (missing pieces) To generate a diff of this commit: cvs rdiff -u -r1.4.10.3.2.6 -r1.4.10.3.2.7 src/doc/README.files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.3.2.6 src/doc/README.files:1.4.10.3.2.7 --- src/doc/README.files:1.4.10.3.2.6 Mon Jan 27 21:18:45 2014 +++ src/doc/README.files Mon Jan 27 21:29:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.3.2.6 2014/01/27 21:18:45 bouyer Exp $ +# $NetBSD: README.files,v 1.4.10.3.2.7 2014/01/27 21:29:13 bouyer Exp $ What's in this directory: @@ -32,7 +32,7 @@ source/sets/ Source distribution sets; s In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 5.1.4 has a binary distribution. The contents of each +NetBSD 5.1.5 has a binary distribution. The contents of each architecture's directory are described in an "INSTALL" file found in that directory.
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: bouyer Date: Mon Jan 27 21:27:50 UTC 2014 Modified Files: src/doc [netbsd-6-1]: README.files src/gnu/usr.bin/groff/tmac [netbsd-6-1]: mdoc.local src/sys/sys [netbsd-6-1]: param.h Added Files: src/doc [netbsd-6-1]: CHANGES-6.1.4 Log Message: Welcome to 6.1.4_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-6.1.4 cvs rdiff -u -r1.4.20.2.2.5 -r1.4.20.2.2.6 src/doc/README.files cvs rdiff -u -r1.66.2.2.2.3 -r1.66.2.2.2.4 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.408.2.12.2.6 -r1.408.2.12.2.7 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/README.files diff -u src/doc/README.files:1.4.20.2.2.5 src/doc/README.files:1.4.20.2.2.6 --- src/doc/README.files:1.4.20.2.2.5 Fri Jan 17 18:11:37 2014 +++ src/doc/README.files Mon Jan 27 21:27:50 2014 @@ -1,7 +1,9 @@ -# $NetBSD: README.files,v 1.4.20.2.2.5 2014/01/17 18:11:37 bouyer Exp $ +# $NetBSD: README.files,v 1.4.20.2.2.6 2014/01/27 21:27:50 bouyer Exp $ What's in this directory: +CHANGES-6.1.4 Changes between the 6.1.3 and 6.1.4 releases. + CHANGES-6.1.3 Changes between the 6.1.2 and 6.1.3 releases. CHANGES-6.1.2 Changes between the 6.1.1 and 6.1.2 releases. @@ -37,7 +39,7 @@ source/patches/ Post-release source code In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 6.1.3 has a binary distribution. The contents of each +NetBSD 6.1.4 has a binary distribution. The contents of each architecture's directory are described in an "INSTALL" file found in that directory. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.2.2.3 src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.2.2.4 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.2.2.3 Sat Oct 12 18:53:47 2013 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Mon Jan 27 21:27:50 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.66.2.2.2.3 2013/10/12 18:53:47 jdc Exp $ +.\" $NetBSD: mdoc.local,v 1.66.2.2.2.4 2014/01/27 21:27:50 bouyer Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~6.1.3 +.ds doc-operating-system NetBSD\~6.1.4 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~6.1.3 +.ds doc-default-operating-system NetBSD\~6.1.4 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -63,6 +63,7 @@ .ds doc-operating-system-NetBSD-6.1.1 6.1.1 .ds doc-operating-system-NetBSD-6.1.2 6.1.2 .ds doc-operating-system-NetBSD-6.1.3 6.1.3 +.ds doc-operating-system-NetBSD-6.1.4 6.1.4 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.12.2.6 src/sys/sys/param.h:1.408.2.12.2.7 --- src/sys/sys/param.h:1.408.2.12.2.6 Fri Jan 17 18:11:37 2014 +++ src/sys/sys/param.h Mon Jan 27 21:27:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.12.2.6 2014/01/17 18:11:37 bouyer Exp $ */ +/* $NetBSD: param.h,v 1.408.2.12.2.7 2014/01/27 21:27:50 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 601000300 /* NetBSD 6.1.3 */ +#define __NetBSD_Version__ 601000301 /* NetBSD 6.1.4 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-6.1.4 diff -u /dev/null src/doc/CHANGES-6.1.4:1.1.2.1 --- /dev/null Mon Jan 27 21:27:50 2014 +++ src/doc/CHANGES-6.1.4 Mon Jan 27 21:27:50 2014 @@ -0,0 +1,12 @@ +# $NetBSD: CHANGES-6.1.4,v 1.1.2.1 2014/01/27 21:27:50 bouyer Exp $ + +A complete list of changes from the NetBSD 6.1.3 release to the NetBSD 6.1.4 +release: + +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 6.1.3_PATCH. + [bouyer] +
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: bouyer Date: Mon Jan 27 21:25:27 UTC 2014 Modified Files: src/doc [netbsd-6-0]: README.files src/gnu/usr.bin/groff/tmac [netbsd-6-0]: mdoc.local src/sys/sys [netbsd-6-0]: param.h Added Files: src/doc [netbsd-6-0]: CHANGES-6.0.5 Log Message: Welcome to 6.0.4_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-6.0.5 cvs rdiff -u -r1.4.20.1.2.5 -r1.4.20.1.2.6 src/doc/README.files cvs rdiff -u -r1.66.2.1.4.4 -r1.66.2.1.4.5 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.408.2.6.2.8 -r1.408.2.6.2.9 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/README.files diff -u src/doc/README.files:1.4.20.1.2.5 src/doc/README.files:1.4.20.1.2.6 --- src/doc/README.files:1.4.20.1.2.5 Fri Jan 17 18:19:15 2014 +++ src/doc/README.files Mon Jan 27 21:25:27 2014 @@ -1,7 +1,9 @@ -# $NetBSD: README.files,v 1.4.20.1.2.5 2014/01/17 18:19:15 bouyer Exp $ +# $NetBSD: README.files,v 1.4.20.1.2.6 2014/01/27 21:25:27 bouyer Exp $ What's in this directory: +CHANGES-6.0.5 Changes between the 6.0.4 and 6.0.5 releases. + CHANGES-6.0.4 Changes between the 6.0.3 and 6.0.4 releases. CHANGES-6.0.3 Changes between the 6.0.2 and 6.0.3 releases. @@ -37,7 +39,7 @@ source/patches/ Post-release source code In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 6.0.4 has a binary distribution. The contents of each +NetBSD 6.0.5 has a binary distribution. The contents of each architecture's directory are described in an "INSTALL" file found in that directory. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.1.4.4 src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.1.4.5 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.1.4.4 Sat Oct 12 18:53:17 2013 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Mon Jan 27 21:25:27 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.66.2.1.4.4 2013/10/12 18:53:17 jdc Exp $ +.\" $NetBSD: mdoc.local,v 1.66.2.1.4.5 2014/01/27 21:25:27 bouyer Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~6.0.4 +.ds doc-operating-system NetBSD\~6.0.5 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~6.0.4 +.ds doc-default-operating-system NetBSD\~6.0.5 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -63,6 +63,7 @@ .ds doc-operating-system-NetBSD-6.0.2 6.0.2 .ds doc-operating-system-NetBSD-6.0.3 6.0.3 .ds doc-operating-system-NetBSD-6.0.4 6.0.4 +.ds doc-operating-system-NetBSD-6.0.5 6.0.5 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.6.2.8 src/sys/sys/param.h:1.408.2.6.2.9 --- src/sys/sys/param.h:1.408.2.6.2.8 Fri Jan 17 18:02:51 2014 +++ src/sys/sys/param.h Mon Jan 27 21:25:27 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.6.2.8 2014/01/17 18:02:51 bouyer Exp $ */ +/* $NetBSD: param.h,v 1.408.2.6.2.9 2014/01/27 21:25:27 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 60400 /* NetBSD 6.0.4 */ +#define __NetBSD_Version__ 60401 /* NetBSD 6.0.4_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-6.0.5 diff -u /dev/null src/doc/CHANGES-6.0.5:1.1.2.1 --- /dev/null Mon Jan 27 21:25:27 2014 +++ src/doc/CHANGES-6.0.5 Mon Jan 27 21:25:27 2014 @@ -0,0 +1,12 @@ +# $NetBSD: CHANGES-6.0.5,v 1.1.2.1 2014/01/27 21:25:27 bouyer Exp $ + +A complete list of changes from the NetBSD 6.0.4 release to the NetBSD 6.0.5 +release: + +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 6.0.4_PATCH. + [bouyer] +
CVS commit: src/share/man/man4
Module Name:src Committed By: pgoyette Date: Mon Jan 27 21:23:59 UTC 2014 Modified Files: src/share/man/man4: crypto.4 Log Message: Update CIOGFSESSION argument spec to match reality To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/crypto.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/crypto.4 diff -u src/share/man/man4/crypto.4:1.23 src/share/man/man4/crypto.4:1.24 --- src/share/man/man4/crypto.4:1.23 Fri Feb 25 21:10:33 2011 +++ src/share/man/man4/crypto.4 Mon Jan 27 21:23:59 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: crypto.4,v 1.23 2011/02/25 21:10:33 wiz Exp $ +.\" $NetBSD: crypto.4,v 1.24 2014/01/27 21:23:59 pgoyette Exp $ .\" .\" Copyright (c) 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -53,7 +53,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 25, 2011 +.Dd January 27, 2014 .Dt CRYPTO 4 .Os .Sh NAME @@ -425,7 +425,7 @@ fields of the operation structure are currently unused. They are intended for use to immediately rekey an existing session before processing a new request. -.It Dv CIOCFSESSION Fa void +.It Dv CIOCFSESSION Fa u_int32_t ses_id Destroys the /dev/crypto session associated with the file-descriptor argument. .It Dv CIOCNFSESSION Fa struct crypt_sfop *sfop ;
CVS commit: [netbsd-5-2] src
Module Name:src Committed By: bouyer Date: Mon Jan 27 21:21:24 UTC 2014 Modified Files: src/doc [netbsd-5-2]: README.files src/gnu/usr.bin/groff/tmac [netbsd-5-2]: mdoc.local src/sys/sys [netbsd-5-2]: param.h Added Files: src/doc [netbsd-5-2]: CHANGES-5.2.3 Log Message: Welcome to 5.2.2_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.2.3 cvs rdiff -u -r1.4.10.4.2.3 -r1.4.10.4.2.4 src/doc/README.files cvs rdiff -u -r1.43.4.18.2.4 -r1.43.4.18.2.5 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.18.2.4 -r1.330.4.18.2.5 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.4.2.3 src/doc/README.files:1.4.10.4.2.4 --- src/doc/README.files:1.4.10.4.2.3 Fri Jan 17 18:17:05 2014 +++ src/doc/README.files Mon Jan 27 21:21:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.4.2.3 2014/01/17 18:17:05 bouyer Exp $ +# $NetBSD: README.files,v 1.4.10.4.2.4 2014/01/27 21:21:24 bouyer Exp $ What's in this directory: @@ -14,6 +14,8 @@ CHANGES-5.2.1 Changes between the 5.2 an CHANGES-5.2.2 Changes between the 5.2.1 and 5.2.2 releases. +CHANGES-5.2.3 Changes between the 5.2.2 and 5.2.3 releases. + CHANGES.prev Changes in previous NetBSD releases. LAST_MINUTE Last minute changes and notes about the release. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.4 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.5 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.4 Fri Jan 17 17:00:03 2014 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Mon Jan 27 21:21:24 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.43.4.18.2.4 2014/01/17 17:00:03 bouyer Exp $ +.\" $NetBSD: mdoc.local,v 1.43.4.18.2.5 2014/01/27 21:21:24 bouyer Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~5.2.2 +.ds doc-operating-system NetBSD\~5.2.3 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.2.2 +.ds doc-default-operating-system NetBSD\~5.2.3 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -61,6 +61,7 @@ .ds doc-operating-system-NetBSD-5.25.2 .ds doc-operating-system-NetBSD-5.2.1 5.2.1 .ds doc-operating-system-NetBSD-5.2.2 5.2.2 +.ds doc-operating-system-NetBSD-5.2.3 5.2.3 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.3 6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.18.2.4 src/sys/sys/param.h:1.330.4.18.2.5 --- src/sys/sys/param.h:1.330.4.18.2.4 Fri Jan 17 17:00:04 2014 +++ src/sys/sys/param.h Mon Jan 27 21:21:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.18.2.4 2014/01/17 17:00:04 bouyer Exp $ */ +/* $NetBSD: param.h,v 1.330.4.18.2.5 2014/01/27 21:21:24 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 502000200 /* NetBSD 5.2.2 */ +#define __NetBSD_Version__ 502000201 /* NetBSD 5.2.2_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.2.3 diff -u /dev/null src/doc/CHANGES-5.2.3:1.1.2.1 --- /dev/null Mon Jan 27 21:21:24 2014 +++ src/doc/CHANGES-5.2.3 Mon Jan 27 21:21:24 2014 @@ -0,0 +1,12 @@ +# $NetBSD: CHANGES-5.2.3,v 1.1.2.1 2014/01/27 21:21:24 bouyer Exp $ + +A complete list of changes from the NetBSD 5.2.2 release to the NetBSD 5.2.3 +release: + +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.2.2_PATCH. + [bouyer] +
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: bouyer Date: Mon Jan 27 21:18:45 UTC 2014 Modified Files: src/doc [netbsd-5-1]: README.files src/gnu/usr.bin/groff/tmac [netbsd-5-1]: mdoc.local src/sys/sys [netbsd-5-1]: param.h Added Files: src/doc [netbsd-5-1]: CHANGES-5.1.5 Log Message: Welcome to 5.1.4_PATCH To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.1.5 cvs rdiff -u -r1.4.10.3.2.5 -r1.4.10.3.2.6 src/doc/README.files cvs rdiff -u -r1.43.4.15.2.7 -r1.43.4.15.2.8 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.15.2.8 -r1.330.4.15.2.9 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.3.2.5 src/doc/README.files:1.4.10.3.2.6 --- src/doc/README.files:1.4.10.3.2.5 Fri Jan 17 18:14:13 2014 +++ src/doc/README.files Mon Jan 27 21:18:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.3.2.5 2014/01/17 18:14:13 bouyer Exp $ +# $NetBSD: README.files,v 1.4.10.3.2.6 2014/01/27 21:18:45 bouyer Exp $ What's in this directory: @@ -16,6 +16,8 @@ CHANGES-5.1.3 Changes between the 5.1.2 CHANGES-5.1.4 Changes between the 5.1.3 and 5.1.4 releases. +CHANGES-5.1.5 Changes between the 5.1.4 and 5.1.5 releases. + CHANGES.prev Changes in previous NetBSD releases. LAST_MINUTE Last minute changes and notes about the release. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.7 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.8 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.7 Sun Oct 13 07:22:07 2013 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Mon Jan 27 21:18:44 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.43.4.15.2.7 2013/10/13 07:22:07 jdc Exp $ +.\" $NetBSD: mdoc.local,v 1.43.4.15.2.8 2014/01/27 21:18:44 bouyer Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~5.1.4 +.ds doc-operating-system NetBSD\~5.1.5 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.1.4 +.ds doc-default-operating-system NetBSD\~5.1.5 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -62,6 +62,7 @@ .ds doc-operating-system-NetBSD-5.1.2 5.1.2 .ds doc-operating-system-NetBSD-5.1.3 5.1.3 .ds doc-operating-system-NetBSD-5.1.4 5.1.4 +.ds doc-operating-system-NetBSD-5.1.5 5.1.5 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.3 6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.15.2.8 src/sys/sys/param.h:1.330.4.15.2.9 --- src/sys/sys/param.h:1.330.4.15.2.8 Fri Jan 17 16:44:06 2014 +++ src/sys/sys/param.h Mon Jan 27 21:18:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.15.2.8 2014/01/17 16:44:06 bouyer Exp $ */ +/* $NetBSD: param.h,v 1.330.4.15.2.9 2014/01/27 21:18:45 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 501000400 /* NetBSD 5.1.4 */ +#define __NetBSD_Version__ 501000401 /* NetBSD 5.1.4_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.1.5 diff -u /dev/null src/doc/CHANGES-5.1.5:1.1.2.1 --- /dev/null Mon Jan 27 21:18:45 2014 +++ src/doc/CHANGES-5.1.5 Mon Jan 27 21:18:45 2014 @@ -0,0 +1,12 @@ +# $NetBSD: CHANGES-5.1.5,v 1.1.2.1 2014/01/27 21:18:45 bouyer Exp $ + +A complete list of changes from the NetBSD 5.1.4 release to the NetBSD 5.1.5 +release: + +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.1.4_PATCH. + [bouyer] +
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: jnemeth Date: Mon Jan 27 21:00:02 UTC 2014 Modified Files: src/usr.bin/calendar/calendars: calendar.netbsd Log Message: add today's releases: 5.1.4, 5.2.2, 6.0.4, and 6.1.3 To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/calendar/calendars/calendar.netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.27 src/usr.bin/calendar/calendars/calendar.netbsd:1.28 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.27 Mon Sep 30 03:50:31 2013 +++ src/usr.bin/calendar/calendars/calendar.netbsd Mon Jan 27 21:00:02 2014 @@ -3,6 +3,10 @@ 01/07 NetBSD/dreamcast port started, 2001 01/17 NetBSD/hpcsh port started, 2001 01/23 NetBSD/arc port started, 2000 +01/27 NetBSD 5.1.4 released, 2014 +01/27 NetBSD 5.2.2 released, 2014 +01/27 NetBSD 6.0.4 released, 2014 +01/27 NetBSD 6.1.3 released, 2014 01/31 NetBSD/shark port started, 1996 02/02 NetBSD 5.1.2 released, 2012 02/06 NetBSD/evbsh3 port started, 2001
CVS commit: src/lib/libkvm
Module Name:src Committed By: matt Date: Mon Jan 27 21:00:01 UTC 2014 Modified Files: src/lib/libkvm: kvm_alpha.c kvm_m68k.c kvm_powerpc.c kvm_powerpc64.c kvm_vax.c Log Message: Add missing __RCSID("$NetBSD$"); To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libkvm/kvm_alpha.c cvs rdiff -u -r1.18 -r1.19 src/lib/libkvm/kvm_m68k.c src/lib/libkvm/kvm_vax.c cvs rdiff -u -r1.12 -r1.13 src/lib/libkvm/kvm_powerpc.c cvs rdiff -u -r1.4 -r1.5 src/lib/libkvm/kvm_powerpc64.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/libkvm/kvm_alpha.c diff -u src/lib/libkvm/kvm_alpha.c:1.25 src/lib/libkvm/kvm_alpha.c:1.26 --- src/lib/libkvm/kvm_alpha.c:1.25 Mon Sep 20 23:23:16 2010 +++ src/lib/libkvm/kvm_alpha.c Mon Jan 27 21:00:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_alpha.c,v 1.25 2010/09/20 23:23:16 jym Exp $ */ +/* $NetBSD: kvm_alpha.c,v 1.26 2014/01/27 21:00:01 matt Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -51,6 +51,8 @@ #include "kvm_private.h" +__RCSID("$NetBSD: kvm_alpha.c,v 1.26 2014/01/27 21:00:01 matt Exp $"); + /*ARGSUSED*/ void _kvm_freevtop(kvm_t *kd) Index: src/lib/libkvm/kvm_m68k.c diff -u src/lib/libkvm/kvm_m68k.c:1.18 src/lib/libkvm/kvm_m68k.c:1.19 --- src/lib/libkvm/kvm_m68k.c:1.18 Mon Sep 20 23:23:16 2010 +++ src/lib/libkvm/kvm_m68k.c Mon Jan 27 21:00:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_m68k.c,v 1.18 2010/09/20 23:23:16 jym Exp $ */ +/* $NetBSD: kvm_m68k.c,v 1.19 2014/01/27 21:00:01 matt Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -59,6 +59,8 @@ #include "kvm_private.h" #include "kvm_m68k.h" +__RCSID("$NetBSD: kvm_m68k.c,v 1.19 2014/01/27 21:00:01 matt Exp $"); + struct name_ops { const char *name; struct kvm_ops *ops; Index: src/lib/libkvm/kvm_vax.c diff -u src/lib/libkvm/kvm_vax.c:1.18 src/lib/libkvm/kvm_vax.c:1.19 --- src/lib/libkvm/kvm_vax.c:1.18 Mon Sep 20 23:23:16 2010 +++ src/lib/libkvm/kvm_vax.c Mon Jan 27 21:00:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_vax.c,v 1.18 2010/09/20 23:23:16 jym Exp $ */ +/* $NetBSD: kvm_vax.c,v 1.19 2014/01/27 21:00:01 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -60,6 +60,7 @@ #include "kvm_private.h" +__RCSID("$NetBSD: kvm_vax.c,v 1.19 2014/01/27 21:00:01 matt Exp $"); struct vmstate { u_long end; Index: src/lib/libkvm/kvm_powerpc.c diff -u src/lib/libkvm/kvm_powerpc.c:1.12 src/lib/libkvm/kvm_powerpc.c:1.13 --- src/lib/libkvm/kvm_powerpc.c:1.12 Mon Sep 20 23:23:16 2010 +++ src/lib/libkvm/kvm_powerpc.c Mon Jan 27 21:00:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_powerpc.c,v 1.12 2010/09/20 23:23:16 jym Exp $ */ +/* $NetBSD: kvm_powerpc.c,v 1.13 2014/01/27 21:00:01 matt Exp $ */ /* * Copyright (c) 2005 Wasabi Systems, Inc. @@ -91,6 +91,8 @@ #include #include +__RCSID("$NetBSD: kvm_powerpc.c,v 1.13 2014/01/27 21:00:01 matt Exp $"); + static int _kvm_match_601bat(kvm_t *, vaddr_t, paddr_t *, int *); static int _kvm_match_bat(kvm_t *, vaddr_t, paddr_t *, int *); static int _kvm_match_sr(kvm_t *, vaddr_t, paddr_t *, int *); Index: src/lib/libkvm/kvm_powerpc64.c diff -u src/lib/libkvm/kvm_powerpc64.c:1.4 src/lib/libkvm/kvm_powerpc64.c:1.5 --- src/lib/libkvm/kvm_powerpc64.c:1.4 Mon Sep 20 23:23:16 2010 +++ src/lib/libkvm/kvm_powerpc64.c Mon Jan 27 21:00:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_powerpc64.c,v 1.4 2010/09/20 23:23:16 jym Exp $ */ +/* $NetBSD: kvm_powerpc64.c,v 1.5 2014/01/27 21:00:01 matt Exp $ */ /* * Copyright (c) 2005 Wasabi Systems, Inc. @@ -90,6 +90,8 @@ #include #include +__RCSID("$NetBSD: kvm_powerpc64.c,v 1.5 2014/01/27 21:00:01 matt Exp $"); + void _kvm_freevtop(kvm_t *kd) {
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 20:44:29 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_or_64_cas.c Log Message: fix c&p bug. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/atomic/atomic_or_64_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_or_64_cas.c diff -u src/common/lib/libc/atomic/atomic_or_64_cas.c:1.7 src/common/lib/libc/atomic/atomic_or_64_cas.c:1.8 --- src/common/lib/libc/atomic/atomic_or_64_cas.c:1.7 Mon Jan 27 18:29:47 2014 +++ src/common/lib/libc/atomic/atomic_or_64_cas.c Mon Jan 27 20:44:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_64_cas.c,v 1.7 2014/01/27 18:29:47 matt Exp $ */ +/* $NetBSD: atomic_or_64_cas.c,v 1.8 2014/01/27 20:44:29 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ uint64_t __sync_fetch_and_or_8(volatile uint64_t *addr, uint64_t val); -void +uint64_t __sync_fetch_and_or_8(volatile uint64_t *addr, uint64_t val) { uint64_t old, new;
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 20:01:50 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_and_64_cas.c Log Message: Return old To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/atomic/atomic_and_64_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_and_64_cas.c diff -u src/common/lib/libc/atomic/atomic_and_64_cas.c:1.7 src/common/lib/libc/atomic/atomic_and_64_cas.c:1.8 --- src/common/lib/libc/atomic/atomic_and_64_cas.c:1.7 Mon Jan 27 18:29:47 2014 +++ src/common/lib/libc/atomic/atomic_and_64_cas.c Mon Jan 27 20:01:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_64_cas.c,v 1.7 2014/01/27 18:29:47 matt Exp $ */ +/* $NetBSD: atomic_and_64_cas.c,v 1.8 2014/01/27 20:01:50 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -46,6 +46,7 @@ __sync_fetch_and_and_8(volatile uint64_t old = *addr; new = old & val; } while (atomic_cas_64(addr, old, new) != old); + return old; } void
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: njoly Date: Mon Jan 27 19:19:15 UTC 2014 Modified Files: src/sys/compat/linux/common: linux_socket.c linux_socket.h Log Message: Add basic IPV6 level socket options support (IPV6_V6ONLY). To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/compat/linux/common/linux_socket.c cvs rdiff -u -r1.21 -r1.22 src/sys/compat/linux/common/linux_socket.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/compat/linux/common/linux_socket.c diff -u src/sys/compat/linux/common/linux_socket.c:1.116 src/sys/compat/linux/common/linux_socket.c:1.117 --- src/sys/compat/linux/common/linux_socket.c:1.116 Mon Jan 27 13:23:33 2014 +++ src/sys/compat/linux/common/linux_socket.c Mon Jan 27 19:19:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.116 2014/01/27 13:23:33 njoly Exp $ */ +/* $NetBSD: linux_socket.c,v 1.117 2014/01/27 19:19:15 njoly Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.116 2014/01/27 13:23:33 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.117 2014/01/27 19:19:15 njoly Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -114,6 +114,7 @@ static int bsd_to_linux_domain(int); int linux_to_bsd_sopt_level(int); int linux_to_bsd_so_sockopt(int); int linux_to_bsd_ip_sockopt(int); +int linux_to_bsd_ipv6_sockopt(int); int linux_to_bsd_tcp_sockopt(int); int linux_to_bsd_udp_sockopt(int); int linux_getifname(struct lwp *, register_t *, void *); @@ -833,6 +834,10 @@ linux_to_bsd_sopt_level(int llevel) return SOL_SOCKET; case LINUX_SOL_IP: return IPPROTO_IP; +#ifdef INET6 + case LINUX_SOL_IPV6: + return IPPROTO_IPV6; +#endif case LINUX_SOL_TCP: return IPPROTO_TCP; case LINUX_SOL_UDP: @@ -922,6 +927,23 @@ linux_to_bsd_ip_sockopt(int lopt) } /* + * Convert Linux IPV6 level socket option number to NetBSD values. + */ +#ifdef INET6 +int +linux_to_bsd_ipv6_sockopt(int lopt) +{ + + switch (lopt) { + case LINUX_IPV6_V6ONLY: + return IPV6_V6ONLY; + default: + return -1; + } +} +#endif + +/* * Convert Linux TCP level socket option number to NetBSD values. */ int @@ -1000,6 +1022,11 @@ linux_sys_setsockopt(struct lwp *l, cons case IPPROTO_IP: name = linux_to_bsd_ip_sockopt(SCARG(uap, optname)); break; +#ifdef INET6 + case IPPROTO_IPV6: + name = linux_to_bsd_ipv6_sockopt(SCARG(uap, optname)); + break; +#endif case IPPROTO_TCP: name = linux_to_bsd_tcp_sockopt(SCARG(uap, optname)); break; @@ -1045,6 +1072,11 @@ linux_sys_getsockopt(struct lwp *l, cons case IPPROTO_IP: name = linux_to_bsd_ip_sockopt(SCARG(uap, optname)); break; +#ifdef INET6 + case IPPROTO_IPV6: + name = linux_to_bsd_ipv6_sockopt(SCARG(uap, optname)); + break; +#endif case IPPROTO_TCP: name = linux_to_bsd_tcp_sockopt(SCARG(uap, optname)); break; Index: src/sys/compat/linux/common/linux_socket.h diff -u src/sys/compat/linux/common/linux_socket.h:1.21 src/sys/compat/linux/common/linux_socket.h:1.22 --- src/sys/compat/linux/common/linux_socket.h:1.21 Thu Jun 30 20:09:39 2011 +++ src/sys/compat/linux/common/linux_socket.h Mon Jan 27 19:19:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.h,v 1.21 2011/06/30 20:09:39 wiz Exp $ */ +/* $NetBSD: linux_socket.h,v 1.22 2014/01/27 19:19:15 njoly Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -78,8 +78,8 @@ #define LINUX_SOL_IP 0 #define LINUX_SOL_TCP 6 #define LINUX_SOL_UDP 17 -/* Unused for now: */ #define LINUX_SOL_IPV6 41 +/* Unused for now: */ #define LINUX_SOL_ICMPV6 58 #define LINUX_SOL_RAW 255 #define LINUX_SOL_IPX 256 @@ -111,6 +111,12 @@ #define LINUX_IP_DROP_MEMBERSHIP 36 /* + * Options for [gs]etsockopt(2), IPV6 level. + */ + +#define LINUX_IPV6_V6ONLY 26 + +/* * Options for [gs]etsockopt(2), TCP level. */
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:43:07 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_and_32_nv_cas.c Log Message: Fix tpyo (add->and) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/atomic/atomic_and_32_nv_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_and_32_nv_cas.c diff -u src/common/lib/libc/atomic/atomic_and_32_nv_cas.c:1.5 src/common/lib/libc/atomic/atomic_and_32_nv_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_and_32_nv_cas.c:1.5 Mon Jan 27 18:36:37 2014 +++ src/common/lib/libc/atomic/atomic_and_32_nv_cas.c Mon Jan 27 18:43:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_32_nv_cas.c,v 1.5 2014/01/27 18:36:37 matt Exp $ */ +/* $NetBSD: atomic_and_32_nv_cas.c,v 1.6 2014/01/27 18:43:07 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ atomic_and_32_nv(volatile uint32_t *addr #undef atomic_and_32_nv atomic_op_alias(atomic_and_32_nv,_atomic_and_32_nv) -__strong_alias(__sync_and_and_fetch_4,_atomic_add_32_nv) +__strong_alias(__sync_and_and_fetch_4,_atomic_and_32_nv) #undef atomic_and_uint_nv atomic_op_alias(atomic_and_uint_nv,_atomic_and_32_nv)
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:36:37 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_add_32_nv_cas.c atomic_add_64_nv_cas.c atomic_and_32_nv_cas.c atomic_and_64_nv_cas.c atomic_or_32_nv_cas.c atomic_or_64_nv_cas.c Log Message: Add __sync__and_fetch_ aliases To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/atomic/atomic_add_32_nv_cas.c \ src/common/lib/libc/atomic/atomic_and_32_nv_cas.c \ src/common/lib/libc/atomic/atomic_or_32_nv_cas.c cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/atomic/atomic_add_64_nv_cas.c \ src/common/lib/libc/atomic/atomic_and_64_nv_cas.c \ src/common/lib/libc/atomic/atomic_or_64_nv_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_add_32_nv_cas.c diff -u src/common/lib/libc/atomic/atomic_add_32_nv_cas.c:1.4 src/common/lib/libc/atomic/atomic_add_32_nv_cas.c:1.5 --- src/common/lib/libc/atomic/atomic_add_32_nv_cas.c:1.4 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/atomic/atomic_add_32_nv_cas.c Mon Jan 27 18:36:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_32_nv_cas.c,v 1.4 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: atomic_add_32_nv_cas.c,v 1.5 2014/01/27 18:36:37 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -48,6 +48,7 @@ atomic_add_32_nv(volatile uint32_t *addr #undef atomic_add_32_nv atomic_op_alias(atomic_add_32_nv,_atomic_add_32_nv) +__strong_alias(__sync_add_and_fetch_4,_atomic_add_32_nv) #undef atomic_add_int_nv atomic_op_alias(atomic_add_int_nv,_atomic_add_32_nv) Index: src/common/lib/libc/atomic/atomic_and_32_nv_cas.c diff -u src/common/lib/libc/atomic/atomic_and_32_nv_cas.c:1.4 src/common/lib/libc/atomic/atomic_and_32_nv_cas.c:1.5 --- src/common/lib/libc/atomic/atomic_and_32_nv_cas.c:1.4 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/atomic/atomic_and_32_nv_cas.c Mon Jan 27 18:36:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_32_nv_cas.c,v 1.4 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: atomic_and_32_nv_cas.c,v 1.5 2014/01/27 18:36:37 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -48,6 +48,8 @@ atomic_and_32_nv(volatile uint32_t *addr #undef atomic_and_32_nv atomic_op_alias(atomic_and_32_nv,_atomic_and_32_nv) +__strong_alias(__sync_and_and_fetch_4,_atomic_add_32_nv) + #undef atomic_and_uint_nv atomic_op_alias(atomic_and_uint_nv,_atomic_and_32_nv) __strong_alias(_atomic_and_uint_nv,_atomic_and_32_nv) Index: src/common/lib/libc/atomic/atomic_or_32_nv_cas.c diff -u src/common/lib/libc/atomic/atomic_or_32_nv_cas.c:1.4 src/common/lib/libc/atomic/atomic_or_32_nv_cas.c:1.5 --- src/common/lib/libc/atomic/atomic_or_32_nv_cas.c:1.4 Mon Apr 28 20:22:53 2008 +++ src/common/lib/libc/atomic/atomic_or_32_nv_cas.c Mon Jan 27 18:36:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_32_nv_cas.c,v 1.4 2008/04/28 20:22:53 martin Exp $ */ +/* $NetBSD: atomic_or_32_nv_cas.c,v 1.5 2014/01/27 18:36:37 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -48,6 +48,8 @@ atomic_or_32_nv(volatile uint32_t *addr, #undef atomic_or_32_nv atomic_op_alias(atomic_or_32_nv,_atomic_or_32_nv) +__strong_alias(__sync_or_and_fetch_4,_atomic_or_32_nv) + #undef atomic_or_uint_nv atomic_op_alias(atomic_or_uint_nv,_atomic_or_32_nv) __strong_alias(_atomic_or_uint_nv,_atomic_or_32_nv) Index: src/common/lib/libc/atomic/atomic_add_64_nv_cas.c diff -u src/common/lib/libc/atomic/atomic_add_64_nv_cas.c:1.5 src/common/lib/libc/atomic/atomic_add_64_nv_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_add_64_nv_cas.c:1.5 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/atomic/atomic_add_64_nv_cas.c Mon Jan 27 18:36:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_64_nv_cas.c,v 1.5 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: atomic_add_64_nv_cas.c,v 1.6 2014/01/27 18:36:37 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -50,6 +50,7 @@ atomic_add_64_nv(volatile uint64_t *addr #undef atomic_add_64_nv atomic_op_alias(atomic_add_64_nv,_atomic_add_64_nv) +__strong_alias(__sync_add_and_fetch_8,_atomic_add_64_nv) #if defined(_LP64) #undef atomic_add_long_nv Index: src/common/lib/libc/atomic/atomic_and_64_nv_cas.c diff -u src/common/lib/libc/atomic/atomic_and_64_nv_cas.c:1.5 src/common/lib/libc/atomic/atomic_and_64_nv_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_and_64_nv_cas.c:1.5 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/atomic/atomic_and_64_nv_cas.c Mon Jan 27 18:36:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_64_nv_cas.c,v 1.5 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: atomic_and_64_nv_cas.c,v 1.6 2014/01/27 18:36:37 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -50,6 +50,8 @@ atomic_and_64_nv(volatile uint64_t *addr #undef atomic_and_64_nv atomic_op_alias(atomic_and_64_nv,
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:36:53 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_and_32_cas.c atomic_or_32_cas.c Log Message: fix tpyos. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/atomic/atomic_and_32_cas.c \ src/common/lib/libc/atomic/atomic_or_32_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_and_32_cas.c diff -u src/common/lib/libc/atomic/atomic_and_32_cas.c:1.6 src/common/lib/libc/atomic/atomic_and_32_cas.c:1.7 --- src/common/lib/libc/atomic/atomic_and_32_cas.c:1.6 Mon Jan 27 18:29:47 2014 +++ src/common/lib/libc/atomic/atomic_and_32_cas.c Mon Jan 27 18:36:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_32_cas.c,v 1.6 2014/01/27 18:29:47 matt Exp $ */ +/* $NetBSD: atomic_and_32_cas.c,v 1.7 2014/01/27 18:36:52 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include -uint32_t atomic_and_32(volatile uint32_t *, uint32_t); +uint32_t __sync_fetch_and_and_4(volatile uint32_t *, uint32_t); uint32_t __sync_fetch_and_and_4(volatile uint32_t *addr, uint32_t val) Index: src/common/lib/libc/atomic/atomic_or_32_cas.c diff -u src/common/lib/libc/atomic/atomic_or_32_cas.c:1.6 src/common/lib/libc/atomic/atomic_or_32_cas.c:1.7 --- src/common/lib/libc/atomic/atomic_or_32_cas.c:1.6 Mon Jan 27 18:29:47 2014 +++ src/common/lib/libc/atomic/atomic_or_32_cas.c Mon Jan 27 18:36:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_32_cas.c,v 1.6 2014/01/27 18:29:47 matt Exp $ */ +/* $NetBSD: atomic_or_32_cas.c,v 1.7 2014/01/27 18:36:52 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ __sync_fetch_and_or_4(volatile uint32_t void atomic_or_32(volatile uint32_t *addr, uint32_t val) { - (void) __sync_val_compare_and_swap_4(addr, val); + (void) __sync_fetch_and_or_4(addr, val); } #undef atomic_or_32
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:29:47 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_add_32_cas.c atomic_add_64_cas.c atomic_and_32_cas.c atomic_and_64_cas.c atomic_or_32_cas.c atomic_or_64_cas.c Log Message: Rework so that __sync_fetch_and__ actually returns a value. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/atomic/atomic_add_32_cas.c \ src/common/lib/libc/atomic/atomic_and_32_cas.c \ src/common/lib/libc/atomic/atomic_or_32_cas.c cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/atomic/atomic_add_64_cas.c \ src/common/lib/libc/atomic/atomic_and_64_cas.c \ src/common/lib/libc/atomic/atomic_or_64_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_add_32_cas.c diff -u src/common/lib/libc/atomic/atomic_add_32_cas.c:1.5 src/common/lib/libc/atomic/atomic_add_32_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_add_32_cas.c:1.5 Mon Jan 27 18:08:37 2014 +++ src/common/lib/libc/atomic/atomic_add_32_cas.c Mon Jan 27 18:29:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_32_cas.c,v 1.5 2014/01/27 18:08:37 matt Exp $ */ +/* $NetBSD: atomic_add_32_cas.c,v 1.6 2014/01/27 18:29:47 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -33,8 +33,10 @@ #include -void -atomic_add_32(volatile uint32_t *addr, int32_t val) +uint32_t __sync_fetch_and_add_4(volatile uint32_t *, int32_t); + +uint32_t +__sync_fetch_and_add_4(volatile uint32_t *addr, int32_t val) { uint32_t old, new; @@ -42,6 +44,13 @@ atomic_add_32(volatile uint32_t *addr, i old = *addr; new = old + val; } while (atomic_cas_32(addr, old, new) != old); + return old; +} + +void +atomic_add_32(volatile uint32_t *addr, int32_t val) +{ + (void) __sync_fetch_and_add_4(addr, val); } #undef atomic_add_32 @@ -50,7 +59,6 @@ atomic_op_alias(atomic_add_32,_atomic_ad #undef atomic_add_int atomic_op_alias(atomic_add_int,_atomic_add_32) __strong_alias(_atomic_add_int,_atomic_add_32) -__strong_alias(__sync_fetch_and_add_4,_atomic_add_32) #if !defined(_LP64) #undef atomic_add_long Index: src/common/lib/libc/atomic/atomic_and_32_cas.c diff -u src/common/lib/libc/atomic/atomic_and_32_cas.c:1.5 src/common/lib/libc/atomic/atomic_and_32_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_and_32_cas.c:1.5 Mon Jan 27 18:12:57 2014 +++ src/common/lib/libc/atomic/atomic_and_32_cas.c Mon Jan 27 18:29:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_32_cas.c,v 1.5 2014/01/27 18:12:57 matt Exp $ */ +/* $NetBSD: atomic_and_32_cas.c,v 1.6 2014/01/27 18:29:47 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -33,8 +33,10 @@ #include -void -atomic_and_32(volatile uint32_t *addr, uint32_t val) +uint32_t atomic_and_32(volatile uint32_t *, uint32_t); + +uint32_t +__sync_fetch_and_and_4(volatile uint32_t *addr, uint32_t val) { uint32_t old, new; @@ -42,11 +44,17 @@ atomic_and_32(volatile uint32_t *addr, u old = *addr; new = old & val; } while (atomic_cas_32(addr, old, new) != old); + return old; +} + +void +atomic_and_32(volatile uint32_t *addr, uint32_t val) +{ + (void) __sync_fetch_and_and_4(addr, val); } #undef atomic_and_32 atomic_op_alias(atomic_and_32,_atomic_and_32) -__strong_alias(__sync_fetch_and_and_4,_atomic_and_32) #undef atomic_and_uint atomic_op_alias(atomic_and_uint,_atomic_and_32) Index: src/common/lib/libc/atomic/atomic_or_32_cas.c diff -u src/common/lib/libc/atomic/atomic_or_32_cas.c:1.5 src/common/lib/libc/atomic/atomic_or_32_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_or_32_cas.c:1.5 Mon Jan 27 18:12:57 2014 +++ src/common/lib/libc/atomic/atomic_or_32_cas.c Mon Jan 27 18:29:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_32_cas.c,v 1.5 2014/01/27 18:12:57 matt Exp $ */ +/* $NetBSD: atomic_or_32_cas.c,v 1.6 2014/01/27 18:29:47 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -33,8 +33,10 @@ #include -void -atomic_or_32(volatile uint32_t *addr, uint32_t val) +uint32_t __sync_fetch_and_or_4(volatile uint32_t *, uint32_t); + +uint32_t +__sync_fetch_and_or_4(volatile uint32_t *addr, uint32_t val) { uint32_t old, new; @@ -42,11 +44,17 @@ atomic_or_32(volatile uint32_t *addr, ui old = *addr; new = old | val; } while (atomic_cas_32(addr, old, new) != old); + return old; +} + +void +atomic_or_32(volatile uint32_t *addr, uint32_t val) +{ + (void) __sync_val_compare_and_swap_4(addr, val); } #undef atomic_or_32 atomic_op_alias(atomic_or_32,_atomic_or_32) -__strong_alias(__sync_fetch_and_or_4,_atomic_or_32) #undef atomic_or_uint atomic_op_alias(atomic_or_uint,_atomic_or_32) Index: src/common/lib/libc/atomic/atomic_add_64_cas.c diff -u src/common/lib/libc/atomic/atomic_add_64_cas.c:1.6 src/common/lib/libc/atomic/atomic_add_64_cas.c:1.7 --- src/common/lib/libc/atomic/atomic_add_64_cas.c
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:12:57 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_and_32_cas.c atomic_and_64_cas.c atomic_or_32_cas.c atomic_or_64_cas.c Log Message: Add __sync_fetch_and__ aliases To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/atomic/atomic_and_32_cas.c \ src/common/lib/libc/atomic/atomic_or_32_cas.c cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/atomic/atomic_and_64_cas.c \ src/common/lib/libc/atomic/atomic_or_64_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_and_32_cas.c diff -u src/common/lib/libc/atomic/atomic_and_32_cas.c:1.4 src/common/lib/libc/atomic/atomic_and_32_cas.c:1.5 --- src/common/lib/libc/atomic/atomic_and_32_cas.c:1.4 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/atomic/atomic_and_32_cas.c Mon Jan 27 18:12:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_32_cas.c,v 1.4 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: atomic_and_32_cas.c,v 1.5 2014/01/27 18:12:57 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -46,6 +46,8 @@ atomic_and_32(volatile uint32_t *addr, u #undef atomic_and_32 atomic_op_alias(atomic_and_32,_atomic_and_32) +__strong_alias(__sync_fetch_and_and_4,_atomic_and_32) + #undef atomic_and_uint atomic_op_alias(atomic_and_uint,_atomic_and_32) __strong_alias(_atomic_and_uint,_atomic_and_32) Index: src/common/lib/libc/atomic/atomic_or_32_cas.c diff -u src/common/lib/libc/atomic/atomic_or_32_cas.c:1.4 src/common/lib/libc/atomic/atomic_or_32_cas.c:1.5 --- src/common/lib/libc/atomic/atomic_or_32_cas.c:1.4 Mon Apr 28 20:22:53 2008 +++ src/common/lib/libc/atomic/atomic_or_32_cas.c Mon Jan 27 18:12:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_32_cas.c,v 1.4 2008/04/28 20:22:53 martin Exp $ */ +/* $NetBSD: atomic_or_32_cas.c,v 1.5 2014/01/27 18:12:57 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -46,6 +46,8 @@ atomic_or_32(volatile uint32_t *addr, ui #undef atomic_or_32 atomic_op_alias(atomic_or_32,_atomic_or_32) +__strong_alias(__sync_fetch_and_or_4,_atomic_or_32) + #undef atomic_or_uint atomic_op_alias(atomic_or_uint,_atomic_or_32) __strong_alias(_atomic_or_uint,_atomic_or_32) Index: src/common/lib/libc/atomic/atomic_and_64_cas.c diff -u src/common/lib/libc/atomic/atomic_and_64_cas.c:1.5 src/common/lib/libc/atomic/atomic_and_64_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_and_64_cas.c:1.5 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/atomic/atomic_and_64_cas.c Mon Jan 27 18:12:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_64_cas.c,v 1.5 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: atomic_and_64_cas.c,v 1.6 2014/01/27 18:12:57 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -48,6 +48,8 @@ atomic_and_64(volatile uint64_t *addr, u #undef atomic_and_64 atomic_op_alias(atomic_and_64,_atomic_and_64) +__strong_alias(__sync_fetch_and_and_8,_atomic_and_64) + #if defined(_LP64) #undef atomic_and_ulong atomic_op_alias(atomic_and_ulong,_atomic_and_64) Index: src/common/lib/libc/atomic/atomic_or_64_cas.c diff -u src/common/lib/libc/atomic/atomic_or_64_cas.c:1.5 src/common/lib/libc/atomic/atomic_or_64_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_or_64_cas.c:1.5 Mon Apr 28 20:22:53 2008 +++ src/common/lib/libc/atomic/atomic_or_64_cas.c Mon Jan 27 18:12:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_64_cas.c,v 1.5 2008/04/28 20:22:53 martin Exp $ */ +/* $NetBSD: atomic_or_64_cas.c,v 1.6 2014/01/27 18:12:57 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -48,6 +48,8 @@ atomic_or_64(volatile uint64_t *addr, ui #undef atomic_or_64 atomic_op_alias(atomic_or_64,_atomic_or_64) +__strong_alias(__sync_fetch_and_or_8,_atomic_or_64) + #if defined(_LP64) #undef atomic_or_ulong atomic_op_alias(atomic_or_ulong,_atomic_or_64)
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:09:51 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_add_64_cas.c Log Message: Add __sync_fetch_and_add_8 alias To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/atomic/atomic_add_64_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_add_64_cas.c diff -u src/common/lib/libc/atomic/atomic_add_64_cas.c:1.5 src/common/lib/libc/atomic/atomic_add_64_cas.c:1.6 --- src/common/lib/libc/atomic/atomic_add_64_cas.c:1.5 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/atomic/atomic_add_64_cas.c Mon Jan 27 18:09:51 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_64_cas.c,v 1.5 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: atomic_add_64_cas.c,v 1.6 2014/01/27 18:09:51 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -48,6 +48,7 @@ atomic_add_64(volatile uint64_t *addr, i #undef atomic_add_64 atomic_op_alias(atomic_add_64,_atomic_add_64) +__strong_alias(__sync_fetch_and_add_8,_atomic_add_64) #if defined(_LP64) #undef atomic_add_long
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:08:37 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_add_32_cas.c Log Message: Add __sync_fetch_and_add_4 alias To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/atomic/atomic_add_32_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_add_32_cas.c diff -u src/common/lib/libc/atomic/atomic_add_32_cas.c:1.4 src/common/lib/libc/atomic/atomic_add_32_cas.c:1.5 --- src/common/lib/libc/atomic/atomic_add_32_cas.c:1.4 Mon Apr 28 20:22:52 2008 +++ src/common/lib/libc/atomic/atomic_add_32_cas.c Mon Jan 27 18:08:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_32_cas.c,v 1.4 2008/04/28 20:22:52 martin Exp $ */ +/* $NetBSD: atomic_add_32_cas.c,v 1.5 2014/01/27 18:08:37 matt Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -50,6 +50,7 @@ atomic_op_alias(atomic_add_32,_atomic_ad #undef atomic_add_int atomic_op_alias(atomic_add_int,_atomic_add_32) __strong_alias(_atomic_add_int,_atomic_add_32) +__strong_alias(__sync_fetch_and_add_4,_atomic_add_32) #if !defined(_LP64) #undef atomic_add_long
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:05:25 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: Makefile.inc atomic_cas_up.S Log Message: Add _atomic_cas_16_up and _atomic_cas_8_up To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/common/lib/libc/arch/arm/atomic/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S 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/arch/arm/atomic/Makefile.inc diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.14 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.15 --- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.14 Fri Nov 8 22:42:52 2013 +++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Mon Jan 27 18:05:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.14 2013/11/08 22:42:52 matt Exp $ +# $NetBSD: Makefile.inc,v 1.15 2014/01/27 18:05:24 matt Exp $ ARMV6= ${CPUFLAGS:M-march=armv6*} ${CPUFLAGS:M-mcpu=arm11*} ARMV6+= ${CFLAGS:M-march=armv6*:} ${CFLAGS:M-mcpu=arm11*} @@ -58,6 +58,8 @@ CPUFLAGS.atomic_simplelock.c+= -marm SRCS.atomic+= atomic_init_testset.c SRCS.atomic+= atomic_cas_up.S CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP +CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_16_UP +CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_8_UP .else SRCS.atomic+= atomic_init_cas.c .endif Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.4 src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.5 --- src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S:1.4 Mon Aug 19 00:35:06 2013 +++ src/common/lib/libc/arch/arm/atomic/atomic_cas_up.S Mon Jan 27 18:05:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_cas_up.S,v 1.4 2013/08/19 00:35:06 matt Exp $ */ +/* $NetBSD: atomic_cas_up.S,v 1.5 2014/01/27 18:05:24 matt Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -48,3 +48,35 @@ RAS_START_ASM_HIDDEN(_atomic_cas) RAS_END_ASM_HIDDEN(_atomic_cas) 1: RET END(_atomic_cas_up) + +ENTRY(_atomic_cas_16_up) + mov r3, r0 + .align 0 +RAS_START_ASM_HIDDEN(_atomic_cas_16) + ldrh r0, [r3] + cmp r0, r1 +#if defined(__thumb__) + beq 1f +#else + strheq r2, [r3] +#endif + .align 0 +RAS_END_ASM_HIDDEN(_atomic_cas_16) +1: RET +END(_atomic_cas_16_up) + +ENTRY(_atomic_cas_8_up) + mov r3, r0 + .align 0 +RAS_START_ASM_HIDDEN(_atomic_cas_8) + ldrb r0, [r3] + cmp r0, r1 +#if defined(__thumb__) + beq 1f +#else + strbeq r2, [r3] +#endif + .align 0 +RAS_END_ASM_HIDDEN(_atomic_cas_8) +1: RET +END(_atomic_cas_8_up)
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: matt Date: Mon Jan 27 18:03:44 UTC 2014 Modified Files: src/common/lib/libc/atomic: atomic_init_testset.c Log Message: Add _atomic_cas_16 and _atomic_cas_8 and their aliases __sync_val_compare_and_swap_2 & __sync_val_compare_and_swap_1 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/common/lib/libc/atomic/atomic_init_testset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/atomic/atomic_init_testset.c diff -u src/common/lib/libc/atomic/atomic_init_testset.c:1.9 src/common/lib/libc/atomic/atomic_init_testset.c:1.10 --- src/common/lib/libc/atomic/atomic_init_testset.c:1.9 Wed Aug 21 03:00:56 2013 +++ src/common/lib/libc/atomic/atomic_init_testset.c Mon Jan 27 18:03:44 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_init_testset.c,v 1.9 2013/08/21 03:00:56 matt Exp $ */ +/* $NetBSD: atomic_init_testset.c,v 1.10 2014/01/27 18:03:44 matt Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__RCSID("$NetBSD: atomic_init_testset.c,v 1.9 2013/08/21 03:00:56 matt Exp $"); +__RCSID("$NetBSD: atomic_init_testset.c,v 1.10 2014/01/27 18:03:44 matt Exp $"); #include "atomic_op_namespace.h" @@ -59,13 +59,29 @@ extern uint32_t _atomic_cas_up(volatile #else static uint32_t _atomic_cas_up(volatile uint32_t *, uint32_t, uint32_t); #endif - static uint32_t (*_atomic_cas_fn)(volatile uint32_t *, uint32_t, uint32_t) = _atomic_cas_up; +RAS_DECL(_atomic_cas); -void __libc_atomic_init(void) __attribute__ ((visibility("hidden"))); +#ifdef __HAVE_ASM_ATOMIC_CAS_16_UP +extern uint16_t _atomic_cas_16_up(volatile uint16_t *, uint16_t, uint16_t); +#else +static uint16_t _atomic_cas_16_up(volatile uint16_t *, uint16_t, uint16_t); +#endif +static uint16_t (*_atomic_cas_16_fn)(volatile uint16_t *, uint16_t, uint16_t) = +_atomic_cas_16_up; +RAS_DECL(_atomic_cas_16); -RAS_DECL(_atomic_cas); +#ifdef __HAVE_ASM_ATOMIC_CAS_8_UP +extern uint8_t _atomic_cas_8_up(volatile uint8_t *, uint8_t, uint8_t); +#else +static uint8_t _atomic_cas_8_up(volatile uint8_t *, uint8_t, uint8_t); +#endif +static uint8_t (*_atomic_cas_8_fn)(volatile uint8_t *, uint8_t, uint8_t) = +_atomic_cas_8_up; +RAS_DECL(_atomic_cas_8); + +void __libc_atomic_init(void) __attribute__ ((visibility("hidden"))); #ifndef __HAVE_ASM_ATOMIC_CAS_UP static uint32_t @@ -85,6 +101,42 @@ _atomic_cas_up(volatile uint32_t *ptr, u } #endif +#ifndef __HAVE_ASM_ATOMIC_CAS_16_UP +static uint16_t +_atomic_cas_up_16(volatile uint16_t *ptr, uint16_t old, uint16_t new) +{ + uint16_t ret; + + RAS_START(_atomic_cas_16); + ret = *ptr; + if (__predict_false(ret != old)) { + return ret; + } + *ptr = new; + RAS_END(_atomic_cas_16); + + return ret; +} +#endif + +#ifndef __HAVE_ASM_ATOMIC_CAS_UP +static uint8_t +_atomic_cas_up(volatile uint8_t *ptr, uint8_t old, uint8_t new) +{ + uint8_t ret; + + RAS_START(_atomic_cas_8); + ret = *ptr; + if (__predict_false(ret != old)) { + return ret; + } + *ptr = new; + RAS_END(_atomic_cas_16); + + return ret; +} +#endif + static uint32_t _atomic_cas_mp(volatile uint32_t *ptr, uint32_t old, uint32_t new) { @@ -109,6 +161,24 @@ _atomic_cas_32(volatile uint32_t *ptr, u return (*_atomic_cas_fn)(ptr, old, new); } +uint16_t _atomic_cas_16(volatile uint16_t *, uint16_t, uint16_t); + +uint16_t +_atomic_cas_16(volatile uint16_t *ptr, uint16_t old, uint16_t new) +{ + + return (*_atomic_cas_16_fn)(ptr, old, new); +} + +uint8_t _atomic_cas_8(volatile uint8_t *, uint8_t, uint8_t); + +uint8_t +_atomic_cas_8(volatile uint8_t *ptr, uint8_t old, uint8_t new) +{ + + return (*_atomic_cas_8_fn)(ptr, old, new); +} + void __section(".text.startup") __libc_atomic_init(void) { @@ -129,6 +199,18 @@ __libc_atomic_init(void) _atomic_cas_fn = _atomic_cas_up; return; } + + if (rasctl(RAS_ADDR(_atomic_cas_16), RAS_SIZE(_atomic_cas_16), + RAS_INSTALL) == 0) { + _atomic_cas_16_fn = _atomic_cas_16_up; + return; + } + + if (rasctl(RAS_ADDR(_atomic_cas_8), RAS_SIZE(_atomic_cas_8), + RAS_INSTALL) == 0) { + _atomic_cas_8_fn = _atomic_cas_8_up; + return; + } } #undef atomic_cas_32 @@ -156,3 +238,7 @@ atomic_op_alias(atomic_cas_ulong_ni,_ato __strong_alias(_atomic_cas_ulong_ni,_atomic_cas_32) atomic_op_alias(atomic_cas_ptr_ni,_atomic_cas_32) __strong_alias(_atomic_cas_ptr_ni,_atomic_cas_32) + +__strong_alias(__sync_val_compare_and_swap_4,_atomic_cas_32) +__strong_alias(__sync_val_compare_and_swap_2,_atomic_cas_16) +__strong_alias(__sync_val_compare_and_swap_1,_atomic_cas_8)
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Mon Jan 27 13:22:55 UTC 2014 Modified Files: src/sys/dev/pci: genfb_pci.c Log Message: back out 1.35 since it completely breaks the mechanism for wsdisplay drivers to determine wether to become console or not. See http://mail-index.netbsd.org/tech-kern/2014/01/15/msg016421.html for fixing this properly. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/genfb_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/genfb_pci.c diff -u src/sys/dev/pci/genfb_pci.c:1.35 src/sys/dev/pci/genfb_pci.c:1.36 --- src/sys/dev/pci/genfb_pci.c:1.35 Thu Jan 16 18:41:10 2014 +++ src/sys/dev/pci/genfb_pci.c Mon Jan 27 13:22:55 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb_pci.c,v 1.35 2014/01/16 18:41:10 jakllsch Exp $ */ +/* $NetBSD: genfb_pci.c,v 1.36 2014/01/27 13:22:55 macallan Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.35 2014/01/16 18:41:10 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.36 2014/01/27 13:22:55 macallan Exp $"); #include #include @@ -99,10 +99,8 @@ pci_genfb_attach(device_t parent, device struct pci_genfb_softc *sc = device_private(self); struct pci_attach_args *pa = aux; struct genfb_ops ops; - prop_dictionary_t dict; pcireg_t rom; int idx, bar, type; - bool isconsole; pci_aprint_devinfo(pa, NULL); @@ -187,10 +185,6 @@ pci_genfb_attach(device_t parent, device ops.genfb_mmap = pci_genfb_mmap; ops.genfb_borrow = pci_genfb_borrow; - isconsole = genfb_is_console() != 0; - dict = device_properties(self); - prop_dictionary_set_bool(dict, "is_console", isconsole); - if (genfb_attach(&sc->sc_gen, &ops) == 0) { /* now try to attach a DRM */
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: njoly Date: Mon Jan 27 13:23:33 UTC 2014 Modified Files: src/sys/compat/linux/common: linux_socket.c Log Message: Add SO_SNDLOWAT, SO_RCVLOWAT and SO_ACCEPTCONN support for socket options. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/compat/linux/common/linux_socket.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/compat/linux/common/linux_socket.c diff -u src/sys/compat/linux/common/linux_socket.c:1.115 src/sys/compat/linux/common/linux_socket.c:1.116 --- src/sys/compat/linux/common/linux_socket.c:1.115 Fri Jan 11 19:01:36 2013 +++ src/sys/compat/linux/common/linux_socket.c Mon Jan 27 13:23:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.115 2013/01/11 19:01:36 christos Exp $ */ +/* $NetBSD: linux_socket.c,v 1.116 2014/01/27 13:23:33 njoly Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.115 2013/01/11 19:01:36 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.116 2014/01/27 13:23:33 njoly Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -873,12 +873,18 @@ linux_to_bsd_so_sockopt(int lopt) return SO_SNDBUF; case LINUX_SO_RCVBUF: return SO_RCVBUF; + case LINUX_SO_SNDLOWAT: + return SO_SNDLOWAT; + case LINUX_SO_RCVLOWAT: + return SO_RCVLOWAT; case LINUX_SO_KEEPALIVE: return SO_KEEPALIVE; case LINUX_SO_OOBINLINE: return SO_OOBINLINE; case LINUX_SO_LINGER: return SO_LINGER; + case LINUX_SO_ACCEPTCONN: + return SO_ACCEPTCONN; case LINUX_SO_PRIORITY: case LINUX_SO_NO_CHECK: default:
CVS commit: src
Module Name:src Committed By: apb Date: Mon Jan 27 08:18:08 UTC 2014 Modified Files: src/distrib/alpha/floppy-GENERIC: Makefile src/distrib/alpha/rz25dist: Makefile src/distrib/cobalt: Makefile src/distrib/common: Makefile.image Makefile.mdset Makefile.minirootkmod Makefile.tarfloppy src/distrib/evbarm/gzboot/gzimg: Makefile src/distrib/ews4800mips/floppies/instkernel: Makefile src/distrib/prep/floppies/bootfloppy-common: Makefile.inc src/distrib/prep/floppies/kernel-generic: Makefile src/distrib/rs6000/bootfs: Makefile src/distrib/sets: Makefile src/distrib/sparc64/xminiroot: Makefile src/distrib/x68k/floppies/bootfloppy.generic: Makefile src/etc/etc.cats: Makefile.inc src/external/mit/xorg/share/fonts: Makefile.bdf src/external/mit/xorg/share/fonts/encodings: Makefile.enc src/lib/libc/time: Makefile src/libexec/httpd: Makefile src/sys/arch/evbppc/conf: Makefile.obs405.inc src/x11/share/fonts/bdf: Makefile.bdf src/x11/share/fonts/encodings: Makefile.enc Log Message: Use ${TOOL_GZIP} instead of just gzip in all Makefiles outside */dist/* subdirectories. When USE_PIGZGZIP=yes, bsd.own.mk sets TOOL_GZIP=${TOOL_PIGZ}, so there's no need to test USE_PIGZGZIP in these Makefiles. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/distrib/alpha/floppy-GENERIC/Makefile cvs rdiff -u -r1.29 -r1.30 src/distrib/alpha/rz25dist/Makefile cvs rdiff -u -r1.3 -r1.4 src/distrib/cobalt/Makefile cvs rdiff -u -r1.32 -r1.33 src/distrib/common/Makefile.image cvs rdiff -u -r1.38 -r1.39 src/distrib/common/Makefile.mdset cvs rdiff -u -r1.1 -r1.2 src/distrib/common/Makefile.minirootkmod cvs rdiff -u -r1.16 -r1.17 src/distrib/common/Makefile.tarfloppy cvs rdiff -u -r1.24 -r1.25 src/distrib/evbarm/gzboot/gzimg/Makefile cvs rdiff -u -r1.4 -r1.5 src/distrib/ews4800mips/floppies/instkernel/Makefile cvs rdiff -u -r1.12 -r1.13 \ src/distrib/prep/floppies/bootfloppy-common/Makefile.inc cvs rdiff -u -r1.9 -r1.10 src/distrib/prep/floppies/kernel-generic/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/rs6000/bootfs/Makefile cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/Makefile cvs rdiff -u -r1.29 -r1.30 src/distrib/sparc64/xminiroot/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/distrib/x68k/floppies/bootfloppy.generic/Makefile cvs rdiff -u -r1.16 -r1.17 src/etc/etc.cats/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/share/fonts/Makefile.bdf cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/share/fonts/encodings/Makefile.enc cvs rdiff -u -r1.16 -r1.17 src/lib/libc/time/Makefile cvs rdiff -u -r1.17 -r1.18 src/libexec/httpd/Makefile cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/Makefile.obs405.inc cvs rdiff -u -r1.7 -r1.8 src/x11/share/fonts/bdf/Makefile.bdf cvs rdiff -u -r1.8 -r1.9 src/x11/share/fonts/encodings/Makefile.enc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/alpha/floppy-GENERIC/Makefile diff -u src/distrib/alpha/floppy-GENERIC/Makefile:1.20 src/distrib/alpha/floppy-GENERIC/Makefile:1.21 --- src/distrib/alpha/floppy-GENERIC/Makefile:1.20 Fri Apr 3 22:36:34 2009 +++ src/distrib/alpha/floppy-GENERIC/Makefile Mon Jan 27 08:18:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2009/04/03 22:36:34 perry Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/27 08:18:07 apb Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -42,7 +42,7 @@ netbsd: ${FLOPPYKERNEL} @rm -f ${.TARGET} ${.TARGET}.tmp cp ${.ALLSRC} ${.TARGET}.tmp ${STRIP} ${.TARGET}.tmp - gzip -9nf ${.TARGET}.tmp + ${TOOL_GZIP} -9nf ${.TARGET}.tmp mv ${.TARGET}.tmp.gz ${.TARGET} CLEANFILES+= netbsd netbsd.tmp netbsd.tmp.gz Index: src/distrib/alpha/rz25dist/Makefile diff -u src/distrib/alpha/rz25dist/Makefile:1.29 src/distrib/alpha/rz25dist/Makefile:1.30 --- src/distrib/alpha/rz25dist/Makefile:1.29 Fri Apr 3 22:36:34 2009 +++ src/distrib/alpha/rz25dist/Makefile Mon Jan 27 08:18:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2009/04/03 22:36:34 perry Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $ .include "../../../Makefile.inc" @@ -77,21 +77,21 @@ diskimage.gz: mount-fs build-fs unmount- umount ${DESTDIR}/usr ${DESTDIR} /bin/rm -f $@ dd if=/dev/r${DESTDISK}c bs=`expr ${SECPERCYL} \* 512` \ - count=${CYLS} | gzip -9n > $@ + count=${CYLS} | ${TOOL_GZIP} -9n > $@ bin.tar.gz: mount-fs build-fs /bin/rm -f $@ (cd ${DESTDIR} ; find . | grep -v '^./etc' | \ grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \ - grep -v '^./boot' | pax -w -d | gzip -9n) > $@ + grep -v '^./boot' | pax -w -d | ${TOOL_GZIP} -9n) > $@ etc.tar.gz: mount-fs build-fs /bin/rm -f $@ - (cd ${DESTDIR} ; find ./etc | pax -w -d | gzip -9n) > $@ + (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP} -9