CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: mbalmer Date: Tue Jan 17 08:13:42 UTC 2012 Modified Files: src/distrib/sets/lists/man: mi Log Message: Add uts(4) man pages To generate a diff of this commit: cvs rdiff -u -r1.1369 -r1.1370 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1369 src/distrib/sets/lists/man/mi:1.1370 --- src/distrib/sets/lists/man/mi:1.1369 Sun Jan 15 17:33:23 2012 +++ src/distrib/sets/lists/man/mi Tue Jan 17 08:13:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1369 2012/01/15 17:33:23 joerg Exp $ +# $NetBSD: mi,v 1.1370 2012/01/17 08:13:41 mbalmer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1722,6 +1722,7 @@ ./usr/share/man/cat4/ustir.0 man-sys-catman .cat ./usr/share/man/cat4/uthum.0 man-sys-catman .cat ./usr/share/man/cat4/utoppy.0 man-sys-catman .cat +./usr/share/man/cat4/uts.0 man-sys-catman .cat ./usr/share/man/cat4/uvideo.0 man-sys-catman .cat ./usr/share/man/cat4/uvisor.0 man-sys-catman .cat ./usr/share/man/cat4/uvscom.0 man-sys-catman .cat @@ -4505,6 +4506,7 @@ ./usr/share/man/html4/ustir.html man-sys-htmlman html ./usr/share/man/html4/uthum.html man-sys-htmlman html ./usr/share/man/html4/utoppy.html man-sys-htmlman html +./usr/share/man/html4/uts.html man-sys-htmlman html ./usr/share/man/html4/uvideo.html man-sys-htmlman html ./usr/share/man/html4/uvisor.html man-sys-htmlman html ./usr/share/man/html4/uvscom.html man-sys-htmlman html @@ -7215,6 +7217,7 @@ ./usr/share/man/man4/ustir.4 man-sys-man .man ./usr/share/man/man4/uthum.4 man-sys-man .man ./usr/share/man/man4/utoppy.4 man-sys-man .man +./usr/share/man/man4/uts.4 man-sys-man .man ./usr/share/man/man4/uvideo.4 man-sys-man .man ./usr/share/man/man4/uvisor.4 man-sys-man .man ./usr/share/man/man4/uvscom.4 man-sys-man .man
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Jan 17 08:20:58 UTC 2012 Modified Files: src/share/man/man4: ipsec.4 kame_ipsec.4 Log Message: New sentence, new line. Bump date for previous. Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/share/man/man4/ipsec.4 cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/kame_ipsec.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/ipsec.4 diff -u src/share/man/man4/ipsec.4:1.35 src/share/man/man4/ipsec.4:1.36 --- src/share/man/man4/ipsec.4:1.35 Mon Jan 16 16:27:59 2012 +++ src/share/man/man4/ipsec.4 Tue Jan 17 08:20:58 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: ipsec.4,v 1.35 2012/01/16 16:27:59 drochner Exp $ +.\ $NetBSD: ipsec.4,v 1.36 2012/01/17 08:20:58 wiz Exp $ .\ $KAME: ipsec.4,v 1.17 2001/06/27 15:25:10 itojun Exp $ .\ .\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -28,7 +28,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd May 16, 2009 +.Dd January 16, 2012 .Dt IPSEC 4 .Os .Sh NAME @@ -77,10 +77,10 @@ Its specifics and kernel options are des .Xr fast_ipsec 4 manual page. The previous implementation is still supported for a transition -period. See +period. +See .Xr kame_ipsec 4 for details. -.Pp .Ss Kernel interface .Nm is controlled by key management engine and policy engine, @@ -279,10 +279,10 @@ routines from looking into IP payload. .Xr socket 2 , .Xr ipsec_set_policy 3 , .Xr fast_ipsec 4 , -.Xr kame_ipsec 4 , .Xr icmp6 4 , .Xr intro 4 , .Xr ip6 4 , +.Xr kame_ipsec 4 , .Xr racoon 8 , .Xr setkey 8 , .Xr sysctl 8 Index: src/share/man/man4/kame_ipsec.4 diff -u src/share/man/man4/kame_ipsec.4:1.2 src/share/man/man4/kame_ipsec.4:1.3 --- src/share/man/man4/kame_ipsec.4:1.2 Mon Jan 16 16:27:59 2012 +++ src/share/man/man4/kame_ipsec.4 Tue Jan 17 08:20:58 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: kame_ipsec.4,v 1.2 2012/01/16 16:27:59 drochner Exp $ +.\ $NetBSD: kame_ipsec.4,v 1.3 2012/01/17 08:20:58 wiz Exp $ .\ $KAME: ipsec.4,v 1.17 2001/06/27 15:25:10 itojun Exp $ .\ .\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -28,7 +28,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd May 16, 2009 +.Dd January 16, 2012 .Dt KAME_IPSEC 4 .Os .Sh NAME @@ -108,11 +108,11 @@ and .Xr ioctl 2 , .Xr socket 2 , .Xr ipsec_set_policy 3 , -.Xr ipsec 4 , .Xr fast_ipsec 4 , .Xr icmp6 4 , .Xr intro 4 , .Xr ip6 4 , +.Xr ipsec 4 , .Xr racoon 8 , .Xr setkey 8 , .Xr sysctl 8
CVS commit: src/sbin/drvctl
Module Name:src Committed By: wiz Date: Tue Jan 17 08:22:09 UTC 2012 Modified Files: src/sbin/drvctl: drvctl.c Log Message: Add -n to usage. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sbin/drvctl/drvctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/drvctl/drvctl.c diff -u src/sbin/drvctl/drvctl.c:1.15 src/sbin/drvctl/drvctl.c:1.16 --- src/sbin/drvctl/drvctl.c:1.15 Mon Jan 16 19:43:50 2012 +++ src/sbin/drvctl/drvctl.c Tue Jan 17 08:22:09 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: drvctl.c,v 1.15 2012/01/16 19:43:50 pgoyette Exp $ */ +/* $NetBSD: drvctl.c,v 1.16 2012/01/17 08:22:09 wiz Exp $ */ /* * Copyright (c) 2004 @@ -55,7 +55,7 @@ usage(void) fprintf(stderr, Usage: %s -r [-a attribute] busdevice [locator ...]\n %s -d device\n %s [-nt] -l [device]\n - %s -p device [prop]\n + %s [-n] -p device [prop]\n %s -Q device\n %s -R device\n %s -S device\n,
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Jan 17 08:23:40 UTC 2012 Modified Files: src/share/man/man4: wsmouse.4 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/wsmouse.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/wsmouse.4 diff -u src/share/man/man4/wsmouse.4:1.19 src/share/man/man4/wsmouse.4:1.20 --- src/share/man/man4/wsmouse.4:1.19 Tue Jan 17 03:49:19 2012 +++ src/share/man/man4/wsmouse.4 Tue Jan 17 08:23:40 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: wsmouse.4,v 1.19 2012/01/17 03:49:19 christos Exp $ +.\ $NetBSD: wsmouse.4,v 1.20 2012/01/17 08:23:40 wiz Exp $ .\ .\ Copyright (c) 1999 .\ Matthias Drochner. All rights reserved. @@ -27,7 +27,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd October 31, 2006 +.Dd January 17, 2012 .Dt WSMOUSE 4 .Os .Sh NAME
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: martin
Date: Tue Jan 17 09:30:16 UTC 2012
Modified Files:
src/sys/fs/puffs: puffs_vnops.c
Log Message:
Add a few KASSERT() - I have a crash that likely will cause one of them to
fire...
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.162 src/sys/fs/puffs/puffs_vnops.c:1.163
--- src/sys/fs/puffs/puffs_vnops.c:1.162 Fri Nov 18 21:18:50 2011
+++ src/sys/fs/puffs/puffs_vnops.c Tue Jan 17 09:30:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.162 2011/11/18 21:18:50 christos Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.163 2012/01/17 09:30:16 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.162 2011/11/18 21:18:50 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.163 2012/01/17 09:30:16 martin Exp $);
#include sys/param.h
#include sys/buf.h
@@ -1356,11 +1356,16 @@ puffs_vnop_fsync(void *v)
off_t a_offhi;
} */ *ap = v;
PUFFS_MSG_VARS(vn, fsync);
- struct vnode *vp = ap-a_vp;
- struct puffs_node *pn = VPTOPP(vp);
- struct puffs_mount *pmp = MPTOPUFFSMP(vp-v_mount);
+ struct vnode *vp;
+ struct puffs_node *pn;
+ struct puffs_mount *pmp;
int error, dofaf;
+ vp = ap-a_vp;
+ KASSERT(vp != NULL);
+ pn = VPTOPP(vp);
+ KASSERT(pn != NULL);
+ pmp = MPTOPUFFSMP(vp-v_mount);
if (ap-a_flags FSYNC_WAIT) {
mutex_enter(pn-pn_sizemtx);
} else {
CVS commit: src
Module Name:src Committed By: cegger Date: Tue Jan 17 10:47:28 UTC 2012 Modified Files: src/share/man/man9: kauth.9 secmodel_securelevel.9 src/sys/kern: kern_cpu.c src/sys/secmodel/securelevel: secmodel_securelevel.c src/sys/secmodel/suser: secmodel_suser.c src/sys/sys: kauth.h Log Message: fix secmodel implementation of CPU_UCODE. ok wiz@ for the manpages ok elad@ To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/share/man/man9/kauth.9 cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/secmodel_securelevel.9 cvs rdiff -u -r1.53 -r1.54 src/sys/kern/kern_cpu.c cvs rdiff -u -r1.25 -r1.26 \ src/sys/secmodel/securelevel/secmodel_securelevel.c cvs rdiff -u -r1.37 -r1.38 src/sys/secmodel/suser/secmodel_suser.c cvs rdiff -u -r1.67 -r1.68 src/sys/sys/kauth.h 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/man9/kauth.9 diff -u src/share/man/man9/kauth.9:1.95 src/share/man/man9/kauth.9:1.96 --- src/share/man/man9/kauth.9:1.95 Sun Dec 4 23:59:25 2011 +++ src/share/man/man9/kauth.9 Tue Jan 17 10:47:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: kauth.9,v 1.95 2011/12/04 23:59:25 jym Exp $ +.\ $NetBSD: kauth.9,v 1.96 2012/01/17 10:47:27 cegger Exp $ .\ .\ Copyright (c) 2005, 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -25,7 +25,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 8, 2011 +.Dd January 16, 2012 .Dt KAUTH 9 .Os .Sh NAME @@ -770,6 +770,12 @@ platforms. Below is a list of available actions, along with which platforms are affected by each. .Bl -tag -width compact +.It Dv KAUTH_MACHDEP_CPU_UCODE_APPLY +Request to apply a CPU microcode to a CPU. +This is related to the +.Em CPU_UCODE +kernel config +.Xr options 4 . .It Dv KAUTH_MACHDEP_CACHEFLUSH Request to flush the whole CPU cache. Affects Index: src/share/man/man9/secmodel_securelevel.9 diff -u src/share/man/man9/secmodel_securelevel.9:1.11 src/share/man/man9/secmodel_securelevel.9:1.12 --- src/share/man/man9/secmodel_securelevel.9:1.11 Sun Dec 4 21:08:45 2011 +++ src/share/man/man9/secmodel_securelevel.9 Tue Jan 17 10:47:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: secmodel_securelevel.9,v 1.11 2011/12/04 21:08:45 jym Exp $ +.\ $NetBSD: secmodel_securelevel.9,v 1.12 2012/01/17 10:47:27 cegger Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ Copyright (c) 2000 Hugh Graham @@ -26,7 +26,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 4, 2011 +.Dd January 16, 2012 .Dt SECMODEL_SECURELEVEL 9 .Os .Sh NAME @@ -154,6 +154,8 @@ The system clock may not be set backward Per-process coredump name may not be changed. .It Packet filtering and NAT rules may not be altered. +.It +CPU ucode loading is denied on platforms that support it. .El .El .Pp Index: src/sys/kern/kern_cpu.c diff -u src/sys/kern/kern_cpu.c:1.53 src/sys/kern/kern_cpu.c:1.54 --- src/sys/kern/kern_cpu.c:1.53 Fri Jan 13 16:05:15 2012 +++ src/sys/kern/kern_cpu.c Tue Jan 17 10:47:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_cpu.c,v 1.53 2012/01/13 16:05:15 cegger Exp $ */ +/* $NetBSD: kern_cpu.c,v 1.54 2012/01/17 10:47:27 cegger Exp $ */ /*- * Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v 1.53 2012/01/13 16:05:15 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v 1.54 2012/01/17 10:47:27 cegger Exp $); #include opt_cpu_ucode.h @@ -258,11 +258,6 @@ cpuctl_ioctl(dev_t dev, u_long cmd, void NULL, NULL, NULL, NULL); if (error != 0) break; - error = kauth_authorize_system(l-l_cred, - KAUTH_SYSTEM_CPU, KAUTH_REQ_SYSTEM_CPU_UCODE_APPLY, - data, NULL, NULL); - if (error != 0) - break; error = cpu_ucode_apply(data); break; #endif Index: src/sys/secmodel/securelevel/secmodel_securelevel.c diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.25 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.26 --- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.25 Fri Jan 13 16:05:15 2012 +++ src/sys/secmodel/securelevel/secmodel_securelevel.c Tue Jan 17 10:47:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: secmodel_securelevel.c,v 1.25 2012/01/13 16:05:15 cegger Exp $ */ +/* $NetBSD: secmodel_securelevel.c,v 1.26 2012/01/17 10:47:27 cegger Exp $ */ /*- * Copyright (c) 2006 Elad Efrat e...@netbsd.org * All rights reserved. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: secmodel_securelevel.c,v 1.25 2012/01/13 16:05:15 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: secmodel_securelevel.c,v 1.26 2012/01/17 10:47:27 cegger Exp $); #ifdef _KERNEL_OPT #include opt_insecure.h @@ -484,8 +484,8
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Tue Jan 17 10:56:56 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: db_trace.c Log Message: Remove comment that shouldn't have crept in. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/hppa/db_trace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/db_trace.c diff -u src/sys/arch/hppa/hppa/db_trace.c:1.10 src/sys/arch/hppa/hppa/db_trace.c:1.11 --- src/sys/arch/hppa/hppa/db_trace.c:1.10 Mon Feb 28 21:24:25 2011 +++ src/sys/arch/hppa/hppa/db_trace.c Tue Jan 17 10:56:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: db_trace.c,v 1.10 2011/02/28 21:24:25 skrll Exp $ */ +/* $NetBSD: db_trace.c,v 1.11 2012/01/17 10:56:56 skrll Exp $ */ /* $OpenBSD: db_interface.c,v 1.16 2001/03/22 23:31:45 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_trace.c,v 1.10 2011/02/28 21:24:25 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: db_trace.c,v 1.11 2012/01/17 10:56:56 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -129,14 +129,6 @@ db_stack_trace_print(db_expr_t addr, boo db_printsym(pc, DB_STGY_PROC, pr); pr(\n); - /* XXX NH - unwind info here */ - /* aue = ue_find(pc); */ - - /* - * get rp? - * fp -= ue_total_frame_size(aue) - */ - /* * if a terminal frame then report the trapframe and continue * after it (if not the last one).
CVS commit: src/sys/arch/hppa/hppa
Module Name:src
Committed By: skrll
Date: Tue Jan 17 12:08:43 UTC 2012
Modified Files:
src/sys/arch/hppa/hppa: db_disasm.c
Log Message:
Add some space to the output.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/hppa/db_disasm.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/hppa/hppa/db_disasm.c
diff -u src/sys/arch/hppa/hppa/db_disasm.c:1.13 src/sys/arch/hppa/hppa/db_disasm.c:1.14
--- src/sys/arch/hppa/hppa/db_disasm.c:1.13 Mon Jan 16 09:01:35 2012
+++ src/sys/arch/hppa/hppa/db_disasm.c Tue Jan 17 12:08:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.13 2012/01/16 09:01:35 skrll Exp $ */
+/* $NetBSD: db_disasm.c,v 1.14 2012/01/17 12:08:43 skrll Exp $ */
/* $OpenBSD: db_disasm.c,v 1.9 2000/04/18 20:02:45 mickey Exp $ */
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.13 2012/01/16 09:01:35 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.14 2012/01/17 12:08:43 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1296,7 +1296,7 @@ iExInit(void)
int
addDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf(%s\t%%r%d,%%r%d,%%r%d,addDCond(Cond4(w)),
+ db_printf(%s\t%%r%d, %%r%d, %%r%d,addDCond(Cond4(w)),
Rsa(w),Rsb(w),Rtc(w));
return (1);
}
@@ -1307,9 +1307,9 @@ unitDasm(const struct inst *i, OFS ofs,
{
db_printf(unitDCond(Cond4(w)));
if (Match(dcor) || Match(idcor))
- db_printf(\t%%r%d,%%r%d,Rsb(w),Rtc(w));
+ db_printf(\t%%r%d, %%r%d,Rsb(w),Rtc(w));
else
- db_printf(\t%%r%d,%%r%d,%%r%d,Rsa(w),Rsb(w),Rtc(w));
+ db_printf(\t%%r%d, %%r%d, %%r%d,Rsa(w),Rsb(w),Rtc(w));
return (1);
}
@@ -1318,10 +1318,10 @@ int
iaDasm(const struct inst *i, OFS ofs, union insn w)
{
if (Match(addi))
- db_printf(%s\t%d,%%r%d,%%r%d,
+ db_printf(%s\t%d, %%r%d, %%r%d,
addDCond(Cond4(w)),Im11(w),Rsb(w),Rta(w));
else
- db_printf(%s\t%d,%%r%d,%%r%d,
+ db_printf(%s\t%d, %%r%d, %%r%d,
subDCond(Cond4(w)),Im11(w),Rsb(w),Rta(w));
return (1);
}
@@ -1331,10 +1331,10 @@ int
shdDasm(const struct inst *i, OFS ofs, union insn w)
{
if (Match(vshd))
- db_printf(%s\t%%r%d,%%r%d,%%r%d,
+ db_printf(%s\t%%r%d, %%r%d, %%r%d,
edDCond(Cond(w)), Rsa(w),Rsb(w),Rtc(w));
else
- db_printf(%s\t%%r%d,%%r%d,%d,%%r%d,
+ db_printf(%s\t%%r%d, %%r%d, %d, %%r%d,
edDCond(Cond(w)),Rsa(w),Rsb(w),31-Imd5(w),Rtc(w));
return (1);
}
@@ -1343,7 +1343,7 @@ shdDasm(const struct inst *i, OFS ofs, u
int
extrDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf(%s\t%%r%d,%d,%d,%%r%d,
+ db_printf(%s\t%%r%d, %d, %d, %%r%d,
edDCond(Cond(w)),Rsb(w),Imd5(w),32 - Rsc(w),Rta(w));
return (1);
}
@@ -1353,7 +1353,7 @@ extrDasm(const struct inst *i, OFS ofs,
int
vextrDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf(%s\t%%r%d,%d,%%r%d,
+ db_printf(%s\t%%r%d, %d, %%r%d,
edDCond(Cond(w)),Rsb(w),32 - Rsc(w),Rta(w));
return (1);
}
@@ -1363,7 +1363,7 @@ vextrDasm(const struct inst *i, OFS ofs,
int
depDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf(%s\t%%r%d,%d,%d,%%r%d,
+ db_printf(%s\t%%r%d, %d, %d, %%r%d,
edDCond(Cond(w)),Rsa(w),31 - Imd5(w),32 - Rsc(w),Rtb(w));
return (1);
}
@@ -1373,7 +1373,7 @@ depDasm(const struct inst *i, OFS ofs, u
int
vdepDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf(%s\t%%r%d,%d,%%r%d,
+ db_printf(%s\t%%r%d, %d, %%r%d,
edDCond(Cond(w)),Rsa(w),32 - Rsc(w),Rtb(w));
return (1);
}
@@ -1383,7 +1383,7 @@ vdepDasm(const struct inst *i, OFS ofs,
int
depiDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf(%s\t%d,%d,%d,%%r%d,
+ db_printf(%s\t%d, %d, %d, %%r%d,
edDCond(Cond(w)),Ima5(w),31 - Imd5(w),32 - Imc5A(w),Rtb(w));
return (1);
}
@@ -1392,7 +1392,7 @@ depiDasm(const struct inst *i, OFS ofs,
int
vdepiDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf(%s\t%d,%d,%%r%d,edDCond(Cond(w)),Ima5(w),32-Imc5A(w),Rtb(w));
+ db_printf(%s\t%d, %d, %%r%d,edDCond(Cond(w)),Ima5(w),32-Imc5A(w),Rtb(w));
return (1);
}
@@ -1517,14 +1517,14 @@ ldDasm(const struct inst *i, OFS ofs, un
s[0] = '\0';
if (Rsb(w) == 0 Match(ldo)) {
- db_printf(ldi\t%s%X,%%r%d,s,d,Rta(w));
+ db_printf(ldi\t%s%X, %%r%d,s,d,Rta(w));
return (1);
}
db_printf(%s\t%s%s%X,i-mnem,(d 2048? R':), s, d);
if (Dss(w))
- db_printf((%%sr%d,%%r%d),%%r%d,Dss(w),Rsb(w),Rta(w));
+ db_printf((%%sr%d, %%r%d), %%r%d,Dss(w),Rsb(w),Rta(w));
else
- db_printf((%%r%d),%%r%d,Rsb(w),Rta(w));
+ db_printf((%%r%d), %%r%d,Rsb(w),Rta(w));
return (1);
}
@@ -1535,7 +1535,7 @@ stDasm(const struct inst *i, OFS ofs, un
int d = Disp(w);
char s[2];
- db_printf(\t%%r%d,,Rta(w));
+ db_printf(\t%%r%d, ,Rta(w));
s[1] = '\0';
if (d 0) {
@@ -1547,7 +1547,7 @@ stDasm(const struct inst *i, OFS ofs, un
db_printf(%s%s%X, (d 2048? R':), s, d);
if
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Tue Jan 17 12:32:52 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: db_disasm.c Log Message: Fix the symbol lookup on branches, etc. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/hppa/db_disasm.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/hppa/hppa/db_disasm.c diff -u src/sys/arch/hppa/hppa/db_disasm.c:1.14 src/sys/arch/hppa/hppa/db_disasm.c:1.15 --- src/sys/arch/hppa/hppa/db_disasm.c:1.14 Tue Jan 17 12:08:43 2012 +++ src/sys/arch/hppa/hppa/db_disasm.c Tue Jan 17 12:32:52 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: db_disasm.c,v 1.14 2012/01/17 12:08:43 skrll Exp $ */ +/* $NetBSD: db_disasm.c,v 1.15 2012/01/17 12:32:52 skrll Exp $ */ /* $OpenBSD: db_disasm.c,v 1.9 2000/04/18 20:02:45 mickey Exp $ */ @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.14 2012/01/17 12:08:43 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.15 2012/01/17 12:32:52 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -2233,7 +2233,7 @@ db_disasm(vaddr_t loc, bool flag) const struct majoropcode *m; u_int ext; union insn instruct; - OFS ofs = 0; + OFS ofs = loc; iExInit();
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Tue Jan 17 15:38:44 UTC 2012 Modified Files: src/doc: TODO.clang Log Message: ah_regdomain.c doesn't use -Wno-error anymore. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/doc/TODO.clang Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.clang diff -u src/doc/TODO.clang:1.3 src/doc/TODO.clang:1.4 --- src/doc/TODO.clang:1.3 Mon Aug 15 10:58:54 2011 +++ src/doc/TODO.clang Tue Jan 17 15:38:44 2012 @@ -1,4 +1,4 @@ -$NetBSD: TODO.clang,v 1.3 2011/08/15 10:58:54 wiz Exp $ +$NetBSD: TODO.clang,v 1.4 2012/01/17 15:38:44 joerg Exp $ Hacks for the clang integration --- @@ -7,9 +7,6 @@ Hacks for the clang integration to compensate for the missing .code16 support in LLVM MC and slightly different encoding of the lock stubs. -ah_regdomain.c in the kernel currently requires -Wno-error due to -http://llvm.org/bugs/show_bug.cgi?id=10030. - Various places use NOCLANGERROR or CWARNFLAGS.clang to disable errors or warnings.
CVS commit: src/sys/dev
Module Name:src Committed By: nonaka Date: Tue Jan 17 15:43:55 UTC 2012 Modified Files: src/sys/dev: TODO.audiomp Log Message: zaudio(4) works fine for me. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/TODO.audiomp 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/TODO.audiomp diff -u src/sys/dev/TODO.audiomp:1.17 src/sys/dev/TODO.audiomp:1.18 --- src/sys/dev/TODO.audiomp:1.17 Sun Dec 11 15:15:25 2011 +++ src/sys/dev/TODO.audiomp Tue Jan 17 15:43:54 2012 @@ -15,7 +15,7 @@ arch/sgimips/hpc/haltwo.c done arch/sgimips/mace/mavb.c done arch/sparc/dev/audioamd.c done arch/x68k/dev/vs.c done port-x68k -arch/zaurus/dev/zaudio.c done does not work, not confirmed to be working before. no sound, no crash. +arch/zaurus/dev/zaudio.c done port-zaurus dev/bluetooth/btsco.c done port-i386 dev/ebus/cs4231_ebus.c done port-sparc64 dev/ic/interwave.c done
CVS commit: src/sys/arch/zaurus/zaurus
Module Name:src Committed By: nonaka Date: Tue Jan 17 15:48:33 UTC 2012 Modified Files: src/sys/arch/zaurus/zaurus: kloader_zaurus.S Log Message: fix struct kloader_bootinfo address. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/zaurus/kloader_zaurus.S 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/zaurus/zaurus/kloader_zaurus.S diff -u src/sys/arch/zaurus/zaurus/kloader_zaurus.S:1.1 src/sys/arch/zaurus/zaurus/kloader_zaurus.S:1.2 --- src/sys/arch/zaurus/zaurus/kloader_zaurus.S:1.1 Wed Mar 11 09:02:05 2009 +++ src/sys/arch/zaurus/zaurus/kloader_zaurus.S Tue Jan 17 15:48:33 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: kloader_zaurus.S,v 1.1 2009/03/11 09:02:05 nonaka Exp $ */ +/* $NetBSD: kloader_zaurus.S,v 1.2 2012/01/17 15:48:33 nonaka Exp $ */ /*- - * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org + * Copyright (c) 2009-2012 NONAKA Kimihiro non...@netbsd.org * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,9 +56,9 @@ */ .global _C_LABEL(kloader_zaurus_boot) _C_LABEL(kloader_zaurus_boot): - mov r0, r12 /* r12: kbi */ - bic r12, r12, #0xff00 - orr r12, r12, #0xa000 + mov sp, r0 /* sp: kbi */ + bic sp, sp, #0xff00 /* clear upper 8 bits */ + orr sp, sp, #0xa000 /* OR in physical base address */ /* We will go ahead and disable the MMU here. */ adr r8, .Lmmuoff @@ -105,15 +105,13 @@ _C_LABEL(kloader_zaurus_boot): bl .Lputcrlf #endif - /* set temporary stack pointer */ + /* Set kernel entry */ + ldr r0, [sp] + + /* Set temporary stack pointer */ ldr sp, .Lstack_addr /* Jump to kernel entry */ -#if 0 /* XXX */ - ldr r0, [r12] /* kbi-entry */ -#else - ldr r0, .Lstart_addr -#endif mov pc, r0 99: b 99b @@ -121,9 +119,6 @@ _C_LABEL(kloader_zaurus_boot): .Lstack_addr: .word 0xa0004000 -.Lstart_addr: - .word 0xa020 - #ifdef PROGRESS .Lprogress: mov r0, #0x2e /*'.'*/
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Jan 17 15:51:56 UTC 2012
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/lib: Makefile
src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMRuntimeDyld: Makefile
Added Files:
src/external/bsd/llvm/lib/libLLVMMipsAsmParser: Makefile
src/tools/llvm-lib/libLLVMMipsAsmParser: Makefile
Log Message:
Update LLVM/Clang snapshot to r148262 for some bugfixes.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/llvm/lib/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/llvm/lib/libLLVMMipsAsmParser/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libLLVMMipsAsmParser/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.28 src/external/bsd/llvm/Makefile.inc:1.29
--- src/external/bsd/llvm/Makefile.inc:1.28 Wed Jan 11 23:24:46 2012
+++ src/external/bsd/llvm/Makefile.inc Tue Jan 17 15:51:55 2012
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.28 2012/01/11 23:24:46 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.29 2012/01/17 15:51:55 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include bsd.own.mk
-LLVM_REVISION= 147888
-CLANG_REVISION= 147888
+LLVM_REVISION= 148262
+CLANG_REVISION= 148262
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
Index: src/external/bsd/llvm/lib/Makefile
diff -u src/external/bsd/llvm/lib/Makefile:1.17 src/external/bsd/llvm/lib/Makefile:1.18
--- src/external/bsd/llvm/lib/Makefile:1.17 Thu Nov 3 17:52:53 2011
+++ src/external/bsd/llvm/lib/Makefile Tue Jan 17 15:51:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2011/11/03 17:52:53 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2012/01/17 15:51:55 joerg Exp $
.include bsd.own.mk
@@ -42,6 +42,7 @@ SUBDIR+= \
libLLVMARMTargetInfo
SUBDIR+= \
+ libLLVMMipsAsmParser \
libLLVMMipsAsmPrinter \
libLLVMMipsMCTargetDesc \
libLLVMMipsTargetInfo
Index: src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.13 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.14
--- src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.13 Wed Jan 11 23:24:47 2012
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile Tue Jan 17 15:51:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/01/11 23:24:47 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/01/17 15:51:55 joerg Exp $
LIB= LLVMCodeGen
@@ -63,6 +63,7 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
MachinePassRegistry.cpp \
MachineRegisterInfo.cpp \
MachineSSAUpdater.cpp \
+ MachineScheduler.cpp \
MachineSink.cpp \
MachineVerifier.cpp \
OcamlGC.cpp \
@@ -76,6 +77,7 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
ProcessImplicitDefs.cpp \
PrologEpilogInserter.cpp \
PseudoSourceValue.cpp \
+ RegAllocBase.cpp \
RegAllocBasic.cpp \
RegAllocFast.cpp \
RegAllocGreedy.cpp \
Index: src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.2 src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.3
--- src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.2 Wed Jul 13 23:48:30 2011
+++ src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile Tue Jan 17 15:51:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/07/13 23:48:30 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/17 15:51:56 joerg Exp $
LIB= LLVMRuntimeDyld
@@ -7,6 +7,7 @@ LIB= LLVMRuntimeDyld
.PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/RuntimeDyld
SRCS+= RuntimeDyld.cpp \
+ RuntimeDyldELF.cpp \
RuntimeDyldMachO.cpp
.include bsd.lib.mk
Added files:
Index: src/external/bsd/llvm/lib/libLLVMMipsAsmParser/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMMipsAsmParser/Makefile:1.1
--- /dev/null Tue Jan 17 15:51:56 2012
+++ src/external/bsd/llvm/lib/libLLVMMipsAsmParser/Makefile Tue Jan 17 15:51:55 2012
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2012/01/17 15:51:55 joerg Exp $
+
+LIB= LLVMMipsAsmParser
+
+.include bsd.init.mk
+
+MIPS_OBJDIR!= cd ${.CURDIR}/../libLLVMMipsCodeGen ${PRINTOBJDIR}
+CPPFLAGS+= -I${MIPS_OBJDIR} -I${LLVM_SRCDIR}/lib/Target/Mips
+
+.PATH: ${LLVM_SRCDIR}/lib/Target/Mips/AsmParser
+
+SRCS+= MipsAsmParser.cpp
+
+.if defined(HOSTLIB)
+.include bsd.hostlib.mk
+.else
+.include bsd.lib.mk
+.endif
Index: src/tools/llvm-lib/libLLVMMipsAsmParser/Makefile
diff -u /dev/null src/tools/llvm-lib/libLLVMMipsAsmParser/Makefile:1.1
--- /dev/null Tue Jan 17 15:51:56 2012
+++ src/tools/llvm-lib/libLLVMMipsAsmParser/Makefile Tue Jan 17 15:51:55 2012
@@ -0,0 +1,3 @@
CVS commit: src/external/bsd/llvm/config/clang/Basic
Module Name:src Committed By: joerg Date: Tue Jan 17 15:53:25 UTC 2012 Modified Files: src/external/bsd/llvm/config/clang/Basic: Version.inc Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/config/clang/Basic/Version.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/llvm/config/clang/Basic/Version.inc diff -u src/external/bsd/llvm/config/clang/Basic/Version.inc:1.1 src/external/bsd/llvm/config/clang/Basic/Version.inc:1.2 --- src/external/bsd/llvm/config/clang/Basic/Version.inc:1.1 Sun Feb 6 01:13:49 2011 +++ src/external/bsd/llvm/config/clang/Basic/Version.inc Tue Jan 17 15:53:24 2012 @@ -1,6 +1,6 @@ -#define CLANG_VERSION 2.9 -#define CLANG_VERSION_MAJOR 2 -#define CLANG_VERSION_MINOR 9 +#define CLANG_VERSION 3.1 +#define CLANG_VERSION_MAJOR 3 +#define CLANG_VERSION_MINOR 1 #if 0 #define CLANG_VERSION_PATCHLEVEL #endif
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:03:37 UTC 2012 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: +gsip(4) To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/sys/arch/sparc64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.147 src/sys/arch/sparc64/conf/GENERIC:1.148 --- src/sys/arch/sparc64/conf/GENERIC:1.147 Sun Dec 25 10:37:14 2011 +++ src/sys/arch/sparc64/conf/GENERIC Tue Jan 17 16:03:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.147 2011/12/25 10:37:14 martin Exp $ +# $NetBSD: GENERIC,v 1.148 2012/01/17 16:03:37 jakllsch Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc64/conf/std.sparc64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.147 $ +#ident GENERIC-$Revision: 1.148 $ maxusers 64 @@ -507,6 +507,7 @@ fpa* at pci? dev ? function ? # DEC DEFP fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet gem* at sbus? slot ? offset ? +gsip* at pci? dev ? function ? # National Semiconductor DP83820 GigE # XXX lacks bus_dmamap_sync() #le* at pci? dev ? function ? # PCnet-PCI Ethernet # XXX uses vtophys()
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:14:47 UTC 2012 Modified Files: src/sys/dev/ic: nslm7xvar.h Log Message: Include sysmonvar.h for envsys types. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/nslm7xvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/nslm7xvar.h diff -u src/sys/dev/ic/nslm7xvar.h:1.27 src/sys/dev/ic/nslm7xvar.h:1.28 --- src/sys/dev/ic/nslm7xvar.h:1.27 Mon Feb 8 21:42:01 2010 +++ src/sys/dev/ic/nslm7xvar.h Tue Jan 17 16:14:47 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: nslm7xvar.h,v 1.27 2010/02/08 21:42:01 pgoyette Exp $ */ +/* $NetBSD: nslm7xvar.h,v 1.28 2012/01/17 16:14:47 jakllsch Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -32,6 +32,8 @@ #ifndef _DEV_ISA_NSLM7XVAR_H_ #define _DEV_ISA_NSLM7XVAR_H_ +#include dev/sysmon/sysmonvar.h + /* * National Semiconductor LM78/79/81 registers. */
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Tue Jan 17 16:27:15 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: sqlite-3.7.10 out. To generate a diff of this commit: cvs rdiff -u -r1.896 -r1.897 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.896 src/doc/3RDPARTY:1.897 --- src/doc/3RDPARTY:1.896 Mon Jan 16 22:44:15 2012 +++ src/doc/3RDPARTY Tue Jan 17 16:27:15 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.896 2012/01/16 22:44:15 jmmv Exp $ +# $NetBSD: 3RDPARTY,v 1.897 2012/01/17 16:27:15 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1007,7 +1007,7 @@ original. Package: sqlite Version: pre-3.6.9 snapshot -Current Vers: 3.6.8 +Current Vers: 3.7.10 Maintainer: Richard Hipp d...@sqlite.org Home Page: http://www.sqlite.org Responsible: joerg
CVS commit: src/sbin/newfs_lfs
Module Name:src
Committed By: perseant
Date: Tue Jan 17 16:27:19 UTC 2012
Modified Files:
src/sbin/newfs_lfs: make_lfs.c
Log Message:
Use an even smaller segment size when creating a very small filesystem.
This allows the lfs_renamerace_dirs case of the t_renamerace test to
fail correctly, rather than with a bogus file system full error as it
has since rev 1.135 of sys/ufs/lfs/lfs.h.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sbin/newfs_lfs/make_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_lfs/make_lfs.c
diff -u src/sbin/newfs_lfs/make_lfs.c:1.16 src/sbin/newfs_lfs/make_lfs.c:1.17
--- src/sbin/newfs_lfs/make_lfs.c:1.16 Tue Feb 16 23:20:30 2010
+++ src/sbin/newfs_lfs/make_lfs.c Tue Jan 17 16:27:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: make_lfs.c,v 1.16 2010/02/16 23:20:30 mlelstv Exp $ */
+/* $NetBSD: make_lfs.c,v 1.17 2012/01/17 16:27:19 perseant Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = @(#)lfs.c 8.5 (Berkeley) 5/24/95;
#else
-__RCSID($NetBSD: make_lfs.c,v 1.16 2010/02/16 23:20:30 mlelstv Exp $);
+__RCSID($NetBSD: make_lfs.c,v 1.17 2012/01/17 16:27:19 perseant Exp $);
#endif
#endif /* not lint */
@@ -488,7 +488,7 @@ make_lfs(int devfd, uint secsize, struct
if (fs-lfs_resvseg MIN_RESV_SEGS)
fs-lfs_resvseg = MIN_RESV_SEGS;
- if(fs-lfs_nseg fs-lfs_minfreeseg + 1
+ if(fs-lfs_nseg (3 * CM_MAG_NUM * fs-lfs_minfreeseg) / CM_MAG_DEN + 1
|| fs-lfs_nseg LFS_MIN_SBINTERVAL + 1)
{
if(seg_size == 0 ssize (bsize1)) {
@@ -510,6 +510,8 @@ make_lfs(int devfd, uint secsize, struct
size %d and block size %d;\nplease decrease the
segment size.\n, ssize, fs-lfs_bsize);
}
+ if(warned_segtoobig)
+ fprintf(stderr,Using segment size %d.\n, ssize);
/*
* Now that we've determined what we're going to do, announce it
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:28:34 UTC 2012 Modified Files: src/sys/dev/isa: wbsio.c Log Message: Add NULL pmf handlers. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/isa/wbsio.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/isa/wbsio.c diff -u src/sys/dev/isa/wbsio.c:1.3 src/sys/dev/isa/wbsio.c:1.4 --- src/sys/dev/isa/wbsio.c:1.3 Wed May 18 01:03:15 2011 +++ src/sys/dev/isa/wbsio.c Tue Jan 17 16:28:33 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: wbsio.c,v 1.3 2011/05/18 01:03:15 dyoung Exp $ */ +/* $NetBSD: wbsio.c,v 1.4 2012/01/17 16:28:33 jakllsch Exp $ */ /* $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2008 Mark Kettenis kette...@openbsd.org @@ -216,6 +216,9 @@ wbsio_attach(device_t parent, device_t s /* Escape from configuration mode */ wbsio_conf_disable(sc-sc_iot, sc-sc_ioh); + if (!pmf_device_register(self, NULL, NULL)) + aprint_error_dev(self, couldn't establish power handler\n); + if (iobase == 0) return;
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: jakllsch
Date: Tue Jan 17 16:32:04 UTC 2012
Modified Files:
src/sys/dev/isa: wbsio.c
Log Message:
Add and enable detachment and child detachment functions.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/isa/wbsio.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/isa/wbsio.c
diff -u src/sys/dev/isa/wbsio.c:1.4 src/sys/dev/isa/wbsio.c:1.5
--- src/sys/dev/isa/wbsio.c:1.4 Tue Jan 17 16:28:33 2012
+++ src/sys/dev/isa/wbsio.c Tue Jan 17 16:32:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.4 2012/01/17 16:28:33 jakllsch Exp $ */
+/* $NetBSD: wbsio.c,v 1.5 2012/01/17 16:32:03 jakllsch Exp $ */
/* $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis kette...@openbsd.org
@@ -69,10 +69,12 @@ struct wbsio_softc {
int wbsio_probe(device_t, cfdata_t, void *);
void wbsio_attach(device_t, device_t, void *);
+int wbsio_detach(device_t, int);
+void wbsio_childdet(device_t, device_t);
int wbsio_print(void *, const char *);
-CFATTACH_DECL_NEW(wbsio, sizeof(struct wbsio_softc),
-wbsio_probe, wbsio_attach, NULL, NULL);
+CFATTACH_DECL2_NEW(wbsio, sizeof(struct wbsio_softc),
+wbsio_probe, wbsio_attach, wbsio_detach, NULL, NULL, wbsio_childdet);
static __inline void
wbsio_conf_enable(bus_space_tag_t iot, bus_space_handle_t ioh)
@@ -228,6 +230,24 @@ wbsio_attach(device_t parent, device_t s
}
int
+wbsio_detach(device_t self, int flags)
+{
+ int rc;
+
+ if ((rc = config_detach_children(self, flags)) != 0)
+ return rc;
+ bus_space_unmap(sc-sc_iot, sc-sc_ioh, WBSIO_IOSIZE);
+ pmf_device_deregister(self);
+ return 0;
+}
+
+void
+wbsio_childdet(device_t self, device_t child)
+{
+ return;
+}
+
+int
wbsio_print(void *aux, const char *pnp)
{
struct isa_attach_args *ia = aux;
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: jakllsch
Date: Tue Jan 17 16:34:52 UTC 2012
Modified Files:
src/sys/dev/isa: wbsio.c
Log Message:
Add module glue.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/wbsio.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/isa/wbsio.c
diff -u src/sys/dev/isa/wbsio.c:1.5 src/sys/dev/isa/wbsio.c:1.6
--- src/sys/dev/isa/wbsio.c:1.5 Tue Jan 17 16:32:03 2012
+++ src/sys/dev/isa/wbsio.c Tue Jan 17 16:34:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.5 2012/01/17 16:32:03 jakllsch Exp $ */
+/* $NetBSD: wbsio.c,v 1.6 2012/01/17 16:34:52 jakllsch Exp $ */
/* $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis kette...@openbsd.org
@@ -23,6 +23,7 @@
#include sys/param.h
#include sys/device.h
#include sys/kernel.h
+#include sys/module.h
#include sys/systm.h
#include sys/bus.h
@@ -261,3 +262,32 @@ wbsio_print(void *aux, const char *pnp)
ia-ia_io[0].ir_size - 1);
return (UNCONF);
}
+
+MODULE(MODULE_CLASS_DRIVER, wbsio, );
+
+#ifdef _MODULE
+#include ioconf.c
+#endif
+
+static int
+wbsio_modcmd(modcmd_t cmd, void *opaque)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ return config_init_component(cfdriver_ioconf_wbsio,
+ cfattach_ioconf_wbsio, cfdata_ioconf_wbsio);
+#else
+ return 0;
+#endif
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ return config_fini_component(cfdriver_ioconf_wbsio,
+ cfattach_ioconf_wbsio, cfdata_ioconf_wbsio);
+#else
+ return 0;
+#endif
+ default:
+ return ENOTTY;
+ }
+}
CVS commit: src/sys
Module Name:src
Committed By: jakllsch
Date: Tue Jan 17 16:50:08 UTC 2012
Modified Files:
src/sys/dev/isa: lm_isa.c
Added Files:
src/sys/dev/isa: lm_isa_common.c lm_isa_common_var.h lm_wbsio.c
src/sys/modules/lm: Makefile
src/sys/modules/lm_isa: Makefile lm_isa.ioconf
src/sys/modules/lm_isa_common: Makefile
src/sys/modules/lm_wbsio: Makefile lm_wbsio.ioconf
src/sys/modules/wbsio: Makefile wbsio.ioconf
Log Message:
Modularize lm_isa and lm_wbsio, splitting the common part out
into a 3rd module. Add wbsio module too.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/isa/lm_isa.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/isa/lm_isa_common.c \
src/sys/dev/isa/lm_isa_common_var.h src/sys/dev/isa/lm_wbsio.c
cvs rdiff -u -r0 -r1.1 src/sys/modules/lm/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/lm_isa/Makefile \
src/sys/modules/lm_isa/lm_isa.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/lm_isa_common/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/lm_wbsio/Makefile \
src/sys/modules/lm_wbsio/lm_wbsio.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/wbsio/Makefile \
src/sys/modules/wbsio/wbsio.ioconf
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/isa/lm_isa.c
diff -u src/sys/dev/isa/lm_isa.c:1.23 src/sys/dev/isa/lm_isa.c:1.24
--- src/sys/dev/isa/lm_isa.c:1.23 Sun Feb 21 05:16:29 2010
+++ src/sys/dev/isa/lm_isa.c Tue Jan 17 16:50:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_isa.c,v 1.23 2010/02/21 05:16:29 cnst Exp $ */
+/* $NetBSD: lm_isa.c,v 1.24 2012/01/17 16:50:07 jakllsch Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,12 +30,13 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lm_isa.c,v 1.23 2010/02/21 05:16:29 cnst Exp $);
+__KERNEL_RCSID(0, $NetBSD: lm_isa.c,v 1.24 2012/01/17 16:50:07 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/kernel.h
#include sys/device.h
+#include sys/module.h
#include sys/conf.h
#include sys/bus.h
@@ -43,121 +44,36 @@ __KERNEL_RCSID(0, $NetBSD: lm_isa.c,v 1
#include dev/isa/isareg.h
#include dev/isa/isavar.h
-#include dev/sysmon/sysmonvar.h
-
-#include dev/ic/nslm7xvar.h
-
-int lm_isa_match(device_t, cfdata_t, void *);
-void lm_isa_attach(device_t, device_t, void *);
-int lm_isa_detach(device_t, int);
-
-uint8_t lm_isa_readreg(struct lm_softc *, int);
-void lm_isa_writereg(struct lm_softc *, int, int);
-
-struct lm_isa_softc {
- struct lm_softc lmsc;
- bus_space_tag_t lm_iot;
- bus_space_handle_t lm_ioh;
-};
+#include dev/isa/lm_isa_common_var.h
CFATTACH_DECL_NEW(lm_isa, sizeof(struct lm_isa_softc),
lm_isa_match, lm_isa_attach, lm_isa_detach, NULL);
-CFATTACH_DECL_NEW(lm_wbsio, sizeof(struct lm_isa_softc),
-lm_isa_match, lm_isa_attach, lm_isa_detach, NULL);
-
-int
-lm_isa_match(device_t parent, cfdata_t match, void *aux)
-{
- bus_space_handle_t ioh;
- struct isa_attach_args *ia = aux;
- struct lm_isa_softc sc;
- int rv;
-
- /* Must supply an address */
- if (ia-ia_nio 1)
- return 0;
-
- if (ISA_DIRECT_CONFIG(ia))
- return 0;
-
- if (ia-ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
- return 0;
-
- if (bus_space_map(ia-ia_iot, ia-ia_io[0].ir_addr, 8, 0, ioh))
- return 0;
-
-
- /* Bus independent probe */
- sc.lm_iot = ia-ia_iot;
- sc.lm_ioh = ioh;
- sc.lmsc.lm_writereg = lm_isa_writereg;
- sc.lmsc.lm_readreg = lm_isa_readreg;
- rv = lm_probe(sc.lmsc);
-
- bus_space_unmap(ia-ia_iot, ioh, 8);
-
- if (rv) {
- ia-ia_nio = 1;
- ia-ia_io[0].ir_size = 8;
-
- ia-ia_niomem = 0;
- ia-ia_nirq = 0;
- ia-ia_ndrq = 0;
- }
-
- return rv;
-}
+MODULE(MODULE_CLASS_DRIVER, lm_isa, lm_isa_common);
+#ifdef _MODULE
+#include ioconf.c
+#endif
-void
-lm_isa_attach(device_t parent, device_t self, void *aux)
+static int
+lm_isa_modcmd(modcmd_t cmd, void *priv)
{
- struct lm_isa_softc *sc = device_private(self);
- struct isa_attach_args *ia = aux;
+ int error = 0;
- sc-lm_iot = ia-ia_iot;
-
- if (bus_space_map(ia-ia_iot, ia-ia_io[0].ir_addr, 8, 0,
- sc-lm_ioh)) {
- aprint_error(: can't map i/o space\n);
- return;
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ error = config_init_component(cfdriver_ioconf_lm_isa,
+ cfattach_ioconf_lm_isa, cfdata_ioconf_lm_isa);
+#endif
+ return error;
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ error = config_fini_component(cfdriver_ioconf_lm_isa,
+ cfattach_ioconf_lm_isa, cfdata_ioconf_lm_isa);
+#endif
+ return error;
+ default:
+ return ENOTTY;
}
-
- /* Bus-independent attachment */
- sc-lmsc.sc_dev = self;
- sc-lmsc.lm_writereg = lm_isa_writereg;
- sc-lmsc.lm_readreg = lm_isa_readreg;
-
- lm_attach(sc-lmsc);
}
-
-int
-lm_isa_detach(device_t self, int flags)
-{
- struct lm_isa_softc *sc = device_private(self);
-
- lm_detach(sc-lmsc);
- bus_space_unmap(sc-lm_iot, sc-lm_ioh, 8);
- return 0;
-}
-
-uint8_t
-lm_isa_readreg(struct lm_softc
CVS commit: src
Module Name:src
Committed By: jakllsch
Date: Tue Jan 17 16:59:38 UTC 2012
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/sys/modules: Makefile
Log Message:
Add lm, lm_isa_common, lm_isa, lm_wbsio and wbsio modules to the x86 build.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.100 -r1.101 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.31 src/distrib/sets/lists/modules/md.amd64:1.32
--- src/distrib/sets/lists/modules/md.amd64:1.31 Tue Oct 18 00:33:48 2011
+++ src/distrib/sets/lists/modules/md.amd64 Tue Jan 17 16:59:37 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.31 2011/10/18 00:33:48 jmcneill Exp $
+# $NetBSD: md.amd64,v 1.32 2012/01/17 16:59:37 jakllsch Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -81,6 +81,14 @@
./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod
./@MODULEDIR@/lg3303base-kernel-modules kmod
./@MODULEDIR@/lg3303/lg3303.kmod base-kernel-modules kmod
+./@MODULEDIR@/lmbase-kernel-modules kmod
+./@MODULEDIR@/lm/lm.kmod base-kernel-modules kmod
+./@MODULEDIR@/lm_isabase-kernel-modules kmod
+./@MODULEDIR@/lm_isa/lm_isa.kmod base-kernel-modules kmod
+./@MODULEDIR@/lm_isa_common base-kernel-modules kmod
+./@MODULEDIR@/lm_isa_common/lm_isa_common.kmod base-kernel-modules kmod
+./@MODULEDIR@/lm_wbsiobase-kernel-modules kmod
+./@MODULEDIR@/lm_wbsio/lm_wbsio.kmod base-kernel-modules kmod
./@MODULEDIR@/mt2131base-kernel-modules kmod
./@MODULEDIR@/mt2131/mt2131.kmod base-kernel-modules kmod
./@MODULEDIR@/nxt2kbase-kernel-modules kmod
@@ -103,6 +111,8 @@
./@MODULEDIR@/tvpll/tvpll.kmod base-kernel-modules kmod
./@MODULEDIR@/vmtbase-kernel-modules kmod
./@MODULEDIR@/vmt/vmt.kmod base-kernel-modules kmod
+./@MODULEDIR@/wbsiobase-kernel-modules kmod
+./@MODULEDIR@/wbsio/wbsio.kmod base-kernel-modules kmod
./@MODULEDIR@/wmidellbase-kernel-modules kmod
./@MODULEDIR@/wmidell/wmidell.kmod base-kernel-modules kmod
./@MODULEDIR@/wmieeepcbase-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.37 src/distrib/sets/lists/modules/md.i386:1.38
--- src/distrib/sets/lists/modules/md.i386:1.37 Tue Oct 18 00:33:48 2011
+++ src/distrib/sets/lists/modules/md.i386 Tue Jan 17 16:59:38 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.37 2011/10/18 00:33:48 jmcneill Exp $
+# $NetBSD: md.i386,v 1.38 2012/01/17 16:59:38 jakllsch Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -85,6 +85,14 @@
./@MODULEDIR@/itesio/itesio.kmod base-kernel-modules kmod
./@MODULEDIR@/lg3303base-kernel-modules kmod
./@MODULEDIR@/lg3303/lg3303.kmod base-kernel-modules kmod
+./@MODULEDIR@/lmbase-kernel-modules kmod
+./@MODULEDIR@/lm/lm.kmod base-kernel-modules kmod
+./@MODULEDIR@/lm_isabase-kernel-modules kmod
+./@MODULEDIR@/lm_isa/lm_isa.kmod base-kernel-modules kmod
+./@MODULEDIR@/lm_isa_common base-kernel-modules kmod
+./@MODULEDIR@/lm_isa_common/lm_isa_common.kmod base-kernel-modules kmod
+./@MODULEDIR@/lm_wbsiobase-kernel-modules kmod
+./@MODULEDIR@/lm_wbsio/lm_wbsio.kmod base-kernel-modules kmod
./@MODULEDIR@/mach64drmbase-kernel-modules kmod
./@MODULEDIR@/mach64drm/mach64drm.kmod base-kernel-modules kmod
./@MODULEDIR@/mgadrmbase-kernel-modules kmod
@@ -129,6 +137,8 @@
./@MODULEDIR@/viadrm/viadrm.kmod base-kernel-modules kmod
./@MODULEDIR@/vmtbase-kernel-modules kmod
./@MODULEDIR@/vmt/vmt.kmod base-kernel-modules kmod
+./@MODULEDIR@/wbsiobase-kernel-modules kmod
+./@MODULEDIR@/wbsio/wbsio.kmod base-kernel-modules kmod
./@MODULEDIR@/wmidellbase-kernel-modules kmod
./@MODULEDIR@/wmidell/wmidell.kmod base-kernel-modules kmod
./@MODULEDIR@/wmieeepcbase-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.100 src/sys/modules/Makefile:1.101
--- src/sys/modules/Makefile:1.100 Sun Dec 4 23:13:54 2011
+++ src/sys/modules/Makefile Tue Jan 17 16:59:38 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2011/12/04 23:13:54 jym Exp $
+# $NetBSD: Makefile,v 1.101 2012/01/17 16:59:38 jakllsch Exp $
.include bsd.own.mk
@@ -190,6 +190,11 @@ SUBDIR+= viadrm
SUBDIR+= aps
SUBDIR+= finsio
SUBDIR+= itesio
+SUBDIR+= lm
+SUBDIR+= lm_isa
+SUBDIR+= lm_isa_common
+SUBDIR+= lm_wbsio
+SUBDIR+= wbsio
.endif
.if ${MACHINE_CPU} == m68k
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 17:17:15 UTC 2012 Modified Files: src/sys/dev/isa: lm_isa_common.c wbsio.c Log Message: No module dependencies are denoted with NULL. Pointed out by jmcneill. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/lm_isa_common.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/isa/wbsio.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/isa/lm_isa_common.c diff -u src/sys/dev/isa/lm_isa_common.c:1.1 src/sys/dev/isa/lm_isa_common.c:1.2 --- src/sys/dev/isa/lm_isa_common.c:1.1 Tue Jan 17 16:50:07 2012 +++ src/sys/dev/isa/lm_isa_common.c Tue Jan 17 17:17:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: lm_isa_common.c,v 1.1 2012/01/17 16:50:07 jakllsch Exp $ */ +/* $NetBSD: lm_isa_common.c,v 1.2 2012/01/17 17:17:15 jakllsch Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lm_isa_common.c,v 1.1 2012/01/17 16:50:07 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: lm_isa_common.c,v 1.2 2012/01/17 17:17:15 jakllsch Exp $); #include sys/param.h #include sys/systm.h @@ -161,7 +161,7 @@ lm_isa_writereg(struct lm_softc *lmsc, i bus_space_write_1(sc-lm_iot, sc-lm_ioh, LMC_DATA, val); } -MODULE(MODULE_CLASS_DRIVER, lm_isa_common, ); +MODULE(MODULE_CLASS_DRIVER, lm_isa_common, NULL); static int lm_isa_common_modcmd(modcmd_t cmd, void *priv) Index: src/sys/dev/isa/wbsio.c diff -u src/sys/dev/isa/wbsio.c:1.6 src/sys/dev/isa/wbsio.c:1.7 --- src/sys/dev/isa/wbsio.c:1.6 Tue Jan 17 16:34:52 2012 +++ src/sys/dev/isa/wbsio.c Tue Jan 17 17:17:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: wbsio.c,v 1.6 2012/01/17 16:34:52 jakllsch Exp $ */ +/* $NetBSD: wbsio.c,v 1.7 2012/01/17 17:17:15 jakllsch Exp $ */ /* $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */ /* * Copyright (c) 2008 Mark Kettenis kette...@openbsd.org @@ -263,7 +263,7 @@ wbsio_print(void *aux, const char *pnp) return (UNCONF); } -MODULE(MODULE_CLASS_DRIVER, wbsio, ); +MODULE(MODULE_CLASS_DRIVER, wbsio, NULL); #ifdef _MODULE #include ioconf.c
CVS commit: src/share/man/man4
Module Name:src Committed By: jakllsch Date: Tue Jan 17 17:24:02 UTC 2012 Modified Files: src/share/man/man4: uslsa.4 Log Message: Update based on recent changes to uslsa(4). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/uslsa.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/uslsa.4 diff -u src/share/man/man4/uslsa.4:1.4 src/share/man/man4/uslsa.4:1.5 --- src/share/man/man4/uslsa.4:1.4 Sun May 25 19:59:33 2008 +++ src/share/man/man4/uslsa.4 Tue Jan 17 17:24:02 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: uslsa.4,v 1.4 2008/05/25 19:59:33 wiz Exp $ +.\ $NetBSD: uslsa.4,v 1.5 2012/01/17 17:24:02 jakllsch Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 12, 2006 +.Dd Jan 17, 2012 .Dt USLSA 4 .Os .Sh NAME @@ -62,6 +62,8 @@ driver which makes it behave like a .Xr usb 4 .Pp .Pa http://www.silabs.com . +.Pp +.Pa Silicon Laboratories AN571: CP210x Virtual COM Port Interface . .Sh HISTORY The .Nm @@ -76,10 +78,6 @@ driver was written by Code and style was borrowed from existing .Nx USB-serial drivers. -Due to the unavailability of documentation, Craig Shelley's -reverse-engineered Linux driver was used as documentation. .Sh CAVEATS -Hardware flow control may not work correctly. -.Pp Settings other than 8 data bits, no parity, and 1 stop bit -seem to be refused by the chip. +seem to be refused by the CP2101.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Jan 17 17:27:32 UTC 2012 Modified Files: src/share/man/man4: uslsa.4 Log Message: Dd wants full months. Use Rs/Re for reference (only title filled in for now, more would be nice). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/uslsa.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/uslsa.4 diff -u src/share/man/man4/uslsa.4:1.5 src/share/man/man4/uslsa.4:1.6 --- src/share/man/man4/uslsa.4:1.5 Tue Jan 17 17:24:02 2012 +++ src/share/man/man4/uslsa.4 Tue Jan 17 17:27:32 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: uslsa.4,v 1.5 2012/01/17 17:24:02 jakllsch Exp $ +.\ $NetBSD: uslsa.4,v 1.6 2012/01/17 17:27:32 wiz Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd Jan 17, 2012 +.Dd January 17, 2012 .Dt USLSA 4 .Os .Sh NAME @@ -62,8 +62,9 @@ driver which makes it behave like a .Xr usb 4 .Pp .Pa http://www.silabs.com . -.Pp -.Pa Silicon Laboratories AN571: CP210x Virtual COM Port Interface . +.Rs +.%T Silicon Laboratories AN571: CP210x Virtual COM Port Interface . +.Re .Sh HISTORY The .Nm
CVS commit: src/usr.sbin/perfused
Module Name:src
Committed By: joerg
Date: Tue Jan 17 17:58:36 UTC 2012
Modified Files:
src/usr.sbin/perfused: perfused.c
Log Message:
Rename perfuse_mount to not conflict with libperfuse. Mark it and
perfuse_trace as static.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/perfused/perfused.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/perfused/perfused.c
diff -u src/usr.sbin/perfused/perfused.c:1.17 src/usr.sbin/perfused/perfused.c:1.18
--- src/usr.sbin/perfused/perfused.c:1.17 Wed Dec 28 17:33:53 2011
+++ src/usr.sbin/perfused/perfused.c Tue Jan 17 17:58:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: perfused.c,v 1.17 2011/12/28 17:33:53 manu Exp $ */
+/* $NetBSD: perfused.c,v 1.18 2012/01/17 17:58:36 joerg Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -55,8 +55,8 @@
* we ever mount multiple filesystems in a single perfused,
* but it is not sure we will ever want to do that.
*/
-struct puffs_usermount *perfuse_mount = NULL;
-FILE *perfuse_trace = NULL;
+static struct puffs_usermount *my_perfuse_mount = NULL;
+static FILE *perfuse_trace = NULL;
static int access_mount(const char *, uid_t, int);
static void new_mount(int, int);
@@ -278,7 +278,7 @@ new_mount(int fd, int pmnt_flags)
/*
* Setup trace file facility
*/
- perfuse_mount = pu;
+ my_perfuse_mount = pu;
if ((perfuse_trace = fopen(_PATH_VAR_RUN_PERFUSE_TRACE, w)) == NULL)
DERR(EX_OSFILE,
@@ -359,7 +359,7 @@ siginfo_handler(int sig)
static void
sigusr1_handler(int sig)
{
- return perfuse_trace_dump(perfuse_mount, perfuse_trace);
+ return perfuse_trace_dump(my_perfuse_mount, perfuse_trace);
}
static int
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: jakllsch
Date: Tue Jan 17 18:04:46 UTC 2012
Modified Files:
src/sys/dev/isa: wbsio.c
Log Message:
Make this compile.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/isa/wbsio.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/isa/wbsio.c
diff -u src/sys/dev/isa/wbsio.c:1.7 src/sys/dev/isa/wbsio.c:1.8
--- src/sys/dev/isa/wbsio.c:1.7 Tue Jan 17 17:17:15 2012
+++ src/sys/dev/isa/wbsio.c Tue Jan 17 18:04:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.7 2012/01/17 17:17:15 jakllsch Exp $ */
+/* $NetBSD: wbsio.c,v 1.8 2012/01/17 18:04:46 jakllsch Exp $ */
/* $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis kette...@openbsd.org
@@ -153,7 +153,7 @@ wbsio_probe(device_t parent, cfdata_t ma
void
wbsio_attach(device_t parent, device_t self, void *aux)
{
- struct wbsio_softc *sc = (void *)self;
+ struct wbsio_softc *sc = device_private(self);
struct isa_attach_args *ia = aux;
struct isa_attach_args nia;
const char *desc = NULL;
@@ -233,6 +233,7 @@ wbsio_attach(device_t parent, device_t s
int
wbsio_detach(device_t self, int flags)
{
+ struct wbsio_softc *sc = device_private(self);
int rc;
if ((rc = config_detach_children(self, flags)) != 0)
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 18:05:15 UTC 2012 Modified Files: src/sys/dev/isa: files.isa Log Message: update for wbsio and lm changes To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/dev/isa/files.isa 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/isa/files.isa diff -u src/sys/dev/isa/files.isa:1.160 src/sys/dev/isa/files.isa:1.161 --- src/sys/dev/isa/files.isa:1.160 Sun Jun 13 03:09:32 2010 +++ src/sys/dev/isa/files.isa Tue Jan 17 18:05:15 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files.isa,v 1.160 2010/06/13 03:09:32 tsutsui Exp $ +# $NetBSD: files.isa,v 1.161 2012/01/17 18:05:15 jakllsch Exp $ # # Config file and device description for machine-independent ISA code. # Included by ports that need it. Requires that the SCSI files be @@ -459,7 +459,9 @@ file dev/isa/wbsio.c wbsio # LM78 temp/fanspeed monitor attach lm at isa with lm_isa attach lm at wbsio with lm_wbsio -file dev/isa/lm_isa.c lm_isa | lm_wbsio +file dev/isa/lm_isa_common.c lm_isa | lm_wbsio +file dev/isa/lm_isa.c lm_isa +file dev/isa/lm_wbsio.c lm_wbsio # iTE Super I/O with hardware monitor device itesio: sysmon_envsys, sysmon_wdog
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: veego Date: Tue Jan 17 18:11:28 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Back out all changes for rev 1.346 which are not related to PR/45850 Should fix the reported build problem from Paul Goyette To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/sys/arch/amd64/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.346 src/sys/arch/amd64/conf/GENERIC:1.347 --- src/sys/arch/amd64/conf/GENERIC:1.346 Tue Jan 17 03:49:19 2012 +++ src/sys/arch/amd64/conf/GENERIC Tue Jan 17 18:11:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.346 2012/01/17 03:49:19 christos Exp $ +# $NetBSD: GENERIC,v 1.347 2012/01/17 18:11:28 veego Exp $ # # GENERIC machine description file # @@ -22,15 +22,10 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.346 $ +#ident GENERIC-$Revision: 1.347 $ maxusers 64 # estimated number of users -# Common binary formats are statically compiled in by default. -options EXEC_ELF32 # exec ELF 32-bits binaries -#no options EXEC_ELF64 # exec ELF 64-bits binaries -#no options EXEC_SCRIPT # exec #! scripts - # delay between rebooting ... message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 @@ -72,8 +67,6 @@ options SYSVMSG # System V-like messag options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#no options EXEC_ELF64 # exec ELF 64-bits binaries -#no options EXEC_SCRIPT # exec #! scripts options MODULAR # new style module(7) framework options USERCONF # userconf(4) support @@ -124,10 +117,11 @@ options COMPAT_50 # NetBSD 5.0 compatib options COMPAT_43 # and 4.3BSD #options COMPAT_386BSD_MBRPART # recognize old partition ID -#options COMPAT_OSSAUDIO +options COMPAT_OSSAUDIO options COMPAT_NETBSD32 -#options COMPAT_LINUX -#options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32 +options COMPAT_LINUX +options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32 +options EXEC_ELF32 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Wedge support @@ -141,23 +135,22 @@ file-system FFS # UFS file-system MFS # memory file system file-system NFS # Network File System client file-system TMPFS # Efficient memory file-system -# File systems, built as module(7)s by default -#file-system EXT2FS # second extended file system (linux) -#file-system LFS # log-structured file system -#file-system NTFS # Windows/NT file system (experimental) -#file-system CD9660 # ISO 9660 + Rock Ridge file system -#file-system MSDOSFS # MS-DOS file system -#file-system FDESC # /dev/fd -#file-system KERNFS # /kern -#file-system NULLFS # loopback file system -#file-system OVERLAY # overlay file system -#file-system PROCFS # /proc -#file-system PUFFS # Userspace file systems (e.g. ntfs-3g sshfs) -#file-system SMBFS # experimental - CIFS; also needs nsmb (below) -#file-system UMAPFS # NULLFS + uid and gid remapping -#file-system UNION # union file system -#file-system CODA # Coda File System; also needs vcoda (below) -#file-system PTYFS # /dev/ptm support +file-system EXT2FS # second extended file system (linux) +file-system LFS # log-structured file system +file-system NTFS # Windows/NT file system (experimental) +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +file-system NULLFS # loopback file system +file-system OVERLAY # overlay file system +file-system PROCFS # /proc +file-system PUFFS # Userspace file systems (e.g. ntfs-3g sshfs) +file-system SMBFS # experimental - CIFS; also needs nsmb (below) +file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system +file-system CODA # Coda File System; also needs vcoda (below) +file-system PTYFS # /dev/ptm support #file-system UDF # experimental - OSTA UDF CD/DVD file-system #file-system HFS # experimental - Apple HFS+ (read-only) #file-system NILFS # experimental - NTT's NiLFS(2) @@ -389,19 +382,15 @@ attimer0 at isa? pcppi0 at isa? sysbeep0 at pcppi? -# Legacy DRI driver -#i915drm* at drm? # Intel i915, i945 DRM driver -#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver -#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver -#r128drm* at drm? # ATI Rage 128 DRM driver -#radeondrm* at drm? # ATI Radeon DRM driver -#savagedrm* at drm? # S3 Savage DRM driver -#sisdrm* at drm? # SiS DRM driver -#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver - -# New DRM/GEM driver ported from OpenBSD (Intel only) -inteldrm* at drm? -drmdev* at inteldrm? +# DRI driver +i915drm* at
CVS commit: src/usr.sbin/crash
Module Name:src
Committed By: skrll
Date: Tue Jan 17 18:44:25 UTC 2012
Modified Files:
src/usr.sbin/crash: Makefile
Removed Files:
src/usr.sbin/crash: ldscript.crash
Log Message:
Remove workaround for old binutils.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/crash/Makefile
cvs rdiff -u -r1.1 -r0 src/usr.sbin/crash/ldscript.crash
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/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.13 src/usr.sbin/crash/Makefile:1.14
--- src/usr.sbin/crash/Makefile:1.13 Tue Aug 16 08:07:12 2011
+++ src/usr.sbin/crash/Makefile Tue Jan 17 18:44:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/08/16 08:07:12 christos Exp $
+# $NetBSD: Makefile,v 1.14 2012/01/17 18:44:24 skrll Exp $
PROG= crash
MAN= crash.8
@@ -6,7 +6,7 @@ RUMPKERNEL= yes # XXX: Avoid -mcmodel=ke
CWARNFLAGS.clang+= -Wno-format
-LDADD+= -lutil -lkvm -ledit -lterminfo -T${.CURDIR}/ldscript.crash
+LDADD+= -lutil -lkvm -ledit -lterminfo
DPADD+= ${LIBUTIL} ${LIBKVM} ${LIBEDIT} ${LIBTERMINFO}
# some ddb kernel components need limited modifications. for now,
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: joerg Date: Tue Jan 17 18:53:25 UTC 2012 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi Log Message: kpasswd depends on MKKERBEROS, not USE_KERBEROS To generate a diff of this commit: cvs rdiff -u -r1.976 -r1.977 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1370 -r1.1371 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.976 src/distrib/sets/lists/base/mi:1.977 --- src/distrib/sets/lists/base/mi:1.976 Wed Jan 4 16:25:14 2012 +++ src/distrib/sets/lists/base/mi Tue Jan 17 18:53:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.976 2012/01/04 16:25:14 yamt Exp $ +# $NetBSD: mi,v 1.977 2012/01/17 18:53:22 joerg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -499,7 +499,7 @@ ./usr/bin/kgetcredbase-krb5-bin kerberos ./usr/bin/kinit base-krb5-bin kerberos ./usr/bin/klist base-krb5-bin kerberos -./usr/bin/kpasswdbase-krb5-bin use_kerberos +./usr/bin/kpasswdbase-krb5-bin kerberos ./usr/bin/krb5-configbase-krb5-bin kerberos ./usr/bin/ktracebase-debug-bin ./usr/bin/ktrussbase-debug-bin Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1370 src/distrib/sets/lists/man/mi:1.1371 --- src/distrib/sets/lists/man/mi:1.1370 Tue Jan 17 08:13:41 2012 +++ src/distrib/sets/lists/man/mi Tue Jan 17 18:53:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1370 2012/01/17 08:13:41 mbalmer Exp $ +# $NetBSD: mi,v 1.1371 2012/01/17 18:53:23 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -228,7 +228,7 @@ ./usr/share/man/cat1/kimpersonate.0 man-obsolete obsolete ./usr/share/man/cat1/kinit.0 man-krb5-catman kerberos,.cat ./usr/share/man/cat1/klist.0 man-krb5-catman kerberos,.cat -./usr/share/man/cat1/kpasswd.0 man-krb5-catman use_kerberos,.cat +./usr/share/man/cat1/kpasswd.0 man-krb5-catman kerberos,.cat ./usr/share/man/cat1/krb5-config.0 man-krb5-catman kerberos,.cat ./usr/share/man/cat1/ksh.0 man-util-catman .cat ./usr/share/man/cat1/ktrace.0 man-debug-catman .cat @@ -3154,7 +3154,7 @@ ./usr/share/man/html1/kimpersonate.html man-obsolete obsolete ./usr/share/man/html1/kinit.html man-krb5-htmlman kerberos,html ./usr/share/man/html1/klist.html man-krb5-htmlman kerberos,html -./usr/share/man/html1/kpasswd.html man-krb5-htmlman use_kerberos,html +./usr/share/man/html1/kpasswd.html man-krb5-htmlman kerberos,html ./usr/share/man/html1/krb5-config.html man-krb5-htmlman kerberos,html ./usr/share/man/html1/ksh.html man-util-htmlman html ./usr/share/man/html1/ktrace.html man-debug-htmlman html @@ -5723,7 +5723,7 @@ ./usr/share/man/man1/kimpersonate.1 man-obsolete obsolete ./usr/share/man/man1/kinit.1 man-krb5-man kerberos,.man ./usr/share/man/man1/klist.1 man-krb5-man kerberos,.man -./usr/share/man/man1/kpasswd.1 man-krb5-man use_kerberos,.man +./usr/share/man/man1/kpasswd.1 man-krb5-man kerberos,.man ./usr/share/man/man1/krb5-config.1 man-krb5-man kerberos,.man ./usr/share/man/man1/ksh.1 man-util-man .man ./usr/share/man/man1/ktrace.1 man-debug-man .man
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue Jan 17 19:13:23 UTC 2012
Modified Files:
src/sys/dev/pci: voodoofb.c
Log Message:
support DDC2, pick an appropriate video mode if a data are found
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/voodoofb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.30 src/sys/dev/pci/voodoofb.c:1.31
--- src/sys/dev/pci/voodoofb.c:1.30 Tue Jan 17 07:48:48 2012
+++ src/sys/dev/pci/voodoofb.c Tue Jan 17 19:13:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: voodoofb.c,v 1.30 2012/01/17 07:48:48 macallan Exp $ */
+/* $NetBSD: voodoofb.c,v 1.31 2012/01/17 19:13:22 macallan Exp $ */
/*
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.30 2012/01/17 07:48:48 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.31 2012/01/17 19:13:22 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -42,8 +42,6 @@ __KERNEL_RCSID(0, $NetBSD: voodoofb.c,v
#include sys/callout.h
#include sys/kauth.h
-#include dev/videomode/videomode.h
-
#include dev/pci/pcivar.h
#include dev/pci/pcireg.h
#include dev/pci/pcidevs.h
@@ -57,6 +55,13 @@ __KERNEL_RCSID(0, $NetBSD: voodoofb.c,v
#include dev/wscons/wsdisplay_vconsvar.h
#include dev/pci/wsdisplay_pci.h
+#include dev/i2c/i2cvar.h
+#include dev/i2c/i2c_bitbang.h
+#include dev/i2c/ddcvar.h
+#include dev/videomode/videomode.h
+#include dev/videomode/edidvar.h
+#include dev/videomode/edidreg.h
+
#include opt_wsemul.h
struct voodoofb_softc {
@@ -87,6 +92,12 @@ struct voodoofb_softc {
int width, height, linebytes;
const struct videomode *sc_videomode;
+ /* i2c stuff */
+ struct i2c_controller sc_i2c;
+ uint8_t sc_edid_data[128];
+ struct edid_info sc_edid_info;
+ uint32_t sc_i2creg;
+
int sc_mode;
uint32_t sc_bg;
@@ -198,6 +209,34 @@ struct wsdisplay_accessops voodoofb_acce
NULL, /* scroll */
};
+/* I2C glue */
+static int voodoofb_i2c_acquire_bus(void *, int);
+static void voodoofb_i2c_release_bus(void *, int);
+static int voodoofb_i2c_send_start(void *, int);
+static int voodoofb_i2c_send_stop(void *, int);
+static int voodoofb_i2c_initiate_xfer(void *, i2c_addr_t, int);
+static int voodoofb_i2c_read_byte(void *, uint8_t *, int);
+static int voodoofb_i2c_write_byte(void *, uint8_t, int);
+
+/* I2C bitbang glue */
+static void voodoofb_i2cbb_set_bits(void *, uint32_t);
+static void voodoofb_i2cbb_set_dir(void *, uint32_t);
+static uint32_t voodoofb_i2cbb_read(void *);
+
+static void voodoofb_setup_i2c(struct voodoofb_softc *);
+
+static const struct i2c_bitbang_ops voodoofb_i2cbb_ops = {
+ voodoofb_i2cbb_set_bits,
+ voodoofb_i2cbb_set_dir,
+ voodoofb_i2cbb_read,
+ {
+ VSP_SDA0_IN,
+ VSP_SCL0_IN,
+ 0,
+ 0
+ }
+};
+
/*
* Inline functions for getting access to register aperture.
*/
@@ -369,9 +408,15 @@ voodoofb_attach(device_t parent, device_
printf(%s: initial resolution %dx%d, %d bit\n, device_xname(self),
sc-width, sc-height, sc-bits_per_pixel);
+ sc-sc_videomode = NULL;
+ voodoofb_setup_i2c(sc);
+
/* XXX this should at least be configurable via kernel config */
- if ((sc-sc_videomode = pick_mode_by_ref(1024, 768, 60)) != NULL)
- voodoofb_set_videomode(sc, sc-sc_videomode);
+ if (sc-sc_videomode == NULL) {
+ sc-sc_videomode = pick_mode_by_ref(width, height, 60);
+ }
+
+ voodoofb_set_videomode(sc, sc-sc_videomode);
vcons_init(sc-vd, sc, voodoofb_defaultscreen, voodoofb_accessops);
sc-vd.init_screen = voodoofb_init_screen;
@@ -1412,3 +1457,140 @@ voodoofb_init(struct voodoofb_softc *sc)
voodoofb_wait_idle(sc);
}
+
+static void
+voodoofb_setup_i2c(struct voodoofb_softc *sc)
+{
+ int i;
+
+ /* Fill in the i2c tag */
+ sc-sc_i2c.ic_cookie = sc;
+ sc-sc_i2c.ic_acquire_bus = voodoofb_i2c_acquire_bus;
+ sc-sc_i2c.ic_release_bus = voodoofb_i2c_release_bus;
+ sc-sc_i2c.ic_send_start = voodoofb_i2c_send_start;
+ sc-sc_i2c.ic_send_stop = voodoofb_i2c_send_stop;
+ sc-sc_i2c.ic_initiate_xfer = voodoofb_i2c_initiate_xfer;
+ sc-sc_i2c.ic_read_byte = voodoofb_i2c_read_byte;
+ sc-sc_i2c.ic_write_byte = voodoofb_i2c_write_byte;
+ sc-sc_i2c.ic_exec = NULL;
+
+ sc-sc_i2creg = voodoo3_read32(sc, VIDSERPARPORT);
+#ifdef VOODOOFB_DEBUG
+ printf(data: %08x\n, sc-sc_i2creg);
+#endif
+ sc-sc_i2creg |= VSP_ENABLE_IIC0;
+ sc-sc_i2creg = ~(VSP_SDA0_OUT | VSP_SCL0_OUT);
+ voodoo3_write32(sc, VIDSERPARPORT, sc-sc_i2creg);
+
+ /* zero out the EDID buffer */
+ memset(sc-sc_edid_data, 0, 128);
+
+ /* Some monitors don't respond first time */
+ i = 0;
+ while (sc-sc_edid_data[1] == 0 i++ 3)
+ ddc_read_edid(sc-sc_i2c, sc-sc_edid_data, 128);
+ if (i 3) {
+ if (edid_parse(sc-sc_edid_data, sc-sc_edid_info) != -1) {
+#ifdef VOODOOFB_DEBUG
+ edid_print(sc-sc_edid_info);
+#endif
+ /*
+ * Now pick a mode.
+ * How do we
CVS commit: src/share/mk
Module Name:src
Committed By: njoly
Date: Tue Jan 17 19:40:08 UTC 2012
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
For xkb_base, do not use ${libdir} (xkeyboard-config.pc does not define
it) but its value ${prefix}/lib instead.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.104 src/share/mk/bsd.x11.mk:1.105
--- src/share/mk/bsd.x11.mk:1.104 Thu Sep 29 10:59:26 2011
+++ src/share/mk/bsd.x11.mk Tue Jan 17 19:40:08 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.104 2011/09/29 10:59:26 dholland Exp $
+# $NetBSD: bsd.x11.mk,v 1.105 2012/01/17 19:40:08 njoly Exp $
.include bsd.init.mk
@@ -285,7 +285,7 @@ pkgconfig-install: ${_PKGDEST.${_pkg}}
s,@Z_LIBS@,-lz,; \
s,@LIBZ@,-lz,; \
s,@LIBBZ2@,-lbz2,; \
- s,@xkb_base@,\\$$\{libdir\}/X11/xkb,; \
+ s,@xkb_base@,\\$$\{prefix\}/lib/X11/xkb,; \
s,@xcbincludedir@,\\$$\{prefix\}/share/xcb,; \
s,@fontrootdir@,\\$$\{libdir\}/X11/fonts,; \
s,@LIBXML2_LIBS@,,; \
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Tue Jan 17 19:46:55 UTC 2012
Modified Files:
src/sys/arch/usermode/usermode: trap.c
Log Message:
Clean up userret/ast handling. Now called ONLY when its 100% clear that it is
returning to userland.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.57 src/sys/arch/usermode/usermode/trap.c:1.58
--- src/sys/arch/usermode/usermode/trap.c:1.57 Sat Jan 14 21:45:28 2012
+++ src/sys/arch/usermode/usermode/trap.c Tue Jan 17 19:46:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.57 2012/01/14 21:45:28 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.58 2012/01/17 19:46:55 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.57 2012/01/14 21:45:28 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.58 2012/01/17 19:46:55 reinoud Exp $);
#include sys/types.h
#include sys/param.h
@@ -50,14 +50,13 @@ __KERNEL_RCSID(0, $NetBSD: trap.c,v 1.5
/* forwards and externals */
void setup_signal_handlers(void);
void stop_all_signal_handlers(void);
-void userret(struct lwp *l);
static void mem_access_handler(int sig, siginfo_t *info, void *ctx);
static void illegal_instruction_handler(int sig, siginfo_t *info, void *ctx);
extern int errno;
-static void pagefault(vaddr_t pc, vaddr_t va);
-static void illegal_instruction(void);
+static void pagefault(vaddr_t from_userland, vaddr_t pc, vaddr_t va);
+static void illegal_instruction(vaddr_t from_userland);
bool pmap_fault(pmap_t pmap, vaddr_t va, vm_prot_t *atype);
@@ -120,6 +119,33 @@ stop_all_signal_handlers(void)
}
+/* ast and userret */
+void
+userret(struct lwp *l)
+{
+ /* invoke MI userret code */
+ mi_userret(l);
+
+ while (astpending) {
+ astpending = 0;
+
+ curcpu()-ci_data.cpu_ntrap++;
+#if 0
+ /* profiling */
+ if (l-l_pflag LP_OWEUPC) {
+ l-l_pflag = ~LP_OWEUPC;
+ ADDUPROF(l);
+ }
+#endif
+ /* allow a forced task switch */
+ if (l-l_cpu-ci_want_resched)
+ preempt();
+
+ mi_userret(l);
+ }
+}
+
+
/* signal handler switching to a pagefault context */
static void
mem_access_handler(int sig, siginfo_t *info, void *ctx)
@@ -128,6 +154,7 @@ mem_access_handler(int sig, siginfo_t *i
struct lwp *l;
struct pcb *pcb;
vaddr_t va, sp, pc, fp;
+ int from_userland;
assert((info-si_signo == SIGSEGV) || (info-si_signo == SIGBUS));
@@ -176,9 +203,12 @@ mem_access_handler(int sig, siginfo_t *i
#endif
/* if we're running on a stack of our own, use the system stack */
+ from_userland = 0;
if ((sp (vaddr_t) pcb-sys_stack) || (sp (vaddr_t) pcb-sys_stack_top)) {
sp = (vaddr_t) pcb-sys_stack_top - sizeof(register_t);
fp = (vaddr_t) pcb-pcb_userret_ucp;
+ if (pc kmem_user_end)
+ from_userland = 1;
} else {
/* stack grows down */
fp = sp - sizeof(ucontext_t) - sizeof(register_t); /* slack */
@@ -198,56 +228,13 @@ mem_access_handler(int sig, siginfo_t *i
pcb-pcb_ucp.uc_flags = _UC_STACK | _UC_CPU;
thunk_makecontext(pcb-pcb_ucp, (void (*)(void)) pagefault,
- 2, (void *) pc, (void *) va, NULL);
+ 3, (void *) from_userland, (void *) pc, (void *) va);
/* switch to the new pagefault entry on return from signal */
memcpy(ctx, pcb-pcb_ucp, sizeof(ucontext_t));
}
-/* ast and userret */
-void
-userret(struct lwp *l)
-{
- struct pcb *pcb;
- ucontext_t ucp, *nucp;
- vaddr_t pc;
-
- KASSERT(l);
-
- /* are we going back to userland? */
- pcb = lwp_getpcb(l);
- KASSERT(pcb);
-
- /* where are we going back to ? */
- thunk_getcontext(ucp);
- nucp = (ucontext_t *) ucp.uc_link;
- pc = md_get_pc(nucp);
-
- if (pc = kmem_k_start)
- return;
-
- /* ok, going to userland, proceed! */
- if (astpending) {
- astpending = 0;
-
- curcpu()-ci_data.cpu_ntrap++;
-#if 0
- /* profiling */
- if (l-l_pflag LP_OWEUPC) {
- l-l_pflag = ~LP_OWEUPC;
- ADDUPROF(l);
- }
-#endif
- /* allow a forced task switch */
- if (l-l_cpu-ci_want_resched)
- preempt();
- }
-
- /* invoke MI userret code */
- mi_userret(l);
-}
-
/* signal handler switching to a illegal instruction context */
static void
illegal_instruction_handler(int sig, siginfo_t *info, void *ctx)
@@ -255,7 +242,8 @@ illegal_instruction_handler(int sig, sig
ucontext_t *ucp = ctx;
struct lwp *l;
struct pcb *pcb;
- vaddr_t sp, fp;
+ vaddr_t sp, pc, fp;
+ int from_userland;
assert(info-si_signo == SIGILL);
#if 0
@@ -291,14 +279,21 @@ illegal_instruction_handler(int sig, sig
l = curlwp;
pcb = lwp_getpcb(l);
+ /* get PC address of faulted instruction */
+ pc = md_get_pc(ctx);
+
/* setup for illegal_instruction context */
sp = md_get_sp(ctx);
/* if we're running on a stack of our own, use the system stack
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Jan 17 20:34:58 UTC 2012
Modified Files:
src/lib/libpthread: pthread_int.h
src/sys/arch/sun2/include: types.h
src/sys/arch/vax/include: types.h
src/tests/lib/libc/tls: t_tls_dlopen.c t_tls_dynamic.c t_tls_static.c
t_tls_static_helper.c
src/tests/lib/libc/tls/dso: h_tls_dlopen.c
src/tests/lib/libc/tls_dso: h_tls_dynamic.c
src/tests/libexec/ld.elf_so/helper_dso1: h_helper_dso1.c
Log Message:
Introduce __HAVE_NO___THREAD for sun2 and vax to disable the TLS usage.
Require __HAVE_TLS_VARIANT_I or __HAVE_TLS_VARIANT_II as well as
__lwp_getprivate_fast / __lwp_gettcb_fast to exist for libpthread.
Define VAX as going to use TLS variant I, if it is ever implemented.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sun2/include/types.h
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/vax/include/types.h
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/tls/t_tls_dlopen.c \
src/tests/lib/libc/tls/t_tls_dynamic.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/tls/t_tls_static.c \
src/tests/lib/libc/tls/t_tls_static_helper.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/tls/dso/h_tls_dlopen.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/tls_dso/h_tls_dynamic.c
cvs rdiff -u -r1.3 -r1.4 \
src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.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/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.81 src/lib/libpthread/pthread_int.h:1.82
--- src/lib/libpthread/pthread_int.h:1.81 Thu Oct 6 16:03:48 2011
+++ src/lib/libpthread/pthread_int.h Tue Jan 17 20:34:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.81 2011/10/06 16:03:48 christos Exp $ */
+/* $NetBSD: pthread_int.h,v 1.82 2012/01/17 20:34:57 joerg Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -266,22 +266,8 @@ pthread__self(void)
#endif
return (pthread_t)tcb-tcb_pthread;
}
-#elif 0 defined(__HAVE___LWP_GETPRIVATE_FAST)
-static inline pthread_t __constfunc
-pthread__self(void)
-{
- return (pthread_t)__lwp_getprivate_fast();
-}
#else
-/* Stack location of pointer to a particular thread */
-extern vaddr_t pthread__mainbase;
-extern vaddr_t pthread__mainstruct;
-static inline pthread_t
-pthread__id(vaddr_t sp) {
- vaddr_t va = sp pthread__threadmask;
- return (pthread_t)(va == pthread__mainbase ? pthread__mainstruct : va);
-}
-#define pthread__self() (pthread__id(pthread__sp()))
+#error Either __HAVE_TLS_VARIANT_I or __HAVE_TLS_VARIANT_II must be defined
#endif
#define pthread__abort() \
Index: src/sys/arch/sun2/include/types.h
diff -u src/sys/arch/sun2/include/types.h:1.10 src/sys/arch/sun2/include/types.h:1.11
--- src/sys/arch/sun2/include/types.h:1.10 Sun Jun 12 03:35:47 2011
+++ src/sys/arch/sun2/include/types.h Tue Jan 17 20:34:57 2012
@@ -1,7 +1,8 @@
-/* $NetBSD: types.h,v 1.10 2011/06/12 03:35:47 rmind Exp $ */
+/* $NetBSD: types.h,v 1.11 2012/01/17 20:34:57 joerg Exp $ */
#include m68k/types.h
#define __HAVE_MM_MD_KERNACC
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#define __HAVE_MM_MD_READWRITE
#define __HAVE_MM_MD_MMAP
+#define __HAVE_NO___THREAD
Index: src/sys/arch/vax/include/types.h
diff -u src/sys/arch/vax/include/types.h:1.43 src/sys/arch/vax/include/types.h:1.44
--- src/sys/arch/vax/include/types.h:1.43 Sun Jun 12 03:35:49 2011
+++ src/sys/arch/vax/include/types.h Tue Jan 17 20:34:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.43 2011/06/12 03:35:49 rmind Exp $ */
+/* $NetBSD: types.h,v 1.44 2012/01/17 20:34:57 joerg Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -80,5 +80,7 @@ typedef volatile char __cpu_simple_lock_
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#define __HAVE___LWP_GETPRIVATE_FAST
+#define __HAVE_NO___THREAD
+#define __HAVE_TLS_VARIANT_I
#endif /* _MACHTYPES_H_ */
Index: src/tests/lib/libc/tls/t_tls_dlopen.c
diff -u src/tests/lib/libc/tls/t_tls_dlopen.c:1.2 src/tests/lib/libc/tls/t_tls_dlopen.c:1.3
--- src/tests/lib/libc/tls/t_tls_dlopen.c:1.2 Thu Nov 17 16:20:11 2011
+++ src/tests/lib/libc/tls/t_tls_dlopen.c Tue Jan 17 20:34:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_tls_dlopen.c,v 1.2 2011/11/17 16:20:11 joerg Exp $ */
+/* $NetBSD: t_tls_dlopen.c,v 1.3 2012/01/17 20:34:57 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_tls_dlopen.c,v 1.2 2011/11/17 16:20:11 joerg Exp $);
+__RCSID($NetBSD: t_tls_dlopen.c,v 1.3 2012/01/17 20:34:57 joerg Exp $);
#include atf-c.h
#include dlfcn.h
@@ -41,7 +41,7 @@ __RCSID($NetBSD: t_tls_dlopen.c,v 1.2 2
#include sys/tls.h
-#if !defined(__HAVE_TLS_VARIANT_I) !defined(__HAVE_TLS_VARIANT_II)
+#ifdef
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Tue Jan 17 20:50:39 UTC 2012 Modified Files: src/sys/arch/usermode/usermode: trap.c Log Message: Do init the astpending variable. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/trap.c diff -u src/sys/arch/usermode/usermode/trap.c:1.58 src/sys/arch/usermode/usermode/trap.c:1.59 --- src/sys/arch/usermode/usermode/trap.c:1.58 Tue Jan 17 19:46:55 2012 +++ src/sys/arch/usermode/usermode/trap.c Tue Jan 17 20:50:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.58 2012/01/17 19:46:55 reinoud Exp $ */ +/* $NetBSD: trap.c,v 1.59 2012/01/17 20:50:38 reinoud Exp $ */ /*- * Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.58 2012/01/17 19:46:55 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.59 2012/01/17 20:50:38 reinoud Exp $); #include sys/types.h #include sys/param.h @@ -62,7 +62,7 @@ bool pmap_fault(pmap_t pmap, vaddr_t va, static stack_t sigstk; -int astpending; +int astpending = 0; void startlwp(void *arg)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue Jan 17 21:31:46 UTC 2012
Modified Files:
src/sys/dev/pci: voodoofb.c
Log Message:
we don't access video memory directly, no need to map it
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/voodoofb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.31 src/sys/dev/pci/voodoofb.c:1.32
--- src/sys/dev/pci/voodoofb.c:1.31 Tue Jan 17 19:13:22 2012
+++ src/sys/dev/pci/voodoofb.c Tue Jan 17 21:31:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: voodoofb.c,v 1.31 2012/01/17 19:13:22 macallan Exp $ */
+/* $NetBSD: voodoofb.c,v 1.32 2012/01/17 21:31:46 macallan Exp $ */
/*
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.31 2012/01/17 19:13:22 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.32 2012/01/17 21:31:46 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -75,10 +75,8 @@ struct voodoofb_softc {
bus_space_handle_t sc_memh;
bus_space_tag_t sc_regt;
- bus_space_tag_t sc_fbt;
bus_space_tag_t sc_ioregt;
bus_space_handle_t sc_regh;
- bus_space_handle_t sc_fbh;
bus_space_handle_t sc_ioregh;
bus_addr_t sc_regs, sc_fb, sc_ioreg;
bus_size_t sc_regsize, sc_fbsize, sc_ioregsize;
@@ -342,7 +340,7 @@ voodoofb_attach(device_t parent, device_
ulong defattr;
int console, width, height, i, j;
prop_dictionary_t dict;
- int linebytes, depth;
+ int linebytes, depth, flags;
uint32_t bg, fg, ul;
sc-sc_dev = self;
@@ -359,10 +357,8 @@ voodoofb_attach(device_t parent, device_
sc-sc_pa = *pa;
/* the framebuffer */
- if (pci_mapreg_map(pa, 0x14, PCI_MAPREG_TYPE_MEM,
- BUS_SPACE_MAP_CACHEABLE | BUS_SPACE_MAP_PREFETCHABLE |
- BUS_SPACE_MAP_LINEAR,
- sc-sc_fbt, sc-sc_fbh, sc-sc_fb, sc-sc_fbsize)) {
+ if (pci_mapreg_info(sc-sc_pc, sc-sc_pcitag, 0x14, PCI_MAPREG_TYPE_MEM,
+ sc-sc_fb, sc-sc_fbsize, flags)) {
aprint_error_dev(self, failed to map the frame buffer.\n);
}
@@ -508,7 +504,6 @@ voodoofb_drm_unmap(struct voodoofb_softc
bus_space_unmap(sc-sc_ioregt, sc-sc_ioregh, sc-sc_ioregsize);
bus_space_unmap(sc-sc_regt, sc-sc_regh, sc-sc_regsize);
- bus_space_unmap(sc-sc_fbt, sc-sc_fbh, sc-sc_fbsize);
return 0;
}
@@ -516,12 +511,6 @@ voodoofb_drm_unmap(struct voodoofb_softc
static int
voodoofb_drm_map(struct voodoofb_softc *sc)
{
- if (pci_mapreg_map(sc-sc_pa, 0x14, PCI_MAPREG_TYPE_MEM,
- BUS_SPACE_MAP_CACHEABLE | BUS_SPACE_MAP_PREFETCHABLE |
- BUS_SPACE_MAP_LINEAR,
- sc-sc_fbt, sc-sc_fbh, sc-sc_fb, sc-sc_fbsize)) {
- aprint_error_dev(sc-sc_dev, failed to map the frame buffer.\n);
- }
/* memory-mapped registers */
if (pci_mapreg_map(sc-sc_pa, 0x10, PCI_MAPREG_TYPE_MEM, 0,
@@ -1005,7 +994,7 @@ voodoofb_mmap(void *v, void *vs, off_t o
/* 'regular' framebuffer mmap()ing */
if (offset sc-sc_fbsize) {
- pa = bus_space_mmap(sc-sc_fbt, offset, 0, prot,
+ pa = bus_space_mmap(sc-sc_memt, offset, 0, prot,
BUS_SPACE_MAP_LINEAR);
return pa;
}
@@ -1064,16 +1053,7 @@ voodoofb_init_screen(void *cookie, struc
ri-ri_width = sc-width;
ri-ri_height = sc-height;
ri-ri_stride = sc-width;
- ri-ri_flg = RI_CENTER | RI_FULLCLEAR;
-
- ri-ri_bits = bus_space_vaddr(sc-sc_fbt, sc-sc_fbh);
-
-#ifdef VOODOOFB_DEBUG
- printf(addr: %08lx\n, (ulong)ri-ri_bits);
-#endif
- if (existing) {
- ri-ri_flg |= RI_CLEAR;
- }
+ ri-ri_flg = RI_CENTER;
rasops_init(ri, 0, 0);
ri-ri_caps = WSSCREEN_WSCOLORS;
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: njoly Date: Tue Jan 17 22:18:54 UTC 2012 Modified Files: src/share/man/man4/man4.x86: balloon.4 Log Message: Remove bad indent keyword. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/man4.x86/balloon.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.x86/balloon.4 diff -u src/share/man/man4/man4.x86/balloon.4:1.8 src/share/man/man4/man4.x86/balloon.4:1.9 --- src/share/man/man4/man4.x86/balloon.4:1.8 Tue Aug 2 10:23:33 2011 +++ src/share/man/man4/man4.x86/balloon.4 Tue Jan 17 22:18:54 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: balloon.4,v 1.8 2011/08/02 10:23:33 wiz Exp $ +.\ $NetBSD: balloon.4,v 1.9 2012/01/17 22:18:54 njoly Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -85,7 +85,7 @@ is also available through under .Dq machdep.xen.balloon (all values being in kilobytes): -.Bl -tag indent -width xxx +.Bl -tag -width xxx .It current (read-only) The current memory reservation of the domain. .It min
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: jakllsch
Date: Wed Jan 18 00:11:43 UTC 2012
Modified Files:
src/sys/dev/isa: lm_isa_common.c
Log Message:
Improve module dependencies, clean up old #if 0 code.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/lm_isa_common.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/isa/lm_isa_common.c
diff -u src/sys/dev/isa/lm_isa_common.c:1.2 src/sys/dev/isa/lm_isa_common.c:1.3
--- src/sys/dev/isa/lm_isa_common.c:1.2 Tue Jan 17 17:17:15 2012
+++ src/sys/dev/isa/lm_isa_common.c Wed Jan 18 00:11:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_isa_common.c,v 1.2 2012/01/17 17:17:15 jakllsch Exp $ */
+/* $NetBSD: lm_isa_common.c,v 1.3 2012/01/18 00:11:43 jakllsch Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lm_isa_common.c,v 1.2 2012/01/17 17:17:15 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: lm_isa_common.c,v 1.3 2012/01/18 00:11:43 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
@@ -59,14 +59,6 @@ struct lm_isa_softc {
bus_space_handle_t lm_ioh;
};
-#if 0
-CFATTACH_DECL_NEW(lm_isa, sizeof(struct lm_isa_softc),
-lm_isa_match, lm_isa_attach, lm_isa_detach, NULL);
-
-CFATTACH_DECL_NEW(lm_wbsio, sizeof(struct lm_isa_softc),
-lm_isa_match, lm_isa_attach, lm_isa_detach, NULL);
-#endif
-
int
lm_isa_match(device_t parent, cfdata_t match, void *aux)
{
@@ -161,7 +153,7 @@ lm_isa_writereg(struct lm_softc *lmsc, i
bus_space_write_1(sc-lm_iot, sc-lm_ioh, LMC_DATA, val);
}
-MODULE(MODULE_CLASS_DRIVER, lm_isa_common, NULL);
+MODULE(MODULE_CLASS_DRIVER, lm_isa_common, lm);
static int
lm_isa_common_modcmd(modcmd_t cmd, void *priv)
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Wed Jan 18 00:14:32 UTC 2012 Modified Files: src/sys/dev/isa: lm_wbsio.c Log Message: Improve module dependency list. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/lm_wbsio.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/isa/lm_wbsio.c diff -u src/sys/dev/isa/lm_wbsio.c:1.1 src/sys/dev/isa/lm_wbsio.c:1.2 --- src/sys/dev/isa/lm_wbsio.c:1.1 Tue Jan 17 16:50:07 2012 +++ src/sys/dev/isa/lm_wbsio.c Wed Jan 18 00:14:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: lm_wbsio.c,v 1.1 2012/01/17 16:50:07 jakllsch Exp $ */ +/* $NetBSD: lm_wbsio.c,v 1.2 2012/01/18 00:14:32 jakllsch Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: lm_wbsio.c,v 1.1 2012/01/17 16:50:07 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: lm_wbsio.c,v 1.2 2012/01/18 00:14:32 jakllsch Exp $); #include sys/param.h #include sys/systm.h @@ -49,7 +49,7 @@ __KERNEL_RCSID(0, $NetBSD: lm_wbsio.c,v CFATTACH_DECL_NEW(lm_wbsio, sizeof(struct lm_isa_softc), lm_isa_match, lm_isa_attach, lm_isa_detach, NULL); -MODULE(MODULE_CLASS_DRIVER, lm_wbsio, lm_isa_common); +MODULE(MODULE_CLASS_DRIVER, lm_wbsio, lm_isa_common,wbsio); #ifdef _MODULE #include ioconf.c
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: jakllsch
Date: Wed Jan 18 00:23:30 UTC 2012
Modified Files:
src/sys/dev/isa: wbsio.c
Log Message:
wbsio(4) rescan support.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/wbsio.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/isa/wbsio.c
diff -u src/sys/dev/isa/wbsio.c:1.8 src/sys/dev/isa/wbsio.c:1.9
--- src/sys/dev/isa/wbsio.c:1.8 Tue Jan 17 18:04:46 2012
+++ src/sys/dev/isa/wbsio.c Wed Jan 18 00:23:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.8 2012/01/17 18:04:46 jakllsch Exp $ */
+/* $NetBSD: wbsio.c,v 1.9 2012/01/18 00:23:30 jakllsch Exp $ */
/* $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis kette...@openbsd.org
@@ -62,20 +62,28 @@
#define WBSIO_HM_ADDR_LSB 0x61 /* Address [7:0] */
struct wbsio_softc {
- struct device sc_dev;
+ device_t sc_dev;
+ device_t sc_lm_dev;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
+
+ struct isa_attach_args sc_ia;
+ struct isa_io sc_io;
};
int wbsio_probe(device_t, cfdata_t, void *);
void wbsio_attach(device_t, device_t, void *);
int wbsio_detach(device_t, int);
+int wbsio_rescan(device_t, const char *, const int *);
void wbsio_childdet(device_t, device_t);
int wbsio_print(void *, const char *);
+static int wbsio_search(device_t, cfdata_t, const int *, void *);
+
CFATTACH_DECL2_NEW(wbsio, sizeof(struct wbsio_softc),
-wbsio_probe, wbsio_attach, wbsio_detach, NULL, NULL, wbsio_childdet);
+wbsio_probe, wbsio_attach, wbsio_detach, NULL,
+wbsio_rescan, wbsio_childdet);
static __inline void
wbsio_conf_enable(bus_space_tag_t iot, bus_space_handle_t ioh)
@@ -90,16 +98,16 @@ wbsio_conf_disable(bus_space_tag_t iot,
bus_space_write_1(iot, ioh, WBSIO_INDEX, WBSIO_CONF_DS_MAGIC);
}
-static __inline u_int8_t
-wbsio_conf_read(bus_space_tag_t iot, bus_space_handle_t ioh, u_int8_t index)
+static __inline uint8_t
+wbsio_conf_read(bus_space_tag_t iot, bus_space_handle_t ioh, uint8_t index)
{
bus_space_write_1(iot, ioh, WBSIO_INDEX, index);
return (bus_space_read_1(iot, ioh, WBSIO_DATA));
}
static __inline void
-wbsio_conf_write(bus_space_tag_t iot, bus_space_handle_t ioh, u_int8_t index,
-u_int8_t data)
+wbsio_conf_write(bus_space_tag_t iot, bus_space_handle_t ioh, uint8_t index,
+uint8_t data)
{
bus_space_write_1(iot, ioh, WBSIO_INDEX, index);
bus_space_write_1(iot, ioh, WBSIO_DATA, data);
@@ -111,7 +119,7 @@ wbsio_probe(device_t parent, cfdata_t ma
struct isa_attach_args *ia = aux;
bus_space_tag_t iot;
bus_space_handle_t ioh;
- u_int8_t reg;
+ uint8_t reg;
/* Must supply an address */
if (ia-ia_nio 1)
@@ -155,10 +163,12 @@ wbsio_attach(device_t parent, device_t s
{
struct wbsio_softc *sc = device_private(self);
struct isa_attach_args *ia = aux;
- struct isa_attach_args nia;
const char *desc = NULL;
- u_int8_t reg, reg0, reg1;
- u_int16_t iobase;
+ uint8_t reg;
+
+ sc-sc_dev = self;
+
+ sc-sc_ia = *ia;
/* Map ISA I/O space */
sc-sc_iot = ia-ia_iot;
@@ -203,31 +213,13 @@ wbsio_attach(device_t parent, device_t s
aprint_naive(\n);
aprint_normal(: Winbond LPC Super I/O %s rev 0x%02x\n, desc, reg);
- /* Select HM logical device */
- wbsio_conf_write(sc-sc_iot, sc-sc_ioh, WBSIO_LDN, WBSIO_LDN_HM);
-
- /*
- * The address should be 8-byte aligned, but it seems some
- * BIOSes ignore this. They get away with it, because
- * Apparently the hardware simply ignores the lower three
- * bits. We do the same here.
- */
- reg0 = wbsio_conf_read(sc-sc_iot, sc-sc_ioh, WBSIO_HM_ADDR_LSB);
- reg1 = wbsio_conf_read(sc-sc_iot, sc-sc_ioh, WBSIO_HM_ADDR_MSB);
- iobase = (reg1 8) | (reg0 ~0x7);
-
/* Escape from configuration mode */
wbsio_conf_disable(sc-sc_iot, sc-sc_ioh);
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, couldn't establish power handler\n);
- if (iobase == 0)
- return;
-
- nia = *ia;
- nia.ia_io[0].ir_addr = iobase;
- config_found(self, nia, wbsio_print);
+ wbsio_rescan(self, wbsio, NULL);
}
int
@@ -243,10 +235,64 @@ wbsio_detach(device_t self, int flags)
return 0;
}
+int
+wbsio_rescan(device_t self, const char *ifattr, const int *locators)
+{
+
+ config_search_loc(wbsio_search, self, ifattr, locators, NULL);
+
+ return 0;
+}
+
void
wbsio_childdet(device_t self, device_t child)
{
- return;
+ struct wbsio_softc *sc = device_private(self);
+
+ if (sc-sc_lm_dev == child)
+ sc-sc_lm_dev = NULL;
+}
+
+static int
+wbsio_search(device_t parent, cfdata_t cf, const int *slocs, void *aux)
+{
+ struct wbsio_softc *sc = device_private(parent);
+ uint16_t iobase;
+ uint8_t reg0, reg1;
+
+ /* Enter configuration mode */
+ wbsio_conf_enable(sc-sc_iot, sc-sc_ioh);
+
+ /* Select HM logical device */
+ wbsio_conf_write(sc-sc_iot, sc-sc_ioh, WBSIO_LDN, WBSIO_LDN_HM);
+
+ /*
+ * The address should be 8-byte aligned,
CVS commit: [yamt-pagecache] src/sys
Module Name:src
Committed By: yamt
Date: Wed Jan 18 02:09:06 UTC 2012
Modified Files:
src/sys/miscfs/genfs [yamt-pagecache]: genfs_io.c
src/sys/uvm [yamt-pagecache]: uvm_loan.c uvm_page_array.c
uvm_page_status.c uvm_vnode.c
Log Message:
- bug fixes
- minor optimizations
- assertions
- comments
To generate a diff of this commit:
cvs rdiff -u -r1.53.2.7 -r1.53.2.8 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.81.2.11 -r1.81.2.12 src/sys/uvm/uvm_loan.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/uvm/uvm_page_array.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/uvm/uvm_page_status.c
cvs rdiff -u -r1.97.2.3 -r1.97.2.4 src/sys/uvm/uvm_vnode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.53.2.7 src/sys/miscfs/genfs/genfs_io.c:1.53.2.8
--- src/sys/miscfs/genfs/genfs_io.c:1.53.2.7 Sat Jan 14 04:44:45 2012
+++ src/sys/miscfs/genfs/genfs_io.c Wed Jan 18 02:09:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.53.2.7 2012/01/14 04:44:45 yamt Exp $ */
+/* $NetBSD: genfs_io.c,v 1.53.2.8 2012/01/18 02:09:05 yamt Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.53.2.7 2012/01/14 04:44:45 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.53.2.8 2012/01/18 02:09:05 yamt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -375,10 +375,11 @@ startover:
*/
pg-flags = ~(PG_RDONLY|PG_HOLE);
/*
- * mark the page dirty.
+ * mark the page DIRTY.
* otherwise another thread can do putpages and pull
* our vnode from syncer's queue before our caller does
- * ubc_release.
+ * ubc_release. note that putpages won't see CLEAN
+ * pages even if they are BUSY.
*/
uvm_pagemarkdirty(pg, UVM_PAGE_STATUS_DIRTY);
}
@@ -852,7 +853,7 @@ genfs_do_putpages(struct vnode *vp, off_
{
struct uvm_object * const uobj = vp-v_uobj;
kmutex_t * const slock = uobj-vmobjlock;
- off_t off;
+ off_t nextoff;
/* Even for strange MAXPHYS, the shift rounds down to a page */
#define maxpages (MAXPHYS PAGE_SHIFT)
int i, error;
@@ -865,7 +866,7 @@ genfs_do_putpages(struct vnode *vp, off_
bool pagedaemon = curlwp == uvm.pagedaemon_lwp;
struct lwp * const l = curlwp ? curlwp : lwp0;
int flags;
- bool modified; /* if we write out any pages */
+ bool written; /* if we write out any pages */
bool need_wapbl;
bool has_trans;
bool tryclean; /* try to pull off from the syncer's list */
@@ -886,7 +887,7 @@ genfs_do_putpages(struct vnode *vp, off_
(origflags PGO_JOURNALLOCKED) == 0);
retry:
- modified = false;
+ written = false;
flags = origflags;
KASSERT((vp-v_iflag VI_ONWORKLST) != 0 ||
(vp-v_iflag VI_WRMAPDIRTY) == 0);
@@ -938,7 +939,7 @@ retry:
error = 0;
wasclean = (vp-v_numoutput == 0);
- off = startoff;
+ nextoff = startoff;
if (endoff == 0 || flags PGO_ALLPAGES) {
endoff = trunc_page(LLONG_MAX);
}
@@ -967,7 +968,7 @@ retry:
for (;;) {
bool protected;
- pg = uvm_page_array_fill_and_peek(a, uobj, off, 0,
+ pg = uvm_page_array_fill_and_peek(a, uobj, nextoff, 0,
dirtyonly ? UVM_PAGE_ARRAY_FILL_DIRTYONLY : 0);
if (pg == NULL) {
break;
@@ -981,7 +982,7 @@ retry:
KASSERT((pg-flags (PG_RELEASED|PG_PAGEOUT)) == 0 ||
(pg-flags (PG_BUSY)) != 0);
KASSERT(pg-offset = startoff);
- KASSERT(pg-offset = off);
+ KASSERT(pg-offset = nextoff);
KASSERT(!dirtyonly ||
uvm_pagegetdirty(pg) != UVM_PAGE_STATUS_CLEAN);
if (pg-offset = endoff) {
@@ -990,7 +991,7 @@ retry:
if (pg-flags (PG_RELEASED|PG_PAGEOUT)) {
KASSERT((pg-flags PG_BUSY) != 0);
wasclean = false;
- off = pg-offset + PAGE_SIZE;
+ nextoff = pg-offset + PAGE_SIZE;
uvm_page_array_advance(a);
continue;
}
@@ -1018,7 +1019,7 @@ retry:
*/
break;
}
- off = pg-offset; /* visit this page again */
+ nextoff = pg-offset; /* visit this page again */
if ((pg-flags PG_BUSY) != 0) {
pg-flags |= PG_WANTED;
UVM_UNLOCK_AND_WAIT(pg, slock, 0, genput, 0);
@@ -1036,7 +1037,7 @@ retry:
continue;
}
- off = pg-offset + PAGE_SIZE;
+ nextoff = pg-offset + PAGE_SIZE;
uvm_page_array_advance(a);
/*
@@ -1097,13 +1098,14 @@ retry:
pg-flags |= PG_BUSY;
UVM_PAGE_OWN(pg, genfs_putpages);
+ fpflags = UFP_NOWAIT|UFP_NOALLOC|UFP_DIRTYONLY;
+
/*
* XXX PG_PAGER1 incompatibility check.
* this is a kludge for nfs.
* probably it's better to make PG_NEEDCOMMIT a first
* level citizen for uvm/genfs.
*/
- fpflags = UFP_NOWAIT|UFP_NOALLOC|UFP_DIRTYONLY;
if ((pg-flags PG_PAGER1) != 0) {
fpflags |= UFP_ONLYPAGER1;
} else {
@@ -1112,20 +1114,31 @@ retry:
/*
* first look backward.
+ *
+ * because we always scan pages in the ascending order,
+ * backward
CVS commit: src/sys/common/pmap/tlb
Module Name:src
Committed By: skrll
Date: Wed Jan 18 07:17:09 UTC 2012
Modified Files:
src/sys/common/pmap/tlb: pmap.c
Log Message:
thinko in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/common/pmap/tlb/pmap.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/common/pmap/tlb/pmap.c
diff -u src/sys/common/pmap/tlb/pmap.c:1.11 src/sys/common/pmap/tlb/pmap.c:1.12
--- src/sys/common/pmap/tlb/pmap.c:1.11 Fri Jan 6 09:41:17 2012
+++ src/sys/common/pmap/tlb/pmap.c Wed Jan 18 07:17:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.11 2012/01/06 09:41:17 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.12 2012/01/18 07:17:09 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.11 2012/01/06 09:41:17 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.12 2012/01/18 07:17:09 skrll Exp $);
/*
* Manages physical address maps.
@@ -717,7 +717,7 @@ pmap_page_protect(struct vm_page *pg, vm
(void)VM_PAGEMD_PVLIST_LOCK(mdpg, false);
pv = mdpg-mdpg_first;
/*
- * Loop over all current mappings setting/clearing as apropos.
+ * Loop over all current mappings setting/clearing as appropriate.
*/
if (pv-pv_pmap != NULL) {
while (pv != NULL) {
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: mbalmer Date: Tue Jan 17 08:13:42 UTC 2012 Modified Files: src/distrib/sets/lists/man: mi Log Message: Add uts(4) man pages To generate a diff of this commit: cvs rdiff -u -r1.1369 -r1.1370 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Jan 17 08:20:58 UTC 2012 Modified Files: src/share/man/man4: ipsec.4 kame_ipsec.4 Log Message: New sentence, new line. Bump date for previous. Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/share/man/man4/ipsec.4 cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/kame_ipsec.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/drvctl
Module Name:src Committed By: wiz Date: Tue Jan 17 08:22:09 UTC 2012 Modified Files: src/sbin/drvctl: drvctl.c Log Message: Add -n to usage. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sbin/drvctl/drvctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Jan 17 08:23:40 UTC 2012 Modified Files: src/share/man/man4: wsmouse.4 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/wsmouse.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/puffs
Module Name:src Committed By: martin Date: Tue Jan 17 09:30:16 UTC 2012 Modified Files: src/sys/fs/puffs: puffs_vnops.c Log Message: Add a few KASSERT() - I have a crash that likely will cause one of them to fire... To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/sys/fs/puffs/puffs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: cegger Date: Tue Jan 17 10:47:28 UTC 2012 Modified Files: src/share/man/man9: kauth.9 secmodel_securelevel.9 src/sys/kern: kern_cpu.c src/sys/secmodel/securelevel: secmodel_securelevel.c src/sys/secmodel/suser: secmodel_suser.c src/sys/sys: kauth.h Log Message: fix secmodel implementation of CPU_UCODE. ok wiz@ for the manpages ok elad@ To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/share/man/man9/kauth.9 cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/secmodel_securelevel.9 cvs rdiff -u -r1.53 -r1.54 src/sys/kern/kern_cpu.c cvs rdiff -u -r1.25 -r1.26 \ src/sys/secmodel/securelevel/secmodel_securelevel.c cvs rdiff -u -r1.37 -r1.38 src/sys/secmodel/suser/secmodel_suser.c cvs rdiff -u -r1.67 -r1.68 src/sys/sys/kauth.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Tue Jan 17 10:56:56 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: db_trace.c Log Message: Remove comment that shouldn't have crept in. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/hppa/db_trace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Tue Jan 17 12:08:43 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: db_disasm.c Log Message: Add some space to the output. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/hppa/db_disasm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Tue Jan 17 12:32:52 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: db_disasm.c Log Message: Fix the symbol lookup on branches, etc. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/hppa/db_disasm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Tue Jan 17 15:38:44 UTC 2012 Modified Files: src/doc: TODO.clang Log Message: ah_regdomain.c doesn't use -Wno-error anymore. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/doc/TODO.clang Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: nonaka Date: Tue Jan 17 15:43:55 UTC 2012 Modified Files: src/sys/dev: TODO.audiomp Log Message: zaudio(4) works fine for me. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/TODO.audiomp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/zaurus/zaurus
Module Name:src Committed By: nonaka Date: Tue Jan 17 15:48:33 UTC 2012 Modified Files: src/sys/arch/zaurus/zaurus: kloader_zaurus.S Log Message: fix struct kloader_bootinfo address. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/zaurus/kloader_zaurus.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Jan 17 15:51:56 UTC 2012 Modified Files: src/external/bsd/llvm: Makefile.inc src/external/bsd/llvm/lib: Makefile src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMRuntimeDyld: Makefile Added Files: src/external/bsd/llvm/lib/libLLVMMipsAsmParser: Makefile src/tools/llvm-lib/libLLVMMipsAsmParser: Makefile Log Message: Update LLVM/Clang snapshot to r148262 for some bugfixes. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/external/bsd/llvm/Makefile.inc cvs rdiff -u -r1.17 -r1.18 src/external/bsd/llvm/lib/Makefile cvs rdiff -u -r1.13 -r1.14 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libLLVMMipsAsmParser/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libLLVMMipsAsmParser/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/llvm/config/clang/Basic
Module Name:src Committed By: joerg Date: Tue Jan 17 15:53:25 UTC 2012 Modified Files: src/external/bsd/llvm/config/clang/Basic: Version.inc Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/config/clang/Basic/Version.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:14:47 UTC 2012 Modified Files: src/sys/dev/ic: nslm7xvar.h Log Message: Include sysmonvar.h for envsys types. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/nslm7xvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Tue Jan 17 16:27:15 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: sqlite-3.7.10 out. To generate a diff of this commit: cvs rdiff -u -r1.896 -r1.897 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs_lfs
Module Name:src Committed By: perseant Date: Tue Jan 17 16:27:19 UTC 2012 Modified Files: src/sbin/newfs_lfs: make_lfs.c Log Message: Use an even smaller segment size when creating a very small filesystem. This allows the lfs_renamerace_dirs case of the t_renamerace test to fail correctly, rather than with a bogus file system full error as it has since rev 1.135 of sys/ufs/lfs/lfs.h. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sbin/newfs_lfs/make_lfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:28:34 UTC 2012 Modified Files: src/sys/dev/isa: wbsio.c Log Message: Add NULL pmf handlers. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/isa/wbsio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:32:04 UTC 2012 Modified Files: src/sys/dev/isa: wbsio.c Log Message: Add and enable detachment and child detachment functions. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/isa/wbsio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:34:52 UTC 2012 Modified Files: src/sys/dev/isa: wbsio.c Log Message: Add module glue. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/wbsio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:50:08 UTC 2012 Modified Files: src/sys/dev/isa: lm_isa.c Added Files: src/sys/dev/isa: lm_isa_common.c lm_isa_common_var.h lm_wbsio.c src/sys/modules/lm: Makefile src/sys/modules/lm_isa: Makefile lm_isa.ioconf src/sys/modules/lm_isa_common: Makefile src/sys/modules/lm_wbsio: Makefile lm_wbsio.ioconf src/sys/modules/wbsio: Makefile wbsio.ioconf Log Message: Modularize lm_isa and lm_wbsio, splitting the common part out into a 3rd module. Add wbsio module too. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/isa/lm_isa.c cvs rdiff -u -r0 -r1.1 src/sys/dev/isa/lm_isa_common.c \ src/sys/dev/isa/lm_isa_common_var.h src/sys/dev/isa/lm_wbsio.c cvs rdiff -u -r0 -r1.1 src/sys/modules/lm/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/lm_isa/Makefile \ src/sys/modules/lm_isa/lm_isa.ioconf cvs rdiff -u -r0 -r1.1 src/sys/modules/lm_isa_common/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/lm_wbsio/Makefile \ src/sys/modules/lm_wbsio/lm_wbsio.ioconf cvs rdiff -u -r0 -r1.1 src/sys/modules/wbsio/Makefile \ src/sys/modules/wbsio/wbsio.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:59:38 UTC 2012 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Log Message: Add lm, lm_isa_common, lm_isa, lm_wbsio and wbsio modules to the x86 build. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.100 -r1.101 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 17:17:15 UTC 2012 Modified Files: src/sys/dev/isa: lm_isa_common.c wbsio.c Log Message: No module dependencies are denoted with NULL. Pointed out by jmcneill. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/lm_isa_common.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/isa/wbsio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: jakllsch Date: Tue Jan 17 17:24:02 UTC 2012 Modified Files: src/share/man/man4: uslsa.4 Log Message: Update based on recent changes to uslsa(4). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/uslsa.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Jan 17 17:27:32 UTC 2012 Modified Files: src/share/man/man4: uslsa.4 Log Message: Dd wants full months. Use Rs/Re for reference (only title filled in for now, more would be nice). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/uslsa.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/perfused
Module Name:src Committed By: joerg Date: Tue Jan 17 17:58:36 UTC 2012 Modified Files: src/usr.sbin/perfused: perfused.c Log Message: Rename perfuse_mount to not conflict with libperfuse. Mark it and perfuse_trace as static. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/perfused/perfused.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 18:04:46 UTC 2012 Modified Files: src/sys/dev/isa: wbsio.c Log Message: Make this compile. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/isa/wbsio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Tue Jan 17 18:05:15 UTC 2012 Modified Files: src/sys/dev/isa: files.isa Log Message: update for wbsio and lm changes To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/dev/isa/files.isa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: veego Date: Tue Jan 17 18:11:28 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Back out all changes for rev 1.346 which are not related to PR/45850 Should fix the reported build problem from Paul Goyette To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/crash
Module Name:src Committed By: skrll Date: Tue Jan 17 18:44:25 UTC 2012 Modified Files: src/usr.sbin/crash: Makefile Removed Files: src/usr.sbin/crash: ldscript.crash Log Message: Remove workaround for old binutils. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/crash/Makefile cvs rdiff -u -r1.1 -r0 src/usr.sbin/crash/ldscript.crash Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: joerg Date: Tue Jan 17 18:53:25 UTC 2012 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi Log Message: kpasswd depends on MKKERBEROS, not USE_KERBEROS To generate a diff of this commit: cvs rdiff -u -r1.976 -r1.977 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1370 -r1.1371 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Tue Jan 17 19:13:23 UTC 2012 Modified Files: src/sys/dev/pci: voodoofb.c Log Message: support DDC2, pick an appropriate video mode if a data are found To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/voodoofb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: njoly
Date: Tue Jan 17 19:40:08 UTC 2012
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
For xkb_base, do not use ${libdir} (xkeyboard-config.pc does not define
it) but its value ${prefix}/lib instead.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Tue Jan 17 19:46:55 UTC 2012 Modified Files: src/sys/arch/usermode/usermode: trap.c Log Message: Clean up userret/ast handling. Now called ONLY when its 100% clear that it is returning to userland. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/usermode/usermode/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Jan 17 20:34:58 UTC 2012 Modified Files: src/lib/libpthread: pthread_int.h src/sys/arch/sun2/include: types.h src/sys/arch/vax/include: types.h src/tests/lib/libc/tls: t_tls_dlopen.c t_tls_dynamic.c t_tls_static.c t_tls_static_helper.c src/tests/lib/libc/tls/dso: h_tls_dlopen.c src/tests/lib/libc/tls_dso: h_tls_dynamic.c src/tests/libexec/ld.elf_so/helper_dso1: h_helper_dso1.c Log Message: Introduce __HAVE_NO___THREAD for sun2 and vax to disable the TLS usage. Require __HAVE_TLS_VARIANT_I or __HAVE_TLS_VARIANT_II as well as __lwp_getprivate_fast / __lwp_gettcb_fast to exist for libpthread. Define VAX as going to use TLS variant I, if it is ever implemented. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/lib/libpthread/pthread_int.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sun2/include/types.h cvs rdiff -u -r1.43 -r1.44 src/sys/arch/vax/include/types.h cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/tls/t_tls_dlopen.c \ src/tests/lib/libc/tls/t_tls_dynamic.c cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/tls/t_tls_static.c \ src/tests/lib/libc/tls/t_tls_static_helper.c cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/tls/dso/h_tls_dlopen.c cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/tls_dso/h_tls_dynamic.c cvs rdiff -u -r1.3 -r1.4 \ src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Tue Jan 17 20:50:39 UTC 2012 Modified Files: src/sys/arch/usermode/usermode: trap.c Log Message: Do init the astpending variable. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/usermode/usermode/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Tue Jan 17 21:31:46 UTC 2012 Modified Files: src/sys/dev/pci: voodoofb.c Log Message: we don't access video memory directly, no need to map it To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/voodoofb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: njoly Date: Tue Jan 17 22:18:54 UTC 2012 Modified Files: src/share/man/man4/man4.x86: balloon.4 Log Message: Remove bad indent keyword. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/man4.x86/balloon.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Wed Jan 18 00:11:43 UTC 2012 Modified Files: src/sys/dev/isa: lm_isa_common.c Log Message: Improve module dependencies, clean up old #if 0 code. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/lm_isa_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Wed Jan 18 00:14:32 UTC 2012 Modified Files: src/sys/dev/isa: lm_wbsio.c Log Message: Improve module dependency list. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/lm_wbsio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: jakllsch Date: Wed Jan 18 00:23:30 UTC 2012 Modified Files: src/sys/dev/isa: wbsio.c Log Message: wbsio(4) rescan support. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/wbsio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [yamt-pagecache] src/sys
Module Name:src Committed By: yamt Date: Wed Jan 18 02:09:06 UTC 2012 Modified Files: src/sys/miscfs/genfs [yamt-pagecache]: genfs_io.c src/sys/uvm [yamt-pagecache]: uvm_loan.c uvm_page_array.c uvm_page_status.c uvm_vnode.c Log Message: - bug fixes - minor optimizations - assertions - comments To generate a diff of this commit: cvs rdiff -u -r1.53.2.7 -r1.53.2.8 src/sys/miscfs/genfs/genfs_io.c cvs rdiff -u -r1.81.2.11 -r1.81.2.12 src/sys/uvm/uvm_loan.c cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/uvm/uvm_page_array.c cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/uvm/uvm_page_status.c cvs rdiff -u -r1.97.2.3 -r1.97.2.4 src/sys/uvm/uvm_vnode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
