CVS commit: src/sys/netinet6
Module Name:src
Committed By: dholland
Date: Thu Apr 21 06:58:32 UTC 2011
Modified Files:
src/sys/netinet6: mld6.c
Log Message:
Prune dead assignment, from Henning Petersen in PR 44890.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/netinet6/mld6.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/mld6.c
diff -u src/sys/netinet6/mld6.c:1.51 src/sys/netinet6/mld6.c:1.52
--- src/sys/netinet6/mld6.c:1.51 Tue Aug 4 22:04:23 2009
+++ src/sys/netinet6/mld6.c Thu Apr 21 06:58:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.51 2009/08/04 22:04:23 dyoung Exp $ */
+/* $NetBSD: mld6.c,v 1.52 2011/04/21 06:58:31 dholland Exp $ */
/* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */
/*
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.51 2009/08/04 22:04:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.52 2011/04/21 06:58:31 dholland Exp $");
#include "opt_inet.h"
@@ -324,7 +324,7 @@
void
mld_input(struct mbuf *m, int off)
{
- struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
+ struct ip6_hdr *ip6;
struct mld_hdr *mldh;
struct ifnet *ifp = m->m_pkthdr.rcvif;
struct in6_multi *in6m = NULL;
CVS commit: src/sys/miscfs/genfs
Module Name:src
Committed By: matt
Date: Thu Apr 21 06:27:17 UTC 2011
Modified Files:
src/sys/miscfs/genfs: genfs_io.c
Log Message:
Move some #ifdefs to prevent a code path change when DEBUG .vs. !DEBUG
Solves problem an assert firing when using NFS on MIPS.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.47 src/sys/miscfs/genfs/genfs_io.c:1.48
--- src/sys/miscfs/genfs/genfs_io.c:1.47 Mon Apr 18 15:53:04 2011
+++ src/sys/miscfs/genfs/genfs_io.c Thu Apr 21 06:27:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.47 2011/04/18 15:53:04 rmind Exp $ */
+/* $NetBSD: genfs_io.c,v 1.48 2011/04/21 06:27:17 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.47 2011/04/18 15:53:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.48 2011/04/21 06:27:17 matt Exp $");
#include
#include
@@ -903,19 +903,19 @@
by_list = (uobj->uo_npages <=
((endoff - startoff) >> PAGE_SHIFT) * UVM_PAGE_TREE_PENALTY);
-#if !defined(DEBUG)
/*
* if this vnode is known not to have dirty pages,
* don't bother to clean it out.
*/
if ((vp->v_iflag & VI_ONWORKLST) == 0) {
+#if !defined(DEBUG)
if ((flags & (PGO_FREE|PGO_DEACTIVATE)) == 0) {
goto skip_scan;
}
+#endif /* !defined(DEBUG) */
flags &= ~PGO_CLEANIT;
}
-#endif /* !defined(DEBUG) */
/*
* start the loop. when scanning by list, hold the last page
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: enami
Date: Thu Apr 21 00:24:07 UTC 2011
Modified Files:
src/sys/arch/x86/x86: db_trace.c
Log Message:
lwpaddr is a boolean variable and thus doesn't hold an address of lwp.
Compare with correct value so that tr/t works again on current procecss.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/db_trace.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/x86/x86/db_trace.c
diff -u src/sys/arch/x86/x86/db_trace.c:1.2 src/sys/arch/x86/x86/db_trace.c:1.3
--- src/sys/arch/x86/x86/db_trace.c:1.2 Mon Apr 11 04:22:31 2011
+++ src/sys/arch/x86/x86/db_trace.c Thu Apr 21 00:24:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.2 2011/04/11 04:22:31 mrg Exp $ */
+/* $NetBSD: db_trace.c,v 1.3 2011/04/21 00:24:07 enami Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.2 2011/04/11 04:22:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.3 2011/04/21 00:24:07 enami Exp $");
#include
#include
@@ -158,13 +158,13 @@
return;
}
db_read_bytes((db_addr_t)pp, sizeof(p), (char *)&p);
- db_read_bytes((db_addr_t)p.p_lwps.lh_first,
- sizeof(l), (char *)&l);
+ addr = (db_addr_t)p.p_lwps.lh_first;
+ db_read_bytes(addr, sizeof(l), (char *)&l);
}
(*pr)("lid %d ", l.l_lid);
pcb = lwp_getpcb(&l);
#ifdef _KERNEL
- if (l.l_proc == curproc && (lwp_t *)lwpaddr == curlwp)
+ if (l.l_proc == curproc && (lwp_t *)addr == curlwp)
set_frame_callpc();
else
#endif
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: enami Date: Wed Apr 20 23:37:51 UTC 2011 Modified Files: src/lib/libc/stdio: getdelim.3 Log Message: - Put empty line after the local variable definition in the sample code to improve readability. - Remove indirection operator to clarify error condition. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/stdio/getdelim.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/getdelim.3 diff -u src/lib/libc/stdio/getdelim.3:1.8 src/lib/libc/stdio/getdelim.3:1.9 --- src/lib/libc/stdio/getdelim.3:1.8 Wed Jun 30 13:38:10 2010 +++ src/lib/libc/stdio/getdelim.3 Wed Apr 20 23:37:51 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: getdelim.3,v 1.8 2010/06/30 13:38:10 jruoho Exp $ +.\" $NetBSD: getdelim.3,v 1.9 2011/04/20 23:37:51 enami Exp $ .\" .\" Copyright (c) 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -108,6 +108,7 @@ char *line = NULL; size_t linesize = 0; ssize_t linelen; + while ((linelen = getline(\*[Am]line, \*[Am]linesize, fp)) != -1) fwrite(line, linelen, 1, stdout); @@ -117,9 +118,9 @@ .Sh ERRORS .Bl -tag -width [EOVERFLOW] .It Bq Er EINVAL -.Fa *lineptr +.Fa lineptr or -.Fa *n +.Fa n is a .Dv NULL pointer.
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: jym
Date: Wed Apr 20 20:32:38 UTC 2011
Modified Files:
src/sys/arch/xen/xen: xennetback_xenbus.c
Log Message:
Unmap rings before freeing their associated VAs, or we will get a
non-recoverable fault in the error path.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/xen/xen/xennetback_xenbus.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/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.40 src/sys/arch/xen/xen/xennetback_xenbus.c:1.41
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.40 Wed Apr 6 23:51:55 2011
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Wed Apr 20 20:32:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.40 2011/04/06 23:51:55 jym Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.41 2011/04/20 20:32:38 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -433,6 +433,7 @@
netif_tx_sring_t *tx_ring;
netif_rx_sring_t *rx_ring;
struct gnttab_map_grant_ref op;
+ struct gnttab_unmap_grant_ref uop;
evtchn_op_t evop;
u_long tx_ring_ref, rx_ring_ref;
u_long revtchn, rx_copy;
@@ -538,7 +539,7 @@
if (err) {
printf("%s: can't get event channel: %d\n",
xneti->xni_if.if_xname, err);
- goto err2;
+ goto err3;
}
xneti->xni_evtchn = evop.u.bind_interdomain.local_port;
xen_wmb();
@@ -570,6 +571,26 @@
break;
}
return;
+
+err3:
+ uop.dev_bus_addr = 0;
+
+ uop.host_addr = xneti->xni_rx_ring_va;
+ uop.handle = xneti->xni_rx_ring_handle;
+ err = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
+ &uop, 1);
+ if (err)
+ aprint_error_ifnet(&xneti->xni_if,
+ "unmap_grant_ref failed: %d\n", err);
+
+ uop.host_addr = xneti->xni_tx_ring_va;
+ uop.handle = xneti->xni_tx_ring_handle;
+ err = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
+ &uop, 1);
+ if (err)
+ aprint_error_ifnet(&xneti->xni_if,
+ "unmap_grant_ref failed: %d\n", err);
+
err2:
uvm_km_free(kernel_map, xneti->xni_rx_ring_va,
PAGE_SIZE, UVM_KMF_VAONLY);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Wed Apr 20 20:15:03 UTC 2011
Modified Files:
src/sys/dev/pci: if_lii.c
Log Message:
PR/41258: Elias Benali: Try to get the ethernet address from the BIOS before
failing.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_lii.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_lii.c
diff -u src/sys/dev/pci/if_lii.c:1.9 src/sys/dev/pci/if_lii.c:1.10
--- src/sys/dev/pci/if_lii.c:1.9 Mon Apr 5 03:20:26 2010
+++ src/sys/dev/pci/if_lii.c Wed Apr 20 16:15:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lii.c,v 1.9 2010/04/05 07:20:26 joerg Exp $ */
+/* $NetBSD: if_lii.c,v 1.10 2011/04/20 20:15:03 christos Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.9 2010/04/05 07:20:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.10 2011/04/20 20:15:03 christos Exp $");
#include
@@ -551,17 +551,18 @@
}
if (found < 2) {
- aprint_error_dev(sc->sc_dev, "error reading MAC address\n");
- return 1;
- }
-
- addr0 = htole32(addr0);
- addr1 = htole32(addr1);
-
- if ((addr0 == 0xff && (addr1 & 0x) == 0x) ||
- (addr0 == 0 && (addr1 & 0x) == 0)) {
+ /* Make sure we try the BIOS method before giving up */
addr0 = htole32(AT_READ_4(sc, ATL2_MAC_ADDR_0));
addr1 = htole32(AT_READ_4(sc, ATL2_MAC_ADDR_1));
+ if ((addr0 == 0xff && (addr1 & 0x) == 0x) ||
+ (addr0 == 0 && (addr1 & 0x) == 0)) {
+ aprint_error_dev(sc->sc_dev,
+ "error reading MAC address\n");
+ return 1;
+ }
+ } else {
+ addr0 = htole32(addr0);
+ addr1 = htole32(addr1);
}
ea[0] = (addr1 & 0xff00) >> 8;
CVS commit: src/tests/lib/libprop
Module Name:src
Committed By: martin
Date: Wed Apr 20 20:02:58 UTC 2011
Modified Files:
src/tests/lib/libprop: t_basic.c
Log Message:
PR fixed, remove expected failure.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libprop/t_basic.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/libprop/t_basic.c
diff -u src/tests/lib/libprop/t_basic.c:1.3 src/tests/lib/libprop/t_basic.c:1.4
--- src/tests/lib/libprop/t_basic.c:1.3 Wed Apr 6 17:41:27 2011
+++ src/tests/lib/libprop/t_basic.c Wed Apr 20 20:02:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_basic.c,v 1.3 2011/04/06 17:41:27 jruoho Exp $ */
+/* $NetBSD: t_basic.c,v 1.4 2011/04/20 20:02:58 martin Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_basic.c,v 1.3 2011/04/06 17:41:27 jruoho Exp $");
+__RCSID("$NetBSD: t_basic.c,v 1.4 2011/04/20 20:02:58 martin Exp $");
#include
#include
@@ -171,7 +171,12 @@
{
prop_dictionary_t c, d;
+ /*
+ * Fixed, should not fail any more...
+ *
atf_tc_expect_death("PR lib/43964");
+ *
+ */
d = prop_dictionary_internalize(compare1);
CVS commit: src/common/lib/libprop
Module Name:src Committed By: martin Date: Wed Apr 20 20:00:07 UTC 2011 Modified Files: src/common/lib/libprop: prop_object.c Log Message: Update also the non-void pointers to the current test objects. Finaly fixes PR lib/43964. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/common/lib/libprop/prop_object.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/libprop/prop_object.c diff -u src/common/lib/libprop/prop_object.c:1.26 src/common/lib/libprop/prop_object.c:1.27 --- src/common/lib/libprop/prop_object.c:1.26 Mon Mar 30 07:42:51 2009 +++ src/common/lib/libprop/prop_object.c Wed Apr 20 20:00:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: prop_object.c,v 1.26 2009/03/30 07:42:51 haad Exp $ */ +/* $NetBSD: prop_object.c,v 1.27 2011/04/20 20:00:07 martin Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -1158,6 +1158,8 @@ if (!_prop_stack_pop(&stack, &obj1, &obj2, &stored_pointer1, &stored_pointer2)) return true; + po1 = obj1; + po2 = obj2; goto continue_subtree; } _PROP_ASSERT(ret == _PROP_OBJECT_EQUALS_RECURSE);
CVS commit: src/lib/libc/sys
Module Name:src Committed By: christos Date: Wed Apr 20 19:57:58 UTC 2011 Modified Files: src/lib/libc/sys: open.2 Log Message: sync with reality (prototype of open is varyadic) To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/lib/libc/sys/open.2 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/sys/open.2 diff -u src/lib/libc/sys/open.2:1.49 src/lib/libc/sys/open.2:1.50 --- src/lib/libc/sys/open.2:1.49 Sun Apr 10 20:21:45 2011 +++ src/lib/libc/sys/open.2 Wed Apr 20 15:57:58 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: open.2,v 1.49 2011/04/11 00:21:45 wiz Exp $ +.\" $NetBSD: open.2,v 1.50 2011/04/20 19:57:58 christos Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)open.2 8.2 (Berkeley) 11/16/93 .\" -.Dd April 10, 2011 +.Dd April 20, 2011 .Dt OPEN 2 .Os .Sh NAME @@ -40,7 +40,7 @@ .Sh SYNOPSIS .In fcntl.h .Ft int -.Fn open "const char *path" "int flags" "mode_t mode" +.Fn open "const char *path" "int flags" "..." .Sh DESCRIPTION The file name specified by .Fa path @@ -72,10 +72,10 @@ .It Dv O_APPEND Append to the file on each write. .It Dv O_CREAT -Create the file if it does not exist, in which case the file is -created with mode -.Ar mode -as described in +Create the file if it does not exist. +The third argument of type +.Ft mode_t +is used to compute the mode bits of the file as described in .Xr chmod 2 and modified by the process' umask value (see .Xr umask 2 ) .
CVS commit: src/common/lib/libprop
Module Name:src Committed By: martin Date: Wed Apr 20 19:40:01 UTC 2011 Modified Files: src/common/lib/libprop: prop_dictionary.c Log Message: Fix "address of a void*" vs. void* confusion. Part of fixing PR lib/43964. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/common/lib/libprop/prop_dictionary.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/libprop/prop_dictionary.c diff -u src/common/lib/libprop/prop_dictionary.c:1.36 src/common/lib/libprop/prop_dictionary.c:1.37 --- src/common/lib/libprop/prop_dictionary.c:1.36 Fri Sep 24 22:51:52 2010 +++ src/common/lib/libprop/prop_dictionary.c Wed Apr 20 19:40:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: prop_dictionary.c,v 1.36 2010/09/24 22:51:52 rmind Exp $ */ +/* $NetBSD: prop_dictionary.c,v 1.37 2011/04/20 19:40:00 martin Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -523,8 +523,8 @@ *stored_pointer1 = (void *)(idx + 1); *stored_pointer2 = (void *)(idx + 1); - *next_obj1 = &dict1->pd_array[idx].pde_objref; - *next_obj2 = &dict2->pd_array[idx].pde_objref; + *next_obj1 = dict1->pd_array[idx].pde_objref; + *next_obj2 = dict2->pd_array[idx].pde_objref; if (!prop_dictionary_keysym_equals(dict1->pd_array[idx].pde_key, dict2->pd_array[idx].pde_key))
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: haad Date: Wed Apr 20 18:55:55 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi shl.mi Log Message: Do some useful work and fix MKDEBUG build after kerberos update. To generate a diff of this commit: cvs rdiff -u -r1.1618 -r1.1619 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.167 -r1.168 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1618 src/distrib/sets/lists/comp/mi:1.1619 --- src/distrib/sets/lists/comp/mi:1.1618 Sun Apr 17 09:01:57 2011 +++ src/distrib/sets/lists/comp/mi Wed Apr 20 18:55:53 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1618 2011/04/17 09:01:57 mrg Exp $ +# $NetBSD: mi,v 1.1619 2011/04/20 18:55:53 haad Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3236,7 +3236,8 @@ ./usr/libdata/debug/usr/bin/grolj4.debug comp-groff-debug groff,debug ./usr/libdata/debug/usr/bin/grops.debug comp-groff-debug groff,debug ./usr/libdata/debug/usr/bin/grotty.debug comp-groff-debug groff,debug -./usr/libdata/debug/usr/bin/gss.debug comp-krb5-debug kerberos,debug +./usr/libdata/debug/usr/bin/gss.debug comp-krb5-debug kerberos,debug,obsolete +./usr/libdata/debug/usr/bin/gsstool.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/bin/gzip.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/head.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/hesinfo.debug comp-hesiod-debug hesiod,debug @@ -3259,11 +3260,13 @@ ./usr/libdata/debug/usr/bin/ipcs.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/join.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/jot.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/kcc.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/bin/kdestroy.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/bin/kdump.debug comp-debug-debug debug ./usr/libdata/debug/usr/bin/kgetcred.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/bin/kinit.debug comp-krb5-debug kerberos,debug -./usr/libdata/debug/usr/bin/klist.debug comp-krb5-debug kerberos,debug +./usr/libdata/debug/usr/bin/klist.debug comp-krb5-debug kerberos,debug,obsolete +./usr/libdata/debug/usr/bin/kpasswd.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/bin/ktrace.debug comp-debug-debug debug ./usr/libdata/debug/usr/bin/ktruss.debug comp-debug-debug debug ./usr/libdata/debug/usr/bin/lam.debug comp-util-debug debug @@ -3576,6 +3579,7 @@ ./usr/libdata/debug/usr/libexec/comsat.debug comp-mail-debug debug ./usr/libdata/debug/usr/libexec/cpp.debug comp-obsolete pcccmds,obsolete ./usr/libdata/debug/usr/libexec/f771.debug comp-fortran-debug gcc=3,gcccmds,debug +./usr/libdata/debug/usr/libexec/digest-service.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/libexec/f771.debug comp-obsolete gcc=4,obsolete ./usr/libdata/debug/usr/libexec/fingerd.debug comp-netutil-debug debug ./usr/libdata/debug/usr/libexec/ftp-proxy.debug comp-obsolete obsolete Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.167 src/distrib/sets/lists/comp/shl.mi:1.168 --- src/distrib/sets/lists/comp/shl.mi:1.167 Sun Apr 17 09:01:58 2011 +++ src/distrib/sets/lists/comp/shl.mi Wed Apr 20 18:55:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.167 2011/04/17 09:01:58 mrg Exp $ +# $NetBSD: shl.mi,v 1.168 2011/04/20 18:55:54 haad Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -222,7 +222,8 @@ ./usr/libdata/debug/usr/lib/i18n/libmapper_zone.so.5.0.debug comp-i18n-debug debug ./usr/libdata/debug/usr/lib/libamu.so.4.0.debug comp-amd-debug debug ./usr/libdata/debug/usr/lib/libarchive.so.3.1.debug comp-sys-debug debug -./usr/libdata/debug/usr/lib/libasn1.so.8.0.debug comp-krb5-debug kerberos,debug +./usr/libdata/debug/usr/lib/libasn1.so.8.0.debug comp-krb5-debug kerberos,debug,obsolete +./usr/libdata/debug/usr/lib/libasn1.so.9.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug zfs,dynamicroot,debug ./usr/libdata/debug/usr/lib/libbfd.so.11.0.debug comp-sys-debug binutils,debug ./usr/libdata/debug/usr/lib/libbind9.so.5.3.debug comp-bind-debug debug @@ -230,7 +231,8 @@ ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libc.so.12.177.debug comp-sys-debug debug -./usr/libdata/debug/usr/lib/libcom_err.so.6.0.debug comp-krb5-debug kerberos,debug +./usr/libdata/debug/usr/lib/libcom_err.so.6.0.debug comp-krb5-debug kerberos,debug,obsolete +./usr/libdata/debug/usr/lib/libcom_err.so.7.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug ./usr/l
CVS commit: src/sys/netinet
Module Name:src Committed By: wiz Date: Wed Apr 20 14:08:07 UTC 2011 Modified Files: src/sys/netinet: tcp_input.c Log Message: Fix typos. To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/sys/netinet/tcp_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/tcp_input.c diff -u src/sys/netinet/tcp_input.c:1.309 src/sys/netinet/tcp_input.c:1.310 --- src/sys/netinet/tcp_input.c:1.309 Wed Apr 20 13:35:51 2011 +++ src/sys/netinet/tcp_input.c Wed Apr 20 14:08:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_input.c,v 1.309 2011/04/20 13:35:51 gdt Exp $ */ +/* $NetBSD: tcp_input.c,v 1.310 2011/04/20 14:08:07 wiz Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -145,7 +145,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.309 2011/04/20 13:35:51 gdt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.310 2011/04/20 14:08:07 wiz Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -3283,7 +3283,7 @@ /* * As with srtt, this should never happen. There is * no support in RFC2988 for this operation. But 1/4s - * as rttvar when faced with someting arguably wrong + * as rttvar when faced with something arguably wrong * is ok. */ if ((tp->t_rttvar += delta) <= 0) @@ -3294,7 +3294,7 @@ * set rtt=R and srtt=R/2. * For srtt, storage representation is 1/32 ticks, * so shift left by 5. - * For rttvar, storage representatnio is 1/16 ticks, + * For rttvar, storage representation is 1/16 ticks, * So shift left by 4, but then right by 1 to halve. */ tp->t_srtt = rtt << (TCP_RTT_SHIFT + 2);
CVS commit: src/sys/netinet
Module Name:src
Committed By: gdt
Date: Wed Apr 20 13:35:52 UTC 2011
Modified Files:
src/sys/netinet: tcp_input.c tcp_subr.c tcp_timer.c tcp_timer.h
tcp_var.h
Log Message:
Rewrite comments about TCP RTO calculations.
Long ago, the storage representations of srtt and rttvar were changed
from the 4.4BSD scheme, and the comments are out of sync with the
code. This commit rewrites most of the comments that explain the RTO
calculations, and points out some issues in the code.
Joint work with Bev Schwartz of BBN (original analysis and comments),
but I have rewritten and extended them, so errors are mine.
This material is based upon work supported by the Defense Advanced
Research Projects Agency and Space and Naval Warfare Systems Center,
Pacific, under Contract No. N66001-09-C-2073. Approved for Public
Release, Distribution Unlimited
To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.238 -r1.239 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.84 -r1.85 src/sys/netinet/tcp_timer.c
cvs rdiff -u -r1.26 -r1.27 src/sys/netinet/tcp_timer.h
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet/tcp_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.308 src/sys/netinet/tcp_input.c:1.309
--- src/sys/netinet/tcp_input.c:1.308 Thu Apr 14 15:48:48 2011
+++ src/sys/netinet/tcp_input.c Wed Apr 20 13:35:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.308 2011/04/14 15:48:48 yamt Exp $ */
+/* $NetBSD: tcp_input.c,v 1.309 2011/04/20 13:35:51 gdt Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -145,7 +145,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.308 2011/04/14 15:48:48 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.309 2011/04/20 13:35:51 gdt Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1687,6 +1687,18 @@
* the current time, or is extremely old, fall back to non-1323
* RTT calculation. Since ts_rtt is unsigned, we can test both
* at the same time.
+ *
+ * Note that ts_rtt is in units of slow ticks (500
+ * ms). Since most earthbound RTTs are < 500 ms,
+ * observed values will have large quantization noise.
+ * Our smoothed RTT is then the fraction of observed
+ * samples that are 1 tick instead of 0 (times 500
+ * ms).
+ *
+ * ts_rtt is increased by 1 to denote a valid sample,
+ * with 0 indicating an invalid measurement. This
+ * extra 1 must be removed when ts_rtt is used, or
+ * else an an erroneous extra 500 ms will result.
*/
ts_rtt = TCP_TIMESTAMP(tp) - opti.ts_ecr + 1;
if (ts_rtt > TCP_PAWS_IDLE)
@@ -3223,6 +3235,9 @@
/*
* Collect new round-trip time estimate
* and update averages and current timeout.
+ *
+ * rtt is in units of slow ticks (typically 500 ms) -- essentially the
+ * difference of two timestamps.
*/
void
tcp_xmit_timer(struct tcpcb *tp, uint32_t rtt)
@@ -3232,35 +3247,55 @@
TCP_STATINC(TCP_STAT_RTTUPDATED);
if (tp->t_srtt != 0) {
/*
- * srtt is stored as fixed point with 3 bits after the
- * binary point (i.e., scaled by 8). The following magic
- * is equivalent to the smoothing algorithm in rfc793 with
- * an alpha of .875 (srtt = rtt/8 + srtt*7/8 in fixed
- * point). Adjust rtt to origin 0.
+ * Compute the amount to add to srtt for smoothing,
+ * *alpha, or 2^(-TCP_RTT_SHIFT). Because
+ * srtt is stored in 1/32 slow ticks, we conceptually
+ * shift left 5 bits, subtract srtt to get the
+ * diference, and then shift right by TCP_RTT_SHIFT
+ * (3) to obtain 1/8 of the difference.
*/
delta = (rtt << 2) - (tp->t_srtt >> TCP_RTT_SHIFT);
+ /*
+ * This can never happen, because delta's lowest
+ * possible value is 1/8 of t_srtt. But if it does,
+ * set srtt to some reasonable value, here chosen
+ * as 1/8 tick.
+ */
if ((tp->t_srtt += delta) <= 0)
tp->t_srtt = 1 << 2;
/*
- * We accumulate a smoothed rtt variance (actually, a
- * smoothed mean difference), then set the retransmit
- * timer to smoothed rtt + 4 times the smoothed variance.
- * rttvar is stored as fixed point with 2 bits after the
- * binary point (scaled by 4). The following is
- * equivalent to rfc793 smoothing with an alpha of .75
- * (rttvar = rttvar*3/4 + |delta| / 4). This replaces
- * rfc793's wired-in beta.
+ * RFC2988 requires that rttvar be updated first.
+ * This code is compliant because "delta" is the old
+ * srtt minus the new observation (scaled).
+ *
+ * RFC2988 says:
+ * rttvar = (1-beta) * rttvar + beta * |srtt-observed|
+ *
+ * delta is in units of 1/32 ticks, and has then been
+ * divided by 8. This is equivalent to being in 1/16s
+ * units and divided by 4. Subtract from it 1/4 of
+ * the existing rttvar to form the (signed) amount to
+ *
CVS commit: src/tests/lib/libcurses/tests
Module Name:src Committed By: blymn Date: Wed Apr 20 10:40:14 UTC 2011 Modified Files: src/tests/lib/libcurses/tests: std_defines Log Message: Add boolean values to the standard definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/std_defines 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/libcurses/tests/std_defines diff -u src/tests/lib/libcurses/tests/std_defines:1.1 src/tests/lib/libcurses/tests/std_defines:1.2 --- src/tests/lib/libcurses/tests/std_defines:1.1 Sun Apr 10 09:55:10 2011 +++ src/tests/lib/libcurses/tests/std_defines Wed Apr 20 10:40:14 2011 @@ -2,6 +2,12 @@ # Define some standard symbols for curses so tests can reference things # symbolically instead of using magic numbers. # +# +# boolean +# +assign TRUE 0x01 +assign FALSE 0x00 +# # colours # assign COLOR_BLACK 0x00
CVS commit: src/external/historical/nawk/bin
Module Name:src Committed By: drochner Date: Wed Apr 20 10:10:33 UTC 2011 Modified Files: src/external/historical/nawk/bin: awk.1 Log Message: fix V->version flag To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/historical/nawk/bin/awk.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/historical/nawk/bin/awk.1 diff -u src/external/historical/nawk/bin/awk.1:1.1 src/external/historical/nawk/bin/awk.1:1.2 --- src/external/historical/nawk/bin/awk.1:1.1 Thu Aug 26 14:57:16 2010 +++ src/external/historical/nawk/bin/awk.1 Wed Apr 20 10:10:32 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: awk.1,v 1.1 2010/08/26 14:57:16 christos Exp $ +.\" $NetBSD: awk.1,v 1.2 2011/04/20 10:10:32 drochner Exp $ .\" .\" Copyright (C) Lucent Technologies 1997 .\" All Rights Reserved @@ -37,7 +37,7 @@ .Op Ar prog | Fl f Ar filename .Ar .Nm -.Fl V +.Fl version .Sh DESCRIPTION .Nm is the Bell Labs' implementation of the AWK programming language as @@ -109,7 +109,7 @@ Any number of .Fl v options may be present. -.It Fl V +.It Fl version Print .Nm version on standard output and exit.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: martin
Date: Wed Apr 20 09:57:59 UTC 2011
Modified Files:
src/sys/arch/sparc64/dev: ffb.c
Log Message:
Remove some leftovers
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc64/dev/ffb.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/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.39 src/sys/arch/sparc64/dev/ffb.c:1.40
--- src/sys/arch/sparc64/dev/ffb.c:1.39 Sat Apr 9 19:31:15 2011
+++ src/sys/arch/sparc64/dev/ffb.c Wed Apr 20 09:57:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.39 2011/04/09 19:31:15 jdc Exp $ */
+/* $NetBSD: ffb.c,v 1.40 2011/04/20 09:57:59 martin Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.39 2011/04/09 19:31:15 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.40 2011/04/20 09:57:59 martin Exp $");
#include
#include
@@ -374,7 +374,6 @@
void
ffb_attach_i2c(struct ffb_softc *sc)
{
- struct i2cbus_attach_args iba;
/* Fill in the i2c tag */
sc->sc_i2c.ic_cookie = sc;
@@ -386,10 +385,6 @@
sc->sc_i2c.ic_read_byte = ffb_i2c_read_byte;
sc->sc_i2c.ic_write_byte = ffb_i2c_write_byte;
sc->sc_i2c.ic_exec = NULL;
-
- /* Attach I2C bus */
- bzero(&iba, sizeof(iba));
- iba.iba_tag = &sc->sc_i2c;
}
int
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: drochner
Date: Wed Apr 20 09:32:43 UTC 2011
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
in alloc_sqtd_chain(), deal with the case where a data packet ends
exactly at a page boundary, and the FORCE_SHORT_XFER was set by the
client (which causes that an empty descriptor is needed to terminate
the transfer), from Gordon McNutt per PR kern/44883
(fixed a bit differently than the proposed patch for aesthetical
reasons -- avoids the page pointer to come into unexpexted area earlier)
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.173 src/sys/dev/usb/ehci.c:1.174
--- src/sys/dev/usb/ehci.c:1.173 Tue Jan 18 15:05:03 2011
+++ src/sys/dev/usb/ehci.c Wed Apr 20 09:32:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.173 2011/01/18 15:05:03 jmcneill Exp $ */
+/* $NetBSD: ehci.c,v 1.174 2011/04/20 09:32:43 drochner Exp $ */
/*
* Copyright (c) 2004-2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.173 2011/01/18 15:05:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.174 2011/04/20 09:32:43 drochner Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2750,7 +2750,8 @@
usb_syncmem(&cur->dma, cur->offs, sizeof(cur->qtd),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
DPRINTFN(10,("ehci_alloc_sqtd_chain: extend chain\n"));
- dataphys += curlen;
+ if (len)
+ dataphys += curlen;
cur = next;
}
cur->qtd.qtd_status |= htole32(EHCI_QTD_IOC);
CVS commit: src/crypto/external/bsd
Module Name:src
Committed By: elric
Date: Wed Apr 20 08:36:08 UTC 2011
Modified Files:
src/crypto/external/bsd: Makefile
Log Message:
openssh and libsaslc depend on heimdal, so we need to wait for it to be
built.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/Makefile
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/Makefile
diff -u src/crypto/external/bsd/Makefile:1.10 src/crypto/external/bsd/Makefile:1.11
--- src/crypto/external/bsd/Makefile:1.10 Fri Apr 15 18:05:42 2011
+++ src/crypto/external/bsd/Makefile Wed Apr 20 08:36:07 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2011/04/15 18:05:42 elric Exp $
+# $NetBSD: Makefile,v 1.11 2011/04/20 08:36:07 elric Exp $
.include
.if (${MKCRYPTO} != "no")
-SUBDIR+= openssl .WAIT heimdal netpgp openssh libsaslc
+SUBDIR+= openssl .WAIT heimdal netpgp .WAIT openssh libsaslc
.endif
.include
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: wiz Date: Wed Apr 20 08:20:17 UTC 2011 Modified Files: src/share/man/man4/man4.x86: balloon.4 Log Message: Spelling, sort sections. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.x86/balloon.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.x86/balloon.4 diff -u src/share/man/man4/man4.x86/balloon.4:1.5 src/share/man/man4/man4.x86/balloon.4:1.6 --- src/share/man/man4/man4.x86/balloon.4:1.5 Wed Apr 20 00:21:34 2011 +++ src/share/man/man4/man4.x86/balloon.4 Wed Apr 20 08:20:16 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: balloon.4,v 1.5 2011/04/20 00:21:34 jym Exp $ +.\" $NetBSD: balloon.4,v 1.6 2011/04/20 08:20:16 wiz Exp $ .\" .\" Copyright (c) 2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -64,7 +64,7 @@ .Xr xm 1 . Alternatively, the host's administrator is free to request to a particular domain to give some memory back. -This command requires the targetted domain's cooperation and requires +This command requires the targeted domain's cooperation and requires .Nm balloon support within it. This can be done through the @@ -107,50 +107,10 @@ This entry serves the same purpose as the .Dq memory/target entry in Xenstore. -This controls the targetted number of pages that the domain should have. +This controls the targeted number of pages that the domain should have. Note that this is only a target, and may not be achieved for a variety of reasons. .El -.Sh ERRORS -When setting the minimum threshold or target reservation entries through -.Dq kern.xen.balloon , -the following errors can be returned: -.Bl -tag -width Er -.It Bq Er EPERM -The value passed is beyond limits. -The new value is either too low -.Po Dq min -is below driver's safeguard value, or -.Dq target -is below minimum value -.Pc , -or too high -.Po Dq target -is above maximum value -.Pc . -.El -.Sh BUGS -There are a number of reasons why a domain may not attain the targetted -memory reservation: -.Nm -can be empty and cannot be collapsed further, domain -may not have enough free memory pages (due to memory fragmentation, -memory exhaustion, ...) so it cannot give enough back to -.Nm . -.Pp -Currently, the virtual memory sub-system of -.Nx -is not capable of ``hot-plugging'' new memory pages into place. -This means that increasing a domain's memory reservation above -its initial maximum value is pointless, as new memory pages -cannot be consumed by the memory management sub-system. -.Pp -Over expanding -.Nm -generates high kernel memory pressure. -While the driver tries to stay as conservative as possible to avoid -crashes, a very low memory reservation will lead to unwanted swap or even -.Fn panic . .Sh DIAGNOSTICS .Bl -diag .It "WARNING: balloon could not reach target %zu (current %zu)" @@ -170,6 +130,24 @@ .Nm will limit reservation up to the maximum value it can handle. .El +.Sh ERRORS +When setting the minimum threshold or target reservation entries through +.Dq kern.xen.balloon , +the following errors can be returned: +.Bl -tag -width Er +.It Bq Er EPERM +The value passed is beyond limits. +The new value is either too low +.Po Dq min +is below driver's safeguard value, or +.Dq target +is below minimum value +.Pc , +or too high +.Po Dq target +is above maximum value +.Pc . +.El .Sh SEE ALSO .Xr xm 1 , .Xr xenbus 4 , @@ -197,6 +175,28 @@ .An Cherry G. Mathew Aq che...@netbsd.org and .An Jean-Yves Migeon Aq j...@netbsd.org . +.Sh BUGS +There are a number of reasons why a domain may not attain the targeted +memory reservation: +.Nm +can be empty and cannot be collapsed further, domain +may not have enough free memory pages (due to memory fragmentation, +memory exhaustion, ...) so it cannot give enough back to +.Nm . +.Pp +Currently, the virtual memory sub-system of +.Nx +is not capable of ``hot-plugging'' new memory pages into place. +This means that increasing a domain's memory reservation above +its initial maximum value is pointless, as new memory pages +cannot be consumed by the memory management sub-system. +.Pp +Over expanding +.Nm +generates high kernel memory pressure. +While the driver tries to stay as conservative as possible to avoid +crashes, a very low memory reservation will lead to unwanted swap or even +.Fn panic . .Sh SECURITY CONSIDERATIONS Ballooning involves moving pages between different domains. This includes their content, which can lead to information leak.
