CVS commit: src/sys/rump
Module Name:src
Committed By: matt
Date: Sat Jul 9 05:52:22 UTC 2016
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Pass down ${CPUFLAGS}
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/rump/Makefile.rump
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.120 src/sys/rump/Makefile.rump:1.121
--- src/sys/rump/Makefile.rump:1.120 Sun Nov 15 13:50:10 2015
+++ src/sys/rump/Makefile.rump Sat Jul 9 05:52:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.120 2015/11/15 13:50:10 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.121 2016/07/09 05:52:22 matt Exp $
#
.if !defined(_RUMP_MK)
@@ -149,19 +149,19 @@ RUMPCOMP_USER_WERROR = ${${_NOWERROR} ==
.for rcusrc in ${RUMPCOMP_USER_SRCS:R}
${rcusrc}.d: ${rcusrc}.c
${_MKTARGET_CREATE}
- ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${.ALLSRC:O:u:M*${rcusrc}.c}
+ ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${CPUFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${.ALLSRC:O:u:M*${rcusrc}.c}
${rcusrc}.o: ${rcusrc}.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${RUMPCOMP_USER_WERROR} ${RUMPCOMP_USER_WARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
+ ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${CPUFLAGS} ${RUMPCOMP_USER_WERROR} ${RUMPCOMP_USER_WARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
${rcusrc}.pico: ${rcusrc}.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${RUMPCOMP_USER_WERROR} ${RUMPCOMP_USER_WARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
+ ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${CPUFLAGS} ${RUMPCOMP_USER_WERROR} ${RUMPCOMP_USER_WARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
${rcusrc}.po: ${rcusrc}.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${RUMPCOMP_USER_WERROR} ${RUMPCOMP_USER_WARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
+ ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${CPUFLAGS} ${RUMPCOMP_USER_WERROR} ${RUMPCOMP_USER_WARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
RUMPOBJ_NORENAME+=${rcusrc}.o ${rcusrc}.pico ${rcusrc}.po
SRCS+=${rcusrc}.c
CVS commit: src/sys/arch/macppc/pci
Module Name:src
Committed By: macallan
Date: Fri Jul 8 22:21:52 UTC 2016
Modified Files:
src/sys/arch/macppc/pci: bandit.c
Log Message:
first step to make genfb work with /chaos/control - don't do config space
writes on /chaos.
tested by jak
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/pci/bandit.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/macppc/pci/bandit.c
diff -u src/sys/arch/macppc/pci/bandit.c:1.31 src/sys/arch/macppc/pci/bandit.c:1.32
--- src/sys/arch/macppc/pci/bandit.c:1.31 Fri Oct 2 05:22:51 2015
+++ src/sys/arch/macppc/pci/bandit.c Fri Jul 8 22:21:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bandit.c,v 1.31 2015/10/02 05:22:51 msaitoh Exp $ */
+/* $NetBSD: bandit.c,v 1.32 2016/07/08 22:21:52 macallan Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bandit.c,v 1.31 2015/10/02 05:22:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bandit.c,v 1.32 2016/07/08 22:21:52 macallan Exp $");
#include
#include
@@ -46,6 +46,7 @@ struct bandit_softc {
struct genppc_pci_chipset sc_pc;
struct powerpc_bus_space sc_iot;
struct powerpc_bus_space sc_memt;
+ boolean_t sc_is_chaos;
};
static void bandit_attach(device_t, device_t, void *);
@@ -53,6 +54,7 @@ static int bandit_match(device_t, cfdata
static pcireg_t bandit_conf_read(void *, pcitag_t, int);
static void bandit_conf_write(void *, pcitag_t, int, pcireg_t);
+static void chaos_conf_write(void *, pcitag_t, int, pcireg_t);
static void bandit_init(struct bandit_softc *);
@@ -89,6 +91,8 @@ bandit_attach(device_t parent, device_t
aprint_normal("\n");
sc->sc_dev = self;
+ sc->sc_is_chaos = (strcmp(ca->ca_name, "chaos") == 0);
+
/* Bandit address */
if (OF_getprop(node, "reg", reg, sizeof(reg)) < 8)
return;
@@ -131,7 +135,10 @@ bandit_attach(device_t parent, device_t
pc->pc_data = mapiodev(reg[0] + 0xc0, 8, false);
pc->pc_bus = busrange[0];
pc->pc_conf_read = bandit_conf_read;
- pc->pc_conf_write = bandit_conf_write;
+ if (sc->sc_is_chaos) {
+ pc->pc_conf_write = chaos_conf_write;
+ } else
+ pc->pc_conf_write = bandit_conf_write;
bandit_init(sc);
@@ -225,6 +232,15 @@ bandit_conf_write(void *cookie, pcitag_t
splx(s);
}
+/*
+ * XXX
+ * /chaos really hates writes to config space, so we just don't do them
+ */
+static void
+chaos_conf_write(void *cookie, pcitag_t tag, int reg, pcireg_t data)
+{
+}
+
#define PCI_BANDIT 11
#define PCI_REG_MODE_SELECT 0x50
CVS commit: src/sys/arch
Module Name:src Committed By: maxv Date: Fri Jul 8 09:15:38 UTC 2016 Modified Files: src/sys/arch/amd64/amd64: locore.S src/sys/arch/i386/i386: locore.S Log Message: The preloaded modules are now reallocated dynamically by the kernel. This area does not need to be executable anymore. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.133 -r1.134 src/sys/arch/i386/i386/locore.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/amd64/amd64/locore.S diff -u src/sys/arch/amd64/amd64/locore.S:1.104 src/sys/arch/amd64/amd64/locore.S:1.105 --- src/sys/arch/amd64/amd64/locore.S:1.104 Mon Jul 4 07:56:07 2016 +++ src/sys/arch/amd64/amd64/locore.S Fri Jul 8 09:15:38 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.104 2016/07/04 07:56:07 maxv Exp $ */ +/* $NetBSD: locore.S,v 1.105 2016/07/08 09:15:38 maxv Exp $ */ /* * Copyright-o-rama! @@ -703,13 +703,13 @@ no_NOX: orl $(PG_V|PG_KW),%eax fillkpt_nox - /* Map [SYMS]+[PRELOADED MODULES] RWX. */ + /* Map [SYMS]+[PRELOADED MODULES] RW. */ movl $RELOC(__kernel_end),%eax movl %esi,%ecx /* start of BOOTSTRAP TABLES */ subl %eax,%ecx shrl $PGSHIFT,%ecx orl $(PG_V|PG_KW),%eax - fillkpt + fillkpt_nox /* Map the BOOTSTRAP TABLES RW. */ movl %esi,%eax /* start of BOOTSTRAP TABLES */ Index: src/sys/arch/i386/i386/locore.S diff -u src/sys/arch/i386/i386/locore.S:1.133 src/sys/arch/i386/i386/locore.S:1.134 --- src/sys/arch/i386/i386/locore.S:1.133 Mon Jul 4 07:56:07 2016 +++ src/sys/arch/i386/i386/locore.S Fri Jul 8 09:15:38 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.133 2016/07/04 07:56:07 maxv Exp $ */ +/* $NetBSD: locore.S,v 1.134 2016/07/08 09:15:38 maxv Exp $ */ /* * Copyright-o-rama! @@ -128,7 +128,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.133 2016/07/04 07:56:07 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.134 2016/07/08 09:15:38 maxv Exp $"); #include "opt_compat_oldboot.h" #include "opt_copy_symtab.h" @@ -738,13 +738,13 @@ no_NOX: orl $(PG_V|PG_KW),%eax fillkpt_nox - /* Map [SYMS]+[PRELOADED MODULES] RWX. */ + /* Map [SYMS]+[PRELOADED MODULES] RW. */ movl $RELOC(__kernel_end),%eax movl %esi,%ecx /* start of BOOTSTRAP TABLES */ subl %eax,%ecx shrl $PGSHIFT,%ecx orl $(PG_V|PG_KW),%eax - fillkpt + fillkpt_nox /* Map the BOOTSTRAP TABLES RW. */ movl %esi,%eax /* start of BOOTSTRAP TABLES */
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Fri Jul 8 08:55:48 UTC 2016
Modified Files:
src/sys/kern: subr_kobj.c
Log Message:
Force the kernel to dynamically reallocate the preloaded modules.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/kern/subr_kobj.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/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.53 src/sys/kern/subr_kobj.c:1.54
--- src/sys/kern/subr_kobj.c:1.53 Thu Jul 7 06:55:43 2016
+++ src/sys/kern/subr_kobj.c Fri Jul 8 08:55:48 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.53 2016/07/07 06:55:43 msaitoh Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.54 2016/07/08 08:55:48 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.53 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.54 2016/07/08 08:55:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -392,14 +392,11 @@ kobj_load(kobj_t ko)
* Size up code/data(progbits) and bss(nobits).
*/
alignmask = 0;
- mapbase = 0;
mapsize = 0;
for (i = 0; i < hdr->e_shnum; i++) {
switch (shdr[i].sh_type) {
case SHT_PROGBITS:
case SHT_NOBITS:
- if (mapbase == 0)
-mapbase = shdr[i].sh_offset;
alignmask = shdr[i].sh_addralign - 1;
mapsize += alignmask;
mapsize &= ~alignmask;
@@ -416,19 +413,17 @@ kobj_load(kobj_t ko)
if (mapsize == 0) {
kobj_error(ko, "no text/data/bss");
error = ENOEXEC;
+ goto out;
+ }
+
+ mapbase = uvm_km_alloc(module_map, round_page(mapsize),
+ 0, UVM_KMF_WIRED | UVM_KMF_EXEC);
+ if (mapbase == 0) {
+ kobj_error(ko, "out of memory");
+ error = ENOMEM;
goto out;
}
- if (ko->ko_type == KT_MEMORY) {
- mapbase += (vaddr_t)ko->ko_source;
- } else {
- mapbase = uvm_km_alloc(module_map, round_page(mapsize),
- 0, UVM_KMF_WIRED | UVM_KMF_EXEC);
- if (mapbase == 0) {
- kobj_error(ko, "out of memory");
- error = ENOMEM;
- goto out;
- }
- }
+
ko->ko_address = mapbase;
ko->ko_size = mapsize;
@@ -445,21 +440,11 @@ kobj_load(kobj_t ko)
case SHT_PROGBITS:
case SHT_NOBITS:
alignmask = shdr[i].sh_addralign - 1;
- if (ko->ko_type == KT_MEMORY) {
-addr = (void *)(shdr[i].sh_offset +
-(vaddr_t)ko->ko_source);
-if (((vaddr_t)addr & alignmask) != 0) {
- kobj_error(ko,
- "section %d not aligned", i);
- error = ENOEXEC;
- goto out;
-}
- } else {
-mapbase += alignmask;
-mapbase &= ~alignmask;
-addr = (void *)mapbase;
-mapbase += shdr[i].sh_size;
- }
+ mapbase += alignmask;
+ mapbase &= ~alignmask;
+ addr = (void *)mapbase;
+ mapbase += shdr[i].sh_size;
+
ko->ko_progtab[pb].addr = addr;
if (shdr[i].sh_type == SHT_PROGBITS) {
ko->ko_progtab[pb].name = "<>";
@@ -469,16 +454,11 @@ kobj_load(kobj_t ko)
kobj_error(ko, "read failed %d", error);
goto out;
}
- } else if (ko->ko_type == KT_MEMORY &&
- shdr[i].sh_size != 0) {
-kobj_error(ko, "non-loadable BSS "
-"section in pre-loaded module");
-error = ENOEXEC;
-goto out;
- } else {
+ } else { /* SHT_NOBITS */
ko->ko_progtab[pb].name = "<>";
memset(addr, 0, shdr[i].sh_size);
}
+
ko->ko_progtab[pb].size = shdr[i].sh_size;
ko->ko_progtab[pb].sec = i;
if (ko->ko_shstrtab != NULL && shdr[i].sh_name != 0) {
@@ -555,7 +535,7 @@ kobj_load(kobj_t ko)
panic("%s:%d: %s: lost rela", __func__, __LINE__,
ko->ko_name);
}
- if (ko->ko_type != KT_MEMORY && mapbase != ko->ko_address + mapsize) {
+ if (mapbase != ko->ko_address + mapsize) {
panic("%s:%d: %s: "
"mapbase 0x%lx != address %lx + mapsize %ld (0x%lx)\n",
__func__, __LINE__, ko->ko_name,
@@ -606,7 +586,7 @@ kobj_unload(kobj_t ko)
kobj_error(ko, "machine dependent deinit failed %d",
error);
}
- if (ko->ko_address != 0 && ko->ko_type != KT_MEMORY) {
+ if (ko->ko_address != 0) {
uvm_km_free(module_map, ko->ko_address, round_page(ko->ko_size),
UVM_KMF_WIRED);
}
@@ -1023,23 +1003,29 @@ kobj_read_mem(kobj_t ko, void **basep, s
void *base = *basep;
int error;
+ KASSERT(ko->ko_source != NULL);
+
if (ko->ko_memsize != -1 && off + size > ko->ko_memsize) {
kobj_error(ko, "preloaded object short");
error = EINVAL;
base = NULL;
} else if (allocate) {
- base = (uint8_t *)ko->ko_source + off;
+ base = kmem_alloc(size, KM_SLEEP);
error = 0;
- } else if ((uint8_t *)base != (uint8_t *)ko->ko_source + off) {
- kobj_error(ko, "object not aligned");
- kobj_error(ko, "source=%p base=%p off=%d "
- "size=%zu", ko->ko_source, base, (int)off, size);
- error = EINVAL;
} else {
- /* Nothing to do. Loading in-situ. */
error = 0;
}
+ if (error == 0) {
+ /* Copy the section */
+ memcpy(base, (uint8_t *)ko->ko_source + off, size);
+ }
+
+
CVS commit: src/tests/net/route
Module Name:src
Committed By: ozaki-r
Date: Fri Jul 8 08:27:07 UTC 2016
Modified Files:
src/tests/net/route: t_flags.sh t_flags6.sh
Log Message:
Fix test names
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/net/route/t_flags.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/net/route/t_flags6.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/route/t_flags.sh
diff -u src/tests/net/route/t_flags.sh:1.9 src/tests/net/route/t_flags.sh:1.10
--- src/tests/net/route/t_flags.sh:1.9 Tue Jun 21 05:04:16 2016
+++ src/tests/net/route/t_flags.sh Fri Jul 8 08:27:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_flags.sh,v 1.9 2016/06/21 05:04:16 ozaki-r Exp $
+# $NetBSD: t_flags.sh,v 1.10 2016/07/08 08:27:07 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -123,7 +123,7 @@ check_entry_fail()
"rump.netstat -rn -f inet | grep ^'$ip'"
}
-test_lo6()
+test_lo()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -132,7 +132,7 @@ test_lo6()
check_entry_flags 127.0.0.1 UHl
}
-test_connected6()
+test_connected()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -144,7 +144,7 @@ test_connected6()
check_entry_flags 10.0.0/24 UC
}
-test_default_gateway6()
+test_default_gateway()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -156,7 +156,7 @@ test_default_gateway6()
check_entry_flags default UGS
}
-test_static6()
+test_static()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -176,7 +176,7 @@ test_static6()
check_entry_flags 10.0.2/24 UGS
}
-test_blackhole6()
+test_blackhole()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -202,7 +202,7 @@ test_blackhole6()
check_entry_fail 10.0.0.1 UH
}
-test_reject6()
+test_reject()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -261,7 +261,7 @@ test_reject6()
return 0
}
-test_icmp_redirect6()
+test_icmp_redirect()
{
### Testing Dynamic flag ###
@@ -320,7 +320,7 @@ test_icmp_redirect6()
teardown_gw
}
-test_announce6()
+test_announce()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -368,12 +368,12 @@ add_test()
atf_init_test_cases()
{
- add_test lo6 "Tests route flags: loop back interface"
- add_test connected6 "Tests route flags: connected route"
- add_test default_gateway6 "Tests route flags: default gateway"
- add_test static6 "Tests route flags: static route"
- add_test blackhole6 "Tests route flags: blackhole route"
- add_test reject6 "Tests route flags: reject route"
- add_test icmp_redirect6 "Tests route flags: icmp redirect"
- add_test announce6"Tests route flags: announce flag"
+ add_test lo "Tests route flags: loop back interface"
+ add_test connected "Tests route flags: connected route"
+ add_test default_gateway "Tests route flags: default gateway"
+ add_test static "Tests route flags: static route"
+ add_test blackhole "Tests route flags: blackhole route"
+ add_test reject "Tests route flags: reject route"
+ add_test icmp_redirect "Tests route flags: icmp redirect"
+ add_test announce"Tests route flags: announce flag"
}
Index: src/tests/net/route/t_flags6.sh
diff -u src/tests/net/route/t_flags6.sh:1.5 src/tests/net/route/t_flags6.sh:1.6
--- src/tests/net/route/t_flags6.sh:1.5 Sat Apr 23 15:47:54 2016
+++ src/tests/net/route/t_flags6.sh Fri Jul 8 08:27:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_flags6.sh,v 1.5 2016/04/23 15:47:54 ozaki-r Exp $
+# $NetBSD: t_flags6.sh,v 1.6 2016/07/08 08:27:07 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -95,7 +95,7 @@ check_entry_fail()
"rump.netstat -rn -f inet6 | grep ^'$ip'"
}
-test_lo()
+test_lo6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -107,7 +107,7 @@ test_lo()
check_entry_flags ::1 UH
}
-test_connected()
+test_connected6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -119,7 +119,7 @@ test_connected()
check_entry_flags fc00::/64 UC
}
-test_default_gateway()
+test_default_gateway6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -131,7 +131,7 @@ test_default_gateway()
check_entry_flags default UGS
}
-test_static()
+test_static6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -153,7 +153,7 @@ test_static()
check_entry_flags fc00::/24 UGS
}
-test_blackhole()
+test_blackhole6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -180,7 +180,7 @@ test_blackhole()
check_entry_fail $IP6_PEER UH
}
-test_reject()
+test_reject6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -243,7 +243,7 @@ test_reject()
return 0
}
-test_announce()
+test_announce6()
{
export RUMP_SERVER=$SOCK_LOCAL
@@ -293,11 +293,11 @@ add_test()
atf_init_test_cases()
{
- add_test lo "Tests route flags: loop back interface"
- add_test connected "Tests route flags: connected route"
- add_test default_gateway "Tests route flags: default gateway"
- add_test static "Tests route flags: static route"
- add_test
CVS commit: src/sys/uvm
Module Name:src Committed By: skrll Date: Fri Jul 8 06:45:34 UTC 2016 Modified Files: src/sys/uvm: uvm_swap.c Log Message: Remove '\n' from UVMHIST_LOG format - it is not needed. To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/sys/uvm/uvm_swap.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/uvm/uvm_swap.c diff -u src/sys/uvm/uvm_swap.c:1.173 src/sys/uvm/uvm_swap.c:1.174 --- src/sys/uvm/uvm_swap.c:1.173 Thu Jul 30 09:55:57 2015 +++ src/sys/uvm/uvm_swap.c Fri Jul 8 06:45:34 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_swap.c,v 1.173 2015/07/30 09:55:57 maxv Exp $ */ +/* $NetBSD: uvm_swap.c,v 1.174 2016/07/08 06:45:34 skrll Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.173 2015/07/30 09:55:57 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.174 2016/07/08 06:45:34 skrll Exp $"); #include "opt_uvmhist.h" #include "opt_compat_netbsd.h" @@ -933,7 +933,7 @@ swap_on(struct lwp *l, struct swapdev *s goto bad; } - UVMHIST_LOG(pdhist, " dev=%x: size=%d addr=%ld\n", dev, size, addr, 0); + UVMHIST_LOG(pdhist, " dev=%x: size=%d addr=%ld", dev, size, addr, 0); /* * now we need to allocate an extent to manage this swap device
CVS commit: src/sys/netinet6
Module Name:src Committed By: ozaki-r Date: Fri Jul 8 06:18:29 UTC 2016 Modified Files: src/sys/netinet6: in6.c Log Message: CID 1363345: remove unreachable code and cleanup returns To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/netinet6/in6.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/netinet6/in6.c diff -u src/sys/netinet6/in6.c:1.207 src/sys/netinet6/in6.c:1.208 --- src/sys/netinet6/in6.c:1.207 Thu Jul 7 09:32:03 2016 +++ src/sys/netinet6/in6.c Fri Jul 8 06:18:29 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: in6.c,v 1.207 2016/07/07 09:32:03 ozaki-r Exp $ */ +/* $NetBSD: in6.c,v 1.208 2016/07/08 06:18:29 ozaki-r Exp $ */ /* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.207 2016/07/07 09:32:03 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.208 2016/07/08 06:18:29 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1283,19 +1283,11 @@ in6_update_ifa1(struct ifnet *ifp, struc nd6_dad_start(>ia_ifa, dad_delay + 1); } - return error; - - /* - * XXX: if a change of an existing address failed, keep the entry - * anyway. - */ - if (hostIsNew) - in6_unlink_ifa(ia, ifp); - exit: - return error; + return 0; cleanup: in6_purgeaddr(>ia_ifa); + exit: return error; }
CVS commit: src/sys/netinet
Module Name:src
Committed By: ozaki-r
Date: Fri Jul 8 06:15:33 UTC 2016
Modified Files:
src/sys/netinet: ip_input.c
Log Message:
CID 1363344: remove dead code
We may need to reconsider a case when m_get_rcvif_psref returns NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 src/sys/netinet/ip_input.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/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.336 src/sys/netinet/ip_input.c:1.337
--- src/sys/netinet/ip_input.c:1.336 Thu Jul 7 09:32:02 2016
+++ src/sys/netinet/ip_input.c Fri Jul 8 06:15:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.336 2016/07/07 09:32:02 ozaki-r Exp $ */
+/* $NetBSD: ip_input.c,v 1.337 2016/07/08 06:15:33 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.336 2016/07/07 09:32:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.337 2016/07/08 06:15:33 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1472,8 +1472,8 @@ ip_savecontrol(struct inpcb *inp, struct
if (inpflags & INP_RECVIF) {
struct sockaddr_dl sdl;
- sockaddr_dl_init(, sizeof(sdl), ifp ?
- ifp->if_index : 0, 0, NULL, 0, NULL, 0);
+ sockaddr_dl_init(, sizeof(sdl), ifp->if_index, 0, NULL, 0,
+ NULL, 0);
*mp = sbcreatecontrol(, sdl.sdl_len, IP_RECVIF, IPPROTO_IP);
if (*mp)
mp = &(*mp)->m_next;
