CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: matt
Date: Fri Aug 29 07:29:07 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: mk.cubie
src/sys/arch/evbarm/cubie: cubie_machdep.c
Log Message:
Instead of printing cubie, use the BOARDTYPE instead. This allows other
boards to use the cubie code but see a more useful BOARDTYPE. We could
also use it to enable more apporpriate configuration for the board.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.cubie
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/cubie/cubie_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/evbarm/conf/mk.cubie
diff -u src/sys/arch/evbarm/conf/mk.cubie:1.3 src/sys/arch/evbarm/conf/mk.cubie:1.4
--- src/sys/arch/evbarm/conf/mk.cubie:1.3 Thu Jan 30 00:07:35 2014
+++ src/sys/arch/evbarm/conf/mk.cubie Fri Aug 29 07:29:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mk.cubie,v 1.3 2014/01/30 00:07:35 matt Exp $
+# $NetBSD: mk.cubie,v 1.4 2014/08/29 07:29:07 matt Exp $
CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
.if !empty(MACHINE_ARCH:M*eb)
@@ -8,6 +8,8 @@ EXTRA_LINKFLAGS+= --be8
SYSTEM_FIRST_OBJ= cubie_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/cubie/cubie_start.S
+COPTS.cubie_machdep.c+= -DBOARDTYPE=${BOARDTYPE}
+
GENASSYM_EXTRAS+= ${THISARM}/cubie/genassym.cf
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
Index: src/sys/arch/evbarm/cubie/cubie_machdep.c
diff -u src/sys/arch/evbarm/cubie/cubie_machdep.c:1.20 src/sys/arch/evbarm/cubie/cubie_machdep.c:1.21
--- src/sys/arch/evbarm/cubie/cubie_machdep.c:1.20 Thu Aug 28 06:36:48 2014
+++ src/sys/arch/evbarm/cubie/cubie_machdep.c Fri Aug 29 07:29:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cubie_machdep.c,v 1.20 2014/08/28 06:36:48 skrll Exp $ */
+/* $NetBSD: cubie_machdep.c,v 1.21 2014/08/29 07:29:07 matt Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.20 2014/08/28 06:36:48 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.21 2014/08/29 07:29:07 matt Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -329,7 +329,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Talk to the user */
- printf(\nNetBSD/evbarm (cubie) booting ...\n);
+ printf(\nNetBSD/evbarm ( __STRING(BOARDTYPE) ) booting ...\n);
#endif
const uint8_t *uboot_bootinfo = (void*)uboot_args[0];
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Fri Aug 29 09:26:39 UTC 2014
Modified Files:
src/bin/sh: parser.c
Log Message:
Eat trailing backslash like bash and pdksh (not zsh). CBACK+CEOF = TEOF
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/bin/sh/parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.91 src/bin/sh/parser.c:1.92
--- src/bin/sh/parser.c:1.91 Tue Aug 19 08:36:58 2014
+++ src/bin/sh/parser.c Fri Aug 29 05:26:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.91 2014/08/19 12:36:58 christos Exp $ */
+/* $NetBSD: parser.c,v 1.92 2014/08/29 09:26:39 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)parser.c 8.7 (Berkeley) 5/16/95;
#else
-__RCSID($NetBSD: parser.c,v 1.91 2014/08/19 12:36:58 christos Exp $);
+__RCSID($NetBSD: parser.c,v 1.92 2014/08/29 09:26:39 christos Exp $);
#endif
#endif /* not lint */
@@ -839,15 +839,20 @@ xxreadtoken(void)
pungetc();
continue;
case '\\':
- if (pgetc() == '\n') {
+ switch (c = pgetc()) {
+ case '\n':
startlinno = ++plinno;
if (doprompt)
setprompt(2);
else
setprompt(0);
continue;
+ case PEOF:
+RETURN(TEOF);
+ default:
+pungetc();
+break;
}
- pungetc();
goto breakloop;
case '\n':
plinno++;
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Fri Aug 29 09:27:44 UTC 2014
Modified Files:
src/usr.bin/make: parse.c
Log Message:
undo eating the trailing backslash now that the shell has been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/usr.bin/make/parse.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/make/parse.c
diff -u src/usr.bin/make/parse.c:1.201 src/usr.bin/make/parse.c:1.202
--- src/usr.bin/make/parse.c:1.201 Thu Aug 28 10:39:13 2014
+++ src/usr.bin/make/parse.c Fri Aug 29 05:27:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.201 2014/08/28 14:39:13 christos Exp $ */
+/* $NetBSD: parse.c,v 1.202 2014/08/29 09:27:43 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: parse.c,v 1.201 2014/08/28 14:39:13 christos Exp $;
+static char rcsid[] = $NetBSD: parse.c,v 1.202 2014/08/29 09:27:43 christos Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)parse.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: parse.c,v 1.201 2014/08/28 14:39:13 christos Exp $);
+__RCSID($NetBSD: parse.c,v 1.202 2014/08/29 09:27:43 christos Exp $);
#endif
#endif /* not lint */
#endif
@@ -2876,10 +2876,7 @@ ParseGetLine(int flags, int *length)
ptr++;
ch = ' ';
} else {
- // Don't add a trailign backslash at theend of a command
- // This is what gmake does, but what does POSIX have to say?
- if (ptr[0] != '\n' ptr[0] != '\0')
- *tp++ = '\\';
+ *tp++ = '\\';
if (ptr[0] == '\t')
ptr++;
}
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Fri Aug 29 09:35:19 UTC 2014
Modified Files:
src/bin/sh: parser.c
Log Message:
remove unused assignment
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/bin/sh/parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.92 src/bin/sh/parser.c:1.93
--- src/bin/sh/parser.c:1.92 Fri Aug 29 05:26:39 2014
+++ src/bin/sh/parser.c Fri Aug 29 05:35:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.92 2014/08/29 09:26:39 christos Exp $ */
+/* $NetBSD: parser.c,v 1.93 2014/08/29 09:35:19 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)parser.c 8.7 (Berkeley) 5/16/95;
#else
-__RCSID($NetBSD: parser.c,v 1.92 2014/08/29 09:26:39 christos Exp $);
+__RCSID($NetBSD: parser.c,v 1.93 2014/08/29 09:35:19 christos Exp $);
#endif
#endif /* not lint */
@@ -839,7 +839,7 @@ xxreadtoken(void)
pungetc();
continue;
case '\\':
- switch (c = pgetc()) {
+ switch (pgetc()) {
case '\n':
startlinno = ++plinno;
if (doprompt)
CVS commit: [netbsd-7] src/sys/dev/dm
Module Name:src
Committed By: martin
Date: Fri Aug 29 10:20:16 UTC 2014
Modified Files:
src/sys/dev/dm [netbsd-7]: dm_target_stripe.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #55):
sys/dev/dm/dm_target_stripe.c: revision 1.20-1.21
Avoid a memory leak - from maxv.
Cleanup properly on error.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/dev/dm/dm_target_stripe.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/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.19 src/sys/dev/dm/dm_target_stripe.c:1.19.2.1
--- src/sys/dev/dm/dm_target_stripe.c:1.19 Sat Jun 14 07:39:00 2014
+++ src/sys/dev/dm/dm_target_stripe.c Fri Aug 29 10:20:16 2014
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.19 2014/06/14 07:39:00 hannken Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.19.2.1 2014/08/29 10:20:16 martin Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -102,6 +102,23 @@ dm_target_stripe_modcmd(modcmd_t cmd, vo
}
#endif
+static void
+dm_target_stripe_fini(dm_target_stripe_config_t *tsc)
+{
+ dm_target_linear_config_t *tlc;
+
+ if (tsc == NULL)
+ return;
+
+ while ((tlc = TAILQ_FIRST(tsc-stripe_devs)) != NULL) {
+ TAILQ_REMOVE(tsc-stripe_devs, tlc, entries);
+ dm_pdev_decr(tlc-pdev);
+ kmem_free(tlc, sizeof(*tlc));
+ }
+
+ kmem_free(tsc, sizeof(*tsc));
+}
+
/*
* Init function called from dm_table_load_ioctl.
* DM_STRIPE_DEV_OFFSET should always hold the index of the first device-offset
@@ -156,8 +173,11 @@ dm_target_stripe_init(dm_dev_t * dmv, vo
argv[strpi], argv[strpi+1]);
tlc = kmem_alloc(sizeof(*tlc), KM_NOSLEEP);
- if ((tlc-pdev = dm_pdev_insert(argv[strpi])) == NULL)
+ if ((tlc-pdev = dm_pdev_insert(argv[strpi])) == NULL) {
+ kmem_free(tlc, sizeof(*tlc));
+ dm_target_stripe_fini(tsc);
return ENOENT;
+ }
tlc-offset = atoi(argv[strpi+1]);
/* Insert striping device to linked list. */
@@ -183,8 +203,10 @@ dm_target_stripe_status(void *target_con
if ((params = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL)
return NULL;
- if ((tmp = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL)
+ if ((tmp = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL) {
+ kmem_free(params, DM_MAX_PARAMS_SIZE);
return NULL;
+ }
snprintf(params, DM_MAX_PARAMS_SIZE, %d % PRIu64,
tsc-stripe_num, tsc-stripe_chunksize);
@@ -290,27 +312,12 @@ dm_target_stripe_sync(dm_table_entry_t *
int
dm_target_stripe_destroy(dm_table_entry_t * table_en)
{
- dm_target_stripe_config_t *tsc;
- dm_target_linear_config_t *tlc;
-
- tsc = table_en-target_config;
-
- if (tsc == NULL)
- return 0;
-
- while ((tlc = TAILQ_FIRST(tsc-stripe_devs)) != NULL) {
- TAILQ_REMOVE(tsc-stripe_devs, tlc, entries);
- dm_pdev_decr(tlc-pdev);
- kmem_free(tlc, sizeof(*tlc));
- }
+ dm_target_stripe_fini(table_en-target_config);
/* Unbusy target so we can unload it */
dm_target_unbusy(table_en-target);
- kmem_free(tsc, sizeof(*tsc));
-
table_en-target_config = NULL;
-
return 0;
}
/* Doesn't not need to do anything here. */
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Fri Aug 29 11:14:14 UTC 2014
Modified Files:
src/lib/libnpf [netbsd-7]: npf.c
src/sys/net/npf [netbsd-7]: npf_alg.c npf_conn.c npf_ctl.c npf_impl.h
npf_nat.c
src/usr.sbin/npf/npfctl [netbsd-7]: npfctl.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #56):
sys/net/npf/npf_ctl.c: revision 1.39
usr.sbin/npf/npfctl/npfctl.c: revision 1.43
lib/libnpf/npf.c: revision 1.33
lib/libnpf/npf.c: revision 1.34
sys/net/npf/npf_impl.h: revision 1.59
sys/net/npf/npf_ctl.c: revision 1.40
sys/net/npf/npf_conn.c: revision 1.11
sys/net/npf/npf_alg.c: revision 1.15
sys/net/npf/npf_conn.c: revision 1.12
sys/net/npf/npf_nat.c: revision 1.33
sys/net/npf/npf_nat.c: revision 1.34
Add and use npf_alg_export().
npf_conn_import: handle NAT metadata correctly.
npf_nat_newpolicy: restore the policy ID.
npfctl_load: fix error code handling for the limit cases.
npf_config_import: fix the inverted logic.
npfctl_load: improve error handling.
npf_conn_import: add a missing stat counter increment.
npf_nat_import: add a missing reference and make a comment.
npf_config_submit: finally, include the saved connections.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/lib/libnpf/npf.c
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/net/npf/npf_alg.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/net/npf/npf_conn.c
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/net/npf/npf_ctl.c
cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/net/npf/npf_nat.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/usr.sbin/npf/npfctl/npfctl.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.32 src/lib/libnpf/npf.c:1.32.2.1
--- src/lib/libnpf/npf.c:1.32 Sun Aug 10 19:09:43 2014
+++ src/lib/libnpf/npf.c Fri Aug 29 11:14:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.32 2014/08/10 19:09:43 rmind Exp $ */
+/* $NetBSD: npf.c,v 1.32.2.1 2014/08/29 11:14:14 martin Exp $ */
/*-
* Copyright (c) 2010-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.32 2014/08/10 19:09:43 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.32.2.1 2014/08/29 11:14:14 martin Exp $);
#include sys/types.h
#include netinet/in_systm.h
@@ -69,13 +69,14 @@ struct nl_ext {
};
struct nl_config {
- /* Rules, translations, tables, procedures. */
+ /* Rules, translations, procedures, tables, connections. */
prop_dictionary_t ncf_dict;
prop_array_t ncf_alg_list;
prop_array_t ncf_rules_list;
prop_array_t ncf_rproc_list;
prop_array_t ncf_table_list;
prop_array_t ncf_nat_list;
+ prop_array_t ncf_conn_list;
/* Iterators. */
prop_object_iterator_t ncf_rule_iter;
@@ -153,6 +154,10 @@ npf_config_submit(nl_config_t *ncf, int
prop_dictionary_set(npf_dict, rprocs, ncf-ncf_rproc_list);
prop_dictionary_set(npf_dict, tables, ncf-ncf_table_list);
prop_dictionary_set(npf_dict, nat, ncf-ncf_nat_list);
+ if (ncf-ncf_conn_list) {
+ prop_dictionary_set(npf_dict, conn-list,
+ ncf-ncf_conn_list);
+ }
prop_dictionary_set_bool(npf_dict, flush, ncf-ncf_flush);
if (ncf-ncf_debug) {
prop_dictionary_set(npf_dict, debug, ncf-ncf_debug);
@@ -194,6 +199,7 @@ _npf_config_consdict(prop_dictionary_t n
ncf-ncf_rproc_list = prop_dictionary_get(npf_dict, rprocs);
ncf-ncf_table_list = prop_dictionary_get(npf_dict, tables);
ncf-ncf_nat_list = prop_dictionary_get(npf_dict, nat);
+ ncf-ncf_conn_list = prop_dictionary_get(npf_dict, conn-list);
return ncf;
}
@@ -237,11 +243,11 @@ npf_config_import(const char *path)
nl_config_t *ncf;
npf_dict = prop_dictionary_internalize_from_file(path);
- if (npf_dict) {
+ if (!npf_dict) {
return NULL;
}
ncf = _npf_config_consdict(npf_dict);
- if (ncf == NULL) {
+ if (!ncf) {
prop_object_release(npf_dict);
return NULL;
}
Index: src/sys/net/npf/npf_alg.c
diff -u src/sys/net/npf/npf_alg.c:1.14 src/sys/net/npf/npf_alg.c:1.14.2.1
--- src/sys/net/npf/npf_alg.c:1.14 Sun Jul 20 00:37:41 2014
+++ src/sys/net/npf/npf_alg.c Fri Aug 29 11:14:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_alg.c,v 1.14 2014/07/20 00:37:41 rmind Exp $ */
+/* $NetBSD: npf_alg.c,v 1.14.2.1 2014/08/29 11:14:14 martin Exp $ */
/*-
* Copyright (c) 2010-2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_alg.c,v 1.14 2014/07/20 00:37:41 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_alg.c,v 1.14.2.1 2014/08/29 11:14:14 martin Exp $);
#include sys/param.h
#include sys/types.h
@@ -244,3 +244,24 @@ npf_alg_conn(npf_cache_t *npc, int di)
pserialize_read_exit(s);
return con;
}
+
+prop_array_t
+npf_alg_export(void)
+{
+ prop_array_t alglist = prop_array_create();
CVS commit: [netbsd-7] src/sys/arch/arm/allwinner
Module Name:src
Committed By: martin
Date: Fri Aug 29 11:17:39 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_mmc.c awin_reg.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #57):
sys/arch/arm/allwinner/awin_reg.h: revision 1.15
sys/arch/arm/allwinner/awin_mmc.c: revision 1.4
Correct the mmc clock. Banana Pi can now find an SD card.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.10.1 src/sys/arch/arm/allwinner/awin_mmc.c
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/arm/allwinner/awin_reg.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/allwinner/awin_mmc.c
diff -u src/sys/arch/arm/allwinner/awin_mmc.c:1.3 src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.1
--- src/sys/arch/arm/allwinner/awin_mmc.c:1.3 Wed Feb 26 02:01:02 2014
+++ src/sys/arch/arm/allwinner/awin_mmc.c Fri Aug 29 11:17:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_mmc.c,v 1.3 2014/02/26 02:01:02 jmcneill Exp $ */
+/* $NetBSD: awin_mmc.c,v 1.3.10.1 2014/08/29 11:17:38 martin Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_mmc.c,v 1.3 2014/02/26 02:01:02 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_mmc.c,v 1.3.10.1 2014/08/29 11:17:38 martin Exp $);
#include sys/param.h
#include sys/bus.h
@@ -87,7 +87,7 @@ struct awin_mmc_softc {
int sc_mmc_present;
device_t sc_sdmmc_dev;
- unsigned int sc_pll5_freq;
+ unsigned int sc_pll_freq;
unsigned int sc_mod_clk;
bool sc_has_gpio_detect;
@@ -129,7 +129,7 @@ awin_mmc_probe_clocks(struct awin_mmc_so
int n, k, p, div;
val = bus_space_read_4(aio-aio_core_bst, aio-aio_ccm_bsh,
- AWIN_PLL5_CFG_REG);
+ AWIN_PLL6_CFG_REG);
n = (val 8) 0x1f;
k = ((val 4) 3) + 1;
@@ -137,20 +137,16 @@ awin_mmc_probe_clocks(struct awin_mmc_so
freq = 2400 * n * k / p;
- sc-sc_pll5_freq = freq;
- if (sc-sc_pll5_freq 4) {
- div = 4;
- } else {
- div = 3;
- }
- sc-sc_mod_clk = sc-sc_pll5_freq / (div + 1);
+ sc-sc_pll_freq = freq;
+ div = ((sc-sc_pll_freq + ) / 1) - 1;
+ sc-sc_mod_clk = sc-sc_pll_freq / (div + 1);
- awin_reg_set_clear(aio-aio_core_bst, aio-aio_ccm_bsh,
+ bus_space_write_4(aio-aio_core_bst, aio-aio_ccm_bsh,
AWIN_SD0_CLK_REG + (sc-sc_mmc_number * 8),
- AWIN_PLL_CFG_ENABLE | AWIN_PLL_CFG_EXG_MODE | div, 0);
+ AWIN_PLL_CFG_ENABLE | AWIN_PLL_CFG_PLL6 | div);
#ifdef AWIN_MMC_DEBUG
- aprint_normal_dev(sc-sc_dev, PLL5 @ %u Hz\n, freq);
+ aprint_normal_dev(sc-sc_dev, PLL6 @ %u Hz\n, freq);
#endif
}
Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.14 src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.1
--- src/sys/arch/arm/allwinner/awin_reg.h:1.14 Sun Aug 3 19:14:24 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Fri Aug 29 11:17:38 2014
@@ -720,7 +720,8 @@
#define AWIN_PLL_CFG_ENABLE __BIT(31)
#define AWIN_PLL_CFG_BYPASS __BIT(30)
-#define AWIN_PLL_CFG_EXG_MODE __BIT(25)
+#define AWIN_PLL_CFG_PLL5 __BIT(25)
+#define AWIN_PLL_CFG_PLL6 __BIT(24)
#define AWIN_PLL_CFG_OUT_EXP_DIVP __BITS(17,16)
#define AWIN_PLL_CFG_FACTOR_N __BITS(12,8)
#define AWIN_PLL_CFG_FACTOR_K __BITS(5,4)
CVS commit: [netbsd-7] src/common/lib/libc/gen
Module Name:src
Committed By: martin
Date: Fri Aug 29 11:32:01 UTC 2014
Modified Files:
src/common/lib/libc/gen [netbsd-7]: rb.c
Log Message:
Pull up following revision(s) (requested by riastradh):
common/lib/libc/gen/rb.c: revision 1.12
common/lib/libc/gen/rb.c: revision 1.13
Fix failure case in rb_tree_find_node_leq/geq.
Return NULL, not `NULL - offset'.
XXX pullup to netbsd-5, netbsd-6, netbsd-7
Remove enclosing parens on return.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.22.1 src/common/lib/libc/gen/rb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gen/rb.c
diff -u src/common/lib/libc/gen/rb.c:1.11 src/common/lib/libc/gen/rb.c:1.11.22.1
--- src/common/lib/libc/gen/rb.c:1.11 Mon Jun 20 09:11:16 2011
+++ src/common/lib/libc/gen/rb.c Fri Aug 29 11:32:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $ */
+/* $NetBSD: rb.c,v 1.11.22.1 2014/08/29 11:32:01 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,10 +39,10 @@
#else
#define KASSERT(s) do { } while (/*CONSTCOND*/ 0)
#endif
-__RCSID($NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $);
+__RCSID($NetBSD: rb.c,v 1.11.22.1 2014/08/29 11:32:01 martin Exp $);
#else
#include lib/libkern/libkern.h
-__KERNEL_RCSID(0, $NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: rb.c,v 1.11.22.1 2014/08/29 11:32:01 martin Exp $);
#endif
#ifdef _LIBC
@@ -145,7 +145,7 @@ rb_tree_find_node_geq(struct rb_tree *rb
parent = parent-rb_nodes[diff 0];
}
- return RB_NODETOITEM(rbto, last);
+ return last == NULL ? NULL : RB_NODETOITEM(rbto, last);
}
void *
@@ -166,7 +166,7 @@ rb_tree_find_node_leq(struct rb_tree *rb
parent = parent-rb_nodes[diff 0];
}
- return RB_NODETOITEM(rbto, last);
+ return last == NULL ? NULL : RB_NODETOITEM(rbto, last);
}
void *
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src Committed By: martin Date: Fri Aug 29 11:35:28 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-openchrome [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by mrg in ticket #60): external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile: revision 1.6 fix the sources list to match the upstream Makefile.am. fixes problems reported by jdbaker. XXX: pullup-7. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.6.1 \ src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/mit/xorg/server/drivers/xf86-video-openchrome/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5.6.1 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5 Sat Jun 1 21:21:36 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Fri Aug 29 11:35:28 2014 @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.5 2013/06/01 21:21:36 mrg Exp $ +# $NetBSD: Makefile,v 1.5.6.1 2014/08/29 11:35:28 martin Exp $ DRIVER= xf86-video-openchrome DRIVER_NAME= openchrome_drv SRCS= \ via_3d.c \ + via_exa.c \ + via_exa_h2.c \ + via_exa_h6.c \ via_bandwidth.c \ via_ch7xxx.c \ via_display.c \ @@ -13,13 +16,19 @@ SRCS= \ via_id.c \ via_lvds.c \ via_memcpy.c \ + via_memmgr.c \ + via_outputs.c \ + via_xv_overlay.c \ + via_ums.c \ via_vbe.c \ via_vgahw.c \ + via_xv.c \ via_vt162x.c # DRI SRCS+= \ via_dri.c \ + via_kms.c \ via_xvmc.c MAN= openchrome.4
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Aug 29 11:37:51 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-7]: if_wm.c if_wmvar.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #61):
sys/dev/pci/if_wm.c: revision 1.290
sys/dev/pci/if_wmvar.h: revision 1.20
Set the WM_F_ATTACHED flag if wm_attach() finished succesfully and check
the flag in wm_detach(). It will avoid to panic in wm_detach().
Fixes PR#49102.
To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.289.2.1 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/dev/pci/if_wmvar.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.289 src/sys/dev/pci/if_wm.c:1.289.2.1
--- src/sys/dev/pci/if_wm.c:1.289 Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_wm.c Fri Aug 29 11:37:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.289 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_wm.c,v 1.289.2.1 2014/08/29 11:37:51 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.289 2014/08/10 16:44:36 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.289.2.1 2014/08/29 11:37:51 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1718,7 +1718,7 @@ wm_attach(device_t parent, device_t self
sc-sc_flasht, sc-sc_flashh, NULL, NULL)) {
aprint_error_dev(sc-sc_dev,
can't map FLASH registers\n);
- return;
+ goto fail_5;
}
reg = ICH8_FLASH_READ32(sc, ICH_FLASH_GFPREG);
sc-sc_ich8_flash_base = (reg ICH_GFPREG_BASE_MASK) *
@@ -1838,7 +1838,7 @@ wm_attach(device_t parent, device_t self
if (wm_read_mac_addr(sc, enaddr) != 0) {
aprint_error_dev(sc-sc_dev,
unable to read Ethernet address\n);
- return;
+ goto fail_5;
}
}
@@ -1856,7 +1856,7 @@ wm_attach(device_t parent, device_t self
} else {
if (wm_nvm_read(sc, EEPROM_OFF_CFG1, 1, cfg1)) {
aprint_error_dev(sc-sc_dev, unable to read CFG1\n);
- return;
+ goto fail_5;
}
}
@@ -1867,7 +1867,7 @@ wm_attach(device_t parent, device_t self
} else {
if (wm_nvm_read(sc, EEPROM_OFF_CFG2, 1, cfg2)) {
aprint_error_dev(sc-sc_dev, unable to read CFG2\n);
- return;
+ goto fail_5;
}
}
@@ -1937,7 +1937,7 @@ wm_attach(device_t parent, device_t self
if (wm_nvm_read(sc, EEPROM_OFF_SWDPIN, 1, swdpin)) {
aprint_error_dev(sc-sc_dev,
unable to read SWDPIN\n);
-return;
+goto fail_5;
}
}
}
@@ -2253,6 +2253,7 @@ wm_attach(device_t parent, device_t self
else
aprint_error_dev(self, couldn't establish power handler\n);
+ sc-sc_flags |= WM_F_ATTACHED;
return;
/*
@@ -2292,7 +2293,12 @@ wm_detach(device_t self, int flags __unu
int i;
#ifndef WM_MPSAFE
int s;
+#endif
+ if ((sc-sc_flags WM_F_ATTACHED) == 0)
+ return 0;
+
+#ifndef WM_MPSAFE
s = splnet();
#endif
/* Stop the interface. Callouts are stopped in it. */
Index: src/sys/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.19 src/sys/dev/pci/if_wmvar.h:1.19.2.1
--- src/sys/dev/pci/if_wmvar.h:1.19 Mon Jul 14 05:00:18 2014
+++ src/sys/dev/pci/if_wmvar.h Fri Aug 29 11:37:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmvar.h,v 1.19 2014/07/14 05:00:18 msaitoh Exp $ */
+/* $NetBSD: if_wmvar.h,v 1.19.2.1 2014/08/29 11:37:51 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -95,6 +95,7 @@
#define WM_F_HAS_MANAGE 0x0010
#define WM_F_WOL 0x0020
#define WM_F_EEE 0x0040 /* Energy Efficiency Ethernet */
+#define WM_F_ATTACHED 0x0080 /* attach() fininsed successfully */
typedef enum {
WM_T_unknown = 0,
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Fri Aug 29 11:42:15 UTC 2014
Modified Files:
src/distrib/sets/lists/man [netbsd-7]: mi
src/share/man/man4 [netbsd-7]: Makefile
src/sys/arch/hp300/conf [netbsd-7]: GENERIC files.hp300 majors.hp300
src/sys/arch/hp300/hp300 [netbsd-7]: intr.c locore.s
src/sys/conf [netbsd-7]: files
Added Files:
src/share/man/man4 [netbsd-7]: arcofi.4
src/sys/arch/hp300/dev [netbsd-7]: arcofi_dio.c
src/sys/dev/ic [netbsd-7]: arcofi.c arcofivar.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #62):
sys/arch/hp300/conf/files.hp300: revision 1.89
share/man/man4/arcofi.4: revision 1.1
share/man/man4/arcofi.4: revision 1.2
share/man/man4/Makefile: revision 1.617
sys/arch/hp300/hp300/intr.c: revision 1.41
sys/conf/files: revision 1.1100
sys/arch/hp300/hp300/locore.s: revision 1.171
distrib/sets/lists/man/mi: revision 1.1486
sys/dev/ic/arcofivar.h: revision 1.1
sys/arch/hp300/conf/majors.hp300: revision 1.26
sys/arch/hp300/dev/arcofi_dio.c: revision 1.1
sys/arch/hp300/conf/GENERIC: revision 1.188
sys/dev/ic/arcofi.c: revision 1.1
Add new arcofi(4) audio driver for NetBSD/hp300, ported from OpenBSD.
The arcofi(4) is a driver for the HP Audio1 device
(Siemens PSB 2160 ARCOFI phone quality audio chip)
found on the HP9000/425e and HP9000/{705,710,745,747} models
(but only hp300 attachment is ported for now).
The chip supports 8-bit mono 8kHz U-law, A-law and
16-bit mono slinear_be formats.
The old HP9000/425e playing tunes with this new arcofi(4) audio driver
was also demonstrated at Open Source Conference 2014 Shimane.
Add a man page for arcofi(4) driver. From OpenBSD.
Fix date.
To generate a diff of this commit:
cvs rdiff -u -r1.1485 -r1.1485.2.1 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.616 -r1.616.2.1 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/arcofi.4
cvs rdiff -u -r1.184 -r1.184.2.1 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.88 -r1.88.2.1 src/sys/arch/hp300/conf/files.hp300
cvs rdiff -u -r1.25 -r1.25.28.1 src/sys/arch/hp300/conf/majors.hp300
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/hp300/dev/arcofi_dio.c
cvs rdiff -u -r1.40 -r1.40.34.1 src/sys/arch/hp300/hp300/intr.c
cvs rdiff -u -r1.170 -r1.170.4.1 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.1096 -r1.1096.2.1 src/sys/conf/files
cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/ic/arcofi.c src/sys/dev/ic/arcofivar.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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1485 src/distrib/sets/lists/man/mi:1.1485.2.1
--- src/distrib/sets/lists/man/mi:1.1485 Sat Aug 9 11:33:53 2014
+++ src/distrib/sets/lists/man/mi Fri Aug 29 11:42:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1485 2014/08/09 11:33:53 apb Exp $
+# $NetBSD: mi,v 1.1485.2.1 2014/08/29 11:42:15 martin Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -826,6 +826,7 @@
./usr/share/man/cat4/aps.0 man-sys-catman .cat
./usr/share/man/cat4/arc/intro.0 man-sys-catman .cat
./usr/share/man/cat4/arcmsr.0 man-sys-catman .cat
+./usr/share/man/cat4/arcofi.0 man-sys-catman .cat
./usr/share/man/cat4/aria.0 man-sys-catman .cat
./usr/share/man/cat4/arm26/arckbd.0 man-obsolete obsolete
./usr/share/man/cat4/arm26/arcwskbd.0 man-obsolete obsolete
@@ -3911,6 +3912,7 @@
./usr/share/man/html4/aps.html man-sys-htmlman html
./usr/share/man/html4/arc/intro.html man-sys-htmlman html
./usr/share/man/html4/arcmsr.html man-sys-htmlman html
+./usr/share/man/html4/arcofi.html man-sys-htmlman html
./usr/share/man/html4/aria.html man-sys-htmlman html
./usr/share/man/html4/arp.html man-sys-htmlman html
./usr/share/man/html4/artsata.html man-sys-htmlman html
@@ -6691,6 +6693,7 @@
./usr/share/man/man4/aps.4 man-sys-man .man
./usr/share/man/man4/arc/intro.4 man-sys-man .man
./usr/share/man/man4/arcmsr.4 man-sys-man .man
+./usr/share/man/man4/arcofi.4 man-sys-man .man
./usr/share/man/man4/aria.4 man-sys-man .man
./usr/share/man/man4/arm26/arckbd.4 man-obsolete obsolete
./usr/share/man/man4/arm26/arcwskbd.4 man-obsolete obsolete
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.616 src/share/man/man4/Makefile:1.616.2.1
--- src/share/man/man4/Makefile:1.616 Thu Jul 24 21:08:50 2014
+++ src/share/man/man4/Makefile Fri Aug 29 11:42:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.616 2014/07/24 21:08:50 alnsn Exp $
+# $NetBSD: Makefile,v 1.616.2.1 2014/08/29 11:42:15 martin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -7,7 +7,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
ahcisata.4 ahd.4 \
aibs.4 alc.4 ale.4 alipm.4 altmem.4 altq.4
CVS commit: [netbsd-7] src/tests/lib/libpthread
Module Name:src Committed By: martin Date: Fri Aug 29 11:44:47 UTC 2014 Modified Files: src/tests/lib/libpthread [netbsd-7]: t_swapcontext.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #63): tests/lib/libpthread/t_swapcontext.c: revision 1.2 Go back to the initial context (as tests/lib/libc/sys/t_swapcontext.c does) after checking pthread_self() didn't change. Otherwise the process exits outside of atf context. Should fix Test case exited normally but failed to create the results file: Results file is empty reports from atf-run. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.12.1 src/tests/lib/libpthread/t_swapcontext.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/lib/libpthread/t_swapcontext.c diff -u src/tests/lib/libpthread/t_swapcontext.c:1.1 src/tests/lib/libpthread/t_swapcontext.c:1.1.12.1 --- src/tests/lib/libpthread/t_swapcontext.c:1.1 Wed Sep 12 02:00:55 2012 +++ src/tests/lib/libpthread/t_swapcontext.c Fri Aug 29 11:44:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: t_swapcontext.c,v 1.1 2012/09/12 02:00:55 manu Exp $ */ +/* $NetBSD: t_swapcontext.c,v 1.1.12.1 2014/08/29 11:44:46 martin Exp $ */ /* * Copyright (c) 2012 Emmanuel Dreyfus. All rights reserved. @@ -59,6 +59,8 @@ swapfunc(void *arg) ATF_REQUIRE_EQ(oself, nself); printf(Test succeeded\n); + /* Go back in main */ + ATF_REQUIRE(swapcontext(nctx, octx)); /* NOTREACHED */ return; @@ -99,8 +101,7 @@ ATF_TC_BODY(swapcontext1, tc) PTHREAD_REQUIRE(getcontext(nctx)); PTHREAD_REQUIRE(pthread_create(thread, NULL, threadfunc, NULL)); - - return; + PTHREAD_REQUIRE(pthread_join(thread, NULL)); } ATF_TP_ADD_TCS(tp)
CVS commit: [netbsd-7] src/usr.bin/ldd/elf64
Module Name:src Committed By: martin Date: Fri Aug 29 11:47:16 UTC 2014 Modified Files: src/usr.bin/ldd/elf64 [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by joerg in ticket #64): usr.bin/ldd/elf64/Makefile: revision 1.8 Fix ldd on LP64 platforms by splitting the symbol versioning stuff for elf64 as well. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.4.1 src/usr.bin/ldd/elf64/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ldd/elf64/Makefile diff -u src/usr.bin/ldd/elf64/Makefile:1.7 src/usr.bin/ldd/elf64/Makefile:1.7.4.1 --- src/usr.bin/ldd/elf64/Makefile:1.7 Sun Mar 2 03:55:19 2014 +++ src/usr.bin/ldd/elf64/Makefile Fri Aug 29 11:47:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/03/02 03:55:19 matt Exp $ +# $NetBSD: Makefile,v 1.7.4.1 2014/08/29 11:47:16 martin Exp $ .include bsd.own.mk @@ -25,6 +25,8 @@ RTLD_FUNCS = \ _rtld_map_object \ _rtld_obj_free \ _rtld_obj_new \ + _rtld_object_add_name \ + _rtld_object_match_name \ _rtld_add_paths \ _rtld_process_hints \ _rtld_sysctl \
CVS commit: [netbsd-7] src/sys/dev/dkwedge
Module Name:src
Committed By: martin
Date: Fri Aug 29 11:49:41 UTC 2014
Modified Files:
src/sys/dev/dkwedge [netbsd-7]: dk.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #65):
sys/dev/dkwedge/dk.c: revision 1.73
Make dk(4) discard from partition start, not from disk start.
Otherwise, anything mounted with `-o discard' will pretty quickly
munch itself up and barf up an unrecoverably corrupted file system!
XXX pullup to netbsd-7
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.72.2.1 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.72 src/sys/dev/dkwedge/dk.c:1.72.2.1
--- src/sys/dev/dkwedge/dk.c:1.72 Fri Jul 25 08:23:56 2014
+++ src/sys/dev/dkwedge/dk.c Fri Aug 29 11:49:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.72 2014/07/25 08:23:56 dholland Exp $ */
+/* $NetBSD: dk.c,v 1.72.2.1 2014/08/29 11:49:41 martin Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.72 2014/07/25 08:23:56 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.72.2.1 2014/08/29 11:49:41 martin Exp $);
#ifdef _KERNEL_OPT
#include opt_dkwedge.h
@@ -1350,6 +1350,8 @@ static int
dkdiscard(dev_t dev, off_t pos, off_t len)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
+ unsigned shift;
+ off_t offset, maxlen;
if (sc == NULL)
return (ENODEV);
@@ -1358,6 +1360,21 @@ dkdiscard(dev_t dev, off_t pos, off_t le
if (sc-sc_parent-dk_rawvp == NULL)
return (ENXIO);
+ shift = (sc-sc_parent-dk_blkshift + DEV_BSHIFT);
+ KASSERT(__type_fit(off_t, sc-sc_size));
+ KASSERT(__type_fit(off_t, sc-sc_offset));
+ KASSERT(0 = sc-sc_offset);
+ KASSERT(sc-sc_size = (__type_max(off_t) shift));
+ KASSERT(sc-sc_offset = ((__type_max(off_t) shift) - sc-sc_size));
+ offset = ((off_t)sc-sc_offset shift);
+ maxlen = ((off_t)sc-sc_size shift);
+
+ if (len maxlen)
+ return (EINVAL);
+ if (pos (maxlen - len))
+ return (EINVAL);
+
+ pos += offset;
return VOP_FDISCARD(sc-sc_parent-dk_rawvp, pos, len);
}
CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src Committed By: martin Date: Fri Aug 29 11:51:47 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: atombios_dp.c Log Message: Pull up following revision(s) (requested by mrg in ticket #66): sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c: revision 1.3 hack around an evergreen attach crash for now: provide a hard coded name for the i2c. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.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/external/bsd/drm2/dist/drm/radeon/atombios_dp.c diff -u src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c:1.2.4.1 --- src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c:1.2 Wed Jul 16 20:59:57 2014 +++ src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c Fri Aug 29 11:51:47 2014 @@ -212,6 +212,10 @@ void radeon_dp_aux_init(struct radeon_co radeon_connector-ddc_bus-rec.hpd = radeon_connector-hpd.hpd; radeon_connector-ddc_bus-aux.dev = radeon_connector-base.kdev; radeon_connector-ddc_bus-aux.transfer = radeon_dp_aux_transfer; +#ifdef __NetBSD__ + /* XXX dervied from sysfs/i2c on linux. */ + radeon_connector-ddc_bus-aux.name = radeon_dp_aux; +#endif ret = drm_dp_aux_register_i2c_bus(radeon_connector-ddc_bus-aux); if (!ret) radeon_connector-ddc_bus-has_aux = true;
CVS commit: [netbsd-7] src/sys/fs/puffs
Module Name:src
Committed By: martin
Date: Fri Aug 29 11:55:34 UTC 2014
Modified Files:
src/sys/fs/puffs [netbsd-7]: puffs_msgif.c puffs_node.c puffs_sys.h
puffs_vfsops.c puffs_vnops.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #67):
sys/fs/puffs/puffs_sys.h: revision 1.86
sys/fs/puffs/puffs_vfsops.c: revision 1.114
sys/fs/puffs/puffs_msgif.c: revision 1.95
sys/fs/puffs/puffs_node.c: revision 1.32
sys/fs/puffs/puffs_vnops.c: revision 1.184
Change puffs from hashlist to vcache.
- field pa_nhashbuckets of struct puffs_kargs becomes a no-op.
and should be removed on the next protocol version bump.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.94.4.1 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/fs/puffs/puffs_node.c
cvs rdiff -u -r1.84.4.1 -r1.84.4.2 src/sys/fs/puffs/puffs_sys.h
cvs rdiff -u -r1.113 -r1.113.2.1 src/sys/fs/puffs/puffs_vfsops.c
cvs rdiff -u -r1.182.2.1 -r1.182.2.2 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.94 src/sys/fs/puffs/puffs_msgif.c:1.94.4.1
--- src/sys/fs/puffs/puffs_msgif.c:1.94 Thu Oct 17 21:03:27 2013
+++ src/sys/fs/puffs/puffs_msgif.c Fri Aug 29 11:55:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.94 2013/10/17 21:03:27 christos Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.94.4.1 2014/08/29 11:55:34 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_msgif.c,v 1.94 2013/10/17 21:03:27 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_msgif.c,v 1.94.4.1 2014/08/29 11:55:34 martin Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -856,7 +856,7 @@ puffsop_expire(struct puffs_mount *pmp,
* vrele should cause it to be reclaimed.
* Otherwise, we have nothing to do.
*/
- if (puffs_cookie2vnode(pmp, cookie, 0, 0, vp) == 0) {
+ if (puffs_cookie2vnode(pmp, cookie, vp) == 0) {
VPTOPP(vp)-pn_stat = ~PNODE_SOPEXP;
vrele(vp);
}
@@ -889,7 +889,7 @@ puffsop_flush(struct puffs_mount *pmp, s
* reason we need to eventually bump locking to userspace, as we
* will need to lock the node if we wish to do flushes.
*/
- rv = puffs_cookie2vnode(pmp, pf-pf_cookie, 0, 0, vp);
+ rv = puffs_cookie2vnode(pmp, pf-pf_cookie, vp);
if (rv) {
if (rv == PUFFS_NOSUCHCOOKIE)
rv = ENOENT;
Index: src/sys/fs/puffs/puffs_node.c
diff -u src/sys/fs/puffs/puffs_node.c:1.31 src/sys/fs/puffs/puffs_node.c:1.31.4.1
--- src/sys/fs/puffs/puffs_node.c:1.31 Thu Jan 23 10:13:56 2014
+++ src/sys/fs/puffs/puffs_node.c Fri Aug 29 11:55:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_node.c,v 1.31 2014/01/23 10:13:56 hannken Exp $ */
+/* $NetBSD: puffs_node.c,v 1.31.4.1 2014/08/29 11:55:34 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_node.c,v 1.31 2014/01/23 10:13:56 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_node.c,v 1.31.4.1 2014/08/29 11:55:34 martin Exp $);
#include sys/param.h
#include sys/hash.h
@@ -48,148 +48,96 @@ __KERNEL_RCSID(0, $NetBSD: puffs_node.c
#include miscfs/genfs/genfs_node.h
#include miscfs/specfs/specdev.h
-static const struct genfs_ops puffs_genfsops = {
- .gop_size = puffs_gop_size,
- .gop_write = genfs_gop_write,
- .gop_markupdate = puffs_gop_markupdate,
-#if 0
- .gop_alloc, should ask userspace
-#endif
-};
-
-static __inline struct puffs_node_hashlist
- *puffs_cookie2hashlist(struct puffs_mount *, puffs_cookie_t);
-static struct puffs_node *puffs_cookie2pnode(struct puffs_mount *,
- puffs_cookie_t);
-
struct pool puffs_pnpool;
struct pool puffs_vapool;
/*
* Grab a vnode, intialize all the puffs-dependent stuff.
*/
-int
-puffs_getvnode(struct mount *mp, puffs_cookie_t ck, enum vtype type,
- voff_t vsize, dev_t rdev, struct vnode **vpp)
+static int
+puffs_getvnode1(struct mount *mp, puffs_cookie_t ck, enum vtype type,
+ voff_t vsize, dev_t rdev, bool may_exist, struct vnode **vpp)
{
struct puffs_mount *pmp;
- struct puffs_newcookie *pnc;
struct vnode *vp;
struct puffs_node *pnode;
- struct puffs_node_hashlist *plist;
int error;
pmp = MPTOPUFFSMP(mp);
- error = EPROTO;
if (type = VNON || type = VBAD) {
puffs_senderr(pmp, PUFFS_ERR_MAKENODE, EINVAL,
bad node type, ck);
- goto bad;
+ return EPROTO;
}
if (vsize == VSIZENOTSET) {
puffs_senderr(pmp, PUFFS_ERR_MAKENODE, EINVAL,
VSIZENOTSET is not a valid size, ck);
- goto bad;
+ return EPROTO;
}
- error = getnewvnode(VT_PUFFS, mp, puffs_vnodeop_p, NULL, vp);
- if (error) {
- goto bad;
+ for (;;) {
+ error = vcache_get(mp, ck, sizeof(ck), vp);
+ if (error)
+
CVS commit: [netbsd-7] src/doc
Module Name:src
Committed By: martin
Date: Fri Aug 29 11:58:30 UTC 2014
Modified Files:
src/doc [netbsd-7]: CHANGES-7.0
Log Message:
Tickets 55, 56, 58, 59 - 67
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-7.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-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.25 src/doc/CHANGES-7.0:1.1.2.26
--- src/doc/CHANGES-7.0:1.1.2.25 Wed Aug 27 15:30:45 2014
+++ src/doc/CHANGES-7.0 Fri Aug 29 11:58:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.25 2014/08/27 15:30:45 msaitoh Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.26 2014/08/29 11:58:30 martin Exp $
A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
until the 7.0 release:
@@ -398,3 +398,125 @@ sys/compat/osf1/osf1_file.c 1.42
Fix a bug that a local user could crash the system by making the
kernel perform a zero-sized memory allocation in osf1.
[maxv, ticket #54]
+
+sys/dev/dm/dm_target_stripe.c 1.20-1.21
+
+ Avoid a memory leak - from maxv.
+ Cleanup properly on error.
+ [christos, ticket #55]
+
+lib/libnpf/npf.c1.33-1.34
+sys/net/npf/npf_alg.c1.15
+sys/net/npf/npf_conn.c1.11-1.12
+sys/net/npf/npf_ctl.c1.39-1.40
+sys/net/npf/npf_impl.h1.59
+sys/net/npf/npf_nat.c1.33
+sys/net/npf/npf_nat.c1.34
+usr.sbin/npf/npfctl/npfctl.c 1.43
+
+ Add and use npf_alg_export().
+ npf_conn_import: handle NAT metadata correctly.
+ npf_nat_newpolicy: restore the policy ID.
+ npfctl_load: fix error code handling for the limit cases.
+ npf_config_import: fix the inverted logic.
+ npfctl_load: improve error handling.
+ npf_conn_import: add a missing stat counter increment.
+ npf_nat_import: add a missing reference and make a comment.
+ npf_config_submit: finally, include the saved connections.
+ [rmind, ticket #56]
+
+sys/arch/arm/allwinner/awin_mmc.c 1.4
+sys/arch/arm/allwinner/awin_reg.h 1.15
+
+ Correct the mmc clock. Banana Pi can now find an SD card.
+ [skrll, ticket #57]
+
+common/lib/libc/gen/rb.c 1.12-1.13
+
+ Fix failure case in rb_tree_find_node_leq/geq.
+ Return NULL, not `NULL - offset'.
+ Remove enclosing parens on return.
+ [riastradh, ticket #59]
+
+external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile 1.6
+
+ Fix the sources list to match the upstream Makefile.am.
+ Fixes problems reported by jdbaker.
+ [mrg, ticket #60]
+
+sys/dev/pci/if_wm.c1.290
+sys/dev/pci/if_wmvar.h1.20
+
+ Set the WM_F_ATTACHED flag if wm_attach() finished succesfully and check
+ the flag in wm_detach(). It will avoid to panic in wm_detach().
+ Fixes PR#49102.
+ [msaitoh, ticket #61]
+
+distrib/sets/lists/man/mi 1.1486
+share/man/man4/Makefile1.617
+share/man/man4/arcofi.41.1-1.2
+sys/arch/hp300/conf/GENERIC 1.188
+sys/arch/hp300/conf/files.hp300 1.89
+sys/arch/hp300/conf/majors.hp300 1.26
+sys/arch/hp300/dev/arcofi_dio.c 1.1
+sys/arch/hp300/hp300/intr.c 1.41
+sys/arch/hp300/hp300/locore.s 1.171
+sys/conf/files 1.1100
+sys/dev/ic/arcofi.c1.1
+sys/dev/ic/arcofivar.h1.1
+
+ Add new arcofi(4) audio driver for NetBSD/hp300, ported from OpenBSD.
+
+ The arcofi(4) is a driver for the HP Audio1 device
+ (Siemens PSB 2160 ARCOFI phone quality audio chip)
+ found on the HP9000/425e and HP9000/{705,710,745,747} models
+ (but only hp300 attachment is ported for now).
+ The chip supports 8-bit mono 8kHz U-law, A-law and
+ 16-bit mono slinear_be formats.
+
+ The old HP9000/425e playing tunes with this new arcofi(4) audio driver
+ was also demonstrated at Open Source Conference 2014 Shimane.
+
+ Add a man page for arcofi(4) driver. From OpenBSD.
+ Fix date.
+ [tsutsui, ticket #62]
+
+tests/lib/libpthread/t_swapcontext.c 1.2
+
+ Go back to the initial context (as tests/lib/libc/sys/t_swapcontext.c
+ does) after checking pthread_self() didn't change. Otherwise the
+ process exits outside of atf context.
+ Should fix Test case exited normally but failed to create the results
+ file: Results file is empty reports from atf-run.
+ [bouyer, ticket #63]
+
+usr.bin/ldd/elf64/Makefile 1.8
+
+ Fix ldd on LP64 platforms by splitting the symbol versioning stuff for
+ elf64 as well.
+ [joerg, ticket #64]
+
+sys/dev/dkwedge/dk.c1.73
+
+ Make dk(4) discard from partition start, not from disk start.
+
+ Otherwise, anything mounted with `-o discard' will pretty quickly
+ munch itself up and barf up an unrecoverably corrupted file system!
+ [riastradh, ticket #65]
+
+sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c 1.3
+
+ Hack around an evergreen attach crash for now: provide a hard coded
+ name for the i2c.
+ [mrg, ticket #66]
+
+sys/fs/puffs/puffs_msgif.c 1.95
+sys/fs/puffs/puffs_node.c 1.32
+sys/fs/puffs/puffs_sys.h 1.86
+sys/fs/puffs/puffs_vfsops.c 1.114
+sys/fs/puffs/puffs_vnops.c 1.184
+
+ Change puffs from hashlist to vcache.
+ Field pa_nhashbuckets of struct
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri Aug 29 12:14:30 UTC 2014
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h
Log Message:
No binary change:
- Move some NVM related macros fromk if_wm.c to if_wmreg.h.
- Rename some macros for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/if_wmreg.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.292 src/sys/dev/pci/if_wm.c:1.293
--- src/sys/dev/pci/if_wm.c:1.292 Thu Aug 28 16:22:59 2014
+++ src/sys/dev/pci/if_wm.c Fri Aug 29 12:14:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.292 2014/08/28 16:22:59 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.293 2014/08/29 12:14:29 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.292 2014/08/28 16:22:59 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.293 2014/08/29 12:14:29 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1856,7 +1856,7 @@ wm_attach(device_t parent, device_t self
KASSERT(prop_object_type(pn) == PROP_TYPE_NUMBER);
cfg1 = (uint16_t) prop_number_integer_value(pn);
} else {
- if (wm_nvm_read(sc, EEPROM_OFF_CFG1, 1, cfg1)) {
+ if (wm_nvm_read(sc, NVM_OFF_CFG1, 1, cfg1)) {
aprint_error_dev(sc-sc_dev, unable to read CFG1\n);
goto fail_5;
}
@@ -1867,7 +1867,7 @@ wm_attach(device_t parent, device_t self
KASSERT(prop_object_type(pn) == PROP_TYPE_NUMBER);
cfg2 = (uint16_t) prop_number_integer_value(pn);
} else {
- if (wm_nvm_read(sc, EEPROM_OFF_CFG2, 1, cfg2)) {
+ if (wm_nvm_read(sc, NVM_OFF_CFG2, 1, cfg2)) {
aprint_error_dev(sc-sc_dev, unable to read CFG2\n);
goto fail_5;
}
@@ -1880,10 +1880,10 @@ wm_attach(device_t parent, device_t self
case WM_T_82543:
/* dummy? */
eeprom_data = 0;
- apme_mask = EEPROM_CFG3_APME;
+ apme_mask = NVM_CFG3_APME;
break;
case WM_T_82544:
- apme_mask = EEPROM_CFG2_82544_APM_EN;
+ apme_mask = NVM_CFG2_82544_APM_EN;
eeprom_data = cfg2;
break;
case WM_T_82546:
@@ -1895,9 +1895,9 @@ wm_attach(device_t parent, device_t self
case WM_T_82583:
case WM_T_80003:
default:
- apme_mask = EEPROM_CFG3_APME;
- wm_nvm_read(sc, (sc-sc_funcid == 1) ? EEPROM_OFF_CFG3_PORTB
- : EEPROM_OFF_CFG3_PORTA, 1, eeprom_data);
+ apme_mask = NVM_CFG3_APME;
+ wm_nvm_read(sc, (sc-sc_funcid == 1) ? NVM_OFF_CFG3_PORTB
+ : NVM_OFF_CFG3_PORTA, 1, eeprom_data);
break;
case WM_T_82575:
case WM_T_82576:
@@ -1936,7 +1936,7 @@ wm_attach(device_t parent, device_t self
KASSERT(prop_object_type(pn) == PROP_TYPE_NUMBER);
swdpin = (uint16_t) prop_number_integer_value(pn);
} else {
- if (wm_nvm_read(sc, EEPROM_OFF_SWDPIN, 1, swdpin)) {
+ if (wm_nvm_read(sc, NVM_OFF_SWDPIN, 1, swdpin)) {
aprint_error_dev(sc-sc_dev,
unable to read SWDPIN\n);
goto fail_5;
@@ -1944,36 +1944,36 @@ wm_attach(device_t parent, device_t self
}
}
- if (cfg1 EEPROM_CFG1_ILOS)
+ if (cfg1 NVM_CFG1_ILOS)
sc-sc_ctrl |= CTRL_ILOS;
if (sc-sc_type = WM_T_82544) {
sc-sc_ctrl |=
- ((swdpin EEPROM_SWDPIN_SWDPIO_SHIFT) 0xf)
+ ((swdpin NVM_SWDPIN_SWDPIO_SHIFT) 0xf)
CTRL_SWDPIO_SHIFT;
sc-sc_ctrl |=
- ((swdpin EEPROM_SWDPIN_SWDPIN_SHIFT) 0xf)
+ ((swdpin NVM_SWDPIN_SWDPIN_SHIFT) 0xf)
CTRL_SWDPINS_SHIFT;
} else {
sc-sc_ctrl |=
- ((cfg1 EEPROM_CFG1_SWDPIO_SHIFT) 0xf)
+ ((cfg1 NVM_CFG1_SWDPIO_SHIFT) 0xf)
CTRL_SWDPIO_SHIFT;
}
#if 0
if (sc-sc_type = WM_T_82544) {
- if (cfg1 EEPROM_CFG1_IPS0)
+ if (cfg1 NVM_CFG1_IPS0)
sc-sc_ctrl_ext |= CTRL_EXT_IPS;
- if (cfg1 EEPROM_CFG1_IPS1)
+ if (cfg1 NVM_CFG1_IPS1)
sc-sc_ctrl_ext |= CTRL_EXT_IPS1;
sc-sc_ctrl_ext |=
- ((swdpin (EEPROM_SWDPIN_SWDPIO_SHIFT + 4)) 0xd)
+ ((swdpin (NVM_SWDPIN_SWDPIO_SHIFT + 4)) 0xd)
CTRL_EXT_SWDPIO_SHIFT;
sc-sc_ctrl_ext |=
- ((swdpin (EEPROM_SWDPIN_SWDPIN_SHIFT + 4)) 0xd)
+ ((swdpin (NVM_SWDPIN_SWDPIN_SHIFT + 4)) 0xd)
CTRL_EXT_SWDPINS_SHIFT;
} else {
sc-sc_ctrl_ext |=
- ((cfg2 EEPROM_CFG2_SWDPIO_SHIFT) 0xf)
+ ((cfg2 NVM_CFG2_SWDPIO_SHIFT) 0xf)
CTRL_EXT_SWDPIO_SHIFT;
}
#endif
@@ -1999,9 +1999,9 @@ wm_attach(device_t parent, device_t self
uint16_t val;
/* Save the NVM K1 bit setting */
- wm_nvm_read(sc, EEPROM_OFF_K1_CONFIG, 1, val);
+ wm_nvm_read(sc, NVM_OFF_K1_CONFIG, 1, val);
- if ((val EEPROM_K1_CONFIG_ENABLE) != 0)
+ if ((val NVM_K1_CONFIG_ENABLE) != 0)
sc-sc_nvm_k1_enabled = 1;
else
sc-sc_nvm_k1_enabled = 0;
@@ -2134,8 +2134,8 @@ wm_attach(device_t parent, device_t self
switch (sc-sc_type) {
case WM_T_82573:
/* XXX limited to 9234 if ASPM is
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Fri Aug 29 15:22:18 UTC 2014 Modified Files: src/sys/external/bsd/drm2/linux: linux_work.c Log Message: Don't forget to lock wq_lock around handling wq_delayed. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/linux/linux_work.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/external/bsd/drm2/linux/linux_work.c diff -u src/sys/external/bsd/drm2/linux/linux_work.c:1.7 src/sys/external/bsd/drm2/linux/linux_work.c:1.8 --- src/sys/external/bsd/drm2/linux/linux_work.c:1.7 Tue Jul 29 17:36:06 2014 +++ src/sys/external/bsd/drm2/linux/linux_work.c Fri Aug 29 15:22:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_work.c,v 1.7 2014/07/29 17:36:06 riastradh Exp $ */ +/* $NetBSD: linux_work.c,v 1.8 2014/08/29 15:22:18 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_work.c,v 1.7 2014/07/29 17:36:06 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_work.c,v 1.8 2014/08/29 15:22:18 riastradh Exp $); #include sys/types.h #include sys/param.h @@ -577,7 +577,9 @@ queue_delayed_work(struct workqueue_stru linux_worker_intr, dw); dw-work.w_state = WORK_DELAYED; dw-work.w_wq = wq; + mutex_enter(wq-wq_lock); TAILQ_INSERT_HEAD(wq-wq_delayed, dw, dw_entry); + mutex_exit(wq-wq_lock); } newly_queued = true; break; @@ -636,7 +638,9 @@ mod_delayed_work(struct workqueue_struct linux_worker_intr, dw); dw-work.w_state = WORK_DELAYED; dw-work.w_wq = wq; + mutex_enter(wq-wq_lock); TAILQ_INSERT_HEAD(wq-wq_delayed, dw, dw_entry); + mutex_exit(wq-wq_lock); } timer_modified = false; break;
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: sjg
Date: Fri Aug 29 15:55:44 UTC 2014
Modified Files:
src/usr.bin/make/unit-tests: Makefile posix1.exp posix1.mk suffixes.mk
Log Message:
posix1.mk and suffixes.mk need to cleanup in order to achieve
repeatable results.
posix1.mk's lib.a target still looks dubious.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/posix1.exp
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/posix1.mk \
src/usr.bin/make/unit-tests/suffixes.mk
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/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.48 src/usr.bin/make/unit-tests/Makefile:1.49
--- src/usr.bin/make/unit-tests/Makefile:1.48 Sun Aug 24 17:17:24 2014
+++ src/usr.bin/make/unit-tests/Makefile Fri Aug 29 15:55:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2014/08/24 17:17:24 apb Exp $
+# $NetBSD: Makefile,v 1.49 2014/08/29 15:55:44 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -66,7 +66,7 @@ all: ${OUTFILES}
CLEANFILES += *.rawout *.out *.status *.tmp *.core *.tmp
CLEANFILES += obj*.[och] lib*.a # posix1.mk
-CLEANFILES += issue* # suffixes.mk
+CLEANFILES += issue* .[ab]* # suffixes.mk
CLEANRECURSIVE += dir dummy # posix1.mk
clean:
Index: src/usr.bin/make/unit-tests/posix1.exp
diff -u src/usr.bin/make/unit-tests/posix1.exp:1.2 src/usr.bin/make/unit-tests/posix1.exp:1.3
--- src/usr.bin/make/unit-tests/posix1.exp:1.2 Sat Aug 23 16:08:42 2014
+++ src/usr.bin/make/unit-tests/posix1.exp Fri Aug 29 15:55:44 2014
@@ -6,7 +6,7 @@ foo baR baz, bar baz, foo bar baz, fooa
mkdir -p 'dir'
touch 'dir/obj_1.h'
mkdir -p 'dir'
-printf '#include obj_1.h\nconst char* obj_1 = dir/obj_1.c;' \
+printf '#include obj_1.h\nconst char* obj_1 = dir/obj_1.c;\n' \
'dir/obj_1.c'
Local variables
$(@)=dir/obj_1.o $()=dir/obj_1.c
@@ -90,7 +90,7 @@ ar -rcv 'lib.a' 'obj1.o'
a - obj1.o
rm -f 'obj1.o'
mkdir -p '.'
-printf '#include obj_2.h\nconst char* obj_2 = obj_2.c;' \
+printf '#include obj_2.h\nconst char* obj_2 = obj_2.c;\n' \
'obj_2.c'
mkdir -p '.'
touch 'obj_2.h'
@@ -139,7 +139,7 @@ touch 'obj3.h'
mkdir -p 'dir'
touch 'dir/dummy'
mkdir -p '.'
-printf '#include obj3.h\nconst char* obj3 = obj3.c;' \
+printf '#include obj3.h\nconst char* obj3 = obj3.c;\n' \
'obj3.c'
Local variables
$(@)=lib.a $()=obj3.c
Index: src/usr.bin/make/unit-tests/posix1.mk
diff -u src/usr.bin/make/unit-tests/posix1.mk:1.1 src/usr.bin/make/unit-tests/posix1.mk:1.2
--- src/usr.bin/make/unit-tests/posix1.mk:1.1 Sat Aug 23 15:02:04 2014
+++ src/usr.bin/make/unit-tests/posix1.mk Fri Aug 29 15:55:44 2014
@@ -1,10 +1,15 @@
-# $NetBSD: posix1.mk,v 1.1 2014/08/23 15:02:04 christos Exp $
+# $NetBSD: posix1.mk,v 1.2 2014/08/29 15:55:44 sjg Exp $
# Keep the default suffixes from interfering, just in case.
.SUFFIXES:
all: line-continuations suffix-substitution localvars
+# we need to clean for repeatable results
+.BEGIN: clean
+clean:
+ @rm -f lib.a dir/* dummy obj*
+
#
# Line continuations
#
@@ -171,7 +176,7 @@ obj2.o: obj_2.c obj_2.h dir/obj_1.h
# as a bait for a regression into the forced dependencies discussed earlier.
obj1.c dir/obj_1.c obj2.c obj_2.c obj3.c:
mkdir -p '$(@D)'
- printf '#include $(@F:.c=.h)\nconst char* $(@F:.c=) = $(@);' \
+ printf '#include $(@F:.c=.h)\nconst char* $(@F:.c=) = $(@);\n' \
'$(@)'
dir/obj_1.h obj_2.h obj3.h dummy dir/dummy:
Index: src/usr.bin/make/unit-tests/suffixes.mk
diff -u src/usr.bin/make/unit-tests/suffixes.mk:1.1 src/usr.bin/make/unit-tests/suffixes.mk:1.2
--- src/usr.bin/make/unit-tests/suffixes.mk:1.1 Sat Aug 23 15:05:40 2014
+++ src/usr.bin/make/unit-tests/suffixes.mk Fri Aug 29 15:55:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: suffixes.mk,v 1.1 2014/08/23 15:05:40 christos Exp $
+# $NetBSD: suffixes.mk,v 1.2 2014/08/29 15:55:44 sjg Exp $
# Issues from PR 49086
@@ -46,6 +46,11 @@ all: issue10.e
# available, so they would have expanded to a null string.
all: issue11.j
+# we need to clean for repeatable results
+.BEGIN: clean
+clean:
+ @rm -f issue* .[ab]*
+
.SUFFIXES: .a .b .c
.a .a.b .b.a:
CVS commit: src/tests/fs/vfs
Module Name:src
Committed By: gson
Date: Fri Aug 29 17:39:18 UTC 2014
Modified Files:
src/tests/fs/vfs: t_unpriv.c
Log Message:
Don't pass an uninitialized variable as the times[] argument of
rump_sys_utimes(). Instead, pass combinations of values representing
edge cases: the farthest possible past, the epoch, and the farthest
possible future. Now the excessive runtime reported in PR bin/49144
occurs reliably, on multiple architectures, and not only with udf, but
also with msdosfs.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/fs/vfs/t_unpriv.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/fs/vfs/t_unpriv.c
diff -u src/tests/fs/vfs/t_unpriv.c:1.10 src/tests/fs/vfs/t_unpriv.c:1.11
--- src/tests/fs/vfs/t_unpriv.c:1.10 Sat Mar 16 05:45:37 2013
+++ src/tests/fs/vfs/t_unpriv.c Fri Aug 29 17:39:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_unpriv.c,v 1.10 2013/03/16 05:45:37 jmmv Exp $ */
+/* $NetBSD: t_unpriv.c,v 1.11 2014/08/29 17:39:18 gson Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
#include atf-c.h
#include libgen.h
+#include limits.h
#include unistd.h
#include rump/rump_syscalls.h
@@ -127,7 +128,13 @@ times(const atf_tc_t *tc, const char *mp
{
const char *name = file.test;
int fd;
+ unsigned int i, j;
struct timeval tmv[2];
+ static struct timeval tmvs[] = {
+ { QUAD_MIN, 0 },
+ { 0, 0 },
+ { QUAD_MAX, 99 }
+ };
FSTEST_ENTER();
@@ -148,15 +155,21 @@ times(const atf_tc_t *tc, const char *mp
if (rump_sys_utimes(name, NULL) == -1)
atf_tc_fail_errno(utimes);
- rump_pub_lwproc_rfork(RUMP_RFCFDG);
- if (rump_sys_setuid(1) == -1)
- atf_tc_fail_errno(setuid);
- if (rump_sys_utimes(name, tmv) != -1 || errno != EPERM)
- atf_tc_fail_errno(utimes);
- rump_pub_lwproc_releaselwp();
-
- if (rump_sys_utimes(name, tmv) == -1)
- atf_tc_fail_errno(utimes);
+ for (i = 0; i sizeof(tmvs) / sizeof(tmvs[0]); i++) {
+ for (j = 0; j sizeof(tmvs) / sizeof(tmvs[0]); j++) {
+ tmv[0] = tmvs[i];
+ tmv[1] = tmvs[j];
+ rump_pub_lwproc_rfork(RUMP_RFCFDG);
+ if (rump_sys_setuid(1) == -1)
+atf_tc_fail_errno(setuid);
+ if (rump_sys_utimes(name, tmv) != -1 || errno != EPERM)
+atf_tc_fail_errno(utimes);
+ rump_pub_lwproc_releaselwp();
+
+ if (rump_sys_utimes(name, tmv) == -1)
+atf_tc_fail_errno(utimes);
+ }
+ }
if (rump_sys_unlink(name) == -1)
atf_tc_fail_errno(unlink);
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: sjg
Date: Fri Aug 29 20:03:27 UTC 2014
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
*.rawout are out-of-date if ${TEST_MAKE} is newer.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/make/unit-tests/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.49 src/usr.bin/make/unit-tests/Makefile:1.50
--- src/usr.bin/make/unit-tests/Makefile:1.49 Fri Aug 29 15:55:44 2014
+++ src/usr.bin/make/unit-tests/Makefile Fri Aug 29 20:03:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2014/08/29 15:55:44 sjg Exp $
+# $NetBSD: Makefile,v 1.50 2014/08/29 20:03:27 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -127,4 +127,8 @@ accept:
cp $${test}.out ${UNIT_TESTS}/$${test}.exp ; } \
done
+.if exists(${TEST_MAKE})
+${TESTNAMES:S/$/.rawout/}: ${TEST_MAKE}
+.endif
+
.-include bsd.obj.mk
