CVS commit: src/rescue
Module Name:src
Committed By: christos
Date: Thu Dec 26 02:25:57 UTC 2013
Modified Files:
src/rescue: Makefile list
Log Message:
mount_smbfs has moved.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/rescue/Makefile
cvs rdiff -u -r1.44 -r1.45 src/rescue/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.29 src/rescue/Makefile:1.30
--- src/rescue/Makefile:1.29 Sun Mar 24 13:05:27 2013
+++ src/rescue/Makefile Wed Dec 25 21:25:57 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/03/24 17:05:27 christos Exp $
+# $NetBSD: Makefile,v 1.30 2013/12/26 02:25:57 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -47,6 +47,9 @@ LDD_ELF32DIR!= cd ${NETBSDSRCDIR}/usr.bi
LDD_ELF64DIR!= cd ${NETBSDSRCDIR}/usr.bin/ldd/elf64 && ${PRINTOBJDIR}
PARSELISTENV+= LDD_ELF32DIR=${LDD_ELF32DIR} LDD_ELF64DIR=${LDD_ELF64DIR}
+SMB_LIBDIR!= cd ${NETBSDSRCDIR}/external/bsd/smbfs/lib/libsmb && ${PRINTOBJDIR}
+PARSELISTENV+= SMB_LIBDIR=${SMB_LIBDIR}
+
# Specially built objects to override the behaviour of
# various library functions
#
Index: src/rescue/list
diff -u src/rescue/list:1.44 src/rescue/list:1.45
--- src/rescue/list:1.44 Thu Nov 28 20:12:47 2013
+++ src/rescue/list Wed Dec 25 21:25:57 2013
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.44 2013/11/29 01:12:47 christos Exp $
+# $NetBSD: list,v 1.45 2013/12/26 02:25:57 christos Exp $
SRCDIRS bin
@@ -86,6 +86,8 @@ PROG mount_null
PROG mount_overlay
PROG mount_procfs
PROG mount_smbfs
+SPECIAL mount_smbfs srcdir external/bsd/smbfs/sbin/mount_smbfs
+LIBS ${SMB_LIBDIR}/libsmb.a
PROG mount_tmpfs
PROG mount_umap
PROG mount_union
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: bad
Date: Thu Dec 26 00:51:23 UTC 2013
Modified Files:
src/sys/dev/pci: ubsec.c
Log Message:
Also disable MCR4INT in ubsec_detach() when appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/ubsec.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/ubsec.c
diff -u src/sys/dev/pci/ubsec.c:1.34 src/sys/dev/pci/ubsec.c:1.35
--- src/sys/dev/pci/ubsec.c:1.34 Sun Nov 17 23:20:18 2013
+++ src/sys/dev/pci/ubsec.c Thu Dec 26 00:51:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsec.c,v 1.34 2013/11/17 23:20:18 bad Exp $ */
+/* $NetBSD: ubsec.c,v 1.35 2013/12/26 00:51:23 bad Exp $ */
/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
/* $OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $ */
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.34 2013/11/17 23:20:18 bad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.35 2013/12/26 00:51:23 bad Exp $");
#undef UBSEC_DEBUG
@@ -544,11 +544,17 @@ ubsec_detach(device_t self, int flags)
{
struct ubsec_softc *sc = device_private(self);
struct ubsec_q *q, *qtmp;
+ volatile u_int32_t ctrl;
/* disable interrupts */
/* XXX wait/abort current ops? where is DMAERR enabled? */
- WRITE_REG(sc, BS_CTRL, READ_REG(sc, BS_CTRL) &~
- (BS_CTRL_MCR2INT | BS_CTRL_MCR1INT | BS_CTRL_DMAERR));
+ ctrl = READ_REG(sc, BS_CTRL);
+
+ ctrl &= ~(BS_CTRL_MCR2INT | BS_CTRL_MCR1INT | BS_CTRL_DMAERR);
+ if (sc->sc_flags & UBS_FLAGS_MULTIMCR)
+ ctrl &= ~BS_CTRL_MCR4INT;
+
+ WRITE_REG(sc, BS_CTRL, ctrl);
#ifndef UBSEC_NO_RNG
if (sc->sc_flags & UBS_FLAGS_RNG) {
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: joerg Date: Thu Dec 26 00:19:07 UTC 2013 Modified Files: src/sys/arch/arm/cortex: a9_mpsubr.S Log Message: dsb is preferred for post-armv7 CPUs. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/cortex/a9_mpsubr.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/arm/cortex/a9_mpsubr.S diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.10 src/sys/arch/arm/cortex/a9_mpsubr.S:1.11 --- src/sys/arch/arm/cortex/a9_mpsubr.S:1.10 Tue Nov 12 17:10:39 2013 +++ src/sys/arch/arm/cortex/a9_mpsubr.S Thu Dec 26 00:19:07 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: a9_mpsubr.S,v 1.10 2013/11/12 17:10:39 matt Exp $ */ +/* $NetBSD: a9_mpsubr.S,v 1.11 2013/12/26 00:19:07 joerg Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -150,7 +150,7 @@ arm_cpuinit: XPUTC(#70) mov r1, #0 - mcr p15, 0, r1, c7, c10, 4 /* Drain the write buffers. */ + dsb/* Drain the write buffers. */ XPUTC(#71) mrc p15, 0, r2, c0, c0, 5 /* get MPIDR */
CVS commit: src/usr.sbin/puffs/rump_smbfs
Module Name:src
Committed By: christos
Date: Wed Dec 25 23:35:17 UTC 2013
Modified Files:
src/usr.sbin/puffs/rump_smbfs: Makefile
Log Message:
smbfs has moved.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/puffs/rump_smbfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/rump_smbfs/Makefile
diff -u src/usr.sbin/puffs/rump_smbfs/Makefile:1.6 src/usr.sbin/puffs/rump_smbfs/Makefile:1.7
--- src/usr.sbin/puffs/rump_smbfs/Makefile:1.6 Sun Dec 5 15:13:26 2010
+++ src/usr.sbin/puffs/rump_smbfs/Makefile Wed Dec 25 18:35:17 2013
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.6 2010/12/05 20:13:26 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2013/12/25 23:35:17 christos Exp $
#
-WARNS=2
-
-.include
+SMBROOT=${.CURDIR}/../../../external/bsd/smbfs
MOUNTNAME= smbfs
SRCS+= smb_rumpops.c
+PROGDPLIBS+= smb ${SMBROOT}/lib/libsmb
LDADD+= -lrumpnet_sockin -lrumpnet
LDADD+= -lrumpkern_crypto -lrumpdev_netsmb -lrumpdev
ISRUMP= # it is
-.include "${.CURDIR}/../../../sbin/mount_smbfs/Makefile.inc"
+.include "${SMBROOT}/Makefile.inc"
+
+CPPFLAGS+=-I${SMBDIST}/mount_smbfs
+.PATH: ${SMBDIST}/mount_smbfs
.include
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/earm
Module Name:src Committed By: joerg Date: Wed Dec 25 22:54:24 UTC 2013 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/earm: Makefile.inc Log Message: Should be ARMv6. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc diff -u src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc:1.5 src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc:1.6 --- src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc:1.5 Wed Dec 25 22:06:11 2013 +++ src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc Wed Dec 25 22:54:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2013/12/25 22:06:11 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.6 2013/12/25 22:54:24 joerg Exp $ SRCS+= \ random.c \ @@ -194,8 +194,8 @@ GMP_LIMB_BITS=32 M4FLAGS= -DPIC COPTS+= -fPIC -AFLAGS.addmul_1.s= -march=armv5 -AFLAGS.invert_limb.s= -march=armv5 -AFLAGS.mode1o.s= -march=armv5 -AFLAGS.mul_1.s= -march=armv5 -AFLAGS.submul_1.s= -march=armv5 +AFLAGS.addmul_1.s= -march=armv6 +AFLAGS.invert_limb.s= -march=armv6 +AFLAGS.mode1o.s= -march=armv6 +AFLAGS.mul_1.s= -march=armv6 +AFLAGS.submul_1.s= -march=armv6
CVS commit: src/tests/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Wed Dec 25 22:26:35 UTC 2013
Modified Files:
src/tests/libexec/ld.elf_so/helper_symver_dso1: Makefile
src/tests/libexec/ld.elf_so/helper_symver_dso2: Makefile
Log Message:
Disable integrated-assembler for clang on ARM for two files that are
victims of the @ comment mess on that platform. Add a reference to the
upstream PR.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile:1.1 Sat Jun 25 05:45:13 2011
+++ src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile Wed Dec 25 22:26:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/25 05:45:13 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2013/12/25 22:26:35 joerg Exp $
.include
@@ -20,4 +20,10 @@ FILESDIR= ${TESTSBASE}/libexec/ld.elf_so
LDFLAGS.lib${LIB} += -Wl,--version-script=${.CURDIR}/h_helper_symver_dso1.map
+.if !empty(MACHINE_ARCH:M*arm*)
+# LLVM PR 18273
+COPTS.h_helper_symver_dso1.c= ${${ACTIVE_CC} == "clang":?-no-integrated-as :}
+.endif
+
.include
+
Index: src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile
diff -u src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.1 src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.2
--- src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile:1.1 Sat Jun 25 05:45:13 2011
+++ src/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile Wed Dec 25 22:26:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/25 05:45:13 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2013/12/25 22:26:35 joerg Exp $
.include
@@ -20,4 +20,9 @@ FILESDIR= ${TESTSBASE}/libexec/ld.elf_so
LDFLAGS.lib${LIB} += -Wl,--version-script=${.CURDIR}/h_helper_symver_dso2.map
+.if !empty(MACHINE_ARCH:M*arm*)
+# LLVM PR 18273
+COPTS.h_helper_symver_dso2.c= ${${ACTIVE_CC} == "clang":?-no-integrated-as :}
+.endif
+
.include
CVS commit: src/crypto/external/bsd/heimdal/libexec
Module Name:src
Committed By: joerg
Date: Wed Dec 25 22:21:33 UTC 2013
Modified Files:
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
Log Message:
Resort libraries according to dependencies.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/libexec/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.2 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.3
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.2 Wed May 25 19:21:18 2011
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc Wed Dec 25 22:21:32 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/05/25 19:21:18 he Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/12/25 22:21:32 joerg Exp $
BINDIR=/usr/libexec
-LDADD+= -lkrb5 -lhx509
+LDADD+= -lheimntlm -lkrb5 -lhx509 -lheimbase
LDADD+= -lasn1 -lcom_err -lroken ${LIBVERS}
-LDADD+= -lheimbase -lheimntlm -lwind
+LDADD+= -lwind
LDADD+= -lcrypto -lcrypt
DPADD+= ${LIBKRB5} ${LIBHX509}
CVS commit: src/external/bsd/bind
Module Name:src
Committed By: joerg
Date: Wed Dec 25 22:19:15 UTC 2013
Modified Files:
src/external/bsd/bind: Makefile.inc
Log Message:
Resort libraries:
- libdns is a dependency of libisccfg
- libkrb5 is required by libheimntlm
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.18 src/external/bsd/bind/Makefile.inc:1.19
--- src/external/bsd/bind/Makefile.inc:1.18 Thu Oct 3 20:17:47 2013
+++ src/external/bsd/bind/Makefile.inc Wed Dec 25 22:19:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2013/10/03 20:17:47 christos Exp $
+# $NetBSD: Makefile.inc,v 1.19 2013/12/25 22:19:15 joerg Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -63,9 +63,9 @@ DBG=-g3 -gstabs
.if !defined(LIB) || empty(LIB)
# NOTE: the order of these libraries is important...
.if defined(NAMED_DEBUG)
-LDADD+= -lbind9_g -ldns_g -llwres_g -lisccfg_g -lisccc_g -lisc_g
+LDADD+= -lbind9_g -llwres_g -lisccfg_g -ldns_g -lisccc_g -lisc_g
.else
-LDADD+= -lbind9 -ldns -llwres -lisccfg -lisccc -lisc
+LDADD+= -lbind9 -llwres -lisccfg -ldns -lisccc -lisc
DPADD+= ${LIBBIND9} ${LIBDNS} ${LIBLWRES}
DPADD+= ${LIBISCCFG} ${LIBISCCC} ${LIBISC}
.endif
@@ -95,7 +95,7 @@ CPPFLAGS+=-DGSSAPI
.endif
.if ${MKKERBEROS} != "no"
.if !defined (LIB) || empty(LIB)
-LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
+LDADD+= -lgssapi -lheimntlm -lkrb5 -lhx509 -lheimbase \
-lcom_err -lroken -lasn1 -lwind
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
CVS commit: src/dist/smbfs
Module Name:src Committed By: christos Date: Wed Dec 25 22:14:53 UTC 2013 Removed Files: src/dist/smbfs: COPYRIGHT CREDITS FREEBSD-upgrade HISTORY INSTALL Makefile Makefile.inc README config.mk.in configure src/dist/smbfs/examples: dot.nsmbrc smbfs.sh.sample src/dist/smbfs/examples/print: lj6l ljspool printcap.sample tolj src/dist/smbfs/include: cflib.h smb_kernelops.h src/dist/smbfs/include/netsmb: nb_lib.h smb_lib.h smb_rap.h src/dist/smbfs/lib: Makefile Makefile.inc src/dist/smbfs/lib/smb: Makefile cfopt.c ctx.c file.c kiconv.c mbuf.c nb.c nb_name.c nb_net.c nbns_rq.c nls.c print.c rap.c rcfile.c rcfile_priv.h rq.c smb_kernelops.c subr.c src/dist/smbfs/mount_smbfs: Makefile mount_smbfs.8 mount_smbfs.c mount_smbfs.h src/dist/smbfs/smbutil: Makefile common.h dumptree.c login.c lookup.c print.c smbutil.1 smbutil.c view.c Log Message: good-bye, moved to external To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/dist/smbfs/COPYRIGHT src/dist/smbfs/CREDITS \ src/dist/smbfs/FREEBSD-upgrade src/dist/smbfs/HISTORY \ src/dist/smbfs/INSTALL src/dist/smbfs/README src/dist/smbfs/configure cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/Makefile \ src/dist/smbfs/Makefile.inc src/dist/smbfs/config.mk.in cvs rdiff -u -r1.3 -r0 src/dist/smbfs/examples/dot.nsmbrc cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/examples/smbfs.sh.sample cvs rdiff -u -r1.1.1.1 -r0 src/dist/smbfs/examples/print/lj6l \ src/dist/smbfs/examples/print/ljspool src/dist/smbfs/examples/print/tolj cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/examples/print/printcap.sample cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/include/cflib.h cvs rdiff -u -r1.2 -r0 src/dist/smbfs/include/smb_kernelops.h cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/include/netsmb/nb_lib.h \ src/dist/smbfs/include/netsmb/smb_rap.h cvs rdiff -u -r1.5 -r0 src/dist/smbfs/include/netsmb/smb_lib.h cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/lib/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/dist/smbfs/lib/Makefile.inc cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/lib/smb/Makefile cvs rdiff -u -r1.2 -r0 src/dist/smbfs/lib/smb/cfopt.c \ src/dist/smbfs/lib/smb/print.c src/dist/smbfs/lib/smb/smb_kernelops.c cvs rdiff -u -r1.15 -r0 src/dist/smbfs/lib/smb/ctx.c cvs rdiff -u -r1.4 -r0 src/dist/smbfs/lib/smb/file.c cvs rdiff -u -r1.3 -r0 src/dist/smbfs/lib/smb/kiconv.c cvs rdiff -u -r1.8 -r0 src/dist/smbfs/lib/smb/mbuf.c \ src/dist/smbfs/lib/smb/nls.c src/dist/smbfs/lib/smb/subr.c cvs rdiff -u -r1.5 -r0 src/dist/smbfs/lib/smb/nb.c \ src/dist/smbfs/lib/smb/nb_net.c src/dist/smbfs/lib/smb/rcfile.c \ src/dist/smbfs/lib/smb/rq.c cvs rdiff -u -r1.7 -r0 src/dist/smbfs/lib/smb/nb_name.c \ src/dist/smbfs/lib/smb/nbns_rq.c cvs rdiff -u -r1.9 -r0 src/dist/smbfs/lib/smb/rap.c cvs rdiff -u -r1.1.1.1 -r0 src/dist/smbfs/lib/smb/rcfile_priv.h cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/mount_smbfs/Makefile cvs rdiff -u -r1.14 -r0 src/dist/smbfs/mount_smbfs/mount_smbfs.8 cvs rdiff -u -r1.11 -r0 src/dist/smbfs/mount_smbfs/mount_smbfs.c cvs rdiff -u -r1.1 -r0 src/dist/smbfs/mount_smbfs/mount_smbfs.h cvs rdiff -u -r1.1.1.2 -r0 src/dist/smbfs/smbutil/Makefile \ src/dist/smbfs/smbutil/login.c src/dist/smbfs/smbutil/lookup.c \ src/dist/smbfs/smbutil/print.c src/dist/smbfs/smbutil/view.c cvs rdiff -u -r1.1.1.1 -r0 src/dist/smbfs/smbutil/common.h \ src/dist/smbfs/smbutil/dumptree.c src/dist/smbfs/smbutil/smbutil.c cvs rdiff -u -r1.2 -r0 src/dist/smbfs/smbutil/smbutil.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Dec 25 22:14:28 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: document smbfs To generate a diff of this commit: cvs rdiff -u -r1.1075 -r1.1076 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1075 src/doc/3RDPARTY:1.1076 --- src/doc/3RDPARTY:1.1075 Wed Dec 4 17:53:55 2013 +++ src/doc/3RDPARTY Wed Dec 25 17:14:28 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1075 2013/12/04 22:53:55 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1076 2013/12/25 22:14:28 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1469,3 +1469,18 @@ Location: sys/external/bsd/libdwarf/dist Notes: Run prepare-import.sh; next time use svn id. Ask jkoshy who the upstream will be. + +Package: smbfs +Version: smbfs-1.4.1.tar.gz + FreeBSD-2003-02-16 +Current Vers: FreeBSD--YY-ZZ +Maintainer: Boris Popov +Archive Site: none +Home Page: http://people.freebsd.org/~bp/pub/smbfs/smbfs-1.4.1.tar.gz +Mailing List: ? +Responsible: christos +License: BSD-like (4-clause) +Location: external/bsd/smbfs +Notes: + The kernel portion has been removed from the tar file. + Our kernel smbfs and netsmb directories could move to + external, but this is just make-work.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Dec 25 22:08:24 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/man: mi Log Message: add smbutil To generate a diff of this commit: cvs rdiff -u -r1.1051 -r1.1052 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1453 -r1.1454 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1051 src/distrib/sets/lists/base/mi:1.1052 --- src/distrib/sets/lists/base/mi:1.1051 Sun Dec 1 04:13:55 2013 +++ src/distrib/sets/lists/base/mi Wed Dec 25 17:08:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1051 2013/12/01 09:13:55 martin Exp $ +# $NetBSD: mi,v 1.1052 2013/12/25 22:08:24 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -697,6 +697,7 @@ ./usr/bin/skeyinfobase-util-bin skey ./usr/bin/skeyinitbase-util-bin skey ./usr/bin/sloginbase-secsh-bin crypto +./usr/bin/smbutilbase-util-bin ./usr/bin/sockstatbase-util-bin ./usr/bin/sort base-util-bin ./usr/bin/spell base-util-bin Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.43 src/distrib/sets/lists/debug/mi:1.44 --- src/distrib/sets/lists/debug/mi:1.43 Sat Nov 16 08:01:38 2013 +++ src/distrib/sets/lists/debug/mi Wed Dec 25 17:08:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.43 2013/11/16 13:01:38 alnsn Exp $ +# $NetBSD: mi,v 1.44 2013/12/25 22:08:24 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -722,6 +722,7 @@ ./usr/libdata/debug/usr/bin/skey.debug comp-util-debug skey,debug ./usr/libdata/debug/usr/bin/skeyinfo.debug comp-util-debug skey,debug ./usr/libdata/debug/usr/bin/skeyinit.debug comp-util-debug skey,debug +./usr/libdata/debug/usr/bin/smbutil.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/sockstat.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/soelim.debug comp-groff-debug debug ./usr/libdata/debug/usr/bin/sort.debug comp-util-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1453 src/distrib/sets/lists/man/mi:1.1454 --- src/distrib/sets/lists/man/mi:1.1453 Tue Dec 24 07:09:19 2013 +++ src/distrib/sets/lists/man/mi Wed Dec 25 17:08:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1453 2013/12/24 12:09:19 rkujawa Exp $ +# $NetBSD: mi,v 1.1454 2013/12/25 22:08:24 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -512,6 +512,7 @@ ./usr/share/man/cat1/skeyinit.0 man-util-catman skey,.cat ./usr/share/man/cat1/sleep.0 man-util-catman .cat ./usr/share/man/cat1/slogin.0 man-secsh-catman crypto,.cat +./usr/share/man/cat1/smbutil.0 man-util-catman .cat ./usr/share/man/cat1/sntp.0 man-ntp-catman .cat ./usr/share/man/cat1/sockstat.0 man-util-catman .cat ./usr/share/man/cat1/sort.0 man-util-catman .cat @@ -3575,6 +3576,7 @@ ./usr/share/man/html1/skeyinit.html man-util-htmlman skey,html ./usr/share/man/html1/sleep.html man-util-htmlman html ./usr/share/man/html1/slogin.html man-secsh-htmlman crypto,html +./usr/share/man/html1/smbutil.html man-util-htmlman html ./usr/share/man/html1/sntp.html man-ntp-htmlman html ./usr/share/man/html1/sockstat.html man-util-htmlman html ./usr/share/man/html1/sort.html man-util-htmlman html @@ -6288,6 +6290,7 @@ ./usr/share/man/man1/skeyinit.1 man-util-man skey,.man ./usr/share/man/man1/sleep.1 man-util-man .man ./usr/share/man/man1/slogin.1 man-secsh-man crypto,.man +./usr/share/man/man1/smbutil.1 man-util-man .man ./usr/share/man/man1/sntp.1 man-ntp-man .man ./usr/share/man/man1/sockstat.1 man-util-man .man ./usr/share/man/man1/sort.1 man-util-man .man
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/earm
Module Name:src Committed By: joerg Date: Wed Dec 25 22:06:11 UTC 2013 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/earm: Makefile.inc Log Message: Tag files using "more" advanced instructions than ARMv4 ISA with the necessary support. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc diff -u src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc:1.4 src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc:1.5 --- src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc:1.4 Wed Dec 4 00:49:17 2013 +++ src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc Wed Dec 25 22:06:11 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2013/12/04 00:49:17 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.5 2013/12/25 22:06:11 joerg Exp $ SRCS+= \ random.c \ @@ -193,3 +193,9 @@ GMP_LIMB_BITS=32 M4FLAGS= -DPIC COPTS+= -fPIC + +AFLAGS.addmul_1.s= -march=armv5 +AFLAGS.invert_limb.s= -march=armv5 +AFLAGS.mode1o.s= -march=armv5 +AFLAGS.mul_1.s= -march=armv5 +AFLAGS.submul_1.s= -march=armv5
CVS commit: src/lib/libc/arch/arm/gen
Module Name:src Committed By: joerg Date: Wed Dec 25 22:05:12 UTC 2013 Modified Files: src/lib/libc/arch/arm/gen: Makefile.inc Log Message: Explicitly enable FPU support. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libc/arch/arm/gen/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/arm/gen/Makefile.inc diff -u src/lib/libc/arch/arm/gen/Makefile.inc:1.25 src/lib/libc/arch/arm/gen/Makefile.inc:1.26 --- src/lib/libc/arch/arm/gen/Makefile.inc:1.25 Wed Aug 21 03:09:39 2013 +++ src/lib/libc/arch/arm/gen/Makefile.inc Wed Dec 25 22:05:12 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.25 2013/08/21 03:09:39 matt Exp $ +# $NetBSD: Makefile.inc,v 1.26 2013/12/25 22:05:12 joerg Exp $ SRCS+= alloca.S byte_swap_2.S byte_swap_4.S bswap64.c divide.S divsi3.S \ fabs.c flt_rounds.c udivsi3.S @@ -20,6 +20,9 @@ SRCS+= __aeabi_idiv0.c __aeabi_ldiv0.c SRCS+= modsi3.S umodsi3.S .endif +AFLAGS._setjmp.S= -mfpu=vfp +AFLAGS.setjmp.S= -mfpu=vfp + SRCS+= nanf.c SRCS+= setjmp.S
CVS commit: src/sbin
Module Name:src Committed By: christos Date: Wed Dec 25 22:04:52 UTC 2013 Modified Files: src/sbin: Makefile Removed Files: src/sbin/mount_smbfs: Makefile Makefile.inc Log Message: moved to external To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sbin/Makefile cvs rdiff -u -r1.12 -r0 src/sbin/mount_smbfs/Makefile cvs rdiff -u -r1.5 -r0 src/sbin/mount_smbfs/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/Makefile diff -u src/sbin/Makefile:1.125 src/sbin/Makefile:1.126 --- src/sbin/Makefile:1.125 Mon Oct 28 15:05:21 2013 +++ src/sbin/Makefile Wed Dec 25 17:04:52 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.125 2013/10/28 19:05:21 mbalmer Exp $ +# $NetBSD: Makefile,v 1.126 2013/12/25 22:04:52 christos Exp $ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # Not ported: XNSrouted enpload scsiformat startslip @@ -44,7 +44,6 @@ SUBDIR+= mount_portal SUBDIR+= mount_procfs SUBDIR+= mount_ptyfs SUBDIR+= mount_puffs -SUBDIR+= mount_smbfs SUBDIR+= mount_sysvbfs SUBDIR+= mount_tmpfs SUBDIR+= mount_umap
CVS commit: src/external/bsd
Module Name:src Committed By: christos Date: Wed Dec 25 22:04:20 UTC 2013 Modified Files: src/external/bsd: Makefile Log Message: Add smbfs To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/external/bsd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/Makefile diff -u src/external/bsd/Makefile:1.45 src/external/bsd/Makefile:1.46 --- src/external/bsd/Makefile:1.45 Thu Nov 28 17:34:17 2013 +++ src/external/bsd/Makefile Wed Dec 25 17:04:20 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2013/11/28 22:34:17 christos Exp $ +# $NetBSD: Makefile,v 1.46 2013/12/25 22:04:20 christos Exp $ .include @@ -35,6 +35,6 @@ SUBDIR+= llvm SUBDIR+= pcc .endif -SUBDIR+= pdisk dhcp nvi ppp +SUBDIR+= pdisk dhcp nvi ppp smbfs .include
CVS commit: src/external/bsd/smbfs/dist
Module Name:src
Committed By: christos
Date: Wed Dec 25 22:03:47 UTC 2013
Added Files:
src/external/bsd/smbfs/dist/include: smb_kernelops.h
src/external/bsd/smbfs/dist/lib/smb: smb_kernelops.c
Log Message:
Add RUMP glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/dist/include/smb_kernelops.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/smbfs/dist/lib/smb/smb_kernelops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/smbfs/dist/include/smb_kernelops.h
diff -u /dev/null src/external/bsd/smbfs/dist/include/smb_kernelops.h:1.1
--- /dev/null Wed Dec 25 17:03:47 2013
+++ src/external/bsd/smbfs/dist/include/smb_kernelops.h Wed Dec 25 17:03:46 2013
@@ -0,0 +1,52 @@
+/* $NetBSD: smb_kernelops.h,v 1.1 2013/12/25 22:03:46 christos Exp $*/
+
+/*
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, 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.
+ */
+
+#ifndef _SMBFS_KERNEL_OPS_H_
+#define _SMBFS_KERNEL_OPS_H_
+
+#include
+#include
+
+#include
+
+struct smb_kernelops {
+ int (*ko_open)(const char *, int, ...);
+ int (*ko_ioctl)(int, unsigned long, ...);
+ int (*ko_close)(int);
+
+ int (*ko_socket)(int, int, int);
+ int (*ko_setsockopt)(int, int, int, const void *, socklen_t);
+ int (*ko_bind)(int, const struct sockaddr *, socklen_t);
+ ssize_t (*ko_sendto)(int, const void *, size_t, int,
+ const struct sockaddr *, socklen_t);
+ ssize_t (*ko_recvfrom)(int, void *, size_t, int,
+ struct sockaddr *, socklen_t *);
+};
+extern const struct smb_kernelops smb_kops;
+
+#endif /* _SMBFS_KERNEL_OPS_H_ */
Index: src/external/bsd/smbfs/dist/lib/smb/smb_kernelops.c
diff -u /dev/null src/external/bsd/smbfs/dist/lib/smb/smb_kernelops.c:1.1
--- /dev/null Wed Dec 25 17:03:47 2013
+++ src/external/bsd/smbfs/dist/lib/smb/smb_kernelops.c Wed Dec 25 17:03:47 2013
@@ -0,0 +1,53 @@
+/* $NetBSD: smb_kernelops.c,v 1.1 2013/12/25 22:03:47 christos Exp $ */
+
+/*
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, 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.
+ */
+
+#include
+#ifndef lint
+__RCSID("$NetBSD: smb_kernelops.c,v 1.1 2013/12/25 22:03:47 christos Exp $");
+#endif /* !lint */
+
+#include
+#include
+#include
+
+#include
+#include
+
+#include "smb_kernelops.h"
+
+const
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: joerg Date: Wed Dec 25 22:04:28 UTC 2013 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv5_ec.S Log Message: Use symbolic form for the third argument of mrc. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.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/arm/arm/cpufunc_asm_armv5_ec.S diff -u src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.4 src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.5 --- src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.4 Sun Aug 18 06:28:18 2013 +++ src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S Wed Dec 25 22:04:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc_asm_armv5_ec.S,v 1.4 2013/08/18 06:28:18 matt Exp $ */ +/* $NetBSD: cpufunc_asm_armv5_ec.S,v 1.5 2013/12/25 22:04:28 joerg Exp $ */ /* * Copyright (c) 2002, 2005 ARM Limited @@ -63,7 +63,7 @@ ENTRY(armv5_ec_setttb) beq 2f @ nope, so don't mcr p15, 0, r0, c7, c5, 0 /* Invalidate ICache */ -1: mrc p15, 0, r15, c7, c14, 3 /* Test, clean and invalidate DCache */ +1: mrc p15, 0, APSR_nzcv, c7, c14, 3 /* Test, clean and invalidate DCache */ bne 1b /* More to do? */ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ cmp r0, #1 @@ -108,7 +108,7 @@ ENTRY_NP(armv5_ec_icache_sync_all) .Larmv5_ec_dcache_wb: 1: - mrc p15, 0, r15, c7, c10, 3 /* Test and clean (don't invalidate) */ + mrc p15, 0, APSR_nzcv, c7, c10, 3 /* Test and clean (don't invalidate) */ bne 1b /* More to do? */ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET @@ -205,7 +205,7 @@ ENTRY_NP(armv5_ec_idcache_wbinv_all) ENTRY(armv5_ec_dcache_wbinv_all) .Larmv5_ec_dcache_wbinv_all: -1: mrc p15, 0, r15, c7, c14, 3 /* Test, clean and invalidate DCache */ +1: mrc p15, 0, APSR_nzcv, c7, c14, 3 /* Test, clean and invalidate DCache */ bne 1b /* More to do? */ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET
CVS import: src/external/bsd/smbfs/dist
Module Name:src Committed By: christos Date: Wed Dec 25 20:33:14 UTC 2013 Update of /cvsroot/src/external/bsd/smbfs/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19470 Log Message: Import latest smbfs from: http://people.freebsd.org/~bp/pub/smbfs/smbfs-1.4.1.tar.gz Status: Vendor Tag: FREEBSD-SMBFS Release Tags: SMBFS1_4_1 N src/external/bsd/smbfs/dist/COPYRIGHT N src/external/bsd/smbfs/dist/CREDITS N src/external/bsd/smbfs/dist/HISTORY N src/external/bsd/smbfs/dist/INSTALL N src/external/bsd/smbfs/dist/Makefile N src/external/bsd/smbfs/dist/Makefile.inc N src/external/bsd/smbfs/dist/README N src/external/bsd/smbfs/dist/config.mk.in N src/external/bsd/smbfs/dist/configure N src/external/bsd/smbfs/dist/examples/smbfs.sh.sample N src/external/bsd/smbfs/dist/examples/dot.nsmbrc N src/external/bsd/smbfs/dist/examples/print/printcap.sample N src/external/bsd/smbfs/dist/examples/print/ljspool N src/external/bsd/smbfs/dist/examples/print/lj6l N src/external/bsd/smbfs/dist/examples/print/tolj N src/external/bsd/smbfs/dist/include/cflib.h N src/external/bsd/smbfs/dist/include/netsmb/smb_lib.h N src/external/bsd/smbfs/dist/include/netsmb/nb_lib.h N src/external/bsd/smbfs/dist/include/netsmb/smb_rap.h N src/external/bsd/smbfs/dist/lib/Makefile.inc N src/external/bsd/smbfs/dist/lib/Makefile N src/external/bsd/smbfs/dist/lib/smb/nb_name.c N src/external/bsd/smbfs/dist/lib/smb/Makefile N src/external/bsd/smbfs/dist/lib/smb/cfopt.c N src/external/bsd/smbfs/dist/lib/smb/ctx.c N src/external/bsd/smbfs/dist/lib/smb/file.c N src/external/bsd/smbfs/dist/lib/smb/kiconv.c N src/external/bsd/smbfs/dist/lib/smb/mbuf.c N src/external/bsd/smbfs/dist/lib/smb/nb.c N src/external/bsd/smbfs/dist/lib/smb/nbns_rq.c N src/external/bsd/smbfs/dist/lib/smb/nb_net.c N src/external/bsd/smbfs/dist/lib/smb/rcfile_priv.h N src/external/bsd/smbfs/dist/lib/smb/nls.c N src/external/bsd/smbfs/dist/lib/smb/print.c N src/external/bsd/smbfs/dist/lib/smb/rap.c N src/external/bsd/smbfs/dist/lib/smb/rcfile.c N src/external/bsd/smbfs/dist/lib/smb/subr.c N src/external/bsd/smbfs/dist/lib/smb/rq.c N src/external/bsd/smbfs/dist/mount_smbfs/getmntopts.c N src/external/bsd/smbfs/dist/mount_smbfs/Makefile N src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.8 N src/external/bsd/smbfs/dist/mount_smbfs/mntopts.h N src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.c N src/external/bsd/smbfs/dist/smbutil/dumptree.c N src/external/bsd/smbfs/dist/smbutil/Makefile N src/external/bsd/smbfs/dist/smbutil/common.h N src/external/bsd/smbfs/dist/smbutil/smbutil.1 N src/external/bsd/smbfs/dist/smbutil/login.c N src/external/bsd/smbfs/dist/smbutil/lookup.c N src/external/bsd/smbfs/dist/smbutil/print.c N src/external/bsd/smbfs/dist/smbutil/view.c N src/external/bsd/smbfs/dist/smbutil/smbutil.c No conflicts created by this import
CVS import: src/external/bsd/libc++/dist/libcxxrt
Module Name:src Committed By: joerg Date: Wed Dec 25 20:19:47 UTC 2013 Update of /cvsroot/src/external/bsd/libc++/dist/libcxxrt In directory ivanova.netbsd.org:/tmp/cvs-serv7413 Log Message: Import new snapshot of libcxxrt. Fixes demangling of anonymous namespaces. Avoid use of old style (C) casts. Status: Vendor Tag: PATHSCALE Release Tags: libcxxrt-3e7988bfceaa4802341134252f4564b7756c4308 U src/external/bsd/libc++/dist/libcxxrt/AUTHORS U src/external/bsd/libc++/dist/libcxxrt/COPYRIGHT U src/external/bsd/libc++/dist/libcxxrt/LICENSE U src/external/bsd/libc++/dist/libcxxrt/README U src/external/bsd/libc++/dist/libcxxrt/src/abi_namespace.h U src/external/bsd/libc++/dist/libcxxrt/src/auxhelper.cc U src/external/bsd/libc++/dist/libcxxrt/src/cxa_atexit.c U src/external/bsd/libc++/dist/libcxxrt/src/cxa_finalize.c U src/external/bsd/libc++/dist/libcxxrt/src/cxxabi.h U src/external/bsd/libc++/dist/libcxxrt/src/libelftc_dem_gnu3.c U src/external/bsd/libc++/dist/libcxxrt/src/memory.cc U src/external/bsd/libc++/dist/libcxxrt/src/stdexcept.cc U src/external/bsd/libc++/dist/libcxxrt/src/stdexcept.h U src/external/bsd/libc++/dist/libcxxrt/src/terminate.cc U src/external/bsd/libc++/dist/libcxxrt/src/typeinfo.h U src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h U src/external/bsd/libc++/dist/libcxxrt/src/unwind.h U src/external/bsd/libc++/dist/libcxxrt/src/atomic.h U src/external/bsd/libc++/dist/libcxxrt/src/dynamic_cast.cc U src/external/bsd/libc++/dist/libcxxrt/src/exception.cc U src/external/bsd/libc++/dist/libcxxrt/src/guard.cc U src/external/bsd/libc++/dist/libcxxrt/src/typeinfo.cc U src/external/bsd/libc++/dist/libcxxrt/src/unwind-arm.h U src/external/bsd/libc++/dist/libcxxrt/src/dwarf_eh.h U src/external/bsd/libc++/dist/libcxxrt/test/run_test.sh U src/external/bsd/libc++/dist/libcxxrt/test/test.cc U src/external/bsd/libc++/dist/libcxxrt/test/test.h U src/external/bsd/libc++/dist/libcxxrt/test/test_exception.cc U src/external/bsd/libc++/dist/libcxxrt/test/test_guard.cc U src/external/bsd/libc++/dist/libcxxrt/test/test_typeinfo.cc No conflicts created by this import
CVS commit: src/lib/libc/db/recno
Module Name:src
Committed By: christos
Date: Wed Dec 25 19:42:23 UTC 2013
Modified Files:
src/lib/libc/db/recno: rec_get.c
Log Message:
fix bug in previous change (sz should be the size of the newly allocated
buffer).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/db/recno/rec_get.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/db/recno/rec_get.c
diff -u src/lib/libc/db/recno/rec_get.c:1.17 src/lib/libc/db/recno/rec_get.c:1.18
--- src/lib/libc/db/recno/rec_get.c:1.17 Sat Dec 14 13:04:56 2013
+++ src/lib/libc/db/recno/rec_get.c Wed Dec 25 14:42:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rec_get.c,v 1.17 2013/12/14 18:04:56 christos Exp $ */
+/* $NetBSD: rec_get.c,v 1.18 2013/12/25 19:42:23 christos Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -34,7 +34,7 @@
#endif
#include
-__RCSID("$NetBSD: rec_get.c,v 1.17 2013/12/14 18:04:56 christos Exp $");
+__RCSID("$NetBSD: rec_get.c,v 1.18 2013/12/25 19:42:23 christos Exp $");
#include "namespace.h"
#include
@@ -175,7 +175,6 @@ __rec_vpipe(BTREE *t, recno_t top)
{
DBT data;
recno_t nrec;
- ptrdiff_t len;
size_t sz;
int bval, ch;
uint8_t *p;
@@ -195,13 +194,12 @@ __rec_vpipe(BTREE *t, recno_t top)
break;
}
if (sz == 0) {
-void *np;
-len = p - (uint8_t *)t->bt_rdata.data;
-sz = t->bt_rdata.size + 256;
-np = realloc(t->bt_rdata.data, sz);
+ptrdiff_t len = p - (uint8_t *)t->bt_rdata.data;
+size_t tot = t->bt_rdata.size + (sz = 256);
+void *np = realloc(t->bt_rdata.data, tot);
if (np == NULL)
return (RET_ERROR);
-t->bt_rdata.size = sz;
+t->bt_rdata.size = tot;
t->bt_rdata.data = np;
p = (uint8_t *)t->bt_rdata.data + len;
}
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: jakllsch Date: Wed Dec 25 17:24:39 UTC 2013 Modified Files: src/sys/arch/x86/pci: pci_machdep.c Log Message: Give cpu_comcnprobe a chance of working on Mode 2 PCI config space. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 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.62 src/sys/arch/x86/pci/pci_machdep.c:1.63 --- src/sys/arch/x86/pci/pci_machdep.c:1.62 Thu Oct 17 21:12:24 2013 +++ src/sys/arch/x86/pci/pci_machdep.c Wed Dec 25 17:24:39 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.62 2013/10/17 21:12:24 christos Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.63 2013/12/25 17:24:39 jakllsch Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.62 2013/10/17 21:12:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.63 2013/12/25 17:24:39 jakllsch Exp $"); #include #include @@ -970,7 +970,7 @@ cpu_comcnprobe(struct consdev *cn, struc pci_mode_detect(); pa->pa_iot = x86_bus_space_io; pa->pa_pc = 0; - pa->pa_tag = pci_make_tag(0, 0, 31, 0); + pa->pa_tag = pci_make_tag(0, 0, pci_bus_maxdevs(NULL, 0) - 1, 0); return 0; } #endif
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Wed Dec 25 17:19:34 UTC 2013
Modified Files:
src/sys/sys: queue.h
Log Message:
Allow QUEUEDEBUG to be used from userland.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/sys/queue.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/queue.h
diff -u src/sys/sys/queue.h:1.64 src/sys/sys/queue.h:1.65
--- src/sys/sys/queue.h:1.64 Wed Nov 27 07:24:56 2013
+++ src/sys/sys/queue.h Wed Dec 25 12:19:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.64 2013/11/27 12:24:56 joerg Exp $ */
+/* $NetBSD: queue.h,v 1.65 2013/12/25 17:19:34 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -91,6 +91,15 @@
#include
#endif
+#if defined(QUEUEDEBUG)
+# if defined(_KERNEL)
+# define QUEUEDEBUG_ABORT(...) panic(__VA_ARGS__)
+# else
+# include
+# define QUEUEDEBUG_ABORT(...) err(1, __VA_ARGS__)
+# endif
+#endif
+
/*
* Singly-linked List definitions.
*/
@@ -205,18 +214,21 @@ struct {\
/*
* List functions.
*/
-#if defined(_KERNEL) && defined(QUEUEDEBUG)
+#if defined(QUEUEDEBUG)
#define QUEUEDEBUG_LIST_INSERT_HEAD(head, elm, field) \
if ((head)->lh_first && \
(head)->lh_first->field.le_prev != &(head)->lh_first) \
- panic("LIST_INSERT_HEAD %p %s:%d", (head), __FILE__, __LINE__);
+ QUEUEDEBUG_ABORT("LIST_INSERT_HEAD %p %s:%d", (head), \
+ __FILE__, __LINE__);
#define QUEUEDEBUG_LIST_OP(elm, field) \
if ((elm)->field.le_next && \
(elm)->field.le_next->field.le_prev != \
&(elm)->field.le_next) \
- panic("LIST_* forw %p %s:%d", (elm), __FILE__, __LINE__);\
+ QUEUEDEBUG_ABORT("LIST_* forw %p %s:%d", (elm), \
+ __FILE__, __LINE__);\
if (*(elm)->field.le_prev != (elm))\
- panic("LIST_* back %p %s:%d", (elm), __FILE__, __LINE__);
+ QUEUEDEBUG_ABORT("LIST_* back %p %s:%d", (elm), \
+ __FILE__, __LINE__);
#define QUEUEDEBUG_LIST_POSTREMOVE(elm, field)\
(elm)->field.le_next = (void *)1L;\
(elm)->field.le_prev = (void *)1L;
@@ -430,26 +442,30 @@ struct {\
/*
* Tail queue functions.
*/
-#if defined(_KERNEL) && defined(QUEUEDEBUG)
+#if defined(QUEUEDEBUG)
#define QUEUEDEBUG_TAILQ_INSERT_HEAD(head, elm, field) \
if ((head)->tqh_first && \
(head)->tqh_first->field.tqe_prev != &(head)->tqh_first) \
- panic("TAILQ_INSERT_HEAD %p %s:%d", (head), __FILE__, __LINE__);
+ QUEUEDEBUG_ABORT("TAILQ_INSERT_HEAD %p %s:%d", (head), \
+ __FILE__, __LINE__);
#define QUEUEDEBUG_TAILQ_INSERT_TAIL(head, elm, field) \
if (*(head)->tqh_last != NULL) \
- panic("TAILQ_INSERT_TAIL %p %s:%d", (head), __FILE__, __LINE__);
+ QUEUEDEBUG_ABORT("TAILQ_INSERT_TAIL %p %s:%d", (head), \
+ __FILE__, __LINE__);
#define QUEUEDEBUG_TAILQ_OP(elm, field) \
if ((elm)->field.tqe_next && \
(elm)->field.tqe_next->field.tqe_prev != \
&(elm)->field.tqe_next) \
- panic("TAILQ_* forw %p %s:%d", (elm), __FILE__, __LINE__);\
+ QUEUEDEBUG_ABORT("TAILQ_* forw %p %s:%d", (elm), \
+ __FILE__, __LINE__);\
if (*(elm)->field.tqe_prev != (elm))\
- panic("TAILQ_* back %p %s:%d", (elm), __FILE__, __LINE__);
+ QUEUEDEBUG_ABORT("TAILQ_* back %p %s:%d", (elm), \
+ __FILE__, __LINE__);
#define QUEUEDEBUG_TAILQ_PREREMOVE(head, elm, field) \
if ((elm)->field.tqe_next == NULL &&\
(head)->tqh_last != &(elm)->field.tqe_next) \
- panic("TAILQ_PREREMOVE head %p elm %p %s:%d", \
- (head), (elm), __FILE__, __LINE__);
+ QUEUEDEBUG_ABORT("TAILQ_PREREMOVE head %p elm %p %s:%d",\
+ (head), (elm), __FILE__, __LINE__);
#define QUEUEDEBUG_TAILQ_POSTREMOVE(elm, field)\
(elm)->field.tqe_next = (void *)1L;\
(elm)->field.tqe_prev = (void *)1L;
@@ -662,34 +678,34 @@ __launder_type(const void *__x)
return __x;
}
-#if defined(_KERNEL) && defined(QUEUEDEBUG)
+#if defined(QUEUEDEBUG)
#define QUEUEDEBUG_CIRCLEQ_HEAD(head, field)\
if ((head)->cqh_first != CIRCLEQ_ENDC(head) && \
(head)->cqh_first->field.cqe_prev != CIRCLEQ_ENDC(head)) \
- panic("CIRCLEQ head forw %p %s:%d", (head), \
+ QUEUEDEBUG_ABORT("CIRCLEQ head forw %p %s:%d", (head), \
__FILE__, __LINE__);\
if ((head)->cqh_last != CIRCLEQ_ENDC(head) && \
(head)->cqh_last->field.cqe_next != CIRCLEQ_ENDC(head)) \
- panic("CIRCLEQ head back %p %s:%d", (head), \
+ QUEUEDEBUG_ABORT("CIRCLEQ head back %p %s:%d", (head), \
__FILE__, __LINE__);
#define QUEUEDEBUG_CIRCLEQ_ELM(head, elm, field) \
if ((elm)->field.cqe_next == CIRCLEQ_ENDC(head)) { \
if ((head)->cqh_last != (elm))\
- panic("CIRCLEQ elm last %p %s:%d", (elm), \
- __FILE__, __LINE__); \
+ QUEUEDEBUG_ABORT("CIRCLEQ elm last %p %s:%d", \
+ (elm), __FILE__, __LINE__); \
} else { \
if ((elm)->field.cqe_next->field.cqe_prev != (elm)) \
- panic("CIRCLEQ elm forw %p %s:%d",
CVS commit: src/external/bsd/nvi/dist
Module Name:src
Committed By: christos
Date: Wed Dec 25 17:18:39 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/cl: cl_main.c
src/external/bsd/nvi/dist/vi: v_search.c
Log Message:
don't use err, it conflicts with err(3)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nvi/dist/cl/cl_main.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/vi/v_search.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/cl/cl_main.c
diff -u src/external/bsd/nvi/dist/cl/cl_main.c:1.2 src/external/bsd/nvi/dist/cl/cl_main.c:1.3
--- src/external/bsd/nvi/dist/cl/cl_main.c:1.2 Fri Nov 22 10:52:05 2013
+++ src/external/bsd/nvi/dist/cl/cl_main.c Wed Dec 25 12:18:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cl_main.c,v 1.2 2013/11/22 15:52:05 christos Exp $ */
+/* $NetBSD: cl_main.c,v 1.3 2013/12/25 17:18:39 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -239,11 +239,11 @@ cl_end(CL_PRIVATE *clp)
static void
term_init(const char *name, const char *ttype)
{
- int err;
+ int error;
/* Set up the terminal database information. */
- setupterm(__UNCONST(ttype), STDOUT_FILENO, &err);
- switch (err) {
+ setupterm(__UNCONST(ttype), STDOUT_FILENO, &error);
+ switch (error) {
case -1:
(void)fprintf(stderr,
"%s: No terminal database found\n", name);
Index: src/external/bsd/nvi/dist/vi/v_search.c
diff -u src/external/bsd/nvi/dist/vi/v_search.c:1.3 src/external/bsd/nvi/dist/vi/v_search.c:1.4
--- src/external/bsd/nvi/dist/vi/v_search.c:1.3 Mon Nov 25 17:43:46 2013
+++ src/external/bsd/nvi/dist/vi/v_search.c Wed Dec 25 12:18:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: v_search.c,v 1.3 2013/11/25 22:43:46 christos Exp $ */
+/* $NetBSD: v_search.c,v 1.4 2013/12/25 17:18:39 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -70,7 +70,7 @@ v_exaddr(SCR *sp, VICMD *vp, dir_t dir)
TEXT *tp;
db_recno_t s_lno;
size_t len, s_cno, tlen;
- int err, nb, type;
+ int error, nb, type;
char buf[20];
CHAR_T *cmd, *t;
const CHAR_T *w;
@@ -174,7 +174,7 @@ v_exaddr(SCR *sp, VICMD *vp, dir_t dir)
* confused the parser. We're not that compatible.
*/
cmdp = &wp->excmd;
- if (ex_range(sp, cmdp, &err))
+ if (ex_range(sp, cmdp, &error))
return (1);
/*
@@ -185,7 +185,7 @@ v_exaddr(SCR *sp, VICMD *vp, dir_t dir)
len = cmdp->clen;
wp->excmd.clen = 0;
- if (err)
+ if (error)
goto err2;
/* Copy out the new cursor position and make sure it's okay. */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Dec 25 16:05:59 UTC 2013
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
Add DIGI Neo 8-port serial(PCIe) and OXFORD OXPCIe952 Parallel.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.88 src/sys/dev/pci/pucdata.c:1.89
--- src/sys/dev/pci/pucdata.c:1.88 Wed Dec 25 15:17:56 2013
+++ src/sys/dev/pci/pucdata.c Wed Dec 25 16:05:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.88 2013/12/25 15:17:56 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.89 2013/12/25 16:05:59 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.88 2013/12/25 15:17:56 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.89 2013/12/25 16:05:59 msaitoh Exp $");
#include
#include
@@ -390,6 +390,22 @@ const struct puc_device_description puc_
},
},
+ /* Digi International Digi Neo 8 Serial (PCIe) */
+ { "Digi International Digi Neo 8 Serial (PCIe)",
+ { PCI_VENDOR_DIGI, PCI_PRODUCT_DIGI_NEO8_PCIE, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0800, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0a00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0c00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x0e00, COM_FREQ * 8 },
+ },
+ },
+
{ "EXAR XR17D152",
{ PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17D152, 0, 0 },
{ 0x, 0x, 0, 0 },
@@ -993,6 +1009,16 @@ const struct puc_device_description puc_
* I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
*/
+ /* Oxford Semiconductor OXPCIe952 PCIe 1P */
+ { "Oxford Semiconductor OXPCIe952 LPT",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952P,
+ 0, 0},
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
+ },
+ },
+
/* Oxford Semiconductor OXPCIe952 PCIe UARTs */
{ "Oxford Semiconductor OXPCIe952 UARTs",
{ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952,
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Dec 25 16:05:18 UTC 2013
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
regen.
To generate a diff of this commit:
cvs rdiff -u -r1.1165 -r1.1166 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1164 -r1.1165 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1165 src/sys/dev/pci/pcidevs.h:1.1166
--- src/sys/dev/pci/pcidevs.h:1.1165 Mon Dec 23 10:05:09 2013
+++ src/sys/dev/pci/pcidevs.h Wed Dec 25 16:05:18 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1165 2013/12/23 10:05:09 msaitoh Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1166 2013/12/25 16:05:18 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1172 2013/12/23 10:04:49 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1173 2013/12/25 16:04:54 msaitoh Exp
*/
/*
@@ -2068,6 +2068,7 @@
#define PCI_PRODUCT_DIGI_ACCELEPORT8R920 0x0027 /* AccelePort 8r 920 8-port serial */
#define PCI_PRODUCT_DIGI_NEO4 0x00b0 /* Neo 4-port */
#define PCI_PRODUCT_DIGI_NEO8 0x00b1 /* Neo 8-port */
+#define PCI_PRODUCT_DIGI_NEO8_PCIE 0x00f0 /* Neo 8-port (PCIe) */
/* D-Link Systems products */
#define PCI_PRODUCT_DLINK_DL1002 0x1002 /* DL-1002 10/100 Ethernet */
@@ -4566,6 +4567,7 @@
#define PCI_PRODUCT_OXFORDSEMI_OX16PCI952 0x9521 /* OX16PCI952 */
#define PCI_PRODUCT_OXFORDSEMI_OX16PCI952P 0x9523 /* OX16PCI952 Parallel */
#define PCI_PRODUCT_OXFORDSEMI_OX16PCI958 0x9538 /* OX16PCI958 */
+#define PCI_PRODUCT_OXFORDSEMI_OXPCIE952P 0xc110 /* OXPCIe952 Parallel */
#define PCI_PRODUCT_OXFORDSEMI_OXPCIE952 0xc120 /* OXPCIe952 */
/* Packet Engines products */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1164 src/sys/dev/pci/pcidevs_data.h:1.1165
--- src/sys/dev/pci/pcidevs_data.h:1.1164 Mon Dec 23 10:05:09 2013
+++ src/sys/dev/pci/pcidevs_data.h Wed Dec 25 16:05:18 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1164 2013/12/23 10:05:09 msaitoh Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1165 2013/12/25 16:05:18 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1172 2013/12/23 10:04:49 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1173 2013/12/25 16:04:54 msaitoh Exp
*/
/*
@@ -3072,6 +3072,8 @@ static const uint16_t pci_products[] = {
13931, 13639, 0,
PCI_VENDOR_DIGI, PCI_PRODUCT_DIGI_NEO8,
13931, 10557, 0,
+ PCI_VENDOR_DIGI, PCI_PRODUCT_DIGI_NEO8_PCIE,
+ 13931, 10557, 5209, 0,
PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DL1002,
13935, 5596, 5494, 0,
PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE530TXPLUS,
@@ -7636,6 +7638,8 @@ static const uint16_t pci_products[] = {
24485, 17017, 0,
PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OX16PCI958,
24496, 0,
+ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952P,
+ 24507, 17017, 0,
PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952,
24507, 0,
PCI_VENDOR_PACKETENGINES, PCI_PRODUCT_PACKETENGINES_GNICII,
@@ -10144,7 +10148,7 @@ static const char pci_words[] = { "."
"Fresco\0" /* 1 refs @ 5186 */
"Nanjing\0" /* 2 refs @ 5193 */
"QinHeng\0" /* 2 refs @ 5201 */
- "(PCIe)\0" /* 1 refs @ 5209 */
+ "(PCIe)\0" /* 2 refs @ 5209 */
"Co\0" /* 1 refs @ 5216 */
"HiNT\0" /* 1 refs @ 5219 */
"3D\0" /* 19 refs @ 5224 */
@@ -10951,7 +10955,7 @@ static const char pci_words[] = { "."
"Module\0" /* 3 refs @ 10530 */
"ADDI-DATA\0" /* 1 refs @ 10537 */
"APCI-7800\0" /* 1 refs @ 10547 */
- "8-port\0" /* 4 refs @ 10557 */
+ "8-port\0" /* 5 refs @ 10557 */
"Serial\0" /* 92 refs @ 10564 */
"S5920\0" /* 1 refs @ 10571 */
"Target\0" /* 1 refs @ 10577 */
@@ -11397,7 +11401,7 @@ static const char pci_words[] = { "."
"AccelePort\0" /* 1 refs @ 13913 */
"8r\0" /* 1 refs @ 13924 */
"920\0" /* 1 refs @ 13927 */
- "Neo\0" /* 2 refs @ 13931 */
+ "Neo\0" /* 3 refs @ 13931 */
"DL-1002\0" /* 1 refs @ 13935 */
"DFE-530TXPLUS\0" /* 1 refs @ 13943 */
"DFE-690TXD\0" /* 1 refs @ 13957 */
@@ -11799,7 +11803,7 @@ static const char pci_words[] = { "."
"#0\0" /* 10 refs @ 17003 */
"#1\0" /* 15 refs @ 17006 */
"Lindsay\0" /* 1 refs @ 17009 */
- "Parallel\0" /* 12 refs @ 17017 */
+ "Parallel\0" /* 13 refs @ 17017 */
"IOP333\0" /* 2 refs @ 17026 */
"Haswell\0" /* 7 refs @ 17033 */
"I347-AT4\0" /* 1 refs @ 17041 */
@@ -12819,7 +12823,7 @@ static const char pci_words[] = { "."
"EX-41098\0" /* 1 refs @ 24476 */
"OX16PCI952\0" /* 2 refs @ 24485 */
"OX16PCI958\0" /* 1 refs @ 24496 */
- "OXPCIe952\0" /* 1 refs @ 24507 */
+ "OXPCIe952\0" /* 2 refs @ 2
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Dec 25 16:04:54 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add DIGI Neo 8-port serial(PCIe) and OXFORD OXPCIe952 Parallel. To generate a diff of this commit: cvs rdiff -u -r1.1172 -r1.1173 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1172 src/sys/dev/pci/pcidevs:1.1173 --- src/sys/dev/pci/pcidevs:1.1172 Mon Dec 23 10:04:49 2013 +++ src/sys/dev/pci/pcidevs Wed Dec 25 16:04:54 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1172 2013/12/23 10:04:49 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1173 2013/12/25 16:04:54 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2061,6 +2061,7 @@ product DIAMOND VIPER 0x9001 Viper/PCI product DIGI ACCELEPORT8R920 0x0027 AccelePort 8r 920 8-port serial product DIGI NEO4 0x00b0 Neo 4-port product DIGI NEO8 0x00b1 Neo 8-port +product DIGI NEO8_PCIE 0x00f0 Neo 8-port (PCIe) /* D-Link Systems products */ product DLINK DL1002 0x1002 DL-1002 10/100 Ethernet @@ -4559,6 +4560,7 @@ product OXFORDSEMI OX16PCI954P 0x9513 OX product OXFORDSEMI OX16PCI952 0x9521 OX16PCI952 product OXFORDSEMI OX16PCI952P 0x9523 OX16PCI952 Parallel product OXFORDSEMI OX16PCI958 0x9538 OX16PCI958 +product OXFORDSEMI OXPCIE952P 0xc110 OXPCIe952 Parallel product OXFORDSEMI OXPCIE952 0xc120 OXPCIe952 /* Packet Engines products */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Dec 25 15:17:56 UTC 2013
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
Add support S1200's UART. Part of PR#48016.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.87 src/sys/dev/pci/pucdata.c:1.88
--- src/sys/dev/pci/pucdata.c:1.87 Thu Nov 7 15:55:08 2013
+++ src/sys/dev/pci/pucdata.c Wed Dec 25 15:17:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.87 2013/11/07 15:55:08 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.88 2013/12/25 15:17:56 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.87 2013/11/07 15:55:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.88 2013/12/25 15:17:56 msaitoh Exp $");
#include
#include
@@ -1851,6 +1851,15 @@ const struct puc_device_description puc_
},
},
+ /* Intel S1200 UART */
+ { "Intel S1200 UART",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_S1200_UART, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
/* VScom PCI-200: 2S */
{ "VScom PCI-200",
{ PCI_VENDOR_PLX, PCI_PRODUCT_PLX_PCI_200,
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: christos
Date: Wed Dec 25 15:09:27 UTC 2013
Modified Files:
src/external/bsd/mdocml/dist: st.in
Log Message:
add p1003.1j
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/mdocml/dist/st.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/st.in
diff -u src/external/bsd/mdocml/dist/st.in:1.1.1.8 src/external/bsd/mdocml/dist/st.in:1.2
--- src/external/bsd/mdocml/dist/st.in:1.1.1.8 Wed Apr 3 10:46:53 2013
+++ src/external/bsd/mdocml/dist/st.in Wed Dec 25 10:09:27 2013
@@ -40,6 +40,7 @@ LINE("-p1003.1b-93", "IEEE Std 1003.1b-1
LINE("-p1003.1c-95", "IEEE Std 1003.1c-1995 (\\(lqPOSIX.1\\(rq)")
LINE("-p1003.1g-2000", "IEEE Std 1003.1g-2000 (\\(lqPOSIX.1\\(rq)")
LINE("-p1003.1i-95", "IEEE Std 1003.1i-1995 (\\(lqPOSIX.1\\(rq)")
+LINE("-p1003.1j-2000", "IEEE Std 1003.1j-2000 (\\(lqPOSIX.1\\(rq)")
LINE("-p1003.2-92", "IEEE Std 1003.2-1992 (\\(lqPOSIX.2\\(rq)")
LINE("-p1003.2a-92", "IEEE Std 1003.2a-1992 (\\(lqPOSIX.2\\(rq)")
LINE("-p1387.2-95", "IEEE Std 1387.2-1995 (\\(lqPOSIX.7.2\\(rq)")
CVS commit: src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: christos Date: Wed Dec 25 15:09:10 UTC 2013 Modified Files: src/gnu/usr.bin/groff/tmac: mdoc.local Log Message: add posix 1003.1j To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/gnu/usr.bin/groff/tmac/mdoc.local Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.74 src/gnu/usr.bin/groff/tmac/mdoc.local:1.75 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.74 Sun Sep 1 17:14:05 2013 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 25 10:09:10 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.74 2013/09/01 21:14:05 wiz Exp $ +.\" $NetBSD: mdoc.local,v 1.75 2013/12/25 15:09:10 christos Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -106,3 +106,5 @@ .ds doc-str-Lb-libsaslc Simple Authentication and Security Layer client library (libsaslc, \-lsaslc) .ds doc-str-Lb-libssp Buffer Overflow Protection Library (libssp, \-lssp) .ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, \-lterminfo) +.ds doc-str-St--p1003.1j-2000 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1j-2000 +.as doc-str-St--p1003.1j-2000 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nonaka Date: Wed Dec 25 13:52:37 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: Added Planex GW-450D. To generate a diff of this commit: cvs rdiff -u -r1.660 -r1.661 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.660 src/sys/dev/usb/usbdevs:1.661 --- src/sys/dev/usb/usbdevs:1.660 Fri Dec 20 01:05:26 2013 +++ src/sys/dev/usb/usbdevs Wed Dec 25 13:52:37 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.660 2013/12/20 01:05:26 jakllsch Exp $ +$NetBSD: usbdevs,v 1.661 2013/12/25 13:52:37 nonaka Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2506,6 +2506,7 @@ product PLANEX2 GWUSMICRO300 0xab29 GW-U product PLANEX2 RTL8188CU_1 0xab2a RTL8188CU product PLANEX2 RTL8192CU 0xab2b RTL8192CU product PLANEX2 RTL8188CU_4 0xab2e RTL8188CU +product PLANEX2 GW450D 0xab31 GW-450D product PLANEX2 GWUS54MINI2 0xab50 GW-US54Mini2 product PLANEX2 GWUS54SG 0xc002 GW-US54SG product PLANEX2 GWUS54GZL 0xc007 GW-US54GZL
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: nonaka
Date: Wed Dec 25 13:53:20 UTC 2013
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.652 -r1.653 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.653 -r1.654 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.652 src/sys/dev/usb/usbdevs.h:1.653
--- src/sys/dev/usb/usbdevs.h:1.652 Fri Dec 20 01:06:21 2013
+++ src/sys/dev/usb/usbdevs.h Wed Dec 25 13:53:20 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.652 2013/12/20 01:06:21 jakllsch Exp $ */
+/* $NetBSD: usbdevs.h,v 1.653 2013/12/25 13:53:20 nonaka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.660 2013/12/20 01:05:26 jakllsch Exp
+ * NetBSD: usbdevs,v 1.661 2013/12/25 13:52:37 nonaka Exp
*/
/*
@@ -2513,6 +2513,7 @@
#define USB_PRODUCT_PLANEX2_RTL8188CU_1 0xab2a /* RTL8188CU */
#define USB_PRODUCT_PLANEX2_RTL8192CU 0xab2b /* RTL8192CU */
#define USB_PRODUCT_PLANEX2_RTL8188CU_4 0xab2e /* RTL8188CU */
+#define USB_PRODUCT_PLANEX2_GW450D 0xab31 /* GW-450D */
#define USB_PRODUCT_PLANEX2_GWUS54MINI2 0xab50 /* GW-US54Mini2 */
#define USB_PRODUCT_PLANEX2_GWUS54SG 0xc002 /* GW-US54SG */
#define USB_PRODUCT_PLANEX2_GWUS54GZL 0xc007 /* GW-US54GZL */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.653 src/sys/dev/usb/usbdevs_data.h:1.654
--- src/sys/dev/usb/usbdevs_data.h:1.653 Fri Dec 20 01:06:21 2013
+++ src/sys/dev/usb/usbdevs_data.h Wed Dec 25 13:53:20 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.653 2013/12/20 01:06:21 jakllsch Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.654 2013/12/25 13:53:20 nonaka Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.660 2013/12/20 01:05:26 jakllsch Exp
+ * NetBSD: usbdevs,v 1.661 2013/12/25 13:52:37 nonaka Exp
*/
/*
@@ -7699,6 +7699,10 @@ const struct usb_product usb_products[]
"RTL8188CU",
},
{
+ USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW450D,
+ "GW-450D",
+ },
+ {
USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54MINI2,
"GW-US54Mini2",
},
@@ -10083,4 +10087,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 1984;
+const int usb_nproducts = 1985;
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Wed Dec 25 13:14:36 UTC 2013 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: move XCR0 definitions to next to CR0's. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.74 src/sys/arch/x86/include/specialreg.h:1.75 --- src/sys/arch/x86/include/specialreg.h:1.74 Sun Dec 8 18:00:51 2013 +++ src/sys/arch/x86/include/specialreg.h Wed Dec 25 13:14:36 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.74 2013/12/08 18:00:51 dsl Exp $ */ +/* $NetBSD: specialreg.h,v 1.75 2013/12/25 13:14:36 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -88,6 +88,16 @@ #define CR4_OSXSAVE 0x0004 /* enable xsave and xrestore */ #define CR4_SMEP 0x0010 /* enable SMEP support */ +/* + * Extended Control Register XCR0 + */ +#define XCR0_X87 0x0001 /* x87 FPU/MMX state */ +#define XCR0_SSE 0x0002 /* SSE state */ +#define XCR0_AVX 0x0004 /* AVX state (ymmn registers) */ + +#define XCR0_FLAGS1 "\20" \ + "\1" "x87" "\2" "SSE" "\3" "AVX" "\4" "B03" + /* * CPUID "features" bits @@ -218,16 +228,6 @@ ? 0 : (CPUID_TO_EXTMODEL(cpuid) << 4))) /* - * Extended Control Register XCR0 - */ -#define XCR0_X87 0x0001 /* x87 FPU/MMX state */ -#define XCR0_SSE 0x0002 /* SSE state */ -#define XCR0_AVX 0x0004 /* AVX state (ymmn registers) */ - -#define XCR0_FLAGS1 "\20" \ - "\1" "x87" "\2" "SSE" "\3" "AVX" "\4" "B03" - -/* * CPUID Processor extended state Enumeration Fn000d * * %ecx == 0: supported features info:
CVS commit: src/sys/fs/sysvbfs
Module Name:src
Committed By: mlelstv
Date: Wed Dec 25 11:15:49 UTC 2013
Modified Files:
src/sys/fs/sysvbfs: sysvbfs_vfsops.c
Log Message:
At least fetch mount data pointer before using it.
Coverity CID 274767
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/fs/sysvbfs/sysvbfs_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/sysvbfs/sysvbfs_vfsops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.41 src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.42
--- src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.41 Thu Jun 14 01:08:22 2012
+++ src/sys/fs/sysvbfs/sysvbfs_vfsops.c Wed Dec 25 11:15:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vfsops.c,v 1.41 2012/06/14 01:08:22 agc Exp $ */
+/* $NetBSD: sysvbfs_vfsops.c,v 1.42 2013/12/25 11:15:49 mlelstv Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.41 2012/06/14 01:08:22 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.42 2013/12/25 11:15:49 mlelstv Exp $");
#include
#include
@@ -81,7 +81,7 @@ sysvbfs_mount(struct mount *mp, const ch
return EINVAL;
if (mp->mnt_flag & MNT_GETARGS) {
- if ((bmp = (void *)mp->mnt_data) == NULL)
+ if ((bmp = (struct sysvbfs_mount *)mp->mnt_data) == NULL)
return EIO;
args->fspec = NULL;
*data_len = sizeof *args;
@@ -116,6 +116,7 @@ sysvbfs_mount(struct mount *mp, const ch
* Be sure we're still naming the same device
* used for our initial mount
*/
+ bmp = (struct sysvbfs_mount *)mp->mnt_data;
if (devvp != bmp->devvp)
error = EINVAL;
}
CVS commit: src/sys/fs/filecorefs
Module Name:src
Committed By: mlelstv
Date: Wed Dec 25 11:11:55 UTC 2013
Modified Files:
src/sys/fs/filecorefs: filecore_vfsops.c
Log Message:
At least fetch the mount data pointer before using it.
Coverity CID 274525
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/fs/filecorefs/filecore_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/filecorefs/filecore_vfsops.c
diff -u src/sys/fs/filecorefs/filecore_vfsops.c:1.72 src/sys/fs/filecorefs/filecore_vfsops.c:1.73
--- src/sys/fs/filecorefs/filecore_vfsops.c:1.72 Sat Nov 23 13:35:36 2013
+++ src/sys/fs/filecorefs/filecore_vfsops.c Wed Dec 25 11:11:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_vfsops.c,v 1.72 2013/11/23 13:35:36 christos Exp $ */
+/* $NetBSD: filecore_vfsops.c,v 1.73 2013/12/25 11:11:55 mlelstv Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.72 2013/11/23 13:35:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.73 2013/12/25 11:11:55 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -290,6 +290,7 @@ filecore_mount(struct mount *mp, const c
if ((mp->mnt_flag & MNT_UPDATE) == 0)
error = filecore_mountfs(devvp, mp, l, args);
else {
+ fcmp = VFSTOFILECORE(mp);
if (devvp != fcmp->fc_devvp)
error = EINVAL; /* needs translation */
else
