svn commit: r215234 - head/sys/dev/arcmsr
Author: delphij Date: Sat Nov 13 08:58:36 2010 New Revision: 215234 URL: http://svn.freebsd.org/changeset/base/215234 Log: Update to vendor release 1.20.00.19. Bug fixes: * Fixed "inquiry data fails comparion at DV1 step" * Fixed bad range input in bus_alloc_resource for ADAPTER_TYPE_B * Fixed arcmsr driver prevent arcsas support for Areca SAS HBA ARC13x0 Many thanks to Areca for continuing to support FreeBSD. This commit is intended for MFC before 8.2-RELEASE. Submitted by: Ching-Lung Huang Modified: head/sys/dev/arcmsr/arcmsr.c head/sys/dev/arcmsr/arcmsr.h Modified: head/sys/dev/arcmsr/arcmsr.c == --- head/sys/dev/arcmsr/arcmsr.cSat Nov 13 06:07:39 2010 (r215233) +++ head/sys/dev/arcmsr/arcmsr.cSat Nov 13 08:58:36 2010 (r215234) @@ -38,29 +38,32 @@ ** History ** **REV# DATENAME DESCRIPTION -** 1.00.00.003/31/2004Erich ChenFirst release -** 1.20.00.02 11/29/2004 Erich Chenbug fix with arcmsr_bus_reset when PHY error -** 1.20.00.034/19/2005 Erich Chenadd SATA 24 Ports adapter type support +** 1.00.00.003/31/2004 Erich Chen First release +** 1.20.00.02 11/29/2004 Erich Chen bug fix with arcmsr_bus_reset when PHY error +** 1.20.00.034/19/2005 Erich Chen add SATA 24 Ports adapter type support ** clean unused function -** 1.20.00.129/12/2005 Erich Chenbug fix with abort command handling, +** 1.20.00.129/12/2005 Erich Chen bug fix with abort command handling, ** firmware version check ** and firmware update notify for hardware bug fix ** handling if none zero high part physical address ** of srb resource -** 1.20.00.138/18/2006 Erich Chenremove pending srb and report busy +** 1.20.00.138/18/2006 Erich Chen remove pending srb and report busy ** add iop message xfer ** with scsi pass-through command ** add new device id of sas raid adapters ** code fit for SPARC64 & PPC -** 1.20.00.14 02/05/2007 Erich Chenbug fix for incorrect ccb_h.status report +** 1.20.00.14 02/05/2007 Erich Chen bug fix for incorrect ccb_h.status report ** and cause g_vfs_done() read write error -** 1.20.00.15 10/10/2007 Erich Chensupport new RAID adapter type ARC120x -** 1.20.00.16 10/10/2009 Erich ChenBug fix for RAID adapter type ARC120x +** 1.20.00.15 10/10/2007 Erich Chen support new RAID adapter type ARC120x +** 1.20.00.16 10/10/2009 Erich Chen Bug fix for RAID adapter type ARC120x ** bus_dmamem_alloc() with BUS_DMA_ZERO -** 1.20.00.17 07/15/2010 Ching Huang Added support ARC1880 -** report CAM_DEV_NOT_THERE instead of CAM_SEL_TIMEOUT when device failed, -** prevent cam_periph_error removing all LUN devices of one Target id -** for any one LUN device failed +** 1.20.00.17 07/15/2010 Ching Huang Added support ARC1880 +** report CAM_DEV_NOT_THERE instead of CAM_SEL_TIMEOUT when device failed, +** prevent cam_periph_error removing all LUN devices of one Target id +** for any one LUN device failed +**1.20.00.18 10/14/2010 Ching Huang Fixed "inquiry data fails comparion at DV1 step" +** 10/25/2010 Ching Huang Fixed bad range input in bus_alloc_resource for ADAPTER_TYPE_B +**1.20.00.1
svn commit: r215235 - head/usr.bin/truss
Author: jh Date: Sat Nov 13 09:28:49 2010 New Revision: 215235 URL: http://svn.freebsd.org/changeset/base/215235 Log: Set FD_CLOEXEC for the output file only when the file has been specified with the -o option. Setting the flag for stderr (the default) could cause the traced process to redirect stderr to a random file. PR: bin/152151 Submitted by: ashish MFC after:5 days Modified: head/usr.bin/truss/main.c Modified: head/usr.bin/truss/main.c == --- head/usr.bin/truss/main.c Sat Nov 13 08:58:36 2010(r215234) +++ head/usr.bin/truss/main.c Sat Nov 13 09:28:49 2010(r215235) @@ -241,13 +241,14 @@ main(int ac, char **av) if (fname != NULL) { /* Use output file */ if ((trussinfo->outfile = fopen(fname, "w")) == NULL) errx(1, "cannot open %s", fname); + /* +* Set FD_CLOEXEC, so that the output file is not shared with +* the traced process. +*/ + if (fcntl(fileno(trussinfo->outfile), F_SETFD, FD_CLOEXEC) == + -1) + warn("fcntl()"); } - /* -* Set FD_CLOEXEC, so that the output file is not shared with -* the traced process. -*/ - if (fcntl(fileno(trussinfo->outfile), F_SETFD, FD_CLOEXEC) == -1) - warn("fcntl()"); /* * If truss starts the process itself, it will ignore some signals -- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215207 - in head: sys/net sys/netinet tools/regression/netinet/arphold
On Fri, 12 Nov 2010 22:03:02 + (UTC) George V. Neville-Neil wrote: GVN> Author: gnn GVN> Date: Fri Nov 12 22:03:02 2010 GVN> New Revision: 215207 GVN> URL: http://svn.freebsd.org/changeset/base/215207 GVN> Modified: head/sys/net/if_llatbl.c GVN> == GVN> --- head/sys/net/if_llatbl.cFri Nov 12 21:47:36 2010 (r215206) GVN> +++ head/sys/net/if_llatbl.cFri Nov 12 22:03:02 2010 (r215207) GVN> @@ -100,18 +100,34 @@ done: GVN> * This function is called by the timer functions GVN> * such as arptimer() and nd6_llinfo_timer(), and GVN> * the caller does the locking. GVN> + * GVN> + * Returns the number of held packets, if any, that were dropped. GVN> */ GVN> -void GVN> +size_t GVN> llentry_free(struct llentry *lle) GVN> { GVN> - GVN> +size_t pkts_dropped; GVN> +struct mbuf *next; GVN> + GVN> +pkts_dropped = 0; GVN> LLE_WLOCK_ASSERT(lle); GVN> LIST_REMOVE(lle, lle_next); GVN> GVN> -if (lle->la_hold != NULL) GVN> +while ((lle->la_numheld > 0) && (lle->la_hold != NULL)) { GVN> +next = lle->la_hold->m_nextpkt; GVN> m_freem(lle->la_hold); GVN> +lle->la_hold = next; GVN> +lle->la_numheld--; GVN> +pkts_dropped++; GVN> +} GVN> + GVN> +KASSERT(lle->la_numheld == 0, GVN> +("%s: la_numheld %d > 0, pkts_droped %ld", __func__, GVN> + lle->la_numheld, pkts_dropped)); cc -c -O -pipe -std=c99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc -I. -I/usr/src/sys -I/usr/src/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -Werror /usr/src/sys/net/if_llatbl.c cc1: warnings being treated as errors /usr/src/sys/net/if_llatbl.c: In function 'llentry_free': /usr/src/sys/net/if_llatbl.c:124: warning: format '%ld' expects type 'long int', but argument 4 has type 'size_t' *** Error code 1 I think this should be: Index: sys/net/if_llatbl.c === --- sys/net/if_llatbl.c (revision 215233) +++ sys/net/if_llatbl.c (working copy) @@ -122,7 +122,7 @@ llentry_free(struct llentry *lle) } KASSERT(lle->la_numheld == 0, - ("%s: la_numheld %d > 0, pkts_droped %ld", __func__, + ("%s: la_numheld %d > 0, pkts_droped %zu", __func__, lle->la_numheld, pkts_dropped)); LLE_FREE_LOCKED(lle); -- Mikolaj Golub ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215166 - in head: . sys/conf sys/netinet sys/netinet/cc sys/sys
On Fri, 12 Nov 2010 06:41:56 + (UTC) Lawrence Stewart wrote: LS> Author: lstewart LS> Date: Fri Nov 12 06:41:55 2010 LS> New Revision: 215166 LS> URL: http://svn.freebsd.org/changeset/base/215166 LS> Log: LS> This commit marks the first formal contribution of the "Five New TCP Congestion LS> Control Algorithms for FreeBSD" FreeBSD Foundation funded project. More details LS> about the project are available at: http://caia.swin.edu.au/freebsd/5cc/ It looks like the code needs improvement to work with VIMAGE :-) options VIMAGE jail -i -c vnet persist path=/ panic: lock "cc_list" 0xc101c418 already initialized #0 doadump () at pcpu.h:231 #1 0xc04f26b9 in db_fncall (dummy1=-1064234614, dummy2=0, dummy3=-1, dummy4=0xca54b688 "\234╤Tй") at /usr/src/sys/ddb/db_command.c:548 #2 0xc04f2aef in db_command (last_cmdp=0xc0e7957c, cmd_table=0x0, dopager=0) at /usr/src/sys/ddb/db_command.c:445 #3 0xc04f2ba4 in db_command_script (command=0xc0e7a484 "call doadump") at /usr/src/sys/ddb/db_command.c:516 #4 0xc04f6df0 in db_script_exec (scriptname=0xca54b794 "kdb.enter.panic", warnifnotfound=Variable "warnifnotfound" is not available.) at /usr/src/sys/ddb/db_script.c:302 #5 0xc04f6ed7 in db_script_kdbenter (eventname=0xc0d2410e "panic") at /usr/src/sys/ddb/db_script.c:324 #6 0xc04f4b28 in db_trap (type=3, code=0) at /usr/src/sys/ddb/db_main.c:228 #7 0xc0910fbe in kdb_trap (type=3, code=0, tf=0xca54b918) at /usr/src/sys/kern/subr_kdb.c:546 #8 0xc0c3d7c6 in trap (frame=0xca54b918) at /usr/src/sys/i386/i386/trap.c:732 #9 0xc0c2647c in calltrap () at /usr/src/sys/i386/i386/exception.s:168 #10 0xc091118a in kdb_enter (why=0xc0d2410e "panic", msg=0xc0d2410e "panic") at cpufunc.h:71 #11 0xc08dcd14 in panic (fmt=0xc0d27986 "lock \"%s\" %p already initialized") at /usr/src/sys/kern/kern_shutdown.c:574 #12 0xc0911bd4 in lock_init (lock=0xc147b204, class=0xc0e23a00, name=0xc0d3f215 "cc_list", type=0x0, flags=2228224) at /usr/src/sys/kern/subr_lock.c:81 #13 0xc08daf5d in rw_init_flags (rw=0xc101c418, name=0xc0d3f215 "cc_list", opts=0) at /usr/src/sys/kern/kern_rwlock.c:195 #14 0xc0a0d0c2 in cc_init () at /usr/src/sys/netinet/cc/cc.c:182 #15 0xc0a7a4fd in tcp_init () at /usr/src/sys/netinet/tcp_subr.c:281 #16 0xc0940e59 in protosw_init (pr=0x0) at /usr/src/sys/kern/uipc_domain.c:157 #17 0xc0940e87 in domain_init (arg=0xc0e34280) at /usr/src/sys/kern/uipc_domain.c:174 #18 0xc0940ee1 in vnet_domain_init (arg=0xc0e34280) at /usr/src/sys/kern/uipc_domain.c:190 #19 0xc09adb2e in vnet_sysinit () at /usr/src/sys/net/vnet.c:625 #20 0xc09ae1ef in vnet_alloc () at /usr/src/sys/net/vnet.c:254 #21 0xc08ba41a in kern_jail_set (td=0xc306d870, optuio=0xc2d66a80, flags=0) at /usr/src/sys/kern/kern_jail.c:1244 #22 0xc08bbd00 in jail_set (td=0xc306d870, uap=0xca54bcec) at /usr/src/sys/kern/kern_jail.c:489 #23 0xc091e903 in syscallenter (td=0xc306d870, sa=0xca54bce4) at /usr/src/sys/kern/subr_trap.c:318 #24 0xc0c3cebf in syscall (frame=0xca54bd28) at /usr/src/sys/i386/i386/trap.c:1095 #25 0xc0c26511 in Xint0x80_syscall () at /usr/src/sys/i386/i386/exception.s:266 #26 0x0033 in ?? () -- Mikolaj Golub ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215236 - in head: include lib/libc/gen
Author: delphij Date: Sat Nov 13 10:38:06 2010 New Revision: 215236 URL: http://svn.freebsd.org/changeset/base/215236 Log: Sync with OpenBSD, primarily better signal and terminal handling. Obtained from:OpenBSD MFC after:2 weeks Modified: head/include/readpassphrase.h head/lib/libc/gen/readpassphrase.3 head/lib/libc/gen/readpassphrase.c Modified: head/include/readpassphrase.h == --- head/include/readpassphrase.h Sat Nov 13 09:28:49 2010 (r215235) +++ head/include/readpassphrase.h Sat Nov 13 10:38:06 2010 (r215236) @@ -1,31 +1,24 @@ -/* $OpenBSD: /usr/local/www/cvsroot/OpenBSD/src/include/readpassphrase.h,v 1.2 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */ /* $FreeBSD$ */ /* - * Copyright (c) 2000 Todd C. Miller - * All rights reserved. + * Copyright (c) 2000, 2002 Todd C. Miller * - * 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. - * 3. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission. + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THIS SOFTWARE IS PROVIDED ``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 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. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Sponsored in part by the Defense Advanced Research Projects + * Agency (DARPA) and Air Force Research Laboratory, Air Force + * Materiel Command, USAF, under agreement number F39502-99-1-0512. */ #ifndef _READPASSPHRASE_H_ @@ -37,6 +30,7 @@ #define RPP_FORCELOWER 0x04 /* Force input to lower case. */ #define RPP_FORCEUPPER 0x08 /* Force input to upper case. */ #define RPP_SEVENBIT0x10 /* Strip the high bit from input. */ +#define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ #include #include Modified: head/lib/libc/gen/readpassphrase.3 == --- head/lib/libc/gen/readpassphrase.3 Sat Nov 13 09:28:49 2010 (r215235) +++ head/lib/libc/gen/readpassphrase.3 Sat Nov 13 10:38:06 2010 (r215236) @@ -1,33 +1,26 @@ -.\"$OpenBSD: readpassphrase.3,v 1.7 2001/12/15 15:37:51 millert Exp $ +.\"$OpenBSD: readpassphrase.3,v 1.17 2007/05/31 19:19:28 jmc Exp $ .\" -.\" Copyright (c) 2000 Todd C. Miller -.\" All rights reserved. +.\" Copyright (c) 2000, 2002 Todd C. Miller .\" -.\" 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. -.\" 3. The name of the author may not be used to endorse or promote products -.\"derived from this software without specific prior written permissi
Re: svn commit: r215212 - head/sys/net
on 13/11/2010 00:59 Dimitry Andric said the following: > Author: dim > Date: Fri Nov 12 22:59:50 2010 > New Revision: 215212 > URL: http://svn.freebsd.org/changeset/base/215212 > > Log: > Similar to r212647, remove the workaround in sys/net/vnet.h for an ld > bug (incorrect placement of __start_SECNAME in some cases) that was > fixed in r210245. Thanks! > There is already an UPDATING entry about needing a recent ld. > > MFC after: 1 month > > Modified: > head/sys/net/vnet.h > > Modified: head/sys/net/vnet.h > == > --- head/sys/net/vnet.h Fri Nov 12 22:43:40 2010(r215211) > +++ head/sys/net/vnet.h Fri Nov 12 22:59:50 2010(r215212) > @@ -193,15 +193,6 @@ extern struct sx vnet_sxlock; > * Virtual network stack memory allocator, which allows global variables to > * be automatically instantiated for each network stack instance. > */ > -__asm__( > -#if defined(__arm__) > - ".section " VNET_SETNAME ", \"aw\", %progbits\n" > -#else > - ".section " VNET_SETNAME ", \"aw\", @progbits\n" > -#endif > - "\t.p2align " __XSTRING(CACHE_LINE_SHIFT) "\n" > - "\t.previous"); > - > #define VNET_NAME(n)vnet_entry_##n > #define VNET_DECLARE(t, n) extern t VNET_NAME(n) > #define VNET_DEFINE(t, n) t VNET_NAME(n) __section(VNET_SETNAME) > __used -- Andriy Gapon ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215237 - head/lib/msun/src
Author: uqs Date: Sat Nov 13 10:54:10 2010 New Revision: 215237 URL: http://svn.freebsd.org/changeset/base/215237 Log: Fix bug in jn(3) and jnf(3) that led to -inf results Explanation by Steve: jn[f](n,x) for certain ranges of x uses downward recursion to compute the value of the function. The recursion sequence that is generated is proportional to the actual desired value, so a normalization step is taken. This normalization is j0[f](x) divided by the zeroth sequence member. As Bruce notes, near the zeros of j0[f](x) the computed value can have giga-ULP inaccuracy. I found for the 1st zero of j0f(x) only the leading decimal digit is correct. The solution to the issue is fairly straight forward. The zeros of j0(x) and j1(x) never coincide, so as j0(x) approaches a zero, the normalization constant switches to j1[f](x) divided by the 2nd sequence member. The expectation is that j1[f](x) is a more accurately computed value. PR: bin/144306 Submitted by: Steven G. Kargl Reviewed by: bde MFC after:7 days Modified: head/lib/msun/src/e_jn.c head/lib/msun/src/e_jnf.c Modified: head/lib/msun/src/e_jn.c == --- head/lib/msun/src/e_jn.cSat Nov 13 10:38:06 2010(r215236) +++ head/lib/msun/src/e_jn.cSat Nov 13 10:54:10 2010(r215237) @@ -200,7 +200,12 @@ __ieee754_jn(int n, double x) } } } - b = (t*__ieee754_j0(x)/b); + z = __ieee754_j0(x); + w = __ieee754_j1(x); + if (fabs(z) >= fabs(w)) + b = (t*z/b); + else + b = (t*w/a); } } if(sgn==1) return -b; else return b; Modified: head/lib/msun/src/e_jnf.c == --- head/lib/msun/src/e_jnf.c Sat Nov 13 10:38:06 2010(r215236) +++ head/lib/msun/src/e_jnf.c Sat Nov 13 10:54:10 2010(r215237) @@ -152,7 +152,12 @@ __ieee754_jnf(int n, float x) } } } - b = (t*__ieee754_j0f(x)/b); + z = __ieee754_j0f(x); + w = __ieee754_j1f(x); + if (fabsf(z) >= fabsf(w)) + b = (t*z/b); + else + b = (t*w/a); } } if(sgn==1) return -b; else return b; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215238 - head/sys/net
Author: kib Date: Sat Nov 13 11:11:51 2010 New Revision: 215238 URL: http://svn.freebsd.org/changeset/base/215238 Log: Use 'z' modifier for size_t printing. Modified: head/sys/net/if_llatbl.c Modified: head/sys/net/if_llatbl.c == --- head/sys/net/if_llatbl.cSat Nov 13 10:54:10 2010(r215237) +++ head/sys/net/if_llatbl.cSat Nov 13 11:11:51 2010(r215238) @@ -122,7 +122,7 @@ llentry_free(struct llentry *lle) } KASSERT(lle->la_numheld == 0, - ("%s: la_numheld %d > 0, pkts_droped %ld", __func__, + ("%s: la_numheld %d > 0, pkts_droped %zd", __func__, lle->la_numheld, pkts_dropped)); LLE_FREE_LOCKED(lle); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215166 - in head: . sys/conf sys/netinet sys/netinet/cc sys/sys
On 11/13/10 20:40, Mikolaj Golub wrote: > > On Fri, 12 Nov 2010 06:41:56 + (UTC) Lawrence Stewart wrote: > > LS> Author: lstewart > LS> Date: Fri Nov 12 06:41:55 2010 > LS> New Revision: 215166 > LS> URL: http://svn.freebsd.org/changeset/base/215166 > > LS> Log: > LS> This commit marks the first formal contribution of the "Five New TCP > Congestion > LS> Control Algorithms for FreeBSD" FreeBSD Foundation funded project. > More details > LS> about the project are available at: > http://caia.swin.edu.au/freebsd/5cc/ > > It looks like the code needs improvement to work with VIMAGE :-) > > options VIMAGE > > jail -i -c vnet persist path=/ > > panic: lock "cc_list" 0xc101c418 already initialized > > #0 doadump () at pcpu.h:231 > #1 0xc04f26b9 in db_fncall (dummy1=-1064234614, dummy2=0, dummy3=-1, > dummy4=0xca54b688 "\234╤Tй") at /usr/src/sys/ddb/db_command.c:548 > #2 0xc04f2aef in db_command (last_cmdp=0xc0e7957c, cmd_table=0x0, dopager=0) > at /usr/src/sys/ddb/db_command.c:445 > #3 0xc04f2ba4 in db_command_script (command=0xc0e7a484 "call doadump") > at /usr/src/sys/ddb/db_command.c:516 > #4 0xc04f6df0 in db_script_exec (scriptname=0xca54b794 "kdb.enter.panic", > warnifnotfound=Variable "warnifnotfound" is not available.) > at /usr/src/sys/ddb/db_script.c:302 > #5 0xc04f6ed7 in db_script_kdbenter (eventname=0xc0d2410e "panic") > at /usr/src/sys/ddb/db_script.c:324 > #6 0xc04f4b28 in db_trap (type=3, code=0) at /usr/src/sys/ddb/db_main.c:228 > #7 0xc0910fbe in kdb_trap (type=3, code=0, tf=0xca54b918) at > /usr/src/sys/kern/subr_kdb.c:546 > #8 0xc0c3d7c6 in trap (frame=0xca54b918) at /usr/src/sys/i386/i386/trap.c:732 > #9 0xc0c2647c in calltrap () at /usr/src/sys/i386/i386/exception.s:168 > #10 0xc091118a in kdb_enter (why=0xc0d2410e "panic", msg=0xc0d2410e "panic") > at cpufunc.h:71 > #11 0xc08dcd14 in panic (fmt=0xc0d27986 "lock \"%s\" %p already initialized") > at /usr/src/sys/kern/kern_shutdown.c:574 > #12 0xc0911bd4 in lock_init (lock=0xc147b204, class=0xc0e23a00, > name=0xc0d3f215 "cc_list", > type=0x0, flags=2228224) at /usr/src/sys/kern/subr_lock.c:81 > #13 0xc08daf5d in rw_init_flags (rw=0xc101c418, name=0xc0d3f215 "cc_list", > opts=0) > at /usr/src/sys/kern/kern_rwlock.c:195 > #14 0xc0a0d0c2 in cc_init () at /usr/src/sys/netinet/cc/cc.c:182 > #15 0xc0a7a4fd in tcp_init () at /usr/src/sys/netinet/tcp_subr.c:281 > #16 0xc0940e59 in protosw_init (pr=0x0) at /usr/src/sys/kern/uipc_domain.c:157 > #17 0xc0940e87 in domain_init (arg=0xc0e34280) at > /usr/src/sys/kern/uipc_domain.c:174 > #18 0xc0940ee1 in vnet_domain_init (arg=0xc0e34280) at > /usr/src/sys/kern/uipc_domain.c:190 > #19 0xc09adb2e in vnet_sysinit () at /usr/src/sys/net/vnet.c:625 > #20 0xc09ae1ef in vnet_alloc () at /usr/src/sys/net/vnet.c:254 > #21 0xc08ba41a in kern_jail_set (td=0xc306d870, optuio=0xc2d66a80, flags=0) > at /usr/src/sys/kern/kern_jail.c:1244 > #22 0xc08bbd00 in jail_set (td=0xc306d870, uap=0xca54bcec) at > /usr/src/sys/kern/kern_jail.c:489 > #23 0xc091e903 in syscallenter (td=0xc306d870, sa=0xca54bce4) > at /usr/src/sys/kern/subr_trap.c:318 > #24 0xc0c3cebf in syscall (frame=0xca54bd28) at > /usr/src/sys/i386/i386/trap.c:1095 > #25 0xc0c26511 in Xint0x80_syscall () at > /usr/src/sys/i386/i386/exception.s:266 > #26 0x0033 in ?? () > Gah, didn't occur to me that cc_init() could be called multiple times. I think I know how to fix it but probably won't get to look at this until tomorrow. Thanks for the report. Cheers, Lawrence ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215239 - head/usr.bin/top
Author: brucec Date: Sat Nov 13 11:43:20 2010 New Revision: 215239 URL: http://svn.freebsd.org/changeset/base/215239 Log: Memory stats are reported in bytes, not pages. PR: docs/151283 Submitted by: Bas Smeelen MFC after: 3 days Modified: head/usr.bin/top/top.local.1 Modified: head/usr.bin/top/top.local.1 == --- head/usr.bin/top/top.local.1Sat Nov 13 11:11:51 2010 (r215238) +++ head/usr.bin/top/top.local.1Sat Nov 13 11:43:20 2010 (r215239) @@ -6,8 +6,8 @@ The '-H' option will toggle the display At runtime the 'H' key will toggle this mode. The default is OFF. .SH DESCRIPTION OF MEMORY -Mem: 9220K Active, 1032K Inact, 3284K Wired, 1MB Cache, 2M Buf, 1320K Free -Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104 K Out +Mem: 9220K Active, 1032K Inact, 3284K Wired, 1M Cache, 2M Buf, 1320K Free +Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104K Out .B K: Kilobyte @@ -19,23 +19,23 @@ Megabyte 1/100 .TP .B Active: -number of pages active +number of bytes active .TP .B Inact: -number of pages inactive +number of bytes inactive .TP .B Wired: -number of pages wired down, including cached file data pages +number of bytes wired down, including cached file data pages .TP .B Cache: -number of clean pages caching data that are available for +number of clean bytes caching data that are available for immediate reallocation .TP .B Buf: -number of pages used for BIO-level disk caching +number of bytes used for BIO-level disk caching .TP .B Free: -number of pages free +number of bytes free .TP .B Total: total available swap usage @@ -47,7 +47,7 @@ total free swap usage swap usage .TP .B In: -pages paged in from swap devices (last interval) +bytes paged in from swap devices (last interval) .TP .B Out: -pages paged out to swap devices (last interval) +bytes paged out to swap devices (last interval) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215240 - head/sys/kern
Author: trasz Date: Sat Nov 13 11:54:04 2010 New Revision: 215240 URL: http://svn.freebsd.org/changeset/base/215240 Log: Remove unused variables. Modified: head/sys/kern/sched_ule.c Modified: head/sys/kern/sched_ule.c == --- head/sys/kern/sched_ule.c Sat Nov 13 11:43:20 2010(r215239) +++ head/sys/kern/sched_ule.c Sat Nov 13 11:54:04 2010(r215240) @@ -1675,23 +1675,19 @@ sched_prio(struct thread *td, u_char pri void sched_user_prio(struct thread *td, u_char prio) { - u_char oldprio; td->td_base_user_pri = prio; if (td->td_flags & TDF_UBORROWING && td->td_user_pri <= prio) return; - oldprio = td->td_user_pri; td->td_user_pri = prio; } void sched_lend_user_prio(struct thread *td, u_char prio) { - u_char oldprio; THREAD_LOCK_ASSERT(td, MA_OWNED); td->td_flags |= TDF_UBORROWING; - oldprio = td->td_user_pri; td->td_user_pri = prio; } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215239 - head/usr.bin/top
On 13 November 2010 14:43, Bruce Cran wrote: > Author: brucec > Date: Sat Nov 13 11:43:20 2010 > New Revision: 215239 > URL: http://svn.freebsd.org/changeset/base/215239 > > Log: > Memory stats are reported in bytes, not pages. > > PR: docs/151283 > Submitted by: Bas Smeelen > MFC after: 3 days > Hi. The downside is that usually active/passive/inactive operations are performed over pages, not bytes, since a page is usually the minimum unit of memory management. The sentences resulted after this change sound now weird for me. > Modified: > head/usr.bin/top/top.local.1 > > Modified: head/usr.bin/top/top.local.1 > == > --- head/usr.bin/top/top.local.1 Sat Nov 13 11:11:51 2010 > (r215238) > +++ head/usr.bin/top/top.local.1 Sat Nov 13 11:43:20 2010 > (r215239) > @@ -6,8 +6,8 @@ The '-H' option will toggle the display > At runtime the 'H' key will toggle this mode. The default is OFF. > > .SH DESCRIPTION OF MEMORY > -Mem: 9220K Active, 1032K Inact, 3284K Wired, 1MB Cache, 2M Buf, 1320K Free > -Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104 K Out > +Mem: 9220K Active, 1032K Inact, 3284K Wired, 1M Cache, 2M Buf, 1320K Free > +Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104K Out > > .B K: > Kilobyte > @@ -19,23 +19,23 @@ Megabyte > 1/100 > .TP > .B Active: > -number of pages active > +number of bytes active > .TP > .B Inact: > -number of pages inactive > +number of bytes inactive > .TP > .B Wired: > -number of pages wired down, including cached file data pages > +number of bytes wired down, including cached file data pages > .TP > .B Cache: > -number of clean pages caching data that are available for > +number of clean bytes caching data that are available for > immediate reallocation > .TP > .B Buf: > -number of pages used for BIO-level disk caching > +number of bytes used for BIO-level disk caching > .TP > .B Free: > -number of pages free > +number of bytes free > .TP > .B Total: > total available swap usage > @@ -47,7 +47,7 @@ total free swap usage > swap usage > .TP > .B In: > -pages paged in from swap devices (last interval) > +bytes paged in from swap devices (last interval) > .TP > .B Out: > -pages paged out to swap devices (last interval) > +bytes paged out to swap devices (last interval) > ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215239 - head/usr.bin/top
On Sat, 13 Nov 2010 14:56:32 +0300 Sergey Kandaurov wrote: > On 13 November 2010 14:43, Bruce Cran wrote: > > Author: brucec > > Date: Sat Nov 13 11:43:20 2010 > > New Revision: 215239 > > URL: http://svn.freebsd.org/changeset/base/215239 > > > > Log: > > Memory stats are reported in bytes, not pages. > > > > PR: docs/151283 > > Submitted by: Bas Smeelen > > MFC after: 3 days > > > > Hi. > The downside is that usually active/passive/inactive operations are > performed over > pages, not bytes, since a page is usually the minimum unit of memory > management. The sentences resulted after this change sound now weird > for me. I think the wording is better in that it's not so misleading, but could still be improved. -- Bruce Cran ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215239 - head/usr.bin/top
On Sat Nov 13 10, Bruce Cran wrote: > Author: brucec > Date: Sat Nov 13 11:43:20 2010 > New Revision: 215239 > URL: http://svn.freebsd.org/changeset/base/215239 > > Log: > Memory stats are reported in bytes, not pages. thanks. :) > > PR: docs/151283 > Submitted by: Bas Smeelen > MFC after: 3 days > > Modified: > head/usr.bin/top/top.local.1 > > Modified: head/usr.bin/top/top.local.1 > == > --- head/usr.bin/top/top.local.1 Sat Nov 13 11:11:51 2010 > (r215238) > +++ head/usr.bin/top/top.local.1 Sat Nov 13 11:43:20 2010 > (r215239) > @@ -6,8 +6,8 @@ The '-H' option will toggle the display > At runtime the 'H' key will toggle this mode. The default is OFF. > > .SH DESCRIPTION OF MEMORY > -Mem: 9220K Active, 1032K Inact, 3284K Wired, 1MB Cache, 2M Buf, 1320K Free > -Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104 K Out > +Mem: 9220K Active, 1032K Inact, 3284K Wired, 1M Cache, 2M Buf, 1320K Free > +Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104K Out > > .B K: > Kilobyte > @@ -19,23 +19,23 @@ Megabyte > 1/100 > .TP > .B Active: > -number of pages active > +number of bytes active > .TP > .B Inact: > -number of pages inactive > +number of bytes inactive > .TP > .B Wired: > -number of pages wired down, including cached file data pages > +number of bytes wired down, including cached file data pages > .TP > .B Cache: > -number of clean pages caching data that are available for > +number of clean bytes caching data that are available for > immediate reallocation > .TP > .B Buf: > -number of pages used for BIO-level disk caching > +number of bytes used for BIO-level disk caching > .TP > .B Free: > -number of pages free > +number of bytes free > .TP > .B Total: > total available swap usage > @@ -47,7 +47,7 @@ total free swap usage > swap usage > .TP > .B In: > -pages paged in from swap devices (last interval) > +bytes paged in from swap devices (last interval) > .TP > .B Out: > -pages paged out to swap devices (last interval) > +bytes paged out to swap devices (last interval) -- a13x ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215241 - head/sys/netinet
Author: tuexen Date: Sat Nov 13 12:52:44 2010 New Revision: 215241 URL: http://svn.freebsd.org/changeset/base/215241 Log: Fix a locking issue reported by brucec@ affecting 1-to-1 style sockets which have not yet been accepted. MFC after: 3 days. Modified: head/sys/netinet/sctp_pcb.c Modified: head/sys/netinet/sctp_pcb.c == --- head/sys/netinet/sctp_pcb.c Sat Nov 13 11:54:04 2010(r215240) +++ head/sys/netinet/sctp_pcb.c Sat Nov 13 12:52:44 2010(r215241) @@ -3464,6 +3464,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, cnt = 0; for ((asoc = LIST_FIRST(&inp->sctp_asoc_list)); asoc != NULL; asoc = nasoc) { + SCTP_TCB_LOCK(asoc); nasoc = LIST_NEXT(asoc, sctp_tcblist); if (asoc->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { if (asoc->asoc.state & SCTP_STATE_IN_ACCEPT_QUEUE) { @@ -3471,10 +3472,10 @@ sctp_inpcb_free(struct sctp_inpcb *inp, sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, asoc, NULL); } cnt++; + SCTP_TCB_UNLOCK(asoc); continue; } /* Free associations that are NOT killing us */ - SCTP_TCB_LOCK(asoc); if ((SCTP_GET_STATE(&asoc->asoc) != SCTP_STATE_COOKIE_WAIT) && ((asoc->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0)) { struct mbuf *op_err; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215237 - head/lib/msun/src
On Sat Nov 13 10, Ulrich Spoerlein wrote: > Author: uqs > Date: Sat Nov 13 10:54:10 2010 > New Revision: 215237 > URL: http://svn.freebsd.org/changeset/base/215237 > > Log: > Fix bug in jn(3) and jnf(3) that led to -inf results thank you very much for fixing this long outstanding issue. you might want to have a look at [1], where two more issues have been reported. cheers. alex [1] http://mailman.oakapple.net/pipermail/numeric-interest/2010-September/thread.html > > Explanation by Steve: > jn[f](n,x) for certain ranges of x uses downward recursion to compute > the value of the function. The recursion sequence that is generated is > proportional to the actual desired value, so a normalization step is > taken. This normalization is j0[f](x) divided by the zeroth sequence > member. As Bruce notes, near the zeros of j0[f](x) the computed value > can have giga-ULP inaccuracy. I found for the 1st zero of j0f(x) only > the leading decimal digit is correct. The solution to the issue is > fairly straight forward. The zeros of j0(x) and j1(x) never coincide, > so as j0(x) approaches a zero, the normalization constant switches to > j1[f](x) divided by the 2nd sequence member. The expectation is that > j1[f](x) is a more accurately computed value. > > PR: bin/144306 > Submitted by: Steven G. Kargl > Reviewed by:bde > MFC after: 7 days > > Modified: > head/lib/msun/src/e_jn.c > head/lib/msun/src/e_jnf.c > > Modified: head/lib/msun/src/e_jn.c > == > --- head/lib/msun/src/e_jn.c Sat Nov 13 10:38:06 2010(r215236) > +++ head/lib/msun/src/e_jn.c Sat Nov 13 10:54:10 2010(r215237) > @@ -200,7 +200,12 @@ __ieee754_jn(int n, double x) > } > } > } > - b = (t*__ieee754_j0(x)/b); > + z = __ieee754_j0(x); > + w = __ieee754_j1(x); > + if (fabs(z) >= fabs(w)) > + b = (t*z/b); > + else > + b = (t*w/a); > } > } > if(sgn==1) return -b; else return b; > > Modified: head/lib/msun/src/e_jnf.c > == > --- head/lib/msun/src/e_jnf.c Sat Nov 13 10:38:06 2010(r215236) > +++ head/lib/msun/src/e_jnf.c Sat Nov 13 10:54:10 2010(r215237) > @@ -152,7 +152,12 @@ __ieee754_jnf(int n, float x) > } > } > } > - b = (t*__ieee754_j0f(x)/b); > + z = __ieee754_j0f(x); > + w = __ieee754_j1f(x); > + if (fabsf(z) >= fabsf(w)) > + b = (t*z/b); > + else > + b = (t*w/a); > } > } > if(sgn==1) return -b; else return b; -- a13x ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215242 - in stable/8/release: picobsd/floppy.tree/sbin sparc64
Author: marius Date: Sat Nov 13 13:46:31 2010 New Revision: 215242 URL: http://svn.freebsd.org/changeset/base/215242 Log: MFC: r214940 Add gpart and glabel to the release CD mfsroot. Modified: stable/8/release/sparc64/boot_crunch.conf Directory Properties: stable/8/release/ (props changed) stable/8/release/doc/en_US.ISO8859-1/hardware/ (props changed) stable/8/release/picobsd/ (props changed) stable/8/release/picobsd/floppy.tree/sbin/ (props changed) stable/8/release/picobsd/floppy.tree/sbin/dhclient-script (props changed) stable/8/release/picobsd/qemu/ (props changed) stable/8/release/picobsd/tinyware/login/ (props changed) Modified: stable/8/release/sparc64/boot_crunch.conf == --- stable/8/release/sparc64/boot_crunch.conf Sat Nov 13 12:52:44 2010 (r215241) +++ stable/8/release/sparc64/boot_crunch.conf Sat Nov 13 13:46:31 2010 (r215242) @@ -15,6 +15,7 @@ srcdirs /usr/src/sbin progs camcontrol progs dhclient progs fsck_ffs +progs geom progs ifconfig progs mount_nfs progs newfs @@ -23,6 +24,8 @@ progs rtsol progs tunefs ln fsck_ffs fsck_4.2bsd ln fsck_ffs fsck_ufs +ln geom glabel +ln geom gpart srcdirs /usr/src/usr.bin progs cpio @@ -40,5 +43,5 @@ progs sysinstall progs usbconfig libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lgeom -lbsdxml libs -larchive -lbz2 -lusb -ljail ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215243 - stable/7/release/sparc64
Author: marius Date: Sat Nov 13 13:46:33 2010 New Revision: 215243 URL: http://svn.freebsd.org/changeset/base/215243 Log: MFC: r214940 Add gpart and glabel to the release CD mfsroot. Modified: stable/7/release/sparc64/boot_crunch.conf Directory Properties: stable/7/release/ (props changed) stable/7/release/doc/ (props changed) stable/7/release/doc/en_US.ISO8859-1/hardware/ (props changed) stable/7/release/picobsd/tinyware/login/ (props changed) Modified: stable/7/release/sparc64/boot_crunch.conf == --- stable/7/release/sparc64/boot_crunch.conf Sat Nov 13 13:46:31 2010 (r215242) +++ stable/7/release/sparc64/boot_crunch.conf Sat Nov 13 13:46:33 2010 (r215243) @@ -18,6 +18,7 @@ srcdirs /usr/src/sbin progs camcontrol progs dhclient progs fsck_ffs +progs geom progs ifconfig progs mount_nfs progs newfs @@ -27,6 +28,8 @@ progs slattach progs tunefs ln fsck_ffs fsck_4.2bsd ln fsck_ffs fsck_ufs +ln geom glabel +ln geom gpart srcdirs /usr/src/usr.bin progs find @@ -43,4 +46,4 @@ progs sysinstall progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lgeom -lbsdxml ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215244 - head/sys/net80211
Author: bschmidt Date: Sat Nov 13 14:59:54 2010 New Revision: 215244 URL: http://svn.freebsd.org/changeset/base/215244 Log: Some device drivers calculate various timing related things based on the currently selected rate. The calculations of course need a valid rate. To make that possible before any call to node_rate() is done, initialize ni_txrate on none_node_init() calls. MFC after:1 week Modified: head/sys/net80211/ieee80211_ratectl_none.c Modified: head/sys/net80211/ieee80211_ratectl_none.c == --- head/sys/net80211/ieee80211_ratectl_none.c Sat Nov 13 13:46:33 2010 (r215243) +++ head/sys/net80211/ieee80211_ratectl_none.c Sat Nov 13 14:59:54 2010 (r215244) @@ -59,6 +59,7 @@ none_deinit(struct ieee80211vap *vap) static void none_node_init(struct ieee80211_node *ni) { + ni->ni_txrate = ni->ni_rates.rs_rates[0] & IEEE80211_RATE_VAL; } static void ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215245 - head/sys/boot/i386/libi386
Author: nyan Date: Sat Nov 13 15:23:20 2010 New Revision: 215245 URL: http://svn.freebsd.org/changeset/base/215245 Log: Remove unused includes. Modified: head/sys/boot/i386/libi386/i386_module.c Modified: head/sys/boot/i386/libi386/i386_module.c == --- head/sys/boot/i386/libi386/i386_module.cSat Nov 13 14:59:54 2010 (r215244) +++ head/sys/boot/i386/libi386/i386_module.cSat Nov 13 15:23:20 2010 (r215245) @@ -32,12 +32,6 @@ __FBSDID("$FreeBSD$"); * */ -#include -#include - -#include "bootstrap.h" -#include "libi386.h" - /* * Use voodoo to load modules required by current hardware. */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215246 - head/sys/boot/pc98/libpc98
Author: nyan Date: Sat Nov 13 15:24:56 2010 New Revision: 215246 URL: http://svn.freebsd.org/changeset/base/215246 Log: Now there is no functional difference from i386 version. So use i386 version. Deleted: head/sys/boot/pc98/libpc98/i386_module.c ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215247 - head/sbin/mdconfig
Author: joel (doc committer) Date: Sat Nov 13 15:28:44 2010 New Revision: 215247 URL: http://svn.freebsd.org/changeset/base/215247 Log: Use "cylinder" instead of "cyl" for consistency. Reviewed by: phk Modified: head/sbin/mdconfig/mdconfig.8 head/sbin/mdconfig/mdconfig.c Modified: head/sbin/mdconfig/mdconfig.8 == --- head/sbin/mdconfig/mdconfig.8 Sat Nov 13 15:24:56 2010 (r215246) +++ head/sbin/mdconfig/mdconfig.8 Sat Nov 13 15:28:44 2010 (r215247) @@ -58,7 +58,7 @@ .Op Fl S Ar sectorsize .Op Fl u Ar unit .Op Fl x Ar sectors/track -.Op Fl y Ar heads/cyl +.Op Fl y Ar heads/cylinder .Nm .Fl d .Fl u Ar unit Modified: head/sbin/mdconfig/mdconfig.c == --- head/sbin/mdconfig/mdconfig.c Sat Nov 13 15:24:56 2010 (r215246) +++ head/sbin/mdconfig/mdconfig.c Sat Nov 13 15:28:44 2010 (r215247) @@ -57,7 +57,7 @@ usage(void) fprintf(stderr, "usage: mdconfig -a -t type [-n] [-o [no]option] ... [-f file]\n" "[-s size] [-S sectorsize] [-u unit]\n" -"[-x sectors/track] [-y heads/cyl]\n" +"[-x sectors/track] [-y heads/cylinder]\n" " mdconfig -d -u unit [-o [no]force]\n" " mdconfig -l [-v] [-n] [-u unit]\n"); fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n"); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215207 - in head: sys/net sys/netinet tools/regression/netinet/arphold
On Nov 13, 2010, at 04:09 , Mikolaj Golub wrote: > > On Fri, 12 Nov 2010 22:03:02 + (UTC) George V. Neville-Neil wrote: > > GVN> Author: gnn > GVN> Date: Fri Nov 12 22:03:02 2010 > GVN> New Revision: 215207 > GVN> URL: http://svn.freebsd.org/changeset/base/215207 > > > > cc -c -O -pipe -std=c99 -g -Wall -Wredundant-decls -Wnested-externs > -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline > -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc -I. > -I/usr/src/sys -I/usr/src/sys/contrib/altq -D_KERNEL > -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common > -finline-limit=8000 --param inline-unit-growth=100 --param > large-function-growth=1000 -mno-align-long-strings > -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 > -ffreestanding -fstack-protector -Werror /usr/src/sys/net/if_llatbl.c > cc1: warnings being treated as errors > /usr/src/sys/net/if_llatbl.c: In function 'llentry_free': > /usr/src/sys/net/if_llatbl.c:124: warning: format '%ld' expects type 'long > int', but argument 4 has type 'size_t' > *** Error code 1 > > I think this should be: > > Index: sys/net/if_llatbl.c > === > --- sys/net/if_llatbl.c (revision 215233) > +++ sys/net/if_llatbl.c (working copy) > @@ -122,7 +122,7 @@ llentry_free(struct llentry *lle) > } > > KASSERT(lle->la_numheld == 0, > - ("%s: la_numheld %d > 0, pkts_droped %ld", __func__, > + ("%s: la_numheld %d > 0, pkts_droped %zu", __func__, >lle->la_numheld, pkts_dropped)); > > LLE_FREE_LOCKED(lle); Looks like Konstatin already fixed this. Best, George ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215237 - head/lib/msun/src
On Sat, Nov 13, 2010 at 12:56:48PM +, Alexander Best wrote: > On Sat Nov 13 10, Ulrich Spoerlein wrote: > > Author: uqs > > Date: Sat Nov 13 10:54:10 2010 > > New Revision: 215237 > > URL: http://svn.freebsd.org/changeset/base/215237 > > > > Log: > > Fix bug in jn(3) and jnf(3) that led to -inf results > > thank you very much for fixing this long outstanding issue. > you might want to have a look at [1], where two more issues have been > reported. > > cheers. > alex > > [1] > http://mailman.oakapple.net/pipermail/numeric-interest/2010-September/thread.html > Ulrich, thanks. Of the two remaining issues, I can verify one is indeed an issue. laptop:kargl[204] cat mn.c #include #include static const double z = 0.; int main(void) { double x, y; x = -1. / z; y = exp( 0.5 * log(x)); printf("pow(%f, 0.5) = %le, %le\n", x, pow(x, 0.5), y); y = exp(-0.5 * log(x)); printf("pow(%f, -0.5) = %le, %le\n", x, pow(x, -0.5), y); return 0; } laptop:kargl[205] cc -o z mn.c -fno-builtin -lm && ./z pow(-inf, 0.5) = inf, nan pow(-inf, -0.5) = 0.00e+00, nan -- Steve ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215248 - head/sbin/kldstat
Author: kib Date: Sat Nov 13 16:49:07 2010 New Revision: 215248 URL: http://svn.freebsd.org/changeset/base/215248 Log: In printfile(), exit the process instead of only printing the warning. This fixes verbose mode when either -i specified non-existent kldfile id, or the file was unloaded between two kldnext(2) calls. While there, fix printfile() definition to be style(9)-compliant. Submitted by: arundel MFC after:1 week Modified: head/sbin/kldstat/kldstat.c Modified: head/sbin/kldstat/kldstat.c == --- head/sbin/kldstat/kldstat.c Sat Nov 13 15:28:44 2010(r215247) +++ head/sbin/kldstat/kldstat.c Sat Nov 13 16:49:07 2010(r215248) @@ -50,14 +50,15 @@ printmod(int modid) printf("\t\t%2d %s\n", stat.id, stat.name); } -static void printfile(int fileid, int verbose) +static void +printfile(int fileid, int verbose) { struct kld_file_stat stat; int modid; stat.version = sizeof(struct kld_file_stat); if (kldstat(fileid, &stat) < 0) - warn("can't stat file id %d", fileid); + err(1, "can't stat file id %d", fileid); else printf("%2d %4d %p %-8zx %s", stat.id, stat.refs, stat.address, stat.size, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215249 - head/etc
Author: tuexen Date: Sat Nov 13 17:52:04 2010 New Revision: 215249 URL: http://svn.freebsd.org/changeset/base/215249 Log: Add for existing protocol entries the missing SCTP port allocations and add protocol entries for protocols which have SCTP port allocations. These entries are according to http://www.iana.org/assignments/port-numbers as of today. Also add SCTP port allocation entires for the echo, daytime, and chargen service. Discussed with rwatson@ MFC after: 3 days. Modified: head/etc/services Modified: head/etc/services == --- head/etc/services Sat Nov 13 16:49:07 2010(r215248) +++ head/etc/services Sat Nov 13 17:52:04 2010(r215249) @@ -33,24 +33,31 @@ echo 4/ddp#AppleTalk Echo Protoco rje 5/tcp#Remote Job Entry rje 5/udp#Remote Job Entry zip 6/ddp#Zone Information Protocol +echo 7/sctp echo 7/tcp echo 7/udp +discard 9/sctp sink null discard 9/tcpsink null discard 9/udpsink null systat 11/tcpusers#Active Users systat 11/udpusers#Active Users +daytime 13/sctp daytime 13/tcp daytime 13/udp qotd17/tcpquote#Quote of the Day qotd17/udpquote#Quote of the Day msp 18/tcp#Message Send Protocol msp 18/udp#Message Send Protocol +chargen 19/sctp ttytst source#Character Generator chargen 19/tcpttytst source#Character Generator chargen 19/udpttytst source#Character Generator +ftp-data20/sctp #File Transfer [Default Data] ftp-data20/tcp#File Transfer [Default Data] ftp-data20/udp#File Transfer [Default Data] +ftp 21/sctp #File Transfer [Control] ftp 21/tcp#File Transfer [Control] ftp 21/udp#File Transfer [Control] +ssh 22/sctp #Secure Shell Login ssh 22/tcp#Secure Shell Login ssh 22/udp#Secure Shell Login telnet 23/tcp @@ -151,6 +158,7 @@ vettcp 78/tcp vettcp 78/udp finger 79/tcp finger 79/udp +http80/sctp www www-http #World Wide Web HTTP http80/tcpwww www-http #World Wide Web HTTP http80/udpwww www-http #World Wide Web HTTP hosts2-ns 81/tcp#HOSTS2 Name Server @@ -350,6 +358,7 @@ xdmcp 177/tcp#X Display Manager Con xdmcp 177/udp#X Display Manager Control Protocol NextStep 178/tcpnextstep NeXTStep#NextStep Window Server NextStep 178/udpnextstep NeXTStep#NextStep Window Server +bgp179/sctp #Border Gateway Protocol bgp179/tcp#Border Gateway Protocol bgp179/udp#Border Gateway Protocol ris180/tcp#Intergraph @@ -738,6 +747,7 @@ decvms-sysmgt 441/tcp decvms-sysmgt 441/udp cvc_hostd 442/tcp cvc_hostd 442/udp +https 443/sctp https 443/tcp https 443/udp snpp 444/tcp#Simple Network Paging Protocol @@ -1519,7 +1529,9 @@ nfsd-keepalive1110/udp #Client status supfiledbg 1127/tcp # for SUP nfa1155/tcp #Network File Access nfa1155/udp #Network File Access -phone 1167/udp #conference calling +cisco-ipsla1167/sctp #Cisco IP SLAs Control Protocol +cisco-ipsla1167/tcp #Cisco IP SLAs Control Protocol +cisco-ipsla1167/udp #Cisco IP SLAs Control Protocol skkserv1178/tcp #SKK (kanji input) openvpn1194/tcp #OpenVPN openvpn1194/udp #OpenVPN @@ -2119,6 +2131,7 @@ sdfunc2046/udp #dls 2047/udp dls-monitor2048/tcp dls-monitor2048/udp +nfsd 2049/sctp nfs # NFS server daemon nfsd 2049/tcp nfs # NFS server daemon nfsd 2049/udp nfs # NFS server daemon #PROBLEMS!= @@ -2146,6 +2159,8 @@ hpssd 2207/tcp #HP Status and Service hpssd 2207/udp #HP Status and Services hpiod 2208/tcp #HP I/O Backend hpiod 2208/udp #HP I/O Backend +rcip-itu 2225/sctp #Resource Connection Initiation Protocol +rcip-itu 2225/tcp #Resource Connection Initiation Protocol ivs-video 2232/tcp #IVS Video default ivs-video 2232/udp #IVS Video default ivsd 2241/tcp #IVS Daemon @@ -2179,6 +2194,17 @@ dict 2628/udp #RFC 2229 listen 2766/tcp #System V listener port www-dev2784/tcp #world wide web
svn commit: r215250 - head/share/man/man5
Author: dougb Date: Sat Nov 13 18:10:44 2010 New Revision: 215250 URL: http://svn.freebsd.org/changeset/base/215250 Log: Remove references to the long-gone ramdisk Submitted by: Garrett Cooper Modified: head/share/man/man5/rc.conf.5 Modified: head/share/man/man5/rc.conf.5 == --- head/share/man/man5/rc.conf.5 Sat Nov 13 17:52:04 2010 (r215249) +++ head/share/man/man5/rc.conf.5 Sat Nov 13 18:10:44 2010 (r215250) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 13, 2010 +.Dd November 13, 2010 .Dt RC.CONF 5 .Os .Sh NAME @@ -4082,65 +4082,6 @@ one could set the following: .Bd -literal mdconfig_md0_cmd="tar xfzC /var/file.tgz \e${_mp}" .Ed -.It Va ramdisk_units -.Pq Vt str -A list of one or more ramdisk units to configure with -.Xr mdconfig 8 -and -.Xr newfs 8 -in time to be mounted from -.Xr fstab 5 . -Each listed unit -.Ar X -must specify at least a -.Ar type -in a -.Va ramdisk_ Ns Ao Ar X Ac Ns Va _config -variable. -Note that this way to configure ramdisks has been deprecated -in favor of new -.Va mdconfig_md* -variables (see above). -.It Va ramdisk_ Ns Ao Ar X Ac Ns Va _config -.Pq Vt str -Arguments to -.Xr mdconfig 8 -for ramdisk -.Ar X . -At minimum a -.Fl t Ar type -must be specified, where -.Ar type -must be one of -.Cm malloc -or -.Cm swap . -.It Va ramdisk_ Ns Ao Ar X Ac Ns Va _newfs -.Pq Vt str -Optional arguments passed to -.Xr newfs 8 -to initialize ramdisk -.Ar X . -.It Va ramdisk_ Ns Ao Ar X Ac Ns Va _owner -.Pq Vt str -An ownership specification passed to -.Xr chown 8 -after the specified ramdisk unit -.Ar X -has been mounted. -Both the -.Xr md 4 -device and the mount point will be changed. -.It Va ramdisk_ Ns Ao Ar X Ac Ns Va _perms -.Pq Vt str -A mode string passed to -.Xr chmod 1 -after the specified ramdisk unit -.Ar X -has been mounted. -Both the -.Xr md 4 -device and the mount point will be changed. .It Va autobridge_interfaces .Pq Vt str Set to the list of bridge interfaces that will have newly arriving interfaces ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215214 - stable/8/sys/dev/sk
On Sat, Nov 13, 2010 at 12:46:07AM +, Pyun YongHyeon wrote: > Author: yongari > Date: Sat Nov 13 00:46:07 2010 > New Revision: 215214 > URL: http://svn.freebsd.org/changeset/base/215214 > > Log: > MFC r214898: > If we got an invalid station address, generate random address. This > might be caused by broken BIOS. > > Reported by: "Mikhail T." aldan.algebra.com> Perhaps the reporter can be more easily referenced as m...@? ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215251 - head/sys/conf
Author: imp Date: Sat Nov 13 18:38:35 2010 New Revision: 215251 URL: http://svn.freebsd.org/changeset/base/215251 Log: Let the linker pick the right output format automatically Modified: head/sys/conf/ldscript.mips Modified: head/sys/conf/ldscript.mips == --- head/sys/conf/ldscript.mips Sat Nov 13 18:10:44 2010(r215250) +++ head/sys/conf/ldscript.mips Sat Nov 13 18:38:35 2010(r215251) @@ -30,16 +30,9 @@ * $FreeBSD$ */ -OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", - "elf32-tradlittlemips") - OUTPUT_ARCH(mips) ENTRY(_start) SEARCH_DIR(/usr/lib); -/* Do we need any of these for elf? - __DYNAMIC = 0; -PROVIDE (_DYNAMIC = 0); -*/ SECTIONS { /* Read-only sections, merged into text segment: */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215252 - head
Author: imp Date: Sat Nov 13 18:39:24 2010 New Revision: 215252 URL: http://svn.freebsd.org/changeset/base/215252 Log: Add legacy names for mips:mips and arm with TARGET_BIG_ENDIAN, for the moment. Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Sat Nov 13 18:38:35 2010(r215251) +++ head/Makefile.inc1 Sat Nov 13 18:39:24 2010(r215252) @@ -123,6 +123,20 @@ TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun ${TARGET_ARCH} != ${MACHINE_ARCH} TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm} .endif +# Legacy names, for a transition period mips:mips -> mipsel:mips +.if ${TARGET_ARCH} == "mips" && ${TARGET} == "mips" +.warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb" +.if defined(TARGET_BIG_ENDIAN) +TARGET_ARCH=mipseb +.else +TARGET_ARCH=mipsel +.endif +.endif +# arm with TARGET_BIG_ENDIAN -> armeb +.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) +.warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated. use armeb" +TARGET_ARCH=armeb +.endif # Otherwise, default to current machine type and architecture. TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215253 - head/lib/libusb
Author: hselasky Date: Sat Nov 13 19:25:11 2010 New Revision: 215253 URL: http://svn.freebsd.org/changeset/base/215253 Log: Fix LibUSB v1.0 compliancy. 1) We need to allow the USB callback to free the USB transfer itself. 2) The USB transfer buffer should only be automatically freed when freeing the USB transfer. Fixed by: hselasky Submitted by: Gustau Perez i Querol Approved by: thompsa (mentor) Modified: head/lib/libusb/libusb10.c head/lib/libusb/libusb10_io.c Modified: head/lib/libusb/libusb10.c == --- head/lib/libusb/libusb10.c Sat Nov 13 18:39:24 2010(r215252) +++ head/lib/libusb/libusb10.c Sat Nov 13 19:25:11 2010(r215253) @@ -800,6 +800,10 @@ libusb_free_transfer(struct libusb_trans if (uxfer == NULL) return; /* be NULL safe */ + /* check if we should free the transfer buffer */ + if (uxfer->flags & LIBUSB_TRANSFER_FREE_BUFFER) + free(uxfer->buffer); + sxfer = (struct libusb_super_transfer *)( (uint8_t *)uxfer - sizeof(*sxfer)); Modified: head/lib/libusb/libusb10_io.c == --- head/lib/libusb/libusb10_io.c Sat Nov 13 18:39:24 2010 (r215252) +++ head/lib/libusb/libusb10_io.c Sat Nov 13 19:25:11 2010 (r215253) @@ -187,6 +187,8 @@ do_done: /* Do all done callbacks */ while ((sxfer = TAILQ_FIRST(&ctx->tr_done))) { + uint8_t flags; + TAILQ_REMOVE(&ctx->tr_done, sxfer, entry); sxfer->entry.tqe_prev = NULL; @@ -197,13 +199,14 @@ do_done: uxfer = (struct libusb_transfer *)( ((uint8_t *)sxfer) + sizeof(*sxfer)); + /* Allow the callback to free the transfer itself. */ + flags = uxfer->flags; + if (uxfer->callback != NULL) (uxfer->callback) (uxfer); - if (uxfer->flags & LIBUSB_TRANSFER_FREE_BUFFER) - free(uxfer->buffer); - - if (uxfer->flags & LIBUSB_TRANSFER_FREE_TRANSFER) + /* Check if the USB transfer should be automatically freed. */ + if (flags & LIBUSB_TRANSFER_FREE_TRANSFER) libusb_free_transfer(uxfer); CTX_LOCK(ctx); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215254 - head/sys/dev/usb/input
Author: hselasky Date: Sat Nov 13 19:26:45 2010 New Revision: 215254 URL: http://svn.freebsd.org/changeset/base/215254 Log: Fix compiler warnings. Submitted by: Alexander Best (arundel) Approved by: thompsa (mentor) Modified: head/sys/dev/usb/input/uhid.c Modified: head/sys/dev/usb/input/uhid.c == --- head/sys/dev/usb/input/uhid.c Sat Nov 13 19:25:11 2010 (r215253) +++ head/sys/dev/usb/input/uhid.c Sat Nov 13 19:26:45 2010 (r215254) @@ -672,7 +672,7 @@ uhid_attach(device_t dev) if (uaa->info.idProduct == USB_PRODUCT_WACOM_GRAPHIRE) { sc->sc_repdesc_size = sizeof(uhid_graphire_report_descr); - sc->sc_repdesc_ptr = &uhid_graphire_report_descr; + sc->sc_repdesc_ptr = (void *)&uhid_graphire_report_descr; sc->sc_flags |= UHID_FLAG_STATIC_DESC; } else if (uaa->info.idProduct == USB_PRODUCT_WACOM_GRAPHIRE3_4X5) { @@ -693,7 +693,7 @@ uhid_attach(device_t dev) usbd_errstr(error)); } sc->sc_repdesc_size = sizeof(uhid_graphire3_4x5_report_descr); - sc->sc_repdesc_ptr = &uhid_graphire3_4x5_report_descr; + sc->sc_repdesc_ptr = (void *)&uhid_graphire3_4x5_report_descr; sc->sc_flags |= UHID_FLAG_STATIC_DESC; } } else if ((uaa->info.bInterfaceClass == UICLASS_VENDOR) && @@ -702,7 +702,7 @@ uhid_attach(device_t dev) /* the Xbox 360 gamepad has no report descriptor */ sc->sc_repdesc_size = sizeof(uhid_xb360gp_report_descr); - sc->sc_repdesc_ptr = &uhid_xb360gp_report_descr; + sc->sc_repdesc_ptr = (void *)&uhid_xb360gp_report_descr; sc->sc_flags |= UHID_FLAG_STATIC_DESC; } if (sc->sc_repdesc_ptr == NULL) { ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215254 - head/sys/dev/usb/input
On Sat Nov 13 10, Hans Petter Selasky wrote: > Author: hselasky > Date: Sat Nov 13 19:26:45 2010 > New Revision: 215254 > URL: http://svn.freebsd.org/changeset/base/215254 > > Log: > Fix compiler warnings. thanks. :) > > Submitted by: Alexander Best (arundel) > Approved by:thompsa (mentor) > > Modified: > head/sys/dev/usb/input/uhid.c > > Modified: head/sys/dev/usb/input/uhid.c > == > --- head/sys/dev/usb/input/uhid.c Sat Nov 13 19:25:11 2010 > (r215253) > +++ head/sys/dev/usb/input/uhid.c Sat Nov 13 19:26:45 2010 > (r215254) > @@ -672,7 +672,7 @@ uhid_attach(device_t dev) > if (uaa->info.idProduct == USB_PRODUCT_WACOM_GRAPHIRE) { > > sc->sc_repdesc_size = > sizeof(uhid_graphire_report_descr); > - sc->sc_repdesc_ptr = &uhid_graphire_report_descr; > + sc->sc_repdesc_ptr = (void > *)&uhid_graphire_report_descr; > sc->sc_flags |= UHID_FLAG_STATIC_DESC; > > } else if (uaa->info.idProduct == > USB_PRODUCT_WACOM_GRAPHIRE3_4X5) { > @@ -693,7 +693,7 @@ uhid_attach(device_t dev) > usbd_errstr(error)); > } > sc->sc_repdesc_size = > sizeof(uhid_graphire3_4x5_report_descr); > - sc->sc_repdesc_ptr = &uhid_graphire3_4x5_report_descr; > + sc->sc_repdesc_ptr = (void > *)&uhid_graphire3_4x5_report_descr; > sc->sc_flags |= UHID_FLAG_STATIC_DESC; > } > } else if ((uaa->info.bInterfaceClass == UICLASS_VENDOR) && > @@ -702,7 +702,7 @@ uhid_attach(device_t dev) > > /* the Xbox 360 gamepad has no report descriptor */ > sc->sc_repdesc_size = sizeof(uhid_xb360gp_report_descr); > - sc->sc_repdesc_ptr = &uhid_xb360gp_report_descr; > + sc->sc_repdesc_ptr = (void *)&uhid_xb360gp_report_descr; > sc->sc_flags |= UHID_FLAG_STATIC_DESC; > } > if (sc->sc_repdesc_ptr == NULL) { -- a13x ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215255 - head/sys/modules
Author: imp Date: Sat Nov 13 20:28:06 2010 New Revision: 215255 URL: http://svn.freebsd.org/changeset/base/215255 Log: Correct mips/arm elimination of sym Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile == --- head/sys/modules/Makefile Sat Nov 13 19:26:45 2010(r215254) +++ head/sys/modules/Makefile Sat Nov 13 20:28:06 2010(r215255) @@ -330,7 +330,7 @@ _syscons= syscons _vpo= vpo .endif -.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" +.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" # no BUS_SPACE_UNSPECIFIED # No barrier instruction support (specific to this driver) _sym= sym ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215256 - head/contrib/binutils/bfd
Author: imp Date: Sat Nov 13 20:30:24 2010 New Revision: 215256 URL: http://svn.freebsd.org/changeset/base/215256 Log: Default to little endian output when building for little endian. This got lost as a result of a mismerge a few months back and I didn't notice until I collapsed tbemd into -head. Submitted by: similar patch by kan@ Modified: head/contrib/binutils/bfd/config.bfd Modified: head/contrib/binutils/bfd/config.bfd == --- head/contrib/binutils/bfd/config.bfdSat Nov 13 20:28:06 2010 (r215255) +++ head/contrib/binutils/bfd/config.bfdSat Nov 13 20:30:24 2010 (r215256) @@ -772,14 +772,18 @@ case "${targ}" in targ_defvec=bfd_elf32_littlemips_vec targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" ;; - mips*-*-freebsd*) -targ_defvec=bfd_elf32_tradbigmips_vec -targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" -;; mips*-*-netbsd*) targ_defvec=bfd_elf32_bigmips_vec targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" ;; + mips*el-*-freebsd*) +targ_defvec=bfd_elf32_tradlittlemips_vec +targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" +;; + mips*-*-freebsd*) +targ_defvec=bfd_elf32_tradbigmips_vec +targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" +;; mips*-dec-* | mips*el-*-ecoff*) targ_defvec=ecoff_little_vec targ_selvecs=ecoff_big_vec ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215257 - head
Author: imp Date: Sat Nov 13 20:41:47 2010 New Revision: 215257 URL: http://svn.freebsd.org/changeset/base/215257 Log: The fixes for mips/mips arm/arm compat hacks broke if TARGET or TARGET_ARCH wasn't defined. Fix it for that case. Submitted by: Garrett Cooper Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Sat Nov 13 20:30:24 2010(r215256) +++ head/Makefile.inc1 Sat Nov 13 20:41:47 2010(r215257) @@ -124,7 +124,8 @@ TARGET_ARCH=${TARGET:S/pc98/i386/:S/sun TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm} .endif # Legacy names, for a transition period mips:mips -> mipsel:mips -.if ${TARGET_ARCH} == "mips" && ${TARGET} == "mips" +.if defined(TARGET) && defined(TARGET_ARCH) && \ +${TARGET_ARCH} == "mips" && ${TARGET} == "mips" .warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb" .if defined(TARGET_BIG_ENDIAN) TARGET_ARCH=mipseb @@ -133,7 +134,7 @@ TARGET_ARCH=mipsel .endif .endif # arm with TARGET_BIG_ENDIAN -> armeb -.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) +.if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) .warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated. use armeb" TARGET_ARCH=armeb .endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215258 - in head/sys/dev/usb: . serial
Author: n_hibma Date: Sat Nov 13 20:45:16 2010 New Revision: 215258 URL: http://svn.freebsd.org/changeset/base/215258 Log: Add the switch config for the XS Stick. It speaks AT commands on 2 out of 3 serial ports, but it has not been verified to work at all speaking PPP yet. Modified: head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/u3g.c == --- head/sys/dev/usb/serial/u3g.c Sat Nov 13 20:41:47 2010 (r215257) +++ head/sys/dev/usb/serial/u3g.c Sat Nov 13 20:45:16 2010 (r215258) @@ -291,6 +291,8 @@ static const struct usb_device_id u3g_de U3G_DEV(KYOCERA2, CDMA_MSM_K, 0), U3G_DEV(KYOCERA2, KPC680, 0), U3G_DEV(LONGCHEER, WM66, U3GINIT_HUAWEI), + U3G_DEV(LONGCHEER, DISK, U3GINIT_TCT), + U3G_DEV(LONGCHEER, W14, 0), U3G_DEV(MERLIN, V620, 0), U3G_DEV(NEOTEL, PRIME, 0), U3G_DEV(NOVATEL, E725, 0), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevsSat Nov 13 20:41:47 2010(r215257) +++ head/sys/dev/usb/usbdevsSat Nov 13 20:45:16 2010(r215258) @@ -2086,7 +2086,10 @@ product LOGITEC RT2870_2 0x0163 RT2870 product LOGITEC RT2870_3 0x0164 RT2870 /* Longcheer Holdings, Ltd. products */ -product LONGCHEER WM66 0x6061 Longcheer WM66 HSDPA USB modem +product LONGCHEER WM66 0x6061 Longcheer WM66 HSDPA +product LONGCHEER W14 0x9603 Mobilcom W14 +product LONGCHEER DISK 0xf000 Driver disk + /* Lucent products */ product LUCENT EVALKIT 0x1001 USS-720 evaluation kit ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215259 - head/sbin/ifconfig
Author: marius Date: Sat Nov 13 21:03:19 2010 New Revision: 215259 URL: http://svn.freebsd.org/changeset/base/215259 Log: When printing media with more than one media option set aggregate these in a comma delimited list instead of repeating "mediaopt" for each one. This matches how the options of the active media are printed with print_media_word() and brings us in line what NetBSD does. MFC after:2 weeks Modified: head/sbin/ifconfig/ifmedia.c Modified: head/sbin/ifconfig/ifmedia.c == --- head/sbin/ifconfig/ifmedia.cSat Nov 13 20:45:16 2010 (r215258) +++ head/sbin/ifconfig/ifmedia.cSat Nov 13 21:03:19 2010 (r215259) @@ -757,7 +757,7 @@ print_media_word_ifconfig(int ifmw) { struct ifmedia_description *desc; struct ifmedia_type_to_subtype *ttos; - int i; + int seen_option = 0, i; /* Find the top-level interface type. */ desc = get_toptype_desc(ifmw); @@ -792,7 +792,10 @@ print_media_word_ifconfig(int ifmw) for (desc = ttos->options[i].desc; desc->ifmt_string != NULL; desc++) { if (ifmw & desc->ifmt_word) { - printf(" mediaopt %s", desc->ifmt_string); + if (seen_option == 0) + printf(" mediaopt "); + printf("%s%s", seen_option++ ? "," : "", + desc->ifmt_string); } } } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215260 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: mm Date: Sat Nov 13 21:09:18 2010 New Revision: 215260 URL: http://svn.freebsd.org/changeset/base/215260 Log: Disable VFS_HOLD placed on mnt_vnodecovered during the mount of a snapshot and VFS_RELE on a non-existing hold on snapshot parent's z_vfs. This disables the changes from OpenSolaris onnv-revision 9234:bffdc4fc05c4 (bug IDs: 6792139, 6794830) - not applicable to FreeBSD. This fixes the process hang if umounting a manually mounted snapshot. Reported by: Alexander Zagrebin Approved by: delphij (mentor) MFC after:1 week Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.cSat Nov 13 21:03:19 2010(r215259) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.cSat Nov 13 21:09:18 2010(r215260) @@ -1218,12 +1218,14 @@ zfs_mount(vfs_t *vfsp) error = zfs_domount(vfsp, osname); PICKUP_GIANT(); +#ifdef sun /* * Add an extra VFS_HOLD on our parent vfs so that it can't * disappear due to a forced unmount. */ if (error == 0 && ((zfsvfs_t *)vfsp->vfs_data)->z_issnap) VFS_HOLD(mvp->v_vfsp); +#endif /* sun */ out: return (error); @@ -1766,12 +1768,14 @@ zfs_freevfs(vfs_t *vfsp) { zfsvfs_t *zfsvfs = vfsp->vfs_data; +#ifdef sun /* * If this is a snapshot, we have an extra VFS_HOLD on our parent * from zfs_mount(). Release it here. */ if (zfsvfs->z_issnap) VFS_RELE(zfsvfs->z_parent->z_vfs); +#endif /* sun */ zfsvfs_free(zfsvfs); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215263 - head/usr.sbin/sysinstall
Author: brucec Date: Sat Nov 13 21:48:32 2010 New Revision: 215263 URL: http://svn.freebsd.org/changeset/base/215263 Log: Add ftp4.se.freebsd.org to the set of mirrors. PR: bin/150552 Submitted by: Niclas Zeising MFC after:3 days Modified: head/usr.sbin/sysinstall/menus.c Modified: head/usr.sbin/sysinstall/menus.c == --- head/usr.sbin/sysinstall/menus.cSat Nov 13 21:37:18 2010 (r215262) +++ head/usr.sbin/sysinstall/menus.cSat Nov 13 21:48:32 2010 (r215263) @@ -793,6 +793,8 @@ DMenu MenuMediaFTP = { VAR_FTP_PATH "=ftp://ftp2.se.freebsd.org"; }, { " Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=ftp://ftp3.se.freebsd.org"; }, + { " Sweden #4", "ftp4.se.freebsd.org", NULL, dmenuSetVariable, NULL, + VAR_FTP_PATH "=ftp://ftp4.se.freebsd.org"; }, { " Sweden #5", "ftp5.se.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=ftp://ftp5.se.freebsd.org"; }, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215266 - head/bin/sh
Author: jilles Date: Sat Nov 13 22:10:26 2010 New Revision: 215266 URL: http://svn.freebsd.org/changeset/base/215266 Log: sh: Do the additional actions if 'local -' restore changes -i/-m/-E/-V. Example: f() { local -; set +m; }; f caused failure to execute external programs because the job control tty fd was not opened. Modified: head/bin/sh/var.c Modified: head/bin/sh/var.c == --- head/bin/sh/var.c Sat Nov 13 22:04:48 2010(r215265) +++ head/bin/sh/var.c Sat Nov 13 22:10:26 2010(r215266) @@ -805,6 +805,7 @@ poplocalvars(void) if (vp == NULL) { /* $- saved */ memcpy(optlist, lvp->text, sizeof optlist); ckfree(lvp->text); + optschanged(); } else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) { (void)unsetvar(vp->text); } else { ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215214 - stable/8/sys/dev/sk
On Sat, Nov 13, 2010 at 06:36:17PM +, Alexey Dokuchaev wrote: > On Sat, Nov 13, 2010 at 12:46:07AM +, Pyun YongHyeon wrote: > > Author: yongari > > Date: Sat Nov 13 00:46:07 2010 > > New Revision: 215214 > > URL: http://svn.freebsd.org/changeset/base/215214 > > > > Log: > > MFC r214898: > > If we got an invalid station address, generate random address. This > > might be caused by broken BIOS. > > > > Reported by:"Mikhail T." aldan.algebra.com> > > Perhaps the reporter can be more easily referenced as m...@? > Hmm, sorry. I was not able to find the name of reporter in committers file. > ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215268 - head/bin/sh/funcs
Author: jilles Date: Sat Nov 13 22:20:46 2010 New Revision: 215268 URL: http://svn.freebsd.org/changeset/base/215268 Log: sh: Update the suspend example for the change of the job control flag from -j to -m, many years ago. Due to r215266, this function now actually works. Modified: head/bin/sh/funcs/suspend Modified: head/bin/sh/funcs/suspend == --- head/bin/sh/funcs/suspend Sat Nov 13 22:18:12 2010(r215267) +++ head/bin/sh/funcs/suspend Sat Nov 13 22:20:46 2010(r215268) @@ -34,6 +34,6 @@ suspend() { local - - set +j + set +m kill -TSTP 0 } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215269 - head/lib/libc_r
Author: emaste Date: Sat Nov 13 22:22:18 2010 New Revision: 215269 URL: http://svn.freebsd.org/changeset/base/215269 Log: Remove libc_r threading library. It has been disconnected from the build for four years (since r162846). Submitted by: Alexander Best arundel@ Deleted: head/lib/libc_r/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215269 - head/lib/libc_r
On Sat Nov 13 10, Ed Maste wrote: > Author: emaste > Date: Sat Nov 13 22:22:18 2010 > New Revision: 215269 > URL: http://svn.freebsd.org/changeset/base/215269 > > Log: > Remove libc_r threading library. It has been disconnected from the build > for four years (since r162846). thanks. :) > > Submitted by: Alexander Best arundel@ > > Deleted: > head/lib/libc_r/ -- a13x ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215270 - in head/sys/mips: adm5120 alchemy atheros cavium conf idt sentry5 sibyte
Author: imp Date: Sat Nov 13 22:34:12 2010 New Revision: 215270 URL: http://svn.freebsd.org/changeset/base/215270 Log: Remove the 'machine mips' from DEFAULTS. Put the proper 'machine mips mipsel' or 'machine mips mipseb' into the config file (with a few 64's tossed in for good measure). This will let us build the proper kernels with different worlds as part of make universe. Added: head/sys/mips/atheros/std.ar71xx (contents, props changed) head/sys/mips/sentry5/std.sentry5 (contents, props changed) head/sys/mips/sibyte/std.sibyte (contents, props changed) Modified: head/sys/mips/adm5120/std.adm5120 head/sys/mips/alchemy/std.alchemy head/sys/mips/cavium/std.octeon1 head/sys/mips/conf/ADM5120 head/sys/mips/conf/ALCHEMY head/sys/mips/conf/AR71XX head/sys/mips/conf/DEFAULTS head/sys/mips/conf/MALTA head/sys/mips/conf/MALTA64 head/sys/mips/conf/OCTEON1 head/sys/mips/conf/OCTEON1-32 head/sys/mips/conf/QEMU head/sys/mips/conf/SENTRY5 head/sys/mips/conf/SWARM head/sys/mips/conf/SWARM64 head/sys/mips/conf/SWARM64_SMP head/sys/mips/conf/SWARM_SMP head/sys/mips/conf/XLR head/sys/mips/conf/XLR64 head/sys/mips/conf/XLRN32 head/sys/mips/conf/std.SWARM head/sys/mips/idt/std.idt Modified: head/sys/mips/adm5120/std.adm5120 == --- head/sys/mips/adm5120/std.adm5120 Sat Nov 13 22:22:18 2010 (r215269) +++ head/sys/mips/adm5120/std.adm5120 Sat Nov 13 22:34:12 2010 (r215270) @@ -1,11 +1,13 @@ # $FreeBSD$ +# # Standard include file for ADM5120 -files "../adm5120/files.adm5120" +files "../adm5120/files.adm5120" +machinemips mipsel cpuCPU_MIPS4KC optionsISA_MIPS32 -# device admpci +# device admpci device admsw device pci Modified: head/sys/mips/alchemy/std.alchemy == --- head/sys/mips/alchemy/std.alchemy Sat Nov 13 22:22:18 2010 (r215269) +++ head/sys/mips/alchemy/std.alchemy Sat Nov 13 22:34:12 2010 (r215270) @@ -4,5 +4,6 @@ files "../alchemy/files.alchemy" +machinemips mipsel cpuCPU_MIPS4KC optionsISA_MIPS32 Added: head/sys/mips/atheros/std.ar71xx == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/atheros/std.ar71xxSat Nov 13 22:34:12 2010 (r215270) @@ -0,0 +1,9 @@ +# $FreeBSD$ +# +# standard config for all ar71xx based kernels. + +files "../atheros/files.ar71xx" + +machinemips mipseb +cpuCPU_MIPS4KC +optionsISA_MIPS32 Modified: head/sys/mips/cavium/std.octeon1 == --- head/sys/mips/cavium/std.octeon1Sat Nov 13 22:22:18 2010 (r215269) +++ head/sys/mips/cavium/std.octeon1Sat Nov 13 22:34:12 2010 (r215270) @@ -5,3 +5,5 @@ # $FreeBSD$ # files "../cavium/files.octeon1" +machinemips mips64eb +cpuCPU_CNMIPS Modified: head/sys/mips/conf/ADM5120 == --- head/sys/mips/conf/ADM5120 Sat Nov 13 22:22:18 2010(r215269) +++ head/sys/mips/conf/ADM5120 Sat Nov 13 22:34:12 2010(r215270) @@ -19,9 +19,6 @@ ident ADM5120 -#makeoptions ARCH_FLAGS=-march=mips32 -makeoptionsMIPS_LITTLE_ENDIAN=defined - # Don't build any modules yet. makeoptionsMODULES_OVERRIDE="" Modified: head/sys/mips/conf/ALCHEMY == --- head/sys/mips/conf/ALCHEMY Sat Nov 13 22:22:18 2010(r215269) +++ head/sys/mips/conf/ALCHEMY Sat Nov 13 22:34:12 2010(r215270) @@ -19,9 +19,6 @@ ident ALCHEMY -makeoptionsARCH_FLAGS=-march=mips32 -makeoptionsMIPS_LITTLE_ENDIAN=defined - # Don't build any modules yet. makeoptionsMODULES_OVERRIDE="" Modified: head/sys/mips/conf/AR71XX == --- head/sys/mips/conf/AR71XX Sat Nov 13 22:22:18 2010(r215269) +++ head/sys/mips/conf/AR71XX Sat Nov 13 22:34:12 2010(r215270) @@ -5,14 +5,11 @@ # ident AR71XX -cpuCPU_MIPS4KC -optionsISA_MIPS32 -makeoptionsTARGET_BIG_ENDIAN makeoptionsKERNLOADADDR=0x8005 optionsHZ=1000 -files "../atheros/files.ar71xx" hints "AR71XX.hints" +include"../atheros/std.ar71xx" makeoptionsDEBUG=-g#Build kernel with gdb(1) debug symbols #makeoptions MODULES_OVERRIDE="" Modified: head/sys/mips/conf/DEFAULTS
svn commit: r215271 - head
Author: imp Date: Sat Nov 13 22:38:33 2010 New Revision: 215271 URL: http://svn.freebsd.org/changeset/base/215271 Log: Add mips back to universe Modified: head/Makefile Modified: head/Makefile == --- head/Makefile Sat Nov 13 22:34:12 2010(r215270) +++ head/Makefile Sat Nov 13 22:38:33 2010(r215271) @@ -281,7 +281,7 @@ tinderbox: # existing system is. # .if make(universe) || make(universe_kernels) || make(tinderbox) -TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v +TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v mips .if defined(DOING_TINDERBOX) FAILFILE=tinderbox.failed ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215269 - head/lib/libc_r
On Sat, Nov 13, 2010 at 10:22:18PM +, Ed Maste wrote: > Log: > Remove libc_r threading library. It has been disconnected from the build > for four years (since r162846). It has been suggested that there's some value in keeping libc_r around for comparison purposes and benchmarking -- sorry if I ripped it out from anyone who was planning to do so. Of course it's still available in svn if needed for such work. -Ed ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215272 - head/sbin/ifconfig
Author: marius Date: Sat Nov 13 22:40:37 2010 New Revision: 215272 URL: http://svn.freebsd.org/changeset/base/215272 Log: When setting a media with no sub-type specified also reset the type specific options along with the global ones so these options don't stick when f.e. switching to IFM_AUTO. MFC after:2 weeks Modified: head/sbin/ifconfig/ifmedia.c Modified: head/sbin/ifconfig/ifmedia.c == --- head/sbin/ifconfig/ifmedia.cSat Nov 13 22:38:33 2010 (r215271) +++ head/sbin/ifconfig/ifmedia.cSat Nov 13 22:40:37 2010 (r215272) @@ -276,7 +276,7 @@ setmedia(const char *val, int d, int s, IFM_TYPE(ifmr->ifm_ulist[0]) | subtype; if ((ifr.ifr_media & IFM_TMASK) == 0) { - ifr.ifr_media &= ~IFM_GMASK; + ifr.ifr_media &= ~(IFM_GMASK | IFM_OMASK); } ifmr->ifm_current = ifr.ifr_media; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215269 - head/lib/libc_r
On Sat Nov 13 10, Ed Maste wrote: > On Sat, Nov 13, 2010 at 10:22:18PM +, Ed Maste wrote: > > > Log: > > Remove libc_r threading library. It has been disconnected from the build > > for four years (since r162846). > > It has been suggested that there's some value in keeping libc_r around > for comparison purposes and benchmarking -- sorry if I ripped it out > from anyone who was planning to do so. Of course it's still available > in svn if needed for such work. just stumbled over this thread from 2005: http://unix.derkeiler.com/Mailing-Lists/FreeBSD/arch/2005-10/0060.html however even back then it was decided that libc_r should stay for a while, but not forever. ...also a few people suggested moving it to ports, but for some reason that didn't happen. so i doubt that the removal of libc_r is a big loss to the majority of developers. ;) cheers. alex > > -Ed -- a13x ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r215166 - in head: . sys/conf sys/netinet sys/netinet/cc sys/sys
On 11/13/10 20:40, Mikolaj Golub wrote: > > On Fri, 12 Nov 2010 06:41:56 + (UTC) Lawrence Stewart wrote: > > LS> Author: lstewart > LS> Date: Fri Nov 12 06:41:55 2010 > LS> New Revision: 215166 > LS> URL: http://svn.freebsd.org/changeset/base/215166 > > LS> Log: > LS> This commit marks the first formal contribution of the "Five New TCP > Congestion > LS> Control Algorithms for FreeBSD" FreeBSD Foundation funded project. > More details > LS> about the project are available at: > http://caia.swin.edu.au/freebsd/5cc/ > > It looks like the code needs improvement to work with VIMAGE :-) > > options VIMAGE > > jail -i -c vnet persist path=/ > > panic: lock "cc_list" 0xc101c418 already initialized > > #0 doadump () at pcpu.h:231 > #1 0xc04f26b9 in db_fncall (dummy1=-1064234614, dummy2=0, dummy3=-1, > dummy4=0xca54b688 "\234╤Tй") at /usr/src/sys/ddb/db_command.c:548 > #2 0xc04f2aef in db_command (last_cmdp=0xc0e7957c, cmd_table=0x0, dopager=0) > at /usr/src/sys/ddb/db_command.c:445 > #3 0xc04f2ba4 in db_command_script (command=0xc0e7a484 "call doadump") > at /usr/src/sys/ddb/db_command.c:516 > #4 0xc04f6df0 in db_script_exec (scriptname=0xca54b794 "kdb.enter.panic", > warnifnotfound=Variable "warnifnotfound" is not available.) > at /usr/src/sys/ddb/db_script.c:302 > #5 0xc04f6ed7 in db_script_kdbenter (eventname=0xc0d2410e "panic") > at /usr/src/sys/ddb/db_script.c:324 > #6 0xc04f4b28 in db_trap (type=3, code=0) at /usr/src/sys/ddb/db_main.c:228 > #7 0xc0910fbe in kdb_trap (type=3, code=0, tf=0xca54b918) at > /usr/src/sys/kern/subr_kdb.c:546 > #8 0xc0c3d7c6 in trap (frame=0xca54b918) at /usr/src/sys/i386/i386/trap.c:732 > #9 0xc0c2647c in calltrap () at /usr/src/sys/i386/i386/exception.s:168 > #10 0xc091118a in kdb_enter (why=0xc0d2410e "panic", msg=0xc0d2410e "panic") > at cpufunc.h:71 > #11 0xc08dcd14 in panic (fmt=0xc0d27986 "lock \"%s\" %p already initialized") > at /usr/src/sys/kern/kern_shutdown.c:574 > #12 0xc0911bd4 in lock_init (lock=0xc147b204, class=0xc0e23a00, > name=0xc0d3f215 "cc_list", > type=0x0, flags=2228224) at /usr/src/sys/kern/subr_lock.c:81 > #13 0xc08daf5d in rw_init_flags (rw=0xc101c418, name=0xc0d3f215 "cc_list", > opts=0) > at /usr/src/sys/kern/kern_rwlock.c:195 > #14 0xc0a0d0c2 in cc_init () at /usr/src/sys/netinet/cc/cc.c:182 > #15 0xc0a7a4fd in tcp_init () at /usr/src/sys/netinet/tcp_subr.c:281 > #16 0xc0940e59 in protosw_init (pr=0x0) at /usr/src/sys/kern/uipc_domain.c:157 > #17 0xc0940e87 in domain_init (arg=0xc0e34280) at > /usr/src/sys/kern/uipc_domain.c:174 > #18 0xc0940ee1 in vnet_domain_init (arg=0xc0e34280) at > /usr/src/sys/kern/uipc_domain.c:190 > #19 0xc09adb2e in vnet_sysinit () at /usr/src/sys/net/vnet.c:625 > #20 0xc09ae1ef in vnet_alloc () at /usr/src/sys/net/vnet.c:254 > #21 0xc08ba41a in kern_jail_set (td=0xc306d870, optuio=0xc2d66a80, flags=0) > at /usr/src/sys/kern/kern_jail.c:1244 > #22 0xc08bbd00 in jail_set (td=0xc306d870, uap=0xca54bcec) at > /usr/src/sys/kern/kern_jail.c:489 > #23 0xc091e903 in syscallenter (td=0xc306d870, sa=0xca54bce4) > at /usr/src/sys/kern/subr_trap.c:318 > #24 0xc0c3cebf in syscall (frame=0xca54bd28) at > /usr/src/sys/i386/i386/trap.c:1095 > #25 0xc0c26511 in Xint0x80_syscall () at > /usr/src/sys/i386/i386/exception.s:266 > #26 0x0033 in ?? () > Would you mind testing the following patch? It fixes the panic for me. http://people.freebsd.org/~lstewart/patches/5cc/modcc_vnetpanic_ccinit.patch There are other VIMAGE related problems with r215166 as well. I'll try get to them as time permits. Cheers, Lawrence ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215274 - head/share/mk
Author: imp Date: Sun Nov 14 01:37:08 2010 New Revision: 215274 URL: http://svn.freebsd.org/changeset/base/215274 Log: This case is actually powerpc specific, and doesn't apply to powerpc64. Submitted by: nathanw@ Modified: head/share/mk/bsd.cpu.mk Modified: head/share/mk/bsd.cpu.mk == --- head/share/mk/bsd.cpu.mkSun Nov 14 01:06:10 2010(r215273) +++ head/share/mk/bsd.cpu.mkSun Nov 14 01:37:08 2010(r215274) @@ -114,7 +114,7 @@ _CPUCFLAGS = -march=armv5te -D__XSCALE__ . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif -. elif ${MACHINE_CPUARCH} == "powerpc" +. elif ${MACHINE_ARCH} == "powerpc" . if ${CPUTYPE} == "e500" MACHINE_CPU = booke _CPUCFLAGS = -Wa,-me500 -msoft-float ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215275 - head/gnu/lib/libgcc
Author: imp Date: Sun Nov 14 01:50:40 2010 New Revision: 215275 URL: http://svn.freebsd.org/changeset/base/215275 Log: These two cases should be different... Submitted by: nathanw@ Modified: head/gnu/lib/libgcc/Makefile Modified: head/gnu/lib/libgcc/Makefile == --- head/gnu/lib/libgcc/MakefileSun Nov 14 01:37:08 2010 (r215274) +++ head/gnu/lib/libgcc/MakefileSun Nov 14 01:50:40 2010 (r215275) @@ -140,13 +140,13 @@ LIB1ASMFUNCS = __divxf3 __divdf3 __divsf LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c .endif -.if ${TARGET_CPUARCH} == "powerpc" +.if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm LIB2FUNCS_EXTRA = tramp.asm LIB2FUNCS_STATIC_EXTRA = eabi.asm .endif -.if ${TARGET_CPUARCH} == "powerpc64" +.if ${TARGET_ARCH} == "powerpc64" # from config/rs6000/t-ppccomm LIB2FUNCS_EXTRA = tramp.asm .endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215276 - in head/gnu/usr.bin: binutils cc gdb gdb/libgdb
Author: imp Date: Sun Nov 14 01:52:19 2010 New Revision: 215276 URL: http://svn.freebsd.org/changeset/base/215276 Log: We need to add powerpc64->powerpc translations (I knew I hated copying this code in the first place). Also MACHINE_ARCH powerpc is 32-bit, not MACHINE_CPUARCH == powerpc. Submitted by: nathanw Modified: head/gnu/usr.bin/binutils/Makefile.inc0 head/gnu/usr.bin/cc/Makefile.tgt head/gnu/usr.bin/gdb/Makefile.inc head/gnu/usr.bin/gdb/libgdb/Makefile Modified: head/gnu/usr.bin/binutils/Makefile.inc0 == --- head/gnu/usr.bin/binutils/Makefile.inc0 Sun Nov 14 01:50:40 2010 (r215275) +++ head/gnu/usr.bin/binutils/Makefile.inc0 Sun Nov 14 01:52:19 2010 (r215276) @@ -7,7 +7,7 @@ VERSION= "2.15 [FreeBSD] 2004-05-23" .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} +TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif @@ -27,7 +27,7 @@ RELSRC= ${RELTOP}/../../../contrib/binut SRCDIR=${.CURDIR}/${RELSRC} .if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "i386" || \ - ${TARGET_CPUARCH} == "powerpc" || \ + ${TARGET_ARCH} == "powerpc" || \ (${TARGET_CPUARCH} == "mips" && \ (!defined(TARGET_ABI) || ${TARGET_ABI} != "n64")) CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 Modified: head/gnu/usr.bin/cc/Makefile.tgt == --- head/gnu/usr.bin/cc/Makefile.tgtSun Nov 14 01:50:40 2010 (r215275) +++ head/gnu/usr.bin/cc/Makefile.tgtSun Nov 14 01:52:19 2010 (r215276) @@ -4,7 +4,7 @@ # MACHINE_CPUARCH, but there's no easy way to export make functions... .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} +TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif Modified: head/gnu/usr.bin/gdb/Makefile.inc == --- head/gnu/usr.bin/gdb/Makefile.inc Sun Nov 14 01:50:40 2010 (r215275) +++ head/gnu/usr.bin/gdb/Makefile.inc Sun Nov 14 01:52:19 2010 (r215276) @@ -20,7 +20,7 @@ OBJ_GDB= ${OBJ_ROOT}/gdb # MACHINE_CPUARCH, but there's no easy way to export make functions... .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} +TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif Modified: head/gnu/usr.bin/gdb/libgdb/Makefile == --- head/gnu/usr.bin/gdb/libgdb/MakefileSun Nov 14 01:50:40 2010 (r215275) +++ head/gnu/usr.bin/gdb/libgdb/MakefileSun Nov 14 01:52:19 2010 (r215276) @@ -4,7 +4,7 @@ # MACHINE_CPUARCH, but there's no easy way to export make functions... .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} +TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215279 - head
Author: imp Date: Sun Nov 14 05:01:40 2010 New Revision: 215279 URL: http://svn.freebsd.org/changeset/base/215279 Log: add / to the translation of TARGET_ARCH to TARGET Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Sun Nov 14 02:38:29 2010(r215278) +++ head/Makefile.inc1 Sun Nov 14 05:01:40 2010(r215279) @@ -121,7 +121,7 @@ VERSION+= ${OSRELDATE} TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/:S/mips/mipsel/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm} +TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm/} .endif # Legacy names, for a transition period mips:mips -> mipsel:mips .if defined(TARGET) && defined(TARGET_ARCH) && \ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215280 - head/sys/dev/arcmsr
Author: delphij Date: Sun Nov 14 05:05:41 2010 New Revision: 215280 URL: http://svn.freebsd.org/changeset/base/215280 Log: Workaround build for PAE case for now - revert the PHYS case to previous panic behavior. I have a real fix that changes the sg dma tag allocation to be limited to the under 4GB address space but would prefer to have review before committing. Modified: head/sys/dev/arcmsr/arcmsr.c Modified: head/sys/dev/arcmsr/arcmsr.c == --- head/sys/dev/arcmsr/arcmsr.cSun Nov 14 05:01:40 2010 (r215279) +++ head/sys/dev/arcmsr/arcmsr.cSun Nov 14 05:05:41 2010 (r215280) @@ -2470,11 +2470,15 @@ static void arcmsr_action(struct cam_sim splx(s); } else { /* Buffer is physical */ +#ifdef PAE + panic("arcmsr: CAM_DATA_PHYS not supported"); +#else struct bus_dma_segment seg; seg.ds_addr = (bus_addr_t)pccb->csio.data_ptr; seg.ds_len = pccb->csio.dxfer_len; arcmsr_execute_srb(srb, &seg, 1, 0); +#endif } } else { /* Scatter/gather list */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r215281 - head/sys/kern
Author: brucec Date: Sun Nov 14 06:09:50 2010 New Revision: 215281 URL: http://svn.freebsd.org/changeset/base/215281 Log: Add some descriptions to sys/kern sysctls. PR: kern/148710 Tested by:Chip Camden MFC after:1 week Modified: head/sys/kern/kern_proc.c head/sys/kern/kern_tc.c head/sys/kern/subr_clock.c head/sys/kern/sysv_sem.c head/sys/kern/vfs_cache.c Modified: head/sys/kern/kern_proc.c == --- head/sys/kern/kern_proc.c Sun Nov 14 05:05:41 2010(r215280) +++ head/sys/kern/kern_proc.c Sun Nov 14 06:09:50 2010(r215281) @@ -144,7 +144,7 @@ struct mtx ppeers_lock; uma_zone_t proc_zone; int kstack_pages = KSTACK_PAGES; -SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0, ""); +SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0, "Kernel stack size in pages"); CTASSERT(sizeof(struct kinfo_proc) == KINFO_PROC_SIZE); #ifdef COMPAT_FREEBSD32 Modified: head/sys/kern/kern_tc.c == --- head/sys/kern/kern_tc.c Sun Nov 14 05:05:41 2010(r215280) +++ head/sys/kern/kern_tc.c Sun Nov 14 06:09:50 2010(r215281) @@ -103,7 +103,7 @@ SYSCTL_NODE(_kern_timecounter, OID_AUTO, static int timestepwarnings; SYSCTL_INT(_kern_timecounter, OID_AUTO, stepwarnings, CTLFLAG_RW, -×tepwarnings, 0, ""); +×tepwarnings, 0, "Log time steps"); static void tc_windup(void); static void cpu_tick_calibrate(int); @@ -560,7 +560,7 @@ sysctl_kern_timecounter_hardware(SYSCTL_ } SYSCTL_PROC(_kern_timecounter, OID_AUTO, hardware, CTLTYPE_STRING | CTLFLAG_RW, -0, 0, sysctl_kern_timecounter_hardware, "A", ""); +0, 0, sysctl_kern_timecounter_hardware, "A", "Timecounter hardware selected"); /* Report or change the active timecounter hardware. */ @@ -583,7 +583,7 @@ sysctl_kern_timecounter_choice(SYSCTL_HA } SYSCTL_PROC(_kern_timecounter, OID_AUTO, choice, CTLTYPE_STRING | CTLFLAG_RD, -0, 0, sysctl_kern_timecounter_choice, "A", ""); +0, 0, sysctl_kern_timecounter_choice, "A", "Timecounter hardware detected"); /* * RFC 2783 PPS-API implementation. @@ -768,7 +768,7 @@ pps_event(struct pps_state *pps, int eve */ static int tc_tick; -SYSCTL_INT(_kern_timecounter, OID_AUTO, tick, CTLFLAG_RD, &tc_tick, 0, ""); +SYSCTL_INT(_kern_timecounter, OID_AUTO, tick, CTLFLAG_RD, &tc_tick, 0, "Approximate number of hardclock ticks in a millisecond"); void tc_ticktock(int cnt) Modified: head/sys/kern/subr_clock.c == --- head/sys/kern/subr_clock.c Sun Nov 14 05:05:41 2010(r215280) +++ head/sys/kern/subr_clock.c Sun Nov 14 06:09:50 2010(r215281) @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include #define ct_debug bootverbose -static int adjkerntz; /* local offset from GMT in seconds */ +static int adjkerntz; /* local offset from UTC in seconds */ static int wall_cmos_clock;/* wall CMOS clock assumed if != 0 */ int tz_minuteswest; @@ -61,7 +61,7 @@ int tz_dsttime; * kern. */ SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); + CTLFLAG_RW, &wall_cmos_clock, 0, "CMOS clock keeps wall time"); static int sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) @@ -74,7 +74,7 @@ sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ } SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); + &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "Local offset from UTC in seconds"); /** * Generic routines to convert between a POSIX date Modified: head/sys/kern/sysv_sem.c == --- head/sys/kern/sysv_sem.cSun Nov 14 05:05:41 2010(r215280) +++ head/sys/kern/sysv_sem.cSun Nov 14 06:09:50 2010(r215281) @@ -212,7 +212,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, semvmx, SYSCTL_INT(_kern_ipc, OID_AUTO, semaem, CTLFLAG_RW, &seminfo.semaem, 0, "Adjust on exit max value"); SYSCTL_PROC(_kern_ipc, OID_AUTO, sema, CTLFLAG_RD, -NULL, 0, sysctl_sema, "", ""); +NULL, 0, sysctl_sema, "", "Semaphore id pool"); static struct syscall_helper_data sem_syscalls[] = { SYSCALL_INIT_HELPER(__semctl), Modified: head/sys/kern/vfs_cache.c == --- head/sys/kern/vfs_cache.c Sun Nov 14 05:05:41 2010(r215280) +++ head/sys/kern/vfs_cache.c Sun Nov 14 06:09:50 2010(r215281) @@ -184,27 +184,27 @@ SYSCTL_INT(_debug, OID_AUTO, vfscache, C /* Export size information to userland */ SYSCTL_INT(_debug_sizeof, OID_AUTO, namecache, CTLFLAG_RD, 0, - sizeof(struct namecache), "");
svn commit: r215282 - head/sys/kern
Author: brucec Date: Sun Nov 14 07:38:42 2010 New Revision: 215282 URL: http://svn.freebsd.org/changeset/base/215282 Log: Add descriptions to some more sysctls. PR: kern/148510 MFC after:1 week Modified: head/sys/kern/vfs_subr.c Modified: head/sys/kern/vfs_subr.c == --- head/sys/kern/vfs_subr.cSun Nov 14 06:09:50 2010(r215281) +++ head/sys/kern/vfs_subr.cSun Nov 14 07:38:42 2010(r215282) @@ -121,7 +121,7 @@ static void destroy_vpollinfo(struct vpo */ static unsigned long numvnodes; -SYSCTL_LONG(_vfs, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, ""); +SYSCTL_LONG(_vfs, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, "Number of vnodes in existence"); /* * Conversion tables for conversion from vnode types to inode formats @@ -150,7 +150,7 @@ static u_long wantfreevnodes; SYSCTL_LONG(_vfs, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, ""); /* Number of vnodes in the free list. */ static u_long freevnodes; -SYSCTL_LONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, ""); +SYSCTL_LONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, "Number of vnodes in the free list"); static int vlru_allow_cache_src; SYSCTL_INT(_vfs, OID_AUTO, vlru_allow_cache_src, CTLFLAG_RW, @@ -162,7 +162,7 @@ SYSCTL_INT(_vfs, OID_AUTO, vlru_allow_ca * XXX these are probably of (very) limited utility now. */ static int reassignbufcalls; -SYSCTL_INT(_vfs, OID_AUTO, reassignbufcalls, CTLFLAG_RW, &reassignbufcalls, 0, ""); +SYSCTL_INT(_vfs, OID_AUTO, reassignbufcalls, CTLFLAG_RW, &reassignbufcalls, 0, "Number of calls to reassignbuf"); /* * Cache for the mount type id assigned to NFS. This is used for @@ -237,14 +237,14 @@ static struct cv sync_wakeup; static int syncer_maxdelay = SYNCER_MAXDELAY; /* maximum delay time */ static int syncdelay = 30; /* max time to delay syncing data */ static int filedelay = 30; /* time to delay syncing files */ -SYSCTL_INT(_kern, OID_AUTO, filedelay, CTLFLAG_RW, &filedelay, 0, ""); +SYSCTL_INT(_kern, OID_AUTO, filedelay, CTLFLAG_RW, &filedelay, 0, "Time to delay syncing files (in seconds)"); static int dirdelay = 29; /* time to delay syncing directories */ -SYSCTL_INT(_kern, OID_AUTO, dirdelay, CTLFLAG_RW, &dirdelay, 0, ""); +SYSCTL_INT(_kern, OID_AUTO, dirdelay, CTLFLAG_RW, &dirdelay, 0, "Time to delay syncing directories (in seconds)"); static int metadelay = 28; /* time to delay syncing metadata */ -SYSCTL_INT(_kern, OID_AUTO, metadelay, CTLFLAG_RW, &metadelay, 0, ""); +SYSCTL_INT(_kern, OID_AUTO, metadelay, CTLFLAG_RW, &metadelay, 0, "Time to delay syncing metadata (in seconds)"); static int rushjob;/* number of slots to run ASAP */ static int stat_rush_requests; /* number of times I/O speeded up */ -SYSCTL_INT(_debug, OID_AUTO, rush_requests, CTLFLAG_RW, &stat_rush_requests, 0, ""); +SYSCTL_INT(_debug, OID_AUTO, rush_requests, CTLFLAG_RW, &stat_rush_requests, 0, "Number of times I/O speeded up (rush requests)"); /* * When shutting down the syncer, run it at four times normal speed. @@ -544,7 +544,7 @@ enum { TSP_SEC, TSP_HZ, TSP_USEC, TSP_NS static int timestamp_precision = TSP_SEC; SYSCTL_INT(_vfs, OID_AUTO, timestamp_precision, CTLFLAG_RW, -×tamp_precision, 0, ""); +×tamp_precision, 0, "File timestamp precision (0: seconds, 1: sec + ns accurate to 1/HZ, 2: sec + ns truncated to ms, 3+: sec + ns (max. precision))"); /* * Get a current timestamp. @@ -2376,7 +2376,7 @@ vinactive(struct vnode *vp, struct threa */ #ifdef DIAGNOSTIC static int busyprt = 0;/* print out busy vnodes */ -SYSCTL_INT(_debug, OID_AUTO, busyprt, CTLFLAG_RW, &busyprt, 0, ""); +SYSCTL_INT(_debug, OID_AUTO, busyprt, CTLFLAG_RW, &busyprt, 0, "Print out busy vnodes"); #endif int @@ -3712,17 +3712,17 @@ extattr_check_cred(struct vnode *vp, int (vp)->v_type == VCHR || (vp)->v_type == VBAD) int vfs_badlock_ddb = 1; /* Drop into debugger on violation. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_ddb, CTLFLAG_RW, &vfs_badlock_ddb, 0, ""); +SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_ddb, CTLFLAG_RW, &vfs_badlock_ddb, 0, "Drop into debugger on lock violation"); int vfs_badlock_mutex = 1; /* Check for interlock across VOPs. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_mutex, CTLFLAG_RW, &vfs_badlock_mutex, 0, ""); +SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_mutex, CTLFLAG_RW, &vfs_badlock_mutex, 0, "Check for interlock across VOPs"); int vfs_badlock_print = 1; /* Print lock violations. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_print, CTLFLAG_RW, &vfs_badlock_print, 0, ""); +SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_print, CTLFLAG_RW, &vfs_badlock_print, 0, "Print lock violations"); #ifdef KDB int vfs_badlock_backtrace = 1; /* Print backtrace at lock violations. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_