CVS commit: src/tests/net/if_vlan
Module Name:src
Committed By: ozaki-r
Date: Tue Jun 12 04:21:22 UTC 2018
Modified Files:
src/tests/net/if_vlan: t_vlan.sh
Log Message:
Add tests of vlan with bridge
The tests trigger a panic reported in PR kern/53357.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/net/if_vlan/t_vlan.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/net/if_vlan/t_vlan.sh
diff -u src/tests/net/if_vlan/t_vlan.sh:1.8 src/tests/net/if_vlan/t_vlan.sh:1.9
--- src/tests/net/if_vlan/t_vlan.sh:1.8 Thu Feb 1 05:22:02 2018
+++ src/tests/net/if_vlan/t_vlan.sh Tue Jun 12 04:21:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_vlan.sh,v 1.8 2018/02/01 05:22:02 ozaki-r Exp $
+# $NetBSD: t_vlan.sh,v 1.9 2018/06/12 04:21:22 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -524,6 +524,80 @@ vlan_configs6_cleanup()
cleanup
}
+vlan_bridge_body_common()
+{
+
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 rump.ifconfig shmif0 up
+
+ atf_check -s exit:0 rump.ifconfig vlan0 create
+ atf_check -s exit:0 rump.ifconfig vlan0 vlan 10 vlanif shmif0
+ atf_check -s exit:0 rump.ifconfig vlan0 up
+ $DEBUG && rump.ifconfig vlan0
+
+ atf_check -s exit:0 rump.ifconfig bridge0 create
+ # Adjust to the MTU of a vlan on a shmif
+ atf_check -s exit:0 rump.ifconfig bridge0 mtu 1496
+ atf_check -s exit:0 rump.ifconfig bridge0 up
+ # Test brconfig add
+ atf_check -s exit:0 $HIJACKING brconfig bridge0 add vlan0
+ $DEBUG && brconfig bridge0
+ # Test brconfig delete
+ atf_check -s exit:0 $HIJACKING brconfig bridge0 delete vlan0
+
+ atf_check -s exit:0 $HIJACKING brconfig bridge0 add vlan0
+ # Test vlan destruction with bridge
+ atf_check -s exit:0 rump.ifconfig vlan0 destroy
+
+ rump_server_destroy_ifaces
+}
+
+atf_test_case vlan_bridge cleanup
+vlan_bridge_head()
+{
+
+ atf_set "descr" "tests of vlan interfaces with bridges (IPv4)"
+ atf_set "require.progs" "rump_server"
+}
+
+vlan_bridge_body()
+{
+
+ rump_server_start $SOCK_LOCAL vlan bridge
+ vlan_bridge_body_common
+}
+
+vlan_bridge_cleanup()
+{
+
+ $DEBUG && dump
+ cleanup
+}
+
+atf_test_case vlan_bridge6 cleanup
+vlan_bridge6_head()
+{
+
+ atf_set "descr" "tests of vlan interfaces with bridges (IPv6)"
+ atf_set "require.progs" "rump_server"
+}
+
+vlan_bridge6_body()
+{
+
+ rump_server_start $SOCK_LOCAL vlan netinet6 bridge
+ vlan_bridge_body_common
+}
+
+vlan_bridge6_cleanup()
+{
+
+ $DEBUG && dump
+ cleanup
+}
+
atf_init_test_cases()
{
@@ -531,9 +605,11 @@ atf_init_test_cases()
atf_add_test_case vlan_basic
atf_add_test_case vlan_vlanid
atf_add_test_case vlan_configs
+ atf_add_test_case vlan_bridge
atf_add_test_case vlan_create_destroy6
atf_add_test_case vlan_basic6
atf_add_test_case vlan_vlanid6
atf_add_test_case vlan_configs6
+ atf_add_test_case vlan_bridge6
}
CVS commit: src/sys/net
Module Name:src Committed By: ozaki-r Date: Tue Jun 12 04:20:36 UTC 2018 Modified Files: src/sys/net: if_vlan.c Log Message: vlan: call ether_ifdetach without IFNET_LOCK Fix PR kern/53357 To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/net/if_vlan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/if_vlan.c diff -u src/sys/net/if_vlan.c:1.125 src/sys/net/if_vlan.c:1.126 --- src/sys/net/if_vlan.c:1.125 Fri Mar 16 17:00:35 2018 +++ src/sys/net/if_vlan.c Tue Jun 12 04:20:36 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vlan.c,v 1.125 2018/03/16 17:00:35 tih Exp $ */ +/* $NetBSD: if_vlan.c,v 1.126 2018/06/12 04:20:36 ozaki-r Exp $ */ /* * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.125 2018/03/16 17:00:35 tih Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.126 2018/06/12 04:20:36 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -625,7 +625,13 @@ vlan_unconfig_locked(struct ifvlan *ifv, IFNET_UNLOCK(p); } + /* XXX ether_ifdetach must not be called with IFNET_LOCK */ + mutex_exit(>ifv_lock); + IFNET_UNLOCK(ifp); ether_ifdetach(ifp); + IFNET_LOCK(ifp); + mutex_enter(>ifv_lock); + /* Restore vlan_ioctl overwritten by ether_ifdetach */ ifp->if_ioctl = vlan_ioctl; vlan_reset_linkname(ifp);
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: kamil
Date: Tue Jun 12 00:42:17 UTC 2018
Modified Files:
src/usr.bin/gzip: gzip.c
Log Message:
Correct Undefined Behavior in gzip(1)
Unportable left shift reported with MKSANITIZER=yes USE_SANITIZER=undefined:
# progress -zf ./games.tgz tar -xp -C "./" -f -
/public/src.git/usr.bin/gzip/gzip.c:2126:33: runtime error: left shift of 251
by 24 places cannot be represented in type 'int'
100%
||
44500 KiB 119.69 MiB/s00:00 ETA
Refactor the following code into something that is more clear
and fix signed integer shift, by casting all buf[] elements to
(unsigned int):
unsigned char buf[8];
uint32_t usize;
[...]
else {
usize = buf[4] | buf[5] << 8 |
buf[6] << 16 | buf[7] << 24;
[...]
New version:
usize = buf[4];
usize |= (unsigned int)buf[5] << 8;
usize |= (unsigned int)buf[6] << 16;
usize |= (unsigned int)buf[7] << 24;
Only the "<< 24" part needs explicit cast, but for consistency make the
integer promotion explicit and clear to a code reader.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/usr.bin/gzip/gzip.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/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.112 src/usr.bin/gzip/gzip.c:1.113
--- src/usr.bin/gzip/gzip.c:1.112 Wed Aug 23 13:04:17 2017
+++ src/usr.bin/gzip/gzip.c Tue Jun 12 00:42:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.112 2017/08/23 13:04:17 christos Exp $ */
+/* $NetBSD: gzip.c,v 1.113 2018/06/12 00:42:17 kamil Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017
@@ -31,7 +31,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
2009, 2010, 2011, 2015, 2017 Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.112 2017/08/23 13:04:17 christos Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.113 2018/06/12 00:42:17 kamil Exp $");
#endif /* not lint */
/*
@@ -2118,12 +2118,16 @@ print_list(int fd, off_t out, const char
maybe_warnx("read of uncompressed size");
else {
-usize = buf[4] | buf[5] << 8 |
- buf[6] << 16 | buf[7] << 24;
+usize = buf[4];
+usize |= (unsigned int)buf[5] << 8;
+usize |= (unsigned int)buf[6] << 16;
+usize |= (unsigned int)buf[7] << 24;
in = (off_t)usize;
#ifndef SMALL
-crc = buf[0] | buf[1] << 8 |
- buf[2] << 16 | buf[3] << 24;
+crc = buf[0];
+crc |= (unsigned int)buf[1] << 8;
+crc |= (unsigned int)buf[2] << 16;
+crc |= (unsigned int)buf[3] << 24;
#endif
}
}
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: jmcneill
Date: Tue Jun 12 00:19:17 UTC 2018
Modified Files:
src/sys/dev/fdt: fdtbus.c
Log Message:
If we don't have a native driver for a node and it has a simple-mfd
compatible string, treat it the same as a simple-bus.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/fdt/fdtbus.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/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.16 src/sys/dev/fdt/fdtbus.c:1.17
--- src/sys/dev/fdt/fdtbus.c:1.16 Sat Apr 7 18:05:08 2018
+++ src/sys/dev/fdt/fdtbus.c Tue Jun 12 00:19:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.16 2018/04/07 18:05:08 bouyer Exp $ */
+/* $NetBSD: fdtbus.c,v 1.17 2018/06/12 00:19:17 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.16 2018/04/07 18:05:08 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.17 2018/06/12 00:19:17 jmcneill Exp $");
#include
#include
@@ -75,7 +75,7 @@ static void fdt_add_node(struct fdt_node
static u_int fdt_get_order(int);
static const char * const fdtbus_compatible[] =
-{ "simple-bus", NULL };
+{ "simple-bus", "simple-mfd", NULL };
CFATTACH_DECL_NEW(fdt, sizeof(struct fdt_softc),
fdt_match, fdt_attach, NULL, NULL);
CVS commit: src/sys/arch/ia64/stand/efi/libefi
Module Name:src
Committed By: christos
Date: Mon Jun 11 21:38:27 UTC 2018
Modified Files:
src/sys/arch/ia64/stand/efi/libefi: Makefile.inc
Log Message:
switch from MAKEOBJDIRPREFIX to MAKEOBJDIR.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/stand/efi/libefi/Makefile.inc
diff -u src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.5 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.6
--- src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.5 Sat May 26 21:14:50 2018
+++ src/sys/arch/ia64/stand/efi/libefi/Makefile.inc Mon Jun 11 17:38:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2018/05/27 01:14:50 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2018/06/11 21:38:27 christos Exp $
#
# Configuration variables (default values are below):
#
@@ -22,7 +22,7 @@ EFILIB= ${EFIDST}/libefi.a
EFIMAKE= \
cd ${EFIDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
MAKEOBJDIR=${EFIDST} ${MAKE} \
- CC=${CC:q} CFLAGS=${CFLAGS:q} \
+ CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
AS=${AS:q} AFLAGS=${AFLAGS:q} \
LD=${LD:q} STRIP=${STRIP:q} \
MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
CVS commit: src/sys/arch/hppa/spmath
Module Name:src
Committed By: christos
Date: Mon Jun 11 21:37:29 UTC 2018
Modified Files:
src/sys/arch/hppa/spmath: Makefile.inc
Log Message:
switch from MAKEOBJDIRPREFIX to MAKEOBJDIR.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/spmath/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/spmath/Makefile.inc
diff -u src/sys/arch/hppa/spmath/Makefile.inc:1.10 src/sys/arch/hppa/spmath/Makefile.inc:1.11
--- src/sys/arch/hppa/spmath/Makefile.inc:1.10 Sat May 26 21:14:50 2018
+++ src/sys/arch/hppa/spmath/Makefile.inc Mon Jun 11 17:37:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2018/05/27 01:14:50 christos Exp $
+# $NetBSD: Makefile.inc,v 1.11 2018/06/11 21:37:29 christos Exp $
# $OpenBSD: Makefile.inc,v 1.4 2001/03/29 03:58:17 mickey Exp $
#
@@ -15,7 +15,7 @@ SPMATH_PROF= ${SPMATHDST}/spmath.po
SPMATHMAKE= \
cd ${SPMATHDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
MAKEOBJDIR=${SPMATHDST} ${MAKE} \
- CC=${CC:q} CFLAGS=${CFLAGS:q} \
+ CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
SPMATHCPPFLAGS=${CPPFLAGS:S@^-I.@-I. -I../../.@g:q} \
AS=${AS:q} AFLAGS=${AFLAGS:q} \
LD=${LD:q} STRIP=${STRIP:q} \
CVS commit: src/sys/arch/acorn32/stand/lib
Module Name:src
Committed By: christos
Date: Mon Jun 11 21:36:20 UTC 2018
Modified Files:
src/sys/arch/acorn32/stand/lib: Makefile.inc
Log Message:
Switch from using MAKEOBJDIRPREFIX to MAKEOBJDIR
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/acorn32/stand/lib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/stand/lib/Makefile.inc
diff -u src/sys/arch/acorn32/stand/lib/Makefile.inc:1.4 src/sys/arch/acorn32/stand/lib/Makefile.inc:1.5
--- src/sys/arch/acorn32/stand/lib/Makefile.inc:1.4 Sat May 26 21:14:50 2018
+++ src/sys/arch/acorn32/stand/lib/Makefile.inc Mon Jun 11 17:36:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/05/27 01:14:50 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2018/06/11 21:36:20 christos Exp $
#
# Configuration variables (default values are below):
#
@@ -22,7 +22,7 @@ RISCOSLIB= ${RISCOSDST}/libriscos.a
RISCOSMAKE= \
cd ${RISCOSDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
MAKEOBJDIR=${RISCOSDST} ${MAKE} \
- CC=${CC:q} CFLAGS=${CFLAGS:q} \
+ CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
AS=${AS:q} AFLAGS=${AFLAGS:q} \
LD=${LD:q} STRIP=${STRIP:q} \
MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: christos
Date: Mon Jun 11 21:35:13 UTC 2018
Modified Files:
src/sys/arch/i386/stand/lib: Makefile.inc
Log Message:
switch CFLAGS from using MAKEOBJDIRPREFIX to MAKEOBJDIR. This whole thing
is disgusting, but fixing it properly. requires restructuring
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/lib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/lib/Makefile.inc
diff -u src/sys/arch/i386/stand/lib/Makefile.inc:1.17 src/sys/arch/i386/stand/lib/Makefile.inc:1.18
--- src/sys/arch/i386/stand/lib/Makefile.inc:1.17 Sat May 26 21:14:50 2018
+++ src/sys/arch/i386/stand/lib/Makefile.inc Mon Jun 11 17:35:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2018/05/27 01:14:50 christos Exp $
+# $NetBSD: Makefile.inc,v 1.18 2018/06/11 21:35:13 christos Exp $
#
# Configuration variables (default values are below):
#
@@ -24,7 +24,7 @@ CWARNFLAGS.clang+= -Wno-tautological-com
I386MAKE= \
cd ${I386DIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
MAKEOBJDIR=${I386DST} ${MAKE} \
- CC=${CC:q} CFLAGS=${CFLAGS:q} \
+ CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
AS=${AS:q} AFLAGS=${AFLAGS:q} \
LD=${LD:q} STRIP=${STRIP:q} \
MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
CVS commit: src/lib/libc/citrus/modules
Module Name:src
Committed By: maya
Date: Mon Jun 11 20:28:23 UTC 2018
Modified Files:
src/lib/libc/citrus/modules: citrus_mapper_std.c
Log Message:
Avoid left-shifting a negative number in the non-compat case, too.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/citrus/modules/citrus_mapper_std.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/citrus/modules/citrus_mapper_std.c
diff -u src/lib/libc/citrus/modules/citrus_mapper_std.c:1.11 src/lib/libc/citrus/modules/citrus_mapper_std.c:1.12
--- src/lib/libc/citrus/modules/citrus_mapper_std.c:1.11 Mon Jun 11 18:03:38 2018
+++ src/lib/libc/citrus/modules/citrus_mapper_std.c Mon Jun 11 20:28:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_mapper_std.c,v 1.11 2018/06/11 18:03:38 kamil Exp $ */
+/* $NetBSD: citrus_mapper_std.c,v 1.12 2018/06/11 20:28:23 maya Exp $ */
/*-
* Copyright (c)2003, 2006 Citrus Project,
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper_std.c,v 1.11 2018/06/11 18:03:38 kamil Exp $");
+__RCSID("$NetBSD: citrus_mapper_std.c,v 1.12 2018/06/11 20:28:23 maya Exp $");
#endif /* LIBC_SCCS and not lint */
#include
@@ -216,7 +216,7 @@ rowcol_parse_variable(struct _citrus_map
rc->rc_dst_unit_bits = be32toh(rcx->rcx_dst_unit_bits);
m = be32toh(rcx->rcx_src_rowcol_bits);
- n = 1 << (m - 1);
+ n = 1U << (m - 1);
n |= n - 1;
rc->rc_src_rowcol_bits = m;
rc->rc_src_rowcol_mask = n;
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: jakllsch
Date: Mon Jun 11 19:54:39 UTC 2018
Modified Files:
src/sys/dev/fdt: fdt_subr.c
Log Message:
Fix fdtbus_get_cells(, 2) when running big endian.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/fdt/fdt_subr.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/fdt/fdt_subr.c
diff -u src/sys/dev/fdt/fdt_subr.c:1.21 src/sys/dev/fdt/fdt_subr.c:1.22
--- src/sys/dev/fdt/fdt_subr.c:1.21 Tue Mar 6 17:40:04 2018
+++ src/sys/dev/fdt/fdt_subr.c Mon Jun 11 19:54:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.21 2018/03/06 17:40:04 bouyer Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.22 2018/06/11 19:54:39 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.21 2018/03/06 17:40:04 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.22 2018/06/11 19:54:39 jakllsch Exp $");
#include
#include
@@ -156,7 +156,7 @@ fdtbus_get_cells(const uint8_t *buf, int
switch (cells) {
case 0: return 0;
case 1: return be32dec(buf);
- case 2: return be64dec(buf);
+ case 2: return ((uint64_t)be32dec(buf)<<32)|be32dec(buf+4);
default: panic("fdtbus_get_cells: bad cells val %d\n", cells);
}
}
CVS commit: src/sys/arch
Module Name:src
Committed By: jakllsch
Date: Mon Jun 11 19:49:18 UTC 2018
Modified Files:
src/sys/arch/arm/vexpress: vexpress_platform.c
src/sys/arch/evbarm/conf: VEXPRESS_A15
Log Message:
fill in vexpress_platform_early_putchar(); make comment about CONSADDR
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/vexpress/vexpress_platform.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/VEXPRESS_A15
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/vexpress/vexpress_platform.c
diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.7 src/sys/arch/arm/vexpress/vexpress_platform.c:1.8
--- src/sys/arch/arm/vexpress/vexpress_platform.c:1.7 Sat Mar 17 18:34:09 2018
+++ src/sys/arch/arm/vexpress/vexpress_platform.c Mon Jun 11 19:49:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.7 2018/03/17 18:34:09 ryo Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.8 2018/06/11 19:49:18 jakllsch Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -30,7 +30,7 @@
#include "opt_fdt_arm.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.7 2018/03/17 18:34:09 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.8 2018/06/11 19:49:18 jakllsch Exp $");
#include
#include
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: vexpress_pla
#include
-#include
+#include
#include
@@ -178,6 +178,21 @@ vexpress_platform_init_attach_args(struc
static void
vexpress_platform_early_putchar(char c)
{
+#ifdef CONSADDR
+#define CONSADDR_VA ((CONSADDR - VEXPRESS_CORE_PBASE) + VEXPRESS_CORE_VBASE)
+ volatile uint32_t *uartaddr = cpu_earlydevice_va_p() ?
+ (volatile uint32_t *)CONSADDR_VA :
+ (volatile uint32_t *)CONSADDR;
+
+ while ((le32toh(uartaddr[PL01XCOM_FR / 4]) & PL01X_FR_TXFF) != 0)
+ continue;
+
+ uartaddr[PL01XCOM_DR / 4] = htole32(c);
+ arm_dsb();
+
+ while ((le32toh(uartaddr[PL01XCOM_FR / 4]) & PL01X_FR_TXFE) == 0)
+ continue;
+#endif
}
static void
Index: src/sys/arch/evbarm/conf/VEXPRESS_A15
diff -u src/sys/arch/evbarm/conf/VEXPRESS_A15:1.18 src/sys/arch/evbarm/conf/VEXPRESS_A15:1.19
--- src/sys/arch/evbarm/conf/VEXPRESS_A15:1.18 Wed Jun 6 20:38:00 2018
+++ src/sys/arch/evbarm/conf/VEXPRESS_A15 Mon Jun 11 19:49:18 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: VEXPRESS_A15,v 1.18 2018/06/06 20:38:00 jakllsch Exp $
+# $NetBSD: VEXPRESS_A15,v 1.19 2018/06/11 19:49:18 jakllsch Exp $
#
# ARM Versatile Express A15
#
@@ -20,6 +20,7 @@ pseudo-device openfirm # /dev/openfirm
#options PMAP_DEBUG # Enable pmap_debug_level code
#options IPKDB # remote kernel debugging
#options VERBOSE_INIT_ARM # verbose bootstrapping messages
+#options CONSADDR=0x1c09
makeoptions DEBUG="-g" # compile full symbol table
makeoptions COPY_SYMTAB=1
CVS commit: src/sys/arch/evbarm/vexpress
Module Name:src
Committed By: jakllsch
Date: Mon Jun 11 19:42:22 UTC 2018
Modified Files:
src/sys/arch/evbarm/vexpress: vexpress_start.S
Log Message:
fix xputc for big endian
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/vexpress/vexpress_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/vexpress/vexpress_start.S
diff -u src/sys/arch/evbarm/vexpress/vexpress_start.S:1.6 src/sys/arch/evbarm/vexpress/vexpress_start.S:1.7
--- src/sys/arch/evbarm/vexpress/vexpress_start.S:1.6 Sat Mar 3 13:46:33 2018
+++ src/sys/arch/evbarm/vexpress/vexpress_start.S Mon Jun 11 19:42:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_start.S,v 1.6 2018/03/03 13:46:33 skrll Exp $ */
+/* $NetBSD: vexpress_start.S,v 1.7 2018/06/11 19:42:22 jakllsch Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include
-RCSID("$NetBSD: vexpress_start.S,v 1.6 2018/03/03 13:46:33 skrll Exp $")
+RCSID("$NetBSD: vexpress_start.S,v 1.7 2018/06/11 19:42:22 jakllsch Exp $")
#ifdef VERBOSE_INIT_ARM
#define XPUTC(n) mov r0, n; bl xputc
@@ -139,6 +139,9 @@ _C_LABEL(vexpress_start):
xputc:
movw r2, #0x
movt r2, #0x1c09
+#ifdef __ARMEB__
+ lsl r0, r0, #24
+#endif
str r0, [r2]
bx lr
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdolecek Date: Mon Jun 11 19:40:05 UTC 2018 Modified Files: src/sys/dev/pci: if_msk.c Log Message: Factual correction: actually old code also used number of octents, but set sc_if->sk_tx_ramend to invalid value, and assumed 128k buffer when SK_EPROM0 read returned zero (no code change) To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/dev/pci/if_msk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_msk.c diff -u src/sys/dev/pci/if_msk.c:1.57 src/sys/dev/pci/if_msk.c:1.58 --- src/sys/dev/pci/if_msk.c:1.57 Mon Jun 11 19:13:38 2018 +++ src/sys/dev/pci/if_msk.c Mon Jun 11 19:40:05 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.57 2018/06/11 19:13:38 jdolecek Exp $ */ +/* $NetBSD: if_msk.c,v 1.58 2018/06/11 19:40:05 jdolecek Exp $ */ /* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */ /* @@ -52,7 +52,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.57 2018/06/11 19:13:38 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.58 2018/06/11 19:40:05 jdolecek Exp $"); #include #include
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Mon Jun 11 19:35:56 UTC 2018
Modified Files:
src/sys/arch/usermode/usermode: machdep.c
Log Message:
Now we use timestamp info, use direct console output instead of kernel
timestamped output for usage() reporting
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/usermode/usermode/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/usermode/machdep.c
diff -u src/sys/arch/usermode/usermode/machdep.c:1.55 src/sys/arch/usermode/usermode/machdep.c:1.56
--- src/sys/arch/usermode/usermode/machdep.c:1.55 Tue Jun 5 20:02:43 2018
+++ src/sys/arch/usermode/usermode/machdep.c Mon Jun 11 19:35:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.55 2018/06/05 20:02:43 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.56 2018/06/11 19:35:56 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk
@@ -37,7 +37,7 @@
#include "opt_memsize.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2018/06/05 20:02:43 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2018/06/11 19:35:56 reinoud Exp $");
#include
#include
@@ -99,7 +99,7 @@ void usermode_reboot(void);
static void
usage(const char *pn)
{
- printf("usage: %s [-acdqsvxz]"
+ thunk_printf("usage: %s [-acdqsvxz]"
" [net=,]"
" [audio=]"
" [disk= ...]"
@@ -107,7 +107,7 @@ usage(const char *pn)
" [vnc=x,]"
" [vdev=atapi,device]\n",
pn);
- printf(" (ex. \"%s"
+ thunk_printf(" (ex. \"%s"
" net=tap0,00:00:be:ef:ca:fe"
" audio=audio0"
" disk=root.fs"
@@ -156,7 +156,7 @@ main(int argc, char *argv[])
char *mac = strchr(tap, ',');
char *p = usermode_tap_devicebuf;
if (mac == NULL) {
- printf("bad net= format\n");
+ thunk_printf("bad net= format\n");
return;
}
memset(usermode_tap_devicebuf, 0,
@@ -189,13 +189,13 @@ main(int argc, char *argv[])
w = vnc;
h = strchr(w, 'x');
if (h == NULL) {
- printf("bad vnc= format\n");
+ thunk_printf("bad vnc= format\n");
return;
}
*h++ = '\0';
p = strchr(h, ',');
if (p == NULL) {
- printf("bad vnc= format\n");
+ thunk_printf("bad vnc= format\n");
return;
}
*p++ = '\0';
@@ -206,7 +206,7 @@ main(int argc, char *argv[])
strlen("disk=")) == 0) {
if (usermode_disk_image_path_count ==
MAX_DISK_IMAGES) {
- printf("too many disk images "
+ thunk_printf("too many disk images "
"(increase MAX_DISK_IMAGES)\n");
usage(argv[0]);
return;
@@ -220,7 +220,7 @@ main(int argc, char *argv[])
char *t, *p;
if (usermode_disk_image_path_count ==
MAX_VDEVS) {
- printf("too many vdevs "
+ thunk_printf("too many vdevs "
"(increase MAX_VDEVS)\n");
usage(argv[0]);
return;
@@ -228,13 +228,13 @@ main(int argc, char *argv[])
t = vdev;
p = strchr(t, ',');
if (p == NULL) {
- printf("bad vdev= format\n");
+ thunk_printf("bad vdev= format\n");
return;
}
*p++ = '\0';
type = vdev_type(t);
if (type < 0) {
- printf("unknown vdev device type\n");
+ thunk_printf("unknown vdev device type\n");
return;
}
usermode_vdev_type[usermode_vdev_count] = type;
@@ -245,7 +245,7 @@ main(int argc, char *argv[])
usermode_root_device = argv[i] +
strlen("root=");
} else {
-printf("%s: unknown parameter\n", argv[i]);
+thunk_printf("%s: unknown parameter\n", argv[i]);
usage(argv[0]);
return;
}
@@ -255,7 +255,7 @@ main(int argc, char *argv[])
r = 0;
BOOT_FLAG(argv[i][j], r);
if (r == 0) {
-printf("-%c: unknown flag\n", argv[i][j]);
+thunk_printf("unknown kernel boot flag '%c'\n", argv[i][j]);
usage(argv[0]);
return;
}
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Mon Jun 11 19:23:21 UTC 2018
Modified Files:
src/sys/arch/usermode/usermode: trap.c
Log Message:
Prevent nested SIGIOs ruining the system stack
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.67 src/sys/arch/usermode/usermode/trap.c:1.68
--- src/sys/arch/usermode/usermode/trap.c:1.67 Fri May 18 20:24:16 2018
+++ src/sys/arch/usermode/usermode/trap.c Mon Jun 11 19:23:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.67 2018/05/18 20:24:16 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.68 2018/06/11 19:23:21 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.67 2018/05/18 20:24:16 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.68 2018/06/11 19:23:21 reinoud Exp $");
#include
#include
@@ -335,7 +335,9 @@ handle_signal(int sig, siginfo_t *info,
if (sig == SIGILL)
print_illegal_instruction_siginfo(sig, info, ctx, pc, va, sp);
- /* if we're running on a stack of our own, use the system stack */
+ /* currently running on the dedicated signal stack */
+
+ /* if we're running on a userland stack, switch to the system stack */
from_userland = 0;
if ((sp < (vaddr_t) pcb->sys_stack) ||
(sp > (vaddr_t) pcb->sys_stack_top)) {
@@ -361,7 +363,11 @@ handle_signal(int sig, siginfo_t *info,
jump_ucp.uc_stack.ss_size = sp - (vaddr_t) pcb->sys_stack;
jump_ucp.uc_link = (void *) fp; /* link to old frame on stack */
- thunk_sigemptyset(_ucp.uc_sigmask);
+ /* prevent multiple nested SIGIOs */
+ if (sig == SIGIO)
+ thunk_sigfillset(_ucp.uc_sigmask);
+ else
+ thunk_sigemptyset(_ucp.uc_sigmask);
jump_ucp.uc_flags = _UC_STACK | _UC_CPU | _UC_SIGMASK;
thunk_makecontext(_ucp,
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jdolecek
Date: Mon Jun 11 19:13:38 UTC 2018
Modified Files:
src/sys/dev/pci: if_msk.c if_mskvar.h
Log Message:
adopt tx/rx buffer size computation from OpenBSD rev. 1.51 to fix
"random" msk failures
the crucial fix is that the start/end adresses are computed and
written to hw registers in number of octets (i.e. size /
sizeof(u_int64_t)), as that is actually what the hardware expects
fixes PR kern/36454 (which had fix which highlighted the trouble),
and seems likely to also fix kern/35711 and port-i386/42514
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_mskvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.56 src/sys/dev/pci/if_msk.c:1.57
--- src/sys/dev/pci/if_msk.c:1.56 Sat Jun 9 18:53:16 2018
+++ src/sys/dev/pci/if_msk.c Mon Jun 11 19:13:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.56 2018/06/09 18:53:16 jdolecek Exp $ */
+/* $NetBSD: if_msk.c,v 1.57 2018/06/11 19:13:38 jdolecek Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.56 2018/06/09 18:53:16 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.57 2018/06/11 19:13:38 jdolecek Exp $");
#include
#include
@@ -1029,7 +1029,7 @@ msk_attach(device_t parent, device_t sel
void *kva;
bus_dma_segment_t seg;
int i, rseg;
- u_int32_t chunk, val;
+ u_int32_t chunk;
sc_if->sk_dev = self;
sc_if->sk_port = sa->skc_port;
@@ -1055,25 +1055,18 @@ msk_attach(device_t parent, device_t sel
ether_sprintf(sc_if->sk_enaddr));
/*
- * Set up RAM buffer addresses. The NIC will have a certain
- * amount of SRAM on it, somewhere between 512K and 2MB. We
- * need to divide this up a) between the transmitter and
- * receiver and b) between the two XMACs, if this is a
- * dual port NIC. Our algorithm is to divide up the memory
- * evenly so that everyone gets a fair share.
- *
- * Just to be contrary, Yukon2 appears to have separate memory
- * for each MAC.
+ * Set up RAM buffer addresses. The Yukon2 has a small amount
+ * of SRAM on it, somewhere between 4K and 48K. We need to
+ * divide this up between the transmitter and receiver. We
+ * give the receiver 2/3 of the memory (rounded down), and the
+ * transmitter whatever remains.
*/
- chunk = sc->sk_ramsize - (sc->sk_ramsize + 2) / 3;
- val = sc->sk_rboff / sizeof(u_int64_t);
- sc_if->sk_rx_ramstart = val;
- val += (chunk / sizeof(u_int64_t));
- sc_if->sk_rx_ramend = val - 1;
- chunk = sc->sk_ramsize - chunk;
- sc_if->sk_tx_ramstart = val;
- val += (chunk / sizeof(u_int64_t));
- sc_if->sk_tx_ramend = val - 1;
+ chunk = (2 * (sc->sk_ramsize / sizeof(u_int64_t)) / 3) & ~0xff;
+ sc_if->sk_rx_ramstart = 0;
+ sc_if->sk_rx_ramend = sc_if->sk_rx_ramstart + chunk - 1;
+ chunk = (sc->sk_ramsize / sizeof(u_int64_t)) - chunk;
+ sc_if->sk_tx_ramstart = sc_if->sk_rx_ramend + 1;
+ sc_if->sk_tx_ramend = sc_if->sk_tx_ramstart + chunk - 1;
DPRINTFN(2, ("msk_attach: rx_ramstart=%#x rx_ramend=%#x\n"
" tx_ramstart=%#x tx_ramend=%#x\n",
@@ -1214,7 +1207,7 @@ mskc_attach(device_t parent, device_t se
const char *intrstr = NULL;
bus_size_t size;
int rc, sk_nodenum;
- u_int8_t hw, skrs;
+ u_int8_t hw;
const char *revstr = NULL;
const struct sysctlnode *node;
void *kva;
@@ -1334,23 +1327,14 @@ mskc_attach(device_t parent, device_t se
}
sc->sk_status_ring = (struct msk_status_desc *)kva;
-
sc->sk_int_mod = SK_IM_DEFAULT;
sc->sk_int_mod_pending = 0;
/* Reset the adapter. */
msk_reset(sc);
- skrs = sk_win_read_1(sc, SK_EPROM0);
- if (skrs == 0x00)
- sc->sk_ramsize = 0x2;
- else
- sc->sk_ramsize = skrs * (1<<12);
- sc->sk_rboff = SK_RBOFF_0;
-
- DPRINTFN(2, ("mskc_attach: ramsize=%d (%dk), rboff=%d\n",
- sc->sk_ramsize, sc->sk_ramsize / 1024,
- sc->sk_rboff));
+ sc->sk_ramsize = sk_win_read_1(sc, SK_EPROM0) * 4096;
+ DPRINTFN(2, ("mskc_attach: ramsize=%dK\n", sc->sk_ramsize / 1024));
switch (sc->sk_type) {
case SK_YUKON_XL:
Index: src/sys/dev/pci/if_mskvar.h
diff -u src/sys/dev/pci/if_mskvar.h:1.12 src/sys/dev/pci/if_mskvar.h:1.13
--- src/sys/dev/pci/if_mskvar.h:1.12 Mon Apr 13 16:33:25 2015
+++ src/sys/dev/pci/if_mskvar.h Mon Jun 11 19:13:38 2018
@@ -1,5 +1,5 @@
/* $OpenBSD: if_mskvar.h,v 1.3 2006/12/28 16:34:42 kettenis Exp $ */
-/* $NetBSD: if_mskvar.h,v 1.12 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: if_mskvar.h,v 1.13 2018/06/11 19:13:38 jdolecek Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -193,7 +193,6 @@ struct sk_softc {
u_int32_t sk_workaround;
u_int8_t sk_macs; /* # of MACs */
const char *sk_name;
- u_int32_t sk_rboff; /* RAMbuffer offset */
u_int32_t sk_ramsize;
CVS commit: src/tools/compat
Module Name:src Committed By: maya Date: Mon Jun 11 18:48:25 UTC 2018 Modified Files: src/tools/compat: compat_defs.h configure configure.ac nbtool_config.h.in Log Message: Add configure check and fallback definition for u_longlong_t Should help linux tools compilation of dtrace tools, and not affect NetBSD. >From Chuck Zmudzinski in current-users, with light modification by myself. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/tools/compat/compat_defs.h cvs rdiff -u -r1.88 -r1.89 src/tools/compat/configure cvs rdiff -u -r1.89 -r1.90 src/tools/compat/configure.ac cvs rdiff -u -r1.42 -r1.43 src/tools/compat/nbtool_config.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/compat_defs.h diff -u src/tools/compat/compat_defs.h:1.109 src/tools/compat/compat_defs.h:1.110 --- src/tools/compat/compat_defs.h:1.109 Tue Oct 3 01:43:03 2017 +++ src/tools/compat/compat_defs.h Mon Jun 11 18:48:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_defs.h,v 1.109 2017/10/03 01:43:03 christos Exp $ */ +/* $NetBSD: compat_defs.h,v 1.110 2018/06/11 18:48:24 maya Exp $ */ #ifndef __NETBSD_COMPAT_DEFS_H__ #define __NETBSD_COMPAT_DEFS_H__ @@ -1298,6 +1298,10 @@ __GEN_ENDIAN_DEC(64, le) #define NBBY 8 #endif +#if !HAVE_U_LONGLONG_T +typedef uint64_t u_longlong_t; +#endif + #if !HAVE_U_QUAD_T /* #define, not typedef, as quad_t exists as a struct on some systems */ #define quad_t long long Index: src/tools/compat/configure diff -u src/tools/compat/configure:1.88 src/tools/compat/configure:1.89 --- src/tools/compat/configure:1.88 Sat Dec 9 04:23:22 2017 +++ src/tools/compat/configure Mon Jun 11 18:48:25 2018 @@ -4227,6 +4227,17 @@ _ACEOF fi +ac_fn_c_check_type "$LINENO" "u_longlong_t" "ac_cv_type_u_longlong_t" "#include +" +if test "x$ac_cv_type_u_longlong_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_U_LONGLONG_T 1 +_ACEOF + + +fi + ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include #ifdef HAVE_RPC_TYPES_H #include Index: src/tools/compat/configure.ac diff -u src/tools/compat/configure.ac:1.89 src/tools/compat/configure.ac:1.90 --- src/tools/compat/configure.ac:1.89 Sat Dec 9 04:22:53 2017 +++ src/tools/compat/configure.ac Mon Jun 11 18:48:25 2018 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.89 2017/12/09 04:22:53 sevan Exp $ +# $NetBSD: configure.ac,v 1.90 2018/06/11 18:48:25 maya Exp $ # # Autoconf definition file for libnbcompat. # @@ -97,6 +97,7 @@ AC_CHECK_HEADERS(rpc/types.h netconfig.h # Typedefs. AC_TYPE_SIZE_T AC_CHECK_TYPES([id_t, long long, u_long, u_char, u_short, u_int, u_quad_t]) +AC_CHECK_TYPES([u_longlong_t],,, [#include ]) AC_CHECK_TYPE(socklen_t, [AC_DEFINE([HAVE_SOCKLEN_T], 1, [Define if you have the socklen_t type.])],, [#include Index: src/tools/compat/nbtool_config.h.in diff -u src/tools/compat/nbtool_config.h.in:1.42 src/tools/compat/nbtool_config.h.in:1.43 --- src/tools/compat/nbtool_config.h.in:1.42 Sat Dec 9 04:23:22 2017 +++ src/tools/compat/nbtool_config.h.in Mon Jun 11 18:48:25 2018 @@ -1,6 +1,6 @@ /* nbtool_config.h.in. Generated from configure.ac by autoheader. */ -/* $NetBSD: nbtool_config.h.in,v 1.42 2017/12/09 04:23:22 sevan Exp $*/ +/* $NetBSD: nbtool_config.h.in,v 1.43 2018/06/11 18:48:25 maya Exp $*/ #ifndef __NETBSD_NBTOOL_CONFIG_H__ #define __NETBSD_NBTOOL_CONFIG_H__ @@ -780,6 +780,9 @@ /* Define to 1 if the system has the type `u_long'. */ #undef HAVE_U_LONG +/* Define to 1 if the system has the type `u_longlong_t'. */ +#undef HAVE_U_LONGLONG_T + /* Define to 1 if the system has the type `u_quad_t'. */ #undef HAVE_U_QUAD_T
CVS commit: src/lib/libc/citrus/modules
Module Name:src
Committed By: kamil
Date: Mon Jun 11 18:03:38 UTC 2018
Modified Files:
src/lib/libc/citrus/modules: citrus_mapper_std.c
Log Message:
Correct Undefined Behavior in libc/citrus
Unportable left shift reported with MKSANITIZER=yes USE_SANITIZER=undefined:
# nm /usr/lib/libc.so|grep sanit
/public/src.git/lib/libc/citrus/modules/citrus_mapper_std.c:173:8: runtime
error: left shift of 1 by 31 places cannot be represented in type 'int'
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/citrus/modules/citrus_mapper_std.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/citrus/modules/citrus_mapper_std.c
diff -u src/lib/libc/citrus/modules/citrus_mapper_std.c:1.10 src/lib/libc/citrus/modules/citrus_mapper_std.c:1.11
--- src/lib/libc/citrus/modules/citrus_mapper_std.c:1.10 Sat Nov 19 18:48:39 2011
+++ src/lib/libc/citrus/modules/citrus_mapper_std.c Mon Jun 11 18:03:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_mapper_std.c,v 1.10 2011/11/19 18:48:39 tnozaki Exp $ */
+/* $NetBSD: citrus_mapper_std.c,v 1.11 2018/06/11 18:03:38 kamil Exp $ */
/*-
* Copyright (c)2003, 2006 Citrus Project,
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper_std.c,v 1.10 2011/11/19 18:48:39 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_mapper_std.c,v 1.11 2018/06/11 18:03:38 kamil Exp $");
#endif /* LIBC_SCCS and not lint */
#include
@@ -170,7 +170,7 @@ rowcol_parse_variable_compat(struct _cit
rc->rc_dst_invalid = be32toh(rcx->rcx_dst_invalid);
rc->rc_dst_unit_bits = be32toh(rcx->rcx_dst_unit_bits);
m = be32toh(rcx->rcx_src_col_bits);
- n = 1 << (m - 1);
+ n = 1U << (m - 1);
n |= n - 1;
rc->rc_src_rowcol_bits = m;
rc->rc_src_rowcol_mask = n;
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: kamil
Date: Mon Jun 11 17:45:51 UTC 2018
Modified Files:
src/sbin/ifconfig: af_inet.c
Log Message:
Correct Undefined Behavior in ifconfig(8)
Unportable left shift reported with MKSANITIZER=yes USE_SANITIZER=undefined:
# ifconfig
alc0: flags=0x8843 mtu 1500
ec_capabilities=3
ec_enabled=0
address: xx:xx:xx:xx:xx:xx
/public/src.git/sbin/ifconfig/af_inet.c:102:34: runtime error: left shift of
16777215 by 8 places cannot be represented in type 'int'
inet 192.168.0.38/24 broadcast 192.168.0.255 flags 0x0
inet6 :::::xxx%alc0/64 flags 0x0 scopeid 0x1
lo0: flags=0x8049 mtu 33624
inet 127.0.0.1/8 flags 0x0
inet6 ::1/128 flags 0x20
inet6 fe80::1%lo0/64 flags 0x0 scopeid 0x2
Change shifting left 1 to shifting 1U. This corrects the issue.
if (cidr < 32) {/* more than 1 bit in mask */
/* check for non-contig netmask */
if ((mask ^ (((1 << cidr) - 1) << (32 - cidr))) != 0) // <- here
return -1; /* noncontig, no pfxlen */
}
Solution suggested by
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sbin/ifconfig/af_inet.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.24 src/sbin/ifconfig/af_inet.c:1.25
--- src/sbin/ifconfig/af_inet.c:1.24 Sat Oct 1 20:59:49 2016
+++ src/sbin/ifconfig/af_inet.c Mon Jun 11 17:45:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet.c,v 1.24 2016/10/01 20:59:49 kre Exp $ */
+/* $NetBSD: af_inet.c,v 1.25 2018/06/11 17:45:50 kamil Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_inet.c,v 1.24 2016/10/01 20:59:49 kre Exp $");
+__RCSID("$NetBSD: af_inet.c,v 1.25 2018/06/11 17:45:50 kamil Exp $");
#endif /* not lint */
#include
@@ -99,7 +99,7 @@ in_prefixlen(struct sockaddr *sa)
if (cidr < 32) { /* more than 1 bit in mask */
/* check for non-contig netmask */
- if ((mask ^ (((1 << cidr) - 1) << (32 - cidr))) != 0)
+ if ((mask ^ (((1U << cidr) - 1) << (32 - cidr))) != 0)
return -1; /* noncontig, no pfxlen */
}
CVS commit: src/external/gpl3/gcc/lib/libubsan
Module Name:src
Committed By: christos
Date: Mon Jun 11 15:29:33 UTC 2018
Modified Files:
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
use LIBISCXX = yes, instead of hard-coding the c++ library. Suggested by joerg
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/libubsan/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.6 src/external/gpl3/gcc/lib/libubsan/Makefile:1.7
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.6 Mon Jun 11 08:47:47 2018
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Mon Jun 11 11:29:33 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2018/06/11 12:47:47 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/06/11 15:29:33 christos Exp $
UNSUPPORTED_COMPILER.clang= # defined
+LIBISCXX = yes
.include
@@ -28,7 +29,6 @@ COPTS.${_s}.cc+=-frtti
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
-LIBDPLIBS+= stdc++ ${.CURDIR}/../libstdc++-v3
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
.if ${MACHINE_ARCH} == "vax"
CVS commit: src
Module Name:src
Committed By: kamil
Date: Mon Jun 11 14:18:17 UTC 2018
Modified Files:
src/games/rogue: Makefile
src/sbin/fsck_ffs: Makefile
src/usr.bin/dc: Makefile
src/usr.bin/gprof: Makefile
Log Message:
Restore the MKGROFF=bo MKCXX=yes build
Mark the documentation in dc(1), gprof(1), rogue(6) and fsck_ffs(8) with
the .roff flag in SUBDIR.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/games/rogue/Makefile
cvs rdiff -u -r1.48 -r1.49 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/dc/Makefile
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/gprof/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/rogue/Makefile
diff -u src/games/rogue/Makefile:1.19 src/games/rogue/Makefile:1.20
--- src/games/rogue/Makefile:1.19 Sat Jul 5 19:22:03 2014
+++ src/games/rogue/Makefile Mon Jun 11 14:18:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/07/05 19:22:03 dholland Exp $
+# $NetBSD: Makefile,v 1.20 2018/06/11 14:18:16 kamil Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= rogue
@@ -12,7 +12,7 @@ HIDEGAME=hidegame
SETGIDGAME=yes
MAN= rogue.6
-SUBDIR+=USD.doc
+SUBDIR.roff+=USD.doc
.include
.include
Index: src/sbin/fsck_ffs/Makefile
diff -u src/sbin/fsck_ffs/Makefile:1.48 src/sbin/fsck_ffs/Makefile:1.49
--- src/sbin/fsck_ffs/Makefile:1.48 Wed Feb 8 16:11:40 2017
+++ src/sbin/fsck_ffs/Makefile Mon Jun 11 14:18:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2017/02/08 16:11:40 rin Exp $
+# $NetBSD: Makefile,v 1.49 2018/06/11 14:18:17 kamil Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
# when making a change to this file, please check if the change is
@@ -9,7 +9,7 @@
MAN= fsck_ffs.8
SRCS= ffs_bswap.c ffs_appleufs.c
-SUBDIR= SMM.doc
+SUBDIR.roff= SMM.doc
.include "Makefile.common"
Index: src/usr.bin/dc/Makefile
diff -u src/usr.bin/dc/Makefile:1.3 src/usr.bin/dc/Makefile:1.4
--- src/usr.bin/dc/Makefile:1.3 Sun May 21 15:28:43 2017
+++ src/usr.bin/dc/Makefile Mon Jun 11 14:18:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/05/21 15:28:43 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2018/06/11 14:18:17 kamil Exp $
.include
@@ -9,7 +9,7 @@ WARNS=6
LDADD= -lcrypto
DPADD= ${LIBCRYPTO}
-SUBDIR+=USD.doc
+SUBDIR.roff+=USD.doc
.include
.include
Index: src/usr.bin/gprof/Makefile
diff -u src/usr.bin/gprof/Makefile:1.29 src/usr.bin/gprof/Makefile:1.30
--- src/usr.bin/gprof/Makefile:1.29 Sat Jul 5 19:22:43 2014
+++ src/usr.bin/gprof/Makefile Mon Jun 11 14:18:17 2018
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.29 2014/07/05 19:22:43 dholland Exp $
+# $NetBSD: Makefile,v 1.30 2018/06/11 14:18:17 kamil Exp $
-SUBDIR=PSD.doc
+SUBDIR.roff=PSD.doc
.include
CVS commit: src/external/gpl3/gcc/lib/libubsan
Module Name:src
Committed By: christos
Date: Mon Jun 11 12:47:47 UTC 2018
Modified Files:
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
Add libstdc++ again; needed for:
undefined reference to `typeinfo for __cxxabiv1::__class_type_info'
undefined reference to `typeinfo for __cxxabiv1::__si_class_type_info'
undefined reference to `typeinfo for __cxxabiv1::__vmi_class_type_info'
undefined reference to `typeinfo for std::type_info'
undefined reference to `__dynamic_cast'
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libubsan/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.5 src/external/gpl3/gcc/lib/libubsan/Makefile:1.6
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.5 Tue Feb 13 22:37:39 2018
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Mon Jun 11 08:47:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/02/14 03:37:39 christos Exp $
+# $NetBSD: Makefile,v 1.6 2018/06/11 12:47:47 christos Exp $
UNSUPPORTED_COMPILER.clang= # defined
@@ -28,6 +28,7 @@ COPTS.${_s}.cc+=-frtti
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
+LIBDPLIBS+= stdc++ ${.CURDIR}/../libstdc++-v3
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
.if ${MACHINE_ARCH} == "vax"
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Mon Jun 11 10:34:18 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_82599.c ixgbe_api.c ixgbe_type.h
ixgbe_x540.c
Log Message:
Apply changes of FreeBSD ix-3.2.18.tgz:
- Add IXGBE_DEV_ID_82599_LS(0x154f) support.
- Increase timeout for newer than ixgbe_mac_X550 (i.e. Xeon-D and Denverton)
in ixgbe_acquire_swfw_sync_X540().
- Add some unused macros (IXGBE_FW_LESM_*).
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ixgbe/ixgbe_x540.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe_82599.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.19 src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.20
--- src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.19 Wed Apr 4 08:59:22 2018
+++ src/sys/dev/pci/ixgbe/ixgbe_82599.c Mon Jun 11 10:34:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_82599.c,v 1.19 2018/04/04 08:59:22 msaitoh Exp $ */
+/* $NetBSD: ixgbe_82599.c,v 1.20 2018/06/11 10:34:18 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -566,6 +566,9 @@ enum ixgbe_media_type ixgbe_get_media_ty
case IXGBE_DEV_ID_82599_T3_LOM:
media_type = ixgbe_media_type_copper;
break;
+ case IXGBE_DEV_ID_82599_LS:
+ media_type = ixgbe_media_type_fiber_lco;
+ break;
case IXGBE_DEV_ID_82599_QSFP_SF_QP:
media_type = ixgbe_media_type_fiber_qsfp;
break;
Index: src/sys/dev/pci/ixgbe/ixgbe_api.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_api.c:1.20 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.21
--- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.20 Wed Apr 4 08:59:22 2018
+++ src/sys/dev/pci/ixgbe/ixgbe_api.c Mon Jun 11 10:34:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_api.c,v 1.20 2018/04/04 08:59:22 msaitoh Exp $ */
+/* $NetBSD: ixgbe_api.c,v 1.21 2018/06/11 10:34:18 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -173,6 +173,7 @@ s32 ixgbe_set_mac_type(struct ixgbe_hw *
case IXGBE_DEV_ID_82599_SFP_SF_QP:
case IXGBE_DEV_ID_82599_QSFP_SF_QP:
case IXGBE_DEV_ID_82599EN_SFP:
+ case IXGBE_DEV_ID_82599_LS:
case IXGBE_DEV_ID_82599_CX4:
case IXGBE_DEV_ID_82599_BYPASS:
case IXGBE_DEV_ID_82599_T3_LOM:
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.34 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.35
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.34 Wed Apr 4 08:59:22 2018
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Mon Jun 11 10:34:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_type.h,v 1.34 2018/04/04 08:59:22 msaitoh Exp $ */
+/* $NetBSD: ixgbe_type.h,v 1.35 2018/06/11 10:34:18 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -131,6 +131,7 @@
#define IXGBE_SUBDEV_ID_82599EN_SFP_OCP1 0x0001
#define IXGBE_DEV_ID_82599_XAUI_LOM PCI_PRODUCT_INTEL_82599_XAUI_LOM
#define IXGBE_DEV_ID_82599_T3_LOM 0x151C
+#define IXGBE_DEV_ID_82599_LS 0x154F
#define IXGBE_DEV_ID_82599_VF 0x10ED
#define IXGBE_DEV_ID_82599_VF_HV 0x152E
#define IXGBE_DEV_ID_82599_BYPASS 0x155D
@@ -2466,6 +2467,16 @@ enum {
#define IXGBE_FW_LESM_PARAMETERS_PTR 0x2
#define IXGBE_FW_LESM_STATE_1 0x1
#define IXGBE_FW_LESM_STATE_ENABLED 0x8000 /* LESM Enable bit */
+#define IXGBE_FW_LESM_2_STATES_ENABLED_MASK 0x1F
+#define IXGBE_FW_LESM_2_STATES_ENABLED 0x12
+#define IXGBE_FW_LESM_STATE0_10G_ENABLED 0x6FFF
+#define IXGBE_FW_LESM_STATE1_10G_ENABLED 0x4FFF
+#define IXGBE_FW_LESM_STATE0_10G_DISABLED 0x0FFF
+#define IXGBE_FW_LESM_STATE1_10G_DISABLED 0x2FFF
+#define IXGBE_FW_LESM_PORT0_STATE0_OFFSET 0x2
+#define IXGBE_FW_LESM_PORT0_STATE1_OFFSET 0x3
+#define IXGBE_FW_LESM_PORT1_STATE0_OFFSET 0x6
+#define IXGBE_FW_LESM_PORT1_STATE1_OFFSET 0x7
#define IXGBE_FW_PASSTHROUGH_PATCH_CONFIG_PTR 0x4
#define IXGBE_FW_PATCH_VERSION_4 0x7
#define IXGBE_FCOE_IBA_CAPS_BLK_PTR 0x33 /* iSCSI/FCOE block */
@@ -3748,6 +3759,7 @@ enum ixgbe_media_type {
ixgbe_media_type_fiber,
ixgbe_media_type_fiber_fixed,
ixgbe_media_type_fiber_qsfp,
+ ixgbe_media_type_fiber_lco,
ixgbe_media_type_copper,
ixgbe_media_type_backplane,
ixgbe_media_type_cx4,
Index: src/sys/dev/pci/ixgbe/ixgbe_x540.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.15 src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.16
--- src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.15 Wed Apr 4 08:59:22 2018
+++ src/sys/dev/pci/ixgbe/ixgbe_x540.c Mon Jun 11 10:34:18 2018
@@ -790,7 +790,7 @@ s32 ixgbe_acquire_swfw_sync_X540(struct
swmask |= swi2c_mask;
fwmask |= swi2c_mask << 2;
- if (hw->mac.type == ixgbe_mac_X550)
+ if (hw->mac.type >= ixgbe_mac_X550)
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jun 11 08:51:20 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Ticket #875 To generate a diff of this commit: cvs rdiff -u -r1.1.2.208 -r1.1.2.209 src/doc/CHANGES-8.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.0 diff -u src/doc/CHANGES-8.0:1.1.2.208 src/doc/CHANGES-8.0:1.1.2.209 --- src/doc/CHANGES-8.0:1.1.2.208 Mon Jun 11 08:48:57 2018 +++ src/doc/CHANGES-8.0 Mon Jun 11 08:51:20 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.208 2018/06/11 08:48:57 martin Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.209 2018/06/11 08:51:20 martin Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -13878,3 +13878,8 @@ share/i18n/esdb/ISO-8859/ISO-8859.alias Add more aliases for Hebrew and Arabic ISO-8859-... encodings. [maya, ticket #874] +usr.sbin/arp/arp.c1.59 + + Fix usage of `arp -d'. + [nonaka, ticket #875] +
CVS commit: [netbsd-8] src/usr.sbin/arp
Module Name:src
Committed By: martin
Date: Mon Jun 11 08:50:31 UTC 2018
Modified Files:
src/usr.sbin/arp [netbsd-8]: arp.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #875):
usr.sbin/arp/arp.c: revision 1.59
fix usage of `arp -d'.
To generate a diff of this commit:
cvs rdiff -u -r1.55.8.1 -r1.55.8.2 src/usr.sbin/arp/arp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/arp/arp.c
diff -u src/usr.sbin/arp/arp.c:1.55.8.1 src/usr.sbin/arp/arp.c:1.55.8.2
--- src/usr.sbin/arp/arp.c:1.55.8.1 Fri Jul 7 13:57:26 2017
+++ src/usr.sbin/arp/arp.c Mon Jun 11 08:50:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.c,v 1.55.8.1 2017/07/07 13:57:26 martin Exp $ */
+/* $NetBSD: arp.c,v 1.55.8.2 2018/06/11 08:50:31 martin Exp $ */
/*
* Copyright (c) 1984, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1984, 19
#if 0
static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: arp.c,v 1.55.8.1 2017/07/07 13:57:26 martin Exp $");
+__RCSID("$NetBSD: arp.c,v 1.55.8.2 2018/06/11 08:50:31 martin Exp $");
#endif
#endif /* not lint */
@@ -597,7 +597,7 @@ usage(void)
progname = getprogname();
(void)fprintf(stderr, "Usage: %s [-n] hostname\n", progname);
(void)fprintf(stderr, " %s [-nv] -a\n", progname);
- (void)fprintf(stderr, " %s [-v] -d [-a|hostname [pub [proxy]]]\n",
+ (void)fprintf(stderr, " %s [-v] -d [-a|hostname [proxy]]\n",
progname);
(void)fprintf(stderr, " %s -s hostname ether_addr [temp] [pub [proxy]]\n",
progname);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jun 11 08:48:57 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Ammend ticket #870 To generate a diff of this commit: cvs rdiff -u -r1.1.2.207 -r1.1.2.208 src/doc/CHANGES-8.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.0 diff -u src/doc/CHANGES-8.0:1.1.2.207 src/doc/CHANGES-8.0:1.1.2.208 --- src/doc/CHANGES-8.0:1.1.2.207 Sat Jun 9 18:01:24 2018 +++ src/doc/CHANGES-8.0 Mon Jun 11 08:48:57 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.207 2018/06/09 18:01:24 martin Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.208 2018/06/11 08:48:57 martin Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -13850,6 +13850,7 @@ usr.bin/make/unit-tests/varquote.exp up usr.bin/make/unit-tests/varquote.mk upto 1.2 usr.bin/make/var.c1.220 distrib/sets/lists/tests/mi 1.784 +sys/arch/acorn26/stand/lib/Makefile.inc (patch) - Introduce :q modifier for make variables and make it double escape $'s so that passing variables to recursive makes with :q works as
CVS commit: [netbsd-8] src/sys/arch/acorn26/stand/lib
Module Name:src
Committed By: martin
Date: Mon Jun 11 08:46:43 UTC 2018
Modified Files:
src/sys/arch/acorn26/stand/lib [netbsd-8]: Makefile.inc
Log Message:
Apply patch, requested by christos on ticket #870:
Use :q (instead of :Q) to quote make variables passed to sub makes here too.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/arch/acorn26/stand/lib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/stand/lib/Makefile.inc
diff -u src/sys/arch/acorn26/stand/lib/Makefile.inc:1.4 src/sys/arch/acorn26/stand/lib/Makefile.inc:1.4.10.1
--- src/sys/arch/acorn26/stand/lib/Makefile.inc:1.4 Tue Mar 22 08:25:22 2016
+++ src/sys/arch/acorn26/stand/lib/Makefile.inc Mon Jun 11 08:46:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2016/03/22 08:25:22 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.4.10.1 2018/06/11 08:46:43 martin Exp $
#
# Configuration variables (default values are below):
#
@@ -22,12 +22,12 @@ RISCOSLIB= ${RISCOSDST}/libriscos.a
RISCOSMAKE= \
cd ${RISCOSDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
MAKEOBJDIR=${RISCOSDST} ${MAKE} \
- CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
- AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
- LD=${LD:Q} STRIP=${STRIP:Q} \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
- RISCOSCPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:Q} \
- RISCOSMISCCPPFLAGS=${RISCOSMISCCPPFLAGS:Q} \
+ CC=${CC:q} CFLAGS=${CFLAGS:q} \
+ AS=${AS:q} AFLAGS=${AFLAGS:q} \
+ LD=${LD:q} STRIP=${STRIP:q} \
+ MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
+ RISCOSCPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:q} \
+ RISCOSMISCCPPFLAGS=${RISCOSMISCCPPFLAGS:q} \
${RISCOSMISCMAKEFLAGS}
${RISCOSLIB}: .NOTMAIN .MAKE __always_make_riscoslib
