CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Tue Jan 3 07:08:05 UTC 2017 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: tickets 1341, 1342, 1345, and 1346 To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-7.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.141 src/doc/CHANGES-7.1:1.1.2.142 --- src/doc/CHANGES-7.1:1.1.2.141 Sat Dec 31 07:43:21 2016 +++ src/doc/CHANGES-7.1 Tue Jan 3 07:08:05 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.141 2016/12/31 07:43:21 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.142 2017/01/03 07:08:05 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -7811,3 +7811,27 @@ xsrc/external/mit/xorg-server/dist/inclu ARM is not always little endian. PR/50356 [rin, ticket #1344] +sys/arch/powerpc/fpu/fpu_emu.c 1.19 +sys/arch/powerpc/fpu/fpu_explode.c 1.7 + + Fix PR port-powerpc/51368: powerpc FPU emulation fails for + single precision floating point arithmetic + [rin, ticket #1341] + +sys/arch/powerpc/fpu/fpu_emu.c 1.18 + + Fix build without DDB. + [rin, ticket #1342] + +sys/arch/amiga/dev/sbic.c 1.74 + + Make it compile with -DDEBUG again. + [mlelstv, ticket #1345] + +share/man/man9/bus_dma.9 1.61, 1.62 + + bus_dma man page: + - Use .An -nosplit + - Give a heads up about bus_dmatag_subregion() + [sevan, ticket #1346] +
CVS commit: [netbsd-7] src/share/man/man9
Module Name:src Committed By: snj Date: Tue Jan 3 06:49:30 UTC 2017 Modified Files: src/share/man/man9 [netbsd-7]: bus_dma.9 Log Message: Pull up following revision(s) (requested by sevan in ticket #1346): share/man/man9/bus_dma.9: revisions 1.61, 1.62 via patch Use .An -nosplit. -- Give a heads up about bus_dmatag_subregion() To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.59.4.1 src/share/man/man9/bus_dma.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/bus_dma.9 diff -u src/share/man/man9/bus_dma.9:1.59 src/share/man/man9/bus_dma.9:1.59.4.1 --- src/share/man/man9/bus_dma.9:1.59 Wed Oct 30 04:16:44 2013 +++ src/share/man/man9/bus_dma.9 Tue Jan 3 06:49:30 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: bus_dma.9,v 1.59 2013/10/30 04:16:44 msaitoh Exp $ +.\" $NetBSD: bus_dma.9,v 1.59.4.1 2017/01/03 06:49:30 snj Exp $ .\" .\" Copyright (c) 1996, 1997, 1998, 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 8, 2011 +.Dd January 2, 2017 .Dt BUS_DMA 9 .Os .Sh NAME @@ -798,6 +798,8 @@ Given a bus_dma_tag_t create a new bus_dma_tag_t with a limited bus address space. This function should not normally be used, but is useful for devices that do not support the full address space of the parent bus. +Not all ports implement this method; on ports where it is unavailable, +EOPNOTSUPP is returned. The arguments are as follows: .Bl -tag -width max_addr -compact .It Fa tag @@ -839,6 +841,7 @@ The interface appeared in .Nx 1.3 . .Sh AUTHORS +.An -nosplit The .Nm interface was designed and implemented by Jason R. Thorpe of the
CVS commit: [netbsd-7] src/sys/arch/amiga/dev
Module Name:src
Committed By: snj
Date: Tue Jan 3 06:42:04 UTC 2017
Modified Files:
src/sys/arch/amiga/dev [netbsd-7]: sbic.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1345):
sys/arch/amiga/dev/sbic.c: revision 1.74
Make it compile with -DDEBUG again.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.2.1 src/sys/arch/amiga/dev/sbic.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/amiga/dev/sbic.c
diff -u src/sys/arch/amiga/dev/sbic.c:1.73 src/sys/arch/amiga/dev/sbic.c:1.73.2.1
--- src/sys/arch/amiga/dev/sbic.c:1.73 Thu Aug 7 08:59:42 2014
+++ src/sys/arch/amiga/dev/sbic.c Tue Jan 3 06:42:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.73 2014/08/07 08:59:42 joerg Exp $ */
+/* $NetBSD: sbic.c,v 1.73.2.1 2017/01/03 06:42:04 snj Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.73 2014/08/07 08:59:42 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.73.2.1 2017/01/03 06:42:04 snj Exp $");
#include
#include
@@ -1231,11 +1231,17 @@ int
sbicxfin(sbic_regmap_t regs, int len, void *bp)
{
int wait;
- u_char *buf;
u_char orig_csr, csr, asr;
+ u_char *buf;
+#ifdef DEBUG
+ u_char *obp;
+#endif
wait = sbic_data_wait;
buf = bp;
+#ifdef DEBUG
+ obp = bp;
+#endif
GET_SBIC_csr (regs, orig_csr);
__USE(orig_csr);
CVS commit: [netbsd-7] src/sys/arch/powerpc/fpu
Module Name:src
Committed By: snj
Date: Tue Jan 3 06:37:25 UTC 2017
Modified Files:
src/sys/arch/powerpc/fpu [netbsd-7]: fpu_emu.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1342):
sys/arch/powerpc/fpu/fpu_emu.c: revision 1.18
Fix build without DDB.
To generate a diff of this commit:
cvs rdiff -u -r1.16.14.1 -r1.16.14.2 src/sys/arch/powerpc/fpu/fpu_emu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/fpu/fpu_emu.c
diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.16.14.1 src/sys/arch/powerpc/fpu/fpu_emu.c:1.16.14.2
--- src/sys/arch/powerpc/fpu/fpu_emu.c:1.16.14.1 Tue Jan 3 06:19:21 2017
+++ src/sys/arch/powerpc/fpu/fpu_emu.c Tue Jan 3 06:37:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emu.c,v 1.16.14.1 2017/01/03 06:19:21 snj Exp $ */
+/* $NetBSD: fpu_emu.c,v 1.16.14.2 2017/01/03 06:37:25 snj Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.16.14.1 2017/01/03 06:19:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.16.14.2 2017/01/03 06:37:25 snj Exp $");
#include "opt_ddb.h"
@@ -248,14 +248,14 @@ fpu_emulate(struct trapframe *tf, struct
case NOTFPU:
default:
DPRINTF(FPE_EX, ("fpu_emulate: SIGILL\n"));
-#ifdef DEBUG
+#if defined(DDB) && defined(DEBUG)
if (fpe_debug & FPE_EX) {
printf("fpu_emulate: illegal insn %x at %p:",
insn.i_int, (void *) (tf->tf_srr0));
opc_disasm((vaddr_t)(tf->tf_srr0), insn.i_int);
}
#endif
-#if defined(PPC_IBM4XX) && defined(DEBUG)
+#if defined(PPC_IBM4XX) && defined(DDB) && defined(DEBUG)
/*
* retry an illegal insn once due to cache issues.
*/
@@ -265,7 +265,7 @@ fpu_emulate(struct trapframe *tf, struct
Debugger();
}
lastill = tf->tf_srr0;
-#endif /* PPC_IBM4XX && DEBUG */
+#endif /* PPC_IBM4XX && DDB && DEBUG */
return false;
}
}
CVS commit: [netbsd-7] src/sys/arch/powerpc/fpu
Module Name:src
Committed By: snj
Date: Tue Jan 3 06:19:21 UTC 2017
Modified Files:
src/sys/arch/powerpc/fpu [netbsd-7]: fpu_emu.c fpu_explode.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1341):
sys/arch/powerpc/fpu/fpu_emu.c: revision 1.19
sys/arch/powerpc/fpu/fpu_explode.c: revision 1.7
- add missing default from FreeBSD
- remove duplicate panic pointed out by matt
--
PR port-powerpc/51368: powerpc FPU emulation fails for single precision
floating point arithmetic
For single precision instruction, calculate first in double precision,
and then round it. With this fix, single precision arithmetic gets sane
on ibm4xx and booke.
Taken from FreeBSD commit r258250:
https://svnweb.freebsd.org/base?view=revision&revision=258250
Ok matt and simonb.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.14.1 src/sys/arch/powerpc/fpu/fpu_emu.c
cvs rdiff -u -r1.6 -r1.6.140.1 src/sys/arch/powerpc/fpu/fpu_explode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/fpu/fpu_emu.c
diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.16 src/sys/arch/powerpc/fpu/fpu_emu.c:1.16.14.1
--- src/sys/arch/powerpc/fpu/fpu_emu.c:1.16 Mon Jul 23 04:13:06 2012
+++ src/sys/arch/powerpc/fpu/fpu_emu.c Tue Jan 3 06:19:21 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emu.c,v 1.16 2012/07/23 04:13:06 matt Exp $ */
+/* $NetBSD: fpu_emu.c,v 1.16.14.1 2017/01/03 06:19:21 snj Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.16 2012/07/23 04:13:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.16.14.1 2017/01/03 06:19:21 snj Exp $");
#include "opt_ddb.h"
@@ -626,9 +626,11 @@ fpu_execute(struct trapframe *tf, struct
rb = instr.i_a.i_frb;
rc = instr.i_a.i_frc;
- type = FTYPE_SNG;
- if (instr.i_any.i_opcd & 0x4)
-type = FTYPE_DBL;
+ /*
+ * All arithmetic operations work on registers, which
+ * are stored as doubles.
+ */
+ type = FTYPE_DBL;
switch ((unsigned int)instr.i_a.i_xo) {
case OPC59_FDIVS:
FPU_EMU_EVCNT_INCR(fdiv);
@@ -745,6 +747,13 @@ fpu_execute(struct trapframe *tf, struct
return (NOTFPU);
break;
}
+
+ /* If the instruction was single precision, round */
+ if (!(instr.i_any.i_opcd & 0x4)) {
+fpu_implode(fe, fp, FTYPE_SNG,
+ (u_int *)&fs->fpreg[rt]);
+fpu_explode(fe, fp = &fe->fe_f1, FTYPE_SNG, rt);
+ }
}
} else {
return (NOTFPU);
Index: src/sys/arch/powerpc/fpu/fpu_explode.c
diff -u src/sys/arch/powerpc/fpu/fpu_explode.c:1.6 src/sys/arch/powerpc/fpu/fpu_explode.c:1.6.140.1
--- src/sys/arch/powerpc/fpu/fpu_explode.c:1.6 Sun Dec 11 12:18:42 2005
+++ src/sys/arch/powerpc/fpu/fpu_explode.c Tue Jan 3 06:19:21 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_explode.c,v 1.6 2005/12/11 12:18:42 christos Exp $ */
+/* $NetBSD: fpu_explode.c,v 1.6.140.1 2017/01/03 06:19:21 snj Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.6 2005/12/11 12:18:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.6.140.1 2017/01/03 06:19:21 snj Exp $");
#include
#include
@@ -235,7 +235,7 @@ fpu_explode(struct fpemu *fe, struct fpn
s = fpu_dtof(fp, s, space[1]);
break;
- panic("fpu_explode");
+ default:
panic("fpu_explode: invalid type %d", type);
}
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: kamil Date: Tue Jan 3 04:12:18 UTC 2017 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Fix typo in distribution synckok.0 -> syncok.0 To generate a diff of this commit: cvs rdiff -u -r1.2092 -r1.2093 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2092 src/distrib/sets/lists/comp/mi:1.2093 --- src/distrib/sets/lists/comp/mi:1.2092 Tue Jan 3 02:13:05 2017 +++ src/distrib/sets/lists/comp/mi Tue Jan 3 04:12:18 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2092 2017/01/03 02:13:05 wiz Exp $ +# $NetBSD: mi,v 1.2093 2017/01/03 04:12:18 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -9323,7 +9323,7 @@ ./usr/share/man/cat3/swapon.0 comp-c-catman .cat ./usr/share/man/cat3/swprintf.0 comp-c-catman .cat ./usr/share/man/cat3/swscanf.0 comp-c-catman .cat -./usr/share/man/cat3/synckok.0 comp-c-catman .cat +./usr/share/man/cat3/syncok.0 comp-c-catman .cat ./usr/share/man/cat3/sys_errlist.0 comp-c-catman .cat ./usr/share/man/cat3/sys_nerr.0 comp-c-catman .cat ./usr/share/man/cat3/sys_siglist.0 comp-c-catman .cat
CVS commit: src/sys/rump/net/lib/libnpf
Module Name:src Committed By: christos Date: Tue Jan 3 03:47:51 UTC 2017 Modified Files: src/sys/rump/net/lib/libnpf: Makefile Log Message: need new file To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/rump/net/lib/libnpf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/net/lib/libnpf/Makefile diff -u src/sys/rump/net/lib/libnpf/Makefile:1.19 src/sys/rump/net/lib/libnpf/Makefile:1.20 --- src/sys/rump/net/lib/libnpf/Makefile:1.19 Mon Dec 26 18:05:05 2016 +++ src/sys/rump/net/lib/libnpf/Makefile Mon Jan 2 22:47:51 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2016/12/26 23:05:05 christos Exp $ +# $NetBSD: Makefile,v 1.20 2017/01/03 03:47:51 christos Exp $ # # Public Domain. # @@ -15,7 +15,7 @@ SRCS= npf.c npf_alg.c npf_conf.c npf_ctl SRCS+= npf_bpf.c npf_if.c npf_inet.c npf_mbuf.c npf_nat.c SRCS+= npf_ruleset.c npf_conn.c npf_conndb.c npf_rproc.c SRCS+= npf_state.c npf_state_tcp.c npf_tableset.c -SRCS+= lpm.c npf_sendpkt.c npf_worker.c npf_os.c +SRCS+= lpm.c npf_sendpkt.c npf_worker.c npf_os.c npf_ifaddr.c SRCS+= if_npflog.c
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Tue Jan 3 02:51:56 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: always define all the renames. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/flex/dist/src/flex.skl 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/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.9 src/external/bsd/flex/dist/src/flex.skl:1.10 --- src/external/bsd/flex/dist/src/flex.skl:1.9 Mon Jan 2 20:56:03 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 21:51:56 2017 @@ -126,7 +126,6 @@ m4preproc_define(`M4_GEN_PREFIX', %endif %if-c-only -%if-reentrant m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`_create_buffer') M4_GEN_PREFIX(`_delete_buffer') @@ -165,7 +164,6 @@ m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`wrap') ) %endif -%endif m4_ifdef( [[M4_YY_BISON_LVAL]], [[
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: wiz Date: Tue Jan 3 02:13:05 UTC 2017 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Fix tag. To generate a diff of this commit: cvs rdiff -u -r1.2091 -r1.2092 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2091 src/distrib/sets/lists/comp/mi:1.2092 --- src/distrib/sets/lists/comp/mi:1.2091 Mon Jan 2 20:17:15 2017 +++ src/distrib/sets/lists/comp/mi Tue Jan 3 02:13:05 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2091 2017/01/02 20:17:15 cherry Exp $ +# $NetBSD: mi,v 1.2092 2017/01/03 02:13:05 wiz Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -3096,7 +3096,7 @@ ./usr/include/uvm/uvm_pager_i.h comp-obsolete obsolete ./usr/include/uvm/uvm_param.h comp-c-include ./usr/include/uvm/uvm_pdaemon.h comp-c-include -./usr/include/uvm/uvm_physseg.h comp-c-include obsolete +./usr/include/uvm/uvm_physseg.h comp-obsolete obsolete ./usr/include/uvm/uvm_pglist.h comp-c-include ./usr/include/uvm/uvm_pmap.h comp-c-include ./usr/include/uvm/uvm_prot.h comp-c-include
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: christos
Date: Tue Jan 3 01:56:04 UTC 2017
Modified Files:
src/external/bsd/flex/dist/src: flex.skl main.c
Log Message:
fix the re-entrant prefixed case.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/flex/dist/src/flex.skl
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/main.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/flex/dist/src/flex.skl
diff -u src/external/bsd/flex/dist/src/flex.skl:1.8 src/external/bsd/flex/dist/src/flex.skl:1.9
--- src/external/bsd/flex/dist/src/flex.skl:1.8 Mon Jan 2 19:50:11 2017
+++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 20:56:03 2017
@@ -113,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define
m4preproc_define(`M4_GEN_PREFIX',
``[[#define yy$1 ]]M4_YY_PREFIX[[$1]]
-m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
+%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
%if-c++-only
/* The c++ scanner is a mess. The FlexLexer.h header file relies on the
@@ -126,7 +126,8 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]
%endif
%if-c-only
-m4_ifelse(M4_YY_PREFIX,M4_YY_PREFIX,,
+%if-reentrant
+m4_ifelse(M4_YY_PREFIX,yy,,
M4_GEN_PREFIX(`_create_buffer')
M4_GEN_PREFIX(`_delete_buffer')
M4_GEN_PREFIX(`_scan_buffer')
@@ -164,6 +165,7 @@ m4_ifelse(M4_YY_PREFIX,M4_YY_PREFIX,,
M4_GEN_PREFIX(`wrap')
)
%endif
+%endif
m4_ifdef( [[M4_YY_BISON_LVAL]],
[[
Index: src/external/bsd/flex/dist/src/main.c
diff -u src/external/bsd/flex/dist/src/main.c:1.5 src/external/bsd/flex/dist/src/main.c:1.6
--- src/external/bsd/flex/dist/src/main.c:1.5 Mon Jan 2 19:22:56 2017
+++ src/external/bsd/flex/dist/src/main.c Mon Jan 2 20:56:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 2017/01/03 00:22:56 christos Exp $ */
+/* $NetBSD: main.c,v 1.6 2017/01/03 01:56:03 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -33,7 +33,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: main.c,v 1.5 2017/01/03 00:22:56 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.6 2017/01/03 01:56:03 christos Exp $");
#include "version.h"
@@ -1590,9 +1590,9 @@ void readin (void)
if (!do_yywrap) {
if (!C_plus_plus) {
if (reentrant)
-outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
+out_str ("\n#define %swrap(yyscanner) (/*CONSTCOND*/1)\n", prefix);
else
-outn ("\n#define yywrap() (/*CONSTCOND*/1)");
+out_str ("\n#define %swrap() (/*CONSTCOND*/1)\n", prefix);
}
outn ("#define YY_SKIP_YYWRAP");
}
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jakllsch
Date: Tue Jan 3 01:30:16 UTC 2017
Modified Files:
src/sys/dev/ic: siisata.c
Log Message:
The SiI3124 was implemented at a time when the ATA/ACS2
DATA SET MANAGEMENT/TRIM command did not exist. As such, the (presumably
immutable) lookup table in the chip does not know that this command
indicates a data write to follow. Use the PRB Protocol Override
functionality to tell the chip the protocol we need for this command.
For PR kern/51756.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/siisata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.29 src/sys/dev/ic/siisata.c:1.30
--- src/sys/dev/ic/siisata.c:1.29 Mon Sep 19 19:07:53 2016
+++ src/sys/dev/ic/siisata.c Tue Jan 3 01:30:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.29 2016/09/19 19:07:53 jakllsch Exp $ */
+/* $NetBSD: siisata.c,v 1.30 2017/01/03 01:30:15 jakllsch Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.29 2016/09/19 19:07:53 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30 2017/01/03 01:30:15 jakllsch Exp $");
#include
#include
@@ -846,6 +846,11 @@ siisata_cmd_start(struct ata_channel *ch
memset(prb->prb_atapi, 0, sizeof(prb->prb_atapi));
+ if (ata_c->r_command == ATA_DATA_SET_MANAGEMENT) {
+ prb->prb_control |= htole16(PRB_CF_PROTOCOL_OVERRIDE);
+ prb->prb_protocol_override |= htole16(PRB_PO_WRITE);
+ }
+
if (siisata_dma_setup(chp, slot,
(ata_c->flags & (AT_READ | AT_WRITE)) ? ata_c->data : NULL,
ata_c->bcount,
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Tue Jan 3 01:29:49 UTC 2017
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5 npf_build.c npf_parse.y npf_scan.l
npfctl.h
Log Message:
npfctl: dynamic interface address handling; update npf.conf(8).
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/npf/npfctl/npf.conf.5
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/npf/npfctl/npf_build.c \
src/usr.sbin/npf/npfctl/npfctl.h
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/npf/npfctl/npf_parse.y
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/npf/npfctl/npf_scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.45 src/usr.sbin/npf/npfctl/npf.conf.5:1.46
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.45 Tue Dec 27 22:35:33 2016
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Tue Jan 3 01:29:49 2017
@@ -1,6 +1,6 @@
-.\"$NetBSD: npf.conf.5,v 1.45 2016/12/27 22:35:33 rmind Exp $
+.\"$NetBSD: npf.conf.5,v 1.46 2017/01/03 01:29:49 rmind Exp $
.\"
-.\" Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This material is based upon work partially supported by The
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd December 28, 2016
+.Dd January 3, 2017
.Dt NPF.CONF 5
.Os
.Sh NAME
@@ -110,6 +110,24 @@ Specific interface addresses can be sele
$pub_if4 = inet4(wm0)
$pub_if46 = { inet4(wm0), inet6(wm0) }
.Ed
+.Pp
+In the above examples, NPF will statically capture the interface
+addresses on configuration load.
+.Pp
+The following can be used for dynamic handling of the interface addresses:
+.Bd -literal
+$pub_if = ifaddrs(wm0)
+.Ed
+.Pp
+In this case, the expression will represent the runtime list of addresses,
+reflecting any changes to the interface, including the attach and detach.
+Marking the interface as ``down'' has no effect, i.e. all addresses will
+remain present.
+.Pp
+The dynamic address list represents both the IPv4 and IPv6 addresses,
+therefore the
+.Cd family
+keyword can be used in combination to make the filtering more narrow.
.Ss Groups
Groups may have the following options: name, interface, and direction.
They are defined in the following form:
Index: src/usr.sbin/npf/npfctl/npf_build.c
diff -u src/usr.sbin/npf/npfctl/npf_build.c:1.42 src/usr.sbin/npf/npfctl/npf_build.c:1.43
--- src/usr.sbin/npf/npfctl/npf_build.c:1.42 Tue Dec 27 22:35:33 2016
+++ src/usr.sbin/npf/npfctl/npf_build.c Tue Jan 3 01:29:49 2017
@@ -1,7 +1,7 @@
-/* $NetBSD: npf_build.c,v 1.42 2016/12/27 22:35:33 rmind Exp $ */
+/* $NetBSD: npf_build.c,v 1.43 2017/01/03 01:29:49 rmind Exp $ */
/*-
- * Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
+ * Copyright (c) 2011-2017 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This material is based upon work partially supported by The
@@ -34,7 +34,7 @@
*/
#include
-__RCSID("$NetBSD: npf_build.c,v 1.42 2016/12/27 22:35:33 rmind Exp $");
+__RCSID("$NetBSD: npf_build.c,v 1.43 2017/01/03 01:29:49 rmind Exp $");
#include
#include
@@ -65,6 +65,7 @@ static nl_rule_t * the_rule = NULL;
static nl_rule_t * current_group[MAX_RULE_NESTING];
static unsigned rule_nesting_level = 0;
static nl_rule_t * defgroup = NULL;
+static unsigned npfctl_tid_counter = 0;
static void npfctl_dump_bpf(struct bpf_program *);
@@ -797,10 +798,9 @@ npfctl_fill_table(nl_table_t *tl, u_int
void
npfctl_build_table(const char *tname, u_int type, const char *fname)
{
- static unsigned tid = 0;
nl_table_t *tl;
- tl = npf_table_create(tname, tid++, type);
+ tl = npf_table_create(tname, npfctl_tid_counter++, type);
assert(tl != NULL);
if (npf_table_insert(npf_conf, tl)) {
@@ -814,6 +814,24 @@ npfctl_build_table(const char *tname, u_
}
}
+npfvar_t *
+npfctl_ifnet_table(const char *ifname)
+{
+ char tname[NPF_TABLE_MAXNAMELEN];
+ nl_table_t *tl;
+ u_int tid;
+
+ snprintf(tname, sizeof(tname), ".ifnet-%s", ifname);
+
+ tid = npfctl_table_getid(tname);
+ if (tid == (unsigned)-1) {
+ tid = npfctl_tid_counter++;
+ tl = npf_table_create(tname, tid, NPF_TABLE_TREE);
+ (void)npf_table_insert(npf_conf, tl);
+ }
+ return npfvar_create_element(NPFVAR_TABLE, &tid, sizeof(u_int));
+}
+
/*
* npfctl_build_alg: create an NPF application level gateway and add it
* to the configuration.
Index: src/usr.sbin/npf/npfctl/npfctl.h
diff -u src/usr.sbin/npf/npfctl/npfctl.h:1.42 src/usr.sbin/npf/npfctl/npfctl.h:1.43
--- src/usr.sbin/npf/npfctl/npfctl.h:1.42 Tue Dec 27 22:35:33 2016
+++ src/usr.sbin/npf/npfctl/npfctl.h Tue Jan 3 01:29:49 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npfctl.h,v 1.42 2016/12/27 22:35:33 rmind Exp $ */
+/* $NetBSD: npfctl.h,v 1.43 2017/01/03 01:29:49 rmind Exp $ */
/*-
* Cop
CVS commit: src/lib/libnpf
Module Name:src Committed By: christos Date: Tue Jan 3 00:59:31 UTC 2017 Modified Files: src/lib/libnpf: npf.c Log Message: set to NULL after releasing to avoid double free. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/lib/libnpf/npf.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/libnpf/npf.c diff -u src/lib/libnpf/npf.c:1.42 src/lib/libnpf/npf.c:1.43 --- src/lib/libnpf/npf.c:1.42 Tue Dec 27 15:32:58 2016 +++ src/lib/libnpf/npf.c Mon Jan 2 19:59:31 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: npf.c,v 1.42 2016/12/27 20:32:58 rmind Exp $ */ +/* $NetBSD: npf.c,v 1.43 2017/01/03 00:59:31 christos Exp $ */ /*- * Copyright (c) 2010-2015 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.42 2016/12/27 20:32:58 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.43 2017/01/03 00:59:31 christos Exp $"); #include #include @@ -805,7 +805,7 @@ npf_rule_getid(nl_rule_t *rl) uint64_t id = 0; (void)prop_dictionary_get_uint64(rldict, "id", &id); - return (unsigned)id; + return id; } const void * @@ -1330,6 +1330,7 @@ npf_nat_lookup(int fd, int af, npf_addr_ goto out; prop_object_release(conn_res); + conn_res = NULL; #if !defined(_NPF_STANDALONE) error = prop_dictionary_sendrecv_ioctl(conn_dict, fd,
CVS commit: src/sys/net/npf
Module Name:src
Committed By: rmind
Date: Tue Jan 3 00:58:05 UTC 2017
Modified Files:
src/sys/net/npf: npf_conf.c npf_ifaddr.c npf_impl.h npf_os.c
Log Message:
NPF: fix the interface table initialisation on load.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/net/npf/npf_conf.c
cvs rdiff -u -r1.1 -r1.2 src/sys/net/npf/npf_ifaddr.c
cvs rdiff -u -r1.66 -r1.67 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.4 -r1.5 src/sys/net/npf/npf_os.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_conf.c
diff -u src/sys/net/npf/npf_conf.c:1.10 src/sys/net/npf/npf_conf.c:1.11
--- src/sys/net/npf/npf_conf.c:1.10 Mon Dec 26 23:05:06 2016
+++ src/sys/net/npf/npf_conf.c Tue Jan 3 00:58:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_conf.c,v 1.10 2016/12/26 23:05:06 christos Exp $ */
+/* $NetBSD: npf_conf.c,v 1.11 2017/01/03 00:58:05 rmind Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_conf.c,v 1.10 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_conf.c,v 1.11 2017/01/03 00:58:05 rmind Exp $");
#include
#include
@@ -157,7 +157,7 @@ npf_config_load(npf_t *npf, npf_ruleset_
npf_ifmap_flush(npf);
npf_conn_load(npf, conns, !flush);
mutex_exit(&npf->config_lock);
- return;
+ goto done;
}
/*
@@ -183,6 +183,9 @@ npf_config_load(npf_t *npf, npf_ruleset_
/* Finally, it is safe to destroy the old config. */
npf_config_destroy(onc);
+done:
+ /* Sync all interface address tables (can be done asynchronously). */
+ npf_ifaddr_syncall(npf);
}
/*
Index: src/sys/net/npf/npf_ifaddr.c
diff -u src/sys/net/npf/npf_ifaddr.c:1.1 src/sys/net/npf/npf_ifaddr.c:1.2
--- src/sys/net/npf/npf_ifaddr.c:1.1 Mon Jan 2 21:49:51 2017
+++ src/sys/net/npf/npf_ifaddr.c Tue Jan 3 00:58:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ifaddr.c,v 1.1 2017/01/02 21:49:51 rmind Exp $ */
+/* $NetBSD: npf_ifaddr.c,v 1.2 2017/01/03 00:58:05 rmind Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_ifaddr.c,v 1.1 2017/01/02 21:49:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ifaddr.c,v 1.2 2017/01/03 00:58:05 rmind Exp $");
#include
#include
@@ -46,20 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: npf_ifaddr.c
#include "npf_impl.h"
-void
-npf_ifaddr_init(npf_t *npf)
-{
- ifnet_t *ifp;
-
- KERNEL_LOCK(1, NULL);
- IFNET_LOCK();
- IFNET_WRITER_FOREACH(ifp) {
- npf_ifaddr_sync(npf, ifp);
- }
- IFNET_UNLOCK();
- KERNEL_UNLOCK_ONE(NULL);
-}
-
static npf_table_t *
lookup_ifnet_table(npf_t *npf, ifnet_t *ifp)
{
@@ -177,3 +163,19 @@ npf_ifaddr_flush(npf_t *npf, ifnet_t *if
}
replace_ifnet_table(npf, t);
}
+
+void
+npf_ifaddr_syncall(npf_t *npf)
+{
+ ifnet_t *ifp;
+
+ KERNEL_LOCK(1, NULL);
+ IFNET_LOCK();
+ IFNET_WRITER_FOREACH(ifp) {
+ npf_ifaddr_sync(npf, ifp);
+ }
+ IFNET_UNLOCK();
+ KERNEL_UNLOCK_ONE(NULL);
+}
+
+
Index: src/sys/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.66 src/sys/net/npf/npf_impl.h:1.67
--- src/sys/net/npf/npf_impl.h:1.66 Mon Jan 2 21:49:51 2017
+++ src/sys/net/npf/npf_impl.h Tue Jan 3 00:58:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.66 2017/01/02 21:49:51 rmind Exp $ */
+/* $NetBSD: npf_impl.h,v 1.67 2017/01/03 00:58:05 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -247,9 +247,9 @@ void npf_ifmap_flush(npf_t *);
u_int npf_ifmap_getid(npf_t *, const ifnet_t *);
const char * npf_ifmap_getname(npf_t *, const u_int);
-void npf_ifaddr_init(npf_t *);
void npf_ifaddr_sync(npf_t *, ifnet_t *);
void npf_ifaddr_flush(npf_t *, ifnet_t *);
+void npf_ifaddr_syncall(npf_t *);
/* Packet filter hooks. */
int npf_pfil_register(bool);
Index: src/sys/net/npf/npf_os.c
diff -u src/sys/net/npf/npf_os.c:1.4 src/sys/net/npf/npf_os.c:1.5
--- src/sys/net/npf/npf_os.c:1.4 Mon Jan 2 23:02:04 2017
+++ src/sys/net/npf/npf_os.c Tue Jan 3 00:58:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_os.c,v 1.4 2017/01/02 23:02:04 christos Exp $ */
+/* $NetBSD: npf_os.c,v 1.5 2017/01/03 00:58:05 rmind Exp $ */
/*-
* Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.4 2017/01/02 23:02:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.5 2017/01/03 00:58:05 rmind Exp $");
#ifdef _KERNEL_OPT
#include "pf.h"
@@ -153,7 +153,6 @@ npf_init(void)
npf = npf_create(0, NULL, &kern_ifops);
npf_setkernctx(npf);
npf_pfil_register(true);
- npf_ifaddr_init(npf);
#ifdef _MODULE
devmajor_t bmajor = NODEVMAJOR, cmajor = NODEVMAJOR;
@@ -445,6 +444,12 @@ npf_pfil_register(bool init)
PFIL_ALL, npf_ph_inet6);
KASSERT(error == 0);
}
+
+ /*
+ * It is necessary to re-sync all/any interface address tables,
+ * since we did n
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Tue Jan 3 00:50:11 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: Add missing macros to the non-recursive prefixed-parser. Disable macros for the recursive parser. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/flex/dist/src/flex.skl 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/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.7 src/external/bsd/flex/dist/src/flex.skl:1.8 --- src/external/bsd/flex/dist/src/flex.skl:1.7 Mon Jan 2 19:22:56 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 19:50:11 2017 @@ -61,11 +61,17 @@ m4_changequote([[, ]]) m4_ifelse(M4_YY_PREFIX,yy,, #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] -#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] +#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] +#define yy_scan_string M4_YY_PREFIX[[_scan_string]] +#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] +#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] +#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] +#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] +#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] #define yyin M4_YY_PREFIX[[in]] #define yyleng M4_YY_PREFIX[[leng]] #define yylex M4_YY_PREFIX[[lex]] @@ -120,7 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]] %endif %if-c-only -m4_ifelse(M4_YY_PREFIX,yy,, +m4_ifelse(M4_YY_PREFIX,M4_YY_PREFIX,, M4_GEN_PREFIX(`_create_buffer') M4_GEN_PREFIX(`_delete_buffer') M4_GEN_PREFIX(`_scan_buffer')
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: jnemeth Date: Tue Jan 3 00:35:07 UTC 2017 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: add rtsold to rc_obsolete_files :-( To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.207 src/usr.sbin/postinstall/postinstall 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/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.206 src/usr.sbin/postinstall/postinstall:1.207 --- src/usr.sbin/postinstall/postinstall:1.206 Wed Oct 19 22:17:08 2016 +++ src/usr.sbin/postinstall/postinstall Tue Jan 3 00:35:07 2017 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.206 2016/10/19 22:17:08 christos Exp $ +# $NetBSD: postinstall,v 1.207 2017/01/03 00:35:07 jnemeth Exp $ # # Copyright (c) 2002-2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -1463,6 +1463,7 @@ login nfsiod poffd portmap +rtsold sdpd servers sunndd
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: christos
Date: Tue Jan 3 00:22:56 UTC 2017
Modified Files:
src/external/bsd/flex/dist/src: flex.skl main.c
Log Message:
don't #define yywrap yywrap (that is if the prefix is yy, don't #define macros
for the same name). Breaks compatibility for things like:
#ifndef yywrap
int
yywrap(void)
{
return 1;
}
#endif
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/src/flex.skl
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/main.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/flex/dist/src/flex.skl
diff -u src/external/bsd/flex/dist/src/flex.skl:1.6 src/external/bsd/flex/dist/src/flex.skl:1.7
--- src/external/bsd/flex/dist/src/flex.skl:1.6 Mon Jan 2 18:21:14 2017
+++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 19:22:56 2017
@@ -120,6 +120,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]
%endif
%if-c-only
+m4_ifelse(M4_YY_PREFIX,yy,,
M4_GEN_PREFIX(`_create_buffer')
M4_GEN_PREFIX(`_delete_buffer')
M4_GEN_PREFIX(`_scan_buffer')
@@ -155,6 +156,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]
M4_GEN_PREFIX(`set_column')
]])
M4_GEN_PREFIX(`wrap')
+)
%endif
m4_ifdef( [[M4_YY_BISON_LVAL]],
@@ -170,11 +172,14 @@ m4_ifdef( [[]],
]])
+m4_ifelse(M4_YY_PREFIX,yy,,
M4_GEN_PREFIX(`alloc')
M4_GEN_PREFIX(`realloc')
M4_GEN_PREFIX(`free')
+)
%if-c-only
+m4_ifelse(M4_YY_PREFIX,yy,,
m4_ifdef( [[M4_YY_NOT_REENTRANT]],
[[
M4_GEN_PREFIX(`text')
@@ -184,6 +189,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]],
M4_GEN_PREFIX(`_flex_debug')
M4_GEN_PREFIX(`lineno')
]])
+)
%endif
Index: src/external/bsd/flex/dist/src/main.c
diff -u src/external/bsd/flex/dist/src/main.c:1.4 src/external/bsd/flex/dist/src/main.c:1.5
--- src/external/bsd/flex/dist/src/main.c:1.4 Mon Jan 2 14:24:39 2017
+++ src/external/bsd/flex/dist/src/main.c Mon Jan 2 19:22:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $ */
+/* $NetBSD: main.c,v 1.5 2017/01/03 00:22:56 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -33,7 +33,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.5 2017/01/03 00:22:56 christos Exp $");
#include "version.h"
@@ -1589,7 +1589,6 @@ void readin (void)
if (!do_yywrap) {
if (!C_plus_plus) {
- outn ("\n#undef yywrap");
if (reentrant)
outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
else
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: christos
Date: Mon Jan 2 23:21:14 UTC 2017
Modified Files:
src/external/bsd/flex/dist/src: flex.skl gen.c initscan.c
Log Message:
more yy_size_t <-> int fixes
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/flex.skl
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/gen.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/src/initscan.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/flex/dist/src/flex.skl
diff -u src/external/bsd/flex/dist/src/flex.skl:1.5 src/external/bsd/flex/dist/src/flex.skl:1.6
--- src/external/bsd/flex/dist/src/flex.skl:1.5 Mon Jan 2 16:06:10 2017
+++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 18:21:14 2017
@@ -384,10 +384,6 @@ typedef struct yy_buffer_state *YY_BUFFE
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
-#ifndef YY_TYPEDEF_YY_SSIZE_T
-#define YY_TYPEDEF_YY_SSIZE_T
-typedef ssize_t yy_ssize_t;
-#endif
%if-not-reentrant
extern yy_size_t yyleng;
@@ -574,7 +570,7 @@ static int yy_did_buffer_switch_on_eof;
void yyrestart ( FILE *input_file M4_YY_PROTO_LAST_ARG );
void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer M4_YY_PROTO_LAST_ARG );
-YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size M4_YY_PROTO_LAST_ARG );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, yy_size_t size M4_YY_PROTO_LAST_ARG );
void yy_delete_buffer ( YY_BUFFER_STATE b M4_YY_PROTO_LAST_ARG );
void yy_flush_buffer ( YY_BUFFER_STATE b M4_YY_PROTO_LAST_ARG );
void yypush_buffer_state ( YY_BUFFER_STATE new_buffer M4_YY_PROTO_LAST_ARG );
@@ -1495,9 +1491,9 @@ void yyFlexLexer::switch_streams( std::i
}
#ifdef YY_INTERACTIVE
-int yyFlexLexer::LexerInput( char* buf, int /* max_size */ )
+int yyFlexLexer::LexerInput( char* buf, yy_size_t /* max_size */ )
#else
-int yyFlexLexer::LexerInput( char* buf, int max_size )
+int yyFlexLexer::LexerInput( char* buf, yy_size_t max_size )
#endif
{
if ( yyin.eof() || yyin.fail() )
@@ -1592,7 +1588,7 @@ int yyFlexLexer::yy_get_next_buffer()
else
{
- yy_ssize_t num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1669,7 +1665,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
if ((YY_G(yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
- int new_size = YY_G(yy_n_chars) + number_to_move + (YY_G(yy_n_chars) >> 1);
+ yy_size_t new_size = YY_G(yy_n_chars) + number_to_move + (YY_G(yy_n_chars) >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size M4_YY_CALL_LAST_ARG );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -1978,10 +1974,10 @@ static void yy_load_buffer_state (M4_YY
* @return the allocated buffer state.
*/
%if-c-only
-YY_BUFFER_STATE yy_create_buffer YYFARGS2( FILE *,file, int ,size)
+YY_BUFFER_STATE yy_create_buffer YYFARGS2( FILE *,file, yy_size_t ,size)
%endif
%if-c++-only
-YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream& file, int size )
+YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream& file, yy_size_t size )
%endif
{
YY_BUFFER_STATE b;
@@ -2014,7 +2010,7 @@ static void yy_load_buffer_state (M4_YY
* M4_YY_DOC_PARAM
* @return the allocated buffer state.
*/
- YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size )
+ YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, yy_size_t size )
{
return yy_create_buffer( *file, size );
}
@@ -2286,7 +2282,7 @@ YY_BUFFER_STATE yy_scan_buffer YYFARGS2
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
- b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */
+ b->yy_buf_size = (size - 2); /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0;
b->yy_input_file = NULL;
Index: src/external/bsd/flex/dist/src/gen.c
diff -u src/external/bsd/flex/dist/src/gen.c:1.4 src/external/bsd/flex/dist/src/gen.c:1.5
--- src/external/bsd/flex/dist/src/gen.c:1.4 Mon Jan 2 16:20:00 2017
+++ src/external/bsd/flex/dist/src/gen.c Mon Jan 2 18:21:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.4 2017/01/02 21:20:00 christos Exp $ */
+/* $NetBSD: gen.c,v 1.5 2017/01/02 23:21:14 christos Exp $ */
/* gen - actual generation (writing) of flex scanners */
@@ -33,7 +33,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: gen.c,v 1.4 2017/01/02 21:20:00 christos Exp $");
+__RCSID("$NetBSD: gen.c,v 1.5 2017/01/02 23:21:14 christos Exp $");
#include "tables.h"
@@ -1509,11 +1509,11 @@ void make_tables (void)
if (yymore_used && !yytext_is_array) {
indent_puts ("YY_G(yy
CVS commit: src/sys/net/npf
Module Name:src Committed By: christos Date: Mon Jan 2 23:02:04 UTC 2017 Modified Files: src/sys/net/npf: npf_os.c Log Message: make this compile as a module. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/net/npf/npf_os.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/npf/npf_os.c diff -u src/sys/net/npf/npf_os.c:1.3 src/sys/net/npf/npf_os.c:1.4 --- src/sys/net/npf/npf_os.c:1.3 Mon Jan 2 16:49:51 2017 +++ src/sys/net/npf/npf_os.c Mon Jan 2 18:02:04 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_os.c,v 1.3 2017/01/02 21:49:51 rmind Exp $ */ +/* $NetBSD: npf_os.c,v 1.4 2017/01/02 23:02:04 christos Exp $ */ /*- * Copyright (c) 2009-2016 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef _KERNEL #include -__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.3 2017/01/02 21:49:51 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.4 2017/01/02 23:02:04 christos Exp $"); #ifdef _KERNEL_OPT #include "pf.h" @@ -54,6 +54,9 @@ __KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1 #include #include #include + +#include +#include #endif #include "npf_impl.h"
CVS commit: src/sys/netinet
Module Name:src
Committed By: christos
Date: Mon Jan 2 23:00:25 UTC 2017
Modified Files:
src/sys/netinet: in.c in_var.h
Log Message:
- You can't just call the pfil hook to remove an address before an address
is removed! Hold a reference instead, remove it, and then free it.
- GC iatoifa()
To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/netinet/in.c
cvs rdiff -u -r1.90 -r1.91 src/sys/netinet/in_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.194 src/sys/netinet/in.c:1.195
--- src/sys/netinet/in.c:1.194 Sat Dec 31 04:41:05 2016
+++ src/sys/netinet/in.c Mon Jan 2 18:00:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.194 2016/12/31 09:41:05 ryo Exp $ */
+/* $NetBSD: in.c,v 1.195 2017/01/02 23:00:25 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.194 2016/12/31 09:41:05 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.195 2017/01/02 23:00:25 christos Exp $");
#include "arp.h"
@@ -668,9 +668,11 @@ in_control0(struct socket *so, u_long cm
break;
case SIOCDIFADDR:
- pfil_run_addrhooks(if_pfil, cmd, iatoifa(ia));
ia4_release(ia, &psref);
+ ifaref(&ia->ia_ifa);
in_purgeaddr(&ia->ia_ifa);
+ pfil_run_addrhooks(if_pfil, cmd, &ia->ia_ifa);
+ ifafree(&ia->ia_ifa);
ia = NULL;
break;
@@ -705,7 +707,7 @@ in_control0(struct socket *so, u_long cm
if (error == 0) {
if (run_hook)
- pfil_run_addrhooks(if_pfil, cmd, iatoifa(ia));
+ pfil_run_addrhooks(if_pfil, cmd, &ia->ia_ifa);
} else if (newifaddr) {
KASSERT(ia != NULL);
in_purgeaddr(&ia->ia_ifa);
Index: src/sys/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.90 src/sys/netinet/in_var.h:1.91
--- src/sys/netinet/in_var.h:1.90 Tue Dec 6 02:01:47 2016
+++ src/sys/netinet/in_var.h Mon Jan 2 18:00:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in_var.h,v 1.90 2016/12/06 07:01:47 knakahara Exp $ */
+/* $NetBSD: in_var.h,v 1.91 2017/01/02 23:00:25 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -148,8 +148,6 @@ struct in_aliasreq {
*/
#define IA_SIN(ia) (&(((struct in_ifaddr *)(ia))->ia_addr))
-#define iatoifa(ia) (struct ifaddr *)(ia)
-
#ifdef _KERNEL
/* Note: 61, 127, 251, 509, 1021, 2039 are good. */
CVS commit: src/sys
Module Name:src
Committed By: rmind
Date: Mon Jan 2 21:49:51 UTC 2017
Modified Files:
src/sys/modules/npf: Makefile
src/sys/net/npf: files.npf npf_ctl.c npf_impl.h npf_os.c npf_tableset.c
npf_worker.c
Added Files:
src/sys/net/npf: npf_ifaddr.c
Log Message:
NPF: implement dynamic handling of interface addresses (the kernel part).
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/modules/npf/Makefile
cvs rdiff -u -r1.19 -r1.20 src/sys/net/npf/files.npf
cvs rdiff -u -r1.45 -r1.46 src/sys/net/npf/npf_ctl.c
cvs rdiff -u -r0 -r1.1 src/sys/net/npf/npf_ifaddr.c
cvs rdiff -u -r1.65 -r1.66 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/npf_os.c \
src/sys/net/npf/npf_worker.c
cvs rdiff -u -r1.25 -r1.26 src/sys/net/npf/npf_tableset.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/modules/npf/Makefile
diff -u src/sys/modules/npf/Makefile:1.20 src/sys/modules/npf/Makefile:1.21
--- src/sys/modules/npf/Makefile:1.20 Wed Dec 28 13:50:55 2016
+++ src/sys/modules/npf/Makefile Mon Jan 2 21:49:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/12/28 13:50:55 christos Exp $
+# $NetBSD: Makefile,v 1.21 2017/01/02 21:49:51 rmind Exp $
#
# Public Domain.
#
@@ -13,7 +13,7 @@ SRCS= npf.c npf_alg.c npf_conf.c npf_ct
SRCS+= npf_bpf.c npf_if.c npf_inet.c npf_mbuf.c npf_nat.c
SRCS+= npf_ruleset.c npf_conn.c npf_conndb.c npf_rproc.c
SRCS+= npf_state.c npf_state_tcp.c npf_tableset.c
-SRCS+= lpm.c npf_sendpkt.c npf_worker.c npf_os.c
+SRCS+= lpm.c npf_sendpkt.c npf_worker.c npf_ifaddr.c npf_os.c
CPPFLAGS+= -DINET6
Index: src/sys/net/npf/files.npf
diff -u src/sys/net/npf/files.npf:1.19 src/sys/net/npf/files.npf:1.20
--- src/sys/net/npf/files.npf:1.19 Mon Dec 26 23:05:06 2016
+++ src/sys/net/npf/files.npf Mon Jan 2 21:49:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.npf,v 1.19 2016/12/26 23:05:06 christos Exp $
+# $NetBSD: files.npf,v 1.20 2017/01/02 21:49:51 rmind Exp $
#
# Public Domain.
#
@@ -11,7 +11,6 @@ defpseudo npf: ifnet
# Core
file net/npf/npf.cnpf
-file net/npf/npf_os.c npf
file net/npf/npf_conf.c npf
file net/npf/npf_ctl.c npf
file net/npf/npf_handler.c npf
@@ -31,6 +30,9 @@ file net/npf/npf_alg.c npf
file net/npf/npf_sendpkt.c npf
file net/npf/npf_worker.c npf
+file net/npf/npf_os.c npf
+file net/npf/npf_ifaddr.c npf
+
# LPM
file net/npf/lpm.cnpf
Index: src/sys/net/npf/npf_ctl.c
diff -u src/sys/net/npf/npf_ctl.c:1.45 src/sys/net/npf/npf_ctl.c:1.46
--- src/sys/net/npf/npf_ctl.c:1.45 Mon Dec 26 23:05:06 2016
+++ src/sys/net/npf/npf_ctl.c Mon Jan 2 21:49:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ctl.c,v 1.45 2016/12/26 23:05:06 christos Exp $ */
+/* $NetBSD: npf_ctl.c,v 1.46 2017/01/02 21:49:51 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.45 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.46 2017/01/02 21:49:51 rmind Exp $");
#include
#include
@@ -108,7 +108,7 @@ npf_mk_table_entries(npf_table_t *t, pro
}
static int __noinline
-npf_mk_tables(npf_tableset_t *tblset, prop_array_t tables,
+npf_mk_tables(npf_t *npf, npf_tableset_t *tblset, prop_array_t tables,
prop_dictionary_t errdict)
{
prop_object_iterator_t it;
@@ -160,9 +160,6 @@ npf_mk_tables(npf_tableset_t *tblset, pr
error = EINVAL;
break;
}
- if (type == NPF_TABLE_HASH) {
- size = 1024; /* XXX */
- }
/* Create and insert the table. */
t = npf_table_create(name, (u_int)tid, type, blob, size);
@@ -558,7 +555,7 @@ npfctl_load(npf_t *npf, u_long cmd, void
goto fail;
}
tblset = npf_tableset_create(nitems);
- error = npf_mk_tables(tblset, tables, errdict);
+ error = npf_mk_tables(npf, tblset, tables, errdict);
if (error) {
goto fail;
}
Index: src/sys/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.65 src/sys/net/npf/npf_impl.h:1.66
--- src/sys/net/npf/npf_impl.h:1.65 Wed Dec 28 21:55:04 2016
+++ src/sys/net/npf/npf_impl.h Mon Jan 2 21:49:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.65 2016/12/28 21:55:04 christos Exp $ */
+/* $NetBSD: npf_impl.h,v 1.66 2017/01/02 21:49:51 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -247,6 +247,10 @@ void npf_ifmap_flush(npf_t *);
u_int npf_ifmap_getid(npf_t *, const ifnet_t *);
const char * npf_ifmap_getname(npf_t *, const u_int);
+void npf_ifaddr_init(npf_t *);
+void npf_ifaddr_sync(npf_t *, ifnet_t *);
+void npf_ifaddr_flush(npf_t *, ifnet_t *);
+
/* Packet filter hooks. */
int npf_pfil_register(bool);
void npf_pfil_unregister(bool);
@@ -297,12 +301,14 @@ void npf_tableset_destroy(npf_tableset_
int npf_tableset_insert(npf_tableset_t *, npf_table_t *);
npf_table_t * npf_tableset_getbyname(npf_tableset_t *, con
CVS commit: src/sys/arch/evbarm/gumstix
Module Name:src
Committed By: skrll
Date: Mon Jan 2 21:46:59 UTC 2017
Modified Files:
src/sys/arch/evbarm/gumstix: gumstix_start.S
Log Message:
Fix boot on Gumstix Verdex boards.
Reported by smesgr on port-arm
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/gumstix/gumstix_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/gumstix/gumstix_start.S
diff -u src/sys/arch/evbarm/gumstix/gumstix_start.S:1.14 src/sys/arch/evbarm/gumstix/gumstix_start.S:1.15
--- src/sys/arch/evbarm/gumstix/gumstix_start.S:1.14 Sat Oct 15 15:27:18 2016
+++ src/sys/arch/evbarm/gumstix/gumstix_start.S Mon Jan 2 21:46:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_start.S,v 1.14 2016/10/15 15:27:18 kiyohara Exp $ */
+/* $NetBSD: gumstix_start.S,v 1.15 2017/01/02 21:46:59 skrll Exp $ */
/*
* Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -71,7 +71,7 @@
#include
#endif
-RCSID("$NetBSD: gumstix_start.S,v 1.14 2016/10/15 15:27:18 kiyohara Exp $")
+RCSID("$NetBSD: gumstix_start.S,v 1.15 2017/01/02 21:46:59 skrll Exp $")
/*
* CPWAIT -- Canonical method to wait for CP15 update.
@@ -212,6 +212,8 @@ _C_LABEL(gumstix_start):
cmp r1, #0 /* Check MPIDR_MP (bit 31) */
orrlt r1, r0, #TTBR_MPATTR
orrge r1, r0, #TTBR_UPATTR
+#else
+ mov r1, r0
#endif
mcr p15, 0, r1, c2, c0, 0 /* Set TTB */
mcr p15, 0, r1, c8, c7, 0 /* Flush TLB */
CVS commit: src/share/man/man9
Module Name:src Committed By: cherry Date: Mon Jan 2 21:42:01 UTC 2017 Modified Files: src/share/man/man9: uvm.9 Log Message: Document sys/uvm/uvm_init.c:uvm_md_init() To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/share/man/man9/uvm.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/uvm.9 diff -u src/share/man/man9/uvm.9:1.110 src/share/man/man9/uvm.9:1.111 --- src/share/man/man9/uvm.9:1.110 Mon Mar 23 08:19:12 2015 +++ src/share/man/man9/uvm.9 Mon Jan 2 21:42:01 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: uvm.9,v 1.110 2015/03/23 08:19:12 riastradh Exp $ +.\" $NetBSD: uvm.9,v 1.111 2017/01/02 21:42:01 cherry Exp $ .\" .\" Copyright (c) 1998 Matthew R. Green .\" All rights reserved. @@ -92,9 +92,15 @@ initializes process limits for the named This is for use by the system startup for process zero, before any other processes are created. .Pp +.Fn uvm_md_init +does early boot initialization. This currently includes: .Fn uvm_setpagesize -initializes the uvmexp members pagesize (if not already done by +which initializes the uvmexp members pagesize (if not already done by machine-dependent code), pageshift and pagemask. +.Fn uvm_physseg_init +which initialises the +.Xr uvm_hotplug 9 +subsystem. It should be called by machine-dependent code early in the .Fn pmap_init call (see
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: christos
Date: Mon Jan 2 21:20:00 UTC 2017
Modified Files:
src/external/bsd/flex/dist/src: gen.c initscan.c
Log Message:
another int -> size_t
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/gen.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/initscan.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/flex/dist/src/gen.c
diff -u src/external/bsd/flex/dist/src/gen.c:1.3 src/external/bsd/flex/dist/src/gen.c:1.4
--- src/external/bsd/flex/dist/src/gen.c:1.3 Mon Jan 2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/gen.c Mon Jan 2 16:20:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.3 2017/01/02 17:45:27 christos Exp $ */
+/* $NetBSD: gen.c,v 1.4 2017/01/02 21:20:00 christos Exp $ */
/* gen - actual generation (writing) of flex scanners */
@@ -33,7 +33,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: gen.c,v 1.3 2017/01/02 17:45:27 christos Exp $");
+__RCSID("$NetBSD: gen.c,v 1.4 2017/01/02 21:20:00 christos Exp $");
#include "tables.h"
@@ -1966,7 +1966,7 @@ void make_tables (void)
("if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )");
++indent_level;
indent_puts ("{");
- indent_puts ("int yyl;");
+ indent_puts ("yy_size_t yyl;");
do_indent ();
out_str ("for ( yyl = %s; yyl < yyleng; ++yyl )\n",
yymore_used ? (yytext_is_array ? "YY_G(yy_prev_more_offset)" :
Index: src/external/bsd/flex/dist/src/initscan.c
diff -u src/external/bsd/flex/dist/src/initscan.c:1.5 src/external/bsd/flex/dist/src/initscan.c:1.6
--- src/external/bsd/flex/dist/src/initscan.c:1.5 Mon Jan 2 15:53:11 2017
+++ src/external/bsd/flex/dist/src/initscan.c Mon Jan 2 16:20:00 2017
@@ -104,7 +104,7 @@
/* end standard C headers. */
-/* $NetBSD: initscan.c,v 1.5 2017/01/02 20:53:11 christos Exp $ */
+/* $NetBSD: initscan.c,v 1.6 2017/01/02 21:20:00 christos Exp $ */
/* flex integer type definitions */
@@ -232,8 +232,12 @@ typedef struct yy_buffer_state *YY_BUFFE
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
+#ifndef YY_TYPEDEF_YY_SSIZE_T
+#define YY_TYPEDEF_YY_SSIZE_T
+typedef ssize_t yy_ssize_t;
+#endif
-extern int yyleng;
+extern yy_size_t yyleng;
extern FILE *yyin, *yyout;
@@ -271,12 +275,12 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
- int yy_buf_size;
+ size_t yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -345,8 +349,8 @@ static YY_BUFFER_STATE * yy_buffer_stack
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int yyleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = NULL;
@@ -373,7 +377,7 @@ static void yy_init_buffer ( YY_BUFFER_S
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size );
YY_BUFFER_STATE yy_scan_string ( const char *yy_str );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len );
void *yyalloc ( yy_size_t );
void *yyrealloc ( void *, yy_size_t );
@@ -1921,10 +1925,10 @@ int yy_flex_debug = 0;
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
-#line 1 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/scan.l"
-/* $NetBSD: initscan.c,v 1.5 2017/01/02 20:53:11 christos Exp $ */
+#line 1 "/usr/src/external/bsd/flex/dist/src/scan.l"
+/* $NetBSD: initscan.c,v 1.6 2017/01/02 21:20:00 christos Exp $ */
/* scan.l - scanner for flex input -*-C-*- */
-#line 6 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/scan.l"
+#line 6 "/usr/src/external/bsd/flex/dist/src/scan.l"
/* Copyright (c) 1990 The Regents of the University of California. */
/* All rights reserved. */
@@ -1956,7 +1960,7 @@ char *yytext;
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: initscan.c,v 1.5 2017/01/02 20:53:11 christos Exp $");
+__RCSID("$NetBSD: initscan.c,v 1.6 2017/01/02 21:20:00 christos Exp $");
#include "parse.h"
extern bool tablesverify, tablesext;
@@ -2044,9 +2048,9 @@ extern int yylval; /* XXX: for bootstrap
if (!indented_code) line_directive_out(NULL, 0);\
} while (0)
-#line 2047 ""
+#line 2051 ""
-#line 2049 ""
+#line 2053 ""
#define INITIAL 0
#define SECT2 1
@@ -2111,7 +2115,7 @@ FILE *yyget_out ( void );
void yyset_out ( FILE *
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: christos
Date: Mon Jan 2 21:06:10 UTC 2017
Modified Files:
src/external/bsd/flex/dist/src: flex.skl
Log Message:
another int to yy_size_t
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/flex.skl
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/flex/dist/src/flex.skl
diff -u src/external/bsd/flex/dist/src/flex.skl:1.4 src/external/bsd/flex/dist/src/flex.skl:1.5
--- src/external/bsd/flex/dist/src/flex.skl:1.4 Mon Jan 2 15:53:11 2017
+++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 16:06:10 2017
@@ -415,7 +415,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
*/
#define YY_LESS_LINENO(n) \
do { \
-int yyl;\
+yy_size_t yyl;\
for ( yyl = n; yyl < yyleng; ++yyl )\
if ( yytext[yyl] == '\n' )\
--yylineno;\
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: martin Date: Mon Jan 2 21:05:06 UTC 2017 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add misising mixerctl file To generate a diff of this commit: cvs rdiff -u -r1.711 -r1.712 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.711 src/distrib/sets/lists/tests/mi:1.712 --- src/distrib/sets/lists/tests/mi:1.711 Mon Jan 2 15:41:09 2017 +++ src/distrib/sets/lists/tests/mi Mon Jan 2 21:05:06 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.711 2017/01/02 15:41:09 christos Exp $ +# $NetBSD: mi,v 1.712 2017/01/02 21:05:06 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3789,6 +3789,7 @@ ./usr/tests/usr.bin/make/unit-tests/varshell.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varshell.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/mixerctl tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/mixerctl/Atffile tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/mixerctl/t_mixerctl tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/mkdep tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/mkdep/Atffile tests-usr.bin-tests compattestfile,atf
CVS commit: src/tests/kernel
Module Name:src
Committed By: kamil
Date: Mon Jan 2 21:02:03 UTC 2017
Modified Files:
src/tests/kernel: t_ptrace_wait.c
Log Message:
Fix typo in atf_tc_set_md_var(): baic -> basic
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/tests/kernel/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.47 src/tests/kernel/t_ptrace_wait.c:1.48
--- src/tests/kernel/t_ptrace_wait.c:1.47 Tue Dec 13 12:25:05 2016
+++ src/tests/kernel/t_ptrace_wait.c Mon Jan 2 21:02:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.47 2016/12/13 12:25:05 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.48 2017/01/02 21:02:03 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.47 2016/12/13 12:25:05 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.48 2017/01/02 21:02:03 kamil Exp $");
#include
#include
@@ -4275,7 +4275,7 @@ ATF_TC(lwpinfo1);
ATF_TC_HEAD(lwpinfo1, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Verify baic LWPINFO call for single thread (PT_TRACE_ME)");
+ "Verify basic LWPINFO call for single thread (PT_TRACE_ME)");
}
ATF_TC_BODY(lwpinfo1, tc)
@@ -4343,7 +4343,7 @@ ATF_TC(lwpinfo2);
ATF_TC_HEAD(lwpinfo2, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Verify baic LWPINFO call for single thread (PT_ATTACH from "
+ "Verify basic LWPINFO call for single thread (PT_ATTACH from "
"tracer)");
}
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: christos
Date: Mon Jan 2 20:53:11 UTC 2017
Modified Files:
src/external/bsd/flex/dist/src: flex.skl initscan.c
Log Message:
deal with our int -> size_t changes.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/flex.skl
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/initscan.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/flex/dist/src/flex.skl
diff -u src/external/bsd/flex/dist/src/flex.skl:1.3 src/external/bsd/flex/dist/src/flex.skl:1.4
--- src/external/bsd/flex/dist/src/flex.skl:1.3 Mon Jan 2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 15:53:11 2017
@@ -384,9 +384,13 @@ typedef struct yy_buffer_state *YY_BUFFE
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
+#ifndef YY_TYPEDEF_YY_SSIZE_T
+#define YY_TYPEDEF_YY_SSIZE_T
+typedef ssize_t yy_ssize_t;
+#endif
%if-not-reentrant
-extern int yyleng;
+extern yy_size_t yyleng;
%endif
%if-c-only
@@ -463,12 +467,12 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
- int yy_buf_size;
+ size_t yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -553,8 +557,8 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
%not-for-header
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int yyleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = NULL;
@@ -586,7 +590,7 @@ static void yy_init_buffer ( YY_BUFFER_S
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size M4_YY_PROTO_LAST_ARG );
YY_BUFFER_STATE yy_scan_string ( const char *yy_str M4_YY_PROTO_LAST_ARG );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len M4_YY_PROTO_LAST_ARG );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len M4_YY_PROTO_LAST_ARG );
%endif
@@ -701,8 +705,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char;
-int yy_n_chars;
-int yyleng_r;
+yy_size_t yy_n_chars;
+yy_size_t yyleng_r;
char *yy_c_buf_p;
int yy_init;
int yy_start;
@@ -839,7 +843,7 @@ void yyset_out ( FILE * _out_str M4_YY_
m4_ifdef( [[M4_YY_NO_GET_LENG]],,
[[
- int yyget_leng ( M4_YY_PROTO_ONLY_ARG );
+ yy_size_t yyget_leng ( M4_YY_PROTO_ONLY_ARG );
]])
m4_ifdef( [[M4_YY_NO_GET_TEXT]],,
@@ -1546,7 +1550,7 @@ int yyFlexLexer::yy_get_next_buffer()
M4_YY_DECL_GUTS_VAR();
char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
char *source = YY_G(yytext_ptr);
- int number_to_move, i;
+ yy_size_t number_to_move, i;
int ret_val;
if ( YY_G(yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars) + 1] )
@@ -1575,7 +1579,7 @@ int yyFlexLexer::yy_get_next_buffer()
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr) - 1);
+ number_to_move = (yy_size_t) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr) - 1);
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
@@ -1588,7 +1592,7 @@ int yyFlexLexer::yy_get_next_buffer()
else
{
- int num_to_read =
+ yy_ssize_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1607,7 +1611,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
if ( b->yy_is_our_buffer )
{
-int new_size = b->yy_buf_size * 2;
+yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1749,7 +1753,7 @@ m4_ifdef( [[M4_YY_NO_UNPUT]],,
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- int number_to_move = YY_G(yy_n_chars) + 2;
+ yy_size_t number_to_move = YY_G(yy_n_chars) + 2;
char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
char *source =
@@ -1761,7 +1765,7 @@ m4_ifdef( [[M4_YY_NO_UNPUT]],,
yy_cp += (int) (dest - source);
yy_bp += (int) (dest - source);
YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
- YY_G(yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+ YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
YY_FATAL_ERROR( "flex scanner push-back overflow" );
@@ -1816,7 +1820,7 @@ m4_ifdef( [[M4_YY_USE_LINENO]
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Mon Jan 2 20:45:09 UTC 2017 Modified Files: src/distrib/sets/lists/debug: shl.mi Log Message: libcurses version bump To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/distrib/sets/lists/debug/shl.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/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.153 src/distrib/sets/lists/debug/shl.mi:1.154 --- src/distrib/sets/lists/debug/shl.mi:1.153 Sun Dec 25 00:09:20 2016 +++ src/distrib/sets/lists/debug/shl.mi Mon Jan 2 20:45:09 2017 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.153 2016/12/25 00:09:20 christos Exp $ +# $NetBSD: shl.mi,v 1.154 2017/01/02 20:45:09 martin Exp $ ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libc.so.12.205.debug comp-sys-debug debug,dynamicroot @@ -77,7 +77,8 @@ ./usr/libdata/debug/usr/lib/libcrypto_mdc2.so.7.0.debug comp-obsolete debug,compatfile,obsolete ./usr/libdata/debug/usr/lib/libcrypto_rc5.so.12.0.debug comp-crypto-debug debug,compatfile,crypto,crypto_rc5 ./usr/libdata/debug/usr/lib/libctf.so.3.0.debug comp-sys-debug debug,compatfile,ctf -./usr/libdata/debug/usr/lib/libcurses.so.7.0.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libcurses.so.7.0.debug comp-sys-debug debug,obsolete,compatfile +./usr/libdata/debug/usr/lib/libcurses.so.7.1.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libdes.so.12.0.debug comp-crypto-debug debug,compatfile,crypto ./usr/libdata/debug/usr/lib/libdevmapper.so.1.0.debug comp-lvm-debug debug,compatfile,lvm ./usr/libdata/debug/usr/lib/libdm.so.0.0.debug comp-sys-debug debug,compatfile
CVS commit: src/etc/mtree
Module Name:src Committed By: martin Date: Mon Jan 2 20:37:12 UTC 2017 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: Add mixerctl test directory To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.138 src/etc/mtree/NetBSD.dist.tests:1.139 --- src/etc/mtree/NetBSD.dist.tests:1.138 Tue Dec 13 18:00:10 2016 +++ src/etc/mtree/NetBSD.dist.tests Mon Jan 2 20:37:12 2017 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.138 2016/12/13 18:00:10 kamil Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.139 2017/01/02 20:37:12 martin Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -405,6 +405,7 @@ ./usr/tests/usr.bin/m4 ./usr/tests/usr.bin/make ./usr/tests/usr.bin/make/unit-tests +./usr/tests/usr.bin/mixerctl ./usr/tests/usr.bin/mkdep ./usr/tests/usr.bin/nbperf ./usr/tests/usr.bin/pr
CVS commit: src/sys/uvm
Module Name:src Committed By: cherry Date: Mon Jan 2 20:22:20 UTC 2017 Modified Files: src/sys/uvm: uvm_extern.h Log Message: Remove a redundant #ifdef _KERNEL/#endif pair. ok mrg@ To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/sys/uvm/uvm_extern.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/uvm/uvm_extern.h diff -u src/sys/uvm/uvm_extern.h:1.201 src/sys/uvm/uvm_extern.h:1.202 --- src/sys/uvm/uvm_extern.h:1.201 Sat Dec 24 19:21:29 2016 +++ src/sys/uvm/uvm_extern.h Mon Jan 2 20:22:20 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_extern.h,v 1.201 2016/12/24 19:21:29 cherry Exp $ */ +/* $NetBSD: uvm_extern.h,v 1.202 2017/01/02 20:22:20 cherry Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -644,12 +644,10 @@ void uvm_km_free(struct vm_map *, vadd struct vm_map *uvm_km_suballoc(struct vm_map *, vaddr_t *, vaddr_t *, vsize_t, int, bool, struct vm_map *); -#ifdef _KERNEL int uvm_km_kmem_alloc(vmem_t *, vmem_size_t, vm_flag_t, vmem_addr_t *); void uvm_km_kmem_free(vmem_t *, vmem_addr_t, vmem_size_t); bool uvm_km_va_starved_p(void); -#endif /* uvm_map.c */ int uvm_map(struct vm_map *, vaddr_t *, vsize_t,
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: cherry Date: Mon Jan 2 20:17:15 UTC 2017 Modified Files: src/distrib/sets/lists/comp: mi Log Message: We don't need sys/uvm/uvm_physseg.h installed, since userland has no use for it. Obsolete it in the set list. To generate a diff of this commit: cvs rdiff -u -r1.2090 -r1.2091 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2090 src/distrib/sets/lists/comp/mi:1.2091 --- src/distrib/sets/lists/comp/mi:1.2090 Mon Jan 2 10:33:28 2017 +++ src/distrib/sets/lists/comp/mi Mon Jan 2 20:17:15 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2090 2017/01/02 10:33:28 hannken Exp $ +# $NetBSD: mi,v 1.2091 2017/01/02 20:17:15 cherry Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -3096,7 +3096,7 @@ ./usr/include/uvm/uvm_pager_i.h comp-obsolete obsolete ./usr/include/uvm/uvm_param.h comp-c-include ./usr/include/uvm/uvm_pdaemon.h comp-c-include -./usr/include/uvm/uvm_physseg.h comp-c-include +./usr/include/uvm/uvm_physseg.h comp-c-include obsolete ./usr/include/uvm/uvm_pglist.h comp-c-include ./usr/include/uvm/uvm_pmap.h comp-c-include ./usr/include/uvm/uvm_prot.h comp-c-include
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: martin
Date: Mon Jan 2 20:10:44 UTC 2017
Modified Files:
src/sys/compat/linux/common: linux_signal.h
Log Message:
Provide a dummy linux_sigset_t for all architectures that do not have
any machdep one. This make kdump compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/common/linux_signal.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_signal.h
diff -u src/sys/compat/linux/common/linux_signal.h:1.31 src/sys/compat/linux/common/linux_signal.h:1.32
--- src/sys/compat/linux/common/linux_signal.h:1.31 Mon Jan 2 16:32:10 2017
+++ src/sys/compat/linux/common/linux_signal.h Mon Jan 2 20:10:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.h,v 1.31 2017/01/02 16:32:10 manu Exp $ */
+/* $NetBSD: linux_signal.h,v 1.32 2017/01/02 20:10:44 martin Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -46,6 +46,8 @@
#include
#elif defined(__amd64__)
#include
+#else
+typedef void linux_sigset_t;
#endif
typedef struct {
CVS commit: src/sys/uvm
Module Name:src Committed By: cherry Date: Mon Jan 2 20:08:33 UTC 2017 Modified Files: src/sys/uvm: uvm.h uvm_physseg.h Log Message: Move sys/uvm/uvm_physseg.h inclusion to within _KERNEL only. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/uvm/uvm.h cvs rdiff -u -r1.7 -r1.8 src/sys/uvm/uvm_physseg.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/uvm/uvm.h diff -u src/sys/uvm/uvm.h:1.67 src/sys/uvm/uvm.h:1.68 --- src/sys/uvm/uvm.h:1.67 Thu Dec 22 13:26:24 2016 +++ src/sys/uvm/uvm.h Mon Jan 2 20:08:32 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm.h,v 1.67 2016/12/22 13:26:24 cherry Exp $ */ +/* $NetBSD: uvm.h,v 1.68 2017/01/02 20:08:32 cherry Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -57,12 +57,12 @@ #include #include #include -#include #include #include #ifdef _KERNEL +#include #include /* Index: src/sys/uvm/uvm_physseg.h diff -u src/sys/uvm/uvm_physseg.h:1.7 src/sys/uvm/uvm_physseg.h:1.8 --- src/sys/uvm/uvm_physseg.h:1.7 Thu Dec 29 12:58:38 2016 +++ src/sys/uvm/uvm_physseg.h Mon Jan 2 20:08:32 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_physseg.h,v 1.7 2016/12/29 12:58:38 rin Exp $ */ +/* $NetBSD: uvm_physseg.h,v 1.8 2017/01/02 20:08:32 cherry Exp $ */ /*- * Copyright (c) 2016 The NetBSD Foundation, Inc. @@ -45,7 +45,6 @@ #include #include -#ifdef _KERNEL /* * No APIs are explicitly #included in uvm_physseg.c */ @@ -144,6 +143,4 @@ void uvm_physseg_set_avail_start(uvm_phy void uvm_physseg_set_avail_end(uvm_physseg_t, paddr_t); #endif /* UVM_PHYSSEG_LEGACY */ -#endif /* _KERNEL */ - #endif /* _UVM_UVM_PHYSSEG_H_ */
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: christos
Date: Mon Jan 2 19:24:40 UTC 2017
Modified Files:
src/external/bsd/flex/dist/src: main.c
Log Message:
avoid yywrap redefinition
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/main.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/flex/dist/src/main.c
diff -u src/external/bsd/flex/dist/src/main.c:1.3 src/external/bsd/flex/dist/src/main.c:1.4
--- src/external/bsd/flex/dist/src/main.c:1.3 Mon Jan 2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/main.c Mon Jan 2 14:24:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2017/01/02 17:45:27 christos Exp $ */
+/* $NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -33,7 +33,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: main.c,v 1.3 2017/01/02 17:45:27 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $");
#include "version.h"
@@ -1589,6 +1589,7 @@ void readin (void)
if (!do_yywrap) {
if (!C_plus_plus) {
+ outn ("\n#undef yywrap");
if (reentrant)
outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
else
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Jan 2 18:41:18 UTC 2017 Removed Files: src/external/bsd/flex/dist/src: skel.c Log Message: delete the generated skeleton, we generate it all the time. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/bsd/flex/dist/src/skel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/flex
Module Name:src
Committed By: christos
Date: Mon Jan 2 18:33:22 UTC 2017
Modified Files:
src/external/bsd/flex/bin: Makefile
src/external/bsd/flex/dist/src: initscan.c
Log Message:
fix the scanner build and regen
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/flex/bin/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/initscan.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/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.10 src/external/bsd/flex/bin/Makefile:1.11
--- src/external/bsd/flex/bin/Makefile:1.10 Mon Jan 2 12:45:26 2017
+++ src/external/bsd/flex/bin/Makefile Mon Jan 2 13:33:22 2017
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.10 2017/01/02 17:45:26 christos Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/02 18:33:22 christos Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -55,7 +55,7 @@ LINKS= ${BINDIR}/lex ${BINDIR}/flex \
MLINKS= flex.1 lex.1
skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
- ${TOOL_SED} -e 's/m4_/m4postproc_/g' -e 's/m4preproc_/m4_/g' \
+ ${TOOL_SED} -e 's/4_/a4_/g; s/m4preproc_/m4_/g' \
${IDIST}/flex.skl | ${TOOL_M4} -I${IDIST} -P \
-DFLEX_MAJOR_VERSION=`echo ${VERSION} | cut -f 1 -d .` \
-DFLEX_MINOR_VERSION=`echo ${VERSION} | cut -f 2 -d .` \
Index: src/external/bsd/flex/dist/src/initscan.c
diff -u src/external/bsd/flex/dist/src/initscan.c:1.3 src/external/bsd/flex/dist/src/initscan.c:1.4
--- src/external/bsd/flex/dist/src/initscan.c:1.3 Mon Jan 2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/initscan.c Mon Jan 2 13:33:22 2017
@@ -1,5 +1,5 @@
-#line 3 ""
+#line 2 ""
#define YY_INT_ALIGNED short int
@@ -8,11 +8,89 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_SUBMINOR_VERSION 3
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
+#define yy_create_buffer yy_create_buffer
+
+#define yy_delete_buffer yy_delete_buffer
+
+#define yy_scan_buffer yy_scan_buffer
+
+#define yy_scan_string yy_scan_string
+
+#define yy_scan_bytes yy_scan_bytes
+
+#define yy_init_buffer yy_init_buffer
+
+#define yy_flush_buffer yy_flush_buffer
+
+#define yy_load_buffer_state yy_load_buffer_state
+
+#define yy_switch_to_buffer yy_switch_to_buffer
+
+#define yypush_buffer_state yypush_buffer_state
+
+#define yypop_buffer_state yypop_buffer_state
+
+#define yyensure_buffer_stack yyensure_buffer_stack
+
+#define yylex yylex
+
+#define yyrestart yyrestart
+
+#define yylex_init yylex_init
+
+#define yylex_init_extra yylex_init_extra
+
+#define yylex_destroy yylex_destroy
+
+#define yyget_debug yyget_debug
+
+#define yyset_debug yyset_debug
+
+#define yyget_extra yyget_extra
+
+#define yyset_extra yyset_extra
+
+#define yyget_in yyget_in
+
+#define yyset_in yyset_in
+
+#define yyget_out yyget_out
+
+#define yyset_out yyset_out
+
+#define yyget_leng yyget_leng
+
+#define yyget_text yyget_text
+
+#define yyget_lineno yyget_lineno
+
+#define yyset_lineno yyset_lineno
+
+#define yywrap yywrap
+
+#define yyalloc yyalloc
+
+#define yyrealloc yyrealloc
+
+#define yyfree yyfree
+
+#define yytext yytext
+
+#define yyleng yyleng
+
+#define yyin yyin
+
+#define yyout yyout
+
+#define yy_flex_debug yy_flex_debug
+
+#define yylineno yylineno
+
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
@@ -26,7 +104,7 @@
/* end standard C headers. */
-/* $NetBSD: initscan.c,v 1.3 2017/01/02 17:45:27 christos Exp $ */
+/* $NetBSD: initscan.c,v 1.4 2017/01/02 18:33:22 christos Exp $ */
/* flex integer type definitions */
@@ -92,56 +170,38 @@ typedef unsigned int flex_uint32_t;
#endif /* ! FLEXINT_H */
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
#define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
#else
-#define yyconst
+#define yynoreturn
#endif
/* Returned upon end-of-file. */
#define YY_NULL 0
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index. If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Prom
CVS commit: src/external/bsd/flex/include
Module Name:src Committed By: christos Date: Mon Jan 2 18:15:55 UTC 2017 Modified Files: src/external/bsd/flex/include: config.h Log Message: avoid m4 redefinition To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/flex/include/config.h 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/flex/include/config.h diff -u src/external/bsd/flex/include/config.h:1.7 src/external/bsd/flex/include/config.h:1.8 --- src/external/bsd/flex/include/config.h:1.7 Mon Jan 2 12:45:32 2017 +++ src/external/bsd/flex/include/config.h Mon Jan 2 13:15:55 2017 @@ -155,7 +155,9 @@ #undef LT_OBJDIR /* Define to the m4 executable name. */ -#define M4 "/usr/bin/gm4" +#ifndef M4 +#define M4 "/usr/bin/m4" +#endif /* Name of package */ #define PACKAGE "flex"
CVS commit: src/doc
Module Name:src Committed By: christos Date: Mon Jan 2 17:46:39 UTC 2017 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new flex To generate a diff of this commit: cvs rdiff -u -r1.1388 -r1.1389 src/doc/3RDPARTY cvs rdiff -u -r1.2230 -r1.2231 src/doc/CHANGES 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.1388 src/doc/3RDPARTY:1.1389 --- src/doc/3RDPARTY:1.1388 Fri Dec 30 14:45:21 2016 +++ src/doc/3RDPARTY Mon Jan 2 12:46:39 2017 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1388 2016/12/30 19:45:21 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1389 2017/01/02 17:46:39 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -425,11 +425,11 @@ Notes: use file2netbsd Package: flex -Version: 2.6.0 -Current Vers: 2.6.2 +Version: 2.6.3 +Current Vers: 2.6.3 Maintainer: Will Estes -Archive Site: http://flex.sourceforge.net/ -Home Page: http://flex.sourceforge.net/ +Archive Site: https://github.com/westes/flex/releases +Home Page: https://github.com/westes/flex Mailing List: http://lists.sourceforge.net/mailman/listinfo/flex-announce Responsible: License: BSD-like Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2230 src/doc/CHANGES:1.2231 --- src/doc/CHANGES:1.2230 Fri Dec 30 14:45:21 2016 +++ src/doc/CHANGES Mon Jan 2 12:46:39 2017 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2230 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2231 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -440,3 +440,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: OpenSSH: Imported 7.4. [christos 20161224] dreamcast: Add preliminary "G1-ATA" IDE HDD support. [tsutsui 20161229] resolvconf(8): Import openresolv-3.9.0 [roy 20161230] + flex(1): Import flex-2.6.3 [christos 20170102]
CVS commit: [nick-nhusb] src/sys
Module Name:src
Committed By: skrll
Date: Mon Jan 2 16:55:50 UTC 2017
Modified Files:
src/sys/arch/arm/nvidia [nick-nhusb]: tegra_xusb.c
src/sys/dev/pci [nick-nhusb]: xhci_pci.c
src/sys/dev/usb [nick-nhusb]: usb.h xhci.c xhcireg.h xhcivar.h
Log Message:
Parse the extended capabilies to and log each controller port to SS/HS
bus root hub ports.
Create/attach the two buses and adapt the xhci_roothub_ctrl to deal with
both buses and sets of roothub ports.
XXX the roothub ub_devices entry needs work to interact with usbdevs(1)
XXX correctly
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/nvidia/tegra_xusb.c
cvs rdiff -u -r1.4.2.7 -r1.4.2.8 src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.111.2.10 -r1.111.2.11 src/sys/dev/usb/usb.h
cvs rdiff -u -r1.28.2.82 -r1.28.2.83 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.2.2.9 -r1.2.2.10 src/sys/dev/usb/xhcireg.h
cvs rdiff -u -r1.4.12.11 -r1.4.12.12 src/sys/dev/usb/xhcivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_xusb.c
diff -u src/sys/arch/arm/nvidia/tegra_xusb.c:1.1.2.2 src/sys/arch/arm/nvidia/tegra_xusb.c:1.1.2.3
--- src/sys/arch/arm/nvidia/tegra_xusb.c:1.1.2.2 Wed Oct 5 20:55:25 2016
+++ src/sys/arch/arm/nvidia/tegra_xusb.c Mon Jan 2 16:55:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_xusb.c,v 1.1.2.2 2016/10/05 20:55:25 skrll Exp $ */
+/* $NetBSD: tegra_xusb.c,v 1.1.2.3 2017/01/02 16:55:50 skrll Exp $ */
/*
* Copyright (c) 2016 Jonathan A. Kollasch
@@ -30,7 +30,7 @@
#include "opt_tegra.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.1.2.2 2016/10/05 20:55:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.1.2.3 2017/01/02 16:55:50 skrll Exp $");
#include
#include
@@ -349,6 +349,8 @@ tegra_xusb_mountroot(device_t self)
sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
+ sc->sc_child2 = config_found(self, &sc->sc_bus2, usbctlprint);
+
error = xusb_mailbox_send(psc, 0x0100);
if (error) {
aprint_error_dev(self, "send failed, error=%d\n", error);
Index: src/sys/dev/pci/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.4.2.7 src/sys/dev/pci/xhci_pci.c:1.4.2.8
--- src/sys/dev/pci/xhci_pci.c:1.4.2.7 Mon Dec 5 10:55:16 2016
+++ src/sys/dev/pci/xhci_pci.c Mon Jan 2 16:55:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_pci.c,v 1.4.2.7 2016/12/05 10:55:16 skrll Exp $ */
+/* $NetBSD: xhci_pci.c,v 1.4.2.8 2017/01/02 16:55:50 skrll Exp $ */
/* OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.4.2.7 2016/12/05 10:55:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.4.2.8 2017/01/02 16:55:50 skrll Exp $");
#include
#include
@@ -126,7 +126,6 @@ xhci_pci_attach(device_t parent, device_
char intrbuf[PCI_INTRSTR_LEN];
sc->sc_dev = self;
- sc->sc_bus.ub_hcpriv = sc;
pci_aprint_devinfo(pa, "USB Controller");
@@ -219,8 +218,11 @@ xhci_pci_attach(device_t parent, device_
xhci_shutdown))
aprint_error_dev(self, "couldn't establish power handler\n");
- /* Attach usb device. */
+ /* Attach usb buses. */
sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
+
+ sc->sc_child2 = config_found(self, &sc->sc_bus2, usbctlprint);
+
return;
fail:
Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.111.2.10 src/sys/dev/usb/usb.h:1.111.2.11
--- src/sys/dev/usb/usb.h:1.111.2.10 Wed Oct 5 20:55:57 2016
+++ src/sys/dev/usb/usb.h Mon Jan 2 16:55:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.111.2.10 2016/10/05 20:55:57 skrll Exp $ */
+/* $NetBSD: usb.h,v 1.111.2.11 2017/01/02 16:55:50 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -53,9 +53,9 @@
#define USB_STACK_VERSION 2
-#define USB_MAX_DEVICES 128
-#define USB_MIN_DEVICES 2 /* unused + root HUB */
-#define USB_START_ADDR 0
+#define USB_MAX_DEVICES (128 + 1) /* 0, root, and 1->127 */
+#define USB_MIN_DEVICES 2 /* unused + root HUB */
+#define USB_START_ADDR 0
#define USB_CONTROL_ENDPOINT 0
#define USB_MAX_ENDPOINTS 16
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.82 src/sys/dev/usb/xhci.c:1.28.2.83
--- src/sys/dev/usb/xhci.c:1.28.2.82 Mon Jan 2 16:54:15 2017
+++ src/sys/dev/usb/xhci.c Mon Jan 2 16:55:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.82 2017/01/02 16:54:15 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.83 2017/01/02 16:55:50 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.82 2017/01/02 16:54:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.83 2017/01/02 16:55:50 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -531,6 +531,36 @@ xhci_get_epstate(struct xhci_softc * con
return XHCI_EPCTX_0_
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Jan 2 16:54:15 UTC 2017
Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c
Log Message:
Use %s for __func__... oops
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.81 -r1.28.2.82 src/sys/dev/usb/xhci.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/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.81 src/sys/dev/usb/xhci.c:1.28.2.82
--- src/sys/dev/usb/xhci.c:1.28.2.81 Mon Jan 2 16:45:30 2017
+++ src/sys/dev/usb/xhci.c Mon Jan 2 16:54:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.81 2017/01/02 16:45:30 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.82 2017/01/02 16:54:15 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.81 2017/01/02 16:45:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.82 2017/01/02 16:54:15 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2996,7 +2996,7 @@ xhci_setup_route(struct usbd_pipe *pipe,
goto found;
}
}
- panic("%d: cannot find HS port", __func__);
+ panic("%s: cannot find HS port", __func__);
found:
DPRINTFN(4, "high speed port %d", p, 0, 0, 0);
} else {
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Jan 2 16:45:30 UTC 2017
Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c
Log Message:
Use __func__ in panic message
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.80 -r1.28.2.81 src/sys/dev/usb/xhci.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/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.80 src/sys/dev/usb/xhci.c:1.28.2.81
--- src/sys/dev/usb/xhci.c:1.28.2.80 Mon Jan 2 16:34:40 2017
+++ src/sys/dev/usb/xhci.c Mon Jan 2 16:45:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.80 2017/01/02 16:34:40 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.81 2017/01/02 16:45:30 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.80 2017/01/02 16:34:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.81 2017/01/02 16:45:30 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2996,7 +2996,7 @@ xhci_setup_route(struct usbd_pipe *pipe,
goto found;
}
}
- panic("xhci_setup_route: cannot find HS port");
+ panic("%d: cannot find HS port", __func__);
found:
DPRINTFN(4, "high speed port %d", p, 0, 0, 0);
} else {
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Jan 2 16:34:40 UTC 2017
Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c
Log Message:
Actually print the bus root hub device in debug output
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.79 -r1.28.2.80 src/sys/dev/usb/xhci.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/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.79 src/sys/dev/usb/xhci.c:1.28.2.80
--- src/sys/dev/usb/xhci.c:1.28.2.79 Mon Jan 2 16:32:23 2017
+++ src/sys/dev/usb/xhci.c Mon Jan 2 16:34:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.79 2017/01/02 16:32:23 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.80 2017/01/02 16:34:40 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.79 2017/01/02 16:32:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.80 2017/01/02 16:34:40 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2299,7 +2299,7 @@ xhci_new_device(device_t parent, struct
if (depth == 0 && port == 0) {
usbd_attach_roothub(parent, dev);
- DPRINTFN(1, "root_hub %p", bus->ub_roothub, 0, 0, 0);
+ DPRINTFN(1, "root hub %p", dev, 0, 0, 0);
return USBD_NORMAL_COMPLETION;
}
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Jan 2 16:39:37 UTC 2017 Modified Files: src/sys/dev/usb [nick-nhusb]: xhcireg.h Log Message: Use lower case for hex constants. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.2.2.8 -r1.2.2.9 src/sys/dev/usb/xhcireg.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/xhcireg.h diff -u src/sys/dev/usb/xhcireg.h:1.2.2.8 src/sys/dev/usb/xhcireg.h:1.2.2.9 --- src/sys/dev/usb/xhcireg.h:1.2.2.8 Wed Oct 5 20:55:59 2016 +++ src/sys/dev/usb/xhcireg.h Mon Jan 2 16:39:36 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: xhcireg.h,v 1.2.2.8 2016/10/05 20:55:59 skrll Exp $ */ +/* $NetBSD: xhcireg.h,v 1.2.2.9 2017/01/02 16:39:36 skrll Exp $ */ /*- * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. @@ -38,10 +38,10 @@ #define PCI_XHCI_FLADJ 0x61 /* RW frame length adjust */ -#define PCI_XHCI_INTEL_XUSB2PR 0xD0/* Intel USB2 Port Routing */ -#define PCI_XHCI_INTEL_USB2PRM 0xD4/* Intel USB2 Port Routing Mask */ -#define PCI_XHCI_INTEL_USB3_PSSEN 0xD8 /* Intel USB3 Port SuperSpeed Enable */ -#define PCI_XHCI_INTEL_USB3PRM 0xDC/* Intel USB3 Port Routing Mask */ +#define PCI_XHCI_INTEL_XUSB2PR 0xd0/* Intel USB2 Port Routing */ +#define PCI_XHCI_INTEL_USB2PRM 0xd4/* Intel USB2 Port Routing Mask */ +#define PCI_XHCI_INTEL_USB3_PSSEN 0xd8 /* Intel USB3 Port SuperSpeed Enable */ +#define PCI_XHCI_INTEL_USB3PRM 0xdc/* Intel USB3 Port Routing Mask */ /* XHCI capability registers */ #define XHCI_CAPLENGTH 0x00 /* RO capability */ @@ -66,7 +66,7 @@ (__SHIFTOUT((x), XHCI_HCS2_SPBUFHI) << 5) | \ (__SHIFTOUT((x), XHCI_HCS2_SPBUFLO)) -#define XHCI_HCSPARAMS3 0x0C /* RO structual parameters 3 */ +#define XHCI_HCSPARAMS3 0x0c /* RO structual parameters 3 */ #define XHCI_HCS3_U1_DEL(x) ((x) & 0xFF) #define XHCI_HCS3_U2_DEL(x) (((x) >> 16) & 0x) @@ -132,14 +132,14 @@ #define XHCI_CRCR_LO_CRR 0x0008 /* RW - command ring running */ #define XHCI_CRCR_LO_MASK 0x000F -#define XHCI_CRCR_HI 0x1C /* XHCI command ring control */ +#define XHCI_CRCR_HI 0x1c /* XHCI command ring control */ #define XHCI_DCBAAP 0x30 /* XHCI dev context BA pointer */ #define XHCI_DCBAAP_HI 0x34 /* XHCI dev context BA pointer */ #define XHCI_CONFIG 0x38 #define XHCI_CONFIG_SLOTS_MASK 0x00FF /* RW - number of device slots enabled */ /* XHCI port status registers */ -#define XHCI_PORTSC(n) (0x3F0 + (0x10 * (n))) /* XHCI port status */ +#define XHCI_PORTSC(n) (0x3f0 + (0x10 * (n))) /* XHCI port status */ #define XHCI_PS_CCS 0x0001 /* RO - current connect status */ #define XHCI_PS_PED 0x0002 /* RW - port enabled / disabled */ #define XHCI_PS_OCA 0x0008 /* RO - over current active */ @@ -170,7 +170,7 @@ #define XHCI_PS_WPR 0x8000U /* RW - warm port reset */ #define XHCI_PS_CLEAR 0x80FF01FFU /* command bits */ -#define XHCI_PORTPMSC(n) (0x3F4 + (0x10 * (n))) /* XHCI status and control */ +#define XHCI_PORTPMSC(n) (0x3f4 + (0x10 * (n))) /* XHCI status and control */ #define XHCI_PM3_U1TO_GET(x) (((x) >> 0) & 0xFF) /* RW - U1 timeout */ #define XHCI_PM3_U1TO_SET(x) (((x) & 0xFF) << 0) /* RW - U1 timeout */ #define XHCI_PM3_U2TO_GET(x) (((x) >> 8) & 0xFF) /* RW - U2 timeout */ @@ -184,10 +184,10 @@ #define XHCI_PM2_L1SLOT_SET(x) (((x) & 0xFF) << 8) /* RW - L1 device slot */ #define XHCI_PM2_HLE 0x0001 /* RW - hardware LPM enable */ -#define XHCI_PORTLI(n) (0x3F8 + (0x10 * (n))) /* XHCI port link info */ +#define XHCI_PORTLI(n) (0x3f8 + (0x10 * (n))) /* XHCI port link info */ #define XHCI_PLI3_ERR_GET(x) (((x) >> 0) & 0x) /* RO - port link errors */ -#define XHCI_PORTRSV(n) (0x3FC + (0x10 * (n))) /* XHCI port reserved */ +#define XHCI_PORTRSV(n) (0x3fc + (0x10 * (n))) /* XHCI port reserved */ /* XHCI runtime registers. Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */ #define XHCI_MFINDEX 0x /* RO - microframe index */
CVS commit: src/sys/compat/linux
Module Name:src
Committed By: manu
Date: Mon Jan 2 16:32:10 UTC 2017
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/i386: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
src/sys/compat/linux/common: linux_misc.c linux_signal.h
Log Message:
Add pselect6 Linux system call.
This lets Matlab R2016A run on NetBSD/amd64
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.57 -r1.58 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.64 -r1.65 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.121 -r1.122 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.90 -r1.91 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.60 -r1.61 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.233 -r1.234 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/linux/common/linux_signal.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/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.91 src/sys/compat/linux/arch/alpha/syscalls.master:1.92
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.91 Sun Jul 24 13:22:01 2016
+++ src/sys/compat/linux/arch/alpha/syscalls.master Mon Jan 2 16:32:09 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.91 2016/07/24 13:22:01 njoly Exp $
+ $NetBSD: syscalls.master,v 1.92 2017/01/02 16:32:09 manu Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -731,7 +731,10 @@
linux_umode_t mode); }
462 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
-463 UNIMPL pselect6
+463 STD { int|linux_sys||pselect6(int nfds, fd_set *readfds, \
+ fd_set *writefds, fd_set *exceptfds, \
+ struct linux_timespec *timeout, \
+ linux_sized_sigset_t *ss); }
464 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.57 src/sys/compat/linux/arch/amd64/syscalls.master:1.58
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.57 Sun Jul 24 13:22:01 2016
+++ src/sys/compat/linux/arch/amd64/syscalls.master Mon Jan 2 16:32:09 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.57 2016/07/24 13:22:01 njoly Exp $
+ $NetBSD: syscalls.master,v 1.58 2017/01/02 16:32:09 manu Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -489,7 +489,10 @@
linux_umode_t mode); }
269 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
-270 UNIMPL pselect6
+270 STD { int|linux_sys||pselect6(int nfds, fd_set *readfds, \
+ fd_set *writefds, fd_set *exceptfds, \
+ struct linux_timespec *timeout, \
+ linux_sized_sigset_t *ss); }
271 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.64 src/sys/compat/linux/arch/arm/syscalls.master:1.65
--- src/sys/compat/linux/arch/arm/syscalls.master:1.64 Sun Jul 24 13:22:01 2016
+++ src/sys/compat/linux/arch/arm/syscalls.master Mon Jan 2 16:32:09 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.64 2016/07/24 13:22:01 njoly Exp $
+ $NetBSD: syscalls.master,v 1.65 2017/01/02 16:32:09 manu Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -530,7 +530,10 @@
linux_umode_t mode); }
334 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
-335 UNIMPL pselect6
+335 STD { int|linux_sys||pselect6(int nfds, fd_set *readfds, \
+ fd_set *writefds, fd_set *exceptfds, \
+ struct linux_timespec *timeout, \
+ linux_sized_sigset_t *ss); }
336 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.121 src/sys/compat/linux/arch/i386/syscalls.master:1.122
--- src/sys/compat/linux/arch/i386/syscalls.master:1.121 Sun Jul 24 13:22:01 2016
+++ src/sys/compat/linux/arch/i386/syscalls.master Mon Jan 2 16:32:09 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.121 2016/07/24 13:22:01 njoly Exp $
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Jan 2 16:32:23 UTC 2017
Modified Files:
src/sys/dev/usb [nick-nhusb]: xhci.c
Log Message:
Remove unnecessary brackets
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.78 -r1.28.2.79 src/sys/dev/usb/xhci.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/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.78 src/sys/dev/usb/xhci.c:1.28.2.79
--- src/sys/dev/usb/xhci.c:1.28.2.78 Thu Dec 29 09:52:00 2016
+++ src/sys/dev/usb/xhci.c Mon Jan 2 16:32:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.78 2016/12/29 09:52:00 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.79 2017/01/02 16:32:23 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.78 2016/12/29 09:52:00 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.79 2017/01/02 16:32:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2184,7 +2184,7 @@ xhci_new_device(device_t parent, struct
dd = &dev->ud_ddesc;
- if ((depth == 0) && (port == 0)) {
+ if (depth == 0 && port == 0) {
KASSERT(bus->ub_devices[dev->ud_addr] == NULL);
bus->ub_devices[dev->ud_addr] = dev;
err = usbd_get_initial_ddesc(dev, dd);
@@ -2297,7 +2297,7 @@ xhci_new_device(device_t parent, struct
usbd_add_dev_event(USB_EVENT_DEVICE_ATTACH, dev);
- if ((depth == 0) && (port == 0)) {
+ if (depth == 0 && port == 0) {
usbd_attach_roothub(parent, dev);
DPRINTFN(1, "root_hub %p", bus->ub_roothub, 0, 0, 0);
return USBD_NORMAL_COMPLETION;
CVS import: src/external/bsd/flex/dist
Module Name:src Committed By: christos Date: Mon Jan 2 16:26:36 UTC 2017 Update of /cvsroot/src/external/bsd/flex/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23495 Log Message: 2016-12-30 Will Estes * NEWS: doc: update NEWS for 2.6.3 release 2016-11-26 Explorer09 * configure.ac, src/Makefile.am: build: New configure option '--disable-bootstrap'. If configure is run with '--disable-bootstrap', then stage1flex won't be built and stage1scan.c will be generated by sed'ing scan.c. This option is intended to workaround bootstrap bugs rather than to fix the bootstrapping issues which are proving subtler and harder to fix than anyone would like. 2016-11-26 Explorer09 * src/Makefile.am: build: "make clean" deletes stage1scan.c, stage1flex 2016-11-26 Explorer09 * configure.ac, src/Makefile.am: build: allow building libfl even with --disable-libfl. For various reasons, we may wish to build libfl explicitly even when configure has been run with the --disable-libfl option. This is possible, now, via 'make -C src libfl.la'. 2016-12-19 Alexis La Goutte * src/flex.skl: scanner: remove trailing whitespace in skeleton 2016-12-01 Demi Obenour * src/buf.c, src/main.c, src/parse.y: scanner: Disallow, overquote '[' and ']' in prefix 2016-12-29 Samuel Thibault * src/main.c: scanner: allocate correct buffer size for m4 path. Flex did not check the length of the m4 path which could lead to a buffer overflow in some cases. Additionally, not all platforms believe in PATH_MAX, so stop relying on it. Fixes #138 2016-11-24 Will Estes * NEWS: doc: note no more libcompat in NEWS 2016-11-24 Will Estes * lib/Makefile.am: build: explain empty lib/Makefile.am 2016-11-20 Explorer09 * configure.ac: build: warn about cross compiling with *alloc 2016-11-19 Explorer09 * configure.ac, lib/Makefile.am, lib/lib.c, src/Makefile.am: build: Link $(LIBOBJS) from src/ dir, remove libcompat.la. The libcompat.la library was small and less friendly to bootstrapping and cross compilation. Now, we will simply link individual object files as needed, which is simpler. 2016-11-16 Explorer09 * src/Makefile.am: build: Let stage1flex respect LFLAGS 2016-11-14 Will Estes * NEWS: doc: describe --disable-libfl in NEWS 2016-10-31 Explorer09 * configure.ac, src/Makefile.am: build: Add --disable-libfl configure option. Disabling libfl is useful when building flex for a cross-toolchain. Fixes: GH-99 2016-11-09 Demi Obenour * src/flex.skl, tests/array_r.l: fix backwards incompatible changes in 2.6.2. This patch addscompatibility `#defines` for all macros affected by `%prefix`. Fixes #113. 2016-11-08 Will Estes * tests/.gitignore: git: ignore quote_in_comment artifacts 2016-11-08 Demi Obenour * src/scan.l, tests/Makefile.am, tests/quote_in_comment.l, tests/quote_in_comment.txt: Fixes a major bug in Flex's own lexing of literals. My changes caused Flex to mishandle string and character literals in line comments. This commit fixes them. Fixes #113. 2016-11-06 Thomas Klausner * configure.ac: Fix unportable test(1) operator. "==" is only supported by bash, "=" is the standard comparison operator. 2016-11-02 Demi Obenour * tests/quotes.l: Add more escaping tests 2016-11-01 Demi Obenour * src/scan.l: Fix another escaping bug in non-indented verbatim section 2 code. I also did some reformatting. 2016-10-28 Alastair Hughes * configure.ac: build: fix false negatives for help2man and texi2dvi HELP2MAN and TEXI2DVI (or the corresponding ac_prog variables) will never be zero length as they fall back to the missing script; check for the fall back and warn on that instead of always warning. 2016-10-28 Explorer09 * doc/Makefile.am: doc: Don't delete flex.1 during "make distclean". flex.1 is pre-generated in release tarball. If we delete it, the next "configure and make" on the source directory will then require help2man unnecessarily. 2016-10-27 Alastair Hughes * NEWS, doc/Makefile.am: Only regenerate the man page when required. Make the flex binary an order-only prerequisite, and add back the prerequisites from before 7cfb440. This prevents rebuilding the man page whenever the flex binary is rebuilt, which causes problems if help2man is not installed and will never work when cross compiling. Fixes #108. 2016-10-26 Will Estes * NEWS, src/Makefile.am: build: no longer build PIC version of libfl. The PIC version of libfl was not being built correctly. From the lack of bug reports around this problem, we conclude tha
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Mon Jan 2 15:41:09 UTC 2017 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add mixerctl tests To generate a diff of this commit: cvs rdiff -u -r1.710 -r1.711 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.710 src/distrib/sets/lists/tests/mi:1.711 --- src/distrib/sets/lists/tests/mi:1.710 Mon Dec 19 12:38:38 2016 +++ src/distrib/sets/lists/tests/mi Mon Jan 2 10:41:09 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.710 2016/12/19 17:38:38 maya Exp $ +# $NetBSD: mi,v 1.711 2017/01/02 15:41:09 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3788,6 +3788,8 @@ ./usr/tests/usr.bin/make/unit-tests/varmisc.mk tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varshell.exp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/make/unit-tests/varshell.mk tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/mixerctl tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/mixerctl/t_mixerctl tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/mkdep tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/mkdep/Atffile tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/mkdep/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
CVS commit: src/tests/usr.bin
Module Name:src
Committed By: christos
Date: Mon Jan 2 15:40:09 UTC 2017
Modified Files:
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/mixerctl: Makefile t_mixerctl.sh
Log Message:
mixerctl tests from Charlotte Koch
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/mixerctl/Makefile \
src/tests/usr.bin/mixerctl/t_mixerctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.22 src/tests/usr.bin/Makefile:1.23
--- src/tests/usr.bin/Makefile:1.22 Sat Oct 22 10:13:39 2016
+++ src/tests/usr.bin/Makefile Mon Jan 2 10:40:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/10/22 14:13:39 abhinav Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/02 15:40:09 christos Exp $
#
.include
@@ -7,7 +7,7 @@ TESTSDIR= ${TESTSBASE}/usr.bin
TESTS_SUBDIRS= awk basename bzip2 cc cmp config cut \
diff dirname find gdb grep gzip id \
- infocmp jot ld m4 make mkdep \
+ infocmp jot ld m4 make mixerctl mkdep \
nbperf netpgpverify pr rump_server shmif_dumpbus sdiff \
sed sort tmux tr unifdef uniq vmstat xlint
Added files:
Index: src/tests/usr.bin/mixerctl/Makefile
diff -u /dev/null src/tests/usr.bin/mixerctl/Makefile:1.1
--- /dev/null Mon Jan 2 10:40:09 2017
+++ src/tests/usr.bin/mixerctl/Makefile Mon Jan 2 10:40:09 2017
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2017/01/02 15:40:09 christos Exp $
+
+.include
+
+TESTSDIR= ${TESTSBASE}/usr.bin/mixerctl
+TESTS_SH= t_mixerctl
+
+.include
Index: src/tests/usr.bin/mixerctl/t_mixerctl.sh
diff -u /dev/null src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.1
--- /dev/null Mon Jan 2 10:40:09 2017
+++ src/tests/usr.bin/mixerctl/t_mixerctl.sh Mon Jan 2 10:40:09 2017
@@ -0,0 +1,51 @@
+# $NetBSD: t_mixerctl.sh,v 1.1 2017/01/02 15:40:09 christos Exp $
+
+atf_test_case noargs_usage
+noargs_usage_head() {
+ atf_set "descr" "Ensure mixerctl(1) with no args prints a usage message"
+}
+noargs_usage_body() {
+ atf_check -s exit:0 -o not-empty -e ignore \
+ mixerctl
+}
+
+atf_test_case showvalue
+showvalue_head() {
+ atf_set "descr" "Ensure mixerctl(1) can print the value for all variables"
+}
+showvalue_body() {
+ for var in $(mixerctl -a | awk -F= '{print $1}'); do
+ atf_check -s exit:0 -e ignore -o match:"^${var}=" \
+ mixerctl ${var}
+ done
+}
+
+atf_test_case nflag
+nflag_head() {
+ atf_set "descr" "Ensure 'mixerctl -n' actually suppresses some output"
+}
+nflag_body() {
+ varname="$(mixerctl -a | head -1 | awk -F= '{print $1}')"
+
+ atf_check -s exit:0 -o match:"${varname}" -e ignore \
+ mixerctl ${varname}
+
+ atf_check -s exit:0 -o not-match:"${varname}" -e ignore \
+ mixerctl -n ${varname}
+}
+
+atf_test_case nonexistant_device
+nonexistant_device_head() {
+ atf_set "descr" "Ensure mixerctl(1) complains if provided a nonexistant mixer device"
+}
+nonexistant_device_body() {
+ atf_check -s not-exit:0 -o ignore -e match:"No such file" \
+ mixerctl -d /a/b/c/d/e
+}
+
+atf_init_test_cases() {
+ atf_add_test_case noargs_usage
+ atf_add_test_case showvalue
+ atf_add_test_case nflag
+ atf_add_test_case nonexistant_device
+}
CVS commit: src/sys/dev
Module Name:src
Committed By: alnsn
Date: Mon Jan 2 14:28:29 UTC 2017
Modified Files:
src/sys/dev: cgd_crypto.c cgd_crypto.h
Log Message:
Replace numeric block sizes with symbolic names,
No functional change. Requested by mrg a couple of months ago.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cgd_crypto.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/cgd_crypto.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/cgd_crypto.c
diff -u src/sys/dev/cgd_crypto.c:1.14 src/sys/dev/cgd_crypto.c:1.15
--- src/sys/dev/cgd_crypto.c:1.14 Sun Dec 11 00:20:49 2016
+++ src/sys/dev/cgd_crypto.c Mon Jan 2 14:28:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd_crypto.c,v 1.14 2016/12/11 00:20:49 alnsn Exp $ */
+/* $NetBSD: cgd_crypto.c,v 1.15 2017/01/02 14:28:29 alnsn Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.14 2016/12/11 00:20:49 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.15 2017/01/02 14:28:29 alnsn Exp $");
#include
#include
@@ -199,7 +199,7 @@ struct aes_privdata {
struct aes_encdata {
keyInstance *ae_key; /* key for this direction */
- u_int8_t ae_iv[16]; /* Initialization Vector */
+ u_int8_t ae_iv[CGD_AES_BLOCK_SIZE]; /* Initialization Vector */
};
static void *
@@ -244,8 +244,10 @@ cgd_cipher_aes_cbc_prep(void *privdata,
KASSERT(cipher_ok > 0);
rijndael_blockEncrypt(&cipher, &apd->ap_enckey,
blkno_buf, blocksize * 8, iv);
- if (blocksize > 16)
- (void)memmove(iv, iv + blocksize - 16, 16);
+ if (blocksize > CGD_AES_BLOCK_SIZE) {
+ (void)memmove(iv, iv + blocksize - CGD_AES_BLOCK_SIZE,
+ CGD_AES_BLOCK_SIZE);
+ }
}
static void
@@ -258,7 +260,8 @@ aes_cbc_enc_int(void *privdata, void *ds
cipher_ok = rijndael_cipherInit(&cipher, MODE_CBC, ae->ae_iv);
KASSERT(cipher_ok > 0);
rijndael_blockEncrypt(&cipher, ae->ae_key, src, len * 8, dst);
- (void)memcpy(ae->ae_iv, (u_int8_t *)dst + (len - 16), 16);
+ (void)memcpy(ae->ae_iv, (u_int8_t *)dst +
+ (len - CGD_AES_BLOCK_SIZE), CGD_AES_BLOCK_SIZE);
}
static void
@@ -271,7 +274,8 @@ aes_cbc_dec_int(void *privdata, void *ds
cipher_ok = rijndael_cipherInit(&cipher, MODE_CBC, ae->ae_iv);
KASSERT(cipher_ok > 0);
rijndael_blockDecrypt(&cipher, ae->ae_key, src, len * 8, dst);
- (void)memcpy(ae->ae_iv, (const u_int8_t *)src + (len - 16), 16);
+ (void)memcpy(ae->ae_iv, (const u_int8_t *)src +
+ (len - CGD_AES_BLOCK_SIZE), CGD_AES_BLOCK_SIZE);
}
static void
@@ -281,7 +285,7 @@ cgd_cipher_aes_cbc(void *privdata, struc
struct aes_privdata *apd = privdata;
struct aes_encdata encd;
- (void)memcpy(encd.ae_iv, iv, 16);
+ (void)memcpy(encd.ae_iv, iv, CGD_AES_BLOCK_SIZE);
switch (dir) {
case CGD_CIPHER_ENCRYPT:
encd.ae_key = &apd->ap_enckey;
@@ -358,7 +362,7 @@ aes_xts_enc_int(void *privdata, void *ds
cipher_ok = rijndael_cipherInit(&cipher, MODE_XTS, ae->ae_iv);
KASSERT(cipher_ok > 0);
rijndael_blockEncrypt(&cipher, ae->ae_key, src, len * 8, dst);
- (void)memcpy(ae->ae_iv, cipher.IV, 16);
+ (void)memcpy(ae->ae_iv, cipher.IV, CGD_AES_BLOCK_SIZE);
}
static void
@@ -371,7 +375,7 @@ aes_xts_dec_int(void *privdata, void *ds
cipher_ok = rijndael_cipherInit(&cipher, MODE_XTS, ae->ae_iv);
KASSERT(cipher_ok > 0);
rijndael_blockDecrypt(&cipher, ae->ae_key, src, len * 8, dst);
- (void)memcpy(ae->ae_iv, cipher.IV, 16);
+ (void)memcpy(ae->ae_iv, cipher.IV, CGD_AES_BLOCK_SIZE);
}
static void
@@ -381,7 +385,7 @@ cgd_cipher_aes_xts(void *privdata, struc
struct aes_privdata *apd = privdata;
struct aes_encdata encd;
- (void)memcpy(encd.ae_iv, iv, 16);
+ (void)memcpy(encd.ae_iv, iv, CGD_AES_BLOCK_SIZE);
switch (dir) {
case CGD_CIPHER_ENCRYPT:
encd.ae_key = &apd->ap_enckey;
@@ -410,7 +414,7 @@ struct c3des_encdata {
des_key_schedule *ce_key1;
des_key_schedule *ce_key2;
des_key_schedule *ce_key3;
- u_int8_t ce_iv[8];
+ u_int8_t ce_iv[CGD_3DES_BLOCK_SIZE];
};
static void *
@@ -455,13 +459,15 @@ cgd_cipher_3des_cbc_prep(void *privdata,
const char *blkno_buf, size_t blocksize, int dir)
{
struct c3des_privdata *cp = privdata;
- char zero_iv[8];
+ char zero_iv[CGD_3DES_BLOCK_SIZE];
memset(zero_iv, 0, sizeof(zero_iv));
des_ede3_cbc_encrypt(blkno_buf, iv, blocksize,
cp->cp_key1, cp->cp_key2, cp->cp_key3, (des_cblock *)zero_iv, 1);
- if (blocksize > 8)
- (void)memmove(iv, iv + blocksize - 8, 8);
+ if (blocksize > CGD_3DES_BLOCK_SIZE) {
+ (void)memmove(iv, iv + blocksize - CGD_3DES_BLOCK_SIZE,
+ CGD_3DES_BLOCK_SIZE);
+ }
}
static void
@@ -471,7 +477,8 @@ c3des_cbc_enc_int(void *privdata, void *
des_ede3_cbc_encrypt(src, dst, len, *ce->ce_key1, *ce->ce_key2,
*ce->ce_key3, (des_cblock *)ce->ce_iv, 1);
- (void)memcpy(ce->ce_iv, (const u_int8_t *)dst + (len - 8), 8);
+ (void)memcpy(ce->ce_iv, (const u_
CVS commit: src
Module Name:src Committed By: roy Date: Mon Jan 2 12:38:16 UTC 2017 Modified Files: src/distrib/sets/lists/base: shl.mi src/lib/libcurses: fileio.h shlib_version Log Message: Bump libcurses to 7.1 for prior additions. To generate a diff of this commit: cvs rdiff -u -r1.795 -r1.796 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.3 -r1.4 src/lib/libcurses/fileio.h cvs rdiff -u -r1.41 -r1.42 src/lib/libcurses/shlib_version 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/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.795 src/distrib/sets/lists/base/shl.mi:1.796 --- src/distrib/sets/lists/base/shl.mi:1.795 Sun Dec 25 00:09:20 2016 +++ src/distrib/sets/lists/base/shl.mi Mon Jan 2 12:38:16 2017 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.795 2016/12/25 00:09:20 christos Exp $ +# $NetBSD: shl.mi,v 1.796 2017/01/02 12:38:16 roy Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -237,7 +237,7 @@ ./usr/lib/libctf.so.3.0base-sys-shlib compatfile,ctf ./usr/lib/libcurses.sobase-sys-shlib compatfile ./usr/lib/libcurses.so.7 base-sys-shlib compatfile -./usr/lib/libcurses.so.7.0 base-sys-shlib compatfile +./usr/lib/libcurses.so.7.1 base-sys-shlib compatfile ./usr/lib/libdes.sobase-crypto-shlib compatfile,crypto ./usr/lib/libdes.so.12base-crypto-shlib compatfile,crypto ./usr/lib/libdes.so.12.0base-crypto-shlib compatfile,crypto Index: src/lib/libcurses/fileio.h diff -u src/lib/libcurses/fileio.h:1.3 src/lib/libcurses/fileio.h:1.4 --- src/lib/libcurses/fileio.h:1.3 Sat Oct 22 21:55:06 2016 +++ src/lib/libcurses/fileio.h Mon Jan 2 12:38:16 2017 @@ -5,4 +5,4 @@ */ #define CURSES_LIB_MAJOR 7 -#define CURSES_LIB_MINOR 0 +#define CURSES_LIB_MINOR 1 Index: src/lib/libcurses/shlib_version diff -u src/lib/libcurses/shlib_version:1.41 src/lib/libcurses/shlib_version:1.42 --- src/lib/libcurses/shlib_version:1.41 Sun Nov 22 04:56:00 2015 +++ src/lib/libcurses/shlib_version Mon Jan 2 12:38:16 2017 @@ -1,8 +1,8 @@ -# $NetBSD: shlib_version,v 1.41 2015/11/22 04:56:00 kamil Exp $ +# $NetBSD: shlib_version,v 1.42 2017/01/02 12:38:16 roy Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # Remember to run `make fileio.h` when changing # Remember to increment the major numbers of libform, libmenu and # libpanel when the libcurses major number increments. # major=7 -minor=0 +minor=1
CVS commit: src/sys/kern
Module Name:src Committed By: hannken Date: Mon Jan 2 10:36:58 UTC 2017 Modified Files: src/sys/kern: vfs_vnode.c Log Message: Now that v_usecount tracks valid references add some "v_usecount == 1" assertions. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/kern/vfs_vnode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/vfs_vnode.c diff -u src/sys/kern/vfs_vnode.c:1.67 src/sys/kern/vfs_vnode.c:1.68 --- src/sys/kern/vfs_vnode.c:1.67 Mon Jan 2 10:35:00 2017 +++ src/sys/kern/vfs_vnode.c Mon Jan 2 10:36:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_vnode.c,v 1.67 2017/01/02 10:35:00 hannken Exp $ */ +/* $NetBSD: vfs_vnode.c,v 1.68 2017/01/02 10:36:58 hannken Exp $ */ /*- * Copyright (c) 1997-2011 The NetBSD Foundation, Inc. @@ -156,7 +156,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.67 2017/01/02 10:35:00 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.68 2017/01/02 10:36:58 hannken Exp $"); #include #include @@ -304,6 +304,10 @@ vstate_assert_change(vnode_t *vp, enum v if (node->vi_state != from) vnpanic(vp, "from is %s, expected %s at %s:%d\n", vstate_name(node->vi_state), vstate_name(from), func, line); + if ((from == VS_BLOCKED || to == VS_BLOCKED) && vp->v_usecount != 1) + vnpanic(vp, "%s to %s with usecount %d at %s:%d", + vstate_name(from), vstate_name(to), vp->v_usecount, + func, line); node->vi_state = to; if (from == VS_LOADING) @@ -877,6 +881,7 @@ vrecycle(vnode_t *vp) mutex_enter(vp->v_interlock); VSTATE_CHANGE(vp, VS_BLOCKED, VS_ACTIVE); + KASSERT(vp->v_usecount == 1); vcache_reclaim(vp); vrelel(vp, 0);
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Mon Jan 2 10:35:00 UTC 2017
Modified Files:
src/sys/kern: vfs_vnode.c
Log Message:
Change vcache_*vget() to increment v_usecount on success only.
Increment v_holdcnt to prevent the vnode from disappearing while
vcache_vget() waits for a stable state.
Now v_usecount tracks the number of successfull references.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/vfs_vnode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.66 src/sys/kern/vfs_vnode.c:1.67
--- src/sys/kern/vfs_vnode.c:1.66 Mon Jan 2 10:33:28 2017
+++ src/sys/kern/vfs_vnode.c Mon Jan 2 10:35:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.66 2017/01/02 10:33:28 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.67 2017/01/02 10:35:00 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.66 2017/01/02 10:33:28 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.67 2017/01/02 10:35:00 hannken Exp $");
#include
#include
@@ -755,18 +755,11 @@ vrelel(vnode_t *vp, int flags)
return;
}
- if (VSTATE_GET(vp) == VS_RECLAIMED) {
+ if (VSTATE_GET(vp) == VS_RECLAIMED && vp->v_holdcnt == 0) {
/*
* It's clean so destroy it. It isn't referenced
* anywhere since it has been reclaimed.
*/
- KASSERT(vp->v_holdcnt == 0);
- KASSERT(vp->v_writecount == 0);
- mutex_exit(vp->v_interlock);
- vfs_insmntque(vp, NULL);
- if (vp->v_type == VBLK || vp->v_type == VCHR) {
- spec_node_destroy(vp);
- }
vcache_free(VNODE_TO_VIMPL(vp));
} else {
/*
@@ -1049,6 +1042,7 @@ vcache_alloc(void)
/*
* Free an unused, unreferenced vcache node.
+ * v_interlock locked on entry.
*/
static void
vcache_free(vnode_impl_t *node)
@@ -1056,10 +1050,18 @@ vcache_free(vnode_impl_t *node)
vnode_t *vp;
vp = VIMPL_TO_VNODE(node);
+ KASSERT(mutex_owned(vp->v_interlock));
KASSERT(vp->v_usecount == 0);
-
+ KASSERT(vp->v_holdcnt == 0);
+ KASSERT(vp->v_writecount == 0);
lru_requeue(vp, NULL);
+ mutex_exit(vp->v_interlock);
+
+ vfs_insmntque(vp, NULL);
+ if (vp->v_type == VBLK || vp->v_type == VCHR)
+ spec_node_destroy(vp);
+
rw_destroy(&vp->v_lock);
uvm_obj_destroy(&vp->v_uobj, true);
cv_destroy(&vp->v_cv);
@@ -1076,39 +1078,22 @@ vcache_free(vnode_impl_t *node)
int
vcache_tryvget(vnode_t *vp)
{
+ int error = 0;
KASSERT(mutex_owned(vp->v_interlock));
- /*
- * Before adding a reference, we must remove the vnode
- * from its freelist.
- */
- if (vp->v_usecount == 0) {
+ if (__predict_false(VSTATE_GET(vp) == VS_RECLAIMED))
+ error = ENOENT;
+ else if (__predict_false(VSTATE_GET(vp) != VS_ACTIVE))
+ error = EBUSY;
+ else if (vp->v_usecount == 0)
vp->v_usecount = 1;
- } else {
+ else
atomic_inc_uint(&vp->v_usecount);
- }
- /*
- * If the vnode is in the process of changing state we wait
- * for the change to complete and take care not to return
- * a clean vnode.
- */
- if (VSTATE_GET(vp) == VS_RECLAIMED) {
- vrelel(vp, 0);
- return ENOENT;
- } else if (VSTATE_GET(vp) != VS_ACTIVE) {
- vrelel(vp, 0);
- return EBUSY;
- }
-
- /*
- * Ok, we got it in good shape.
- */
- VSTATE_ASSERT(vp, VS_ACTIVE);
mutex_exit(vp->v_interlock);
- return 0;
+ return error;
}
/*
@@ -1124,34 +1109,25 @@ vcache_vget(vnode_t *vp)
KASSERT(mutex_owned(vp->v_interlock));
- /*
- * Before adding a reference, we must remove the vnode
- * from its freelist.
- */
- if (vp->v_usecount == 0) {
- vp->v_usecount = 1;
- } else {
- atomic_inc_uint(&vp->v_usecount);
- }
-
- /*
- * If the vnode is in the process of changing state we wait
- * for the change to complete and take care not to return
- * a clean vnode.
- */
+ /* Increment hold count to prevent vnode from disappearing. */
+ vp->v_holdcnt++;
VSTATE_WAIT_STABLE(vp);
- if (VSTATE_GET(vp) == VS_RECLAIMED) {
- vrelel(vp, 0);
+ vp->v_holdcnt--;
+
+ /* If this was the last reference to a reclaimed vnode free it now. */
+ if (__predict_false(VSTATE_GET(vp) == VS_RECLAIMED)) {
+ if (vp->v_holdcnt == 0 && vp->v_usecount == 0)
+ vcache_free(VNODE_TO_VIMPL(vp));
+ else
+ mutex_exit(vp->v_interlock);
return ENOENT;
- } else if (VSTATE_GET(vp) != VS_ACTIVE) {
- vrelel(vp, 0);
- return EBUSY;
}
-
- /*
- * Ok, we got it in good shape.
- */
VSTATE_ASSERT(vp, VS_ACTIVE);
+ if (vp->v_usecount == 0)
+ vp->v_usecount = 1;
+ else
+ atomic_inc_uint(&vp->v_usecount);
+
mutex_exit(vp->v_interlock);
return 0;
CVS commit: src
Module Name:src Committed By: hannken Date: Mon Jan 2 10:33:28 UTC 2017 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile vnode.9 vnsubr.9 src/sys/kern: vfs_cache.c vfs_mount.c vfs_subr.c vfs_vnode.c src/sys/miscfs/specfs: spec_vnops.c src/sys/sys: param.h vnode.h vnode_impl.h Log Message: Rename vget() to vcache_vget() and vcache_tryvget() respectively and move the definitions to sys/vnode_impl.h. No functional change intended. Welcome to 7.99.54 To generate a diff of this commit: cvs rdiff -u -r1.2089 -r1.2090 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.399 -r1.400 src/share/man/man9/Makefile cvs rdiff -u -r1.73 -r1.74 src/share/man/man9/vnode.9 cvs rdiff -u -r1.43 -r1.44 src/share/man/man9/vnsubr.9 cvs rdiff -u -r1.110 -r1.111 src/sys/kern/vfs_cache.c cvs rdiff -u -r1.42 -r1.43 src/sys/kern/vfs_mount.c cvs rdiff -u -r1.452 -r1.453 src/sys/kern/vfs_subr.c cvs rdiff -u -r1.65 -r1.66 src/sys/kern/vfs_vnode.c cvs rdiff -u -r1.167 -r1.168 src/sys/miscfs/specfs/spec_vnops.c cvs rdiff -u -r1.520 -r1.521 src/sys/sys/param.h cvs rdiff -u -r1.267 -r1.268 src/sys/sys/vnode.h cvs rdiff -u -r1.4 -r1.5 src/sys/sys/vnode_impl.h 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2089 src/distrib/sets/lists/comp/mi:1.2090 --- src/distrib/sets/lists/comp/mi:1.2089 Mon Jan 2 10:28:35 2017 +++ src/distrib/sets/lists/comp/mi Mon Jan 2 10:33:28 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2089 2017/01/02 10:28:35 roy Exp $ +# $NetBSD: mi,v 1.2090 2017/01/02 10:33:28 hannken Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -11234,7 +11234,7 @@ ./usr/share/man/cat9/vfs_write_suspend.0 comp-obsolete obsolete ./usr/share/man/cat9/vfsops.0 comp-sys-catman .cat ./usr/share/man/cat9/vfssubr.0 comp-sys-catman .cat -./usr/share/man/cat9/vget.0 comp-sys-catman .cat +./usr/share/man/cat9/vget.0 comp-sys-catman obsolete ./usr/share/man/cat9/vgone.0 comp-sys-catman .cat ./usr/share/man/cat9/vgonel.0 comp-sys-catman .cat ./usr/share/man/cat9/vhold.0 comp-sys-catman .cat @@ -18418,7 +18418,7 @@ ./usr/share/man/html9/vfs_vnode_iterator_next.html comp-sys-htmlman html ./usr/share/man/html9/vfsops.html comp-sys-htmlman html ./usr/share/man/html9/vfssubr.html comp-sys-htmlman html -./usr/share/man/html9/vget.html comp-sys-htmlman html +./usr/share/man/html9/vget.html comp-sys-htmlman obsolete ./usr/share/man/html9/vgone.html comp-sys-htmlman html ./usr/share/man/html9/vgonel.html comp-sys-htmlman html ./usr/share/man/html9/vhold.html comp-sys-htmlman html @@ -25842,7 +25842,7 @@ ./usr/share/man/man9/vfs_write_suspend.9 comp-obsolete obsolete ./usr/share/man/man9/vfsops.9 comp-sys-man .man ./usr/share/man/man9/vfssubr.9 comp-sys-man .man -./usr/share/man/man9/vget.9 comp-sys-man .man +./usr/share/man/man9/vget.9 comp-sys-man obsolete ./usr/share/man/man9/vgone.9 comp-sys-man .man ./usr/share/man/man9/vgonel.9 comp-sys-man .man ./usr/share/man/man9/vhold.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.399 src/share/man/man9/Makefile:1.400 --- src/share/man/man9/Makefile:1.399 Thu Dec 22 11:46:48 2016 +++ src/share/man/man9/Makefile Mon Jan 2 10:33:28 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.399 2016/12/22 11:46:48 cherry Exp $ +# $NetBSD: Makefile,v 1.400 2017/01/02 10:33:28 hannken Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -949,7 +949,6 @@ MLINKS+=vmem.9 vmem_alloc.9 \ MLINKS+=vnode.9 vref.9 \ vnode.9 vrele.9 \ vnode.9 vrele_async.9 \ - vnode.9 vget.9 \ vnode.9 vput.9 \ vnode.9 vhold.9 \ vnode.9 holdrele.9 \ Index: src/share/man/man9/vnode.9 diff -u src/share/man/man9/vnode.9:1.73 src/share/man/man9/vnode.9:1.74 --- src/share/man/man9/vnode.9:1.73 Wed Dec 14 15:48:54 2016 +++ src/share/man/man9/vnode.9 Mon Jan 2 10:33:28 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: vnode.9,v 1.73 2016/12/14 15:48:54 hannken Exp $ +.\" $NetBSD: vnode.9,v 1.74 2017/01/02 10:33:28 hannken Exp $ .\" .\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 14, 2016 +.Dd January 2, 2017 .Dt VNODE 9 .Os .Sh NAME @@ -35,7 +35,6 @@ .Nm vref , .Nm vrele , .Nm vrele_async , -.Nm vget , .Nm vput , .Nm vhold , .Nm holdrele , @@ -68,8 +67,6 @@ .Fn vrele "struct vnode *vp" .Ft void .Fn vrele_async "struct vnode *vp" -.Ft int -.Fn vget "struct vnode *vp" "int lockflag" "int wait" .Ft void .Fn vput "struct vnode *vp" .Ft void @@ -152,12 +149,10 @@ When a file system retrieves a
CVS commit: src
Module Name:src Committed By: roy Date: Mon Jan 2 10:28:35 UTC 2017 Modified Files: src/distrib/sets/lists/comp: mi src/lib/libcurses: Makefile addbytes.c clrtobot.c clrtoeol.c curses.h curses_private.h curses_refresh.3 curses_touch.3 delch.c ins_wch.c ins_wstr.c insdelln.c insstr.c line.c touchwin.c Added Files: src/lib/libcurses: immedok.c syncok.c Log Message: Implement POSIX Curses functions immedok(3) and syncok(3). To generate a diff of this commit: cvs rdiff -u -r1.2088 -r1.2089 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.76 -r1.77 src/lib/libcurses/Makefile cvs rdiff -u -r1.44 -r1.45 src/lib/libcurses/addbytes.c cvs rdiff -u -r1.22 -r1.23 src/lib/libcurses/clrtobot.c \ src/lib/libcurses/delch.c cvs rdiff -u -r1.26 -r1.27 src/lib/libcurses/clrtoeol.c cvs rdiff -u -r1.112 -r1.113 src/lib/libcurses/curses.h cvs rdiff -u -r1.53 -r1.54 src/lib/libcurses/curses_private.h cvs rdiff -u -r1.11 -r1.12 src/lib/libcurses/curses_refresh.3 cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/curses_touch.3 \ src/lib/libcurses/ins_wstr.c cvs rdiff -u -r0 -r1.1 src/lib/libcurses/immedok.c src/lib/libcurses/syncok.c cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/ins_wch.c src/lib/libcurses/line.c cvs rdiff -u -r1.16 -r1.17 src/lib/libcurses/insdelln.c cvs rdiff -u -r1.3 -r1.4 src/lib/libcurses/insstr.c cvs rdiff -u -r1.28 -r1.29 src/lib/libcurses/touchwin.c 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2088 src/distrib/sets/lists/comp/mi:1.2089 --- src/distrib/sets/lists/comp/mi:1.2088 Sun Jan 1 03:06:06 2017 +++ src/distrib/sets/lists/comp/mi Mon Jan 2 10:28:35 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2088 2017/01/01 03:06:06 roy Exp $ +# $NetBSD: mi,v 1.2089 2017/01/02 10:28:35 roy Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -6807,6 +6807,7 @@ ./usr/share/man/cat3/ilogbl.0 comp-c-catman .cat ./usr/share/man/cat3/imaxabs.0 comp-c-catman .cat ./usr/share/man/cat3/imaxdiv.0 comp-c-catman .cat +./usr/share/man/cat3/immedok.0 comp-c-catman .cat ./usr/share/man/cat3/inch.0 comp-c-catman .cat ./usr/share/man/cat3/inchnstr.0 comp-c-catman .cat ./usr/share/man/cat3/inchstr.0 comp-c-catman .cat @@ -9322,6 +9323,7 @@ ./usr/share/man/cat3/swapon.0 comp-c-catman .cat ./usr/share/man/cat3/swprintf.0 comp-c-catman .cat ./usr/share/man/cat3/swscanf.0 comp-c-catman .cat +./usr/share/man/cat3/synckok.0 comp-c-catman .cat ./usr/share/man/cat3/sys_errlist.0 comp-c-catman .cat ./usr/share/man/cat3/sys_nerr.0 comp-c-catman .cat ./usr/share/man/cat3/sys_siglist.0 comp-c-catman .cat @@ -14153,6 +14155,7 @@ ./usr/share/man/html3/ilogbl.html comp-c-htmlman html ./usr/share/man/html3/imaxabs.html comp-c-htmlman html ./usr/share/man/html3/imaxdiv.html comp-c-htmlman html +./usr/share/man/html3/immedok.html comp-c-htmlman html ./usr/share/man/html3/inch.html comp-c-htmlman html ./usr/share/man/html3/inchnstr.html comp-c-htmlman html ./usr/share/man/html3/inchstr.html comp-c-htmlman html @@ -16607,6 +16610,7 @@ ./usr/share/man/html3/swapon.html comp-c-htmlman html ./usr/share/man/html3/swprintf.html comp-c-htmlman html ./usr/share/man/html3/swscanf.html comp-c-htmlman html +./usr/share/man/html3/syncok.html comp-c-htmlman html ./usr/share/man/html3/sys_errlist.html comp-c-htmlman html ./usr/share/man/html3/sys_nerr.html comp-c-htmlman html ./usr/share/man/html3/sys_siglist.html comp-c-htmlman html @@ -21416,6 +21420,7 @@ ./usr/share/man/man3/ilogbl.3 comp-c-man .man ./usr/share/man/man3/imaxabs.3 comp-c-man .man ./usr/share/man/man3/imaxdiv.3 comp-c-man .man +./usr/share/man/man3/immedok.3 comp-c-man .man ./usr/share/man/man3/inch.3 comp-c-man .man ./usr/share/man/man3/inchnstr.3 comp-c-man .man ./usr/share/man/man3/inchstr.3 comp-c-man .man @@ -23927,6 +23932,7 @@ ./usr/share/man/man3/swapon.3 comp-c-man .man ./usr/share/man/man3/swprintf.3 comp-c-man .man ./usr/share/man/man3/swscanf.3 comp-c-man .man +./usr/share/man/man3/syncok.3 comp-c-man .man ./usr/share/man/man3/sys_errlist.3 comp-c-man .man ./usr/share/man/man3/sys_nerr.3 comp-c-man .man ./usr/share/man/man3/sys_siglist.3 comp-c-man .man Index: src/lib/libcurses/Makefile diff -u src/lib/libcurses/Makefile:1.76 src/lib/libcurses/Makefile:1.77 --- src/lib/libcurses/Makefile:1.76 Sun Jan 1 03:06:06 2017 +++ src/lib/libcurses/Makefile Mon Jan 2 10:28:34 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2017/01/01 03:06:06 roy Exp $ +# $NetBSD: Makefile,v 1.77 2017/01/02 10:28:34 roy Exp $ # @(#)Makefile 8.2 (Berkeley) 1/2/94 .include @@ -19,12 +19,12 @@ SRCS= acs.c addbytes.c addch.c addchnstr ctrace.c cur_hash.c curs_set.c \ c
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Mon Jan 2 09:53:04 UTC 2017 Modified Files: src/share/man/man9: bus_dma.9 Log Message: More macros, whitespace. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/share/man/man9/bus_dma.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/bus_dma.9 diff -u src/share/man/man9/bus_dma.9:1.62 src/share/man/man9/bus_dma.9:1.63 --- src/share/man/man9/bus_dma.9:1.62 Mon Jan 2 03:12:49 2017 +++ src/share/man/man9/bus_dma.9 Mon Jan 2 09:53:04 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: bus_dma.9,v 1.62 2017/01/02 03:12:49 sevan Exp $ +.\" $NetBSD: bus_dma.9,v 1.63 2017/01/02 09:53:04 wiz Exp $ .\" .\" Copyright (c) 1996, 1997, 1998, 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -799,7 +799,8 @@ create a new bus_dma_tag_t with a limite This function should not normally be used, but is useful for devices that do not support the full address space of the parent bus. Not all ports implement this method; on ports where it is unavailable, -EOPNOTSUPP is returned. +.Er EOPNOTSUPP +is returned. The arguments are as follows: .Bl -tag -width max_addr -compact .It Fa tag @@ -857,4 +858,4 @@ design was provided by .An Matthew Jacob , .An Jonathan Stone , and -.An Matt Thomas. +.An Matt Thomas .
CVS commit: src/sys/netinet
Module Name:src
Committed By: skrll
Date: Mon Jan 2 09:29:38 UTC 2017
Modified Files:
src/sys/netinet: tcp_congctl.c
Log Message:
Restore behaviour to pre- tcp_congctl.c:1.18 for SACK. Further analysis
of the change is required.
OK kefren@
PR/51753 tcp SACK causes SSH disconnect
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/netinet/tcp_congctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_congctl.c
diff -u src/sys/netinet/tcp_congctl.c:1.22 src/sys/netinet/tcp_congctl.c:1.23
--- src/sys/netinet/tcp_congctl.c:1.22 Tue Dec 13 08:29:03 2016
+++ src/sys/netinet/tcp_congctl.c Mon Jan 2 09:29:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $ */
+/* $NetBSD: tcp_congctl.c,v 1.23 2017/01/02 09:29:38 skrll Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc.
@@ -135,7 +135,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.23 2017/01/02 09:29:38 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -707,7 +707,6 @@ tcp_newreno_fast_retransmit_newack(struc
tp->t_partialacks++;
TCP_TIMER_DISARM(tp, TCPT_REXMT);
tp->t_rtttime = 0;
- tp->snd_nxt = th->th_ack;
if (TCP_SACK_ENABLED(tp)) {
/*
@@ -734,6 +733,7 @@ tcp_newreno_fast_retransmit_newack(struc
tp->t_flags |= TF_ACKNOW;
(void) tcp_output(tp);
} else {
+ tp->snd_nxt = th->th_ack;
/*
* Set snd_cwnd to one segment beyond ACK'd offset
* snd_una is not yet updated when we're called
CVS commit: src/usr.bin/vmstat
Module Name:src
Committed By: pgoyette
Date: Mon Jan 2 09:24:55 UTC 2017
Modified Files:
src/usr.bin/vmstat: vmstat.c
Log Message:
Use appropriate PRI* format specifiers for fixed-bit-size numbers
Should fix i386 build.
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/usr.bin/vmstat/vmstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/vmstat/vmstat.c
diff -u src/usr.bin/vmstat/vmstat.c:1.211 src/usr.bin/vmstat/vmstat.c:1.212
--- src/usr.bin/vmstat/vmstat.c:1.211 Mon Jan 2 02:08:05 2017
+++ src/usr.bin/vmstat/vmstat.c Mon Jan 2 09:24:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.211 2017/01/02 02:08:05 pgoyette Exp $ */
+/* $NetBSD: vmstat.c,v 1.212 2017/01/02 09:24:54 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95";
#else
-__RCSID("$NetBSD: vmstat.c,v 1.211 2017/01/02 02:08:05 pgoyette Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.212 2017/01/02 09:24:54 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -2235,8 +2235,8 @@ hist_dodump_sysctl(int mib[], unsigned i
(void)printf("%06ld.%06ld ",
(long int)e->she_tspec.tv_sec,
(long int)(e->she_tspec.tv_nsec / 1000));
- (void)printf("%s#%ld@%d: ", fn, e->she_callnumber,
- e->she_cpunum);
+ (void)printf("%s#%"PRIu64"@%"PRIu32": ", fn,
+ e->she_callnumber, e->she_cpunum);
(void)printf(fmt, e->she_values[0], e->she_values[1],
e->she_values[2], e->she_values[3]);
(void)putchar('\n');
CVS commit: src/lib/libcurses
Module Name:src
Committed By: roy
Date: Mon Jan 2 08:44:12 UTC 2017
Modified Files:
src/lib/libcurses: line.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libcurses/line.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/libcurses/line.c
diff -u src/lib/libcurses/line.c:1.6 src/lib/libcurses/line.c:1.7
--- src/lib/libcurses/line.c:1.6 Tue Feb 23 19:48:26 2010
+++ src/lib/libcurses/line.c Mon Jan 2 08:44:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: line.c,v 1.6 2010/02/23 19:48:26 drochner Exp $ */
+/* $NetBSD: line.c,v 1.7 2017/01/02 08:44:12 roy Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: line.c,v 1.6 2010/02/23 19:48:26 drochner Exp $");
+__RCSID("$NetBSD: line.c,v 1.7 2017/01/02 08:44:12 roy Exp $");
#endif/* not lint */
#include
@@ -93,7 +93,7 @@ whline(WINDOW *win, chtype ch, int count
ch |= ACS_HLINE;
for (i = 0; i < n; i++)
mvwaddch(win, win->cury, ocurx + i, ch);
-
+
wmove(win, win->cury, ocurx);
return OK;
#else
@@ -238,7 +238,7 @@ int whline_set(WINDOW *win, const cchar_
#endif /* DEBUG */
mvwadd_wch(win, win->cury, ocurx + i * cw, &cc);
}
-
+
wmove(win, win->cury, ocurx);
return OK;
#endif /* HAVE_WCHAR */
