CVS commit: src/sys/netinet
Module Name:src
Committed By: yamt
Date: Thu Oct 7 03:15:49 UTC 2010
Modified Files:
src/sys/netinet: ip_reass.c
Log Message:
make ipfr_lock IPL_VM as ip_reass_drain is called in interrupts via
the drain hook for mbuf pools.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet/ip_reass.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_reass.c
diff -u src/sys/netinet/ip_reass.c:1.5 src/sys/netinet/ip_reass.c:1.6
--- src/sys/netinet/ip_reass.c:1.5 Wed Oct 6 07:39:37 2010
+++ src/sys/netinet/ip_reass.c Thu Oct 7 03:15:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_reass.c,v 1.5 2010/10/06 07:39:37 enami Exp $ */
+/* $NetBSD: ip_reass.c,v 1.6 2010/10/07 03:15:49 yamt Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.5 2010/10/06 07:39:37 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.6 2010/10/07 03:15:49 yamt Exp $");
#include
#include
@@ -152,7 +152,7 @@
ipfren_cache = pool_cache_init(sizeof(ipfr_qent_t), coherency_unit,
0, 0, "ipfrenpl", NULL, IPL_NET, NULL, NULL, NULL);
- mutex_init(&ipfr_lock, MUTEX_DEFAULT, IPL_SOFTNET);
+ mutex_init(&ipfr_lock, MUTEX_DEFAULT, IPL_VM);
for (i = 0; i < IPREASS_HASH_SIZE; i++) {
LIST_INIT(&ip_frags[i]);
CVS commit: src/sys/kern
Module Name:src
Committed By: chs
Date: Thu Oct 7 02:14:02 UTC 2010
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
when we use a fake data section, make sure that the start is page-aligned.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/exec_elf.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.26 src/sys/kern/exec_elf.c:1.27
--- src/sys/kern/exec_elf.c:1.26 Sat Sep 11 20:49:28 2010
+++ src/sys/kern/exec_elf.c Thu Oct 7 02:14:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.26 2010/09/11 20:49:28 chs Exp $ */
+/* $NetBSD: exec_elf.c,v 1.27 2010/10/07 02:14:02 chs Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.26 2010/09/11 20:49:28 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.27 2010/10/07 02:14:02 chs Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -781,7 +781,7 @@
}
if (epp->ep_daddr == ELFDEFNNAME(NO_ADDR)) {
- epp->ep_daddr = end_text;
+ epp->ep_daddr = round_page(end_text);
epp->ep_dsize = 0;
}
CVS commit: src/usr.sbin/services_mkdb
Module Name:src
Committed By: christos
Date: Thu Oct 7 01:28:51 UTC 2010
Modified Files:
src/usr.sbin/services_mkdb: services_mkdb.c
Log Message:
bump PROTOMAX
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/services_mkdb/services_mkdb.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/services_mkdb/services_mkdb.c
diff -u src/usr.sbin/services_mkdb/services_mkdb.c:1.17 src/usr.sbin/services_mkdb/services_mkdb.c:1.18
--- src/usr.sbin/services_mkdb/services_mkdb.c:1.17 Wed May 5 18:10:50 2010
+++ src/usr.sbin/services_mkdb/services_mkdb.c Wed Oct 6 21:28:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: services_mkdb.c,v 1.17 2010/05/05 22:10:50 wiz Exp $ */
+/* $NetBSD: services_mkdb.c,v 1.18 2010/10/07 01:28:50 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: services_mkdb.c,v 1.17 2010/05/05 22:10:50 wiz Exp $");
+__RCSID("$NetBSD: services_mkdb.c,v 1.18 2010/10/07 01:28:50 christos Exp $");
#endif /* not lint */
#include
@@ -54,7 +54,7 @@
static char tname[MAXPATHLEN];
#define PMASK 0x
-#define PROTOMAX 5
+#define PROTOMAX 6
static StringList ***parseservices(const char *, StringList *);
static void cleanup(void);
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: enami Date: Thu Oct 7 00:14:14 UTC 2010 Modified Files: src/lib/libc/stdio: fmemopen.3 Log Message: The was is not an argument but simply a part of sentense. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/stdio/fmemopen.3 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/stdio/fmemopen.3 diff -u src/lib/libc/stdio/fmemopen.3:1.4 src/lib/libc/stdio/fmemopen.3:1.5 --- src/lib/libc/stdio/fmemopen.3:1.4 Tue Sep 28 00:39:56 2010 +++ src/lib/libc/stdio/fmemopen.3 Thu Oct 7 00:14:14 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: fmemopen.3,v 1.4 2010/09/28 00:39:56 enami Exp $ +.\" $NetBSD: fmemopen.3,v 1.5 2010/10/07 00:14:14 enami Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -157,7 +157,8 @@ .Bl -tag -width Er .It Bq Er EINVAL The -.Fa size was +.Fa size +was .Dv 0 ; or the .Fa mode
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jakllsch Date: Wed Oct 6 18:13:34 UTC 2010 Modified Files: src/sys/dev/ic: nslm7x.c Log Message: Fix vcore readings in some cases on W83627THF by being mindful of the VRM9 mode. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/ic/nslm7x.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/nslm7x.c diff -u src/sys/dev/ic/nslm7x.c:1.55 src/sys/dev/ic/nslm7x.c:1.56 --- src/sys/dev/ic/nslm7x.c:1.55 Tue Mar 23 12:13:28 2010 +++ src/sys/dev/ic/nslm7x.c Wed Oct 6 18:13:33 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: nslm7x.c,v 1.55 2010/03/23 12:13:28 njoly Exp $ */ +/* $NetBSD: nslm7x.c,v 1.56 2010/10/06 18:13:33 jakllsch Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.55 2010/03/23 12:13:28 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.56 2010/10/06 18:13:33 jakllsch Exp $"); #include #include @@ -1847,6 +1847,10 @@ break; case WB_CHIPID_W83627THF: model = "W83627THF"; + lm_generic_banksel(sc, WB_BANKSEL_B0); + if ((*sc->lm_readreg)(sc, WB_BANK0_CONFIG) & WB_CONFIG_VMR9) + sc->vrm9 = 1; + lm_generic_banksel(sc, banksel); lm_setup_sensors(sc, w83637hf_sensors); wb_temp_diode_type(sc, cf_flags); break;
CVS commit: src/tests/dev/dm
Module Name:src
Committed By: haad
Date: Wed Oct 6 11:24:56 UTC 2010
Added Files:
src/tests/dev/dm: Atffile Makefile dm_targets_cmd.plist
dm_version_cmd.plist h_dm.c t_dm.sh
Log Message:
Import new test program for device-mapper driver it currently call
dm_version_list
and dm_targets_list ioctl to test if dm driver inside rump works.
It will be disable for now, because I need to find out why if I run this
test by atf-run it fails while running h_dm by hand works.
XXX. component.c in rump/libdm calls devsw_attach before dm_modcmd can do
that therefore unmodified modcmd returns error.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/dev/dm/Atffile src/tests/dev/dm/Makefile \
src/tests/dev/dm/dm_targets_cmd.plist \
src/tests/dev/dm/dm_version_cmd.plist src/tests/dev/dm/h_dm.c \
src/tests/dev/dm/t_dm.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tests/dev/dm/Atffile
diff -u /dev/null src/tests/dev/dm/Atffile:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/Atffile Wed Oct 6 11:24:55 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/10/06 11:24:55 haad Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: t_*
Index: src/tests/dev/dm/Makefile
diff -u /dev/null src/tests/dev/dm/Makefile:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/Makefile Wed Oct 6 11:24:55 2010
@@ -0,0 +1,27 @@
+
+# $NetBSD: Makefile,v 1.1 2010/10/06 11:24:55 haad Exp $
+#
+
+.include
+
+TESTSDIR= ${TESTSBASE}/dev/dm
+FILESDIR= ${TESTSDIR}
+
+TESTS_SH= t_dm
+TESTS_C= h_dm
+
+ATFFILE= yes
+
+
+LDADD+= -lprop -lutil
+LDADD+= -lrumpdev_disk -lrumpdev_dm
+LDADD+= -lrumpdev -lrumpvfs
+LDADD+= -lrump
+LDADD+= -lrumpuser -lpthread
+
+FILES= t_dm_disk_1.bz2.uue t_dm_disk_2.bz2.uue t_dm_disk_3.bz2.uue
+
+WARNS= 4
+NOMAN=
+
+.include
Index: src/tests/dev/dm/dm_targets_cmd.plist
diff -u /dev/null src/tests/dev/dm/dm_targets_cmd.plist:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/dm_targets_cmd.plist Wed Oct 6 11:24:55 2010
@@ -0,0 +1,20 @@
+
+http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+
+
+cmd_data
+
+command
+targets
+event_nr
+0x0
+flags
+0x4
+version
+
+0x4
+0x1
+0x0
+
+
+
\ No newline at end of file
Index: src/tests/dev/dm/dm_version_cmd.plist
diff -u /dev/null src/tests/dev/dm/dm_version_cmd.plist:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/dm_version_cmd.plist Wed Oct 6 11:24:55 2010
@@ -0,0 +1,20 @@
+
+http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+
+
+cmd_data
+
+command
+version
+event_nr
+0x0
+flags
+0x4
+version
+
+0x4
+0x0
+0x0
+
+
+
\ No newline at end of file
Index: src/tests/dev/dm/h_dm.c
diff -u /dev/null src/tests/dev/dm/h_dm.c:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/h_dm.c Wed Oct 6 11:24:55 2010
@@ -0,0 +1,146 @@
+/* $NetBSD: h_dm.c,v 1.1 2010/10/06 11:24:55 haad Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+int dm_test_targets(void);
+int dm_test_versions(void);
+
+/*
+ * Test simple dm versions command on device-mapper device.
+ */
CVS commit: src/crypto/external/bsd/netpgp/dist/src/pgp2ssh
Module Name:src
Committed By: agc
Date: Wed Oct 6 10:12:36 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/pgp2ssh: main.c
Log Message:
fix an off-by-two error when printing out the received key
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/pgp2ssh/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/pgp2ssh/main.c
diff -u src/crypto/external/bsd/netpgp/dist/src/pgp2ssh/main.c:1.1 src/crypto/external/bsd/netpgp/dist/src/pgp2ssh/main.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/pgp2ssh/main.c:1.1 Mon Sep 6 18:16:52 2010
+++ src/crypto/external/bsd/netpgp/dist/src/pgp2ssh/main.c Wed Oct 6 10:12:36 2010
@@ -96,7 +96,7 @@
/* btoa */
ascc = b64encode(key, keyc, asc, sizeof(asc), 0x);
/* write to .ssh/id_c0596823.pub */
- printf("ssh-rsa %.*s %s\n", ascc - 2, asc, cp);
+ printf("ssh-rsa %.*s %s\n", ascc, asc, cp);
}
exit((ok) ? EXIT_SUCCESS : EXIT_FAILURE);
}
CVS commit: src/crypto/external/bsd/netpgp/dist/src/hkpclient
Module Name:src
Committed By: agc
Date: Wed Oct 6 09:58:22 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/hkpclient: main.c
Log Message:
don't try to print a key if an error occurred
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/hkpclient/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/hkpclient/main.c
diff -u src/crypto/external/bsd/netpgp/dist/src/hkpclient/main.c:1.1 src/crypto/external/bsd/netpgp/dist/src/hkpclient/main.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/hkpclient/main.c:1.1 Thu Sep 2 05:58:01 2010
+++ src/crypto/external/bsd/netpgp/dist/src/hkpclient/main.c Wed Oct 6 09:58:22 2010
@@ -61,7 +61,7 @@
}
}
for (i = optind + 1 ; i < argc ; i++) {
- if (hkpc_get(&res, server, port, family, argv[optind], argv[i])) {
+ if (hkpc_get(&res, server, port, family, argv[optind], argv[i]) >= 0) {
hkpc_print_key(stdout, argv[optind], res);
}
}
CVS commit: src/crypto/external/bsd/netpgp/dist/src/hkpclient
Module Name:src
Committed By: agc
Date: Wed Oct 6 09:57:48 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/hkpclient: hkpc.c
Log Message:
fix an off-by-one error when printing the key from the server when retrieving
with the "get" command.
fix up an erroneous error message
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.c:1.1 src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.c:1.1 Thu Sep 2 05:58:01 2010
+++ src/crypto/external/bsd/netpgp/dist/src/hkpclient/hkpc.c Wed Oct 6 09:57:48 2010
@@ -74,7 +74,7 @@
}
freeaddrinfo(res);
if (rc < 0) {
-(void) fprintf(stderr, "bind() to %s:%d failed (rc %d)\n",
+(void) fprintf(stderr, "connect() to %s:%d failed (rc %d)\n",
hostname, port, rc);
}
return sock;
@@ -128,7 +128,7 @@
if (strcmp(op, "index") == 0 || strcmp(op, "vindex") == 0) {
ret = netpgp_format_json(fp, &res[(int)matches[0].rm_eo], 1);
} else {
- (void) fprintf(fp, "%s\n", &res[(int)matches[0].rm_eo + 1]);
+ (void) fprintf(fp, "%s\n", &res[(int)matches[0].rm_eo]);
ret = 1;
}
return ret;
CVS commit: src/usr.bin/uniq
Module Name:src
Committed By: wiz
Date: Wed Oct 6 07:59:18 UTC 2010
Modified Files:
src/usr.bin/uniq: uniq.c
Log Message:
Sync usage with man page.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/uniq/uniq.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/uniq/uniq.c
diff -u src/usr.bin/uniq/uniq.c:1.16 src/usr.bin/uniq/uniq.c:1.17
--- src/usr.bin/uniq/uniq.c:1.16 Wed Oct 6 06:43:26 2010
+++ src/usr.bin/uniq/uniq.c Wed Oct 6 07:59:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uniq.c,v 1.16 2010/10/06 06:43:26 dholland Exp $ */
+/* $NetBSD: uniq.c,v 1.17 2010/10/06 07:59:18 wiz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: uniq.c,v 1.16 2010/10/06 06:43:26 dholland Exp $");
+__RCSID("$NetBSD: uniq.c,v 1.17 2010/10/06 07:59:18 wiz Exp $");
#endif /* not lint */
#include
@@ -251,7 +251,7 @@
static void
usage(void)
{
- (void)fprintf(stderr, "Usage: %s [-c | -du] [-f fields] [-s chars] "
+ (void)fprintf(stderr, "Usage: %s [-cdu] [-f fields] [-s chars] "
"[input [output]]\n", getprogname());
exit(1);
}
CVS commit: src/sys/netinet
Module Name:src Committed By: enami Date: Wed Oct 6 07:39:37 UTC 2010 Modified Files: src/sys/netinet: ip_reass.c Log Message: Don't free memory still in use. Fixes nfs root problem reported by Christoph Egger on source-changes-d. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/ip_reass.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_reass.c diff -u src/sys/netinet/ip_reass.c:1.4 src/sys/netinet/ip_reass.c:1.5 --- src/sys/netinet/ip_reass.c:1.4 Sun Oct 3 19:44:47 2010 +++ src/sys/netinet/ip_reass.c Wed Oct 6 07:39:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_reass.c,v 1.4 2010/10/03 19:44:47 rmind Exp $ */ +/* $NetBSD: ip_reass.c,v 1.5 2010/10/06 07:39:37 enami Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -46,7 +46,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.4 2010/10/03 19:44:47 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.5 2010/10/06 07:39:37 enami Exp $"); #include #include @@ -390,7 +390,6 @@ pool_cache_put(ipfren_cache, q); m_cat(m, t); } - free(fp, M_FTABLE); /* * Create header for new packet by modifying header of first @@ -400,6 +399,7 @@ ip->ip_len = htons((ip->ip_hl << 2) + next); ip->ip_src = fp->ipq_src; ip->ip_dst = fp->ipq_dst; + free(fp, M_FTABLE); m->m_len += (ip->ip_hl << 2); m->m_data -= (ip->ip_hl << 2);
