CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: dholland Date: Mon Nov 23 05:01:12 UTC 2009 Modified Files: src/sys/arch/i386/i386: machdep.c Log Message: When converting an if/panic to a KASSERT it's necessary to reverse the sense of the test. Makes i386 boot again. HI RMIND To generate a diff of this commit: cvs rdiff -u -r1.675 -r1.676 src/sys/arch/i386/i386/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/machdep.c diff -u src/sys/arch/i386/i386/machdep.c:1.675 src/sys/arch/i386/i386/machdep.c:1.676 --- src/sys/arch/i386/i386/machdep.c:1.675 Sat Nov 21 15:38:43 2009 +++ src/sys/arch/i386/i386/machdep.c Mon Nov 23 05:01:12 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.675 2009/11/21 15:38:43 rmind Exp $ */ +/* $NetBSD: machdep.c,v 1.676 2009/11/23 05:01:12 dholland Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009 @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.675 2009/11/21 15:38:43 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.676 2009/11/23 05:01:12 dholland Exp $"); #include "opt_beep.h" #include "opt_compat_ibcs2.h" @@ -1371,7 +1371,7 @@ * Saving SSE registers won't work if the save area isn't * 16-byte aligned. */ - KASSERT(offsetof(struct pcb, pcb_savefpu) & 0xf); + KASSERT((offsetof(struct pcb, pcb_savefpu) & 0xf) == 0); /* * Start with 2 color bins -- this is just a guess to get us
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Mon Nov 23 03:21:05 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1099. To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.141 src/doc/CHANGES-5.1:1.1.2.142 --- src/doc/CHANGES-5.1:1.1.2.141 Sat Nov 21 20:10:39 2009 +++ src/doc/CHANGES-5.1 Mon Nov 23 03:21:04 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.141 2009/11/21 20:10:39 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.142 2009/11/23 03:21:04 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14803,3 +14803,64 @@ vrelel(). call mutex_exit() on v_interlock directly instead. [bouyer, ticket #1152] +external/bsd/dhcpcd/dist/compat patch +external/bsd/dhcpcd/dist/defs.h patch +external/bsd/dhcpcd/dist/arp.c patch +external/bsd/dhcpcd/dist/bind.c patch +external/bsd/dhcpcd/dist/common.c patch +external/bsd/dhcpcd/dist/common.h patch +external/bsd/dhcpcd/dist/config.h patch +external/bsd/dhcpcd/dist/configure.c patch +external/bsd/dhcpcd/dist/control.c patch +external/bsd/dhcpcd/dist/dhcp.c patch +external/bsd/dhcpcd/dist/dhcp.h patch +external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in patch +external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in patch +external/bsd/dhcpcd/dist/dhcpcd.8.in patch +external/bsd/dhcpcd/dist/dhcpcd.c patch +external/bsd/dhcpcd/dist/dhcpcd.conf patch +external/bsd/dhcpcd/dist/dhcpcd.conf.5.in patch +external/bsd/dhcpcd/dist/duid.c patch +external/bsd/dhcpcd/dist/if-bsd.c patch +external/bsd/dhcpcd/dist/if-options.c patch +external/bsd/dhcpcd/dist/if-options.h patch +external/bsd/dhcpcd/dist/if-pref.c patch +external/bsd/dhcpcd/dist/ipv4ll.c patch +external/bsd/dhcpcd/dist/net.c patch +external/bsd/dhcpcd/dist/net.h patch +external/bsd/dhcpcd/dist/signals.c patch +external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu patch +external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname patch +external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf patch +external/bsd/dhcpcd/sbin/dhcpcd/Makefile patch + + Update dhcpcd to 5.1.3. Changes: + * Fixed correct dstaddr detection at startup on PtP links. + * Default to requesting an MTU. + * Fix crash on MIPS + * Save and restore interface MTU when changing + * IP whitelist + * Ensure that the lease and pidfile directories exist at startup + * Fix -f path/to/config + * -e, --env var=value for profile specific env vars + * Many issues resolved when running in test mode + * Don't print a (null) string when there is no NAK message + * Only allow hardware families we know by default (over-ridable) + * Fix persistent and timeout 0 options + * Fix parsing of escape code sequencies + * Don't bring up interfaces brought down when handling new interfaces + * Allow un-encapsulated vendor option + * Don't null terminate gratuitously when handling quotes. + * Fix various typos and grammatical errors. Thanks to Stephen Borrill. + * ClientID is now reported when interface starts + * -w, --wait forces dhcpcd to wait until an interface gets a lease ar + times out + * 50-ypbind hook added for BSD style NIS + * Ensure DHCP socket is open when sending a DECLINE + * Uses new hwaddr if existing interface is downed and then changed. + * No longer works on firewire interfaces by default. + * waitip is enabled when running on a single interface. + * Classless Static Routes are now enabled by default in dhcpcd.conf + instead of being always being requested. + [roy, ticket #1099] +
CVS commit: src/sys
Module Name:src Committed By: rmind Date: Mon Nov 23 02:13:48 UTC 2009 Modified Files: src/sys/coda: coda_vnops.c src/sys/conf: debugsyms.c src/sys/dev: cninit.c cons.c nullcons_subr.c src/sys/dev/apm: apm.c src/sys/dev/arcbios: arcbios_tty.c src/sys/dev/bi: kdb.c uba_bi.c src/sys/dev/eisa: ahb.c uha_eisa.c src/sys/dev/hpc: hpcfb.c src/sys/dev/hpc/apm: apmdev.c src/sys/dev/ic: adv.c adw.c adwmcode.c aha.c aic6360.c bha.c clmpcc.c com.c cy.c isp_netbsd.h lpt.c mb89352.c ncr5380sbc.c sunscpal.c uha.c src/sys/dev/isa: adv_isa.c aic_isa.c com_isa.c com_multi.c lpt_isa.c seagate.c uha_isa.c wds.c src/sys/dev/mca: com_mca.c esp_mca.c src/sys/dev/mvme: lpt_mvme.c src/sys/dev/pcmcia: com_pcmcia.c src/sys/dev/qbus: uba.c src/sys/dev/scsipi: ch.c ss.c ss_mustek.c ss_scanjet.c st.c src/sys/net: bpf.c Log Message: Remove some unecessary includes sys/user.h header. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/coda/coda_vnops.c cvs rdiff -u -r1.2 -r1.3 src/sys/conf/debugsyms.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/cninit.c src/sys/dev/nullcons_subr.c cvs rdiff -u -r1.65 -r1.66 src/sys/dev/cons.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/apm/apm.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/arcbios/arcbios_tty.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/bi/kdb.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/bi/uba_bi.c cvs rdiff -u -r1.56 -r1.57 src/sys/dev/eisa/ahb.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/eisa/uha_eisa.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/hpc/hpcfb.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/hpc/apm/apmdev.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ic/adv.c src/sys/dev/ic/uha.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/ic/adw.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/adwmcode.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ic/aha.c cvs rdiff -u -r1.98 -r1.99 src/sys/dev/ic/aic6360.c cvs rdiff -u -r1.71 -r1.72 src/sys/dev/ic/bha.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/clmpcc.c cvs rdiff -u -r1.290 -r1.291 src/sys/dev/ic/com.c cvs rdiff -u -r1.56 -r1.57 src/sys/dev/ic/cy.c cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/isp_netbsd.h cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/lpt.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/mb89352.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/ic/ncr5380sbc.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/sunscpal.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/isa/adv_isa.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/isa/aic_isa.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/isa/com_isa.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/isa/com_multi.c cvs rdiff -u -r1.67 -r1.68 src/sys/dev/isa/lpt_isa.c cvs rdiff -u -r1.69 -r1.70 src/sys/dev/isa/seagate.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/isa/uha_isa.c cvs rdiff -u -r1.73 -r1.74 src/sys/dev/isa/wds.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/mca/com_mca.c cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mca/esp_mca.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/mvme/lpt_mvme.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pcmcia/com_pcmcia.c cvs rdiff -u -r1.77 -r1.78 src/sys/dev/qbus/uba.c cvs rdiff -u -r1.85 -r1.86 src/sys/dev/scsipi/ch.c cvs rdiff -u -r1.78 -r1.79 src/sys/dev/scsipi/ss.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/scsipi/ss_mustek.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/scsipi/ss_scanjet.c cvs rdiff -u -r1.213 -r1.214 src/sys/dev/scsipi/st.c cvs rdiff -u -r1.147 -r1.148 src/sys/net/bpf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/coda/coda_vnops.c diff -u src/sys/coda/coda_vnops.c:1.70 src/sys/coda/coda_vnops.c:1.71 --- src/sys/coda/coda_vnops.c:1.70 Mon Jun 29 05:08:15 2009 +++ src/sys/coda/coda_vnops.c Mon Nov 23 02:13:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: coda_vnops.c,v 1.70 2009/06/29 05:08:15 dholland Exp $ */ +/* $NetBSD: coda_vnops.c,v 1.71 2009/11/23 02:13:44 rmind Exp $ */ /* * @@ -46,7 +46,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.70 2009/06/29 05:08:15 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.71 2009/11/23 02:13:44 rmind Exp $"); #include #include @@ -60,7 +60,6 @@ #include #include #include -#include #include #include Index: src/sys/conf/debugsyms.c diff -u src/sys/conf/debugsyms.c:1.2 src/sys/conf/debugsyms.c:1.3 --- src/sys/conf/debugsyms.c:1.2 Fri Jun 6 13:21:00 2008 +++ src/sys/conf/debugsyms.c Mon Nov 23 02:13:45 2009 @@ -1,10 +1,10 @@ -/* $NetBSD: debugsyms.c,v 1.2 2008/06/06 13:21:00 ad Exp $ */ +/* $NetBSD: debugsyms.c,v 1.3 2009/11/23 02:13:45 rmind Exp $ */ /* * This file is in the public domain. */ #include -__KERNEL_RCSID(0, "$NetBSD: debugsyms.c,v 1.2 2008/06/06 13:21:00 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: debugsyms.c,v 1.3 2009/11/23 02:13:45 rmind Exp $"); #define _CALLOUT_PRIVATE #define __MUTEX_PRIVATE @@ -21,7 +21,6 @@ #include #include #include -#includ
CVS commit: src/sys/compat
Module Name:src
Committed By: rmind
Date: Mon Nov 23 00:46:07 UTC 2009
Modified Files:
src/sys/compat/common: kern_sig_43.c
src/sys/compat/freebsd: freebsd_ptrace.c
src/sys/compat/irix: irix_signal.c
src/sys/compat/linux/arch/alpha: linux_machdep.c
src/sys/compat/linux/arch/amd64: linux_machdep.c
src/sys/compat/linux/arch/arm: linux_machdep.c
src/sys/compat/linux/arch/i386: linux_exec_machdep.c linux_machdep.c
src/sys/compat/linux/arch/mips: linux_machdep.c
src/sys/compat/linux/arch/powerpc: linux_machdep.c
src/sys/compat/linux32/arch/amd64: linux32_machdep.c
src/sys/compat/osf1: osf1_misc.c
src/sys/compat/svr4: svr4_lwp.c
src/sys/compat/svr4_32: svr4_32_lwp.c
Log Message:
Use lwp_getpcb() in compat code, clean from struct user.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/compat/common/kern_sig_43.c
cvs rdiff -u -r1.18 -r1.19 src/sys/compat/freebsd/freebsd_ptrace.c
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/irix/irix_signal.c
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/linux/arch/alpha/linux_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/compat/linux/arch/amd64/linux_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/linux/arch/arm/linux_machdep.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/compat/linux/arch/i386/linux_exec_machdep.c
cvs rdiff -u -r1.145 -r1.146 src/sys/compat/linux/arch/i386/linux_machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/compat/linux/arch/mips/linux_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/linux/arch/powerpc/linux_machdep.c
cvs rdiff -u -r1.22 -r1.23 \
src/sys/compat/linux32/arch/amd64/linux32_machdep.c
cvs rdiff -u -r1.83 -r1.84 src/sys/compat/osf1/osf1_misc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/compat/svr4/svr4_lwp.c
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/svr4_32/svr4_32_lwp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/kern_sig_43.c
diff -u src/sys/compat/common/kern_sig_43.c:1.32 src/sys/compat/common/kern_sig_43.c:1.33
--- src/sys/compat/common/kern_sig_43.c:1.32 Mon Apr 28 20:23:41 2008
+++ src/sys/compat/common/kern_sig_43.c Mon Nov 23 00:46:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig_43.c,v 1.32 2008/04/28 20:23:41 martin Exp $ */
+/* $NetBSD: kern_sig_43.c,v 1.33 2009/11/23 00:46:06 rmind Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sig_43.c,v 1.32 2008/04/28 20:23:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig_43.c,v 1.33 2009/11/23 00:46:06 rmind Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -61,8 +61,6 @@
#include
-#include /* for coredump */
-
#include
void compat_43_sigmask_to_sigset(const int *, sigset_t *);
Index: src/sys/compat/freebsd/freebsd_ptrace.c
diff -u src/sys/compat/freebsd/freebsd_ptrace.c:1.18 src/sys/compat/freebsd/freebsd_ptrace.c:1.19
--- src/sys/compat/freebsd/freebsd_ptrace.c:1.18 Wed Nov 12 12:36:10 2008
+++ src/sys/compat/freebsd/freebsd_ptrace.c Mon Nov 23 00:46:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_ptrace.c,v 1.18 2008/11/12 12:36:10 ad Exp $ */
+/* $NetBSD: freebsd_ptrace.c,v 1.19 2009/11/23 00:46:06 rmind Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: freebsd_ptrace.c,v 1.18 2008/11/12 12:36:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_ptrace.c,v 1.19 2009/11/23 00:46:06 rmind Exp $");
#include
#include
@@ -79,7 +79,6 @@
#include
#include
#include
-#include
#include
#include
#include
Index: src/sys/compat/irix/irix_signal.c
diff -u src/sys/compat/irix/irix_signal.c:1.51 src/sys/compat/irix/irix_signal.c:1.52
--- src/sys/compat/irix/irix_signal.c:1.51 Wed Nov 4 21:23:02 2009
+++ src/sys/compat/irix/irix_signal.c Mon Nov 23 00:46:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: irix_signal.c,v 1.51 2009/11/04 21:23:02 rmind Exp $ */
+/* $NetBSD: irix_signal.c,v 1.52 2009/11/23 00:46:06 rmind Exp $ */
/*-
* Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.51 2009/11/04 21:23:02 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.52 2009/11/23 00:46:06 rmind Exp $");
#include
#include
@@ -43,7 +43,6 @@
#include
#include
#include
-#include
#include
#include
@@ -370,10 +369,12 @@
}
static void
-irix_set_sigcontext (struct irix_sigcontext *scp, const sigset_t *mask, int code, struct lwp *l)
+irix_set_sigcontext (struct irix_sigcontext *scp, const sigset_t *mask,
+int code, struct lwp *l)
{
- int i;
struct frame *f;
+ struct pcb *pcb;
+ int i;
KASSERT(mutex_owned(l->l_proc->p_lock));
@@ -400,19 +401,19 @@
/*
* Save the floating-pointstate, if necessary, then copy it.
*/
+ pcb = lwp_getpcb(l);
#ifnd
CVS commit: src/sys/arch/atari/conf
Module Name:src Committed By: abs Date: Mon Nov 23 00:18:38 UTC 2009 Modified Files: src/sys/arch/atari/conf: ATARITT GENERIC.in Log Message: Do not include FPU_EMULATE in ATARITT only config To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.80 -r1.81 src/sys/arch/atari/conf/GENERIC.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.93 src/sys/arch/atari/conf/ATARITT:1.94 --- src/sys/arch/atari/conf/ATARITT:1.93 Fri Mar 6 23:38:41 2009 +++ src/sys/arch/atari/conf/ATARITT Mon Nov 23 00:18:38 2009 @@ -1,5 +1,5 @@ # -# $NetBSD: ATARITT,v 1.93 2009/03/06 23:38:41 abs Exp $ +# $NetBSD: ATARITT,v 1.94 2009/11/23 00:18:38 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -12,7 +12,6 @@ options HZ=64 # Set the clock-rate (48/64/96) options INSECURE # disable kernel security levels options M68030 # support for 030 -options FPU_EMULATE # Support for MC68881/MC68882 emulator options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 options PPP_BSDCOMP # BSD-Compress compression support for PPP Index: src/sys/arch/atari/conf/GENERIC.in diff -u src/sys/arch/atari/conf/GENERIC.in:1.80 src/sys/arch/atari/conf/GENERIC.in:1.81 --- src/sys/arch/atari/conf/GENERIC.in:1.80 Fri Mar 6 23:38:07 2009 +++ src/sys/arch/atari/conf/GENERIC.in Mon Nov 23 00:18:37 2009 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.in,v 1.80 2009/03/06 23:38:07 abs Exp $ +# $NetBSD: GENERIC.in,v 1.81 2009/11/23 00:18:37 abs Exp $ # # Generic atari # @@ -50,8 +50,10 @@ # #if defined(TT030_KERNEL) || defined(FALCON_KERNEL) options M68030 # support for 030 -options FPU_EMULATE # Support for MC68881/MC68882 emulator #endif /* TT030_KERNEL || FALCON_KERNEL */ +#if defined(FALCON_KERNEL) +options FPU_EMULATE # Support for MC68881/MC68882 emulator +#endif /* FALCON_KERNEL */ #if (defined(FALCON_KERNEL) && !defined(SMALL030_KERNEL)) || \ defined(HADES_KERNEL) || defined(MILAN_KERNEL) options M68040 # support for 040
CVS commit: src/sys/arch
Module Name:src
Committed By: bouyer
Date: Sun Nov 22 21:41:03 UTC 2009
Modified Files:
src/sys/arch/amd64/include: vmparam.h
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
For amd64, introduce a third free list distinct from the default free list
for memory between 16M and 4G. On large memory machine, this avoids
the 32bit-accessible memory being eaten by various kernel early allocation,
causing 32bit bus_dma(9) memory allocation to fail at boot time.
Tested on a system with 48GB RAM; based on netbsd-5 patch proposed on
port-amd64 3 days ago.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/include/vmparam.h
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x86/x86/x86_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/include/vmparam.h
diff -u src/sys/arch/amd64/include/vmparam.h:1.21 src/sys/arch/amd64/include/vmparam.h:1.22
--- src/sys/arch/amd64/include/vmparam.h:1.21 Fri Mar 6 20:31:47 2009
+++ src/sys/arch/amd64/include/vmparam.h Sun Nov 22 21:41:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.21 2009/03/06 20:31:47 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.22 2009/11/22 21:41:03 bouyer Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -152,9 +152,10 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
-#define VM_NFREELIST 2
+#define VM_NFREELIST 3
#define VM_FREELIST_DEFAULT 0
-#define VM_FREELIST_FIRST16 1
+#define VM_FREELIST_FIRST4G 1
+#define VM_FREELIST_FIRST16 2
#include
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.36 src/sys/arch/x86/x86/x86_machdep.c:1.37
--- src/sys/arch/x86/x86/x86_machdep.c:1.36 Sat Nov 21 03:11:02 2009
+++ src/sys/arch/x86/x86/x86_machdep.c Sun Nov 22 21:41:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.36 2009/11/21 03:11:02 rmind Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.37 2009/11/22 21:41:03 bouyer Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.36 2009/11/21 03:11:02 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.37 2009/11/22 21:41:03 bouyer Exp $");
#include "opt_modular.h"
@@ -632,6 +632,9 @@
uint64_t seg_start, seg_end;
uint64_t seg_start1, seg_end1;
int first16q, x;
+#ifdef VM_FREELIST_FIRST4G
+ int first4gq;
+#endif
/*
* If we have 16M of RAM or less, just put it all on
@@ -640,11 +643,28 @@
* all of the ISA DMA'able memory won't be eaten up
* first-off).
*/
- if (avail_end <= (16 * 1024 * 1024))
+#define ADDR_16M (16 * 1024 * 1024)
+
+ if (avail_end <= ADDR_16M)
first16q = VM_FREELIST_DEFAULT;
else
first16q = VM_FREELIST_FIRST16;
+#ifdef VM_FREELIST_FIRST4G
+ /*
+ * If we have 4G of RAM or less, just put it all on
+ * the default free list. Otherwise, put the first
+ * 4G of RAM on a lower priority free list (so that
+ * all of the 32bit PCI DMA'able memory won't be eaten up
+ * first-off).
+ */
+#define ADDR_4G (4ULL * 1024 * 1024 * 1024)
+ if (avail_end <= ADDR_4G)
+ first4gq = VM_FREELIST_DEFAULT;
+ else
+ first4gq = VM_FREELIST_FIRST4G;
+#endif /* defined(VM_FREELIST_FIRST4G) */
+
/* Make sure the end of the space used by the kernel is rounded. */
first_avail = round_page(first_avail);
@@ -696,18 +716,19 @@
/* First hunk */
if (seg_start != seg_end) {
- if (seg_start < (16 * 1024 * 1024) &&
+ if (seg_start < ADDR_16M &&
first16q != VM_FREELIST_DEFAULT) {
uint64_t tmp;
-if (seg_end > (16 * 1024 * 1024))
- tmp = (16 * 1024 * 1024);
+if (seg_end > ADDR_16M)
+ tmp = ADDR_16M;
else
tmp = seg_end;
if (tmp != seg_start) {
#ifdef DEBUG_MEMLOAD
- printf("loading 0x%"PRIx64"-0x%"PRIx64
+ printf("loading first16q 0x%"PRIx64
+ "-0x%"PRIx64
" (0x%"PRIx64"-0x%"PRIx64")\n",
seg_start, tmp,
(uint64_t)atop(seg_start),
@@ -720,9 +741,36 @@
seg_start = tmp;
}
+#ifdef VM_FREELIST_FIRST4G
+ if (seg_start < ADDR_4G &&
+ first4gq != VM_FREELIST_DEFAULT) {
+uint64_t tmp;
+
+if (seg_end > ADDR_4G)
+ tmp = ADDR_4G;
+else
+ tmp = seg_end;
+
+if (tmp != seg_start) {
+#ifdef DEBUG_MEMLOAD
+ printf("loading first4gq 0x%"PRIx64
+ "-0x%"PRIx64
+ " (0x%"PRIx64"-0x%"PRIx64")\n",
+ seg_start, tmp,
+ (uint64_t)atop(seg_start),
+ (uint64_t)atop(tmp));
+#endif
+ uvm_page_physload(atop(seg_start),
+ atop(tmp), atop(seg_start),
+ atop(tmp), first4gq);
+}
+seg_start = tmp;
+ }
+#endif /* defined(VM_FREELIST_FIRST4G) */
+
if (seg_start != seg_end) {
#ifdef DEBUG_MEMLOAD
-printf("loading 0x%"PRIx64"-0x%"PRIx64
+printf("loading default 0x%"PRIx64"-0x%"PRIx64
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: dsl
Date: Sun Nov 22 21:18:42 UTC 2009
Modified Files:
src/sys/dev/pcmcia: if_cnw.c
Log Message:
Remove "splurious interrupt" message. The IRQ might be shared.
Fixes PR/11410
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pcmcia/if_cnw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/if_cnw.c
diff -u src/sys/dev/pcmcia/if_cnw.c:1.51 src/sys/dev/pcmcia/if_cnw.c:1.52
--- src/sys/dev/pcmcia/if_cnw.c:1.51 Tue May 12 14:42:18 2009
+++ src/sys/dev/pcmcia/if_cnw.c Sun Nov 22 21:18:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.51 2009/05/12 14:42:18 cegger Exp $ */
+/* $NetBSD: if_cnw.c,v 1.52 2009/11/22 21:18:42 dsl Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.51 2009/05/12 14:42:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.52 2009/11/22 21:18:42 dsl Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -895,12 +895,9 @@
status = bus_space_read_1(sc->sc_memt, sc->sc_memh,
sc->sc_memoff + CNW_IOM_OFF + CNW_REG_CCSR);
#endif
- if (!(status & 0x02)) {
- if (ret == 0)
-printf("%s: spurious interrupt\n",
-device_xname(&sc->sc_dev));
+ if (!(status & 0x02))
+ /* No more commands, or shared IRQ */
return (ret);
- }
ret = 1;
#ifndef MEMORY_MAPPED
status = bus_space_read_1(sc->sc_iot, sc->sc_ioh, CNW_REG_ASR);
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: christos
Date: Sun Nov 22 19:34:56 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: handler.c
Log Message:
PR/42363: Yasuoka Masahiko:
racoon uses a wrong IPsec-SA handle that is for other peer in case it
receives a ISAKMP message for IPsec-SA that has the same message-id as
the message-id that is received before.
racoon uses message-id to find the handle of IPsec-SA. The message-id
is a unique number for each peer, but different peers may use the same
value.
Different Windows Vista or Windows 7 peers seem to use the same
message-id. racoon can handle the first Windows's Phase-2, but it
cannot handle the second Windows. Because racoon misunderstands the
message for the second Windows as the message for the first Windows.
>Category: bin
>Synopsis: racoon uses a wrong IPsec-SA that is for different peer
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible:bin-bug-people
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sun Nov 22 18:25:00 + 2009
>Originator: yasu...@iij.ad.jp
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/crypto/dist/ipsec-tools/src/racoon/handler.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/handler.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.30 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.31
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.30 Thu Sep 3 05:29:07 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Sun Nov 22 14:34:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: handler.c,v 1.30 2009/09/03 09:29:07 tteras Exp $ */
+/* $NetBSD: handler.c,v 1.31 2009/11/22 19:34:55 christos Exp $ */
/* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
@@ -573,7 +573,7 @@
{
struct ph2handle *p;
- LIST_FOREACH(p, &ph2tree, chain) {
+ LIST_FOREACH(p, &iph1->ph2tree, chain) {
if (p->msgid == msgid && p->ph1 == iph1)
return p;
}
CVS commit: src/sys
Module Name:src Committed By: mbalmer Date: Sun Nov 22 19:09:16 UTC 2009 Modified Files: src/sys/arch/arm/gemini: gemini_reg.h src/sys/arch/evbarm/nslu2: README src/sys/arch/hp700/hp700: autoconf.c src/sys/arch/ia64/stand/common: environment.c src/sys/arch/mips/sibyte/include: bcm1480_hsp.h src/sys/arch/sgimips/gio: grtwo.c src/sys/compat/common: compat_mod.c src/sys/dev/pci/n8/QMgr: QMQueue.c src/sys/dist/ipf/netinet: ip_state.c src/sys/kern: sched_m2.c sys_aio.c src/sys/netbt: rfcomm_upper.c Log Message: more s/the the/the/ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/gemini/gemini_reg.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/nslu2/README cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hp700/hp700/autoconf.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/environment.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/sibyte/include/bcm1480_hsp.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/gio/grtwo.c cvs rdiff -u -r1.8 -r1.9 src/sys/compat/common/compat_mod.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/n8/QMgr/QMQueue.c cvs rdiff -u -r1.34 -r1.35 src/sys/dist/ipf/netinet/ip_state.c cvs rdiff -u -r1.28 -r1.29 src/sys/kern/sched_m2.c cvs rdiff -u -r1.29 -r1.30 src/sys/kern/sys_aio.c cvs rdiff -u -r1.11 -r1.12 src/sys/netbt/rfcomm_upper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/gemini/gemini_reg.h diff -u src/sys/arch/arm/gemini/gemini_reg.h:1.8 src/sys/arch/arm/gemini/gemini_reg.h:1.9 --- src/sys/arch/arm/gemini/gemini_reg.h:1.8 Mon Dec 15 04:44:27 2008 +++ src/sys/arch/arm/gemini/gemini_reg.h Sun Nov 22 19:09:15 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: gemini_reg.h,v 1.8 2008/12/15 04:44:27 matt Exp $ */ +/* $NetBSD: gemini_reg.h,v 1.9 2009/11/22 19:09:15 mbalmer Exp $ */ #ifndef _ARM_GEMINI_REG_H_ #define _ARM_GEMINI_REG_H_ @@ -254,7 +254,7 @@ #define GPIO_BOUNCESCALE_RESV __BITS(31,16) #define GPIO_BOUNCESCALE_VAL __BITS(15,0) /* NOTE: * if bounce is enabled, and bounce pre-scale == 0 - * then the the pin will not detect any interrupt + * then the pin will not detect any interrupt */ #define GEMINI_GPIO_SIZE (GEMINI_GPIO_BOUNCESCALE + 4) Index: src/sys/arch/evbarm/nslu2/README diff -u src/sys/arch/evbarm/nslu2/README:1.6 src/sys/arch/evbarm/nslu2/README:1.7 --- src/sys/arch/evbarm/nslu2/README:1.6 Wed Jan 17 16:00:20 2007 +++ src/sys/arch/evbarm/nslu2/README Sun Nov 22 19:09:15 2009 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.6 2007/01/17 16:00:20 imp Exp $ +$NetBSD: README,v 1.7 2009/11/22 19:09:15 mbalmer Exp $ NetBSD for the Linksys NSLU2 (a.k.a. "Slug") @@ -88,7 +88,7 @@ hooking up a MAX3232 chip to your Slug. While your soldering iron is hot, you should seriously consider de-restricting your Slug's CPU core clock speed (133MHz stock, 266MHz de-restricted) by removing a single surface- -mount resistor. Full instructions for both the these mods are on the above +mount resistor. Full instructions for both these mods are on the above website. Once you have console access you can interrupt RedBoot's auto-boot process Index: src/sys/arch/hp700/hp700/autoconf.c diff -u src/sys/arch/hp700/hp700/autoconf.c:1.29 src/sys/arch/hp700/hp700/autoconf.c:1.30 --- src/sys/arch/hp700/hp700/autoconf.c:1.29 Fri May 8 09:33:58 2009 +++ src/sys/arch/hp700/hp700/autoconf.c Sun Nov 22 19:09:15 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.29 2009/05/08 09:33:58 skrll Exp $ */ +/* $NetBSD: autoconf.c,v 1.30 2009/11/22 19:09:15 mbalmer Exp $ */ /* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */ @@ -86,7 +86,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2009/05/08 09:33:58 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.30 2009/11/22 19:09:15 mbalmer Exp $"); #include "opt_kgdb.h" #include "opt_useleds.h" @@ -333,7 +333,7 @@ * is the HPA or device path (DP) to get the boot device. * If the boot device is a SCSI device below a GSC attached SCSI * controller PAGE0->mem_boot.pz_hpa contains the HPA of the SCSI - * controller. In that case we remember the the pointer to the + * controller. In that case we remember the pointer to the * controller's struct dev in boot_device. The SCSI device is located * later, see below. */ Index: src/sys/arch/ia64/stand/common/environment.c diff -u src/sys/arch/ia64/stand/common/environment.c:1.2 src/sys/arch/ia64/stand/common/environment.c:1.3 --- src/sys/arch/ia64/stand/common/environment.c:1.2 Mon Jul 20 04:59:03 2009 +++ src/sys/arch/ia64/stand/common/environment.c Sun Nov 22 19:09:15 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: environment.c,v 1.2 2009/07/20 04:59:03 kiyohara Exp $ */ +/* $NetBSD: environment.c,v 1.3 2009/11/22 19:09:15 mbalmer Exp $ */ /* @@ -63,7 +63,7 @
CVS commit: src/usr.bin/sdpquery
Module Name:src
Committed By: plunky
Date: Sun Nov 22 18:53:44 UTC 2009
Modified Files:
src/usr.bin/sdpquery: print.c
Log Message:
add translation for "802.1Q" ethertype
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/sdpquery/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.4 src/usr.bin/sdpquery/print.c:1.5
--- src/usr.bin/sdpquery/print.c:1.4 Thu Aug 20 11:07:42 2009
+++ src/usr.bin/sdpquery/print.c Sun Nov 22 18:53:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.4 2009/08/20 11:07:42 plunky Exp $ */
+/* $NetBSD: print.c,v 1.5 2009/11/22 18:53:44 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: print.c,v 1.4 2009/08/20 11:07:42 plunky Exp $");
+__RCSID("$NetBSD: print.c,v 1.5 2009/11/22 18:53:44 plunky Exp $");
#include
#include
@@ -1374,6 +1374,7 @@
switch (v) {
case 0x0800: printf("IPv4"); break;
case 0x0806: printf("ARP"); break;
+ case 0x8100: printf("802.1Q"); break;
case 0x86dd: printf("IPv6"); break;
default: printf("0x%04x", v); break;
}
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: mbalmer Date: Sun Nov 22 18:45:27 UTC 2009 Modified Files: src/usr.sbin/postinstall: postinstall.8 Log Message: s/the the/the/ To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/postinstall/postinstall.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall.8 diff -u src/usr.sbin/postinstall/postinstall.8:1.14 src/usr.sbin/postinstall/postinstall.8:1.15 --- src/usr.sbin/postinstall/postinstall.8:1.14 Thu Oct 15 02:15:19 2009 +++ src/usr.sbin/postinstall/postinstall.8 Sun Nov 22 18:45:27 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: postinstall.8,v 1.14 2009/10/15 02:15:19 joerg Exp $ +.\" $NetBSD: postinstall.8,v 1.15 2009/11/22 18:45:27 mbalmer Exp $ .\" .\" Copyright (c) 2005-2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -178,6 +178,6 @@ .Pp In .Nx 5.0 , -the the ability to specify multiple colon-separated files with a single +the ability to specify multiple colon-separated files with a single .Fl s option was deprecated.
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src
Committed By: mbalmer
Date: Sun Nov 22 18:43:28 UTC 2009
Modified Files:
src/usr.sbin/makefs/cd9660: cd9660_write.c
Log Message:
make sense
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/makefs/cd9660/cd9660_write.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660/cd9660_write.c
diff -u src/usr.sbin/makefs/cd9660/cd9660_write.c:1.11 src/usr.sbin/makefs/cd9660/cd9660_write.c:1.12
--- src/usr.sbin/makefs/cd9660/cd9660_write.c:1.11 Sun Nov 22 18:40:27 2009
+++ src/usr.sbin/makefs/cd9660/cd9660_write.c Sun Nov 22 18:43:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_write.c,v 1.11 2009/11/22 18:40:27 mbalmer Exp $ */
+/* $NetBSD: cd9660_write.c,v 1.12 2009/11/22 18:43:27 mbalmer Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_write.c,v 1.11 2009/11/22 18:40:27 mbalmer Exp $");
+__RCSID("$NetBSD: cd9660_write.c,v 1.12 2009/11/22 18:43:27 mbalmer Exp $");
#endif /* !__lint */
static int cd9660_write_volume_descriptors(FILE *);
@@ -502,7 +502,7 @@
}
/*
- * If we had to go the continuation area, head back to
+ * If we had to go to the continuation area, head back to
* where we should be.
*/
if (in_ca)
CVS commit: src
Module Name:src
Committed By: mbalmer
Date: Sun Nov 22 18:40:27 UTC 2009
Modified Files:
src/common/dist/zlib/contrib/asm586: README.586
src/lib/libpuffs: puffs_framebuf.3
src/libexec/httpd: bozohttpd.8
src/sbin/init: init.c
src/share/man/man4: wapbl.4
src/share/man/man9: mutex.9 rwlock.9
src/sys/altq: altq_cbq.c
src/sys/sys: sleepq.h
src/usr.sbin/makefs/cd9660: cd9660_write.c
Log Message:
s/the the/the/
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/common/dist/zlib/contrib/asm586/README.586
cvs rdiff -u -r1.26 -r1.27 src/lib/libpuffs/puffs_framebuf.3
cvs rdiff -u -r1.15 -r1.16 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.98 -r1.99 src/sbin/init/init.c
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/wapbl.4
cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/mutex.9
cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/rwlock.9
cvs rdiff -u -r1.25 -r1.26 src/sys/altq/altq_cbq.c
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/sleepq.h
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/makefs/cd9660/cd9660_write.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/dist/zlib/contrib/asm586/README.586
diff -u src/common/dist/zlib/contrib/asm586/README.586:1.1.1.1 src/common/dist/zlib/contrib/asm586/README.586:1.2
--- src/common/dist/zlib/contrib/asm586/README.586:1.1.1.1 Sat Jan 14 20:10:46 2006
+++ src/common/dist/zlib/contrib/asm586/README.586 Sun Nov 22 18:40:26 2009
@@ -5,7 +5,7 @@
README.586
match.S
-The effectiveness of these modifications is a bit marginal, as the the
+The effectiveness of these modifications is a bit marginal, as the
program's bottleneck seems to be mostly L1-cache contention, for which
there is no real way to work around without rewriting the basic
algorithm. The speedup on average is around 5-10% (which is generally
Index: src/lib/libpuffs/puffs_framebuf.3
diff -u src/lib/libpuffs/puffs_framebuf.3:1.26 src/lib/libpuffs/puffs_framebuf.3:1.27
--- src/lib/libpuffs/puffs_framebuf.3:1.26 Fri Feb 20 14:26:56 2009
+++ src/lib/libpuffs/puffs_framebuf.3 Sun Nov 22 18:40:26 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: puffs_framebuf.3,v 1.26 2009/02/20 14:26:56 pooka Exp $
+.\" $NetBSD: puffs_framebuf.3,v 1.27 2009/11/22 18:40:26 mbalmer Exp $
.\"
.\" Copyright (c) 2007 Antti Kantee. All rights reserved.
.\"
@@ -210,7 +210,7 @@
.It rfb
Read a frame from the file descriptor onto the specified buffer.
.It wfb
-Write a frame from the the specified buffer into the file descriptor.
+Write a frame from the specified buffer into the file descriptor.
.It cmpfb
Identify if a buffer is the response to the specified buffer.
.It gotfb
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.15 src/libexec/httpd/bozohttpd.8:1.16
--- src/libexec/httpd/bozohttpd.8:1.15 Sat May 23 20:26:18 2009
+++ src/libexec/httpd/bozohttpd.8 Sun Nov 22 18:40:26 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: bozohttpd.8,v 1.15 2009/05/23 20:26:18 wiz Exp $
+.\" $NetBSD: bozohttpd.8,v 1.16 2009/11/22 18:40:26 mbalmer Exp $
.\"
.\" $eterna: bozohttpd.8,v 1.91 2009/05/23 00:55:22 mrg Exp $
.\"
@@ -224,7 +224,7 @@
This option enables the transformation of Uniform Resource Locators of
the form
.Em /~user/
-into the the directory
+into the directory
.Pa ~user/public_html
(but see the
.Fl p
Index: src/sbin/init/init.c
diff -u src/sbin/init/init.c:1.98 src/sbin/init/init.c:1.99
--- src/sbin/init/init.c:1.98 Sun Apr 12 09:31:32 2009
+++ src/sbin/init/init.c Sun Nov 22 18:40:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.98 2009/04/12 09:31:32 apb Exp $ */
+/* $NetBSD: init.c,v 1.99 2009/11/22 18:40:26 mbalmer Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: init.c,v 1.98 2009/04/12 09:31:32 apb Exp $");
+__RCSID("$NetBSD: init.c,v 1.99 2009/11/22 18:40:26 mbalmer Exp $");
#endif
#endif /* not lint */
@@ -1138,7 +1138,7 @@
make_utmpx("", BOOT_MSG, BOOT_TIME, 0, &boot_time, 0);
/*
- * If wtmpx is not empty, pick the the down time from there
+ * If wtmpx is not empty, pick the down time from there
*/
if (stat(_PATH_WTMPX, &st) != -1 && st.st_size != 0) {
struct timeval down_time;
Index: src/share/man/man4/wapbl.4
diff -u src/share/man/man4/wapbl.4:1.10 src/share/man/man4/wapbl.4:1.11
--- src/share/man/man4/wapbl.4:1.10 Sun Nov 22 00:02:56 2009
+++ src/share/man/man4/wapbl.4 Sun Nov 22 18:40:26 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: wapbl.4,v 1.10 2009/11/22 00:02:56 christos Exp $
+.\" $NetBSD: wapbl.4,v 1.11 2009/11/22 18:40:26 mbalmer Exp $
.\"
.\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -64,7 +64,7 @@
will be based on 1MB of journal per 1GB of file system, to a maximum
journal size of 64MB.
.Pp
-If there is adequate space between the end of the the
CVS commit: src/share/man/man4
Module Name:src
Committed By: pooka
Date: Sun Nov 22 18:36:16 UTC 2009
Modified Files:
src/share/man/man4: puffs.4
Log Message:
Remove extra crud which hasn't been up-to-date in eons.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/puffs.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/puffs.4
diff -u src/share/man/man4/puffs.4:1.9 src/share/man/man4/puffs.4:1.10
--- src/share/man/man4/puffs.4:1.9 Sun Nov 22 18:02:22 2009
+++ src/share/man/man4/puffs.4 Sun Nov 22 18:36:16 2009
@@ -1,6 +1,6 @@
-.\" $NetBSD: puffs.4,v 1.9 2009/11/22 18:02:22 mbalmer Exp $
+.\" $NetBSD: puffs.4,v 1.10 2009/11/22 18:36:16 pooka Exp $
.\"
-.\" Copyright (c) 2006 Antti Kantee. All rights reserved.
+.\" Copyright (c) 2009 Antti Kantee. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 1, 2006
+.Dd November 22, 2009
.Dt PUFFS 4
.Os
.Sh NAME
@@ -33,240 +33,29 @@
.Cd "file-system PUFFS"
.Cd "pseudo-device putter"
.Sh DESCRIPTION
-.Em THIS DOCUMENT IS HOPELESSLY OUT OF DATE .
-While some parts are still valid, please refer to the source
-code for current reality.
-.Pp
-.Em IMPORTANT NOTE!
-This document describes interfaces which are not yet guaranteed to be
-stable.
-In case you update your system sources, please recompile everything
-and fix compilation errors.
-If your sources are out-of-sync, incorrect operation may result.
-.Pp
.Nm
provides a framework for creating file systems as userspace servers.
The in-kernel VFS attachment is controlled through a special device
node,
.Pa /dev/puffs .
-This document describes the operations on the device.
-People looking to implement file systems should prefer using the
+People looking to implement file systems should use the
system through the convenience library described in
.Xr puffs 3 .
-Users wanting to access the device node directly should include
-the header
-.Pa sys/fs/puffs/puffs_msgif.h
-for relevant definitions.
-.Ss Mounting
-The
-.Nm
-device node should be opened once per file system instance (i.e. mount).
-The device itself is a cloning node, so the same node can be opened
-a practically unlimited number of times.
-Once the device is open, the file system can be mounted the normal
-way using the
-.Xr mount 2
-system call and using the argument structure to control mount options:
-.Bd -literal -offset indent
-struct puffs_args {
- int pa_vers;
- int pa_fd;
- unsigned int pa_flags;
- size_t pa_maxreqlen;
- char pa_name[PUFFSNAMESIZE];
- uint8_t pa_vnopmask[PUFFS_VN_MAX];
-};
-.Ed
-.Pp
-The member
-.Va pa_vers
-is currently always 0 and ignored.
-The
-.Va pa_fd
-member is the file descriptor number from opening the device node.
-.Va pa_flags
-controls some operations specific to puffs:
-.Bl -tag -width "PUFFS_KFLAG_ALLOWCTL"
-.It Dv PUFFS_KFLAG_ALLOWCTL
-Allow file system fcntl and ioctl operations.
-Allowing these has security implications as the file system can
-technically read anything out of a calling processes address space.
-This flag may additionally be enforced by the kernel security policy.
-.It Dv PUFFS_KFLAG_NOCACHE
-Do not store data in the page cache.
-This causes operations to always consult the user server instead of
-consulting the page cache.
-This makes sense in situations where there is relatively little
-bulk data to be transferred and the user server does not want to take
-part in complex cache management routines in case the file system data
-can be modified through routes other than the file system interface.
-.It Dv PUFFS_KFLAG_ALLOPS
-Transport all vnode operations to the file system server instead of just
-the ones specified by
-.Va pa_vnopmask .
-.El
-.Pp
-The
-.Va pa_maxreqlen
-member signifies the length of the incoming data buffer in userspace.
-A good value is
-.Dv PUFFS_REQ_MAXSIZE ,
-which is the maximum the kernel will use.
-A minimum value is also enforced, so the value of this field should
-be checked after the mount operation to determine the correct buffer
-size.
-During operation, in case request fetch is attempted with a buffer
-too short, the error
-.Er E2BIG
-will be returned.
-The file system type is give in
-.Va pa_name .
-It will always be prepended by "puffs:" by the kernel.
-Finally, the array
-.Va pa_vnopmask
-specifies which operations are supported by the file system server.
-The array is indexed with
-.Dv PUFFS_VN_FOO
-and 0 means vnode operation
-.Dv FOO
-is unimplemented while non-zero means an implemented operation.
-This array is ignored if
-.Dv PUFFS_KFLAG_ALLOPS
-is given.
-.Pp
-After a successful mount system call, the ioctl
-.Dv PUFFSSTARTOP
-must be issued through the open device node.
-
CVS commit: src/lib/libukfs
Module Name:src Committed By: pooka Date: Sun Nov 22 18:14:49 UTC 2009 Modified Files: src/lib/libukfs: ukfs.3 Log Message: Update. Especially, describe ukfs_mount_disk(), ukfs_release() flags and return value, and remove obsolete info in BUGS. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libukfs/ukfs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libukfs/ukfs.3 diff -u src/lib/libukfs/ukfs.3:1.9 src/lib/libukfs/ukfs.3:1.10 --- src/lib/libukfs/ukfs.3:1.9 Mon Sep 14 20:54:34 2009 +++ src/lib/libukfs/ukfs.3 Sun Nov 22 18:14:49 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: ukfs.3,v 1.9 2009/09/14 20:54:34 pooka Exp $ +.\" $NetBSD: ukfs.3,v 1.10 2009/11/22 18:14:49 pooka Exp $ .\" .\" Copyright (c) 2008 Antti Kantee. All rights reserved. .\" @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 28, 2008 +.Dd November 22, 2009 .Dt UKFS 3 .Os .Sh NAME @@ -74,7 +74,11 @@ .It Ft struct ukfs * .Fn ukfs_mount "const char *vfsname" "const char *devpath" \ "const char *mountpath" "int mntflags" "void *arg" "size_t alen" -.It Ft void +.It Ft struct ukfs * +.Fn ukfs_mount_disk "const char *vfsname" "const char *devpath" \ +"int partition" "const char *mountpath" "int mntflags" \ +"void *arg" "size_t alen" +.It Ft int .Fn ukfs_release "struct ukfs *ukfs" "int flags" .El .Pp @@ -173,16 +177,44 @@ Size of said structure. .El .Pp +The +.Fn ukfs_mount_disk +function must be used to mount disk-based file systems. +It takes the same arguments as +.Fn ukfs_mount , +except for an additional argument signifying the +.Fa partition +number. +If the image +.Fa devpath +contains a disklabel, this value specifies the number of the partition +within the image used as the file system backend. +If +.Fa devpath +does not contain a disklabel, the value +.Dv UKFS_PARTITION_NONE +must be used to signal that the file system backend is the entire +image. +.Pp .Fn ukfs_release -releases the resources associated with +unmounts the file system and releases the resources associated with .Fa ukfs . -If -.Fa flags -is -.Dv UKFS_RELFLAG_NOUNMOUNT , -the file system is not unmounted. -This is required if the file system has already been unmounted due -to prior activity, otherwise 0 should be passed. +The return value signals the return value of the unmount operation. +If non-zero, +.Fa ukfs +will continue to remain valid. +The possible values for flags are: +.Bl -tag -width XUKFS_RELFLAG_NOUNMOUT -offset indent +.It Dv UKFS_RELFLAG_NOUNMOUNT +Do not unmount file system, just release ukfs handle. +Release always succeeds. +.It Dv UKFS_RELFLAG_FORCE +Forcefully unmount the file system. +This means that any busy nodes (due to e.g. +.Fn ukfs_chdir ) +will be ignored. +Release always succeeds. +.El .Sh OPERATION .Bl -ohang .It Ft int @@ -286,13 +318,11 @@ .Nm should be considered experimental technology and may change without warning. .Sh BUGS -Due to how the runtime linker works, it is possible to include -support for only one file system in dynamic binaries at linktime. -The remaining desired file systems can be loaded with -.Fn ukfs_modload . -Statically linked binaries do not have this limitation, but cannot use -.Fn ukfs_modload -at all. -The recommended approach is to use dynamically linked binaries and load all -file system modules with +On Linux, dynamically linked binaries can include support for only +one file system due to restrictions with the dynamic linker. +If more are desired, they must be loaded at runtime using .Fn ukfs_modload . +Even though +.Nx +does not have this restriction, portable programs should load all +file system drivers dynamically.
CVS commit: src/lib/libc/time
Module Name:src
Committed By: mbalmer
Date: Sun Nov 22 18:07:39 UTC 2009
Modified Files:
src/lib/libc/time: getdate.c
Log Message:
one more the
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/time/getdate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/getdate.c
diff -u src/lib/libc/time/getdate.c:1.1 src/lib/libc/time/getdate.c:1.2
--- src/lib/libc/time/getdate.c:1.1 Thu May 14 02:37:36 2009
+++ src/lib/libc/time/getdate.c Sun Nov 22 18:07:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: getdate.c,v 1.1 2009/05/14 02:37:36 ginsbach Exp $ */
+/* $NetBSD: getdate.c,v 1.2 2009/11/22 18:07:39 mbalmer Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -226,7 +226,7 @@
* XXX More undocumented functionality but observed.
*
* Given the weekday find the first matching weekday
- * starting with the weekday of the first day of the the
+ * starting with the weekday of the first day of the
* month and moving into the future.
*/
if (rtm.tm_wday != TMSENTINEL) {
CVS commit: src/lib/libc/sys
Module Name:src Committed By: mbalmer Date: Sun Nov 22 18:05:50 UTC 2009 Modified Files: src/lib/libc/sys: kqueue.2 Log Message: remove one the to much. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libc/sys/kqueue.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/kqueue.2 diff -u src/lib/libc/sys/kqueue.2:1.25 src/lib/libc/sys/kqueue.2:1.26 --- src/lib/libc/sys/kqueue.2:1.25 Sat Oct 24 17:49:58 2009 +++ src/lib/libc/sys/kqueue.2 Sun Nov 22 18:05:50 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: kqueue.2,v 1.25 2009/10/24 17:49:58 christos Exp $ +.\" $NetBSD: kqueue.2,v 1.26 2009/11/22 18:05:50 mbalmer Exp $ .\" .\" Copyright (c) 2000 Jonathan Lemon .\" All rights reserved. @@ -304,7 +304,7 @@ contains the offset from current position to end of file, and may be negative. .It "Fifos, Pipes" -Returns when the there is data to read; +Returns when there is data to read; .Va data contains the number of bytes available. .Pp
CVS commit: src/lib/libc/resolv
Module Name:src
Committed By: mbalmer
Date: Sun Nov 22 18:04:37 UTC 2009
Modified Files:
src/lib/libc/resolv: res_compat.c
Log Message:
the doo doo doo, the daa daa daa...
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/resolv/res_compat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/resolv/res_compat.c
diff -u src/lib/libc/resolv/res_compat.c:1.2 src/lib/libc/resolv/res_compat.c:1.3
--- src/lib/libc/resolv/res_compat.c:1.2 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/resolv/res_compat.c Sun Nov 22 18:04:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: res_compat.c,v 1.2 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: res_compat.c,v 1.3 2009/11/22 18:04:37 mbalmer Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: res_compat.c,v 1.2 2008/04/28 20:23:00 martin Exp $");
+__RCSID("$NetBSD: res_compat.c,v 1.3 2009/11/22 18:04:37 mbalmer Exp $");
#endif
#include
@@ -49,7 +49,7 @@
* Most userland programs use this to set res_options before res_init()
* is called. There are hooks to res_init() to consult the data in this
* structure. The hooks are provided indirectly by the two functions below.
- * We depend on the fact the the first 440 [32 bit machines] bytes are
+ * We depend on the fact the first 440 [32 bit machines] bytes are
* shared between the two structures.
*/
#ifndef __BIND_NOSTATIC
CVS commit: src/share/man/man4
Module Name:src Committed By: mbalmer Date: Sun Nov 22 18:02:23 UTC 2009 Modified Files: src/share/man/man4: puffs.4 Log Message: remove the the double the. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/puffs.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/puffs.4 diff -u src/share/man/man4/puffs.4:1.8 src/share/man/man4/puffs.4:1.9 --- src/share/man/man4/puffs.4:1.8 Sun Apr 13 16:02:33 2008 +++ src/share/man/man4/puffs.4 Sun Nov 22 18:02:22 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: puffs.4,v 1.8 2008/04/13 16:02:33 pooka Exp $ +.\" $NetBSD: puffs.4,v 1.9 2009/11/22 18:02:22 mbalmer Exp $ .\" .\" Copyright (c) 2006 Antti Kantee. All rights reserved. .\" @@ -134,7 +134,7 @@ .Dv PUFFS_KFLAG_ALLOPS is given. .Pp -After a successful mount system call, the the ioctl +After a successful mount system call, the ioctl .Dv PUFFSSTARTOP must be issued through the open device node. The parameter for this ioctl is the following structure:
CVS commit: src/common/lib/libc/arch/x86_64/string
Module Name:src
Committed By: dsl
Date: Sun Nov 22 17:25:47 UTC 2009
Modified Files:
src/common/lib/libc/arch/x86_64/string: bcopy.S
Log Message:
Align to the destination buffer.
This probably costs 1 clock (on modern cpus) in the normal case.
But gives a big benefit when the destination is misaligned.
In particular when the source has the same misalignment - although
that may not be a gain on Nehalem!
Fixes PR/35535
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/x86_64/string/bcopy.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/x86_64/string/bcopy.S
diff -u src/common/lib/libc/arch/x86_64/string/bcopy.S:1.3 src/common/lib/libc/arch/x86_64/string/bcopy.S:1.4
--- src/common/lib/libc/arch/x86_64/string/bcopy.S:1.3 Sat Nov 21 19:52:54 2009
+++ src/common/lib/libc/arch/x86_64/string/bcopy.S Sun Nov 22 17:25:47 2009
@@ -32,14 +32,14 @@
#include
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: bcopy.S,v 1.3 2009/11/21 19:52:54 dsl Exp $")
+ RCSID("$NetBSD: bcopy.S,v 1.4 2009/11/22 17:25:47 dsl Exp $")
#endif
/*
* (ov)bcopy (src,dst,cnt)
* w...@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800
*
- * Hacked about by d...@netnsd.org
+ * Hacked about by d...@netbsd.org
*/
#ifdef MEMCOPY
@@ -55,7 +55,9 @@
movq %rdx,%rcx
#if defined(MEMCOPY) || defined(MEMMOVE)
movq %rdi,%rax /* must return destination address */
+ mov %rdi,%r11 /* for misaligned check */
#else
+ mov %rsi,%r11 /* for misaligned check */
xchgq %rdi,%rsi /* bcopy() has arg order reversed */
#endif
@@ -68,7 +70,7 @@
jz 8f /* j if less than 8 bytes */
lea -8(%rdi,%rdx),%r9 /* target address of last 8 */
- mov -8(%rsi,%rdx),%r10 /* get last bytes */
+ mov -8(%rsi,%rdx),%r10 /* get last word */
#if !defined(NO_OVERLAP)
cmpq %rdx,%r8 /* overlapping? */
jb 10f
@@ -80,16 +82,41 @@
* if %ecx is more than 76.
* AMD might do something similar some day.
*/
+ and $7,%r11 /* destination misaligned ? */
+ jnz 2f
rep
movsq
- mov %r10,(%r9) /* write last bytes */
+ mov %r10,(%r9) /* write last word */
+ ret
+
+/*
+ * Destination misaligned
+ * AMD say it is better to align the destination (not the source).
+ * This will also re-align copies if the source and dest are both
+ * misaligned by the same amount)
+ * (I think Nehalem will use its accelerated copy if the source
+ * and destination have the same alignment.)
+ */
+2:
+ lea -9(%r11,%rdx),%rcx /* post re-alignment count */
+ neg %r11 /* now -1 .. -7 */
+ mov (%rsi),%rdx /* get first word */
+ mov %rdi,%r8 /* target for first word */
+ lea 8(%rsi,%r11),%rsi
+ lea 8(%rdi,%r11),%rdi
+ shr $3,%rcx
+ rep
+ movsq
+ mov %rdx,(%r8) /* write first word */
+ mov %r10,(%r9) /* write last word */
ret
#if !defined(NO_OVERLAP)
/* Must copy backwards.
* Reverse copy is probably easy to code faster than 'rep movds'
- * since that requires (IIRC) an extra clock per iteration.
+ * since that requires (IIRC) an extra clock every 3 iterations (AMD).
* However I don't suppose anything cares that much!
+ * The big cost is the std/cld pair - reputedly 50+ cycles on Netburst P4.
* The copy is aligned with the buffer start (more likely to
* be a multiple of 8 than the end).
*/
@@ -106,7 +133,7 @@
/* Less than 8 bytes to copy, copy by bytes */
/* Intel Nehalem optimise 'rep movsb' for <= 7 bytes (9-15 clocks).
- * For long transfers it is 50+ !
+ * For longer transfers it is 50+ !
*/
8: mov %rdx,%rcx
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: jmmv
Date: Sun Nov 22 17:09:58 UTC 2009
Modified Files:
src/sys/fs/tmpfs: tmpfs_vnops.c
Log Message:
Fix panic when trying to delete a directory entry (hi yamt!) by not
attempting to release a pnbuf that does not exist.
I.e. fixes "mkdir a ; unlink a/.". And actually, this was caught by the
automated tests.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/fs/tmpfs/tmpfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.64 src/sys/fs/tmpfs/tmpfs_vnops.c:1.65
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.64 Sat Oct 17 22:20:56 2009
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Sun Nov 22 17:09:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.64 2009/10/17 22:20:56 njoly Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.65 2009/11/22 17:09:58 jmmv Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.64 2009/10/17 22:20:56 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.65 2009/11/22 17:09:58 jmmv Exp $");
#include
#include
@@ -728,7 +728,10 @@
vrele(dvp);
else
vput(dvp);
- PNBUF_PUT(cnp->cn_pnbuf);
+ if (cnp->cn_flags & HASBUF) {
+ PNBUF_PUT(cnp->cn_pnbuf);
+ cnp->cn_flags &= ~HASBUF;
+ }
return error;
}
CVS commit: src/share/man/man4
Module Name:src Committed By: snj Date: Sun Nov 22 16:50:13 UTC 2009 Modified Files: src/share/man/man4: ale.4 Log Message: Kill space before a period. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/ale.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ale.4 diff -u src/share/man/man4/ale.4:1.3 src/share/man/man4/ale.4:1.4 --- src/share/man/man4/ale.4:1.3 Tue May 5 09:58:40 2009 +++ src/share/man/man4/ale.4 Sun Nov 22 16:50:13 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: ale.4,v 1.3 2009/05/05 09:58:40 cegger Exp $ +.\" $NetBSD: ale.4,v 1.4 2009/11/22 16:50:13 snj Exp $ .\" $OpenBSD: ale.4,v 1.2 2009/02/25 03:15:50 deraadt Exp $ .\" .\" Copyright (c) 2009 Kevin Lo @@ -90,4 +90,4 @@ by .An Christoph Egger .Aq ceg...@netbsd.org -and Kevin Lahey . +and Kevin Lahey.
CVS commit: src/sys/arch/evbarm/gumstix
Module Name:src
Committed By: kiyohara
Date: Sun Nov 22 12:05:14 UTC 2009
Modified Files:
src/sys/arch/evbarm/gumstix: gumstix_machdep.c gumstixvar.h
Log Message:
Move definition 'void gxlcd_cnattach(void)' to gumstixvar.h.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/gumstix/gumstixvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.17 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.18
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.17 Sat Nov 21 08:41:38 2009
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Sun Nov 22 12:05:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_machdep.c,v 1.17 2009/11/21 08:41:38 kiyohara Exp $ */
+/* $NetBSD: gumstix_machdep.c,v 1.18 2009/11/22 12:05:14 kiyohara Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -1104,11 +1104,7 @@
#endif /* NCOM */
#if NLCD > 0
- {
- extern void gxlcd_cnattach(void);
-
- gxlcd_cnattach();
- }
+ gxlcd_cnattach();
#endif
}
Index: src/sys/arch/evbarm/gumstix/gumstixvar.h
diff -u src/sys/arch/evbarm/gumstix/gumstixvar.h:1.4 src/sys/arch/evbarm/gumstix/gumstixvar.h:1.5
--- src/sys/arch/evbarm/gumstix/gumstixvar.h:1.4 Sun Aug 9 07:10:13 2009
+++ src/sys/arch/evbarm/gumstix/gumstixvar.h Sun Nov 22 12:05:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstixvar.h,v 1.4 2009/08/09 07:10:13 kiyohara Exp $ */
+/* $NetBSD: gumstixvar.h,v 1.5 2009/11/22 12:05:14 kiyohara Exp $ */
/*
* Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -80,4 +80,10 @@
extern struct gxpcic_slot_irqs gxpcic_slot_irqs[2];
extern int gxpcic_gpio_reset;
+
+/*
+ * gxlcd
+ */
+void gxlcd_cnattach(void);
+
#endif /* _EVBARM_GUMSTIXVAR_H_ */
CVS commit: src/sys/arch/evbarm/gumstix
Module Name:src
Committed By: kiyohara
Date: Sun Nov 22 12:00:56 UTC 2009
Modified Files:
src/sys/arch/evbarm/gumstix: gxio.c
Log Message:
Add GPIO configuration 'LCD backlight on'.
Remove '' in comment. That GPIO config is power on the Marvell 88W8385.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/gumstix/gxio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/gumstix/gxio.c
diff -u src/sys/arch/evbarm/gumstix/gxio.c:1.11 src/sys/arch/evbarm/gumstix/gxio.c:1.12
--- src/sys/arch/evbarm/gumstix/gxio.c:1.11 Sat Aug 15 10:18:17 2009
+++ src/sys/arch/evbarm/gumstix/gxio.c Sun Nov 22 12:00:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gxio.c,v 1.11 2009/08/15 10:18:17 kiyohara Exp $ */
+/* $NetBSD: gxio.c,v 1.12 2009/11/22 12:00:56 kiyohara Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.11 2009/08/15 10:18:17 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.12 2009/11/22 12:00:56 kiyohara Exp $");
#include "opt_gxio.h"
@@ -124,6 +124,9 @@
/* Bluetooth module configuration */
{ 9, GPIO_ALT_FN_3_OUT }, /* CHOUT<0> */
+ /* LCD configuration */
+ { 17, GPIO_IN }, /* backlight on */
+
/* FFUART configuration */
{ 27, GPIO_ALT_FN_3_OUT }, /* FFRTS */
{ 34, GPIO_ALT_FN_1_IN }, /* FFRXD */
@@ -483,7 +486,7 @@
cfstix_config();
/* However use pxamci. */
pxa2x0_gpio_set_function(111, GPIO_CLR | GPIO_ALT_FN_1_IN);
- /* : Power to Marvell 88W8385??? */
+ /* Power to Marvell 88W8385 */
pxa2x0_gpio_set_function(80, GPIO_OUT | GPIO_SET);
}
@@ -501,7 +504,7 @@
cfstix_config();
- /* : Power to Marvell 88W8385??? */
+ /* Power to Marvell 88W8385 */
pxa2x0_gpio_set_function(80, GPIO_OUT | GPIO_SET);
}
@@ -523,6 +526,6 @@
cfstix_config();
- /* : Power to Marvell 88W8385??? */
+ /* Power to Marvell 88W8385 */
pxa2x0_gpio_set_function(80, GPIO_OUT | GPIO_SET);
}
