CVS commit: src/lib/libcurses

[Brett Lymn]

Module Name:src
Committed By:   blymn
Date:   Thu Feb 10 08:54:13 UTC 2011

Modified Files:
src/lib/libcurses: curses_chgat.3

Log Message:
Fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libcurses/curses_chgat.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libcurses/curses_chgat.3
diff -u src/lib/libcurses/curses_chgat.3:1.4 src/lib/libcurses/curses_chgat.3:1.5
--- src/lib/libcurses/curses_chgat.3:1.4	Sun Jul 12 23:14:06 2009
+++ src/lib/libcurses/curses_chgat.3	Thu Feb 10 08:54:12 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: curses_chgat.3,v 1.4 2009/07/12 23:14:06 wiz Exp $
+.\ $NetBSD: curses_chgat.3,v 1.5 2011/02/10 08:54:12 blymn Exp $
 .\
 .\ Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -65,7 +65,7 @@
 .Fa color .
 If
 .Fa n
-is negative or larger than the reminder of the line, it gets truncated.
+is negative or larger than the remainder of the line, it gets truncated.
 .Pp
 The
 .Fn wchgat

CVS commit: src/sys/arch/x86/x86

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Thu Feb 10 10:21:40 UTC 2011

Modified Files:
src/sys/arch/x86/x86: genfb_machdep.c

Log Message:
Unfortunately the current MTRR code can't grow an existing WC mapping, and
since we don't know the total framebuffer size setting up an MTRR here
would prevent X from creating a larger one later.

Instead map the framebuffer with BUS_SPACE_MAP_PREFETCHABLE and hope that
PAT is supported.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/x86/genfb_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/genfb_machdep.c
diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.7 src/sys/arch/x86/x86/genfb_machdep.c:1.8
--- src/sys/arch/x86/x86/genfb_machdep.c:1.7	Wed Feb  9 13:24:24 2011
+++ src/sys/arch/x86/x86/genfb_machdep.c	Thu Feb 10 10:21:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.c,v 1.7 2011/02/09 13:24:24 jmcneill Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.8 2011/02/10 10:21:40 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb_machdep.c,v 1.7 2011/02/09 13:24:24 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb_machdep.c,v 1.8 2011/02/10 10:21:40 jmcneill Exp $);
 
 #include opt_mtrr.h
 
@@ -100,6 +100,7 @@
 void
 x86_genfb_mtrr_init(uint64_t physaddr, uint32_t size)
 {
+#if notyet
 #ifdef MTRR
 	struct mtrr mtrr;
 	int error, n;
@@ -129,6 +130,7 @@
 #else
 	aprint_debug(%s: kernel lacks MTRR option\n, __func__);
 #endif
+#endif
 }
 
 int
