CVS commit: src/sys/dev/pci
Module Name:src Committed By: mbalmer Date: Tue Jan 19 11:43:34 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add two IBM RSS devices. To generate a diff of this commit: cvs rdiff -u -r1.1014 -r1.1015 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1014 src/sys/dev/pci/pcidevs:1.1015 --- src/sys/dev/pci/pcidevs:1.1014 Thu Jan 14 11:27:23 2010 +++ src/sys/dev/pci/pcidevs Tue Jan 19 11:43:33 2010 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1014 2010/01/14 11:27:23 sborrill Exp $ +$NetBSD: pcidevs,v 1.1015 2010/01/19 11:43:33 mbalmer Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2145,6 +2145,8 @@ product IBM GXT6500P 0x021b GXT-6500P Graphics Adapter product IBM GXT4500P 0x021c GXT-4500P Graphics Adapter product IBM GXT135P 0x0233 GXT-135P Graphics Adapter +product IBM 4810_BSP 0x0295 4810 BSP +product IBM 4810_SCC 0x0297 4810 SCC product IBM SERVERAID8K 0x9580 ServeRAID 8k product IBM MPIC2 0x MPIC-II
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: mbalmer
Date: Tue Jan 19 12:11:21 UTC 2010
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
Add the IBM 481033H SCC
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.58 src/sys/dev/pci/pucdata.c:1.59
--- src/sys/dev/pci/pucdata.c:1.58 Wed Nov 18 00:28:09 2009
+++ src/sys/dev/pci/pucdata.c Tue Jan 19 12:11:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.58 2009/11/18 00:28:09 enami Exp $ */
+/* $NetBSD: pucdata.c,v 1.59 2010/01/19 12:11:21 mbalmer Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.58 2009/11/18 00:28:09 enami Exp $);
+__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.59 2010/01/19 12:11:21 mbalmer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -205,6 +205,17 @@
* XXX Dolphin Peripherals 4078 (dual serial and single parallel)
*/
+ /* IBM SurePOS 300 Series (481033H) serial ports */
+ { IBM SurePOS 300 Series (481033H),
+ { PCI_VENDOR_IBM, PCI_PRODUCT_IBM_4810_SCC, 0, 0 },
+ { 0x, 0xfff,0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, /* Port C */
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, /* Port D */
+ { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, /* Port E */
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, /* Port F */
+ },
+ },
/*
* SIIG Boards.
CVS commit: src/sys/dev/isa
Module Name:src Committed By: pooka Date: Tue Jan 19 12:41:41 UTC 2010 Modified Files: src/sys/dev/isa: files.isa Removed Files: src/sys/dev/isa: if_hp.c Log Message: h...@isa was marked non-compiling and broken 14 years ago. I'm sure the tens of well-tested changes since then have been necessary, but now i'll just spoil the fun for everyone by sending the driver to the attic. To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/sys/dev/isa/files.isa cvs rdiff -u -r1.48 -r0 src/sys/dev/isa/if_hp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/isa/files.isa diff -u src/sys/dev/isa/files.isa:1.157 src/sys/dev/isa/files.isa:1.158 --- src/sys/dev/isa/files.isa:1.157 Thu Apr 3 22:46:22 2008 +++ src/sys/dev/isa/files.isa Tue Jan 19 12:41:41 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files.isa,v 1.157 2008/04/03 22:46:22 xtraeme Exp $ +# $NetBSD: files.isa,v 1.158 2010/01/19 12:41:41 pooka Exp $ # # Config file and device description for machine-independent ISA code. # Included by ports that need it. Requires that the SCSI files be @@ -218,12 +218,6 @@ attach fmv at isa with fmv_isa file dev/isa/if_fmv_isa.c fmv_isa -# HP Lan Ethernet controllers -# XXX currently broken -#device hp: ether, ifnet, arp -#attach hp at isa -#file dev/isa/if_hp.c hp - # Intel i82595-based boards. # (Intel EtherExpress PRO) device iy: ether, ifnet, arp
CVS commit: src/sys/nfs
Module Name:src Committed By: yamt Date: Tue Jan 19 13:29:40 UTC 2010 Modified Files: src/sys/nfs: nfs.h Log Message: remove unused r_timer member. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/nfs/nfs.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/nfs/nfs.h diff -u src/sys/nfs/nfs.h:1.70 src/sys/nfs/nfs.h:1.71 --- src/sys/nfs/nfs.h:1.70 Wed Oct 22 11:36:06 2008 +++ src/sys/nfs/nfs.h Tue Jan 19 13:29:40 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs.h,v 1.70 2008/10/22 11:36:06 matt Exp $ */ +/* $NetBSD: nfs.h,v 1.71 2010/01/19 13:29:40 yamt Exp $ */ /* * Copyright (c) 1989, 1993, 1995 * The Regents of the University of California. All rights reserved. @@ -329,7 +329,6 @@ int r_flags; /* flags on request, see below */ int r_retry; /* max retransmission count */ int r_rexmit; /* current retrans count */ - int r_timer; /* tick counter on reply */ u_int32_t r_procnum; /* NFS procedure number */ int r_rtt; /* RTT for rpc */ struct lwp *r_lwp; /* LWP that did I/O system call */
CVS commit: src/sys/nfs
Module Name:src
Committed By: yamt
Date: Tue Jan 19 13:39:04 UTC 2010
Modified Files:
src/sys/nfs: nfs_socket.c
Log Message:
nfs_request: fix races which break congestion window and make nfs client stuck.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/nfs/nfs_socket.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/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.184 src/sys/nfs/nfs_socket.c:1.185
--- src/sys/nfs/nfs_socket.c:1.184 Thu Dec 31 19:31:31 2009
+++ src/sys/nfs/nfs_socket.c Tue Jan 19 13:39:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_socket.c,v 1.184 2009/12/31 19:31:31 christos Exp $ */
+/* $NetBSD: nfs_socket.c,v 1.185 2010/01/19 13:39:04 yamt Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_socket.c,v 1.184 2009/12/31 19:31:31 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_socket.c,v 1.185 2010/01/19 13:39:04 yamt Exp $);
#ifdef _KERNEL_OPT
#include fs_nfs.h
@@ -1133,10 +1133,14 @@
if (nmp-nm_soflags PR_CONNREQUIRED)
nfs_sndunlock(nmp);
}
+ s = splsoftnet();
if (!error (rep-r_flags R_MUSTRESEND) == 0) {
- nmp-nm_sent += NFS_CWNDSCALE;
- rep-r_flags |= R_SENT;
+ if ((rep-r_flags R_SENT) == 0) {
+nmp-nm_sent += NFS_CWNDSCALE;
+rep-r_flags |= R_SENT;
+ }
}
+ splx(s);
} else {
splx(s);
rep-r_rtt = -1;
@@ -1153,7 +1157,6 @@
*/
s = splsoftnet();
TAILQ_REMOVE(nfs_reqq, rep, r_chain);
- splx(s);
/*
* Decrement the outstanding request count.
@@ -1162,6 +1165,7 @@
rep-r_flags = ~R_SENT; /* paranoia */
nmp-nm_sent -= NFS_CWNDSCALE;
}
+ splx(s);
if (rexmitp != NULL) {
int rexmit;
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Tue Jan 19 15:23:15 UTC 2010
Modified Files:
src/sys/kern: kern_module.c
Log Message:
Update comment: unloaded modules which were pumped up by the
bootloader are not freed at the end of bootstrap (there should be
none, although this is not asserted. maybe it should be?).
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.56 src/sys/kern/kern_module.c:1.57
--- src/sys/kern/kern_module.c:1.56 Fri Jan 1 03:22:13 2010
+++ src/sys/kern/kern_module.c Tue Jan 19 15:23:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.56 2010/01/01 03:22:13 dholland Exp $ */
+/* $NetBSD: kern_module.c,v 1.57 2010/01/19 15:23:14 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.56 2010/01/01 03:22:13 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.57 2010/01/19 15:23:14 pooka Exp $);
#define _MODULE_INTERNAL
@@ -625,10 +625,7 @@
/*
* Load the module and link. Before going to the file system,
- * scan the list of modules loaded by the boot loader. Just
- * before init is started the list of modules loaded at boot
- * will be purged. Before init is started we can assume that
- * `name' is a module name and not a path name.
+ * scan the list of modules loaded by the boot loader.
*/
TAILQ_FOREACH(mod, module_bootlist, mod_chain) {
if (strcmp(mod-mod_info-mi_name, name) == 0) {
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: tsutsui
Date: Tue Jan 19 15:26:45 UTC 2010
Modified Files:
src/sys/lib/libsa: subr_prf.c
Log Message:
Add long long (%lld etc.) support and width (%02x etc.) support
in libsa printf(3). Disabled by default but enabled by
-DLIBSA_PRINTF_LONGLONG_SUPPORT and -DLIBSA_PRINTF_WIDTH_SUPPORT.
Provided by tnozaki@ for my libsa debugging. Thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/lib/libsa/subr_prf.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/lib/libsa/subr_prf.c
diff -u src/sys/lib/libsa/subr_prf.c:1.16 src/sys/lib/libsa/subr_prf.c:1.17
--- src/sys/lib/libsa/subr_prf.c:1.16 Sat Nov 24 13:20:57 2007
+++ src/sys/lib/libsa/subr_prf.c Tue Jan 19 15:26:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.16 2007/11/24 13:20:57 isaki Exp $ */
+/* $NetBSD: subr_prf.c,v 1.17 2010/01/19 15:26:45 tsutsui Exp $ */
/*-
* Copyright (c) 1993
@@ -42,7 +42,25 @@
#include stand.h
-static void kprintn(void (*)(int), u_long, int);
+#ifdef LIBSA_PRINTF_LONGLONG_SUPPORT
+#define INTMAX_T longlong_t
+#define UINTMAX_T u_longlong_t
+#else
+#define INTMAX_T long
+#define UINTMAX_T u_long
+#endif
+
+#if 0 /* XXX: abuse intptr_t until the situation with ptrdiff_t is clear */
+#define PTRDIFF_T ptrdiff_t
+#else
+#define PTRDIFF_T intptr_t
+#endif
+
+#ifdef LIBSA_PRINTF_WIDTH_SUPPORT
+static void kprintn(void (*)(int), UINTMAX_T, int, int, int);
+#else
+static void kprintn(void (*)(int), UINTMAX_T, int);
+#endif
static void sputchar(int);
static void kdoprnt(void (*)(int), const char *, va_list);
@@ -51,6 +69,65 @@
const char HEXDIGITS[] = 0123456789ABCDEF;
const char hexdigits[] = 0123456789abcdef;
+#define LONG 0x01
+#ifdef LIBSA_PRINTF_LONGLONG_SUPPORT
+#define LLONG 0x02
+#endif
+#ifdef LIBSA_PRINTF_WIDTH_SUPPORT
+#define ALT 0x04
+#define SPACE 0x08
+#define LADJUST 0x10
+#define SIGN 0x20
+#define ZEROPAD 0x40
+#define NEGATIVE 0x80
+#define KPRINTN(base) kprintn(put, ul, base, lflag, width)
+#define RZERO() \
+do {\
+ if ((lflag (ZEROPAD|LADJUST)) == ZEROPAD) { \
+ while (width-- 0)\
+ put('0');\
+ } \
+} while (/*CONSTCOND*/0)
+#define RPAD() \
+do {\
+ if (lflag LADJUST) { \
+ while (width-- 0)\
+ put(' ');\
+ } \
+} while (/*CONSTCOND*/0)
+#define LPAD() \
+do {\
+ if ((lflag (ZEROPAD|LADJUST)) == 0) { \
+ while (width-- 0)\
+ put(' ');\
+ } \
+} while (/*CONSTCOND*/0)
+#else /* LIBSA_PRINTF_WIDTH_SUPPORT */
+#define KPRINTN(base) kprintn(put, ul, base)
+#define RZERO() /**/
+#define RPAD() /**/
+#define LPAD() /**/
+#endif /* LIBSA_PRINTF_WIDTH_SUPPORT */
+
+#ifdef LIBSA_PRINTF_LONGLONG_SUPPORT
+#define KPRINT(base) \
+do {\
+ ul = (lflag LLONG) \
+ ? va_arg(ap, u_longlong_t)\
+ : (lflag LONG) \
+ ? va_arg(ap, u_long)\
+ : va_arg(ap, u_int);\
+ KPRINTN(base); \
+} while (/*CONSTCOND*/0)
+#else /* LIBSA_PRINTF_LONGLONG_SUPPORT */
+#define KPRINT(base) \
+do {\
+ ul = (lflag LONG) \
+ ? va_arg(ap, u_long) : va_arg(ap, u_int); \
+ KPRINTN(base); \
+} while (/*CONSTCOND*/0)
+#endif /* LIBSA_PRINTF_LONGLONG_SUPPORT */
+
static void
sputchar(int c)
{
@@ -82,8 +159,12 @@
{
char *p;
int ch;
- unsigned long ul;
+ UINTMAX_T ul;
int lflag;
+#ifdef LIBSA_PRINTF_WIDTH_SUPPORT
+ int width;
+ char *q;
+#endif
for (;;) {
while ((ch = *fmt++) != '%') {
@@ -92,63 +173,110 @@
put(ch);
}
lflag = 0;
+#ifdef LIBSA_PRINTF_WIDTH_SUPPORT
+ width = 0;
+#endif
reswitch:
switch (ch = *fmt++) {
+#ifdef LIBSA_PRINTF_WIDTH_SUPPORT
+ case '#':
+ lflag |= ALT;
+ goto reswitch;
+ case ' ':
+ lflag |= SPACE;
+ goto reswitch;
+ case '-':
+ lflag |= LADJUST;
+ goto reswitch;
+ case '+':
+ lflag |= SIGN;
+ goto reswitch;
+ case '0':
+ lflag |= ZEROPAD;
+ goto reswitch;
+ case '1': case '2': case '3': case '4': case '5':
+ case '6': case '7': case '8': case '9':
+ for (;;) {
+width *= 10;
+width += ch - '0';
+ch = *fmt;
+if ((unsigned)ch - '0' 9)
+ break;
+++fmt;
+ }
+#endif
+ goto reswitch;
case 'l':
- lflag = 1;
+#ifdef LIBSA_PRINTF_LONGLONG_SUPPORT
+ if (*fmt == 'l') {
+++fmt;
+lflag |= LLONG;
+ } else
+#endif
+lflag |= LONG;
goto reswitch;
case 't':
-#if 0 /* XXX: abuse intptr_t until the situation with ptrdiff_t is clear */
- lflag = (sizeof(ptrdiff_t) == sizeof(long));
-#else
- lflag = (sizeof(intptr_t) == sizeof(long));
-#endif
+ if (sizeof(PTRDIFF_T) == sizeof(long))
+lflag |= LONG;
goto reswitch;
case 'z':
- lflag = (sizeof(size_t) == sizeof(unsigned long));
+ if (sizeof(ssize_t) == sizeof(long))
+lflag |= LONG;
goto reswitch;
case 'c':
ch = va_arg(ap, int);
-put(ch 0x7f);
+#ifdef
CVS commit: src/sys/arch/cobalt/stand/boot
Module Name:src
Committed By: tsutsui
Date: Tue Jan 19 15:28:52 UTC 2010
Modified Files:
src/sys/arch/cobalt/stand/boot: Makefile tlp.c wd.c wdc.c
Log Message:
Use -DLIBSA_PRINTF_LONGLONG_SUPPORT -DLIBSA_PRINTF_WIDTH_SUPPORT
in debug printf()s.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cobalt/stand/boot/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/cobalt/stand/boot/tlp.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cobalt/stand/boot/wd.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/cobalt/stand/boot/wdc.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/cobalt/stand/boot/Makefile
diff -u src/sys/arch/cobalt/stand/boot/Makefile:1.19 src/sys/arch/cobalt/stand/boot/Makefile:1.20
--- src/sys/arch/cobalt/stand/boot/Makefile:1.19 Sun Mar 15 10:47:59 2009
+++ src/sys/arch/cobalt/stand/boot/Makefile Tue Jan 19 15:28:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/03/15 10:47:59 tsutsui Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/19 15:28:51 tsutsui Exp $
NOMAN= # defined
@@ -41,7 +41,8 @@
# -I${.CURDIR}/../.. done by Makefile.inc
CPPFLAGS+= -nostdinc -D_STANDALONE -DNO_ABICALLS -D_NO_PROM_DEFINES
-# CPPFLAGS+= -D_DEBUG
+#CPPFLAGS+= -D_DEBUG \
+# -DLIBSA_PRINTF_LONGLONG_SUPPORT -DLIBSA_PRINTF_WIDTH_SUPPORT
CPPFLAGS+= -I${.OBJDIR} -I${S} -I${S}/arch -I${LIBSADIR}
CPPFLAGS+= -DCONS_SERIAL -DCOMPORT=${COMPORT}
CPPFLAGS+= -DCOMSPEED=${COMSPEED} -DCOMPROBE=${COMPROBE}
Index: src/sys/arch/cobalt/stand/boot/tlp.c
diff -u src/sys/arch/cobalt/stand/boot/tlp.c:1.8 src/sys/arch/cobalt/stand/boot/tlp.c:1.9
--- src/sys/arch/cobalt/stand/boot/tlp.c:1.8 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/cobalt/stand/boot/tlp.c Tue Jan 19 15:28:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tlp.c,v 1.8 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: tlp.c,v 1.9 2010/01/19 15:28:52 tsutsui Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -238,7 +238,7 @@
en[4] = val;
en[5] = val 8;
- DPRINTF((tlp: MAC address %x:%x:%x:%x:%x:%x\n,
+ DPRINTF((tlp: MAC address %02x:%02x:%02x:%02x:%02x:%02x\n,
en[0], en[1], en[2], en[3], en[4], en[5]));
rxd = l-rxd[0];
Index: src/sys/arch/cobalt/stand/boot/wd.c
diff -u src/sys/arch/cobalt/stand/boot/wd.c:1.11 src/sys/arch/cobalt/stand/boot/wd.c:1.12
--- src/sys/arch/cobalt/stand/boot/wd.c:1.11 Sun Jan 10 16:20:45 2010
+++ src/sys/arch/cobalt/stand/boot/wd.c Tue Jan 19 15:28:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.11 2010/01/10 16:20:45 tsutsui Exp $ */
+/* $NetBSD: wd.c,v 1.12 2010/01/19 15:28:52 tsutsui Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -98,8 +98,8 @@
wd-sc_params.atap_heads *
wd-sc_params.atap_sectors;
}
- DPRINTF((wd-sc_capacity = %ld, wd-sc_capacity28 = %d.\n,
- (u_long)wd-sc_capacity, wd-sc_capacity28));
+ DPRINTF((wd-sc_capacity = % PRId64 , wd-sc_capacity28 = %d.\n,
+ wd-sc_capacity, wd-sc_capacity28));
return 0;
}
Index: src/sys/arch/cobalt/stand/boot/wdc.c
diff -u src/sys/arch/cobalt/stand/boot/wdc.c:1.12 src/sys/arch/cobalt/stand/boot/wdc.c:1.13
--- src/sys/arch/cobalt/stand/boot/wdc.c:1.12 Sun Jan 10 16:20:45 2010
+++ src/sys/arch/cobalt/stand/boot/wdc.c Tue Jan 19 15:28:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.12 2010/01/10 16:20:45 tsutsui Exp $ */
+/* $NetBSD: wdc.c,v 1.13 2010/01/19 15:28:52 tsutsui Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -34,6 +34,7 @@
#include sys/bootblock.h
#include lib/libsa/stand.h
+#include lib/libkern/libkern.h
#include machine/param.h
#include boot.h
@@ -259,9 +260,9 @@
struct wdc_channel *chp = wd-sc_channel;
#if 0
- DPRINTF((%s(%d, %x, %ld, %d)\n, __func__,
+ DPRINTF((%s(%d, %x, % PRId64 , %d)\n, __func__,
wd_c-drive, wd_c-r_command,
- (u_long)wd_c-r_blkno, wd_c-r_count));
+ wd_c-r_blkno, wd_c-r_count));
#endif
/* Select drive, head, and addressing mode. */
CVS commit: src/sys/conf
Module Name:src Committed By: pooka Date: Tue Jan 19 16:24:44 UTC 2010 Modified Files: src/sys/conf: files Log Message: Specify bpf_filter attribute only when the device uses the filter engine. To generate a diff of this commit: cvs rdiff -u -r1.968 -r1.969 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.968 src/sys/conf/files:1.969 --- src/sys/conf/files:1.968 Tue Jan 12 21:08:08 2010 +++ src/sys/conf/files Tue Jan 19 16:24:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.968 2010/01/12 21:08:08 dyoung Exp $ +# $NetBSD: files,v 1.969 2010/01/19 16:24:44 pooka Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20090313 @@ -1261,9 +1261,9 @@ defpseudo faith: ifnet defpseudo srt: ifnet defpseudo stf: ifnet -defpseudodev tap: ifnet, ether, arp, bpf_filter -defpseudo carp: ifnet, ether, arp, bpf_filter -defpseudodev etherip: ifnet, ether, arp, bpf_filter +defpseudodev tap: ifnet, ether, arp +defpseudo carp: ifnet, ether, arp +defpseudodev etherip: ifnet, ether, arp defpseudo sequencer defpseudo clockctl
CVS commit: src/sys/rump/net/rumptest
Module Name:src
Committed By: pooka
Date: Tue Jan 19 17:51:03 UTC 2010
Modified Files:
src/sys/rump/net/rumptest: rumptest_net.c
Log Message:
Make build with PF_INET-is-the-NIC support again.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/net/rumptest/rumptest_net.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/net/rumptest/rumptest_net.c
diff -u src/sys/rump/net/rumptest/rumptest_net.c:1.14 src/sys/rump/net/rumptest/rumptest_net.c:1.15
--- src/sys/rump/net/rumptest/rumptest_net.c:1.14 Sat Jan 16 20:47:01 2010
+++ src/sys/rump/net/rumptest/rumptest_net.c Tue Jan 19 17:51:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumptest_net.c,v 1.14 2010/01/16 20:47:01 pooka Exp $ */
+/* $NetBSD: rumptest_net.c,v 1.15 2010/01/19 17:51:03 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -58,6 +58,8 @@
#define DEST_ADDR 204.152.190.12 /* www.NetBSD.org */
#define DEST_PORT 80 /* take a wild guess */
+static in_addr_t youraddr;
+
#ifdef FULL_NETWORK_STACK
/*
* If we are running with the full networking stack, configure
@@ -79,7 +81,7 @@
#define MYGW 10.181.181.1
#define IFNAME virt0 /* XXX: hardcoded */
-static in_addr_t myaddr, youraddr;
+static in_addr_t myaddr;
static void
configure_interface(void)
@@ -178,31 +180,6 @@
err(1, routing incomplete);
rump_sys_close(s);
}
-#endif /* FULL_NETWORK_STACK */
-
-static void
-printstats(void)
-{
- struct mbstat mbstat;
- int ctl[] = { CTL_KERN, KERN_MBUF, MBUF_STATS };
- int totalmbuf = 0;
- size_t mbslen = sizeof(struct mbstat);
- unsigned i;
-
- if (rump_sys___sysctl(ctl, __arraycount(ctl), mbstat, mbslen,
- NULL, 0) == -1)
- return;
-
- printf( mbuf count:\n);
- for (i = 0; i __arraycount(mbstat.m_mtypes); i++) {
- if (mbstat.m_mtypes[i] == 0)
- continue;
- printf(%s (%d) mbuf count %d\n,
- i == MT_DATA ? data : unknown, i, mbstat.m_mtypes[i]);
- totalmbuf += mbstat.m_mtypes[i];
- }
- printf(total mbufs: %d\n, totalmbuf);
-}
static void
dobpfread(void)
@@ -315,6 +292,31 @@
}
}
}
+#endif /* FULL_NETWORK_STACK */
+
+static void
+printstats(void)
+{
+ struct mbstat mbstat;
+ int ctl[] = { CTL_KERN, KERN_MBUF, MBUF_STATS };
+ int totalmbuf = 0;
+ size_t mbslen = sizeof(struct mbstat);
+ unsigned i;
+
+ if (rump_sys___sysctl(ctl, __arraycount(ctl), mbstat, mbslen,
+ NULL, 0) == -1)
+ return;
+
+ printf( mbuf count:\n);
+ for (i = 0; i __arraycount(mbstat.m_mtypes); i++) {
+ if (mbstat.m_mtypes[i] == 0)
+ continue;
+ printf(%s (%d) mbuf count %d\n,
+ i == MT_DATA ? data : unknown, i, mbstat.m_mtypes[i]);
+ totalmbuf += mbstat.m_mtypes[i];
+ }
+ printf(total mbufs: %d\n, totalmbuf);
+}
int
main(int argc, char *argv[])
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: bouyer
Date: Tue Jan 19 20:54:32 UTC 2010
Modified Files:
src/sys/dev/ic: mfi.c
Log Message:
bio(4) is MP-safe but mfi(4) is not. So get the kernel_lock at
mfi_ioctl() entry and release it on exit.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/mfi.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/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.30 src/sys/dev/ic/mfi.c:1.31
--- src/sys/dev/ic/mfi.c:1.30 Sun Sep 13 21:24:58 2009
+++ src/sys/dev/ic/mfi.c Tue Jan 19 20:54:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.30 2009/09/13 21:24:58 dyoung Exp $ */
+/* $NetBSD: mfi.c,v 1.31 2010/01/19 20:54:32 bouyer Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom ma...@peereboom.us
@@ -17,7 +17,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.30 2009/09/13 21:24:58 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfi.c,v 1.31 2010/01/19 20:54:32 bouyer Exp $);
#include bio.h
@@ -1412,7 +1412,10 @@
{
struct mfi_softc *sc = device_private(dev);
int error = 0;
- int s = splbio();
+ int s;
+
+ KERNEL_LOCK(1, curlwp);
+ s = splbio();
DNPRINTF(MFI_D_IOCTL, %s: mfi_ioctl , DEVNAME(sc));
@@ -1452,6 +1455,7 @@
error = EINVAL;
}
splx(s);
+ KERNEL_UNLOCK_ONE(curlwp);
DNPRINTF(MFI_D_IOCTL, %s: mfi_ioctl return %x\n, DEVNAME(sc), error);
return error;
CVS commit: src/share/man/man5
Module Name:src Committed By: jmmv Date: Tue Jan 19 22:08:52 UTC 2010 Modified Files: src/share/man/man5: daily.conf.5 security.conf.5 Log Message: Document the new package-related maintenance options and security checks in daily.conf and security.conf. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/share/man/man5/daily.conf.5 cvs rdiff -u -r1.33 -r1.34 src/share/man/man5/security.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/daily.conf.5 diff -u src/share/man/man5/daily.conf.5:1.24 src/share/man/man5/daily.conf.5:1.25 --- src/share/man/man5/daily.conf.5:1.24 Wed Oct 28 02:31:44 2009 +++ src/share/man/man5/daily.conf.5 Tue Jan 19 22:08:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: daily.conf.5,v 1.24 2009/10/28 02:31:44 snj Exp $ +.\ $NetBSD: daily.conf.5,v 1.25 2010/01/19 22:08:52 jmmv Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd August 30, 2008 +.Dd January 19, 2010 .Dt DAILY.CONF 5 .Os .Sh NAME @@ -58,7 +58,7 @@ (Note that you should never edit .Pa /etc/defaults/daily.conf directly, as it is often replaced during system upgrades.) -.Bl -tag -width purge_accounting +.Bl -tag -width fetch_pkg_vulnerabilities .It Sy find_core This runs .Xr find 1 @@ -136,6 +136,11 @@ .Xr skeyaudit 1 program to check the S/Key database and informs users of S/Keys that are about to expire. +.It Sy fetch_pkg_vulnerabilities +Refreshes the local database of package vulnerabilities. +See the settings in +.Xr security.conf 5 +for details on the actual package checks. .El .Pp The variables described below can be set to modify the tests: @@ -163,6 +168,10 @@ If set, the report generated by the .Sy run_security phase will always be sent, even if it is empty. +.It Sy pkgdb_dir +Location of the packages database. +Defaults to +.Pa /var/db/pkg . .El .Sh FILES .Bl -tag -width /etc/defaults/daily.conf -compact Index: src/share/man/man5/security.conf.5 diff -u src/share/man/man5/security.conf.5:1.33 src/share/man/man5/security.conf.5:1.34 --- src/share/man/man5/security.conf.5:1.33 Thu May 29 14:51:25 2008 +++ src/share/man/man5/security.conf.5 Tue Jan 19 22:08:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.conf.5,v 1.33 2008/05/29 14:51:25 mrg Exp $ +.\ $NetBSD: security.conf.5,v 1.34 2010/01/19 22:08:52 jmmv Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd May 29, 2006 +.Dd January 19, 2010 .Dt SECURITY.CONF 5 .Os .Sh NAME @@ -46,7 +46,7 @@ .Pa /etc/daily.conf . .Pp The variables described below can be set to NO to disable the test: -.Bl -tag -width check_network +.Bl -tag -width check_pkg_vulnerabilities .It Sy check_passwd This checks the .Pa /etc/master.passwd @@ -151,6 +151,17 @@ This includes files such as .Pa /etc/master.passwd . .El +.It Sy check_pkg_vulnerabilities +Checks the currently installed packages against a database of known +vulnerabilities and reports those that are vulnerable. +Check the +.Sy fetch_pkg_vulnerabilities +setting in +.Xr daily.conf 5 +to keep the database up to date. +.It Sy check_pkg_signatures +Checks the digital signature of all files installed by packages against +the expected values stored in the packages database. .El .Pp The variables described below can be set to modify the tests:
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Tue Jan 19 22:11:57 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note the addition of new security checks to daily.conf and security.conf for packages. To generate a diff of this commit: cvs rdiff -u -r1.1345 -r1.1346 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1345 src/doc/CHANGES:1.1346 --- src/doc/CHANGES:1.1345 Mon Jan 18 23:41:47 2010 +++ src/doc/CHANGES Tue Jan 19 22:11:57 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1345 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1346 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -524,3 +524,10 @@ tn3270: Removed from base [roy 20100116] macppc: Add support for new-style kernel modules. [jmmv 20100118] shark: Add support for new-style kernel modules. [jmmv 20100118] + daily.conf(5): Add fetch_pkg_vulnerabilities to keep the packages + vulnerabilities database up to date, if it exists. + [jmmv 20100119] + security.conf(5): Add check_pkg_vulnerabilities and + check_pkg_signatures to validate the installed packages + against the vulnerabilities database and the expected + checksums for their files. [jmmv 20100119]
CVS commit: src/sys/sys
Module Name:src Committed By: pooka Date: Tue Jan 19 22:12:00 UTC 2010 Modified Files: src/sys/sys: param.h Log Message: 5.99.24: bpf_foo = bpf_ops-bpf_foo (better bump than bummer) To generate a diff of this commit: cvs rdiff -u -r1.358 -r1.359 src/sys/sys/param.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/sys/param.h diff -u src/sys/sys/param.h:1.358 src/sys/sys/param.h:1.359 --- src/sys/sys/param.h:1.358 Tue Dec 29 04:24:32 2009 +++ src/sys/sys/param.h Tue Jan 19 22:12:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.358 2009/12/29 04:24:32 elad Exp $ */ +/* $NetBSD: param.h,v 1.359 2010/01/19 22:12:00 pooka Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 599002300 /* NetBSD 5.99.23 */ +#define __NetBSD_Version__ 599002400 /* NetBSD 5.99.24 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Tue Jan 19 22:17:45 UTC 2010
Modified Files:
src/sys/kern: kern_module_vfs.c subr_kobj_vfs.c
src/sys/sys: kobj.h
Log Message:
Rename a few routines from _file() to _vfs() for consistency.
Ride 5.99.24 bump.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/kern_module_vfs.c \
src/sys/kern/subr_kobj_vfs.c
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/kobj.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/kern/kern_module_vfs.c
diff -u src/sys/kern/kern_module_vfs.c:1.1 src/sys/kern/kern_module_vfs.c:1.2
--- src/sys/kern/kern_module_vfs.c:1.1 Wed Nov 18 17:40:45 2009
+++ src/sys/kern/kern_module_vfs.c Tue Jan 19 22:17:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module_vfs.c,v 1.1 2009/11/18 17:40:45 pooka Exp $ */
+/* $NetBSD: kern_module_vfs.c,v 1.2 2010/01/19 22:17:44 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module_vfs.c,v 1.1 2009/11/18 17:40:45 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module_vfs.c,v 1.2 2010/01/19 22:17:44 pooka Exp $);
#define _MODULE_INTERNAL
#include sys/param.h
@@ -49,8 +49,8 @@
#include prop/proplib.h
-static int module_load_plist_file(const char *, const bool,
- prop_dictionary_t *);
+static int module_load_plist_vfs(const char *, const bool,
+ prop_dictionary_t *);
int
module_load_vfs(const char *name, int flags, bool autoload,
@@ -70,13 +70,13 @@
if (!autoload) {
nochroot = false;
snprintf(path, MAXPATHLEN, %s, name);
- error = kobj_load_file(mod-mod_kobj, path, nochroot);
+ error = kobj_load_vfs(mod-mod_kobj, path, nochroot);
}
if (autoload || (error == ENOENT)) {
nochroot = true;
snprintf(path, MAXPATHLEN, %s/%s/%s.kmod,
module_base, name, name);
- error = kobj_load_file(mod-mod_kobj, path, nochroot);
+ error = kobj_load_vfs(mod-mod_kobj, path, nochroot);
}
if (error != 0) {
PNBUF_PUT(path);
@@ -94,7 +94,7 @@
* Load and process module.prop if it exists.
*/
if ((flags MODCTL_NO_PROP) == 0 filedictp) {
- error = module_load_plist_file(path, nochroot, filedictp);
+ error = module_load_plist_vfs(path, nochroot, filedictp);
if (error != 0) {
module_print(plist load returned error %d for `%s',
error, path);
@@ -113,12 +113,12 @@
}
/*
- * module_load_plist_file:
+ * module_load_plist_vfs:
*
* Load a plist located in the file system into memory.
*/
static int
-module_load_plist_file(const char *modpath, const bool nochroot,
+module_load_plist_vfs(const char *modpath, const bool nochroot,
prop_dictionary_t *filedictp)
{
struct nameidata nd;
Index: src/sys/kern/subr_kobj_vfs.c
diff -u src/sys/kern/subr_kobj_vfs.c:1.1 src/sys/kern/subr_kobj_vfs.c:1.2
--- src/sys/kern/subr_kobj_vfs.c:1.1 Fri Nov 27 17:54:11 2009
+++ src/sys/kern/subr_kobj_vfs.c Tue Jan 19 22:17:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj_vfs.c,v 1.1 2009/11/27 17:54:11 pooka Exp $ */
+/* $NetBSD: subr_kobj_vfs.c,v 1.2 2010/01/19 22:17:44 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -72,10 +72,10 @@
#include sys/vnode.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_kobj_vfs.c,v 1.1 2009/11/27 17:54:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_kobj_vfs.c,v 1.2 2010/01/19 22:17:44 pooka Exp $);
static void
-kobj_close_file(kobj_t ko)
+kobj_close_vfs(kobj_t ko)
{
VOP_UNLOCK(ko-ko_source, 0);
@@ -88,7 +88,7 @@
* Utility function: read from the object.
*/
static int
-kobj_read_file(kobj_t ko, void **basep, size_t size, off_t off,
+kobj_read_vfs(kobj_t ko, void **basep, size_t size, off_t off,
bool allocate)
{
size_t resid;
@@ -126,12 +126,12 @@
}
/*
- * kobj_load_file:
+ * kobj_load_vfs:
*
* Load an object located in the file system.
*/
int
-kobj_load_file(kobj_t *kop, const char *path, const bool nochroot)
+kobj_load_vfs(kobj_t *kop, const char *path, const bool nochroot)
{
struct nameidata nd;
kauth_cred_t cred;
@@ -156,8 +156,8 @@
ko-ko_type = KT_VNODE;
ko-ko_source = nd.ni_vp;
- ko-ko_read = kobj_read_file;
- ko-ko_close = kobj_close_file;
+ ko-ko_read = kobj_read_vfs;
+ ko-ko_close = kobj_close_vfs;
*kop = ko;
return kobj_load(ko);
@@ -166,7 +166,7 @@
#else /* MODULAR */
int
-kobj_load_file(kobj_t *kop, const char *path, const bool nochroot)
+kobj_load_vfs(kobj_t *kop, const char *path, const bool nochroot)
{
return ENOSYS;
Index: src/sys/sys/kobj.h
diff -u src/sys/sys/kobj.h:1.12 src/sys/sys/kobj.h:1.13
--- src/sys/sys/kobj.h:1.12 Wed Jun 17 21:04:25 2009
+++ src/sys/sys/kobj.h Tue Jan 19 22:17:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj.h,v 1.12 2009/06/17 21:04:25 dyoung Exp $ */
+/* $NetBSD: kobj.h,v 1.13 2010/01/19 22:17:45 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation,
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Tue Jan 19 22:28:31 UTC 2010
Modified Files:
src/sys/compat/common: kern_time_50.c
src/sys/dev/ata: wd.c
src/sys/kern: sys_sig.c
src/sys/lib/libkern: Makefile.libkern libkern.h
src/sys/sys: signalvar.h
Added Files:
src/sys/lib/libkern: kern_assert.c
Removed Files:
src/sys/lib/libkern: __assert.c
Log Message:
Get rid of last easy kernel symbols starting with __:
__assert - kern_assert
__sigtimedwait1 - sigtimedwait1
__wdstart - wdstart1
The rest are MD and/or shared with userspace, so they will require
a little more involvement than what is available for this quick
ride the 5.99.24 bump action.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/compat/common/kern_time_50.c
cvs rdiff -u -r1.381 -r1.382 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.25 -r1.26 src/sys/kern/sys_sig.c
cvs rdiff -u -r1.8 -r1.9 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.11 -r0 src/sys/lib/libkern/__assert.c
cvs rdiff -u -r0 -r1.1 src/sys/lib/libkern/kern_assert.c
cvs rdiff -u -r1.92 -r1.93 src/sys/lib/libkern/libkern.h
cvs rdiff -u -r1.75 -r1.76 src/sys/sys/signalvar.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/compat/common/kern_time_50.c
diff -u src/sys/compat/common/kern_time_50.c:1.12 src/sys/compat/common/kern_time_50.c:1.13
--- src/sys/compat/common/kern_time_50.c:1.12 Wed Nov 11 09:48:50 2009
+++ src/sys/compat/common/kern_time_50.c Tue Jan 19 22:28:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time_50.c,v 1.12 2009/11/11 09:48:50 rmind Exp $ */
+/* $NetBSD: kern_time_50.c,v 1.13 2010/01/19 22:28:31 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_time_50.c,v 1.12 2009/11/11 09:48:50 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_time_50.c,v 1.13 2010/01/19 22:28:31 pooka Exp $);
#ifdef _KERNEL_OPT
#include opt_aio.h
@@ -629,7 +629,7 @@
const struct compat_50_sys___sigtimedwait_args *uap, register_t *retval)
{
- return __sigtimedwait1(l,
+ return sigtimedwait1(l,
(const struct sys_sigtimedwait50_args *)uap, retval, copyout,
tscopyin, tscopyout);
}
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.381 src/sys/dev/ata/wd.c:1.382
--- src/sys/dev/ata/wd.c:1.381 Fri Jan 8 19:48:12 2010
+++ src/sys/dev/ata/wd.c Tue Jan 19 22:28:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.381 2010/01/08 19:48:12 dyoung Exp $ */
+/* $NetBSD: wd.c,v 1.382 2010/01/19 22:28:31 pooka Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.381 2010/01/08 19:48:12 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.382 2010/01/19 22:28:31 pooka Exp $);
#include opt_ata.h
@@ -175,7 +175,7 @@
void wdgetdefaultlabel(struct wd_softc *, struct disklabel *);
void wdgetdisklabel(struct wd_softc *);
void wdstart(void *);
-void __wdstart(struct wd_softc*, struct buf *);
+void wdstart1(struct wd_softc*, struct buf *);
void wdrestart(void *);
void wddone(void *);
int wd_get_params(struct wd_softc *, u_int8_t, struct ataparams *);
@@ -585,7 +585,7 @@
wd-openings--;
wd-retries = 0;
- __wdstart(wd, bp);
+ wdstart1(wd, bp);
}
}
@@ -623,7 +623,7 @@
bp-b_data = (char *)bp-b_data + bp-b_bcount;
bp-b_blkno += (bp-b_bcount / 512);
bp-b_rawblkno += (bp-b_bcount / 512);
- __wdstart(sc, bp);
+ wdstart1(sc, bp);
return;
done:
@@ -636,7 +636,7 @@
}
void
-__wdstart(struct wd_softc *wd, struct buf *bp)
+wdstart1(struct wd_softc *wd, struct buf *bp)
{
/*
@@ -721,7 +721,7 @@
case ATACMD_COMPLETE:
break;
default:
- panic(__wdstart: bad return code from ata_bio());
+ panic(wdstart1: bad return code from ata_bio());
}
}
@@ -831,7 +831,7 @@
ATADEBUG_PRINT((wdrestart %s\n, device_xname(wd-sc_dev)),
DEBUG_XFERS);
s = splbio();
- __wdstart(v, bp);
+ wdstart1(v, bp);
splx(s);
}
Index: src/sys/kern/sys_sig.c
diff -u src/sys/kern/sys_sig.c:1.25 src/sys/kern/sys_sig.c:1.26
--- src/sys/kern/sys_sig.c:1.25 Sun Dec 20 04:49:09 2009
+++ src/sys/kern/sys_sig.c Tue Jan 19 22:28:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_sig.c,v 1.25 2009/12/20 04:49:09 rmind Exp $ */
+/* $NetBSD: sys_sig.c,v 1.26 2010/01/19 22:28:31 pooka Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.25 2009/12/20 04:49:09 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.26 2010/01/19 22:28:31 pooka Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -315,7 +315,7 @@
const struct sys_sigtimedwait50_args *uap, register_t *retval)
{
- return __sigtimedwait1(l, uap, retval, copyout,
CVS commit: src/sys/net
Module Name:src Committed By: pooka Date: Tue Jan 19 22:33:35 UTC 2010 Modified Files: src/sys/net: bpf_stub.c Log Message: slap dis wit summah dat RCSId To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/net/bpf_stub.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/net/bpf_stub.c diff -u src/sys/net/bpf_stub.c:1.1 src/sys/net/bpf_stub.c:1.2 --- src/sys/net/bpf_stub.c:1.1 Tue Jan 19 22:08:00 2010 +++ src/sys/net/bpf_stub.c Tue Jan 19 22:33:35 2010 @@ -1,4 +1,34 @@ +/* $NetBSD: bpf_stub.c,v 1.2 2010/01/19 22:33:35 pooka Exp $ */ + +/* + * Copyright (c) 2010 The NetBSD Foundation, Inc. + * All rights reserved. + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: bpf_stub.c,v 1.2 2010/01/19 22:33:35 pooka Exp $); +); #include sys/param.h #include sys/mbuf.h
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Tue Jan 19 22:38:08 UTC 2010 Modified Files: src/lib/libedit: eln.c Log Message: Fix wrapper for EL_EDITOR, from Michael L. Hitch To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libedit/eln.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/eln.c diff -u src/lib/libedit/eln.c:1.4 src/lib/libedit/eln.c:1.5 --- src/lib/libedit/eln.c:1.4 Tue Jan 12 14:40:50 2010 +++ src/lib/libedit/eln.c Tue Jan 19 17:38:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: eln.c,v 1.4 2010/01/12 19:40:50 christos Exp $ */ +/* $NetBSD: eln.c,v 1.5 2010/01/19 22:38:08 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include config.h #if !defined(lint) !defined(SCCSID) -__RCSID($NetBSD: eln.c,v 1.4 2010/01/12 19:40:50 christos Exp $); +__RCSID($NetBSD: eln.c,v 1.5 2010/01/19 22:38:08 christos Exp $); #endif /* not lint not SCCSID */ #include histedit.h @@ -118,6 +118,11 @@ ret = el_wset(el, op, va_arg(ap, char *)); break; + case EL_EDITOR: /* const wchar_t * */ + ret = el_wset(el, op, ct_decode_string(va_arg(ap, char *), + el-el_lgcyconv)); + break; + case EL_SIGNAL: /* int */ case EL_EDITMODE: case EL_UNBUFFERED:
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Tue Jan 19 22:38:21 UTC 2010
Modified Files:
src/sys/rump/dev: Makefile.rumpdev
src/sys/rump/librump/rumpdev: rump_dev.c rump_dev_private.h
Added Files:
src/sys/rump/dev/lib/libbpf: Makefile component.c shlib_version
Log Message:
Add bpf rump component (and put in some wscons stuff i forgot to earlier).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/Makefile.rumpdev
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libbpf/Makefile \
src/sys/rump/dev/lib/libbpf/component.c \
src/sys/rump/dev/lib/libbpf/shlib_version
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpdev/rump_dev.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpdev/rump_dev_private.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/dev/Makefile.rumpdev
diff -u src/sys/rump/dev/Makefile.rumpdev:1.6 src/sys/rump/dev/Makefile.rumpdev:1.7
--- src/sys/rump/dev/Makefile.rumpdev:1.6 Fri Dec 4 22:13:59 2009
+++ src/sys/rump/dev/Makefile.rumpdev Tue Jan 19 22:38:21 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpdev,v 1.6 2009/12/04 22:13:59 haad Exp $
+# $NetBSD: Makefile.rumpdev,v 1.7 2010/01/19 22:38:21 pooka Exp $
#
-RUMPDEVLIST= cgd disk netsmb raidframe rnd dm
+RUMPDEVLIST= bpf cgd disk netsmb raidframe rnd dm
.for var in ${RUMPDEVLIST}
RUMPDEVLIBS+=lib${var}
Index: src/sys/rump/librump/rumpdev/rump_dev.c
diff -u src/sys/rump/librump/rumpdev/rump_dev.c:1.11 src/sys/rump/librump/rumpdev/rump_dev.c:1.12
--- src/sys/rump/librump/rumpdev/rump_dev.c:1.11 Sun Jan 10 13:42:34 2010
+++ src/sys/rump/librump/rumpdev/rump_dev.c Tue Jan 19 22:38:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev.c,v 1.11 2010/01/10 13:42:34 martin Exp $ */
+/* $NetBSD: rump_dev.c,v 1.12 2010/01/19 22:38:21 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_dev.c,v 1.11 2010/01/10 13:42:34 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_dev.c,v 1.12 2010/01/19 22:38:21 pooka Exp $);
#include sys/param.h
#include sys/device.h
@@ -35,6 +35,7 @@
void nocomponent(void);
void nocomponent() {}
+__weak_alias(rump_dev_bpf_init,nocomponent);
__weak_alias(rump_dev_cgd_init,nocomponent);
__weak_alias(rump_dev_dm_init,nocomponent);
__weak_alias(rump_dev_raidframe_init,nocomponent);
@@ -43,6 +44,7 @@
__weak_alias(rump_dev_rumpusbhc_init,nocomponent);
__weak_alias(rump_device_configuration,nocomponent);
+__weak_alias(rump_wscons_configuration,nocomponent);
const char *rootspec = rump0a; /* usually comes from config */
@@ -57,6 +59,7 @@
config_init_mi();
+ rump_dev_bpf_init();
rump_dev_cgd_init();
rump_dev_dm_init();
rump_dev_raidframe_init();
@@ -67,6 +70,7 @@
rump_pdev_finalize();
rump_device_configuration();
+ rump_wscons_configuration();
cold = 0;
if (config_rootfound(mainbus, NULL) == NULL)
Index: src/sys/rump/librump/rumpdev/rump_dev_private.h
diff -u src/sys/rump/librump/rumpdev/rump_dev_private.h:1.7 src/sys/rump/librump/rumpdev/rump_dev_private.h:1.8
--- src/sys/rump/librump/rumpdev/rump_dev_private.h:1.7 Fri Dec 4 22:13:59 2009
+++ src/sys/rump/librump/rumpdev/rump_dev_private.h Tue Jan 19 22:38:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev_private.h,v 1.7 2009/12/04 22:13:59 haad Exp $ */
+/* $NetBSD: rump_dev_private.h,v 1.8 2010/01/19 22:38:21 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -33,6 +33,7 @@
void rump_pdev_add(void (*fn)(int), int);
void rump_pdev_finalize(void);
+void rump_dev_bpf_init(void);
void rump_dev_cgd_init(void);
void rump_dev_dm_init(void);
void rump_dev_raidframe_init(void);
@@ -41,6 +42,7 @@
void rump_dev_rumpusbhc_init(void);
void rump_device_configuration(void);
+void rump_wscons_configuration(void);
struct mainbus_attach_args {
int maa_unit;
Added files:
Index: src/sys/rump/dev/lib/libbpf/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libbpf/Makefile:1.1
--- /dev/null Tue Jan 19 22:38:21 2010
+++ src/sys/rump/dev/lib/libbpf/Makefile Tue Jan 19 22:38:21 2010
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2010/01/19 22:38:21 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net
+
+LIB= rumpdev_bpf
+
+SRCS= bpf.c bpf_filter.c
+SRCS+= component.c
+
+CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libbpf/component.c
diff -u /dev/null src/sys/rump/dev/lib/libbpf/component.c:1.1
--- /dev/null Tue Jan 19 22:38:21 2010
+++ src/sys/rump/dev/lib/libbpf/component.c Tue Jan 19 22:38:21 2010
@@ -0,0 +1,58 @@
+/* $NetBSD: component.c,v 1.1 2010/01/19 22:38:21 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Tue Jan 19 22:46:34 UTC 2010 Modified Files: src/distrib/sets/lists/base: shl.elf shl.mi src/distrib/sets/lists/comp: mi shl.mi Log Message: add rumpdev_bpf to setlists To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.515 -r1.516 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1364 -r1.1365 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.196 src/distrib/sets/lists/base/shl.elf:1.197 --- src/distrib/sets/lists/base/shl.elf:1.196 Sun Dec 27 01:42:40 2009 +++ src/distrib/sets/lists/base/shl.elf Tue Jan 19 22:46:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.196 2009/12/27 01:42:40 christos Exp $ +# $NetBSD: shl.elf,v 1.197 2010/01/19 22:46:33 pooka Exp $ # # Note: Do not mark old major and major.minor shared libraries as # obsolete; just remove the entry, as third-party applications @@ -236,6 +236,8 @@ ./usr/lib/librumpcrypto.so.0 base-rump-shlib ./usr/lib/librumpdev.sobase-rump-shlib ./usr/lib/librumpdev.so.0 base-rump-shlib +./usr/lib/librumpdev_bpf.so base-rump-shlib +./usr/lib/librumpdev_bpf.so.0 base-rump-shlib ./usr/lib/librumpdev_cgd.so base-rump-shlib ./usr/lib/librumpdev_cgd.so.0 base-rump-shlib ./usr/lib/librumpdev_disk.so base-rump-shlib Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.515 src/distrib/sets/lists/base/shl.mi:1.516 --- src/distrib/sets/lists/base/shl.mi:1.515 Thu Jan 14 10:04:19 2010 +++ src/distrib/sets/lists/base/shl.mi Tue Jan 19 22:46:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.515 2010/01/14 10:04:19 wiz Exp $ +# $NetBSD: shl.mi,v 1.516 2010/01/19 22:46:33 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -125,6 +125,7 @@ ./usr/lib/librump.so.0.0 base-rump-shlib ./usr/lib/librumpcrypto.so.0.0 base-rump-shlib ./usr/lib/librumpdev.so.0.0 base-rump-shlib +./usr/lib/librumpdev_bpf.so.0.0 base-rump-shlib ./usr/lib/librumpdev_cgd.so.0.0 base-rump-shlib ./usr/lib/librumpdev_disk.so.0.0 base-rump-shlib ./usr/lib/librumpdev_dm.so.0.0 base-rump-shlib Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1364 src/distrib/sets/lists/comp/mi:1.1365 --- src/distrib/sets/lists/comp/mi:1.1364 Sat Jan 16 15:34:22 2010 +++ src/distrib/sets/lists/comp/mi Tue Jan 19 22:46:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1364 2010/01/16 15:34:22 roy Exp $ +# $NetBSD: mi,v 1.1365 2010/01/19 22:46:33 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2560,6 +2560,9 @@ ./usr/lib/librumpdev.acomp-c-lib ./usr/lib/librumpdev_g.a -unknown- debuglib ./usr/lib/librumpdev_p.a comp-c-proflib profile +./usr/lib/librumpdev_bpf.a comp-c-lib +./usr/lib/librumpdev_bpf_g.a -unknown- debuglib +./usr/lib/librumpdev_bpf_p.a comp-c-proflib profile ./usr/lib/librumpdev_cgd.a comp-c-lib ./usr/lib/librumpdev_cgd_g.a -unknown- debuglib ./usr/lib/librumpdev_cgd_p.a comp-c-proflib profile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.98 src/distrib/sets/lists/comp/shl.mi:1.99 --- src/distrib/sets/lists/comp/shl.mi:1.98 Thu Jan 14 13:47:41 2010 +++ src/distrib/sets/lists/comp/shl.mi Tue Jan 19 22:46:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.98 2010/01/14 13:47:41 wiz Exp $ +# $NetBSD: shl.mi,v 1.99 2010/01/19 22:46:34 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -88,6 +88,7 @@ ./usr/lib/librump_pic.acomp-c-piclib ./usr/lib/librumpcrypto_pic.a comp-c-piclib ./usr/lib/librumpdev_pic.a comp-c-piclib +./usr/lib/librumpdev_bpf_pic.a comp-c-piclib ./usr/lib/librumpdev_cgd_pic.a comp-c-piclib ./usr/lib/librumpdev_disk_pic.a comp-c-piclib ./usr/lib/librumpdev_dm_pic.a comp-c-piclib
CVS commit: src/sys/rump/net/rumptest
Module Name:src Committed By: pooka Date: Tue Jan 19 22:47:46 UTC 2010 Modified Files: src/sys/rump/net/rumptest: Makefile Log Message: Add components necessary for bpf support (commented out just for the sheer heck of it). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/rump/net/rumptest/Makefile 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/net/rumptest/Makefile diff -u src/sys/rump/net/rumptest/Makefile:1.7 src/sys/rump/net/rumptest/Makefile:1.8 --- src/sys/rump/net/rumptest/Makefile:1.7 Wed Oct 14 17:34:08 2009 +++ src/sys/rump/net/rumptest/Makefile Tue Jan 19 22:47:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2009/10/14 17:34:08 pooka Exp $ +# $NetBSD: Makefile,v 1.8 2010/01/19 22:47:46 pooka Exp $ # PROG= rumptest_net @@ -10,6 +10,9 @@ -lrumpuser -lpthread CPPFLAGS+= -DFULL_NETWORK_STACK +# uncomment for bpf support +#LDADD+= -lrumpdev_bpf -lrumpdev -lrumpvfs + # use protocol families provided by host kernel sockets #LDADD= -lrump -lrumpnet -lrumpnet_sockin -lrumpuser -lpthread
CVS commit: src/doc
Module Name:src Committed By: pooka Date: Tue Jan 19 22:58:45 UTC 2010 Modified Files: src/doc: CHANGES Log Message: note modularity change to kernel bpf To generate a diff of this commit: cvs rdiff -u -r1.1346 -r1.1347 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1346 src/doc/CHANGES:1.1347 --- src/doc/CHANGES:1.1346 Tue Jan 19 22:11:57 2010 +++ src/doc/CHANGES Tue Jan 19 22:58:44 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1346 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1347 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -531,3 +531,6 @@ check_pkg_signatures to validate the installed packages against the vulnerabilities database and the expected checksums for their files. [jmmv 20100119] + bpf: Make bpf interface with an ops vector backed by stubs + if bpf is not present in the kernel. The client + linkage is now always the same. [pooka 20100119]
CVS commit: src/sys/net
Module Name:src Committed By: pooka Date: Tue Jan 19 23:11:10 UTC 2010 Modified Files: src/sys/net: bpf_stub.c Log Message: fix pasto in previous To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/net/bpf_stub.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/net/bpf_stub.c diff -u src/sys/net/bpf_stub.c:1.2 src/sys/net/bpf_stub.c:1.3 --- src/sys/net/bpf_stub.c:1.2 Tue Jan 19 22:33:35 2010 +++ src/sys/net/bpf_stub.c Tue Jan 19 23:11:10 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bpf_stub.c,v 1.2 2010/01/19 22:33:35 pooka Exp $ */ +/* $NetBSD: bpf_stub.c,v 1.3 2010/01/19 23:11:10 pooka Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -27,8 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bpf_stub.c,v 1.2 2010/01/19 22:33:35 pooka Exp $); -); +__KERNEL_RCSID(0, $NetBSD: bpf_stub.c,v 1.3 2010/01/19 23:11:10 pooka Exp $); #include sys/param.h #include sys/mbuf.h
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: pooka Date: Tue Jan 19 23:15:50 UTC 2010 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_signal.c Log Message: A few more instances of __sigtimedwait1 - sigtimedwait1 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.32 -r1.33 src/sys/compat/netbsd32/netbsd32_signal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_compat_50.c diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.8 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.9 --- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.8 Mon Dec 21 16:18:17 2009 +++ src/sys/compat/netbsd32/netbsd32_compat_50.c Tue Jan 19 23:15:50 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_50.c,v 1.8 2009/12/21 16:18:17 njoly Exp $ */ +/* $NetBSD: netbsd32_compat_50.c,v 1.9 2010/01/19 23:15:50 pooka Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_50.c,v 1.8 2009/12/21 16:18:17 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_compat_50.c,v 1.9 2010/01/19 23:15:50 pooka Exp $); #if defined(_KERNEL_OPT) #include opt_sysv.h @@ -550,7 +550,7 @@ NETBSD32TOP_UAP(info, siginfo_t); NETBSD32TOP_UAP(timeout, struct timespec); - return __sigtimedwait1(l, ua, retval, + return sigtimedwait1(l, ua, retval, compat_50_netbsd32_sigtimedwait_put_info, compat_50_netbsd32_sigtimedwait_fetch_timeout, compat_50_netbsd32_sigtimedwait_put_timeout); Index: src/sys/compat/netbsd32/netbsd32_signal.c diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.32 src/sys/compat/netbsd32/netbsd32_signal.c:1.33 --- src/sys/compat/netbsd32/netbsd32_signal.c:1.32 Sun Jan 11 02:45:49 2009 +++ src/sys/compat/netbsd32/netbsd32_signal.c Tue Jan 19 23:15:50 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_signal.c,v 1.32 2009/01/11 02:45:49 christos Exp $ */ +/* $NetBSD: netbsd32_signal.c,v 1.33 2010/01/19 23:15:50 pooka Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_signal.c,v 1.32 2009/01/11 02:45:49 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_signal.c,v 1.33 2010/01/19 23:15:50 pooka Exp $); #include sys/param.h #include sys/systm.h @@ -481,7 +481,7 @@ NETBSD32TOP_UAP(info, siginfo_t); NETBSD32TOP_UAP(timeout, struct timespec); - return __sigtimedwait1(l, ua, retval, + return sigtimedwait1(l, ua, retval, netbsd32_sigtimedwait_put_info, netbsd32_sigtimedwait_fetch_timeout, netbsd32_sigtimedwait_put_timeout);
CVS commit: src/share/man/man9
Module Name:src Committed By: pooka Date: Wed Jan 20 00:35:05 UTC 2010 Modified Files: src/share/man/man9: Makefile Log Message: Remove MKLINKS for VATTR_NULL, so that the obsolete lists don't have to do the work every build. To generate a diff of this commit: cvs rdiff -u -r1.303 -r1.304 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.303 src/share/man/man9/Makefile:1.304 --- src/share/man/man9/Makefile:1.303 Fri Jan 8 13:15:46 2010 +++ src/share/man/man9/Makefile Wed Jan 20 00:35:05 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.303 2010/01/08 13:15:46 pooka Exp $ +# $NetBSD: Makefile,v 1.304 2010/01/20 00:35:05 pooka Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -699,8 +699,7 @@ vme.9 vme_space_alloc.9 \ vme.9 vme_space_free.9 \ vme.9 vme_space_get.9 -MLINKS+=vattr.9 vattr_null.9 \ - vattr.9 VATTR_NULL.9 +MLINKS+=vattr.9 vattr_null.9 MLINKS+=vfs_hooks.9 vfs_hooks_unmount.9 MLINKS+=vfsops.9 VFS_MOUNT.9 \ vfsops.9 VFS_START.9 \
CVS commit: src
Module Name:src Committed By: dyoung Date: Wed Jan 20 00:39:30 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile pmf.9 Log Message: Update PMF documentation: rename pmf_device_resume_subtree to pmf_device_subtree_resume. Briefly describe pmf_qual_t and add it to the PMF function signatures. There's still a lot left to document. To generate a diff of this commit: cvs rdiff -u -r1.1365 -r1.1366 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.304 -r1.305 src/share/man/man9/Makefile cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/pmf.9 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.1365 src/distrib/sets/lists/comp/mi:1.1366 --- src/distrib/sets/lists/comp/mi:1.1365 Tue Jan 19 22:46:33 2010 +++ src/distrib/sets/lists/comp/mi Wed Jan 20 00:39:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1365 2010/01/19 22:46:33 pooka Exp $ +# $NetBSD: mi,v 1.1366 2010/01/20 00:39:30 dyoung Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -9138,7 +9138,7 @@ ./usr/share/man/cat9/pmf_device_register.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_device_register1.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_device_resume.0 comp-sys-catman .cat -./usr/share/man/cat9/pmf_device_resume_subtree.0 comp-sys-catman .cat +./usr/share/man/cat9/pmf_device_subtree_resume.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_device_suspend.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_event_deregister.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_event_inject.0 comp-sys-catman .cat @@ -14653,7 +14653,7 @@ ./usr/share/man/html9/pmf_device_register.html comp-sys-htmlman html ./usr/share/man/html9/pmf_device_register1.html comp-sys-htmlman html ./usr/share/man/html9/pmf_device_resume.html comp-sys-htmlman html -./usr/share/man/html9/pmf_device_resume_subtree.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_subtree_resume.html comp-sys-htmlman html ./usr/share/man/html9/pmf_device_suspend.html comp-sys-htmlman html ./usr/share/man/html9/pmf_event_deregister.html comp-sys-htmlman html ./usr/share/man/html9/pmf_event_inject.html comp-sys-htmlman html @@ -20337,7 +20337,7 @@ ./usr/share/man/man9/pmf_device_register.9 comp-sys-man .man ./usr/share/man/man9/pmf_device_register1.9 comp-sys-man .man ./usr/share/man/man9/pmf_device_resume.9 comp-sys-man .man -./usr/share/man/man9/pmf_device_resume_subtree.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_subtree_resume.9 comp-sys-man .man ./usr/share/man/man9/pmf_device_suspend.9 comp-sys-man .man ./usr/share/man/man9/pmf_event_deregister.9 comp-sys-man .man ./usr/share/man/man9/pmf_event_inject.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.304 src/share/man/man9/Makefile:1.305 --- src/share/man/man9/Makefile:1.304 Wed Jan 20 00:35:05 2010 +++ src/share/man/man9/Makefile Wed Jan 20 00:39:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.304 2010/01/20 00:35:05 pooka Exp $ +# $NetBSD: Makefile,v 1.305 2010/01/20 00:39:30 dyoung Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -537,7 +537,7 @@ pmf.9 pmf_device_suspend.9 pmf.9 pmf_device_resume.9 \ pmf.9 pmf_device_recursive_suspend.9 \ pmf.9 pmf_device_recursive_resume.9 \ - pmf.9 pmf_device_resume_subtree.9 \ + pmf.9 pmf_device_subtree_resume.9 \ pmf.9 pmf_class_network_register.9 pmf.9 pmf_class_input_register.9 \ pmf.9 pmf_class_display_register.9 \ pmf.9 pmf_system_suspend.9 pmf.9 pmf_system_resume.9 \ Index: src/share/man/man9/pmf.9 diff -u src/share/man/man9/pmf.9:1.12 src/share/man/man9/pmf.9:1.13 --- src/share/man/man9/pmf.9:1.12 Wed Oct 21 16:06:59 2009 +++ src/share/man/man9/pmf.9 Wed Jan 20 00:39:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: pmf.9,v 1.12 2009/10/21 16:06:59 snj Exp $ +.\ $NetBSD: pmf.9,v 1.13 2010/01/20 00:39:30 dyoung Exp $ .\ .\ Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca .\ All rights reserved. @@ -52,21 +52,21 @@ .Sh SYNOPSIS .In sys/device.h .Ft bool -.Fn pmf_device_register device_t dev bool (*suspend)(device_t dev) bool (*resume)(device_t dev) +.Fn pmf_device_register device_t dev bool (*suspend)(device_t dev, pmf_qual_t qual) bool (*resume)(device_t dev, pmf_qual_t qual) .Ft bool -.Fn pmf_device_register1 device_t dev bool (*suspend)(device_t dev) bool (*resume)(device_t dev) bool (*shutdown)(device_t dev, int how) +.Fn pmf_device_register1 device_t dev bool (*suspend)(device_t dev, pmf_qual_t qual) bool (*resume)(device_t dev, pmf_qual_t qual) bool (*shutdown)(device_t dev, int how) .Ft void .Fn pmf_device_deregister device_t dev .Ft bool -.Fn pmf_device_suspend device_t dev +.Fn pmf_device_suspend device_t dev pmf_qual_t qual .Ft bool -.Fn pmf_device_resume device_t dev +.Fn
CVS commit: src/external/bsd/iscsi/dist/src/lib
Module Name:src
Committed By: yamt
Date: Wed Jan 20 00:50:09 UTC 2010
Modified Files:
src/external/bsd/iscsi/dist/src/lib: disk.c
Log Message:
disk_write: report an error from target_transfer_data instead of
silently write garbage to the storage.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/iscsi/dist/src/lib/disk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/src/lib/disk.c
diff -u src/external/bsd/iscsi/dist/src/lib/disk.c:1.2 src/external/bsd/iscsi/dist/src/lib/disk.c:1.3
--- src/external/bsd/iscsi/dist/src/lib/disk.c:1.2 Tue Jun 30 02:44:52 2009
+++ src/external/bsd/iscsi/dist/src/lib/disk.c Wed Jan 20 00:50:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.c,v 1.2 2009/06/30 02:44:52 agc Exp $ */
+/* $NetBSD: disk.c,v 1.3 2010/01/20 00:50:09 yamt Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -1398,6 +1398,7 @@
if (target_transfer_data(sess, args, sg, 1) != 0) {
iscsi_err(__FILE__, __LINE__,
target_transfer_data() failed\n);
+ return -1;
}
/* Finish up write */
if (de_lseek(disks.v[sess-d].lunv-v[lun].de, (off_t)byte_offset,
CVS commit: src/external/bsd/iscsi/dist/src/lib
Module Name:src
Committed By: yamt
Date: Wed Jan 20 00:51:51 UTC 2010
Modified Files:
src/external/bsd/iscsi/dist/src/lib: target.c
Log Message:
target_transfer_data: fix an incorrect flattening of RETURN_NOT_EQUAL
in rev.1.2.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/iscsi/dist/src/lib/target.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/src/lib/target.c
diff -u src/external/bsd/iscsi/dist/src/lib/target.c:1.2 src/external/bsd/iscsi/dist/src/lib/target.c:1.3
--- src/external/bsd/iscsi/dist/src/lib/target.c:1.2 Tue Jun 30 02:44:52 2009
+++ src/external/bsd/iscsi/dist/src/lib/target.c Wed Jan 20 00:51:51 2010
@@ -1841,8 +1841,8 @@
#if 0
RETURN_NOT_EQUAL(Final bit, args-final, 1, TTD_CLEANUP, -1);
#else
- if (data.final != 1) {
- iscsi_err(__FILE__, __LINE__, Final bit);
+ if (args-final != 1) {
+ iscsi_err(__FILE__, __LINE__, Final bit\n);
TTD_CLEANUP;
return -1;
}
CVS commit: src/external/bsd/iscsi/dist/src/lib
Module Name:src
Committed By: yamt
Date: Wed Jan 20 00:58:49 UTC 2010
Modified Files:
src/external/bsd/iscsi/dist/src/lib: disk.c target.c
Log Message:
add missing trailing newline chars to some of iscsi_err messages.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/iscsi/dist/src/lib/disk.c \
src/external/bsd/iscsi/dist/src/lib/target.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/src/lib/disk.c
diff -u src/external/bsd/iscsi/dist/src/lib/disk.c:1.3 src/external/bsd/iscsi/dist/src/lib/disk.c:1.4
--- src/external/bsd/iscsi/dist/src/lib/disk.c:1.3 Wed Jan 20 00:50:09 2010
+++ src/external/bsd/iscsi/dist/src/lib/disk.c Wed Jan 20 00:58:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.c,v 1.3 2010/01/20 00:50:09 yamt Exp $ */
+/* $NetBSD: disk.c,v 1.4 2010/01/20 00:58:49 yamt Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -715,12 +715,12 @@
}
if (de_read(de, block, sizeof(block)) == -1) {
iscsi_err(__FILE__, __LINE__,
-error reading \%s\, filename);
+error reading \%s\\n, filename);
return 0;
}
if (de_write(de, block, sizeof(block)) == -1) {
iscsi_err(__FILE__, __LINE__,
-error writing \%s\, filename);
+error writing \%s\\n, filename);
return 0;
}
return 1;
@@ -863,7 +863,7 @@
}
if (!(tp-flags TARGET_READONLY) !allocate_space(tp)) {
iscsi_err(__FILE__, __LINE__,
- error allocating space for \%s\, tp-target);
+ error allocating space for \%s\\n, tp-target);
return -1;
}
printf(% PRIu64 MB %sdisk storage for \%s\\n,
Index: src/external/bsd/iscsi/dist/src/lib/target.c
diff -u src/external/bsd/iscsi/dist/src/lib/target.c:1.3 src/external/bsd/iscsi/dist/src/lib/target.c:1.4
--- src/external/bsd/iscsi/dist/src/lib/target.c:1.3 Wed Jan 20 00:51:51 2010
+++ src/external/bsd/iscsi/dist/src/lib/target.c Wed Jan 20 00:58:49 2010
@@ -1832,7 +1832,7 @@
RETURN_NOT_EQUAL(Final bit, data.final, 1, TTD_CLEANUP, -1);
#else
if (data.final != 1) {
- iscsi_err(__FILE__, __LINE__, Final bit);
+ iscsi_err(__FILE__, __LINE__, Final bit\n);
TTD_CLEANUP;
return -1;
}
CVS commit: src/sys/lib/libkern/arch/mips
Module Name:src Committed By: pooka Date: Wed Jan 20 03:36:26 UTC 2010 Modified Files: src/sys/lib/libkern/arch/mips: Makefile.inc Log Message: __assert.c - kern_assert.c (I don't fully understand why __assert.c is needed here. maybe it can be removed, but I don't have time to do a full set of mips builds tonight) To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/lib/libkern/arch/mips/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/mips/Makefile.inc diff -u src/sys/lib/libkern/arch/mips/Makefile.inc:1.21 src/sys/lib/libkern/arch/mips/Makefile.inc:1.22 --- src/sys/lib/libkern/arch/mips/Makefile.inc:1.21 Mon Dec 14 00:48:35 2009 +++ src/sys/lib/libkern/arch/mips/Makefile.inc Wed Jan 20 03:36:26 2010 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.inc,v 1.21 2009/12/14 00:48:35 matt Exp $ +# $NetBSD: Makefile.inc,v 1.22 2010/01/20 03:36:26 pooka Exp $ # # There are likely more that we will notice when we go native NO_SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c NO_SRCS+= __main.c -SRCS+= __assert.c memchr.c memcmp.c random.c scanc.c \ +SRCS+= kern_assert.c memchr.c memcmp.c random.c scanc.c \ skpc.c strcat.c strcpy.c strcasecmp.c \ strncasecmp.c strncmp.c strncpy.c strtoul.c
CVS commit: [netbsd-5] src/external/gpl2
Module Name:src Committed By: snj Date: Wed Jan 20 05:13:34 UTC 2010 Removed Files: src/external/gpl2/libdevmapper/dist [netbsd-5]: COPYING COPYING.LIB INSTALL INTRO Makefile.in README VERSION WHATS_NEW configure configure.in make.tmpl.in src/external/gpl2/libdevmapper/dist/autoconf [netbsd-5]: config.guess config.sub install-sh src/external/gpl2/libdevmapper/dist/contrib [netbsd-5]: dm-reverse.README dm-reverse.c src/external/gpl2/libdevmapper/dist/debian [netbsd-5]: changelog control copyright devmapper-dev.dirs devmapper-dev.files dmsetup.dirs dmsetup.docs dmsetup.files dmsetup.manpages kernel-patch-device-mapper.docs kernel-patch-device-mapper.kpatches libdevmapper-dev.dirs libdevmapper-dev.docs libdevmapper-dev.files libdevmapper0.dirs libdevmapper0.docs libdevmapper0.files libdevmapper0.postinst rules src/external/gpl2/libdevmapper/dist/debian/include/linux [netbsd-5]: device-mapper.h dm-ioctl.h fs.h jbd.h mempool.h vmalloc.h src/external/gpl2/libdevmapper/dist/debian/scripts [netbsd-5]: includes.pl strippatch.pl src/external/gpl2/libdevmapper/dist/dmeventd [netbsd-5]: .exported_symbols Makefile.in dmeventd.c dmeventd.h libdevmapper-event.c libdevmapper-event.h libdevmapper-event.pc.in src/external/gpl2/libdevmapper/dist/dmeventd/old [netbsd-5]: .exported_symbols Makefile.in dmevent.c dmeventd.c mktestdevices noop.c noop.d src/external/gpl2/libdevmapper/dist/dmsetup [netbsd-5]: Makefile.in dmsetup.c src/external/gpl2/libdevmapper/dist/include [netbsd-5]: .symlinks Makefile.in configure.h.in intl.h kdev_t.h lib.h list.h log.h src/external/gpl2/libdevmapper/dist/include/linux [netbsd-5]: .symlinks src/external/gpl2/libdevmapper/dist/kernel [netbsd-5]: Makefile.in src/external/gpl2/libdevmapper/dist/kernel/common [netbsd-5]: device-mapper.h dm-daemon.c dm-daemon.h dm-exception-store.c dm-io.c dm-io.h dm-linear.c dm-log.c dm-log.h dm-raid1.c dm-snapshot.c dm-snapshot.h dm-stripe.c dm-table.c dm-target.c dm.c dm.h kcopyd.c kcopyd.c.async kcopyd.h src/external/gpl2/libdevmapper/dist/kernel/fs [netbsd-5]: dmfs-error.c dmfs-lv.c dmfs-root.c dmfs-status.c dmfs-super.c dmfs-suspend.c dmfs-table.c dmfs.h src/external/gpl2/libdevmapper/dist/kernel/ioctl [netbsd-5]: dm-ioctl.c dm-ioctl.h src/external/gpl2/libdevmapper/dist/lib [netbsd-5]: .exported_symbols Makefile.in libdevmapper.h libdevmapper.pc.in libdm-common.c libdm-common.h libdm-deptree.c libdm-file.c libdm-report.c libdm-string.c src/external/gpl2/libdevmapper/dist/lib/datastruct [netbsd-5]: bitset.c bitset.h hash.c hash.h src/external/gpl2/libdevmapper/dist/lib/ioctl [netbsd-5]: libdm-compat.h libdm-iface.c libdm-targets.h src/external/gpl2/libdevmapper/dist/lib/mm [netbsd-5]: dbg_malloc.c dbg_malloc.h pool-debug.c pool-fast.c pool.c pool.h src/external/gpl2/libdevmapper/dist/lib/regex [netbsd-5]: matcher.c parse_rx.c parse_rx.h ttree.c ttree.h src/external/gpl2/libdevmapper/dist/man [netbsd-5]: Makefile.in dmsetup.8 src/external/gpl2/libdevmapper/dist/multilog [netbsd-5]: .exported_symbols Makefile.in README libmultilog.c libmultilog.h multilog_internal.h src/external/gpl2/libdevmapper/dist/multilog/async [netbsd-5]: .exported_symbols Makefile.in async_logger.c async_logger.h src/external/gpl2/libdevmapper/dist/multilog/pthread_lock [netbsd-5]: .exported_symbols Makefile.in pthread_lock.c pthread_lock.h src/external/gpl2/libdevmapper/dist/multilog/tests [netbsd-5]: Makefile.in test-multilog.c src/external/gpl2/libdevmapper/dist/patches [netbsd-5]: linux-2.4.20-VFS-lock.patch linux-2.4.20-devmapper-ioctl.patch linux-2.4.21-VFS-lock-experimental.patch linux-2.4.21-VFS-lock.patch linux-2.4.21-devmapper-ioctl.patch linux-2.4.22-VFS-lock.patch linux-2.4.22-devmapper-ioctl.patch linux-2.4.26-rc1-devmapper-ioctl.patch linux-2.4.27-devmapper-ioctl.patch linux-2.4.28-pre4-devmapper-ioctl.patch src/external/gpl2/libdevmapper/dist/patches/common [netbsd-5]: README linux-2.4.20-arch64.patch linux-2.4.20-b_private.patch linux-2.4.20-config.patch linux-2.4.20-devmapper.patch linux-2.4.20-makefile.patch linux-2.4.20-mempool.patch linux-2.4.20-o_direct.patch linux-2.4.20-vcalloc.patch linux-2.4.21-arch64.patch linux-2.4.21-b_private.patch
CVS commit: [netbsd-5] src/sys/lib/libkern
Module Name:src Committed By: snj Date: Wed Jan 20 05:29:25 UTC 2010 Modified Files: src/sys/lib/libkern [netbsd-5]: arc4random.c Log Message: Pull up following revision(s) (requested by joerg in ticket #1253): sys/lib/libkern/arc4random.c: revision 1.21 Keep arc4_i and arc4_j synchronised after a rekeying. This prevents accidentally ending up in a short ARC4 cycle. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.10.1 src/sys/lib/libkern/arc4random.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/lib/libkern/arc4random.c diff -u src/sys/lib/libkern/arc4random.c:1.20 src/sys/lib/libkern/arc4random.c:1.20.10.1 --- src/sys/lib/libkern/arc4random.c:1.20 Mon Apr 28 20:24:06 2008 +++ src/sys/lib/libkern/arc4random.c Wed Jan 20 05:29:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: arc4random.c,v 1.20 2008/04/28 20:24:06 martin Exp $ */ +/* $NetBSD: arc4random.c,v 1.20.10.1 2010/01/20 05:29:25 snj Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -136,6 +136,7 @@ arc4_j = (arc4_j + arc4_sbox[n] + key[n]) % 256; arc4_swap(arc4_sbox[n], arc4_sbox[arc4_j]); } + arc4_i = arc4_j; /* Reset for next reseed cycle. */ arc4_nextreseed = time_uptime + ARC4_RESEED_SECONDS;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Wed Jan 20 05:33:10 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1211 and 1253. To generate a diff of this commit: cvs rdiff -u -r1.1.2.175 -r1.1.2.176 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.175 src/doc/CHANGES-5.1:1.1.2.176 --- src/doc/CHANGES-5.1:1.1.2.175 Sat Jan 16 17:55:39 2010 +++ src/doc/CHANGES-5.1 Wed Jan 20 05:33:10 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.175 2010/01/16 17:55:39 bouyer Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.176 2010/01/20 05:33:10 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16088,3 +16088,15 @@ Provide inline assembly version of bswap64. [joerg, ticket #1245] +external/gpl2/libdevmapper/* delete +external/gpl2/lvm2tools/* delete + + Remove obsolete LVM sources. + [tron, ticket #1211] + +sys/lib/libkern/arc4random.c 1.21 + + Keep arc4_i and arc4_j synchronised after a rekeying. This + prevents accidentally ending up in a short ARC4 cycle. + [joerg, ticket #1253] +
CVS commit: [netbsd-5-0] src/sys/lib/libkern
Module Name:src Committed By: snj Date: Wed Jan 20 05:36:09 UTC 2010 Modified Files: src/sys/lib/libkern [netbsd-5-0]: arc4random.c Log Message: Pull up following revision(s) (requested by joerg in ticket #1253): sys/lib/libkern/arc4random.c: revision 1.21 Keep arc4_i and arc4_j synchronised after a rekeying. This prevents accidentally ending up in a short ARC4 cycle. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.16.1 src/sys/lib/libkern/arc4random.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/lib/libkern/arc4random.c diff -u src/sys/lib/libkern/arc4random.c:1.20 src/sys/lib/libkern/arc4random.c:1.20.16.1 --- src/sys/lib/libkern/arc4random.c:1.20 Mon Apr 28 20:24:06 2008 +++ src/sys/lib/libkern/arc4random.c Wed Jan 20 05:36:09 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: arc4random.c,v 1.20 2008/04/28 20:24:06 martin Exp $ */ +/* $NetBSD: arc4random.c,v 1.20.16.1 2010/01/20 05:36:09 snj Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -136,6 +136,7 @@ arc4_j = (arc4_j + arc4_sbox[n] + key[n]) % 256; arc4_swap(arc4_sbox[n], arc4_sbox[arc4_j]); } + arc4_i = arc4_j; /* Reset for next reseed cycle. */ arc4_nextreseed = time_uptime + ARC4_RESEED_SECONDS;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Wed Jan 20 05:36:59 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1253. To generate a diff of this commit: cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.41 src/doc/CHANGES-5.0.2:1.1.2.42 --- src/doc/CHANGES-5.0.2:1.1.2.41 Mon Jan 18 18:52:24 2010 +++ src/doc/CHANGES-5.0.2 Wed Jan 20 05:36:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.41 2010/01/18 18:52:24 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.42 2010/01/20 05:36:59 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -962,3 +962,9 @@ lock order assumptions. Per discussion with martin. [rmind, ticket #1241] +sys/lib/libkern/arc4random.c 1.21 + + Keep arc4_i and arc4_j synchronised after a rekeying. This + prevents accidentally ending up in a short ARC4 cycle. + [joerg, ticket #1253] +
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: wiz Date: Wed Jan 20 07:27:11 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Like the comment at the top says: don't remove entries here, mark them obsolete. Do so for pmf_device_resume_subtree.9. To generate a diff of this commit: cvs rdiff -u -r1.1366 -r1.1367 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.1366 src/distrib/sets/lists/comp/mi:1.1367 --- src/distrib/sets/lists/comp/mi:1.1366 Wed Jan 20 00:39:30 2010 +++ src/distrib/sets/lists/comp/mi Wed Jan 20 07:27:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1366 2010/01/20 00:39:30 dyoung Exp $ +# $NetBSD: mi,v 1.1367 2010/01/20 07:27:09 wiz Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -9138,6 +9138,7 @@ ./usr/share/man/cat9/pmf_device_register.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_device_register1.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_device_resume.0 comp-sys-catman .cat +./usr/share/man/cat9/pmf_device_resume_subtree.0 comp-obsolete obsolete ./usr/share/man/cat9/pmf_device_subtree_resume.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_device_suspend.0 comp-sys-catman .cat ./usr/share/man/cat9/pmf_event_deregister.0 comp-sys-catman .cat @@ -14653,6 +14654,7 @@ ./usr/share/man/html9/pmf_device_register.html comp-sys-htmlman html ./usr/share/man/html9/pmf_device_register1.html comp-sys-htmlman html ./usr/share/man/html9/pmf_device_resume.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_resume_subtree.html comp-obsolete obsolete ./usr/share/man/html9/pmf_device_subtree_resume.html comp-sys-htmlman html ./usr/share/man/html9/pmf_device_suspend.html comp-sys-htmlman html ./usr/share/man/html9/pmf_event_deregister.html comp-sys-htmlman html @@ -20337,6 +20339,7 @@ ./usr/share/man/man9/pmf_device_register.9 comp-sys-man .man ./usr/share/man/man9/pmf_device_register1.9 comp-sys-man .man ./usr/share/man/man9/pmf_device_resume.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_resume_subtree.9 comp-obsolete obsolete ./usr/share/man/man9/pmf_device_subtree_resume.9 comp-sys-man .man ./usr/share/man/man9/pmf_device_suspend.9 comp-sys-man .man ./usr/share/man/man9/pmf_event_deregister.9 comp-sys-man .man
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Wed Jan 20 07:27:21 UTC 2010 Modified Files: src/share/man/man9: pmf.9 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/pmf.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/pmf.9 diff -u src/share/man/man9/pmf.9:1.13 src/share/man/man9/pmf.9:1.14 --- src/share/man/man9/pmf.9:1.13 Wed Jan 20 00:39:30 2010 +++ src/share/man/man9/pmf.9 Wed Jan 20 07:27:21 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: pmf.9,v 1.13 2010/01/20 00:39:30 dyoung Exp $ +.\ $NetBSD: pmf.9,v 1.14 2010/01/20 07:27:21 wiz Exp $ .\ .\ Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 14, 2009 +.Dd January 20, 2010 .Dt PMF 9 .Os .Sh NAME
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed Jan 20 07:31:59 UTC 2010 Modified Files: src/doc: CHANGES Log Message: bpf - bpf(4) To generate a diff of this commit: cvs rdiff -u -r1.1347 -r1.1348 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1347 src/doc/CHANGES:1.1348 --- src/doc/CHANGES:1.1347 Tue Jan 19 22:58:44 2010 +++ src/doc/CHANGES Wed Jan 20 07:31:59 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1347 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1348 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -531,6 +531,6 @@ check_pkg_signatures to validate the installed packages against the vulnerabilities database and the expected checksums for their files. [jmmv 20100119] - bpf: Make bpf interface with an ops vector backed by stubs + bpf(4): Make bpf interface with an ops vector backed by stubs if bpf is not present in the kernel. The client linkage is now always the same. [pooka 20100119]
CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Wed Jan 20 07:33:25 UTC 2010 Modified Files: src/share/man/man5: security.conf.5 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/share/man/man5/security.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/security.conf.5 diff -u src/share/man/man5/security.conf.5:1.34 src/share/man/man5/security.conf.5:1.35 --- src/share/man/man5/security.conf.5:1.34 Tue Jan 19 22:08:52 2010 +++ src/share/man/man5/security.conf.5 Wed Jan 20 07:33:25 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.conf.5,v 1.34 2010/01/19 22:08:52 jmmv Exp $ +.\ $NetBSD: security.conf.5,v 1.35 2010/01/20 07:33:25 wiz Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -207,7 +207,7 @@ .Sy check_mtree phase to report errors for entries for these symbolic links (i.e. of type=link in the mtree specification) as they will always appear to be plain -files for the purposes of the check. +files for the purposes of the check. .Pa /etc/mtree/special.local may be used to override the checks for the affected links. .It Sy check_passwd_nowarn_shells