@@ -158,7 +160,7 @@
 
 	err = _x86_memio_map(t, (bus_addr_t)fbinfo-physaddr,
 	fbinfo-width * fbinfo-stride,
-	BUS_SPACE_MAP_LINEAR, h);
+	BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE, h);
 	if (err) {
 		aprint_error(x86_genfb_cnattach: couldn't map framebuffer\n);
 		return 0;

CVS commit: src/sys/dev/pci

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Thu Feb 10 10:23:20 UTC 2011

Modified Files:
src/sys/dev/pci: genfb_pci.c

Log Message:
Use BUS_SPACE_MAP_PREFETCHABLE when mapping the framebuffer.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/genfb_pci.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/genfb_pci.c
diff -u src/sys/dev/pci/genfb_pci.c:1.28 src/sys/dev/pci/genfb_pci.c:1.29
--- src/sys/dev/pci/genfb_pci.c:1.28	Wed Feb  9 13:19:53 2011
+++ src/sys/dev/pci/genfb_pci.c	Thu Feb 10 10:23:20 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfb_pci.c,v 1.28 2011/02/09 13:19:53 jmcneill Exp $ */
+/*	$NetBSD: genfb_pci.c,v 1.29 2011/02/10 10:23:20 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb_pci.c,v 1.28 2011/02/09 13:19:53 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb_pci.c,v 1.29 2011/02/10 10:23:20 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -132,8 +132,9 @@
 	}
 
 	if (bus_space_map(sc-sc_memt, sc-sc_gen.sc_fboffset,
-	sc-sc_gen.sc_fbsize, BUS_SPACE_MAP_LINEAR, sc-sc_memh) != 0) {
-
+	sc-sc_gen.sc_fbsize,
+	BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE,
+	sc-sc_memh) != 0) {
 		aprint_error_dev(self, unable to map the framebuffer\n);
 		return;
 	}
@@ -244,7 +245,8 @@
 	(sc-sc_want_wsfb == 1)) {
 
 		return bus_space_mmap(sc-sc_memt, sc-sc_gen.sc_fboffset,
-		   offset, prot, BUS_SPACE_MAP_LINEAR);
+		   offset, prot,
+		   BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE);
 	}
 
 	/*

CVS commit: src/sys/arch/hp300/stand/common

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 10 10:44:23 UTC 2011

Modified Files:
src/sys/arch/hp300/stand/common: ite.c ite_subr.c itevar.h

Log Message:
All framebuffer drivers use common readbyte and writeglyph functions
so no need to put them into per driver function pointers. From OpenBSD.

Tested on HP382 (serial) and HP425t (topcat).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp300/stand/common/ite.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/stand/common/ite_subr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp300/stand/common/itevar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hp300/stand/common/ite.c
diff -u src/sys/arch/hp300/stand/common/ite.c:1.11 src/sys/arch/hp300/stand/common/ite.c:1.12
--- src/sys/arch/hp300/stand/common/ite.c:1.11	Tue Feb  8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/ite.c	Thu Feb 10 10:44:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.11 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: ite.c,v 1.12 2011/02/10 10:44:22 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -64,35 +64,35 @@
 struct itesw itesw[] = {
 	{ GID_TOPCAT,
 	topcat_init,	ite_deinit_noop, topcat_clear,	topcat_putc,
-	topcat_cursor,	topcat_scroll,	ite_readbyte,	ite_writeglyph },
+	topcat_cursor,	topcat_scroll },
 
 	{ GID_GATORBOX,
 	gbox_init,	ite_deinit_noop, gbox_clear,	gbox_putc,
-	gbox_cursor,	gbox_scroll,	ite_readbyte,	ite_writeglyph },
+	gbox_cursor,	gbox_scroll },
 
 	{ GID_RENAISSANCE,
 	rbox_init,	ite_deinit_noop, rbox_clear,	rbox_putc,
-	rbox_cursor,	rbox_scroll,	ite_readbyte,	ite_writeglyph },
+	rbox_cursor,	rbox_scroll },
 
 	{ GID_LRCATSEYE,
 	topcat_init,	ite_deinit_noop, topcat_clear,	topcat_putc,
-	topcat_cursor,	topcat_scroll,	ite_readbyte,	ite_writeglyph },
+	topcat_cursor,	topcat_scroll },
 
 	{ GID_HRCCATSEYE,
 	topcat_init,	ite_deinit_noop, topcat_clear,	topcat_putc,
-	topcat_cursor,	topcat_scroll,	ite_readbyte,	ite_writeglyph },
+	topcat_cursor,	topcat_scroll },
 
 	{ GID_HRMCATSEYE,
 	topcat_init,	ite_deinit_noop, topcat_clear,	topcat_putc,
-	topcat_cursor,	topcat_scroll,	ite_readbyte,	ite_writeglyph },
+	topcat_cursor,	topcat_scroll },
 
 	{ GID_DAVINCI,
   	dvbox_init,	ite_deinit_noop, dvbox_clear,	dvbox_putc,
-	dvbox_cursor,	dvbox_scroll,	ite_readbyte,	ite_writeglyph },
+	dvbox_cursor,	dvbox_scroll },
 
 	{ GID_HYPERION,
 	hyper_init,	ite_deinit_noop, hyper_clear,	hyper_putc,
-	hyper_cursor,	hyper_scroll,	ite_readbyte,	ite_writeglyph },
+	hyper_cursor,	hyper_scroll },
 };
 int	nitesw = sizeof(itesw) / sizeof(itesw[0]);
 

Index: src/sys/arch/hp300/stand/common/ite_subr.c
diff -u src/sys/arch/hp300/stand/common/ite_subr.c:1.7 src/sys/arch/hp300/stand/common/ite_subr.c:1.8
--- src/sys/arch/hp300/stand/common/ite_subr.c:1.7	Tue Feb  8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/ite_subr.c	Thu Feb 10 10:44:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_subr.c,v 1.7 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: ite_subr.c,v 1.8 2011/02/10 10:44:22 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -47,6 +47,8 @@
 #include hp300/stand/common/samachdep.h
 #include hp300/stand/common/itevar.h
 
+static void ite_writeglyph(struct ite_data *, u_char *, u_char *);
+
 void
 ite_fontinfo(struct ite_data *ip)
 {
@@ -99,21 +101,11 @@
 			*dp++ = getbyte(ip, romp);
 			romp += 2;
 		}
-		writeglyph(ip, fbmem, fontbuf);
+		ite_writeglyph(ip, fbmem, fontbuf);
 	}
 }
 
-/*
- * Display independent versions of the readbyte and writeglyph routines.
- */
-u_char
-ite_readbyte(struct ite_data *ip, int disp)
-{
-
-	return (u_char)*(((u_char *)ip-regbase) + disp);
-}
-
-void
+static void
 ite_writeglyph(struct ite_data *ip, u_char *fbmem, u_char *glyphp)
 {
 	int bn;

Index: src/sys/arch/hp300/stand/common/itevar.h
diff -u src/sys/arch/hp300/stand/common/itevar.h:1.8 src/sys/arch/hp300/stand/common/itevar.h:1.9
--- src/sys/arch/hp300/stand/common/itevar.h:1.8	Tue Feb  8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/itevar.h	Thu Feb 10 10:44:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: itevar.h,v 1.8 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: itevar.h,v 1.9 2011/02/10 10:44:23 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,14 +45,11 @@
 #define ITEUNIT(dev)   minor(dev)
 
 #define getbyte(ip, offset) \
-	((*(ip)-isw-ite_readbyte)(ip, offset))
+	*(((u_char *)(ip)-regbase) + (offset))
 
 #define getword(ip, offset) \
 	((getbyte(ip, offset)  8) | getbyte(ip, (offset) + 2))
 
-#define writeglyph(ip, offset, fontbuf) \
-	((*(ip)-isw-ite_writeglyph)((ip), (offset), (fontbuf)))
-
 struct ite_data {
 	int	flags;
 	struct	tty *tty;
@@ -84,8 +81,6 @@
 	void	(*ite_putc)(struct ite_data *, int, int, int, int);
 	void	(*ite_cursor)(struct ite_data *, int);
 	void	(*ite_scroll)(struct ite_data *, int, int, int, int);
-	u_char	(*ite_readbyte)(struct ite_data *, int);
-	void	

CVS commit: src/sys/arch/hp300/stand/common

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 10 10:52:01 UTC 2011

Modified Files:
src/sys/arch/hp300/stand/common: itevar.h

Log Message:
bcopy() - memmove()

How did this one survive several sweeps?


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/common/itevar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hp300/stand/common/itevar.h
diff -u src/sys/arch/hp300/stand/common/itevar.h:1.9 src/sys/arch/hp300/stand/common/itevar.h:1.10
--- src/sys/arch/hp300/stand/common/itevar.h:1.9	Thu Feb 10 10:44:23 2011
+++ src/sys/arch/hp300/stand/common/itevar.h	Thu Feb 10 10:52:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: itevar.h,v 1.9 2011/02/10 10:44:23 tsutsui Exp $	*/
+/*	$NetBSD: itevar.h,v 1.10 2011/02/10 10:52:01 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -99,9 +99,9 @@
 	memset(ip-attrbuf + ((sy) * ip-cols) + (sx), 0, (h) * (w))
   
 #define attrmov(ip, sy, sx, dy, dx, h, w) \
-	bcopy(ip-attrbuf + ((sy) * ip-cols) + (sx), \
-	  ip-attrbuf + ((dy) * ip-cols) + (dx), \
-	  (h) * (w))
+	memmove(ip-attrbuf + ((dy) * ip-cols) + (dx), \
+	ip-attrbuf + ((sy) * ip-cols) + (sx), \
+	(h) * (w))
 
 #define attrtest(ip, attr) \
 	((* (u_char *) attrloc(ip, ip-cury, ip-curx))  attr)

CVS commit: src/sys

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 11:00:45 UTC 2011

Modified Files:
src/sys/rump/librump/rumpvfs: devnodes.c
src/sys/sys: conf.h

Log Message:
Make it possible to specify a minor number for an autogenerated device node.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpvfs/devnodes.c
cvs rdiff -u -r1.138 -r1.139 src/sys/sys/conf.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/rump/librump/rumpvfs/devnodes.c
diff -u src/sys/rump/librump/rumpvfs/devnodes.c:1.5 src/sys/rump/librump/rumpvfs/devnodes.c:1.6
--- src/sys/rump/librump/rumpvfs/devnodes.c:1.5	Fri Apr 30 21:02:36 2010
+++ src/sys/rump/librump/rumpvfs/devnodes.c	Thu Feb 10 11:00:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: devnodes.c,v 1.5 2010/04/30 21:02:36 pooka Exp $	*/
+/*	$NetBSD: devnodes.c,v 1.6 2011/02/10 11:00:45 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: devnodes.c,v 1.5 2010/04/30 21:02:36 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: devnodes.c,v 1.6 2011/02/10 11:00:45 pooka Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -170,6 +170,7 @@
 rump_vfs_builddevs(struct devsw_conv *dcvec, size_t dcvecsize)
 {
 	char *pnbuf = PNBUF_GET();
+	devminor_t themin;
 	struct devsw_conv *dc;
 	size_t i;
 	int v1, v2;
@@ -181,8 +182,14 @@
 		case DEVNODE_DONTBOTHER:
 			break;
 		case DEVNODE_SINGLE:
+			if (dc-d_flags  DEVNODE_FLAG_ISMINOR0) {
+themin = dc-d_vectdim[0];
+			} else {
+themin = 0;
+			}
 			makeonenode(pnbuf,
-			dc-d_bmajor, dc-d_cmajor, 0, dc-d_name, -1, -1);
+			dc-d_bmajor, dc-d_cmajor, themin,
+			dc-d_name, -1, -1);
 			break;
 		case DEVNODE_VECTOR:
 			for (v1 = 0; v1  dc-d_vectdim[0]; v1++) {

Index: src/sys/sys/conf.h
diff -u src/sys/sys/conf.h:1.138 src/sys/sys/conf.h:1.139
--- src/sys/sys/conf.h:1.138	Wed Jan  5 17:00:25 2011
+++ src/sys/sys/conf.h	Thu Feb 10 11:00:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.h,v 1.138 2011/01/05 17:00:25 jmcneill Exp $	*/
+/*	$NetBSD: conf.h,v 1.139 2011/02/10 11:00:45 pooka Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -231,9 +231,13 @@
 enum devnode_class {
 	DEVNODE_DONTBOTHER,
 	DEVNODE_SINGLE,
-	DEVNODE_VECTOR
+	DEVNODE_VECTOR,
 };
 #define DEVNODE_FLAG_LINKZERO	0x01	/* create name - name0 link */
+#define DEVNODE_FLAG_ISMINOR0	0x02	/* vector[0] specifies minor */
+#ifdef notyet
+#define DEVNODE_FLAG_ISMINOR1	0x04	/* vector[1] specifies starting minor */
+#endif
 
 struct devsw_conv {
 	const char *d_name;

CVS commit: src/sys/rump/librump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 11:01:31 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: devsw.c
src/sys/rump/librump/rumpvfs: devnull.c

Log Message:
support /dev/zero


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpkern/devsw.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpvfs/devnull.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/rump/librump/rumpkern/devsw.c
diff -u src/sys/rump/librump/rumpkern/devsw.c:1.5 src/sys/rump/librump/rumpkern/devsw.c:1.6
--- src/sys/rump/librump/rumpkern/devsw.c:1.5	Mon Nov 22 20:29:15 2010
+++ src/sys/rump/librump/rumpkern/devsw.c	Thu Feb 10 11:01:31 2011
@@ -43,7 +43,8 @@
 	{ rumpblk, 197, 197, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
 	{ cons, -1, 0, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
 	{ ctty, -1, 1, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
-	{ null, -1, 2, DEVNODE_SINGLE, 0, { 0, 0 }},
+	{ null, -1, 2, DEVNODE_SINGLE, DEVNODE_FLAG_ISMINOR0, { DEV_NULL,0 }},
+	{ zero, -1, 2, DEVNODE_SINGLE, DEVNODE_FLAG_ISMINOR0, { DEV_ZERO,0 }},
 	{ wd, 0, 3, DEVNODE_VECTOR, 0, { 8, 8 }},
 	{ swap, 1, 4, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
 	{ pts, -1, 5, DEVNODE_DONTBOTHER, 0, { 0, 0 }},

Index: src/sys/rump/librump/rumpvfs/devnull.c
diff -u src/sys/rump/librump/rumpvfs/devnull.c:1.2 src/sys/rump/librump/rumpvfs/devnull.c:1.3
--- src/sys/rump/librump/rumpvfs/devnull.c:1.2	Wed Jul  7 10:47:39 2010
+++ src/sys/rump/librump/rumpvfs/devnull.c	Thu Feb 10 11:01:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: devnull.c,v 1.2 2010/07/07 10:47:39 pooka Exp $	*/
+/*	$NetBSD: devnull.c,v 1.3 2011/02/10 11:01:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: devnull.c,v 1.2 2010/07/07 10:47:39 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: devnull.c,v 1.3 2011/02/10 11:01:31 pooka Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -67,14 +67,38 @@
 rump_devnullopen(dev_t dev, int flag, int mode, struct lwp *l)
 {
 
-	return 0;
+	if (minor(dev) == DEV_ZERO || minor(dev) == DEV_NULL)
+		return 0;
+	return ENXIO;
 }
 
 static int
 rump_devnullrw(dev_t dev, struct uio *uio, int flags)
 {
+	char zeros[512];
+	int error;
+
+	switch (minor(dev)) {
+	case DEV_NULL:
+		if (uio-uio_rw == UIO_WRITE)
+			uio-uio_resid = 0;
+		break;
+	case DEV_ZERO:
+		if (uio-uio_rw == UIO_WRITE) {
+			uio-uio_resid = 0;
+			break;
+		}
+		memset(zeros, 0, sizeof(zeros));
+		while (uio-uio_resid  0) {
+			error = uiomove(zeros,
+			min(sizeof(zeros), uio-uio_resid), uio);
+			if (error)
+return error;
+		}
+		break;
+	default:
+		return ENXIO; /* how? */
+	}
 
-	if (uio-uio_rw == UIO_WRITE)
-		uio-uio_resid = 0;
 	return 0;
 }

CVS commit: src/sys/arch/hp300/stand/common

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 10 11:08:24 UTC 2011

Modified Files:
src/sys/arch/hp300/stand/common: ite_dv.c ite_gb.c ite_hy.c ite_rb.c
ite_subr.c ite_tc.c itevar.h

Log Message:
Move and renamve hyper_ite_fontinit() to ite_fontinit1bpp() to share it
among all monochrome framebuffers.  Also rename ite_fontinit() to
ite_fontinit8bpp(). From OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp300/stand/common/ite_dv.c \
src/sys/arch/hp300/stand/common/ite_gb.c \
src/sys/arch/hp300/stand/common/ite_subr.c \
src/sys/arch/hp300/stand/common/ite_tc.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/common/ite_hy.c \
src/sys/arch/hp300/stand/common/itevar.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/common/ite_rb.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/hp300/stand/common/ite_dv.c
diff -u src/sys/arch/hp300/stand/common/ite_dv.c:1.8 src/sys/arch/hp300/stand/common/ite_dv.c:1.9
--- src/sys/arch/hp300/stand/common/ite_dv.c:1.8	Tue Feb  8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/ite_dv.c	Thu Feb 10 11:08:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_dv.c,v 1.8 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: ite_dv.c,v 1.9 2011/02/10 11:08:23 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -115,7 +115,7 @@
 	db_waitbusy(regbase);
 
 	ite_fontinfo(ip);
-	ite_fontinit(ip);
+	ite_fontinit8bpp(ip);
 
 	/*
 	 * Clear the (visible) framebuffer.
Index: src/sys/arch/hp300/stand/common/ite_gb.c
diff -u src/sys/arch/hp300/stand/common/ite_gb.c:1.8 src/sys/arch/hp300/stand/common/ite_gb.c:1.9
--- src/sys/arch/hp300/stand/common/ite_gb.c:1.8	Tue Feb  8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/ite_gb.c	Thu Feb 10 11:08:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_gb.c,v 1.8 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: ite_gb.c,v 1.9 2011/02/10 11:08:23 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -91,7 +91,7 @@
 	gbcm_waitbusy(regbase);
 
 	ite_fontinfo(ip);
-	ite_fontinit(ip);
+	ite_fontinit8bpp(ip);
 
 	/*
 	 * Clear the display. This used to be before the font unpacking
Index: src/sys/arch/hp300/stand/common/ite_subr.c
diff -u src/sys/arch/hp300/stand/common/ite_subr.c:1.8 src/sys/arch/hp300/stand/common/ite_subr.c:1.9
--- src/sys/arch/hp300/stand/common/ite_subr.c:1.8	Thu Feb 10 10:44:22 2011
+++ src/sys/arch/hp300/stand/common/ite_subr.c	Thu Feb 10 11:08:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_subr.c,v 1.8 2011/02/10 10:44:22 tsutsui Exp $	*/
+/*	$NetBSD: ite_subr.c,v 1.9 2011/02/10 11:08:23 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -82,7 +82,35 @@
 }
 
 void
-ite_fontinit(struct ite_data *ip)
+ite_fontinit1bpp(struct ite_data *ip)
+{
+	u_char *fbmem, *dp;
+	int c, l, b;
+	int stride, width;
+
+	dp = (u_char *)(getword(ip, getword(ip, FONTROM) + FONTADDR) +
+	(char *)ip-regbase) + FONTDATA;
+	stride = ip-fbwidth  3;
+	width = (ip-ftwidth + 7) / 8;
+
+	for (c = 0; c  128; c++) {
+		fbmem = (u_char *) FBBASE +
+			(ip-fonty + (c / ip-cpl) * ip-ftheight) *
+			stride;
+		fbmem += (ip-fontx  3) + (c % ip-cpl) * width;
+		for (l = 0; l  ip-ftheight; l++) {
+			for (b = 0; b  width; b++) {
+*fbmem++ = *dp;
+dp += 2;
+			}
+			fbmem -= width;
+			fbmem += stride;
+		}
+	}
+}
+
+void
+ite_fontinit8bpp(struct ite_data *ip)
 {
 	int bytewidth = (((ip-ftwidth - 1) / 8) + 1);
 	int glyphsize = bytewidth * ip-ftheight;
Index: src/sys/arch/hp300/stand/common/ite_tc.c
diff -u src/sys/arch/hp300/stand/common/ite_tc.c:1.8 src/sys/arch/hp300/stand/common/ite_tc.c:1.9
--- src/sys/arch/hp300/stand/common/ite_tc.c:1.8	Tue Feb  8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/ite_tc.c	Thu Feb 10 11:08:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_tc.c,v 1.8 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: ite_tc.c,v 1.9 2011/02/10 11:08:23 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -99,7 +99,7 @@
 	topcat_windowmove(ip, 0, 0, 0, 0, ip-fbheight, ip-fbwidth, RR_CLEAR);
 	tc_waitbusy(regbase, ip-planemask);
 
-	ite_fontinit(ip);
+	ite_fontinit8bpp(ip);
 
 	/*
 	 * Stash the inverted cursor.

Index: src/sys/arch/hp300/stand/common/ite_hy.c
diff -u src/sys/arch/hp300/stand/common/ite_hy.c:1.10 src/sys/arch/hp300/stand/common/ite_hy.c:1.11
--- src/sys/arch/hp300/stand/common/ite_hy.c:1.10	Tue Feb  8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/ite_hy.c	Thu Feb 10 11:08:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_hy.c,v 1.10 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: ite_hy.c,v 1.11 2011/02/10 11:08:23 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -55,7 +55,6 @@
 #define	charX(ip,c)	\
 	(((c) % (ip)-cpl) * ip)-ftwidth + 7) / 8) * 8) + (ip)-fontx)
 
-void hyper_ite_fontinit(struct ite_data *);
 void hyper_windowmove(struct ite_data *, int, int, int, int, int, int, int);
 
 

CVS commit: src/crypto/dist/ipsec-tools/src/racoon

[Timo Teräs]

Module Name:src
Committed By:   tteras
Date:   Thu Feb 10 11:17:17 UTC 2011

Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: prsa_par.y

Log Message:
From M E Andersson deb...@gisladisker.se: Fix parsing of restricted RSA
key addresses.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y
diff -u src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y:1.4 src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y:1.5
--- src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y:1.4	Sat Sep  9 16:22:10 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y	Thu Feb 10 11:17:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: prsa_par.y,v 1.4 2006/09/09 16:22:10 manu Exp $	*/
+/*	$NetBSD: prsa_par.y,v 1.5 2011/02/10 11:17:17 tteras Exp $	*/
 
 /* Id: prsa_par.y,v 1.3 2004/11/08 12:04:23 ludvigm Exp */
 
@@ -236,6 +236,7 @@
 	{
 		int err;
 		struct sockaddr_in *sap;
+		struct addrinfo hints, *res;
 		
 		if ($2 == -1) $2 = 32;
 		if ($2  0 || $2  32) {
@@ -245,12 +246,16 @@
 		$$ = calloc (sizeof(struct netaddr), 1);
 		$$-prefix = $2;
 		sap = (struct sockaddr_in *)($$-sa);
-		sap-sin_family = AF_INET;
-		err = inet_pton(AF_INET, $1, (struct in_addr*)(sap-sin_addr));
-		if (err = 0) {
-			prsaerror(inet_pton(%s): %s\n, $1, strerror(errno));
+		memset(hints, 0, sizeof(hints));
+		hints.ai_family = AF_INET;
+		hints.ai_flags = AI_NUMERICHOST;
+		err = getaddrinfo($1, NULL, hints, res);
+		if (err  0) {
+			prsaerror(getaddrinfo(%s): %s\n, $1, gai_strerror(err));
 			YYABORT;
 		}
+		memcpy(sap, res-ai_addr, res-ai_addrlen);
+		freeaddrinfo(res);
 	}
 	;
 
@@ -259,6 +264,7 @@
 	{
 		int err;
 		struct sockaddr_in6 *sap;
+		struct addrinfo hints, *res;
 		
 		if ($2 == -1) $2 = 128;
 		if ($2  0 || $2  128) {
@@ -268,12 +274,16 @@
 		$$ = calloc (sizeof(struct netaddr), 1);
 		$$-prefix = $2;
 		sap = (struct sockaddr_in6 *)($$-sa);
-		sap-sin6_family = AF_INET6;
-		err = inet_pton(AF_INET6, $1, (struct in6_addr*)(sap-sin6_addr));
-		if (err = 0) {
-			prsaerror(inet_pton(%s): %s\n, $1, strerror(errno));
+		memset(hints, 0, sizeof(hints));
+		hints.ai_family = AF_INET6;
+		hints.ai_flags = AI_NUMERICHOST;
+		err = getaddrinfo($1, NULL, hints, res);
+		if (err  0) {
+			prsaerror(getaddrinfo(%s): %s\n, $1, gai_strerror(err));
 			YYABORT;
 		}
+		memcpy(sap, res-ai_addr, res-ai_addrlen);
+		freeaddrinfo(res);
 	}
 	;
 

CVS commit: src/sys/arch/hp300/stand/common

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 10 11:17:21 UTC 2011

Modified Files:
src/sys/arch/hp300/stand/common: ite.c itevar.h

Log Message:
Remove unused deinit functions. From OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/ite.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp300/stand/common/itevar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hp300/stand/common/ite.c
diff -u src/sys/arch/hp300/stand/common/ite.c:1.12 src/sys/arch/hp300/stand/common/ite.c:1.13
--- src/sys/arch/hp300/stand/common/ite.c:1.12	Thu Feb 10 10:44:22 2011
+++ src/sys/arch/hp300/stand/common/ite.c	Thu Feb 10 11:17:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.12 2011/02/10 10:44:22 tsutsui Exp $	*/
+/*	$NetBSD: ite.c,v 1.13 2011/02/10 11:17:21 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -57,41 +57,40 @@
 #include hp300/stand/common/samachdep.h
 
 static void iteconfig(void);
-static void ite_deinit_noop(struct ite_data *);
 static void ite_clrtoeol(struct ite_data *, struct itesw *, int, int);
 static void itecheckwrap(struct ite_data *, struct itesw *);
 
 struct itesw itesw[] = {
 	{ GID_TOPCAT,
-	topcat_init,	ite_deinit_noop, topcat_clear,	topcat_putc,
+	topcat_init,	topcat_clear,	topcat_putc,
 	topcat_cursor,	topcat_scroll },
 
 	{ GID_GATORBOX,
-	gbox_init,	ite_deinit_noop, gbox_clear,	gbox_putc,
+	gbox_init,	gbox_clear,	gbox_putc,
 	gbox_cursor,	gbox_scroll },
 
 	{ GID_RENAISSANCE,
-	rbox_init,	ite_deinit_noop, rbox_clear,	rbox_putc,
+	rbox_init,	rbox_clear,	rbox_putc,
 	rbox_cursor,	rbox_scroll },
 
 	{ GID_LRCATSEYE,
-	topcat_init,	ite_deinit_noop, topcat_clear,	topcat_putc,
+	topcat_init,	topcat_clear,	topcat_putc,
 	topcat_cursor,	topcat_scroll },
 
 	{ GID_HRCCATSEYE,
-	topcat_init,	ite_deinit_noop, topcat_clear,	topcat_putc,
+	topcat_init,	topcat_clear,	topcat_putc,
 	topcat_cursor,	topcat_scroll },
 
 	{ GID_HRMCATSEYE,
-	topcat_init,	ite_deinit_noop, topcat_clear,	topcat_putc,
+	topcat_init,	topcat_clear,	topcat_putc,
 	topcat_cursor,	topcat_scroll },
 
 	{ GID_DAVINCI,
-  	dvbox_init,	ite_deinit_noop, dvbox_clear,	dvbox_putc,
+  	dvbox_init,	dvbox_clear,	dvbox_putc,
 	dvbox_cursor,	dvbox_scroll },
 
 	{ GID_HYPERION,
-	hyper_init,	ite_deinit_noop, hyper_clear,	hyper_putc,
+	hyper_init,	hyper_clear,	hyper_putc,
 	hyper_cursor,	hyper_scroll },
 };
 int	nitesw = sizeof(itesw) / sizeof(itesw[0]);
@@ -303,9 +302,3 @@
 #endif
 }
 #endif
-
-/* ARGSUSED */
-static void
-ite_deinit_noop(struct ite_data *ip)
-{
-}

Index: src/sys/arch/hp300/stand/common/itevar.h
diff -u src/sys/arch/hp300/stand/common/itevar.h:1.11 src/sys/arch/hp300/stand/common/itevar.h:1.12
--- src/sys/arch/hp300/stand/common/itevar.h:1.11	Thu Feb 10 11:08:23 2011
+++ src/sys/arch/hp300/stand/common/itevar.h	Thu Feb 10 11:17:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: itevar.h,v 1.11 2011/02/10 11:08:23 tsutsui Exp $	*/
+/*	$NetBSD: itevar.h,v 1.12 2011/02/10 11:17:21 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -76,7 +76,6 @@
 struct itesw {
 	int	ite_hwid;
 	void	(*ite_init)(struct ite_data *);
-	void	(*ite_deinit)(struct ite_data *);
 	void	(*ite_clear)(struct ite_data *, int, int, int, int);
 	void	(*ite_putc)(struct ite_data *, int, int, int, int);
 	void	(*ite_cursor)(struct ite_data *, int);

CVS commit: src/crypto/dist/ipsec-tools/src/racoon

[Timo Teräs]

Module Name:src
Committed By:   tteras
Date:   Thu Feb 10 11:20:08 UTC 2011

Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: plainrsa-gen.c

Log Message:
From Mats Erik Andersson deb...@gisladisker.se: Implement importing of
RSA keys from PEM files.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c:1.4 src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c:1.5
--- src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c:1.4	Sat Sep  9 16:22:10 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c	Thu Feb 10 11:20:08 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: plainrsa-gen.c,v 1.4 2006/09/09 16:22:10 manu Exp $	*/
+/*	$NetBSD: plainrsa-gen.c,v 1.5 2011/02/10 11:20:08 tteras Exp $	*/
 
 /* Id: plainrsa-gen.c,v 1.6 2005/04/21 09:08:40 monas Exp */
 /*
@@ -43,11 +43,13 @@
 #include sys/stat.h
 #include sys/socket.h
 #include unistd.h
+#include fcntl.h
 
 #include openssl/bio.h
 #include openssl/bn.h
 #include openssl/err.h
 #include openssl/objects.h
+#include openssl/pem.h
 #include openssl/rsa.h
 #include openssl/evp.h
 #ifdef HAVE_OPENSSL_ENGINE_H
@@ -72,6 +74,7 @@
 	fprintf(stderr,   -b bits   Generate bits long RSA key (default=1024)\n);
 	fprintf(stderr,   -e pubexp Public exponent to use (default=0x3)\n);
 	fprintf(stderr,   -f filename   Filename to store the key to (default=stdout)\n);
+	fprintf(stderr,   -i filename   Input source for format conversion\n);
 	fprintf(stderr,   -hHelp\n);
 	fprintf(stderr, \n);
 	fprintf(stderr, Report bugs to ipsec-tools-de...@lists.sourceforge.net\n);
@@ -82,7 +85,7 @@
  * See RFC 2065, section 3.5 for details about the output format.
  */
 vchar_t *
-mix_b64_pubkey(RSA *key)
+mix_b64_pubkey(const RSA *key)
 {
 	char *binbuf;
 	long binlen, ret;
@@ -116,17 +119,10 @@
 }
 
 int
-gen_rsa_key(FILE *fp, size_t bits, unsigned long exp)
+print_rsa_key(FILE *fp, const RSA *key)
 {
-	RSA *key;
 	vchar_t *pubkey64 = NULL;
 
-	key = RSA_generate_key(bits, exp, NULL, NULL);
-	if (!key) {
-		fprintf(stderr, RSA_generate_key(): %s\n, eay_strerror());
-		return -1;
-	}
-	
 	pubkey64 = mix_b64_pubkey(key);
 	if (!pubkey64) {
 		fprintf(stderr, mix_b64_pubkey(): %s\n, eay_strerror());
@@ -135,7 +131,7 @@
 	
 	fprintf(fp, # : PUB 0s%s\n, pubkey64-v);
 	fprintf(fp, : RSA\t{\n);
-	fprintf(fp, \t# RSA %zu bits\n, bits);
+	fprintf(fp, \t# RSA %zu bits\n, BN_num_bits(key-n));
 	fprintf(fp, \t# pubkey=0s%s\n, pubkey64-v);
 	fprintf(fp, \tModulus: 0x%s\n, lowercase(BN_bn2hex(key-n)));
 	fprintf(fp, \tPublicExponent: 0x%s\n, lowercase(BN_bn2hex(key-e)));
@@ -148,23 +144,92 @@
 	fprintf(fp,   }\n);
 
 	vfree(pubkey64);
+	return 0;
+}
+
+int
+print_public_rsa_key(FILE *fp, const RSA *key)
+{
+	vchar_t *pubkey64 = NULL;
 
+	pubkey64 = mix_b64_pubkey(key);
+	if (!pubkey64) {
+		fprintf(stderr, mix_b64_pubkey(): %s\n, eay_strerror());
+		return -1;
+	}
+	
+	fprintf(fp, : PUB 0s%s\n, pubkey64-v);
+
+	vfree(pubkey64);
 	return 0;
 }
 
 int
+convert_rsa_key(FILE *fpout, FILE *fpin)
+{
+	int ret;
+	RSA *key = NULL;
+
+	key = PEM_read_RSAPrivateKey(fpin, NULL, NULL, NULL);
+	if (key) {
+		ret = print_rsa_key(fpout, key);
+		RSA_free(key);
+
+		return ret;
+	}
+	
+	rewind(fpin);
+
+	key = PEM_read_RSA_PUBKEY(fpin, NULL, NULL, NULL);
+	if (key) {
+		ret = print_public_rsa_key(fpout, key);
+		RSA_free(key);
+
+		return ret;
+	}
+
+	/* Implement parsing of input stream containing
+	 * private or public plainrsa formatted text.
+	 * Convert the result to PEM formatted output.
+	 *
+	 * This seemingly needs manual use of prsaparse().
+	 * An expert ought to do this. */
+
+	fprintf(stderr, convert_rsa_key: %s\n, Only conversion from PEM at this time);
+	return -1;
+}
+
+int
+gen_rsa_key(FILE *fp, size_t bits, unsigned long exp)
+{
+	int ret;
+	RSA *key;
+
+	key = RSA_generate_key(bits, exp, NULL, NULL);
+	if (!key) {
+		fprintf(stderr, RSA_generate_key(): %s\n, eay_strerror());
+		return -1;
+	}
+	
+	ret = print_rsa_key(fp, key);
+	RSA_free(key);
+
+	return ret;
+}
+
+int
 main (int argc, char *argv[])
 {
-	FILE *fp = stdout;
+	FILE *fp = stdout, *fpin = NULL;
 	size_t bits = 1024;
 	unsigned int pubexp = 0x3;
 	struct stat st;
 	extern char *optarg;
 	extern int optind;
-	int c;
-	char *fname = NULL;
+	int c, fd = -1, fdin = -1;
+	char *fname = NULL, *finput = NULL;
 
-	while ((c = getopt(argc, argv, e:b:f:h)) != -1)
+	while ((c = getopt(argc, argv, e:b:f:i:h)) != -1)
 		switch (c) {
 			case 'e':
 if (strncmp(optarg, 0x, 2) == 0)
@@ -178,31 +243,65 @@
 			case 'f':
 fname = optarg;
 break;
+			case 'i':
+finput = optarg;
+break;
 			case 'h':
 			default:
 usage(argv[0]);
 		}
 
 	if (fname) {
-		if (stat(fname, st) = 0) 

CVS commit: [ipsec-tools-0_7-branch] src/crypto/dist/ipsec-tools/src/racoon

[Timo Teräs]

Module Name:src
Committed By:   tteras
Date:   Thu Feb 10 11:21:55 UTC 2011

Modified Files:
src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_7-branch]:
prsa_par.y

Log Message:
From Mats Erik Andersson deb...@gisladisker.se: Fix address
initialization of restricted RSA keys to work on non-linux platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 \
src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y
diff -u src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y:1.4 src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y:1.4.6.1
--- src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y:1.4	Sat Sep  9 16:22:10 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y	Thu Feb 10 11:21:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: prsa_par.y,v 1.4 2006/09/09 16:22:10 manu Exp $	*/
+/*	$NetBSD: prsa_par.y,v 1.4.6.1 2011/02/10 11:21:55 tteras Exp $	*/
 
 /* Id: prsa_par.y,v 1.3 2004/11/08 12:04:23 ludvigm Exp */
 
@@ -246,6 +246,9 @@
 		$$-prefix = $2;
 		sap = (struct sockaddr_in *)($$-sa);
 		sap-sin_family = AF_INET;
+#ifndef __linux__
+		sap-sin_len = sizeof(*sap);
+#endif
 		err = inet_pton(AF_INET, $1, (struct in_addr*)(sap-sin_addr));
 		if (err = 0) {
 			prsaerror(inet_pton(%s): %s\n, $1, strerror(errno));
@@ -269,6 +272,9 @@
 		$$-prefix = $2;
 		sap = (struct sockaddr_in6 *)($$-sa);
 		sap-sin6_family = AF_INET6;
+#ifndef __linux__
+		sap-sin6_len = sizeof(*sap);
+#endif
 		err = inet_pton(AF_INET6, $1, (struct in6_addr*)(sap-sin6_addr));
 		if (err = 0) {
 			prsaerror(inet_pton(%s): %s\n, $1, strerror(errno));

CVS commit: src/sys/dev/pci

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Thu Feb 10 11:35:20 UTC 2011

Modified Files:
src/sys/dev/pci: genfb_pci.c

Log Message:
add support for 64-bit BARs


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/genfb_pci.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/genfb_pci.c
diff -u src/sys/dev/pci/genfb_pci.c:1.29 src/sys/dev/pci/genfb_pci.c:1.30
--- src/sys/dev/pci/genfb_pci.c:1.29	Thu Feb 10 10:23:20 2011
+++ src/sys/dev/pci/genfb_pci.c	Thu Feb 10 11:35:20 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfb_pci.c,v 1.29 2011/02/10 10:23:20 jmcneill Exp $ */
+/*	$NetBSD: genfb_pci.c,v 1.30 2011/02/10 11:35:20 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb_pci.c,v 1.29 2011/02/10 10:23:20 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb_pci.c,v 1.30 2011/02/10 11:35:20 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -142,26 +142,30 @@
 
 	/* mmap()able bus ranges */
 	idx = 0;
-	bar = 0x10;
-	while (bar  0x34) {
+	bar = PCI_MAPREG_START;
+	while (bar = PCI_MAPREG_ROM) {
 
 		type = pci_mapreg_type(sc-sc_pc, sc-sc_pcitag, bar);
-		if ((type == PCI_MAPREG_TYPE_MEM) || 
-		(type == PCI_MAPREG_TYPE_ROM)) {
-
+		if (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_MEM || 
+		PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_ROM) {
 			pci_mapreg_info(sc-sc_pc, sc-sc_pcitag, bar, type,
 			sc-sc_ranges[idx].offset,
 			sc-sc_ranges[idx].size,
 			sc-sc_ranges[idx].flags);
 			idx++;
 		}
-		sc-sc_bars[(bar - 0x10)  2] = rom =
+		sc-sc_bars[(bar - PCI_MAPREG_START)  2] = rom =
 		pci_conf_read(sc-sc_pc, sc-sc_pcitag, bar);
 		if ((bar == PCI_MAPREG_ROM)  (rom != 0)) {
 			pci_conf_write(sc-sc_pc, sc-sc_pcitag, bar, rom |
 			PCI_MAPREG_ROM_ENABLE);
 		}
-		bar += 4;
+
+		if (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_MEM 
+		PCI_MAPREG_MEM_TYPE(type) == PCI_MAPREG_MEM_TYPE_64BIT)
+			bar += 8;
+		else
+			bar += 4;
 	}
 
 	sc-sc_ranges_used = idx;			

CVS commit: src/sys/dev/pci

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Thu Feb 10 12:37:58 UTC 2011

Modified Files:
src/sys/dev/pci: pci.c pci_usrreq.c pcivar.h

Log Message:
pcimmap: if the requested page is marked prefetchable in a child device's
BAR, pass the BUS_SPACE_MAP_PREFETCHABLE flag down to bus_space_mmap


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/pci/pci.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/pci_usrreq.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pci/pcivar.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/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.131 src/sys/dev/pci/pci.c:1.132
--- src/sys/dev/pci/pci.c:1.131	Tue Feb  1 19:37:37 2011
+++ src/sys/dev/pci/pci.c	Thu Feb 10 12:37:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci.c,v 1.131 2011/02/01 19:37:37 dyoung Exp $	*/
+/*	$NetBSD: pci.c,v 1.132 2011/02/10 12:37:58 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci.c,v 1.131 2011/02/01 19:37:37 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci.c,v 1.132 2011/02/10 12:37:58 jmcneill Exp $);
 
 #include opt_pci.h
 
@@ -272,8 +272,8 @@
 {
 	pci_chipset_tag_t pc = sc-sc_pc;
 	struct pci_attach_args pa;
-	pcireg_t id, csr, class, intr, bhlcr;
-	int ret, pin, bus, device, function;
+	pcireg_t id, csr, class, intr, bhlcr, bar;
+	int ret, pin, bus, device, function, i, width;
 	int locs[PCICF_NLOCS];
 
 	pci_decompose_tag(pc, tag, bus, device, function);
@@ -297,6 +297,27 @@
 	if (PCI_VENDOR(id) == 0)
 		return 0;
 
+	/* Collect memory range info */
+	memset(sc-PCI_SC_DEVICESC(device, function).c_range, 0,
+	sizeof(sc-PCI_SC_DEVICESC(device, function).c_range));
+	i = 0;
+	for (bar = PCI_MAPREG_START; bar  PCI_MAPREG_END; bar += width) {
+		int type = pci_mapreg_type(pc, tag, bar);
+		struct pci_range *r;
+
+		width = 4;
+		if (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_MEM) {
+			if (PCI_MAPREG_MEM_TYPE(type) ==
+			PCI_MAPREG_MEM_TYPE_64BIT)
+width = 8;
+
+			r = sc-PCI_SC_DEVICESC(device, function).c_range[i++];
+			if (pci_mapreg_info(pc, tag, bar, type,
+			r-r_offset, r-r_size, r-r_flags) != 0)
+break;
+		}
+	}
+
 	pa.pa_iot = sc-sc_iot;
 	pa.pa_memt = sc-sc_memt;
 	pa.pa_dmat = sc-sc_dmat;

Index: src/sys/dev/pci/pci_usrreq.c
diff -u src/sys/dev/pci/pci_usrreq.c:1.22 src/sys/dev/pci/pci_usrreq.c:1.23
--- src/sys/dev/pci/pci_usrreq.c:1.22	Thu Jul 30 04:38:24 2009
+++ src/sys/dev/pci/pci_usrreq.c	Thu Feb 10 12:37:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_usrreq.c,v 1.22 2009/07/30 04:38:24 macallan Exp $	*/
+/*	$NetBSD: pci_usrreq.c,v 1.23 2011/02/10 12:37:58 jmcneill Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_usrreq.c,v 1.22 2009/07/30 04:38:24 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_usrreq.c,v 1.23 2011/02/10 12:37:58 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -114,6 +114,10 @@
 pcimmap(dev_t dev, off_t offset, int prot)
 {
 	struct pci_softc *sc = device_lookup_private(pci_cd, minor(dev));
+	struct pci_child *c;
+	struct pci_range *r;
+	int flags = 0;
+	int device, range;
 
 	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
 	NULL) != 0) {
@@ -124,7 +128,7 @@
 	 * take the offset to be the address on the bus,
 	 * and pass 0 as the offset into that range.
 	 *
-	 * XXX Need a way to deal with linear/prefetchable/etc.
+	 * XXX Need a way to deal with linear/etc.
 	 *
 	 * XXX we rely on MD mmap() methods to enforce limits since these
 	 * are hidden in *_tag_t structs if they exist at all 
@@ -145,7 +149,24 @@
 		0, prot, 0);
 	}
 #endif /* PCI_MAGIC_IO_RANGE */
-	return bus_space_mmap(sc-sc_memt, offset, 0, prot, 0);
+
+	for (device = 0; device  __arraycount(sc-sc_devices); device++) {
+		c = sc-sc_devices[device];
+		if (c-c_dev == NULL)
+			continue;
+		for (range = 0; range  __arraycount(c-c_range); range++) {
+			r = c-c_range[range];
+			if (r-r_size == 0)
+break;
+			if (offset = r-r_offset 
+			offset  r-r_offset + r-r_size) {
+flags = r-r_flags;
+break;
+			}
+		}
+	}
+
+	return bus_space_mmap(sc-sc_memt, offset, 0, prot, flags);
 }
 
 const struct cdevsw pci_cdevsw = {

Index: src/sys/dev/pci/pcivar.h
diff -u src/sys/dev/pci/pcivar.h:1.90 src/sys/dev/pci/pcivar.h:1.91
--- src/sys/dev/pci/pcivar.h:1.90	Wed Jun  9 02:39:32 2010
+++ src/sys/dev/pci/pcivar.h	Thu Feb 10 12:37:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcivar.h,v 1.90 2010/06/09 02:39:32 mrg Exp $	*/
+/*	$NetBSD: pcivar.h,v 1.91 2011/02/10 12:37:58 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -196,11 +196,18 @@
 	pcireg_t reg[16];
 };
 
+struct pci_range {
+	bus_addr_t		r_offset;
+	bus_size_t		r_size;
+	int			r_flags;
+};
+
 struct pci_child {
 	device_t		c_dev;
 	bool			

CVS commit: src/usr.sbin/ldpd

[Mihai Chelaru]

Module Name:src
Committed By:   kefren
Date:   Thu Feb 10 12:44:41 UTC 2011

Modified Files:
src/usr.sbin/ldpd: tlv_stack.c

Log Message:
stop processing a label mapping message if we don't have a route for it.
This way we avoid failing an assert later in mpls_add_label()


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/ldpd/tlv_stack.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/ldpd/tlv_stack.c
diff -u src/usr.sbin/ldpd/tlv_stack.c:1.2 src/usr.sbin/ldpd/tlv_stack.c:1.3
--- src/usr.sbin/ldpd/tlv_stack.c:1.2	Thu Dec  9 00:10:59 2010
+++ src/usr.sbin/ldpd/tlv_stack.c	Thu Feb 10 12:44:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tlv_stack.c,v 1.2 2010/12/09 00:10:59 christos Exp $ */
+/* $NetBSD: tlv_stack.c,v 1.3 2011/02/10 12:44:41 kefren Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -109,6 +109,11 @@
 			memcpy(inatmp, pref-prefix, ldp_ceil8(pref-prelen));
 			debugp(Prefix/Host add: %s/%d\n, inet_ntoa(inatmp),
 			pref-prelen);
+
+			/* don't bother if we don't have a label/route */
+			if (label_get_by_prefix(inatmp, pref-prelen) == NULL)
+break;
+
 			ldp_peer_add_mapping(p, inatmp, pref-prelen,
 			ntohl(l-label));
 			mpls_add_label(p, NULL, inatmp, pref-prelen,

CVS commit: src/sys/arch/hp300/stand/common

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 10 12:46:22 UTC 2011

Modified Files:
src/sys/arch/hp300/stand/common: ite.c ite_dv.c ite_gb.c ite_hy.c
ite_rb.c ite_subr.c ite_tc.c itevar.h

Log Message:
Pull OpenBSD's standalone ITE driver reorganization:
 - merge similar clear, putc, cursor, and scroll ops for all DIO framebuffers
 - rename and move hyper_windowmove() to ite_dio_windowmove1bpp()
   to use it among all dumb monochrome framebuffers
 - ditto hyper_putc() to ite_dio_putc1bpp()
 - remove unnecessary flags, macro, function args, and structure members
 - remove trailing spaces and tabs

Also misc cosmetics to reduce diffs from OpenBSD,
and some KNF that generates diffs from OpenBSD.

Tested on HP382 and HP425t.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/ite.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/common/ite_dv.c \
src/sys/arch/hp300/stand/common/ite_gb.c \
src/sys/arch/hp300/stand/common/ite_subr.c \
src/sys/arch/hp300/stand/common/ite_tc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp300/stand/common/ite_hy.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/common/ite_rb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/itevar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hp300/stand/common/ite.c
diff -u src/sys/arch/hp300/stand/common/ite.c:1.13 src/sys/arch/hp300/stand/common/ite.c:1.14
--- src/sys/arch/hp300/stand/common/ite.c:1.13	Thu Feb 10 11:17:21 2011
+++ src/sys/arch/hp300/stand/common/ite.c	Thu Feb 10 12:46:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.13 2011/02/10 11:17:21 tsutsui Exp $	*/
+/*	$NetBSD: ite.c,v 1.14 2011/02/10 12:46:22 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -62,36 +62,36 @@
 
 struct itesw itesw[] = {
 	{ GID_TOPCAT,
-	topcat_init,	topcat_clear,	topcat_putc,
-	topcat_cursor,	topcat_scroll },
+	topcat_init,	ite_dio_clear,	ite_dio_putc8bpp,
+	ite_dio_cursor,	ite_dio_scroll },
 
 	{ GID_GATORBOX,
-	gbox_init,	gbox_clear,	gbox_putc,
-	gbox_cursor,	gbox_scroll },
+	gbox_init,	ite_dio_clear,	ite_dio_putc8bpp,
+	ite_dio_cursor,	gbox_scroll },
 
 	{ GID_RENAISSANCE,
-	rbox_init,	rbox_clear,	rbox_putc,
-	rbox_cursor,	rbox_scroll },
+	rbox_init,	ite_dio_clear,	ite_dio_putc8bpp,
+	ite_dio_cursor,	ite_dio_scroll },
 
 	{ GID_LRCATSEYE,
-	topcat_init,	topcat_clear,	topcat_putc,
-	topcat_cursor,	topcat_scroll },
+	topcat_init,	ite_dio_clear,	ite_dio_putc8bpp,
+	ite_dio_cursor,	ite_dio_scroll },
 
 	{ GID_HRCCATSEYE,
-	topcat_init,	topcat_clear,	topcat_putc,
-	topcat_cursor,	topcat_scroll },
+	topcat_init,	ite_dio_clear,	ite_dio_putc8bpp,
+	ite_dio_cursor,	ite_dio_scroll },
 
 	{ GID_HRMCATSEYE,
-	topcat_init,	topcat_clear,	topcat_putc,
-	topcat_cursor,	topcat_scroll },
+	topcat_init,	ite_dio_clear,	ite_dio_putc8bpp,
+	ite_dio_cursor,	ite_dio_scroll },
 
 	{ GID_DAVINCI,
-  	dvbox_init,	dvbox_clear,	dvbox_putc,
-	dvbox_cursor,	dvbox_scroll },
+  	dvbox_init,	ite_dio_clear,	ite_dio_putc8bpp,
+	ite_dio_cursor,	ite_dio_scroll },
 
 	{ GID_HYPERION,
-	hyper_init,	hyper_clear,	hyper_putc,
-	hyper_cursor,	hyper_scroll },
+	hyper_init,	ite_dio_clear,	ite_dio_putc1bpp,
+	ite_dio_cursor,	ite_dio_scroll },
 };
 int	nitesw = sizeof(itesw) / sizeof(itesw[0]);
 
@@ -150,7 +150,7 @@
 			ip-dwidth = ip-fbwidth;
 		if (ip-dheight  ip-fbheight)
 			ip-dheight = ip-fbheight;
-		ip-flags = ITE_ALIVE|ITE_CONSOLE;
+		ip-alive = 1;
 		i++;
 	}
 }
@@ -186,8 +186,7 @@
 			continue;
 #endif
 		ip = ite_data[ite];
-		if ((ip-flags  (ITE_ALIVE|ITE_CONSOLE))
-		!= (ITE_ALIVE|ITE_CONSOLE))
+		if (ip-alive == 0)
 			continue;
 		if ((int)ip-regbase == INTIOBASE + FB_BASE) {
 			pri = CN_INTERNAL;
@@ -238,7 +237,7 @@
 	case '\n':
 		if (++ip-cury == ip-rows) {
 			ip-cury--;
-			(*sp-ite_scroll)(ip, 1, 0, 1, SCROLL_UP);
+			(*sp-ite_scroll)(ip);
 			ite_clrtoeol(ip, sp, ip-cury, 0);
 		}
 		else
@@ -260,7 +259,7 @@
 	default:
 		if (c  ' ' || c == 0177)
 			break;
-		(*sp-ite_putc)(ip, c, ip-cury, ip-curx, ATTR_NOR);
+		(*sp-ite_putc)(ip, c, ip-cury, ip-curx);
 		(*sp-ite_cursor)(ip, DRAW_CURSOR);
 		itecheckwrap(ip, sp);
 		break;
@@ -274,7 +273,7 @@
 		ip-curx = 0;
 		if (++ip-cury == ip-rows) {
 			--ip-cury;
-			(*sp-ite_scroll)(ip, 1, 0, 1, SCROLL_UP);
+			(*sp-ite_scroll)(ip);
 			ite_clrtoeol(ip, sp, ip-cury, 0);
 			return;
 		}

Index: src/sys/arch/hp300/stand/common/ite_dv.c
diff -u src/sys/arch/hp300/stand/common/ite_dv.c:1.9 src/sys/arch/hp300/stand/common/ite_dv.c:1.10
--- src/sys/arch/hp300/stand/common/ite_dv.c:1.9	Thu Feb 10 11:08:23 2011
+++ src/sys/arch/hp300/stand/common/ite_dv.c	Thu Feb 10 12:46:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_dv.c,v 1.9 2011/02/10 11:08:23 tsutsui Exp $	*/
+/*	$NetBSD: ite_dv.c,v 1.10 2011/02/10 12:46:22 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -48,8 +48,6 @@
 

CVS commit: src/sys/arch/hp300/stand

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 10 12:47:09 UTC 2011

Modified Files:
src/sys/arch/hp300/stand/inst: version
src/sys/arch/hp300/stand/uboot: version

Log Message:
Bump version to denote standalone ITE driver reorganization
pulled from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/inst/version
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/stand/uboot/version

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/hp300/stand/inst/version
diff -u src/sys/arch/hp300/stand/inst/version:1.9 src/sys/arch/hp300/stand/inst/version:1.10
--- src/sys/arch/hp300/stand/inst/version:1.9	Wed Jul 16 13:44:51 2008
+++ src/sys/arch/hp300/stand/inst/version	Thu Feb 10 12:47:08 2011
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.9 2008/07/16 13:44:51 tsutsui Exp $
+$NetBSD: version,v 1.10 2011/02/10 12:47:08 tsutsui Exp $
 
 1.1:	Initial version
 1.2:	Added support for HP-IB cartridge tapes
@@ -9,3 +9,4 @@
 1.7:	Added APCI console support
 1.8:	Identify HP362 and HP382
 1.9:	Change boot messages to replace build date and maker with kernrev.
+1.10:	Pull OpenBSD's ite driver reorganization.

Index: src/sys/arch/hp300/stand/uboot/version
diff -u src/sys/arch/hp300/stand/uboot/version:1.16 src/sys/arch/hp300/stand/uboot/version:1.17
--- src/sys/arch/hp300/stand/uboot/version:1.16	Wed Jul 16 13:44:51 2008
+++ src/sys/arch/hp300/stand/uboot/version	Thu Feb 10 12:47:08 2011
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.16 2008/07/16 13:44:51 tsutsui Exp $
+$NetBSD: version,v 1.17 2011/02/10 12:47:08 tsutsui Exp $
 
 1.1:	Initial version
 1.2:	Added support for network booting
@@ -16,3 +16,4 @@
 1.14:	Default to BOOTP network boot
 1.15:	Identify HP362 and HP382
 1.16:	Change boot messages to replace build date and maker with kernrev.
+1.17:	Pull OpenBSD's ite driver reorganization.

CVS commit: src/sys/arch/hp300/stand

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 10 13:04:32 UTC 2011

Modified Files:
src/sys/arch/hp300/stand: Makefile.buildboot
src/sys/arch/hp300/stand/common: ite.c itevar.h
Added Files:
src/sys/arch/hp300/stand/common: ite_tvrx.c

Log Message:
Pull support for Tigershark monochrome framebuffer from OpenBSD.
Untested (no hardware), but doesn't break existing HP425t topcat.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hp300/stand/Makefile.buildboot
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/common/ite.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/hp300/stand/common/ite_tvrx.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/itevar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hp300/stand/Makefile.buildboot
diff -u src/sys/arch/hp300/stand/Makefile.buildboot:1.30 src/sys/arch/hp300/stand/Makefile.buildboot:1.31
--- src/sys/arch/hp300/stand/Makefile.buildboot:1.30	Sat Jan 22 19:19:17 2011
+++ src/sys/arch/hp300/stand/Makefile.buildboot	Thu Feb 10 13:04:31 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.30 2011/01/22 19:19:17 joerg Exp $
+#	$NetBSD: Makefile.buildboot,v 1.31 2011/02/10 13:04:31 tsutsui Exp $
 
 # RELOC=FFF0 allows for boot prog up to FF000 (1044480) bytes long
 RELOC=	FFF0
@@ -56,9 +56,9 @@
 COMMONSOURCE=		srt0.S autoconf.c clock.c conf.c cons.c devopen.c \
 			exec.c machdep.c prf.c rawfs.c netio.c
 DRIVERSOURCE=		apci.c ct.c dca.c dcm.c dnkbd.c fhpib.c hil.c \
-			hpib.c if_le.c ite.c ite_dv.c ite_gb.c ite_rb.c \
-			ite_subr.c ite_tc.c ite_hy.c kbd.c kbdconf.c \
-			nhpib.c rd.c scsi.c sd.c
+			hpib.c if_le.c ite.c ite_dv.c ite_gb.c ite_hy.c \
+			ite_rb.c ite_subr.c ite_tc.c ite_tvrx.c \
+			kbd.c kbdconf.c nhpib.c rd.c scsi.c sd.c
 
 .include bsd.own.mk
 .include bsd.klinks.mk

Index: src/sys/arch/hp300/stand/common/ite.c
diff -u src/sys/arch/hp300/stand/common/ite.c:1.14 src/sys/arch/hp300/stand/common/ite.c:1.15
--- src/sys/arch/hp300/stand/common/ite.c:1.14	Thu Feb 10 12:46:22 2011
+++ src/sys/arch/hp300/stand/common/ite.c	Thu Feb 10 13:04:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.14 2011/02/10 12:46:22 tsutsui Exp $	*/
+/*	$NetBSD: ite.c,v 1.15 2011/02/10 13:04:32 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -92,6 +92,10 @@
 	{ GID_HYPERION,
 	hyper_init,	ite_dio_clear,	ite_dio_putc1bpp,
 	ite_dio_cursor,	ite_dio_scroll },
+
+	{ GID_TIGER,
+	tvrx_init,	ite_dio_clear,	ite_dio_putc1bpp,
+	ite_dio_cursor,	ite_dio_scroll },
 };
 int	nitesw = sizeof(itesw) / sizeof(itesw[0]);
 

Index: src/sys/arch/hp300/stand/common/itevar.h
diff -u src/sys/arch/hp300/stand/common/itevar.h:1.13 src/sys/arch/hp300/stand/common/itevar.h:1.14
--- src/sys/arch/hp300/stand/common/itevar.h:1.13	Thu Feb 10 12:46:22 2011
+++ src/sys/arch/hp300/stand/common/itevar.h	Thu Feb 10 13:04:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: itevar.h,v 1.13 2011/02/10 12:46:22 tsutsui Exp $	*/
+/*	$NetBSD: itevar.h,v 1.14 2011/02/10 13:04:32 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -132,3 +132,4 @@
 void rbox_init(struct ite_data *);
 void dvbox_init(struct ite_data *);
 void hyper_init(struct ite_data *);
+void tvrx_init(struct ite_data *);

Added files:

Index: src/sys/arch/hp300/stand/common/ite_tvrx.c
diff -u /dev/null src/sys/arch/hp300/stand/common/ite_tvrx.c:1.1
--- /dev/null	Thu Feb 10 13:04:32 2011
+++ src/sys/arch/hp300/stand/common/ite_tvrx.c	Thu Feb 10 13:04:32 2011
@@ -0,0 +1,76 @@
+/*	$NetBSD: ite_tvrx.c,v 1.1 2011/02/10 13:04:32 tsutsui Exp $	*/
+/*	$OpenBSD: ite_tvrx.c,v 1.2 2006/08/17 06:31:10 miod Exp $	*/
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department and Mark Davies of the Department of Computer
+ * Science, Victoria University of Wellington, New Zealand.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, 

CVS commit: src/tests/dev/md

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 13:29:03 UTC 2011

Modified Files:
src/tests/dev/md: h_mdserv.c

Log Message:
explicitly zero-fill the initial md backend


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/dev/md/h_mdserv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/dev/md/h_mdserv.c
diff -u src/tests/dev/md/h_mdserv.c:1.3 src/tests/dev/md/h_mdserv.c:1.4
--- src/tests/dev/md/h_mdserv.c:1.3	Tue Nov 30 14:31:14 2010
+++ src/tests/dev/md/h_mdserv.c	Thu Feb 10 13:29:02 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: h_mdserv.c,v 1.3 2010/11/30 14:31:14 pooka Exp $	*/
+/*	$NetBSD: h_mdserv.c,v 1.4 2011/02/10 13:29:02 pooka Exp $	*/
 
 #include sys/types.h
 #include sys/mman.h
@@ -70,7 +70,7 @@
 	if (argc != 2)
 		exit(1);
 
-	md.md_addr = malloc(MDSIZE);
+	md.md_addr = calloc(1, MDSIZE);
 	md.md_size = MDSIZE;
 	md.md_type = MD_UMEM_SERVER;
 

CVS commit: src/sys/rump/librump/rumpkern

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 13:31:30 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: lwproc.c

Log Message:
copy parent's p_comm when forking (if it exists)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/lwproc.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/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.13 src/sys/rump/librump/rumpkern/lwproc.c:1.14
--- src/sys/rump/librump/rumpkern/lwproc.c:1.13	Fri Jan 28 18:48:21 2011
+++ src/sys/rump/librump/rumpkern/lwproc.c	Thu Feb 10 13:31:30 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: lwproc.c,v 1.13 2011/01/28 18:48:21 pooka Exp $	*/
+/*  $NetBSD: lwproc.c,v 1.14 2011/02/10 13:31:30 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.13 2011/01/28 18:48:21 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.14 2011/02/10 13:31:30 pooka Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -116,7 +116,10 @@
 
 	p-p_vmspace = vmspace_kernel();
 	p-p_emul = emul_netbsd;
-	strcpy(p-p_comm, rumproc);
+	if (*parent-p_comm)
+		strcpy(p-p_comm, parent-p_comm);
+	else
+		strcpy(p-p_comm, rumproc);
 
 	if ((flags  RUMP_RFCFDG) == 0)
 		KASSERT(parent == curproc);

CVS commit: src/sys/rump/librump/rumpkern

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 13:31:56 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: rump.c

Log Message:
zalloc struct vmspace to avoid having one full of garbage


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.228 src/sys/rump/librump/rumpkern/rump.c:1.229
--- src/sys/rump/librump/rumpkern/rump.c:1.228	Thu Feb  3 11:01:51 2011
+++ src/sys/rump/librump/rumpkern/rump.c	Thu Feb 10 13:31:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.c,v 1.228 2011/02/03 11:01:51 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.229 2011/02/10 13:31:55 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.228 2011/02/03 11:01:51 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.229 2011/02/10 13:31:55 pooka Exp $);
 
 #include sys/systm.h
 #define ELFSIZE ARCH_ELFSIZE
@@ -768,7 +768,7 @@
 	 * Refcount will eternally be 1.
 	 */
 	p = curproc;
-	newspace = kmem_alloc(sizeof(*newspace), KM_SLEEP);
+	newspace = kmem_zalloc(sizeof(*newspace), KM_SLEEP);
 	newspace-vm_refcnt = 1;
 	newspace-vm_map.pmap = priv;
 	KASSERT(p-p_vmspace == vmspace_kernel());

CVS commit: src/sys/arch/sandpoint/stand/altboot

[Tohru Nishimura]

Module Name:src
Committed By:   nisimura
Date:   Thu Feb 10 13:38:08 UTC 2011

Modified Files:
src/sys/arch/sandpoint/stand/altboot: brdsetup.c dsk.c globals.h main.c
nif.c pci.c

Log Message:
- some rework for PCI device enumeration.
- allow dual IDE/SATA devices.
- fix a typo of D-Link #define.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/stand/altboot/brdsetup.c \
src/sys/arch/sandpoint/stand/altboot/dsk.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/altboot/globals.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/stand/altboot/main.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sandpoint/stand/altboot/nif.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sandpoint/stand/altboot/pci.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/sandpoint/stand/altboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.3 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.4
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.3	Tue Feb  8 00:33:05 2011
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c	Thu Feb 10 13:38:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.3 2011/02/08 00:33:05 nisimura Exp $ */
+/* $NetBSD: brdsetup.c,v 1.4 2011/02/10 13:38:08 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -101,8 +101,8 @@
 	NULL, iomegabrdfix, iomegapcifix },
 {
 	dlink,
-	D-Link GSM-G600,
-	BRD_DLINKGSM,
+	D-Link DSM-G600,
+	BRD_DLINKDSM,
 	0,
 	eumb, 0x4500, 9600,
 	NULL, dlinkbrdfix, dlinkpcifix },
@@ -215,7 +215,7 @@
 	}
 	else if (PCI_VENDOR(pcicfgread(pcimaketag(0, 16, 0), PCI_ID_REG)) ==
 	0x1191) {/* PCI_VENDOR_ACARD */
-		brdtype = BRD_DLINKGSM;
+		brdtype = BRD_DLINKDSM;
 	}
 
 	brdprop = brd_lookup(brdtype);
@@ -406,12 +406,12 @@
 void
 motpcifix(struct brdprop *brd)
 {
-	unsigned ide, nic, pcib, steer, val;
+	unsigned ide, net, pcib, steer, val;
 	int line;
 
 	pcib = pcimaketag(0, 11, 0);
 	ide  = pcimaketag(0, 11, 1);
-	nic  = pcimaketag(0, 15, 0);
+	net  = pcimaketag(0, 15, 0);
 
 	/*
 	 *  WinBond PIRQ 
@@ -492,21 +492,21 @@
 	 *  fxp fixup 
 	 * - use PCI pin A line 15 (fxp 0x3d/3c)
 	 */
-	val = pcicfgread(nic, 0x3c)  0x;
-	pcidecomposetag(nic, NULL, line, NULL);
+	val = pcicfgread(net, 0x3c)  0x;
+	pcidecomposetag(net, NULL, line, NULL);
 	val |= (('A' - '@')  8) | line;
-	pcicfgwrite(nic, 0x3c, val);
+	pcicfgwrite(net, 0x3c, val);
 }
 
 void
 encpcifix(struct brdprop *brd)
 {
-	unsigned ide, irq, nic, pcib, steer, val;
+	unsigned ide, irq, net, pcib, steer, val;
 
 #define	STEER(v, b) (((v)  (b)) ? edge : level)
 	pcib = pcimaketag(0, 22, 0);
 	ide  = pcimaketag(0, 22, 1);
-	nic  = pcimaketag(0, 25, 0);
+	net  = pcimaketag(0, 25, 0);
 
 	/*
 	 *  VIA PIRQ 
@@ -603,9 +603,9 @@
 	 * - use PCI pin A line 25 (fxp 0x3d/3c)
 	 */
 	/* 0x3d/3c - PCI pin/line */
-	val = pcicfgread(nic, 0x3c)  0x;
+	val = pcicfgread(net, 0x3c)  0x;
 	val |= (('A' - '@')  8) | 25;
-	pcicfgwrite(nic, 0x3c, val);
+	pcicfgwrite(net, 0x3c, val);
 }
 
 void
@@ -630,17 +630,17 @@
 void
 kuropcifix(struct brdprop *brd)
 {
-	unsigned ide, nic, usb, val;
+	unsigned dsk, net, usb, val;
 
-	nic = pcimaketag(0, 11, 0);
-	val = pcicfgread(nic, 0x3c)  0xff00;
+	net = pcimaketag(0, 11, 0);
+	val = pcicfgread(net, 0x3c)  0xff00;
 	val |= 11;
-	pcicfgwrite(nic, 0x3c, val);
+	pcicfgwrite(net, 0x3c, val);
 
-	ide = pcimaketag(0, 12, 0);
-	val = pcicfgread(ide, 0x3c)  0xff00;
+	dsk = pcimaketag(0, 12, 0);
+	val = pcicfgread(dsk, 0x3c)  0xff00;
 	val |= 12;
-	pcicfgwrite(ide, 0x3c, val);
+	pcicfgwrite(dsk, 0x3c, val);
 
 	usb = pcimaketag(0, 14, 0);
 	val = pcicfgread(usb, 0x3c)  0xff00;
@@ -677,12 +677,12 @@
 void
 synopcifix(struct brdprop *brd)
 {
-	unsigned ide, nic, usb, val;
+	unsigned dsk, net, usb, val;
 
-	ide = pcimaketag(0, 13, 0);
-	val = pcicfgread(ide, 0x3c)  0xff00;
+	dsk = pcimaketag(0, 13, 0);
+	val = pcicfgread(dsk, 0x3c)  0xff00;
 	val |= 13;
-	pcicfgwrite(ide, 0x3c, val);
+	pcicfgwrite(dsk, 0x3c, val);
 
 	usb = pcimaketag(0, 14, 0);
 	val = pcicfgread(usb, 0x3c)  0xff00;
@@ -699,10 +699,10 @@
 	val |= 14;
 	pcicfgwrite(usb, 0x3c, val);
 
-	nic = pcimaketag(0, 15, 0);
-	val = pcicfgread(nic, 0x3c)  0xff00;
+	net = pcimaketag(0, 15, 0);
+	val = pcicfgread(net, 0x3c)  0xff00;
 	val |= 15;
-	pcicfgwrite(nic, 0x3c, val);
+	pcicfgwrite(net, 0x3c, val);
 }
 
 void
@@ -716,12 +716,12 @@
 void
 qnappcifix(struct brdprop *brd)
 {
-	unsigned ide, nic, usb, val;
+	unsigned dsk, net, usb, val;
 
-	ide = pcimaketag(0, 13, 0);
-	val = pcicfgread(ide, 0x3c)  0xff00;
+	dsk = pcimaketag(0, 13, 0);
+	val = pcicfgread(dsk, 0x3c)  0xff00;
 	val |= 13;
-	pcicfgwrite(ide, 0x3c, val);
+	pcicfgwrite(dsk, 0x3c, val);
 
 	usb = pcimaketag(0, 14, 0);
 	val = pcicfgread(usb, 0x3c)  0xff00;
@@ -738,10 +738,10 @@
 	val 

CVS commit: src/etc

[OBATA Akio]

Module Name:src
Committed By:   obache
Date:   Thu Feb 10 13:39:33 UTC 2011

Modified Files:
src/etc: services

Log Message:
remove obsolete sieve 2000/tcp entry.  PR#42426.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/etc/services

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/services
diff -u src/etc/services:1.93 src/etc/services:1.94
--- src/etc/services:1.93	Mon Oct  4 22:31:11 2010
+++ src/etc/services	Thu Feb 10 13:39:32 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: services,v 1.93 2010/10/04 22:31:11 christos Exp $
+#	$NetBSD: services,v 1.94 2011/02/10 13:39:32 obache Exp $
 # See also: services(5), http://www.sethwklein.net/projects/iana-etc/
 #
 # PORT NUMBERS
@@ -16525,7 +16525,6 @@
 supfiledbg	1127/tcp		# SUP debugging
 radacct		1813/tcp
 radacct		1813/udp
-sieve		2000/tcp		# RFC3028
 lmtp		2003/tcp		# Local Mail Transfer Protocol
 nfsd		2049/udp		# Sun NFS
 nfsd		2049/tcp		# Sun NFS

CVS commit: src/sys/rump/librump/rumpkern

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 13:40:35 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: lwproc.c

Log Message:
Explicitly zerofill some fields which are not within the boundaries
of p_start/endzero for whatever reasons.

Obviously, this fixes remote physio when running with MALLOC_OPTIONS J.
Otherwise PS_WEXIT is set in struct proc, proc_vmspace_getref() fails,
and copyout_proc() with it.

Reported by njoly


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpkern/lwproc.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/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.14 src/sys/rump/librump/rumpkern/lwproc.c:1.15
--- src/sys/rump/librump/rumpkern/lwproc.c:1.14	Thu Feb 10 13:31:30 2011
+++ src/sys/rump/librump/rumpkern/lwproc.c	Thu Feb 10 13:40:35 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: lwproc.c,v 1.14 2011/02/10 13:31:30 pooka Exp $	*/
+/*  $NetBSD: lwproc.c,v 1.15 2011/02/10 13:40:35 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.14 2011/02/10 13:31:30 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: lwproc.c,v 1.15 2011/02/10 13:40:35 pooka Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -112,6 +112,16 @@
 	offsetof(struct proc, p_endcopy)
 	  - offsetof(struct proc, p_startcopy));
 
+	/* some other garbage we need to zero */
+	p-p_sigacts = NULL;
+	p-p_aio = NULL;
+	p-p_dtrace = NULL;
+	p-p_mqueue_cnt = p-p_exitsig = 0;
+	p-p_flag = p-p_sflag = p-p_slflag = p-p_lflag = p-p_stflag = 0;
+	p-p_trace_enabled = 0;
+	p-p_xstat = p-p_acflag = 0;
+	p-p_stackbase = 0;
+
 	p-p_stats = pstatscopy(parent-p_stats);
 
 	p-p_vmspace = vmspace_kernel();

CVS commit: src/sys/rump/librump/rumpkern

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 13:49:11 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern: vm.c

Log Message:
Set b_error in vunmapbuf() if copyout_proc fails.
XXX: what if copyin fails in vmapbuf()?


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/rump/librump/rumpkern/vm.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/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.109 src/sys/rump/librump/rumpkern/vm.c:1.110
--- src/sys/rump/librump/rumpkern/vm.c:1.109	Sat Feb  5 17:25:45 2011
+++ src/sys/rump/librump/rumpkern/vm.c	Thu Feb 10 13:49:10 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.109 2011/02/05 17:25:45 pooka Exp $	*/
+/*	$NetBSD: vm.c,v 1.110 2011/02/10 13:49:10 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2010 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.109 2011/02/05 17:25:45 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.110 2011/02/10 13:49:10 pooka Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -782,6 +782,7 @@
 		bp-b_data = rump_hypermalloc(len, 0, true, vmapbuf);
 		if (BUF_ISWRITE(bp)) {
 			copyin(bp-b_saveaddr, bp-b_data, len);
+			/* XXX: error? */
 		}
 	}
 }
@@ -793,7 +794,7 @@
 	/* remote case */
 	if (!RUMP_LOCALPROC_P(bp-b_proc)) {
 		if (BUF_ISREAD(bp)) {
-			copyout_proc(bp-b_proc,
+			bp-b_error = copyout_proc(bp-b_proc,
 			bp-b_data, bp-b_saveaddr, len);
 		}
 		rump_hyperfree(bp-b_data, len);

CVS commit: src/sys/dev/pci

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Thu Feb 10 13:52:36 UTC 2011

Modified Files:
src/sys/dev/pci: alipm.c ichsmb.c piixpm.c

Log Message:
Make the SMbus Send/Receive functions work.

If cmdlen = 0 and len = 1 use the XXX_HC_CMD_BYTE protocol, send
data through XXX_SMB_HCMD or receive data from XXX_SMB_HD0.

Ok: Paul Goyette


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/alipm.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/piixpm.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/alipm.c
diff -u src/sys/dev/pci/alipm.c:1.7 src/sys/dev/pci/alipm.c:1.8
--- src/sys/dev/pci/alipm.c:1.7	Thu Mar 11 04:00:36 2010
+++ src/sys/dev/pci/alipm.c	Thu Feb 10 13:52:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: alipm.c,v 1.7 2010/03/11 04:00:36 mrg Exp $ */
+/*	$NetBSD: alipm.c,v 1.8 2011/02/10 13:52:36 hannken Exp $ */
 /*	$OpenBSD: alipm.c,v 1.13 2007/05/03 12:19:01 dlg Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: alipm.c,v 1.7 2010/03/11 04:00:36 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: alipm.c,v 1.8 2011/02/10 13:52:36 hannken Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -255,7 +255,8 @@
 	flags 0x%x\n, device_xname(sc-sc_dev), op, addr, cmdlen,
 	len, flags));
 
-	if (!I2C_OP_STOP_P(op) || cmdlen  1 || len  2)
+	if (!I2C_OP_STOP_P(op) || cmdlen  1 || len  2 ||
+	(cmdlen == 0  len  1))
 		return (EOPNOTSUPP);
 
 	/* Clear status bits */
@@ -298,7 +299,10 @@
 	if (I2C_OP_WRITE_P(op)) {
 		/* Write data. */
 		b = buf;
-		if (len  0)
+		if (cmdlen == 0  len == 1)
+			bus_space_write_1(sc-sc_iot, sc-sc_ioh,
+			ALIPM_SMB_HCMD, b[0]);
+		else if (len  0)
 			bus_space_write_1(sc-sc_iot, sc-sc_ioh,
 			ALIPM_SMB_HD0, b[0]);
 		if (len  1)
@@ -307,8 +311,8 @@
 	}
 
 	/* Set SMBus command */
-	if (len == 0) {
-		if (cmdlen == 0)
+	if (cmdlen == 0) {
+		if (len == 0)
 			ctl = ALIPM_SMB_HC_CMD_QUICK;
 		else
 			ctl = ALIPM_SMB_HC_CMD_BYTE;

Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.23 src/sys/dev/pci/ichsmb.c:1.24
--- src/sys/dev/pci/ichsmb.c:1.23	Fri Jul 30 15:28:09 2010
+++ src/sys/dev/pci/ichsmb.c	Thu Feb 10 13:52:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichsmb.c,v 1.23 2010/07/30 15:28:09 njoly Exp $	*/
+/*	$NetBSD: ichsmb.c,v 1.24 2011/02/10 13:52:36 hannken Exp $	*/
 /*	$OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.23 2010/07/30 15:28:09 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.24 2011/02/10 13:52:36 hannken Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -238,7 +238,8 @@
 	if (cold || sc-sc_poll)
 		flags |= I2C_F_POLL;
 
-	if (!I2C_OP_STOP_P(op) || cmdlen  1 || len  2)
+	if (!I2C_OP_STOP_P(op) || cmdlen  1 || len  2 ||
+	(cmdlen == 0  len  1))
 		return (1);
 
 	/* Setup transfer */
@@ -261,7 +262,10 @@
 	if (I2C_OP_WRITE_P(op)) {
 		/* Write data */
 		b = buf;
-		if (len  0)
+		if (cmdlen == 0  len == 1)
+			bus_space_write_1(sc-sc_iot, sc-sc_ioh,
+			LPCIB_SMB_HCMD, b[0]);
+		else if (len  0)
 			bus_space_write_1(sc-sc_iot, sc-sc_ioh,
 			LPCIB_SMB_HD0, b[0]);
 		if (len  1)
@@ -270,8 +274,8 @@
 	}
 
 	/* Set SMBus command */
-	if (len == 0) {
-		if (cmdlen == 0)
+	if (cmdlen == 0) {
+		if (len == 0)
 			ctl = LPCIB_SMB_HC_CMD_QUICK;
 		else
 			ctl = LPCIB_SMB_HC_CMD_BYTE;

Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.33 src/sys/dev/pci/piixpm.c:1.34
--- src/sys/dev/pci/piixpm.c:1.33	Tue Jul 27 05:29:05 2010
+++ src/sys/dev/pci/piixpm.c	Thu Feb 10 13:52:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.33 2010/07/27 05:29:05 jakllsch Exp $ */
+/* $NetBSD: piixpm.c,v 1.34 2011/02/10 13:52:36 hannken Exp $ */
 /*	$OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: piixpm.c,v 1.33 2010/07/27 05:29:05 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: piixpm.c,v 1.34 2011/02/10 13:52:36 hannken Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -316,7 +316,8 @@
 	if (cold || sc-sc_poll)
 		flags |= I2C_F_POLL;
 
-	if (!I2C_OP_STOP_P(op) || cmdlen  1 || len  2)
+	if (!I2C_OP_STOP_P(op) || cmdlen  1 || len  2 ||
+	(cmdlen == 0  len  1))
 		return (1);
 
 	/* Setup transfer */
@@ -340,7 +341,10 @@
 	if (I2C_OP_WRITE_P(op)) {
 		/* Write data */
 		b = buf;
-		if (len  0)
+		if (cmdlen == 0  len == 1)
+			bus_space_write_1(sc-sc_smb_iot, sc-sc_smb_ioh,
+			PIIX_SMB_HCMD, b[0]);
+		else if (len  0)
 			bus_space_write_1(sc-sc_smb_iot, sc-sc_smb_ioh,
 			PIIX_SMB_HD0, b[0]);
 		if (len  1)
@@ -349,8 +353,8 @@
 	}
 
 	/* Set SMBus command */
-	if (len == 0) {
-		if (cmdlen == 0)
+	if (cmdlen == 0) {
+		if (len == 0)
 			ctl = PIIX_SMB_HC_CMD_QUICK;
 		else
 		

CVS commit: src/sys/arch/sandpoint

[Tohru Nishimura]

Module Name:src
Committed By:   nisimura
Date:   Thu Feb 10 13:54:45 UTC 2011

Modified Files:
src/sys/arch/sandpoint: README.NAS
src/sys/arch/sandpoint/pci: pci_machdep.c
src/sys/arch/sandpoint/sandpoint: satmgr.c

Log Message:
- add D-Link EPIC defition to pci_machdep.c
- change the way to reboot/pwroff to make satmgr.c more flexible for
  a multiple byte sat protocol.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sandpoint/README.NAS
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sandpoint/pci/pci_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sandpoint/sandpoint/satmgr.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/sandpoint/README.NAS
diff -u src/sys/arch/sandpoint/README.NAS:1.11 src/sys/arch/sandpoint/README.NAS:1.12
--- src/sys/arch/sandpoint/README.NAS:1.11	Tue Feb  8 12:21:26 2011
+++ src/sys/arch/sandpoint/README.NAS	Thu Feb 10 13:54:45 2011
@@ -1,4 +1,4 @@
-$NetBSD: README.NAS,v 1.11 2011/02/08 12:21:26 phx Exp $
+$NetBSD: README.NAS,v 1.12 2011/02/10 13:54:45 nisimura Exp $
 
  MPC8241/8245 NAS products 
 
@@ -41,7 +41,7 @@
 Synology	12, 13, 14, 15	- 4, 0, 1, 2
 QNAP		13, 14, 15, 16	- 0, 1, 2, 3
 StorCenter	12, 13, 14, 15  - 0, 1, 2, 3
-DLink		13, 14, 15, 16	- 0, 1, 2, 3
+DLink		13, 14, 15, 16	- 0, 1, 3, 4
 
 - USB EHCI is a multiple function PCI device which has
   pin assignment A, B and C.

Index: src/sys/arch/sandpoint/pci/pci_machdep.c
diff -u src/sys/arch/sandpoint/pci/pci_machdep.c:1.21 src/sys/arch/sandpoint/pci/pci_machdep.c:1.22
--- src/sys/arch/sandpoint/pci/pci_machdep.c:1.21	Mon Feb  7 13:35:21 2011
+++ src/sys/arch/sandpoint/pci/pci_machdep.c	Thu Feb 10 13:54:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.21 2011/02/07 13:35:21 nisimura Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.22 2011/02/10 13:54:45 nisimura Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -43,7 +43,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.21 2011/02/07 13:35:21 nisimura Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.22 2011/02/10 13:54:45 nisimura Exp $);
 
 #include opt_pci.h
 
@@ -95,6 +95,7 @@
 #define BRD_QNAPTS101		101
 #define BRD_SYNOLOGY		102
 #define BRD_STORCENTER		103
+#define BRD_DLINKDSM		104
 #define BRD_UNKNOWN		-1
 
 #define	PCI_CONFIG_ENABLE	0x8000UL
@@ -104,7 +105,7 @@
 struct pcibus_attach_args *pba)
 {
 	pcitag_t tag;
-	pcireg_t dev11, dev22, dev15, dev13;
+	pcireg_t dev11, dev22, dev15, dev13, dev16;
 
 	tag = pci_make_tag(pba-pba_pc, pba-pba_bus, 11, 0);
 	dev11 = pci_conf_read(pba-pba_pc, tag, PCI_CLASS_REG);
@@ -150,7 +151,14 @@
 		brdtype = BRD_STORCENTER;
 		return;
 	}
-	
+	tag = pci_make_tag(pba-pba_pc, pba-pba_bus, 16, 0);
+	dev16 = pci_conf_read(pba-pba_pc, tag, PCI_ID_REG);
+	if (PCI_VENDOR(dev16) == PCI_VENDOR_ACARD) {
+		/* ACARD ATP865 at dev 16 */
+		brdtype = BRD_DLINKDSM;
+		return;
+	}
+
 	brdtype = BRD_UNKNOWN;
 }
 
@@ -336,6 +344,10 @@
 		/* map line 12,13-15 to EPIC IRQ4,0-2 */
 		*ihp = (line == 12) ? 4 : line - 13;
 		break;
+	case BRD_DLINKDSM:
+		/* map line 13,14,15,16 to EPIC IRQ0,1,3,4 */
+		*ihp = (line  15) ? line - 13 : line - 12;
+		break;
 	case BRD_STORCENTER:
 	default:
 		/* map line 12-15 to EPIC IRQ0-3 */

Index: src/sys/arch/sandpoint/sandpoint/satmgr.c
diff -u src/sys/arch/sandpoint/sandpoint/satmgr.c:1.2 src/sys/arch/sandpoint/sandpoint/satmgr.c:1.3
--- src/sys/arch/sandpoint/sandpoint/satmgr.c:1.2	Thu Jun  3 10:44:21 2010
+++ src/sys/arch/sandpoint/sandpoint/satmgr.c	Thu Feb 10 13:54:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: satmgr.c,v 1.2 2010/06/03 10:44:21 phx Exp $ */
+/* $NetBSD: satmgr.c,v 1.3 2011/02/10 13:54:45 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -55,6 +55,9 @@
 #include sandpoint/sandpoint/eumbvar.h
 #include locators.h
 
+
+struct satops;
+
 struct satmgr_softc {
 	device_t		sc_dev;
 	bus_space_tag_t		sc_iot;
@@ -71,6 +74,8 @@
 	char sc_rd_buf[16], *sc_rd_lim, *sc_rd_cur, *sc_rd_ptr;
 	char sc_wr_buf[16], *sc_wr_lim, *sc_wr_cur, *sc_wr_ptr;
 	int sc_rd_cnt, sc_wr_cnt;
+	int sc_btnstate;
+	struct satops		*sc_ops;
 };
 
 static int  satmgr_match(device_t, cfdata_t, void *);
@@ -104,24 +109,30 @@
 static void txintr(struct satmgr_softc *);
 static void startoutput(struct satmgr_softc *);
 static void swintr(void *);
+static void kreboot(struct satmgr_softc *);
+static void sreboot(struct satmgr_softc *);
+static void qreboot(struct satmgr_softc *);
+static void kpwroff(struct satmgr_softc *);
+static void spwroff(struct satmgr_softc *);
+static void qpwroff(struct satmgr_softc *);
 static void kbutton(struct satmgr_softc *, int);
 static void sbutton(struct satmgr_softc *, int);
 static void qbutton(struct satmgr_softc *, int);
 static void guarded_pbutton(void *);
 static void sched_sysmon_pbutton(void *);
 
-struct satmsg {
+struct 

CVS commit: src

[Mindaugas Rasiukevicius]

Module Name:src
Committed By:   rmind
Date:   Thu Feb 10 14:04:30 UTC 2011

Modified Files:
src/dist/pf/usr.sbin/ftp-proxy: filter.h
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi

Log Message:
- Fix man pages list for MKNPF=no case.  Based on a patch from Scott Ellis.
- Fix build with MKNPF=yes and MKIPFILTER=no as well; close PR/44512.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/dist/pf/usr.sbin/ftp-proxy/filter.h
cvs rdiff -u -r1.1584 -r1.1585 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1286 -r1.1287 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/dist/pf/usr.sbin/ftp-proxy/filter.h
diff -u src/dist/pf/usr.sbin/ftp-proxy/filter.h:1.3 src/dist/pf/usr.sbin/ftp-proxy/filter.h:1.4
--- src/dist/pf/usr.sbin/ftp-proxy/filter.h:1.3	Wed Feb  2 02:20:26 2011
+++ src/dist/pf/usr.sbin/ftp-proxy/filter.h	Thu Feb 10 14:04:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: filter.h,v 1.3 2011/02/02 02:20:26 rmind Exp $ */
+/*	$NetBSD: filter.h,v 1.4 2011/02/10 14:04:30 rmind Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Camiel Dobbelaar, c...@sentia.nl
@@ -36,14 +36,19 @@
 
 extern const ftp_proxy_ops_t	pf_fprx_ops;
 
-#if defined(__NetBSD__)  defined(WITH_NPF)
-extern const ftp_proxy_ops_t	npf_fprx_ops;
+#if defined(__NetBSD__)
+
 extern const char *		netif;
+
+#if defined(WITH_NPF)
+extern const ftp_proxy_ops_t	npf_fprx_ops;
+extern char *			npfopts;
 #endif
 
-#if defined(__NetBSD__)  defined(WITH_IPF)
+#if defined(WITH_IPF)
 extern const ftp_proxy_ops_t	ipf_fprx_ops;
-extern char *			npfopts;
+#endif
+
 #endif
 
 #endif

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1584 src/distrib/sets/lists/comp/mi:1.1585
--- src/distrib/sets/lists/comp/mi:1.1584	Tue Feb  8 03:20:14 2011
+++ src/distrib/sets/lists/comp/mi	Thu Feb 10 14:04:29 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1584 2011/02/08 03:20:14 haad Exp $
+#	$NetBSD: mi,v 1.1585 2011/02/10 14:04:29 rmind Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1501,8 +1501,8 @@
 ./usr/include/net/if_vlanvar.h			comp-c-include
 ./usr/include/net/net_stats.h			comp-c-include
 ./usr/include/net/netisr.h			comp-c-include
-./usr/include/net/npf.hcomp-npf-include	npf
-./usr/include/net/npf_ncode.h			comp-npf-include	npf
+./usr/include/net/npf.hcomp-c-include
+./usr/include/net/npf_ncode.h			comp-c-include
 ./usr/include/net/pfil.h			comp-c-include
 ./usr/include/net/pfkeyv2.h			comp-c-include
 ./usr/include/net/pfvar.h			comp-c-include
@@ -7460,7 +7460,7 @@
 ./usr/share/man/cat3/noqiflush.0		comp-c-catman		.cat
 ./usr/share/man/cat3/noraw.0			comp-c-catman		.cat
 ./usr/share/man/cat3/notimeout.0		comp-c-catman		.cat
-./usr/share/man/cat3/npf.0			comp-npf-catman		.cat
+./usr/share/man/cat3/npf.0			comp-npf-catman		.cat,npf
 ./usr/share/man/cat3/nrand48.0			comp-c-catman		.cat
 ./usr/share/man/cat3/ns.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/ns_addr.0			comp-obsolete		obsolete
@@ -13477,7 +13477,7 @@
 ./usr/share/man/html3/noqiflush.html		comp-c-htmlman		html
 ./usr/share/man/html3/noraw.html		comp-c-htmlman		html
 ./usr/share/man/html3/notimeout.html		comp-c-htmlman		html
-./usr/share/man/html3/npf.html			comp-npf-htmlman	html
+./usr/share/man/html3/npf.html			comp-npf-htmlman	html,npf
 ./usr/share/man/html3/nrand48.html		comp-c-htmlman		html
 ./usr/share/man/html3/nsdispatch.html		comp-c-htmlman		html
 ./usr/share/man/html3/ntoa.html			comp-c-htmlman		html
@@ -19480,7 +19480,7 @@
 ./usr/share/man/man3/noqiflush.3		comp-c-man		.man
 ./usr/share/man/man3/noraw.3			comp-c-man		.man
 ./usr/share/man/man3/notimeout.3		comp-c-man		.man
-./usr/share/man/man3/npf.3			comp-npf-man		.man
+./usr/share/man/man3/npf.3			comp-npf-man		.man,npf
 ./usr/share/man/man3/nrand48.3			comp-c-man		.man
 ./usr/share/man/man3/ns.3			comp-obsolete		obsolete
 ./usr/share/man/man3/ns_addr.3			comp-obsolete		obsolete

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1286 src/distrib/sets/lists/man/mi:1.1287
--- src/distrib/sets/lists/man/mi:1.1286	Wed Feb  9 15:12:40 2011
+++ src/distrib/sets/lists/man/mi	Thu Feb 10 14:04:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1286 2011/02/09 15:12:40 tsutsui Exp $
+# $NetBSD: mi,v 1.1287 2011/02/10 14:04:30 rmind Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1918,7 +1918,7 @@
 ./usr/share/man/cat5/nicknames.0		man-nis-catman		yp,.cat
 ./usr/share/man/cat5/nisplus_table.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat5/nologin.0			man-sysutil-catman	.cat
-./usr/share/man/cat5/npf.conf.0			man-npf-catman		.cat
+./usr/share/man/cat5/npf.conf.0			man-npf-catman		.cat,npf
 ./usr/share/man/cat5/nsswitch.conf.0		man-net-catman		.cat
 ./usr/share/man/cat5/openssl.cnf.0		man-crypto-catman	crypto,.cat
 ./usr/share/man/cat5/pam.conf.0	

CVS commit: src/sys

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 14:46:48 UTC 2011

Modified Files:
src/sys/arch/acorn26/acorn26: vm_machdep.c
src/sys/arch/alpha/alpha: vm_machdep.c
src/sys/arch/arm/arm32: vm_machdep.c
src/sys/arch/hppa/hppa: vm_machdep.c
src/sys/arch/ia64/ia64: vm_machdep.c
src/sys/arch/m68k/m68k: vm_machdep.c
src/sys/arch/mips/mips: vm_machdep.c
src/sys/arch/powerpc/powerpc: vm_machdep.c
src/sys/arch/sh3/sh3: vm_machdep.c
src/sys/arch/sparc/sparc: vm_machdep.c
src/sys/arch/sparc64/sparc64: vm_machdep.c
src/sys/arch/vax/vax: vm_machdep.c
src/sys/arch/x86/x86: vm_machdep.c
src/sys/kern: kern_physio.c
src/sys/rump/librump/rumpkern: vm.c
src/sys/uvm: uvm_extern.h

Log Message:
Make vmapbuf() return success/error and make physio deal with a
failure.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn26/acorn26/vm_machdep.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/alpha/alpha/vm_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/arm/arm32/vm_machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hppa/hppa/vm_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/ia64/vm_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/m68k/m68k/vm_machdep.c
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/mips/mips/vm_machdep.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/powerpc/powerpc/vm_machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sh3/sh3/vm_machdep.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sparc/sparc/vm_machdep.c
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/sparc64/sparc64/vm_machdep.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/vax/vax/vm_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/x86/vm_machdep.c
cvs rdiff -u -r1.91 -r1.92 src/sys/kern/kern_physio.c
cvs rdiff -u -r1.110 -r1.111 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.169 -r1.170 src/sys/uvm/uvm_extern.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/vm_machdep.c
diff -u src/sys/arch/acorn26/acorn26/vm_machdep.c:1.26 src/sys/arch/acorn26/acorn26/vm_machdep.c:1.27
--- src/sys/arch/acorn26/acorn26/vm_machdep.c:1.26	Sun Nov 29 04:15:42 2009
+++ src/sys/arch/acorn26/acorn26/vm_machdep.c	Thu Feb 10 14:46:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.26 2009/11/29 04:15:42 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.27 2011/02/10 14:46:45 pooka Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 Ben Harris
@@ -64,7 +64,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.26 2009/11/29 04:15:42 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.27 2011/02/10 14:46:45 pooka Exp $);
 
 #include sys/param.h
 #include sys/buf.h
@@ -173,7 +173,7 @@
  * do not need to pass an access_type to pmap_enter().
  */
 /* This code was originally stolen from the alpha port. */
-void
+int
 vmapbuf(struct buf *bp, vsize_t len)
 {
 	vaddr_t faddr, taddr, off;
@@ -203,6 +203,8 @@
 		taddr += PAGE_SIZE;
 	}
 	pmap_update(vm_map_pmap(phys_map));
+
+	return 0;
 }
 
 /*

Index: src/sys/arch/alpha/alpha/vm_machdep.c
diff -u src/sys/arch/alpha/alpha/vm_machdep.c:1.104 src/sys/arch/alpha/alpha/vm_machdep.c:1.105
--- src/sys/arch/alpha/alpha/vm_machdep.c:1.104	Sun Nov 29 04:15:42 2009
+++ src/sys/arch/alpha/alpha/vm_machdep.c	Thu Feb 10 14:46:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.104 2009/11/29 04:15:42 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.105 2011/02/10 14:46:46 pooka Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.104 2009/11/29 04:15:42 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.105 2011/02/10 14:46:46 pooka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -192,7 +192,7 @@
  * Note: the pages are already locked by uvm_vslock(), so we
  * do not need to pass an access_type to pmap_enter().
  */
-void
+int
 vmapbuf(struct buf *bp, vsize_t len)
 {
 	vaddr_t faddr, taddr, off;
@@ -219,6 +219,8 @@
 		taddr += PAGE_SIZE;
 	}
 	pmap_update(vm_map_pmap(phys_map));
+
+	return 0;
 }
 
 /*

Index: src/sys/arch/arm/arm32/vm_machdep.c
diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.54 src/sys/arch/arm/arm32/vm_machdep.c:1.55
--- src/sys/arch/arm/arm32/vm_machdep.c:1.54	Fri Jan 14 02:06:23 2011
+++ src/sys/arch/arm/arm32/vm_machdep.c	Thu Feb 10 14:46:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.54 2011/01/14 02:06:23 rmind Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.55 2011/02/10 14:46:46 pooka Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.54 2011/01/14 02:06:23 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.55 2011/02/10 14:46:46 pooka Exp $);
 
 #include 

CVS commit: [bouyer-quota2] src/sys/ufs/ufs

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Feb 10 16:16:05 UTC 2011

Modified Files:
src/sys/ufs/ufs [bouyer-quota2]: ufs_quota2.c

Log Message:
Unless the filestystem is mounted MNT_SYNCHRONOUS, use bdwrite()
to write back updated quota entries.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/sys/ufs/ufs/ufs_quota2.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/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.1.2.12 src/sys/ufs/ufs/ufs_quota2.c:1.1.2.13
--- src/sys/ufs/ufs/ufs_quota2.c:1.1.2.12	Wed Feb  9 21:17:17 2011
+++ src/sys/ufs/ufs/ufs_quota2.c	Thu Feb 10 16:16:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.1.2.12 2011/02/09 21:17:17 bouyer Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.1.2.13 2011/02/10 16:16:05 bouyer Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * All rights reserved.
@@ -28,7 +28,7 @@
   */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.1.2.12 2011/02/09 21:17:17 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.1.2.13 2011/02/10 16:16:05 bouyer Exp $);
 
 #include sys/buf.h
 #include sys/param.h
@@ -63,6 +63,7 @@
  * the locking order is dq_interlock - dqlock
  */
 
+static int quota2_bwrite(struct mount *, struct buf *);
 static int getinoquota2(struct inode *, int, struct buf **,
 struct quota2_entry **);
 static int getq2h(struct ufsmount *, int, struct buf **,
@@ -77,6 +78,17 @@
 static const char *valtypes[] = INITQLNAMES;
 
 static int
+quota2_bwrite(struct mount *mp, struct buf *bp)
+{
+	if (mp-mnt_flag  MNT_SYNCHRONOUS)
+		return bwrite(bp);
+	else {
+		bdwrite(bp);
+		return 0;
+	}
+}
+
+static int
 getq2h(struct ufsmount *ump, int type,
 struct buf **bpp, struct quota2_header **q2hp, int flags)
 {
@@ -170,12 +182,12 @@
 			/* callback changed parent's pointer, redo */
 			off = ufs_rw64(*offp, needswap);
 			if (bp != hbp  bp != obp)
-ret2 = VOP_BWRITE(bp);
+ret2 = bwrite(bp);
 		} else {
 			/* parent if now current */
 			if (obp != bp  obp != hbp) {
 if (flags  B_MODIFY)
-	ret2 = VOP_BWRITE(obp);
+	ret2 = bwrite(obp);
 else
 	brelse(obp, 0);
 			}
@@ -192,7 +204,7 @@
 	}
 	if (obp != hbp) {
 		if (flags  B_MODIFY)
-			ret2 = VOP_BWRITE(obp);
+			ret2 = bwrite(obp);
 		else
 			brelse(obp, 0);
 	}
@@ -263,7 +275,7 @@
 		uvm_vnp_setsize(vp, ip-i_size);
 		quota2_addfreeq2e(q2h, bp-b_data, size, ump-umq2_bsize,
 		needswap);
-		error = VOP_BWRITE(bp);
+		error = bwrite(bp);
 		error2 = UFS_UPDATE(vp, NULL, NULL, UPDATE_WAIT);
 		if (error || error2) {
 			brelse(hbp, 0);
@@ -297,7 +309,7 @@
 	q2e-q2e_next = q2h-q2h_entries[uid  hash_mask];
 	q2h-q2h_entries[uid  hash_mask] = ufs_rw64(offset, needswap);
 	if (hbp != bp) {
-		VOP_BWRITE(hbp);
+		bwrite(hbp);
 	}
 	*q2ep = q2e;
 	*bpp = bp;
@@ -404,7 +416,7 @@
 			else
 ncurblks += change;
 			q2vp-q2v_cur = ufs_rw64(ncurblks, needswap);
-			VOP_BWRITE(bp[i]);
+			quota2_bwrite(mp, bp[i]);
 			mutex_exit(dq-dq_interlock);
 		}
 		return 0;
@@ -479,7 +491,7 @@
 			q2vp = q2e[i]-q2e_val[vtype];
 			ncurblks = ufs_rw64(q2vp-q2v_cur, needswap);
 			q2vp-q2v_cur = ufs_rw64(ncurblks + change, needswap);
-			VOP_BWRITE(bp[i]);
+			quota2_bwrite(mp, bp[i]);
 		} else
 			brelse(bp[i], 0);
 		mutex_exit(dq-dq_interlock);
@@ -532,7 +544,7 @@
 		}
 		quota2_ufs_rwq2e(q2e, q2h-q2h_defentry, needswap);
 		mutex_exit(dqlock);
-		VOP_BWRITE(bp);
+		quota2_bwrite(ump-um_mountp, bp);
 		goto out_wapbl;
 	}
 
@@ -560,7 +572,7 @@
 		goto out_il;
 	}
 	quota2_ufs_rwq2e(q2e, q2ep, needswap);
-	VOP_BWRITE(bp);
+	quota2_bwrite(ump-um_mountp, bp);
 
 out_il:
 	mutex_exit(dq-dq_interlock);
@@ -660,7 +672,7 @@
 			q2e.q2e_val[i].q2v_grace;
 			q2ep-q2e_val[i].q2v_time = 0;
 		}
-		VOP_BWRITE(bp);
+		quota2_bwrite(ump-um_mountp, bp);
 		goto out_wapbl;
 	}
 	/* we can free it. release bp so we can walk the list */
@@ -678,7 +690,7 @@
 	q2h-q2h_entries[id  hash_mask], B_MODIFY, c,
 	dq2clear_callback);
 
-	VOP_BWRITE(hbp);
+	bwrite(hbp);
 
 out_dqlock:
 	mutex_exit(dqlock);

CVS commit: src/tests/fs/common

[Nicolas Joly]

Module Name:src
Committed By:   njoly
Date:   Thu Feb 10 16:35:01 UTC 2011

Modified Files:
src/tests/fs/common: fstest_nfs.c fstest_puffs.c

Log Message:
Do initialise allocated file system args structures for puffs and nfs
(fix some puffs tests failures with MALLOC_OPTIONS=J).
While here, detect and report args allocation failure.

ok from pooka.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/common/fstest_nfs.c
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/common/fstest_puffs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/fs/common/fstest_nfs.c
diff -u src/tests/fs/common/fstest_nfs.c:1.5 src/tests/fs/common/fstest_nfs.c:1.6
--- src/tests/fs/common/fstest_nfs.c:1.5	Fri Dec 31 18:11:27 2010
+++ src/tests/fs/common/fstest_nfs.c	Thu Feb 10 16:35:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fstest_nfs.c,v 1.5 2010/12/31 18:11:27 pooka Exp $	*/
+/*	$NetBSD: fstest_nfs.c,v 1.6 2011/02/10 16:35:01 njoly Exp $	*/
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -149,6 +149,9 @@
 	 * the mountpath available here.
 	 */
 	args = malloc(sizeof(*args));
+	if (args == NULL)
+		return errno;
+	memset(args, 0, sizeof(*args));
 	args-ta_childpid = childpid;
 	strcpy(args-ta_ethername, ethername);
 

Index: src/tests/fs/common/fstest_puffs.c
diff -u src/tests/fs/common/fstest_puffs.c:1.9 src/tests/fs/common/fstest_puffs.c:1.10
--- src/tests/fs/common/fstest_puffs.c:1.9	Fri Jan  7 11:50:37 2011
+++ src/tests/fs/common/fstest_puffs.c	Thu Feb 10 16:35:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: fstest_puffs.c,v 1.9 2011/01/07 11:50:37 pooka Exp $	*/
+/*	$NetBSD: fstest_puffs.c,v 1.10 2011/02/10 16:35:01 njoly Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -260,6 +260,7 @@
 	args = malloc(sizeof(*args));
 	if (args == NULL)
 		return errno;
+	memset(args, 0, sizeof(*args));
 
 	pflags = args-pta_pflags;
 

CVS commit: src/sys/arch/i386/conf

[Jean-Yves Migeon]

Module Name:src
Committed By:   jym
Date:   Thu Feb 10 16:49:19 UTC 2011

Modified Files:
src/sys/arch/i386/conf: INSTALL

Log Message:
For i386, include MONOLITHIC for INSTALL rather than GENERIC. While here,
remove drm drivers, we don't need them for install.

i386 GENERIC has FFS and ELF support compiled as modules, so we hit
an interesting chicken-egg situation when the kernel attempts to mount
a ffs ramdisk, while the module might be contained inside... the ramdisk.

Interesting scenario: my netbsd-INSTALL.gz testing involved a QEMU image
which already contained an installed system, including modules. So the
bootloader was able to get the ffs.kmod, and lead to a successful mount
of the ramdisk.

Caught off-guard by gson@ automated builds... Erf. My fondest apologies.
Lesson learnt. Hopefully, this will unbreak the floppy install.
Waiting for the release build to finish...


To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 src/sys/arch/i386/conf/INSTALL

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.327 src/sys/arch/i386/conf/INSTALL:1.328
--- src/sys/arch/i386/conf/INSTALL:1.327	Thu Feb 10 00:43:19 2011
+++ src/sys/arch/i386/conf/INSTALL	Thu Feb 10 16:49:19 2011
@@ -1,15 +1,26 @@
-# $NetBSD: INSTALL,v 1.327 2011/02/10 00:43:19 jym Exp $
+# $NetBSD: INSTALL,v 1.328 2011/02/10 16:49:19 jym Exp $
 #
 #	INSTALL - Installation kernel.
 #
 #	This kernel is derived from GENERIC with additional memory disk
 #	options.
 
-include	arch/i386/conf/GENERIC
+include	arch/i386/conf/MONOLITHIC
 
-#ident 		INSTALL-$Revision: 1.327 $
+#ident 		INSTALL-$Revision: 1.328 $
 
 no options	MEMORY_DISK_DYNAMIC
 options 	MEMORY_DISK_IS_ROOT # force root on memory disk
 options 	MEMORY_DISK_SERVER=0# no userspace memory disk support
 options 	MEMORY_DISK_ROOT_SIZE=1 # size of memory disk, in blocks
+options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
+
+# DRI driver
+no i915drm*	at vga?		# Intel i915, i945 DRM driver
+no mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
+no mgadrm*	at vga?		# Matrox G[24]00, G[45]50 DRM driver
+no r128drm*	at vga?		# ATI Rage 128 DRM driver
+no radeondrm*	at vga?		# ATI Radeon DRM driver
+no savagedrm*	at vga?		# S3 Savage DRM driver
+no sisdrm*	at vga?		# SiS DRM driver
+no tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver

CVS commit: src/sys/arch/sandpoint

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Thu Feb 10 17:11:33 UTC 2011

Modified Files:
src/sys/arch/sandpoint: README.NAS

Log Message:
Fixed typo. Added AMS150.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sandpoint/README.NAS

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/sandpoint/README.NAS
diff -u src/sys/arch/sandpoint/README.NAS:1.12 src/sys/arch/sandpoint/README.NAS:1.13
--- src/sys/arch/sandpoint/README.NAS:1.12	Thu Feb 10 13:54:45 2011
+++ src/sys/arch/sandpoint/README.NAS	Thu Feb 10 17:11:33 2011
@@ -1,4 +1,4 @@
-$NetBSD: README.NAS,v 1.12 2011/02/10 13:54:45 nisimura Exp $
+$NetBSD: README.NAS,v 1.13 2011/02/10 17:11:33 phx Exp $
 
  MPC8241/8245 NAS products 
 
@@ -29,8 +29,8 @@
 re.15	satalink.13 	QNAP TS-201
 stge.15	acardide.16	D-Link DSM-G600
 re.?	iteide.16	Allnet ALL6250
-re.?	satalink.?	Allnet ALL6260, Longshine LCS-8311, Nettronix NH231,
-			Fujitsu-Siemens SBLAN2
+re.?	satalink.?	Allnet ALL6260, Longshine LCS-8311, Netronix NH231,
+			Fujitsu-Siemens AMS150, Fujitsu-Siemens SBLAN2
 ?	?		LevelOne NASCon FNS-5000B (GBit, SATA)
 
 

CVS commit: [bouyer-quota2] src/usr.sbin/repquota

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Feb 10 17:11:35 UTC 2011

Modified Files:
src/usr.sbin/repquota [bouyer-quota2]: repquota.8 repquota.c

Log Message:
Add an option -x to export a filesystem quotas in a plist format, which
can be feed to quotactl(8). This is the way to migrate limits from quota1
to quota2.


To generate a diff of this commit:
cvs rdiff -u -r1.9.50.1 -r1.9.50.2 src/usr.sbin/repquota/repquota.8
cvs rdiff -u -r1.25.2.6 -r1.25.2.7 src/usr.sbin/repquota/repquota.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/repquota/repquota.8
diff -u src/usr.sbin/repquota/repquota.8:1.9.50.1 src/usr.sbin/repquota/repquota.8:1.9.50.2
--- src/usr.sbin/repquota/repquota.8:1.9.50.1	Fri Jan 21 16:58:07 2011
+++ src/usr.sbin/repquota/repquota.8	Thu Feb 10 17:11:35 2011
@@ -29,9 +29,9 @@
 .\ SUCH DAMAGE.
 .\
 .\ from: @(#)repquota.8	8.1 (Berkeley) 6/6/93
-.\	$NetBSD: repquota.8,v 1.9.50.1 2011/01/21 16:58:07 bouyer Exp $
+.\	$NetBSD: repquota.8,v 1.9.50.2 2011/02/10 17:11:35 bouyer Exp $
 .\
-.Dd January 21, 2011
+.Dd February 10, 2011
 .Dt REPQUOTA 8
 .Os
 .Sh NAME
@@ -52,6 +52,12 @@
 .Op Fl u
 .Op Fl v
 .Fl a
+.Nm
+.Fl x
+.Op Fl D
+.Op Fl g
+.Op Fl u
+.Ar filesystem
 .Sh DESCRIPTION
 .Nm
 prints a summary of the disk usage and quotas for the
@@ -73,6 +79,10 @@
 Debug: print plist sent to and received from kernel.
 .It Fl h
 Numbers are displayed in a human readable format.
+.It Fl x
+export filesystem quota in a plist format suitable for
+.Xr quotactl 8 .
+A single filesystem should be specified.
 .El
 .Pp
 For each user or group, the current
@@ -83,14 +93,13 @@
 .Xr edquota 8 .
 .Pp
 Only the super-user may use this command.
-.Sh DIAGNOSTICS
-Various messages about inaccessible files; self-explanatory.
 .Sh SEE ALSO
 .Xr quota 1 ,
 .Xr quotactl 2 ,
 .Xr fstab 5 ,
 .Xr edquota 8 ,
 .Xr quotacheck 8 ,
+.Xr quotactl 8 ,
 .Xr quotaon 8
 .Sh HISTORY
 The

Index: src/usr.sbin/repquota/repquota.c
diff -u src/usr.sbin/repquota/repquota.c:1.25.2.6 src/usr.sbin/repquota/repquota.c:1.25.2.7
--- src/usr.sbin/repquota/repquota.c:1.25.2.6	Thu Feb  3 15:56:16 2011
+++ src/usr.sbin/repquota/repquota.c	Thu Feb 10 17:11:35 2011
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = @(#)repquota.c	8.2 (Berkeley) 11/22/94;
 #else
-__RCSID($NetBSD: repquota.c,v 1.25.2.6 2011/02/03 15:56:16 bouyer Exp $);
+__RCSID($NetBSD: repquota.c,v 1.25.2.7 2011/02/10 17:11:35 bouyer Exp $);
 #endif
 #endif /* not lint */
 
@@ -82,12 +82,15 @@
 #define FUHASH 1024	/* must be power of two */
 struct fileusage *fuhead[MAXQUOTAS][FUHASH];
 u_long highid[MAXQUOTAS];	/* highest addid()'ed identifier per type */
+int valid[MAXQUOTAS];
 struct quota2_entry defaultq2e[MAXQUOTAS];
 
 int	vflag = 0;		/* verbose */
 int	aflag = 0;		/* all file systems */
 int	Dflag = 0;		/* debug */
-int	hflag = 0;		/* debug */
+int	hflag = 0;		/* humanize */
+int	xflag = 0;		/* export */
+
 
 struct fileusage *addid(u_long, int, const char *);
 int	hasquota(struct fstab *, int, char **);
@@ -99,6 +102,7 @@
 int	repquota1(const struct statvfs *, int);
 void	usage(void);
 void	printquotas(int, const struct statvfs *, int);
+void	exportquotas(void);
 void	dqblk2q2e(const struct dqblk *, struct quota2_entry *);
 
 int
@@ -114,7 +118,7 @@
 	struct statvfs *fst;
 	int nfst;
 
-	while ((ch = getopt(argc, argv, Daguhv)) != -1) {
+	while ((ch = getopt(argc, argv, Daguhvx)) != -1) {
 		switch(ch) {
 		case 'a':
 			aflag++;
@@ -134,12 +138,17 @@
 		case 'D':
 			Dflag++;
 			break;
+		case 'x':
+			xflag++;
+			break;
 		default:
 			usage();
 		}
 	}
 	argc -= optind;
 	argv += optind;
+	if (xflag  argc != 1)
+		usage();
 	if (argc == 0  !aflag)
 		usage();
 	if (!gflag  !uflag) {
@@ -184,6 +193,8 @@
 errs += repquota(fst[i], USRQUOTA);
 		}
 	}
+	if (xflag)
+		exportquotas();
 	for (i = 0; i  argc; i++)
 		if ((done  (1  i)) == 0)
 			fprintf(stderr, %s not mounted\n, argv[i]);
@@ -193,9 +204,10 @@
 void
 usage()
 {
-	fprintf(stderr, usage:\n\t%s\n\t%s\n,
-		repquota [-D] [-v] [-g] [-u] -a,
-		repquota [-D] [-v] [-g] [-u] filesys ...);
+	fprintf(stderr, usage:\n
+		\trepquota [-D] [-v] [-g] [-u] -a\n
+		\trepquota [-D] [-v] [-g] [-u] filesys ...\n
+		\trepquota -x [-D] [-g] [-u] filesys\n);
 	exit(1);
 }
 
@@ -293,6 +305,7 @@
 		if (dataiter == NULL)
 			err(1, prop_array_iterator);
 
+		valid[type] = 1;
 		while ((data = prop_object_iterator_next(dataiter)) != NULL) {
 			strid = NULL;
 			if (!prop_dictionary_get_uint32(data, id, id)) {
@@ -322,7 +335,8 @@
 	}
 	prop_object_iterator_release(cmditer);
 	prop_object_release(dict);
-	printquotas(type, vfs, version);
+	if (xflag == 0)
+		printquotas(type, vfs, version);
 	return (0);
 }
 
@@ -334,16 +348,8 @@
 	FILE *qf;
 	u_long id;
 	struct dqblk dqbuf;
+	time_t bgrace = MAX_DQ_TIME, igrace = MAX_DQ_TIME;
 
-#if 0
-	static int warned = 0;
-	if (quotactl(fs-fs_file, QCMD(Q_SYNC, type), 0, 

CVS commit: src/etc/mtree

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Feb 10 19:12:45 UTC 2011

Modified Files:
src/etc/mtree: NetBSD.dist.mips64eb NetBSD.dist.mips64el

Log Message:
Add debugdirs for o32 and 64


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.mips64eb \
src/etc/mtree/NetBSD.dist.mips64el

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/mtree/NetBSD.dist.mips64eb
diff -u src/etc/mtree/NetBSD.dist.mips64eb:1.1 src/etc/mtree/NetBSD.dist.mips64eb:1.2
--- src/etc/mtree/NetBSD.dist.mips64eb:1.1	Mon Dec 14 13:23:56 2009
+++ src/etc/mtree/NetBSD.dist.mips64eb	Thu Feb 10 19:12:44 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.mips64eb,v 1.1 2009/12/14 13:23:56 uebayasi Exp $
+#	$NetBSD: NetBSD.dist.mips64eb,v 1.2 2011/02/10 19:12:44 matt Exp $
 
 ./usr/lib/o32
 ./usr/lib/o32/i18n
@@ -6,3 +6,7 @@
 ./usr/lib/64
 ./usr/lib/64/i18n
 ./usr/lib/64/security
+./usr/libdata/debug/usr/lib/o32
+./usr/libdata/debug/usr/lib/o32/i18n
+./usr/libdata/debug/usr/lib/64
+./usr/libdata/debug/usr/lib/64/i18n
Index: src/etc/mtree/NetBSD.dist.mips64el
diff -u src/etc/mtree/NetBSD.dist.mips64el:1.1 src/etc/mtree/NetBSD.dist.mips64el:1.2
--- src/etc/mtree/NetBSD.dist.mips64el:1.1	Mon Dec 14 13:23:56 2009
+++ src/etc/mtree/NetBSD.dist.mips64el	Thu Feb 10 19:12:44 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.mips64el,v 1.1 2009/12/14 13:23:56 uebayasi Exp $
+#	$NetBSD: NetBSD.dist.mips64el,v 1.2 2011/02/10 19:12:44 matt Exp $
 
 ./usr/lib/o32
 ./usr/lib/o32/i18n
@@ -6,3 +6,7 @@
 ./usr/lib/64
 ./usr/lib/64/i18n
 ./usr/lib/64/security
+./usr/libdata/debug/usr/lib/o32
+./usr/libdata/debug/usr/lib/o32/i18n
+./usr/libdata/debug/usr/lib/64
+./usr/libdata/debug/usr/lib/64i18n

CVS commit: src/etc/mtree

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Feb 10 19:17:35 UTC 2011

Modified Files:
src/etc/mtree: NetBSD.dist.mips64el

Log Message:
Add missing /


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/etc/mtree/NetBSD.dist.mips64el

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/mtree/NetBSD.dist.mips64el
diff -u src/etc/mtree/NetBSD.dist.mips64el:1.2 src/etc/mtree/NetBSD.dist.mips64el:1.3
--- src/etc/mtree/NetBSD.dist.mips64el:1.2	Thu Feb 10 19:12:44 2011
+++ src/etc/mtree/NetBSD.dist.mips64el	Thu Feb 10 19:17:35 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.mips64el,v 1.2 2011/02/10 19:12:44 matt Exp $
+#	$NetBSD: NetBSD.dist.mips64el,v 1.3 2011/02/10 19:17:35 matt Exp $
 
 ./usr/lib/o32
 ./usr/lib/o32/i18n
@@ -9,4 +9,4 @@
 ./usr/libdata/debug/usr/lib/o32
 ./usr/libdata/debug/usr/lib/o32/i18n
 ./usr/libdata/debug/usr/lib/64
-./usr/libdata/debug/usr/lib/64i18n
+./usr/libdata/debug/usr/lib/64/i18n

CVS commit: src/share/misc

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Thu Feb 10 19:25:42 UTC 2011

Modified Files:
src/share/misc: acronyms

Log Message:
FSCK.


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/share/misc/acronyms

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.200 src/share/misc/acronyms:1.201
--- src/share/misc/acronyms:1.200	Mon Jan 17 15:18:06 2011
+++ src/share/misc/acronyms	Thu Feb 10 19:25:42 2011
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.200 2011/01/17 15:18:06 jnemeth Exp $
+$NetBSD: acronyms,v 1.201 2011/02/10 19:25:42 jruoho Exp $
 10Q	thank you
 10X	thanks
 1337	elite (leet)
@@ -109,6 +109,7 @@
 FOAD	{fuck off,fall over} and die
 FOS	full of shit
 FPS	first person shooter
+FSCK	fuck
 FSDO	for some definition of
 FSVO	for some value of
 FTBFS	fails to build from source

CVS commit: src/tests/fs/puffs

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Thu Feb 10 20:10:54 UTC 2011

Modified Files:
src/tests/fs/puffs: t_basic.c

Log Message:
update /dev/null rump minor to make test pass again


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/puffs/t_basic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/fs/puffs/t_basic.c
diff -u src/tests/fs/puffs/t_basic.c:1.9 src/tests/fs/puffs/t_basic.c:1.10
--- src/tests/fs/puffs/t_basic.c:1.9	Mon Nov 15 20:39:00 2010
+++ src/tests/fs/puffs/t_basic.c	Thu Feb 10 20:10:54 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_basic.c,v 1.9 2010/11/15 20:39:00 pooka Exp $	*/
+/*	$NetBSD: t_basic.c,v 1.10 2011/02/10 20:10:54 pooka Exp $	*/
 
 #include sys/types.h
 #include sys/mount.h
@@ -190,7 +190,7 @@
 
 ATF_TC_BODY(root_chrdev, tc)
 {
-	MAKEOPTS(-r, chr 2 0);
+	MAKEOPTS(-r, chr 2 2);
 	void *args;
 	ssize_t rv;
 	char buf[512];

CVS commit: src/sys/netipsec

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Thu Feb 10 20:24:27 UTC 2011

Modified Files:
src/sys/netipsec: ipsec_output.c xform_ah.c xform_esp.c xform_ipcomp.c

Log Message:
-in opencrypto callbacks (which run in a kernel thread), pull softnet_lock
 everywhere splsoftnet() was used before, to fix MP concurrency problems
-pull KERNEL_LOCK where ip(6)_output() is called, as this is what
 the network stack (unfortunately) expects, in particular to avoid
 races for packets in the interface send queues
From Wolfgang Stukenbrock per PR kern/44418, with the application
of KERNEL_LOCK to what I think are the essential points, tested
on a dual-core i386.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/netipsec/ipsec_output.c
cvs rdiff -u -r1.26 -r1.27 src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.22 -r1.23 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.20 -r1.21 src/sys/netipsec/xform_ipcomp.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/netipsec/ipsec_output.c
diff -u src/sys/netipsec/ipsec_output.c:1.29 src/sys/netipsec/ipsec_output.c:1.30
--- src/sys/netipsec/ipsec_output.c:1.29	Tue Dec  1 01:01:34 2009
+++ src/sys/netipsec/ipsec_output.c	Thu Feb 10 20:24:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_output.c,v 1.29 2009/12/01 01:01:34 dyoung Exp $	*/
+/*	$NetBSD: ipsec_output.c,v 1.30 2011/02/10 20:24:27 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipsec_output.c,v 1.29 2009/12/01 01:01:34 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipsec_output.c,v 1.30 2011/02/10 20:24:27 drochner Exp $);
 
 /*
  * IPsec output processing.
@@ -123,6 +123,9 @@
 #ifdef INET
 	struct ip * ip;
 #endif /* INET */
+#if defined(INET) || defined(INET6)
+	int rv;
+#endif
 
 	switch (af) {
 #ifdef INET
@@ -133,8 +136,11 @@
 		ip-ip_len = ntohs(ip-ip_len);
 		ip-ip_off = ntohs(ip-ip_off);
 #endif /* __FreeBSD_ */
-		return ip_output(m, NULL, NULL, IP_RAWOUTPUT,
+		KERNEL_LOCK(1, NULL);
+		rv = ip_output(m, NULL, NULL, IP_RAWOUTPUT,
 		(struct ip_moptions *)NULL, (struct socket *)NULL);
+		KERNEL_UNLOCK_ONE(NULL);
+		return rv;
 
 #endif /* INET */
 #ifdef INET6
@@ -143,7 +149,10 @@
 		 * We don't need massage, IPv6 header fields are always in
 		 * net endian.
 		 */
-		return ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL);
+		KERNEL_LOCK(1, NULL);
+		rv = ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL);
+		KERNEL_UNLOCK_ONE(NULL);
+		return rv;
 #endif /* INET6 */
 	}
 

Index: src/sys/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.26 src/sys/netipsec/xform_ah.c:1.27
--- src/sys/netipsec/xform_ah.c:1.26	Sat Apr 18 14:58:06 2009
+++ src/sys/netipsec/xform_ah.c	Thu Feb 10 20:24:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: xform_ah.c,v 1.26 2009/04/18 14:58:06 tsutsui Exp $	*/
+/*	$NetBSD: xform_ah.c,v 1.27 2011/02/10 20:24:27 drochner Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xform_ah.c,v 1.26 2009/04/18 14:58:06 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: xform_ah.c,v 1.27 2011/02/10 20:24:27 drochner Exp $);
 
 #include opt_inet.h
 #ifdef __FreeBSD__
@@ -53,6 +53,7 @@
 #include sys/syslog.h
 #include sys/kernel.h
 #include sys/sysctl.h
+#include sys/socketvar.h /* for softnet_lock */
 
 #include net/if.h
 
@@ -828,6 +829,7 @@
 	}
 #endif
 
+	mutex_enter(softnet_lock);
 	s = splsoftnet();
 
 	sav = KEY_ALLOCSA(tc-tc_dst, tc-tc_proto, tc-tc_spi, sport, dport);
@@ -851,8 +853,11 @@
 		if (sav-tdb_cryptoid != 0)
 			sav-tdb_cryptoid = crp-crp_sid;
 
-		if (crp-crp_etype == EAGAIN)
+		if (crp-crp_etype == EAGAIN) {
+			splx(s);
+			mutex_exit(softnet_lock);
 			return crypto_dispatch(crp);
+		}
 
 		AH_STATINC(AH_STAT_NOXFORM);
 		DPRINTF((ah_input_cb: crypto error %d\n, crp-crp_etype));
@@ -960,11 +965,13 @@
 
 	KEY_FREESAV(sav);
 	splx(s);
+	mutex_exit(softnet_lock);
 	return error;
 bad:
 	if (sav)
 		KEY_FREESAV(sav);
 	splx(s);
+	mutex_exit(softnet_lock);
 	if (m != NULL)
 		m_freem(m);
 	if (tc != NULL)
@@ -1228,6 +1235,7 @@
 	ptr = (tc + 1);
 	m = (struct mbuf *) crp-crp_buf;
 
+	mutex_enter(softnet_lock);
 	s = splsoftnet();
 
 	isr = tc-tc_isr;
@@ -1248,6 +1256,7 @@
 		if (crp-crp_etype == EAGAIN) {
 			KEY_FREESAV(sav);
 			splx(s);
+			mutex_exit(softnet_lock);
 			return crypto_dispatch(crp);
 		}
 
@@ -1294,11 +1303,13 @@
 	err = ipsec_process_done(m, isr);
 	KEY_FREESAV(sav);
 	splx(s);
+	mutex_exit(softnet_lock);
 	return err;
 bad:
 	if (sav)
 		KEY_FREESAV(sav);
 	splx(s);
+	mutex_exit(softnet_lock);
 	if (m)
 		m_freem(m);
 	free(tc, M_XDATA);

Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.22 src/sys/netipsec/xform_esp.c:1.23
--- 

CVS commit: src/sys/netipsec

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Thu Feb 10 20:42:30 UTC 2011

Modified Files:
src/sys/netipsec: ipsec_output.c

Log Message:
in rev.1.192 of ip_output.c the semantics of ip_output() was changed:
Before, setting the IP_RAWOUTPUT flag did imply that the ip_id
(the fragmentation thing) was used as-is.
Now, a new ID is diced unless the new IP_NOIPNEWID flag is set.
The ip_id is part of the data which are used to calculate the hash
for AH, so set the IP_NOIPNEWID flag to make sure the IP header
is not modified behind AH's back. Otherwise, the recipient will detect
a checksum mismatch and discard the packet.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/netipsec/ipsec_output.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/netipsec/ipsec_output.c
diff -u src/sys/netipsec/ipsec_output.c:1.30 src/sys/netipsec/ipsec_output.c:1.31
--- src/sys/netipsec/ipsec_output.c:1.30	Thu Feb 10 20:24:27 2011
+++ src/sys/netipsec/ipsec_output.c	Thu Feb 10 20:42:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_output.c,v 1.30 2011/02/10 20:24:27 drochner Exp $	*/
+/*	$NetBSD: ipsec_output.c,v 1.31 2011/02/10 20:42:30 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipsec_output.c,v 1.30 2011/02/10 20:24:27 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipsec_output.c,v 1.31 2011/02/10 20:42:30 drochner Exp $);
 
 /*
  * IPsec output processing.
@@ -137,7 +137,7 @@
 		ip-ip_off = ntohs(ip-ip_off);
 #endif /* __FreeBSD_ */
 		KERNEL_LOCK(1, NULL);
-		rv = ip_output(m, NULL, NULL, IP_RAWOUTPUT,
+		rv = ip_output(m, NULL, NULL, IP_RAWOUTPUT|IP_NOIPNEWID,
 		(struct ip_moptions *)NULL, (struct socket *)NULL);
 		KERNEL_UNLOCK_ONE(NULL);
 		return rv;

CVS commit: src/distrib/sets/lists/comp

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Feb 10 20:56:03 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
Fix liblua_g.a and libterminfo_g.a to be -unknown- debuglib instead of
proflibs.


To generate a diff of this commit:
cvs rdiff -u -r1.1585 -r1.1586 src/distrib/sets/lists/comp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1585 src/distrib/sets/lists/comp/mi:1.1586
--- src/distrib/sets/lists/comp/mi:1.1585	Thu Feb 10 14:04:29 2011
+++ src/distrib/sets/lists/comp/mi	Thu Feb 10 20:56:02 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1585 2011/02/10 14:04:29 rmind Exp $
+#	$NetBSD: mi,v 1.1586 2011/02/10 20:56:02 matt Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2541,7 +2541,7 @@
 ./usr/lib/libldap_r_g.a-unknown-		debuglib,ldap
 ./usr/lib/libldap_r_p.acomp-ldap-proflib	profile,ldap
 ./usr/lib/liblua.acomp-c-lib
-./usr/lib/liblua_g.acomp-c-proflib		debuglib
+./usr/lib/liblua_g.a-unknown-		debuglib
 ./usr/lib/liblua_p.acomp-c-proflib		profile
 ./usr/lib/liblwres.acomp-bind-lib
 ./usr/lib/liblwres_g.a-unknown-		debuglib
@@ -2892,7 +2892,7 @@
 ./usr/lib/libtermcap_g.a			comp-obsolete		obsolete
 ./usr/lib/libtermcap_p.a			comp-c-proflib		profile
 ./usr/lib/libterminfo.acomp-c-lib
-./usr/lib/libterminfo_g.a			comp-c-proflib		profile,debuglib
+./usr/lib/libterminfo_g.a			-unknown-		debuglib
 ./usr/lib/libterminfo_p.a			comp-c-proflib		profile
 ./usr/lib/libtermlib.acomp-c-lib
 ./usr/lib/libtermlib_p.a			comp-c-proflib		profile

CVS commit: src/lib

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Feb 10 20:57:23 UTC 2011

Modified Files:
src/lib: Makefile

Log Message:
Make liblzf and the lvm2 libraries during the library stage.  This also makes
them get built for MKCOMPAT.


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.162 src/lib/Makefile:1.163
--- src/lib/Makefile:1.162	Tue Feb  8 03:20:15 2011
+++ src/lib/Makefile	Thu Feb 10 20:57:22 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.162 2011/02/08 03:20:15 haad Exp $
+#	$NetBSD: Makefile,v 1.163 2011/02/10 20:57:22 matt Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include bsd.own.mk
@@ -59,6 +59,7 @@
 SUBDIR+=	../external/bsd/libdwarf/lib
 SUBDIR+=	../external/bsd/libelf/lib
 SUBDIR+=	../external/bsd/libevent/lib
+SUBDIR+=	../external/bsd/liblzf/lib
 SUBDIR+=	../external/bsd/libpcap/lib
 
 SUBDIR+=	../external/mit/lua/lib
@@ -105,6 +106,10 @@
 
 SUBDIR+=	../external/bsd/libarchive/lib	# depends on libxz
 
+.if (${MKLVM} != no)
+SUBDIR+=	../external/gpl2/lvm2/lib	# depends on libprop
+.endif
+
 .if (${MKBINUTILS} != no)
 SUBDIR+=	../external/gpl3/binutils/lib	# libbfd depends on libz
 .endif

CVS commit: src/sys/opencrypto

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Thu Feb 10 21:00:42 UTC 2011

Modified Files:
src/sys/opencrypto: cryptosoft.c cryptosoft.h

Log Message:
Don't store temporary values in the opencrypto session data struct which
can be shared by multiple threads -- pass them on the stack instead.
Add some const to document this. (One _could_ use the session struct
for temporary stuff with proper locking, but it seems unnecessary here.)
Also remove the unused SW_crc member in the session struct.
From Wolfgang Stukenbrock per PR kern/44472.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/opencrypto/cryptosoft.c
cvs rdiff -u -r1.6 -r1.7 src/sys/opencrypto/cryptosoft.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/opencrypto/cryptosoft.c
diff -u src/sys/opencrypto/cryptosoft.c:1.26 src/sys/opencrypto/cryptosoft.c:1.27
--- src/sys/opencrypto/cryptosoft.c:1.26	Mon Aug  2 19:59:35 2010
+++ src/sys/opencrypto/cryptosoft.c	Thu Feb 10 21:00:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cryptosoft.c,v 1.26 2010/08/02 19:59:35 jakllsch Exp $ */
+/*	$NetBSD: cryptosoft.c,v 1.27 2011/02/10 21:00:42 drochner Exp $ */
 /*	$FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $	*/
 /*	$OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $	*/
 
@@ -24,7 +24,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptosoft.c,v 1.26 2010/08/02 19:59:35 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptosoft.c,v 1.27 2011/02/10 21:00:42 drochner Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -60,8 +60,8 @@
 	(x) == CRYPTO_BUF_MBUF ? m_copydata((struct mbuf *)a,b,c,d) \
 	: cuio_copydata((struct uio *)a,b,c,d)
 
-static	int swcr_encdec(struct cryptodesc *, struct swcr_data *, void *, int);
-static	int swcr_compdec(struct cryptodesc *, struct swcr_data *, void *, int);
+static	int swcr_encdec(struct cryptodesc *, const struct swcr_data *, void *, int);
+static	int swcr_compdec(struct cryptodesc *, const struct swcr_data *, void *, int, int *);
 static	int swcr_process(void *, struct cryptop *, int);
 static	int swcr_newsession(void *, u_int32_t *, struct cryptoini *);
 static	int swcr_freesession(void *, u_int64_t);
@@ -70,7 +70,7 @@
  * Apply a symmetric encryption/decryption algorithm.
  */
 static int
-swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, void *bufv,
+swcr_encdec(struct cryptodesc *crd, const struct swcr_data *sw, void *bufv,
 int outtype)
 {
 	char *buf = bufv;
@@ -418,7 +418,7 @@
  */
 int
 swcr_authcompute(struct cryptop *crp, struct cryptodesc *crd,
-struct swcr_data *sw, void *buf, int outtype)
+const struct swcr_data *sw, void *buf, int outtype)
 {
 	unsigned char aalg[AALG_MAX_RESULT_LEN];
 	const struct swcr_auth_hash *axf;
@@ -512,8 +512,8 @@
  * Apply a compression/decompression algorithm
  */
 static int
-swcr_compdec(struct cryptodesc *crd, struct swcr_data *sw,
-void *buf, int outtype)
+swcr_compdec(struct cryptodesc *crd, const struct swcr_data *sw,
+void *buf, int outtype, int *res_size)
 {
 	u_int8_t *data, *out;
 	const struct swcr_comp_algo *cxf;
@@ -544,7 +544,7 @@
 	/* Copy back the (de)compressed data. m_copyback is
 	 * extending the mbuf as necessary.
 	 */
-	sw-sw_size = result;
+	*res_size = (int)result;
 	/* Check the compressed size when doing compression */
 	if (crd-crd_flags  CRD_F_COMP) {
 		if (result  crd-crd_len) {
@@ -986,10 +986,8 @@
 		case CRYPTO_GZIP_COMP:
 			DPRINTF((swcr_process: compdec for %d\n, sw-sw_alg));
 			if ((crp-crp_etype = swcr_compdec(crd, sw,
-			crp-crp_buf, type)) != 0)
+			crp-crp_buf, type, crp-crp_olen)) != 0)
 goto done;
-			else
-crp-crp_olen = (int)sw-sw_size;
 			break;
 
 		default:

Index: src/sys/opencrypto/cryptosoft.h
diff -u src/sys/opencrypto/cryptosoft.h:1.6 src/sys/opencrypto/cryptosoft.h:1.7
--- src/sys/opencrypto/cryptosoft.h:1.6	Wed Mar 25 01:26:13 2009
+++ src/sys/opencrypto/cryptosoft.h	Thu Feb 10 21:00:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cryptosoft.h,v 1.6 2009/03/25 01:26:13 darran Exp $ */
+/*	$NetBSD: cryptosoft.h,v 1.7 2011/02/10 21:00:42 drochner Exp $ */
 /*	$OpenBSD: cryptosoft.h,v 1.10 2002/04/22 23:10:09 deraadt Exp $	*/
 
 /*
@@ -40,8 +40,6 @@
 			const struct swcr_enc_xform *SW_exf;
 		} SWCR_ENC;
 		struct {
-			u_int32_t	 SW_size;
-			u_int32_t	 SW_crc;
 			const struct swcr_comp_algo *SW_cxf;
 		} SWCR_COMP;
 	} SWCR_UN;
@@ -52,7 +50,6 @@
 #define sw_axf		SWCR_UN.SWCR_AUTH.SW_axf
 #define sw_kschedule	SWCR_UN.SWCR_ENC.SW_kschedule
 #define sw_exf		SWCR_UN.SWCR_ENC.SW_exf
-#define sw_size		SWCR_UN.SWCR_COMP.SW_size
 #define sw_cxf		SWCR_UN.SWCR_COMP.SW_cxf
 
 	struct swcr_data *sw_next;
@@ -60,7 +57,7 @@
 
 #ifdef _KERNEL
 int swcr_authcompute(struct cryptop *crp, struct cryptodesc *crd,
-struct swcr_data *sw, void *buf, int outtype);
+const struct swcr_data *sw, void *buf, int outtype);

CVS commit: src/sys/uvm

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Feb 10 21:05:53 UTC 2011

Modified Files:
src/sys/uvm: uvm_fault.c

Log Message:
Spell uvm_fault_lower_neighbor correctly in UVMHIST_FUNC by using
__func__


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/sys/uvm/uvm_fault.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/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.181 src/sys/uvm/uvm_fault.c:1.182
--- src/sys/uvm/uvm_fault.c:1.181	Wed Feb  2 15:13:34 2011
+++ src/sys/uvm/uvm_fault.c	Thu Feb 10 21:05:52 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_fault.c,v 1.181 2011/02/02 15:13:34 chuck Exp $	*/
+/*	$NetBSD: uvm_fault.c,v 1.182 2011/02/10 21:05:52 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_fault.c,v 1.181 2011/02/02 15:13:34 chuck Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_fault.c,v 1.182 2011/02/10 21:05:52 skrll Exp $);
 
 #include opt_uvmhist.h
 
@@ -1754,7 +1754,7 @@
 	struct uvm_faultinfo *ufi, const struct uvm_faultctx *flt,
 	vaddr_t currva, struct vm_page *pg, bool readonly)
 {
-	UVMHIST_FUNC(uvm_fault_lower_neighor); UVMHIST_CALLED(maphist);
+	UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
 
 	/* locked: maps(read), amap(if there), uobj */
 

CVS commit: src/sys/opencrypto

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Thu Feb 10 21:17:49 UTC 2011

Modified Files:
src/sys/opencrypto: deflate.c

Log Message:
whan compressing, set the Z_FINISH flag to zlib to tell that
the data chunk is the final one, which makes that zlib issues the
proper termination marker
(KAME IPSEC does this, but doesn't check eagerly in the receive
path, so the missing termination didn't cause problems so far)
closes my PR kern/44539
being here, replace the Z_PARTIAL_FLUSH flag which is marked
deprecated by zlib by Z_SYNC_FLUSH in the decompression path
(tested with IPv4 IPCOMP on i386)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/opencrypto/deflate.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/opencrypto/deflate.c
diff -u src/sys/opencrypto/deflate.c:1.13 src/sys/opencrypto/deflate.c:1.14
--- src/sys/opencrypto/deflate.c:1.13	Wed Mar 25 01:26:13 2009
+++ src/sys/opencrypto/deflate.c	Thu Feb 10 21:17:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: deflate.c,v 1.13 2009/03/25 01:26:13 darran Exp $ */
+/*	$NetBSD: deflate.c,v 1.14 2011/02/10 21:17:49 drochner Exp $ */
 /*	$FreeBSD: src/sys/opencrypto/deflate.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $	*/
 /* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
 
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: deflate.c,v 1.13 2009/03/25 01:26:13 darran Exp $);
+__KERNEL_RCSID(0, $NetBSD: deflate.c,v 1.14 2011/02/10 21:17:49 drochner Exp $);
 
 #include sys/types.h
 #include sys/malloc.h
@@ -132,8 +132,8 @@
 	if (error != Z_OK)
 		goto bad;
 	for (;;) {
-		error = decomp ? inflate(zbuf, Z_PARTIAL_FLUSH) :
- deflate(zbuf, Z_PARTIAL_FLUSH);
+		error = decomp ? inflate(zbuf, Z_SYNC_FLUSH) :
+ deflate(zbuf, Z_FINISH);
 		if (error != Z_OK  error != Z_STREAM_END)
 			goto bad;
 		else if (zbuf.avail_in == 0  zbuf.avail_out != 0)
@@ -354,8 +354,8 @@
 	for (;;) {
 		DPRINTF((pre: %s in:%d out:%d\n, decomp ? deflate() : inflate(), 
 zbuf.avail_in, zbuf.avail_out));
-		error = decomp ? inflate(zbuf, Z_PARTIAL_FLUSH) :
- deflate(zbuf, Z_PARTIAL_FLUSH);
+		error = decomp ? inflate(zbuf, Z_SYNC_FLUSH) :
+ deflate(zbuf, Z_FINISH);
 		DPRINTF((post: %s in:%d out:%d\n, decomp ? deflate() : inflate(), 
 zbuf.avail_in, zbuf.avail_out));
 		if (error != Z_OK  error != Z_STREAM_END) {

CVS commit: src/share/mk

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Feb 10 21:55:34 UTC 2011

Modified Files:
src/share/mk: bsd.lib.mk

Log Message:
Only define DPLIBC if LIBC_SO is not empty otherwise we an errant
dependency on DESTDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/share/mk/bsd.lib.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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.311 src/share/mk/bsd.lib.mk:1.312
--- src/share/mk/bsd.lib.mk:1.311	Sun Feb  6 00:52:49 2011
+++ src/share/mk/bsd.lib.mk	Thu Feb 10 21:55:33 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.311 2011/02/06 00:52:49 joerg Exp $
+#	$NetBSD: bsd.lib.mk,v 1.312 2011/02/10 21:55:33 matt Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include bsd.init.mk
@@ -536,10 +536,14 @@
 # -Xl,-nostdlib is not enough because we want to tell the compiler-driver not
 # to add standard libraries, not the linker.
 .if !defined(LIB)
+.if !empty(LIBC_SO)
 DPLIBC ?= ${DESTDIR}${LIBC_SO}
+.endif
 .else
 .if ${LIB} != c  ${LIB:Mgcc*} == 
+.if !empty(LIBC_SO)
 DPLIBC ?= ${DESTDIR}${LIBC_SO}
+.endif
 .else
 LDLIBC ?= -nodefaultlibs
 .if ${LIB} == c

CVS commit: src/usr.sbin/installboot/arch

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 10 23:25:11 UTC 2011

Modified Files:
src/usr.sbin/installboot/arch: hp300.c

Log Message:
Fix botch in previous revision. Sorry for a stupid change.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/installboot/arch/hp300.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/installboot/arch/hp300.c
diff -u src/usr.sbin/installboot/arch/hp300.c:1.12 src/usr.sbin/installboot/arch/hp300.c:1.13
--- src/usr.sbin/installboot/arch/hp300.c:1.12	Thu Jan  7 13:26:00 2010
+++ src/usr.sbin/installboot/arch/hp300.c	Thu Feb 10 23:25:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hp300.c,v 1.12 2010/01/07 13:26:00 tsutsui Exp $ */
+/* $NetBSD: hp300.c,v 1.13 2011/02/10 23:25:11 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 #if !defined(__lint)
-__RCSID($NetBSD: hp300.c,v 1.12 2010/01/07 13:26:00 tsutsui Exp $);
+__RCSID($NetBSD: hp300.c,v 1.13 2011/02/10 23:25:11 tsutsui Exp $);
 #endif /* !__lint */
 
 /* We need the target disklabel.h, not the hosts one. */
@@ -108,7 +108,8 @@
 		 * The bootstrap can be well over 8k, and must go into a BOOT
 		 * partition. Read NetBSD label to locate BOOT partition.
 		 */
-		if (pread(params-fsfd, label, params-sectorsize, LABELSECTOR)
+		if (pread(params-fsfd, label, params-sectorsize,
+		LABELSECTOR * params-sectorsize)
 		!= (ssize_t)params-sectorsize) {
 			warn(reading disklabel);
 			goto done;

CVS commit: src/sys/uvm

[Mindaugas Rasiukevicius]

Module Name:src
Committed By:   rmind
Date:   Fri Feb 11 00:21:18 UTC 2011

Modified Files:
src/sys/uvm: uvm_aobj.c

Log Message:
Replace uvm_aobj_cache with kmem(9).


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/uvm/uvm_aobj.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/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.112 src/sys/uvm/uvm_aobj.c:1.113
--- src/sys/uvm/uvm_aobj.c:1.112	Wed Feb  2 15:28:38 2011
+++ src/sys/uvm/uvm_aobj.c	Fri Feb 11 00:21:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_aobj.c,v 1.112 2011/02/02 15:28:38 chuck Exp $	*/
+/*	$NetBSD: uvm_aobj.c,v 1.113 2011/02/11 00:21:18 rmind Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -27,6 +27,7 @@
  *
  * from: Id: uvm_aobj.c,v 1.1.2.5 1998/02/06 05:14:38 chs Exp
  */
+
 /*
  * uvm_aobj.c: anonymous memory uvm_object pager
  *
@@ -37,7 +38,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v 1.112 2011/02/02 15:28:38 chuck Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v 1.113 2011/02/11 00:21:18 rmind Exp $);
 
 #include opt_uvmhist.h
 
@@ -131,13 +132,11 @@
 LIST_HEAD(uao_swhash, uao_swhash_elt);
 
 /*
- * uao_swhash_elt_pool: pool of uao_swhash_elt structures
- * NOTE: Pages for this pool must not come from a pageable kernel map!
+ * uao_swhash_elt_pool: pool of uao_swhash_elt structures.
+ * Note: pages for this pool must not come from a pageable kernel map.
  */
 static struct pool uao_swhash_elt_pool;
 
-static struct pool_cache uvm_aobj_cache;
-
 /*
  * uvm_aobj: the actual anon-backed uvm_object
  *
@@ -417,7 +416,7 @@
 	 */
 
 	UVM_OBJ_DESTROY(aobj-u_obj);
-	pool_cache_put(uvm_aobj_cache, aobj);
+	kmem_free(aobj, sizeof(struct uvm_aobj));
 }
 
 /*
@@ -459,7 +458,7 @@
 		kobj_alloced = UAO_FLAG_KERNSWAP;
 		refs = 0xdeadbeaf; /* XXX: gcc */
 	} else {
-		aobj = pool_cache_get(uvm_aobj_cache, PR_WAITOK);
+		aobj = kmem_alloc(sizeof(struct uvm_aobj), KM_SLEEP);
 		aobj-u_pages = pages;
 		aobj-u_flags = 0;
 		refs = 1;
@@ -531,8 +530,6 @@
 	uao_initialized = true;
 	LIST_INIT(uao_list);
 	mutex_init(uao_list_lock, MUTEX_DEFAULT, IPL_NONE);
-	pool_cache_bootstrap(uvm_aobj_cache, sizeof(struct uvm_aobj), 0, 0,
-	0, aobj, NULL, IPL_NONE, NULL, NULL, NULL);
 	pool_init(uao_swhash_elt_pool, sizeof(struct uao_swhash_elt),
 	0, 0, 0, uaoeltpl, NULL, IPL_VM);
 }

CVS commit: src/sys/external/bsd/drm/dist/bsd-core

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Fri Feb 11 01:13:03 UTC 2011

Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_memory.c

Log Message:
Make DRM work with genfb again.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm/dist/bsd-core/drm_memory.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/external/bsd/drm/dist/bsd-core/drm_memory.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.7 src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.8
--- src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.7	Tue Jan 26 08:01:26 2010
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c	Fri Feb 11 01:13:02 2011
@@ -44,13 +44,18 @@
 # else
 #  if defined(_KERNEL_OPT)
 #include agp_i810.h
+#include genfb.h
 #  else
 #   define NAGP_I810 1
+#   define NGENFB 1
 #  endif
 # endif
 # if NAGP_I810  0
 #  include dev/pci/agpvar.h
 # endif
+# if NGENFB  0
+#  include dev/wsfb/genfbvar.h
+# endif
 #endif
 
 MALLOC_DEFINE(DRM_MEM_DMA, drm_dma, DRM DMA Data Structures);
@@ -140,6 +145,10 @@
 if (agp_i810_borrow(map-offset, map-bsh))
 	return bus_space_vaddr(map-bst, map-bsh);
 #endif
+#if NGENFB  0
+if (genfb_borrow(map-offset, map-bsh))
+	return bus_space_vaddr(map-bst, map-bsh);
+#endif
 DRM_DEBUG(ioremap: failed to map (%d)\n,
 	  reason);
 return NULL;

CVS commit: src/sys/arch/i386/conf

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Fri Feb 11 01:59:57 UTC 2011

Modified Files:
src/sys/arch/i386/conf: ALL GENERIC INSTALL

Log Message:
attach drm hw drivers to 'drm' not 'vga'


To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1010 -r1.1011 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.328 -r1.329 src/sys/arch/i386/conf/INSTALL

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.285 src/sys/arch/i386/conf/ALL:1.286
--- src/sys/arch/i386/conf/ALL:1.285	Mon Jan 17 15:56:03 2011
+++ src/sys/arch/i386/conf/ALL	Fri Feb 11 01:59:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.285 2011/01/17 15:56:03 jmcneill Exp $
+# $NetBSD: ALL,v 1.286 2011/02/11 01:59:56 jmcneill Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		ALL-$Revision: 1.285 $
+#ident 		ALL-$Revision: 1.286 $
 
 maxusers	64		# estimated number of users
 
@@ -593,15 +593,15 @@
 wsdisplay*	at xboxfb? console ?
 
 # DRI driver
-i915drm*	at vga?		# Intel i915, i945 DRM driver
-mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm* 	at vga?		# Matrox G[24]00, G[45]50 DRM driver
-r128drm*	at vga?		# ATI Rage 128 DRM driver
-radeondrm*	at vga?		# ATI Radeon DRM driver
-savagedrm*	at vga?		# S3 Savage DRM driver
-sisdrm* 	at vga?		# SiS DRM driver
-tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver
-viadrm* 	at vga?		# VIA UniChrome DRM 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
+viadrm* 	at drm?		# VIA UniChrome DRM driver
 
 attimer0	at isa?
 pcppi0		at isa?

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1010 src/sys/arch/i386/conf/GENERIC:1.1011
--- src/sys/arch/i386/conf/GENERIC:1.1010	Mon Feb  7 04:05:49 2011
+++ src/sys/arch/i386/conf/GENERIC	Fri Feb 11 01:59:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1010 2011/02/07 04:05:49 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.1011 2011/02/11 01:59:57 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.1010 $
+#ident 		GENERIC-$Revision: 1.1011 $
 
 maxusers	64		# estimated number of users
 
@@ -564,15 +564,15 @@
 sysbeep0	at pcppi?
 
 # DRI driver
-i915drm*	at vga?		# Intel i915, i945 DRM driver
-mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm*		at vga?		# Matrox G[24]00, G[45]50 DRM driver
-r128drm*	at vga?		# ATI Rage 128 DRM driver
-radeondrm*	at vga?		# ATI Radeon DRM driver
-savagedrm*	at vga?		# S3 Savage DRM driver
-sisdrm*		at vga?		# SiS DRM driver
-tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver
-viadrm*		at vga?		# VIA DRM 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
+viadrm*		at drm?		# VIA DRM driver
 
 # Serial Devices
 

Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.328 src/sys/arch/i386/conf/INSTALL:1.329
--- src/sys/arch/i386/conf/INSTALL:1.328	Thu Feb 10 16:49:19 2011
+++ src/sys/arch/i386/conf/INSTALL	Fri Feb 11 01:59:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.328 2011/02/10 16:49:19 jym Exp $
+# $NetBSD: INSTALL,v 1.329 2011/02/11 01:59:57 jmcneill Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -7,7 +7,7 @@
 
 include	arch/i386/conf/MONOLITHIC
 
-#ident 		INSTALL-$Revision: 1.328 $
+#ident 		INSTALL-$Revision: 1.329 $
 
 no options	MEMORY_DISK_DYNAMIC
 options 	MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -16,11 +16,12 @@
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 
 # DRI driver
-no i915drm*	at vga?		# Intel i915, i945 DRM driver
-no mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
-no mgadrm*	at vga?		# Matrox G[24]00, G[45]50 DRM driver
-no r128drm*	at vga?		# ATI Rage 128 DRM driver
-no radeondrm*	at vga?		# ATI Radeon DRM driver
-no savagedrm*	at vga?		# S3 Savage DRM driver
-no sisdrm*	at vga?		# SiS DRM driver
-no tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver
+no i915drm*	at drm?		# Intel i915, i945 DRM driver
+no mach64drm*	at drm?		# mach64 (3D Rage 

CVS commit: src/sys/arch/amd64/conf

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Fri Feb 11 02:06:10 UTC 2011

Modified Files:
src/sys/arch/amd64/conf: GENERIC INSTALL

Log Message:
attach drm hw drivers to 'drm' not 'vga'


To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/amd64/conf/INSTALL

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.301 src/sys/arch/amd64/conf/GENERIC:1.302
--- src/sys/arch/amd64/conf/GENERIC:1.301	Sun Feb  6 23:25:16 2011
+++ src/sys/arch/amd64/conf/GENERIC	Fri Feb 11 02:06:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.301 2011/02/06 23:25:16 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.302 2011/02/11 02:06:09 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.301 $
+#ident 		GENERIC-$Revision: 1.302 $
 
 maxusers	64		# estimated number of users
 
@@ -374,14 +374,14 @@
 sysbeep0	at pcppi?
 
 # DRI driver
-i915drm*	at vga?		# Intel i915, i945 DRM driver
-mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm*		at vga?		# Matrox G[24]00, G[45]50 DRM driver
-r128drm*	at vga?		# ATI Rage 128 DRM driver
-radeondrm*	at vga?		# ATI Radeon DRM driver
-savagedrm*	at vga?		# S3 Savage DRM driver
-sisdrm*		at vga?		# SiS DRM driver
-tdfxdrm*	at vga?		# 3dfx (voodoo) DRM 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
 
 # Cryptographic Devices
 

Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.82 src/sys/arch/amd64/conf/INSTALL:1.83
--- src/sys/arch/amd64/conf/INSTALL:1.82	Sun Aug  9 21:32:16 2009
+++ src/sys/arch/amd64/conf/INSTALL	Fri Feb 11 02:06:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.82 2009/08/09 21:32:16 christos Exp $
+# $NetBSD: INSTALL,v 1.83 2011/02/11 02:06:09 jmcneill Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -7,7 +7,7 @@
 
 include	arch/amd64/conf/GENERIC
 
-#ident 		INSTALL-$Revision: 1.82 $
+#ident 		INSTALL-$Revision: 1.83 $
 
 no options	MEMORY_DISK_DYNAMIC
 options 	MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -17,11 +17,11 @@
 
 no options	MTRR
 # DRI driver
-no i915drm*	at vga?		# Intel i915, i945 DRM driver
-no mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
-no mgadrm*	at vga?		# Matrox G[24]00, G[45]50 DRM driver
-no r128drm*	at vga?		# ATI Rage 128 DRM driver
-no radeondrm*	at vga?		# ATI Radeon DRM driver
-no savagedrm*	at vga?		# S3 Savage DRM driver
-no sisdrm*	at vga?		# SiS DRM driver
-no tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver
+no i915drm*	at drm?		# Intel i915, i945 DRM driver
+no mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
+no mgadrm*	at drm?		# Matrox G[24]00, G[45]50 DRM driver
+no r128drm*	at drm?		# ATI Rage 128 DRM driver
+no radeondrm*	at drm?		# ATI Radeon DRM driver
+no savagedrm*	at drm?		# S3 Savage DRM driver
+no sisdrm*	at drm?		# SiS DRM driver
+no tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver

CVS commit: src/external/gpl2/lvm2/lib/libdevmapper

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri Feb 11 06:35:26 UTC 2011

Modified Files:
src/external/gpl2/lvm2/lib/libdevmapper: Makefile

Log Message:
Use LIBDPLIBS


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/lvm2/lib/libdevmapper/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/gpl2/lvm2/lib/libdevmapper/Makefile
diff -u src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.5 src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.6
--- src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.5	Thu Dec 23 17:46:55 2010
+++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile	Fri Feb 11 06:35:26 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2010/12/23 17:46:55 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2011/02/11 06:35:26 matt Exp $
 
 USE_SHLIBDIR=	yes
 USE_FORT?=	no
@@ -15,7 +15,7 @@
 
 CPPFLAGS+=	-D__LIB_DEVMAPPER__ 
 
-LDADD+=		-lprop
+LIBDPLIBS+=	prop ${NETBSDSRCDIR}/lib/libprop
 
 SRCS+=		bitset.c hash.c list.c libdm-common.c libdm-file.c \
 		libdm-deptree.c	libdm-string.c libdm-report.c \

CVS commit: src/distrib/sets/lists/base

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri Feb 11 06:50:14 UTC 2011

Modified Files:
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64

Log Message:
Add compat entries for libdevmapper and liblzf


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.113 -r1.114 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/base/md.sparc64

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/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.40 src/distrib/sets/lists/base/ad.mips64eb:1.41
--- src/distrib/sets/lists/base/ad.mips64eb:1.40	Wed Feb  9 08:11:37 2011
+++ src/distrib/sets/lists/base/ad.mips64eb	Fri Feb 11 06:50:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.40 2011/02/09 08:11:37 haad Exp $
+# $NetBSD: ad.mips64eb,v 1.41 2011/02/11 06:50:13 matt Exp $
 ./libexec/ld.elf_so-64base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32base-sysutil-bin	compat,pic
 ./usr/lib/64	base-compat-lib
@@ -525,6 +525,10 @@
 ./usr/lib/o32/security/pam_skey.so.3		base-compat-shlib	compat,pic,skey,pam
 ./usr/lib/o32/security/pam_ssh.so.3		base-compat-shlib	compat,pic,crypto,pam
 ./usr/lib/o32/security/pam_unix.so.3		base-compat-shlib	compat,pic,pam
+./usr/libdata/debug/usr/lib/64			base-compat-lib		compat
+./usr/libdata/debug/usr/lib/64/i18n		base-compat-lib		compat
+./usr/libdata/debug/usr/lib/o32			base-compat-lib		compat
+./usr/libdata/debug/usr/lib/o32/i18n		base-compat-lib		compat
 ./usr/libexec/ld.elf_so-64			base-compat-shlib	compat,pic
 ./usr/libexec/ld.elf_so-o32			base-sysutil-bin	compat,pic
 ./usr/lkm/ldscriptbase-obsolete		obsolete

Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.38 src/distrib/sets/lists/base/ad.mips64el:1.39
--- src/distrib/sets/lists/base/ad.mips64el:1.38	Wed Feb  9 08:11:37 2011
+++ src/distrib/sets/lists/base/ad.mips64el	Fri Feb 11 06:50:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.38 2011/02/09 08:11:37 haad Exp $
+# $NetBSD: ad.mips64el,v 1.39 2011/02/11 06:50:13 matt Exp $
 ./libexec/ld.elf_so-64base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32base-sysutil-bin	compat,pic
 ./usr/lib/64	base-compat-lib
@@ -77,6 +77,8 @@
 ./usr/lib/64/libcurses.so.7.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libdes.so.8			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libdes.so.8.1			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libdevmapper.so.1			base-compat-shlib	compat,pic,lvm
+./usr/lib/64/libdevmapper.so.1.0		base-compat-shlib	compat,pic,lvm
 ./usr/lib/64/libdm.sobase-compat-shlib	compat,pic
 ./usr/lib/64/libdm.so.0base-compat-shlib	compat,pic
 ./usr/lib/64/libdm.so.0.0			base-compat-shlib	compat,pic
@@ -138,6 +140,8 @@
 ./usr/lib/64/libldap.so.4.2			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap_r.so.4.2			base-compat-shlib	compat,pic,ldap
+./usr/lib/64/liblzf.so.0			base-compat-shlib	compat,pic
+./usr/lib/64/liblzf.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/64/liblua.so.1			base-compat-shlib	compat,pic
 ./usr/lib/64/liblua.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/64/liblwres.so.5			base-compat-shlib	compat,pic
@@ -339,6 +343,8 @@
 ./usr/lib/o32/libcurses.so.7.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libdes.so.8			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libdes.so.8.1			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libdevmapper.so.1			base-compat-shlib	compat,pic,lvm
+./usr/lib/o32/libdevmapper.so.1.0		base-compat-shlib	compat,pic,lvm
 ./usr/lib/o32/libdm.sobase-compat-shlib	compat,pic
 ./usr/lib/o32/libdm.so.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libdm.so.0.0			base-compat-shlib	compat,pic
@@ -400,6 +406,9 @@
 ./usr/lib/o32/libldap.so.4.2			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap_r.so.4.2			base-compat-shlib	compat,pic,ldap
+./usr/lib/o32/liblzf.so.0			base-compat-shlib	compat,pic
+./usr/lib/o32/liblzf.so.0.0			base-compat-shlib	compat,pic
+./usr/lib/64/liblua.so.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblua.so.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblua.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblwres.so.5			base-compat-shlib	compat,pic
@@ -525,6 +534,10 @@
 ./usr/lib/o32/security/pam_skey.so.3		base-compat-shlib	compat,pic,skey,pam
 ./usr/lib/o32/security/pam_ssh.so.3		base-compat-shlib	compat,pic,crypto,pam
 ./usr/lib/o32/security/pam_unix.so.3		base-compat-shlib	compat,pic,pam
+./usr/libdata/debug/usr/lib/64			base-compat-lib		compat
+./usr/libdata/debug/usr/lib/64/i18n		base-compat-lib		compat

CVS commit: src/distrib/sets/lists/comp

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri Feb 11 06:54:18 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: md.amd64 md.sparc64

Log Message:
Add compat entries for libdevmapper, libdm, and liblzf


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/comp/md.sparc64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.97 src/distrib/sets/lists/comp/md.amd64:1.98
--- src/distrib/sets/lists/comp/md.amd64:1.97	Tue Feb  8 19:57:11 2011
+++ src/distrib/sets/lists/comp/md.amd64	Fri Feb 11 06:54:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.97 2011/02/08 19:57:11 haad Exp $
+# $NetBSD: md.amd64,v 1.98 2011/02/11 06:54:18 matt Exp $
 ./usr/include/amd64comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -441,10 +441,15 @@
 ./usr/lib/i386/libcurses_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libdes.acomp-c-lib		compat
 ./usr/lib/i386/libdes.so			comp-sys-shlib		compat,pic
-./usr/lib/i386/libdes_g.a			comp-c-proflib		compat,debuglib
+./usr/lib/i386/libdes_g.a			-unknown-		compat,debuglib
 ./usr/lib/i386/libdes_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libdes_pic.a			comp-c-piclib		compat,pic
+./usr/lib/i386/libdevmapper.a			comp-c-lib		compat,lvm
+./usr/lib/i386/libdevmapper.so			comp-sys-shlib		compat,pic,lvm
+./usr/lib/i386/libdevmapper_g.a			-unknown-		compat,debuglib,lvm
+./usr/lib/i386/libdevmapper_p.a			comp-c-proflib		compat,profile,lvm
 ./usr/lib/i386/libdm.acomp-c-lib		compat
+./usr/lib/i386/libdm.socomp-sys-shlib		compat,pic
 ./usr/lib/i386/libdm_p.a			comp-c-proflb		compat,profile
 ./usr/lib/i386/libdm_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libdns.acomp-c-lib		compat
@@ -630,6 +635,10 @@
 ./usr/lib/i386/liblwres_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/liblwres_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/liblwres_pic.a			comp-c-piclib		compat,pic
+./usr/lib/i386/liblzf.acomp-c-lib		compat
+./usr/lib/i386/liblzf.so			comp-sys-shlib		compat,pic
+./usr/lib/i386/liblzf_g.a			comp-c-proflib		compat,debuglib
+./usr/lib/i386/liblzf_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/liblzma.a			comp-c-lib		compat
 ./usr/lib/i386/liblzma.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/liblzma_g.a			comp-c-proflib		compat,debuglib

Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.85 src/distrib/sets/lists/comp/md.sparc64:1.86
--- src/distrib/sets/lists/comp/md.sparc64:1.85	Sun Feb  6 00:44:09 2011
+++ src/distrib/sets/lists/comp/md.sparc64	Fri Feb 11 06:54:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.85 2011/02/06 00:44:09 christos Exp $
+# $NetBSD: md.sparc64,v 1.86 2011/02/11 06:54:18 matt Exp $
 ./usr/include/ieeefp.hcomp-c-include
 ./usr/include/sparccomp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
@@ -301,6 +301,14 @@
 ./usr/lib/sparc/libdes.so			base-sys-shlib		compat,pic,crypto
 ./usr/lib/sparc/libdes_p.a			comp-c-proflib		compat,profile,crypto
 ./usr/lib/sparc/libdes_pic.a			comp-c-piclib		compat,pic,crypto
+./usr/lib/sparc/libdevmapper.a			comp-c-lib		compat,lvm
+./usr/lib/sparc/libdevmapper.so			base-sys-shlib		compat,pic,lvm
+./usr/lib/sparc/libdevmapper_p.a		comp-c-proflib		compat,profile,lvm
+./usr/lib/sparc/libdevmapper_pic.a		comp-c-piclib		compat,pic,lvm
+./usr/lib/sparc/libdm.acomp-c-lib		compat
+./usr/lib/sparc/libdm.so			base-sys-shlib		compat,pic
+./usr/lib/sparc/libdm_p.a			comp-c-proflib		compat,profile
+./usr/lib/sparc/libdm_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/libdns.a			comp-c-lib		compat
 ./usr/lib/sparc/libdns.so			base-sys-shlib		compat,pic
 ./usr/lib/sparc/libdns_p.a			comp-c-proflib		compat,profile
@@ -435,6 +443,10 @@
 ./usr/lib/sparc/libldap_r.so			base-sys-shlib		compat,pic,ldap
 ./usr/lib/sparc/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/sparc/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
+./usr/lib/sparc/liblzf.a			comp-c-lib		compat
+./usr/lib/sparc/liblzf.so			base-sys-shlib		compat,pic
+./usr/lib/sparc/liblzf_p.a			comp-c-proflib		compat,profile
+./usr/lib/sparc/liblzf_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/liblua.a			comp-c-lib		compat
 ./usr/lib/sparc/liblua_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/liblua_pic.a			comp-c-piclib		compat,pic