CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Jan 25 09:33:29 UTC 2010 Modified Files: src/share/man/man4: acpidalb.4 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/acpidalb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpidalb.4 diff -u src/share/man/man4/acpidalb.4:1.2 src/share/man/man4/acpidalb.4:1.3 --- src/share/man/man4/acpidalb.4:1.2 Mon May 19 07:52:52 2008 +++ src/share/man/man4/acpidalb.4 Mon Jan 25 09:33:29 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: acpidalb.4,v 1.2 2008/05/19 07:52:52 wiz Exp $ +.\" $NetBSD: acpidalb.4,v 1.3 2010/01/25 09:33:29 jruoho Exp $ .\" .\" Copyright (c) 2008 Christoph Egger .\" All rights reserved. @@ -31,23 +31,33 @@ .Nm acpidalb .Nd Direct Application Launch Buttons .Sh SYNOPSIS -.Cd "acpidalb*at acpi?" +.Cd "acpidalb* at acpi?" .Sh DESCRIPTION -This driver provides support for PNP0C32 ACPI hotkeys aka +This driver provides support for +.Tn PNP0C32 +.Tn ACPI +hotkeys a.k.a. .Dq The Direct Application Launch Buttons . .Pp These are recognized on startup from system-wake or at runtime. Behaviour may differ from the standard specification in relation to the ACPI implementation. .Pp -The hotkeys are reported to the power daemon as +The hotkeys are reported to the power management daemon as .Dv hotkey_button . .Sh SEE ALSO .Xr acpi 4 , .Xr powerd 8 -.Sh STANDARDS -This drivers conforms to the PNP0C32 specification provided at -.Lk http://www.microsoft.com/whdc/system/vista/DirAppLaunch.mspx +.Pp +The +.Tn PNP0C32 +specification is described in: +.Rs +.%A Microsoft Corporation +.%D October 26, 2006 +.%T Direct Application Launch from System Startup on Windows Vista +.%U http://www.microsoft.com/whdc/system/vista/DirAppLaunch.mspx +.Re .Sh HISTORY The .Nm
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Jan 25 10:05:15 UTC 2010 Modified Files: src/share/man/man4: acpidalb.4 Log Message: Revert an accidental commit. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/acpidalb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpidalb.4 diff -u src/share/man/man4/acpidalb.4:1.3 src/share/man/man4/acpidalb.4:1.4 --- src/share/man/man4/acpidalb.4:1.3 Mon Jan 25 09:33:29 2010 +++ src/share/man/man4/acpidalb.4 Mon Jan 25 10:05:14 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: acpidalb.4,v 1.3 2010/01/25 09:33:29 jruoho Exp $ +.\" $NetBSD: acpidalb.4,v 1.4 2010/01/25 10:05:14 jruoho Exp $ .\" .\" Copyright (c) 2008 Christoph Egger .\" All rights reserved. @@ -31,33 +31,23 @@ .Nm acpidalb .Nd Direct Application Launch Buttons .Sh SYNOPSIS -.Cd "acpidalb* at acpi?" +.Cd "acpidalb*at acpi?" .Sh DESCRIPTION -This driver provides support for -.Tn PNP0C32 -.Tn ACPI -hotkeys a.k.a. +This driver provides support for PNP0C32 ACPI hotkeys aka .Dq The Direct Application Launch Buttons . .Pp These are recognized on startup from system-wake or at runtime. Behaviour may differ from the standard specification in relation to the ACPI implementation. .Pp -The hotkeys are reported to the power management daemon as +The hotkeys are reported to the power daemon as .Dv hotkey_button . .Sh SEE ALSO .Xr acpi 4 , .Xr powerd 8 -.Pp -The -.Tn PNP0C32 -specification is described in: -.Rs -.%A Microsoft Corporation -.%D October 26, 2006 -.%T Direct Application Launch from System Startup on Windows Vista -.%U http://www.microsoft.com/whdc/system/vista/DirAppLaunch.mspx -.Re +.Sh STANDARDS +This drivers conforms to the PNP0C32 specification provided at +.Lk http://www.microsoft.com/whdc/system/vista/DirAppLaunch.mspx .Sh HISTORY The .Nm
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Jan 25 10:12:41 UTC 2010 Modified Files: src/share/man/man4: acpidalb.4 Log Message: Recommit: * add verbosity to the PNP0C32 reference * use more markup * improve wording To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/acpidalb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpidalb.4 diff -u src/share/man/man4/acpidalb.4:1.4 src/share/man/man4/acpidalb.4:1.5 --- src/share/man/man4/acpidalb.4:1.4 Mon Jan 25 10:05:14 2010 +++ src/share/man/man4/acpidalb.4 Mon Jan 25 10:12:41 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: acpidalb.4,v 1.4 2010/01/25 10:05:14 jruoho Exp $ +.\" $NetBSD: acpidalb.4,v 1.5 2010/01/25 10:12:41 jruoho Exp $ .\" .\" Copyright (c) 2008 Christoph Egger .\" All rights reserved. @@ -31,23 +31,33 @@ .Nm acpidalb .Nd Direct Application Launch Buttons .Sh SYNOPSIS -.Cd "acpidalb*at acpi?" +.Cd "acpidalb* at acpi?" .Sh DESCRIPTION -This driver provides support for PNP0C32 ACPI hotkeys aka +This driver provides support for +.Tn PNP0C32 +.Tn ACPI +hotkeys a.k.a. .Dq The Direct Application Launch Buttons . .Pp These are recognized on startup from system-wake or at runtime. Behaviour may differ from the standard specification in relation to the ACPI implementation. .Pp -The hotkeys are reported to the power daemon as +The hotkeys are reported to the power management daemon as .Dv hotkey_button . .Sh SEE ALSO .Xr acpi 4 , .Xr powerd 8 -.Sh STANDARDS -This drivers conforms to the PNP0C32 specification provided at -.Lk http://www.microsoft.com/whdc/system/vista/DirAppLaunch.mspx +.Pp +The +.Tn PNP0C32 +specification is described in: +.Rs +.%A Microsoft Corporation +.%D October 26, 2006 +.%T Direct Application Launch from System Startup on Windows Vista +.%U http://www.microsoft.com/whdc/system/vista/DirAppLaunch.mspx +.Re .Sh HISTORY The .Nm
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jan 25 10:25:30 UTC 2010
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Back out part of my device property change: the mac-address part was already
done better in another place which I overlooked when merging local
changes.
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/dev/pci/if_bge.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/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.175 src/sys/dev/pci/if_bge.c:1.176
--- src/sys/dev/pci/if_bge.c:1.175 Sun Jan 24 23:27:39 2010
+++ src/sys/dev/pci/if_bge.c Mon Jan 25 10:25:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.175 2010/01/24 23:27:39 martin Exp $ */
+/* $NetBSD: if_bge.c,v 1.176 2010/01/25 10:25:30 martin Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.175 2010/01/24 23:27:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.176 2010/01/25 10:25:30 martin Exp $");
#include "vlan.h"
#include "rnd.h"
@@ -2365,7 +2365,6 @@
bus_addr_t memaddr;
bus_size_t memsize;
uint32_t pm_ctl;
- prop_data_t eaddrprop;
bool no_seeprom;
bp = bge_lookup(pa);
@@ -2636,17 +2635,8 @@
}
/*
- * Get station address from the EEPROM (or use firmware values
- * if provided via device properties)
+ * Get station address from the EEPROM
*/
- eaddrprop = prop_dictionary_get(device_properties(self), "mac-address");
-
- if (eaddrprop != NULL && prop_data_size(eaddrprop) == ETHER_ADDR_LEN) {
- memcpy(eaddr, prop_data_data_nocopy(eaddrprop),
- ETHER_ADDR_LEN);
- goto got_eaddr;
- }
-
if (bge_get_eaddr(sc, eaddr)) {
aprint_error_dev(sc->bge_dev,
"failed to read station address\n");
@@ -2654,7 +2644,6 @@
return;
}
-got_eaddr:
br = bge_lookup_rev(sc->bge_chipid);
if (br == NULL) {
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Jan 25 11:02:56 UTC 2010 Modified Files: src/share/man/man4: acpi.4 Log Message: Be more pedantic with the references; list also authors, dates, revisions, and titles. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/share/man/man4/acpi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.31 src/share/man/man4/acpi.4:1.32 --- src/share/man/man4/acpi.4:1.31 Fri Jan 15 19:24:49 2010 +++ src/share/man/man4/acpi.4 Mon Jan 25 11:02:56 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: acpi.4,v 1.31 2010/01/15 19:24:49 joerg Exp $ +.\" $NetBSD: acpi.4,v 1.32 2010/01/25 11:02:56 jruoho Exp $ .\" .\" Copyright (c) 2002, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -256,12 +256,24 @@ .Xr acpidump 8 , .Xr amldb 8 .Rs -.%T ACPI specification -.%U http://www.acpi.info/ +.%A Hewlett-Packard Corporation +.%A Intel Corporation +.%A Microsoft Corporation +.%A Phoenix Technologies Ltd. +.%A Toshiba Corporation +.%T Advanced Configuration and Power Interface Specification +.%N Revision 4.0 +.%D June 16, 2009 +.%U http://www.acpi.info/spec.htm .Re .Rs -.%T Intel ACPI CA (Component Architecture) -.%U http://developer.intel.com/technology/iapc/acpi/ +.%A Intel Corporation +.%T ACPI Component Architecture, +.%T Programmer Reference, +.%T OS-Independent Subsystem, Debugger, and Utilities +.%N Revision 1.27 +.%D January 20, 2010 +.%U http://www.acpica.org/download/acpica-reference.pdf .Re .Sh HISTORY The
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Jan 25 11:41:10 UTC 2010 Modified Files: src/share/man/man4: acpi.4 Log Message: Add some missing devices. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/man/man4/acpi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.32 src/share/man/man4/acpi.4:1.33 --- src/share/man/man4/acpi.4:1.32 Mon Jan 25 11:02:56 2010 +++ src/share/man/man4/acpi.4 Mon Jan 25 11:41:10 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: acpi.4,v 1.32 2010/01/25 11:02:56 jruoho Exp $ +.\" $NetBSD: acpi.4,v 1.33 2010/01/25 11:41:10 jruoho Exp $ .\" .\" Copyright (c) 2002, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -35,14 +35,18 @@ .Cd "acpiacad* at acpi?" .Cd "acpibat* at acpi?" .Cd "acpibut* at acpi?" +.Cd "acpidalb* at acpi?" .Cd "acpiec* at acpi?" +.Cd "acpiecdt* at acpi?" .Cd "acpilid* at acpi?" .Cd "acpitz* at acpi?" -.Cd "attimer* at acpi?" .Cd "aiboost* at acpi?" +.Cd "asus* at acpi?" +.Cd "attimer* at acpi?" .Cd "com* at acpi?" .Cd "fdc* at acpi?" .Cd "hpet* at acpi?" +.Cd "hpqlb*at acpi?" .Cd "joy* at acpi?" .Cd "lpt* at acpi?" .Cd "mpu* at acpi?" @@ -51,8 +55,10 @@ .Cd "pcppi*at acpi?" .Cd "sony* at acpi?" .Cd "spic* at acpi?" +.Cd "thinkpad* at acpi?" .Cd "ug* at acpi?" .Cd "vald* at acpi?" +.Cd "wb* at acpi?" .Cd "wss* at acpi?" .Cd "ym* at acpi?" .Pp @@ -181,25 +187,35 @@ .It acpibut .Tn ACPI power and sleep buttons. +.It acpidalb +.Tn ACPI +Direction Application Launch Buttons. .It acpiec .Tn ACPI Embedded Controllers. +.It acpiecdt +.Tn ACPI +Embedded Controller Boot Resource Table. .It acpilid .Tn ACPI lid switches. .It acpitz .Tn ACPI thermal zones. -.It attimer -AT Timer. .It aiboost ASUS AI Booster Hardware monitor. +.It asus +ASUS laptop hotkeys. +.It attimer +AT Timer. .It com NS8250-, NS16450-, and NS16550-based serial ports. .It fdc Floppy disk controllers. .It hpet High Precision Event Timer. +.It hpqlb +HP Quick Launch Buttons. .It joy Joystick/Game port interface. .It lpt @@ -208,8 +224,12 @@ Roland MPU-401 (compatible) MIDI UART. .It pcppi AT-style speaker sound. +.It thinkpad +IBM/Lenovo ThinkPad laptop device driver. .It ug Abit uGuru Hardware monitor. +.It wb +Winbond W83L518D Integrated Media Reader. .It wss Windows Sound System-compatible sound cards based on the AD1848 and compatible chips. .It ym @@ -232,6 +252,7 @@ .Xr acpiacad 4 , .Xr acpibat 4 , .Xr acpibut 4 , +.Xr acpidalb 4 , .Xr acpiec 4 , .Xr acpilid 4 , .Xr acpitz 4 , @@ -240,6 +261,7 @@ .Xr attimer 4 , .Xr com 4 , .Xr fdc 4 , +.Xr hpqlb 4 , .Xr joy 4 , .Xr lpt 4 , .Xr mpu 4 , @@ -249,8 +271,10 @@ .Xr pcppi 4 , .Xr sony 4 , .Xr spic 4 , +.Xr thinkpad 4 , .Xr ug 4 , .Xr vald 4 , +.Xr wb 4 , .Xr wss 4 , .Xr ym 4 , .Xr acpidump 8 ,
CVS commit: src/external/bsd/iscsi/dist/src/lib
Module Name:src
Committed By: yamt
Date: Mon Jan 25 13:45:16 UTC 2010
Modified Files:
src/external/bsd/iscsi/dist/src/lib: target.c
Log Message:
scsi_command_t: rather than putting cleanup code before every
return statememts, use goto to a single copy of the cleanup code.
no functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/external/bsd/iscsi/dist/src/lib/target.c:1.6
--- src/external/bsd/iscsi/dist/src/lib/target.c:1.5 Wed Jan 20 11:50:28 2010
+++ src/external/bsd/iscsi/dist/src/lib/target.c Mon Jan 25 13:45:16 2010
@@ -173,12 +173,16 @@
target_cmd_t cmd;
uint32_t DataSN = 0;
uint8_t rsp_header[ISCSI_HEADER_LEN];
+ struct iovec *sg_new = NULL;
+ int result;
(void) memset(&scsi_cmd, 0x0, sizeof(scsi_cmd));
+ scsi_cmd.ahs = NULL;
if (iscsi_scsi_cmd_decap(header, &scsi_cmd) != 0) {
iscsi_err(__FILE__, __LINE__,
"iscsi_scsi_cmd_decap() failed\n");
- return -1;
+ result = -1;
+ goto out;
}
iscsi_trace(TRACE_ISCSI_DEBUG,
"session %d: SCSI Command (CmdSN %u, op %#x)\n",
@@ -193,7 +197,8 @@
"CmdSN(%d) of SCSI Command not valid, "
"ExpCmdSN(%d) MaxCmdSN(%d). Ignoring the command\n",
scsi_cmd.CmdSN, sess->ExpCmdSN, sess->MaxCmdSN);
- return 0;
+ result = 0;
+ goto out;
}
/* Arg check. */
scsi_cmd.attr = 0; /* Temp fix FIXME */
@@ -227,7 +232,8 @@
"scsi_cmd.length (%u) > MaxRecvDataSegmentLength "
"(%u)\n",
scsi_cmd.length, sess->sess_params.max_dataseg_len);
- return -1;
+ result = -1;
+ goto out;
}
#if 0
@@ -247,26 +253,21 @@
uint8_t *ahs_ptr;
uint8_t ahs_type;
- scsi_cmd.ahs = NULL;
iscsi_trace(TRACE_ISCSI_DEBUG,
"reading %u bytes AHS\n", scsi_cmd.ahs_len);
scsi_cmd.ahs = iscsi_malloc_atomic((unsigned)scsi_cmd.ahs_len);
if (scsi_cmd.ahs == NULL) {
iscsi_err(__FILE__, __LINE__,
"iscsi_malloc_atomic() failed\n");
- return -1;
+ result = -1;
+ goto out;
}
-#define AHS_CLEANUP do { \
- if (scsi_cmd.ahs != NULL) { \
- iscsi_free_atomic(scsi_cmd.ahs); \
- }\
-} while (/* CONSTCOND */ 0)
if (iscsi_sock_msg(sess->sock, 0, (unsigned)scsi_cmd.ahs_len,
scsi_cmd.ahs, 0) != scsi_cmd.ahs_len) {
iscsi_err(__FILE__, __LINE__,
"iscsi_sock_msg() failed\n");
- AHS_CLEANUP;
- return -1;
+ result = -1;
+ goto out;
}
iscsi_trace(TRACE_ISCSI_DEBUG,
"read %u bytes AHS\n", scsi_cmd.ahs_len);
@@ -277,8 +278,8 @@
if (ahs_len == 0) {
iscsi_err(__FILE__, __LINE__,
"Zero ahs_len\n");
-AHS_CLEANUP;
-return -1;
+result = -1;
+goto out;
}
switch (ahs_type = *(ahs_ptr + 2)) {
case ISCSI_AHS_EXTENDED_CDB:
@@ -301,8 +302,8 @@
default:
iscsi_err(__FILE__, __LINE__,
"unknown AHS type %x\n", ahs_type);
-AHS_CLEANUP;
-return -1;
+result = -1;
+goto out;
}
}
iscsi_trace(TRACE_ISCSI_DEBUG,
@@ -328,24 +329,20 @@
if (device_command(sess, &cmd) != 0) {
iscsi_err(__FILE__, __LINE__,
"device_command() failed\n");
- AHS_CLEANUP;
- return -1;
+ result = -1;
+ goto out;
}
/* Send any input data */
scsi_cmd.bytes_sent = 0;
if (!scsi_cmd.status && scsi_cmd.input) {
struct iovecsg_singleton;
- struct iovec *sg, *sg_orig, *sg_new = NULL;
+ struct iovec *sg, *sg_orig;
int sg_len_orig, sg_len;
uint32_toffset, trans_len;
int fragment_flag = 0;
int offset_inc;
-#define SG_CLEANUP do { \
- if (fragment_flag) { \
- iscsi_free_atomic(sg_new);\
- }\
-} while (/* CONSTCOND */ 0)
+
if (scsi_cmd.output) {
iscsi_trace(TRACE_ISCSI_DEBUG,
"sending %u bytes bi-directional input data\n",
@@ -384,8 +381,8 @@
sg_new = iscsi_malloc_atomic(sizeof(struct iovec) * sg_len_orig);
if (sg_new == NULL) {
iscsi_err(__FILE__, __LINE__, "iscsi_malloc_atomic() failed\n");
- AHS_CLEANUP;
- return -1;
+ result = -1;
+ goto out;
}
fragment_flag++;
}
@@ -394,9 +391,8 @@
(void) memcpy(sg, sg_orig, sizeof(struct iovec) * sg_len_orig);
if (modify_iov(&sg, &sg_len, offset, data.length) != 0) {
iscsi_err(__FILE__, __LINE__, "modify_iov() failed\n");
- SG_CLEANUP;
- AHS_CLEANUP;
- return -1;
+ result = -1;
+ goto out;
}
}
iscsi_trace(TRACE_ISCSI_DEBUG, "sending read data PDU (offset %u, len %u)\n", offset, data.length);
@@ -413,9 +409,8 @@
}
} else if (offset + data.length > trans_len) {
iscsi_err(__FILE__, __LINE__, "offset+data.length > trans_len??\n");
-SG_CLEANUP;
-AHS_CLEANUP;
-return -1;
+result = -1;
+goto out;
}
data.task_tag =
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: mlelstv
Date: Mon Jan 25 14:51:03 UTC 2010
Modified Files:
src/sys/dev/dkwedge: dk.c dkwedge_gpt.c
Log Message:
GPTs are defined in terms of physical blocks.
- Fix reading of GPT for devices with non-512byte sectors
- Fix bounds check to use DEV_BSIZE units.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/dkwedge/dk.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/dkwedge/dkwedge_gpt.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.53 src/sys/dev/dkwedge/dk.c:1.54
--- src/sys/dev/dkwedge/dk.c:1.53 Sat Jan 23 18:31:04 2010
+++ src/sys/dev/dkwedge/dk.c Mon Jan 25 14:51:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.53 2010/01/23 18:31:04 bouyer Exp $ */
+/* $NetBSD: dk.c,v 1.54 2010/01/25 14:51:03 mlelstv Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.53 2010/01/23 18:31:04 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.54 2010/01/25 14:51:03 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -1098,6 +1098,7 @@
dkstrategy(struct buf *bp)
{
struct dkwedge_softc *sc = dkwedge_lookup(bp->b_dev);
+ uint64_t p_size, p_offset;
int s;
if (sc->sc_state != DKW_STATE_RUNNING) {
@@ -1109,12 +1110,15 @@
if (bp->b_bcount == 0)
goto done;
+ p_offset = sc->sc_offset << sc->sc_parent->dk_blkshift;
+ p_size = sc->sc_size << sc->sc_parent->dk_blkshift;
+
/* Make sure it's in-range. */
- if (bounds_check_with_mediasize(bp, DEV_BSIZE, sc->sc_size) <= 0)
+ if (bounds_check_with_mediasize(bp, DEV_BSIZE, p_size) <= 0)
goto done;
/* Translate it to the parent's raw LBA. */
- bp->b_rawblkno = bp->b_blkno + sc->sc_offset;
+ bp->b_rawblkno = bp->b_blkno + p_offset;
/* Place it in the queue and start I/O on the unit. */
s = splbio();
Index: src/sys/dev/dkwedge/dkwedge_gpt.c
diff -u src/sys/dev/dkwedge/dkwedge_gpt.c:1.10 src/sys/dev/dkwedge/dkwedge_gpt.c:1.11
--- src/sys/dev/dkwedge/dkwedge_gpt.c:1.10 Thu Oct 23 19:37:40 2008
+++ src/sys/dev/dkwedge/dkwedge_gpt.c Mon Jan 25 14:51:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_gpt.c,v 1.10 2008/10/23 19:37:40 jakllsch Exp $ */
+/* $NetBSD: dkwedge_gpt.c,v 1.11 2010/01/25 14:51:03 mlelstv Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.10 2008/10/23 19:37:40 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.11 2010/01/25 14:51:03 mlelstv Exp $");
#include
#include
@@ -130,6 +130,7 @@
static const char gpt_hdr_sig[] = GPT_HDR_SIG;
struct dkwedge_info dkw;
void *buf;
+ uint32_t secsize;
struct gpt_hdr *hdr;
struct gpt_ent *ent;
uint32_t entries, entsz;
@@ -138,7 +139,8 @@
int error;
u_int i;
- buf = malloc(DEV_BSIZE, M_DEVBUF, M_WAITOK);
+ secsize = DEV_BSIZE << pdk->dk_blkshift;
+ buf = malloc(secsize, M_DEVBUF, M_WAITOK);
/*
* Note: We don't bother with a Legacy or Protective MBR
@@ -147,7 +149,7 @@
*/
/* Read in the GPT Header. */
- error = dkwedge_read(pdk, vp, GPT_HDR_BLKNO, buf, DEV_BSIZE);
+ error = dkwedge_read(pdk, vp, GPT_HDR_BLKNO << pdk->dk_blkshift, buf, secsize);
if (error)
goto out;
hdr = buf;
@@ -163,7 +165,7 @@
error = ESRCH;
goto out;
}
- if (le32toh(hdr->hdr_size) > DEV_BSIZE) {
+ if (le32toh(hdr->hdr_size) > secsize) {
/* XXX Should check at end-of-disk. */
error = ESRCH;
goto out;
@@ -212,9 +214,9 @@
}
free(buf, M_DEVBUF);
- buf = malloc(roundup(entries * entsz, DEV_BSIZE), M_DEVBUF, M_WAITOK);
- error = dkwedge_read(pdk, vp, lba_table, buf,
- roundup(entries * entsz, DEV_BSIZE));
+ buf = malloc(roundup(entries * entsz, secsize), M_DEVBUF, M_WAITOK);
+ error = dkwedge_read(pdk, vp, lba_table << pdk->dk_blkshift, buf,
+ roundup(entries * entsz, secsize));
if (error) {
/* XXX Should check alternate location. */
aprint_error("%s: unable to read GPT partition array, "
CVS commit: src/sys/fs/msdosfs
Module Name:src
Committed By: mlelstv
Date: Mon Jan 25 15:30:44 UTC 2010
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
Log Message:
Fetch sector size also from wedges.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/fs/msdosfs/msdosfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.76 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.77
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.76 Mon Jun 29 05:08:17 2009
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Mon Jan 25 15:30:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.76 2009/06/29 05:08:17 dholland Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.77 2010/01/25 15:30:44 mlelstv Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.76 2009/06/29 05:08:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.77 2010/01/25 15:30:44 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -501,6 +501,7 @@
psize = dpart.part->p_size;
} else {
struct dkwedge_info dkw;
+ struct disk *pdk;
error = VOP_IOCTL(devvp, DIOCGWEDGEINFO, &dkw, FREAD, NOCRED);
secsize = 512; /* XXX */
dtype = DTYPE_FLOPPY; /* XXX */
@@ -513,6 +514,12 @@
goto error_exit;
}
} else {
+ pdk = disk_find(dkw.dkw_parent);
+ if (pdk == NULL) {
+error = ENODEV;
+goto error_exit;
+ }
+ secsize = DEV_BSIZE << pdk->dk_blkshift;
fstype = strcmp(dkw.dkw_ptype, DKW_PTYPE_FAT) == 0 ?
FS_MSDOS : -1;
psize = dkw.dkw_size;
CVS commit: src/usr.sbin/puffs
Module Name:src
Committed By: pooka
Date: Mon Jan 25 15:55:37 UTC 2010
Modified Files:
src/usr.sbin/puffs: Makefile.inc
src/usr.sbin/puffs/rump_cd9660: Makefile
src/usr.sbin/puffs/rump_efs: Makefile
src/usr.sbin/puffs/rump_ext2fs: Makefile
src/usr.sbin/puffs/rump_ffs: Makefile
src/usr.sbin/puffs/rump_hfs: Makefile
src/usr.sbin/puffs/rump_lfs: Makefile
src/usr.sbin/puffs/rump_msdos: Makefile
src/usr.sbin/puffs/rump_ntfs: Makefile
src/usr.sbin/puffs/rump_udf: Makefile
Log Message:
Define concept "disk based file system" and flag appropriate file
systems as such.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/puffs/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_cd9660/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_efs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/puffs/rump_ext2fs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/rump_ffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_hfs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/puffs/rump_lfs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_msdos/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_ntfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_udf/Makefile
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/puffs/Makefile.inc
diff -u src/usr.sbin/puffs/Makefile.inc:1.12 src/usr.sbin/puffs/Makefile.inc:1.13
--- src/usr.sbin/puffs/Makefile.inc:1.12 Thu Nov 5 11:41:43 2009
+++ src/usr.sbin/puffs/Makefile.inc Mon Jan 25 15:55:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2009/11/05 11:41:43 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.13 2010/01/25 15:55:36 pooka Exp $
WARNS?= 4
@@ -38,6 +38,11 @@
.PATH: ${MOUNT} ${MOUNTDIR}/mount_${MOUNTNAME}
.endif # MOUNTNAME
+# disk components for disk-based file systems
+.if RUMP_DISKFS
+LDADD+= -lrumpdev_disk -lrumpdev
+.endif
+
LDADD+= -lp2k -lukfs -lrumpvfs -lrump -lrumpuser -lpuffs -lutil
LDADD+= -lpthread
Index: src/usr.sbin/puffs/rump_cd9660/Makefile
diff -u src/usr.sbin/puffs/rump_cd9660/Makefile:1.2 src/usr.sbin/puffs/rump_cd9660/Makefile:1.3
--- src/usr.sbin/puffs/rump_cd9660/Makefile:1.2 Tue Aug 5 20:57:45 2008
+++ src/usr.sbin/puffs/rump_cd9660/Makefile Mon Jan 25 15:55:36 2010
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/08/05 20:57:45 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/25 15:55:36 pooka Exp $
#
MOUNTNAME= cd9660
ISRUMP= # yes
+RUMP_DISKFS=
.include
Index: src/usr.sbin/puffs/rump_efs/Makefile
diff -u src/usr.sbin/puffs/rump_efs/Makefile:1.2 src/usr.sbin/puffs/rump_efs/Makefile:1.3
--- src/usr.sbin/puffs/rump_efs/Makefile:1.2 Tue Aug 5 20:57:45 2008
+++ src/usr.sbin/puffs/rump_efs/Makefile Mon Jan 25 15:55:36 2010
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/08/05 20:57:45 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/25 15:55:36 pooka Exp $
#
MOUNTNAME= efs
ISRUMP= # gracie, padre
+RUMP_DISKFS=
.include
Index: src/usr.sbin/puffs/rump_ext2fs/Makefile
diff -u src/usr.sbin/puffs/rump_ext2fs/Makefile:1.5 src/usr.sbin/puffs/rump_ext2fs/Makefile:1.6
--- src/usr.sbin/puffs/rump_ext2fs/Makefile:1.5 Sat May 2 01:15:53 2009
+++ src/usr.sbin/puffs/rump_ext2fs/Makefile Mon Jan 25 15:55:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/02 01:15:53 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/25 15:55:36 pooka Exp $
#
.include
@@ -9,5 +9,6 @@
DPADD+= ${LIBRUMPFS_FFS}
ISRUMP= # yea baby
+RUMP_DISKFS=
.include
Index: src/usr.sbin/puffs/rump_ffs/Makefile
diff -u src/usr.sbin/puffs/rump_ffs/Makefile:1.4 src/usr.sbin/puffs/rump_ffs/Makefile:1.5
--- src/usr.sbin/puffs/rump_ffs/Makefile:1.4 Sat May 2 01:15:53 2009
+++ src/usr.sbin/puffs/rump_ffs/Makefile Mon Jan 25 15:55:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/02 01:15:53 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/25 15:55:36 pooka Exp $
#
.include
@@ -6,5 +6,6 @@
MOUNTNAME= ffs
ISRUMP= # affirmative
+RUMP_DISKFS=
.include
Index: src/usr.sbin/puffs/rump_hfs/Makefile
diff -u src/usr.sbin/puffs/rump_hfs/Makefile:1.3 src/usr.sbin/puffs/rump_hfs/Makefile:1.4
--- src/usr.sbin/puffs/rump_hfs/Makefile:1.3 Thu Dec 3 14:26:44 2009
+++ src/usr.sbin/puffs/rump_hfs/Makefile Mon Jan 25 15:55:36 2010
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/12/03 14:26:44 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/25 15:55:36 pooka Exp $
#
MOUNTNAME= hfs
ISRUMP= # rump roast
+RUMP_DISKFS=
.include
Index: src/usr.sbin/puffs/rump_lfs/Makefile
diff -u src/usr.sbin/puffs/rump_lfs/Makefile:1.7 src/usr.sbin/puffs/rump_lfs/Makefile:1.8
--- src/usr.sbin/puffs/rump_lfs/Makefile:1.7 Thu Nov 5 14:17:07 2009
+++ src/usr.sbin/puffs/rump_lfs/Makefile Mon Jan 25 15:55:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/11/05 14:17:07 pooka Exp $
+# $NetBSD: Makefi
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Mon Jan 25 16:16:34 UTC 2010 Modified Files: src/share/man/man9: Makefile Added Files: src/share/man/man9: sysmon_taskq.9 Log Message: Add a simple manual page for the simple sysmon task queue. ok wiz@ To generate a diff of this commit: cvs rdiff -u -r1.310 -r1.311 src/share/man/man9/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/sysmon_taskq.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/Makefile diff -u src/share/man/man9/Makefile:1.310 src/share/man/man9/Makefile:1.311 --- src/share/man/man9/Makefile:1.310 Mon Jan 25 07:51:17 2010 +++ src/share/man/man9/Makefile Mon Jan 25 16:16:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.310 2010/01/25 07:51:17 jruoho Exp $ +# $NetBSD: Makefile,v 1.311 2010/01/25 16:16:33 jruoho Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -48,8 +48,9 @@ secmodel_suser.9 setjmp.9 shutdownhook_establish.9 \ signal.9 sockopt.9 softintr.9 spl.9 splraiseipl.9 \ store.9 suspendsched.9 \ - sysctl.9 sysmon_envsys.9 tc.9 tcp_congctl.9 timecounter.9 \ - time_second.9 todr.9 tvtohz.9 uiomove.9 ucom.9 userret.9 \ + sysctl.9 sysmon_envsys.9 sysmon_taskq.9 tc.9 tcp_congctl.9 \ + timecounter.9 time_second.9 todr.9 tvtohz.9 \ + uiomove.9 ucom.9 userret.9 \ vattr.9 veriexec.9 vcons.9 vfs.9 vfs_hooks.9 vfsops.9 vfssubr.9 \ video.9 vme.9 \ vnfileops.9 vnode.9 vnodeops.9 vnsubr.9 \ @@ -658,6 +659,7 @@ sysmon_envsys.9 sysmon_envsys_unregister.9 \ sysmon_envsys.9 sysmon_envsys_sensor_attach.9 \ sysmon_envsys.9 sysmon_envsys_sensor_detach.9 +MLINKS+=sysmon_taskq.9 sysmon_task_queue_sched.9 MLINKS+=time_second.9 boottime.9 time_second.9 time_uptime.9 MLINKS+=timecounter.9 tc_init.9 MLINKS+=tc.9 tc_intr_establish.9 \ Added files: Index: src/share/man/man9/sysmon_taskq.9 diff -u /dev/null src/share/man/man9/sysmon_taskq.9:1.1 --- /dev/null Mon Jan 25 16:16:34 2010 +++ src/share/man/man9/sysmon_taskq.9 Mon Jan 25 16:16:33 2010 @@ -0,0 +1,65 @@ +.\" $NetBSD: sysmon_taskq.9,v 1.1 2010/01/25 16:16:33 jruoho Exp $ +.\" +.\" Copyright (c) 2010 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Jukka Ruohonen. +.\" +.\" 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. +.\" +.Dd January 24, 2010 +.Dt SYSMON_TASKQ 9 +.Os +.Sh NAME +.Nm sysmon_taskq +.Nd simple general purpose task queue +.Sh SYNOPSIS +.In dev/sysmon/sysmon_taskq.h +.Ft int +.Fn sysmon_task_queue_sched "u_int pri" "void (*func)(void *)" "void *arg" +.Sh DESCRIPTION +The machine-independent +.Nm +provides a simple general purpose task queue. +It can be used to run callbacks that require thread context, +but do not warrant the use of a more fine-grained solution. +.Pp +The +.Fn sysmon_task_queue_sched +enqueues +.Fa func +to be executed at the priority +.Fa pri . +If +.Fa pri +is 0, the scheduled function will be placed as the last element in the queue. +The single argument passed to +.Fa func +is specified by +.Fa arg . +.Sh SEE ALSO +.Xr queue 3 , +.Xr kthread 9 , +.Xr workqueue 9 +.Sh AUTHORS +.An Jason R. Thorpe Aq thor...@netbsd.org
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Jan 25 16:17:10 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add sysmon_taskq(9). To generate a diff of this commit: cvs rdiff -u -r1.1375 -r1.1376 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.1375 src/distrib/sets/lists/comp/mi:1.1376 --- src/distrib/sets/lists/comp/mi:1.1375 Mon Jan 25 07:57:05 2010 +++ src/distrib/sets/lists/comp/mi Mon Jan 25 16:17:10 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1375 2010/01/25 07:57:05 jruoho Exp $ +# $NetBSD: mi,v 1.1376 2010/01/25 16:17:10 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -9376,6 +9376,8 @@ ./usr/share/man/cat9/sysmon_envsys_sensor_attach.0 comp-sys-catman .cat ./usr/share/man/cat9/sysmon_envsys_sensor_detach.0 comp-sys-catman .cat ./usr/share/man/cat9/sysmon_envsys_unregister.0 comp-sys-catman .cat +./usr/share/man/cat9/sysmon_taskq.0 comp-sys-catman .cat +./usr/share/man/cat9/sysmon_task_queue_sched.0 comp-sys-catman .cat ./usr/share/man/cat9/tc.0 comp-sys-catman .cat ./usr/share/man/cat9/tc_badaddr.0 comp-sys-catman .cat ./usr/share/man/cat9/tc_init.0 comp-sys-catman .cat @@ -14899,6 +14901,8 @@ ./usr/share/man/html9/sysmon_envsys_sensor_attach.html comp-sys-htmlan html ./usr/share/man/html9/sysmon_envsys_sensor_detach.html comp-sys-htmlman html ./usr/share/man/html9/sysmon_envsys_unregister.html comp-sys-htmlman html +./usr/share/man/html9/sysmon_taskq.html comp-sys-htmlman html +./usr/share/man/html9/sysmon_task_queue_sched.html comp-sys-htmlman html ./usr/share/man/html9/tc.html comp-sys-htmlman html ./usr/share/man/html9/tc_badaddr.html comp-sys-htmlman html ./usr/share/man/html9/tc_init.html comp-sys-htmlman html @@ -20629,6 +20633,8 @@ ./usr/share/man/man9/sysmon_envsys_sensor_attach.9 comp-sys-man .man ./usr/share/man/man9/sysmon_envsys_sensor_detach.9 comp-sys-man .man ./usr/share/man/man9/sysmon_envsys_unregister.9 comp-sys-man .man +./usr/share/man/man9/sysmon_taskq.9 comp-sys-man .man +./usr/share/man/man9/sysmon_task_queue_sched.9 comp-sys-man .man ./usr/share/man/man9/tc.9 comp-sys-man .man ./usr/share/man/man9/tc_badaddr.9 comp-sys-man .man ./usr/share/man/man9/tc_init.9 comp-sys-man .man
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Jan 25 17:21:33 UTC 2010 Modified Files: src/share/man/man4: acpi.4 Log Message: Add the paper/presentation of Joerg and Jared to the list of references. (Probably better reading than any of the specifications, with also some historical value to NetBSD.) To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/share/man/man4/acpi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.33 src/share/man/man4/acpi.4:1.34 --- src/share/man/man4/acpi.4:1.33 Mon Jan 25 11:41:10 2010 +++ src/share/man/man4/acpi.4 Mon Jan 25 17:21:32 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: acpi.4,v 1.33 2010/01/25 11:41:10 jruoho Exp $ +.\" $NetBSD: acpi.4,v 1.34 2010/01/25 17:21:32 jruoho Exp $ .\" .\" Copyright (c) 2002, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -299,6 +299,14 @@ .%D January 20, 2010 .%U http://www.acpica.org/download/acpica-reference.pdf .Re +.Rs +.%A Joerg Sonnenberger +.%A Jared D. McNeill +.%T Sleeping Beauty - NetBSD on Modern Laptops +.%D February 3, 2008 +.%O Proceedings of AsiaBSDCon 2008 +.%P pp. 127-134 +.Re .Sh HISTORY The .Nm
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Mon Jan 25 17:27:41 UTC 2010 Modified Files: src/share/man/man9: mutex.9 Log Message: Remove two consecutive commas in the SEE ALSO section. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man9/mutex.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/mutex.9 diff -u src/share/man/man9/mutex.9:1.20 src/share/man/man9/mutex.9:1.21 --- src/share/man/man9/mutex.9:1.20 Sun Nov 22 18:40:26 2009 +++ src/share/man/man9/mutex.9 Mon Jan 25 17:27:41 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: mutex.9,v 1.20 2009/11/22 18:40:26 mbalmer Exp $ +.\" $NetBSD: mutex.9,v 1.21 2010/01/25 17:27:41 jruoho Exp $ .\" .\" Copyright (c) 2007, 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -257,7 +257,7 @@ .Rs .%A Jim Mauro .%A Richard McDougall -.%T Solaris Internals: Core Kernel Architecture , +.%T Solaris Internals: Core Kernel Architecture .%I Prentice Hall .%D 2001 .%O ISBN 0-13-022496-0
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Mon Jan 25 18:25:08 UTC 2010 Modified Files: src/share/man/man9: sysmon_taskq.9 Log Message: Add a RETURN VALUES section. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/sysmon_taskq.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/sysmon_taskq.9 diff -u src/share/man/man9/sysmon_taskq.9:1.1 src/share/man/man9/sysmon_taskq.9:1.2 --- src/share/man/man9/sysmon_taskq.9:1.1 Mon Jan 25 16:16:33 2010 +++ src/share/man/man9/sysmon_taskq.9 Mon Jan 25 18:25:08 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysmon_taskq.9,v 1.1 2010/01/25 16:16:33 jruoho Exp $ +.\" $NetBSD: sysmon_taskq.9,v 1.2 2010/01/25 18:25:08 jruoho Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -57,6 +57,17 @@ .Fa func is specified by .Fa arg . +.Sh RETURN VALUES +Upon successful completion, +.Fn sysmon_task_queue_sched +returns 0. +Otherwise, the following error values are returned: +.Bl -tag -width [EINVAL] +.It Bq Er EINVAL +An invalid parameter was specified. +.It Bq Er ENOMEM +There was not enough memory. +.El .Sh SEE ALSO .Xr queue 3 , .Xr kthread 9 ,
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Mon Jan 25 18:37:51 UTC 2010 Modified Files: src/sys/rump/librump/rumpkern: scheduler.c Log Message: Set attached cpus as running, otherwise (evil) state-probing code will not execute properly. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpkern/scheduler.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/scheduler.c diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.8 src/sys/rump/librump/rumpkern/scheduler.c:1.9 --- src/sys/rump/librump/rumpkern/scheduler.c:1.8 Tue Dec 1 09:50:51 2009 +++ src/sys/rump/librump/rumpkern/scheduler.c Mon Jan 25 18:37:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: scheduler.c,v 1.8 2009/12/01 09:50:51 pooka Exp $ */ +/* $NetBSD: scheduler.c,v 1.9 2010/01/25 18:37:51 pooka Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.8 2009/12/01 09:50:51 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.9 2010/01/25 18:37:51 pooka Exp $"); #include #include @@ -87,6 +87,7 @@ rump_cpu_bootstrap(ci); ci->ci_schedstate.spc_mutex = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE); + ci->ci_schedstate.spc_flags = SPCF_RUNNING; rcpu->rcpu_ci = ci; LIST_INSERT_HEAD(&cpu_freelist, rcpu, rcpu_entries); rcpu->rcpu_flags = RCPU_FREELIST;
CVS commit: src/tests/rump/rumpkern
Module Name:src
Committed By: pooka
Date: Mon Jan 25 19:27:25 UTC 2010
Modified Files:
src/tests/rump/rumpkern: Makefile
Log Message:
msdosfs depends on disk devices now
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/rump/rumpkern/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.5 src/tests/rump/rumpkern/Makefile:1.6
--- src/tests/rump/rumpkern/Makefile:1.5 Sat Nov 28 22:20:38 2009
+++ src/tests/rump/rumpkern/Makefile Mon Jan 25 19:27:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/11/28 22:20:38 he Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/25 19:27:24 pooka Exp $
.include
@@ -8,7 +8,8 @@
TESTS_C+= t_modlinkset
ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lpthread
-LDADD.t_modlinkset+= -lukfs -lrumpfs_cd9660 -lrumpfs_msdos ${ADD_TO_LD}
+LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos
+LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD}
LDADD+= ${ADD_TO_LD}
WARNS= 4
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Mon Jan 25 19:34:37 UTC 2010 Modified Files: src/share/man/man9: dmover.9 Log Message: Do not list complete prototypes in the sections describing the functions. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/dmover.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/dmover.9 diff -u src/share/man/man9/dmover.9:1.13 src/share/man/man9/dmover.9:1.14 --- src/share/man/man9/dmover.9:1.13 Mon May 4 19:41:09 2009 +++ src/share/man/man9/dmover.9 Mon Jan 25 19:34:37 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: dmover.9,v 1.13 2009/05/04 19:41:09 wiz Exp $ +.\" $NetBSD: dmover.9,v 1.14 2010/01/25 19:34:37 jruoho Exp $ .\" .\" Copyright (c) 2002 Wasabi Systems, Inc. .\" All rights reserved. @@ -263,8 +263,7 @@ .Ss CLIENT INTERFACE The following functions are provided to the client: .Bl -tag -width "" -.It int Fn dmover_session_create "const char *function" \ -"struct dmover_session **sessionp" +.It Fn dmover_session_create "function" "sessionp" .Pp The .Fn dmover_session_create @@ -272,7 +271,7 @@ function .Fa function . A handle to the new session is returned in -.Fa *sessionp . +.Fa sessionp . .Pp The following are valid data movement function names: .Bl -tag -width "fill8xx" @@ -350,14 +349,13 @@ .Dq xor8 .Pq Va dmover_funcname_xor8 .El -.It void Fn dmover_session_destroy "struct dmover_session *session" +.It Fn dmover_session_destroy "session" .Pp The .Fn dmover_session_destroy function tears down a data mover session and releases all resources associated with it. -.It struct dmover_request * Fn dmover_request_alloc \ -"struct dmover_session *session" "dmover_buffer *inbuf" +.It Fn dmover_request_alloc "session" "inbuf" .Pp The .Fn dmover_request_alloc @@ -385,7 +383,7 @@ return .Dv NULL to indicate failure. -.It void Fn dmover_request_free "struct dmover_request *req" +.It Fn dmover_request_free "req" .Pp The .Fn dmover_request_free @@ -400,7 +398,7 @@ were allocated by .Fn dmover_request_alloc , then the input buffer descriptors will also be freed. -.It void Fn dmover_process "struct dmover_request *req" +.It Fn dmover_process "req" .Pp The .Fn dmover_process @@ -520,7 +518,7 @@ .Pp The following functions are provided to the back-ends: .Bl -tag -width "" -.It void Fn dmover_backend_register "struct dmover_backend *backend" +.It Fn dmover_backend_register "backend" .Pp The .Fn dmover_backend_register @@ -529,7 +527,7 @@ with the .Nm dmover facility. -.It void Fn dmover_backend_unregister "struct dmover_backend *backend" +.It Fn dmover_backend_unregister "backend" .Pp The .Fn dmover_backend_unregister @@ -539,7 +537,7 @@ .Nm dmover facility. The back-end must already be registered. -.It void Fn dmover_done "struct dmover_request *req" +.It Fn dmover_done "req" .Pp The .Fn dmover_done
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Mon Jan 25 19:58:46 UTC 2010 Modified Files: src/share/man/man9: ethersubr.9 Log Message: Add the names of the parameters to the section describing the functions. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/ethersubr.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/ethersubr.9 diff -u src/share/man/man9/ethersubr.9:1.19 src/share/man/man9/ethersubr.9:1.20 --- src/share/man/man9/ethersubr.9:1.19 Mon Mar 9 17:17:02 2009 +++ src/share/man/man9/ethersubr.9 Mon Jan 25 19:58:46 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: ethersubr.9,v 1.19 2009/03/09 17:17:02 joerg Exp $ +.\" $NetBSD: ethersubr.9,v 1.20 2010/01/25 19:58:46 jruoho Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -84,7 +84,7 @@ .Xr arp 9 stuff to support IPv4 on your hardware. .Bl -tag -width compact -.It Fn ether_ifattach +.It Fn ether_ifattach "ifp" "lla" Perform the device-independent, but Ethernet-specific initialization of the interface pointed to by .Fa ifp . @@ -96,10 +96,10 @@ there. .Pp You must call this function from the driver's attach function. -.It Fn fddi_ifattach +.It Fn fddi_ifattach "ifp" "lla" corresponding function for FDDI devices. -.It Fn ether_addmulti -.It Fn ether_delmulti +.It Fn ether_addmulti "sa" "ec" +.It Fn ether_delmulti "sa" "ec" Add .Pq Fn ether_addmulti or delete @@ -145,15 +145,15 @@ .Er ENXIO if the specified address can't be found in the list of multicast addresses. -.It Fn fddi_addmulti -.It Fn fddi_delmulti +.It Fn fddi_addmulti "sa" "ec" +.It Fn fddi_delmulti "sa" "ec" corresponding functions for FDDI devices. -.It Fn ETHER_NEXT_MULTI +.It Fn ETHER_NEXT_MULTI "step" "enm" is a macro to step through all of the ether_multi records, one at a time. The current position is remembered in .Fa step , which the caller must provide. -.It Fn ETHER_FIRST_MULTI +.It Fn ETHER_FIRST_MULTI "step" "ec" "enm" must be called to initialize .Fa step and get the first record. @@ -161,7 +161,7 @@ .Dv NULL .Fa enm when there are no remaining records. -.It Fn ETHER_IS_MULTICAST +.It Fn ETHER_IS_MULTICAST "addr" returns 1, if .Fa addr points to an Ethernet/FDDI multicast (or broadcast) address.
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Mon Jan 25 20:09:15 UTC 2010 Modified Files: src/share/man/man9: ethersubr.9 Log Message: Improve wording. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man9/ethersubr.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/ethersubr.9 diff -u src/share/man/man9/ethersubr.9:1.20 src/share/man/man9/ethersubr.9:1.21 --- src/share/man/man9/ethersubr.9:1.20 Mon Jan 25 19:58:46 2010 +++ src/share/man/man9/ethersubr.9 Mon Jan 25 20:09:15 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: ethersubr.9,v 1.20 2010/01/25 19:58:46 jruoho Exp $ +.\" $NetBSD: ethersubr.9,v 1.21 2010/01/25 20:09:15 jruoho Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -95,9 +95,9 @@ .Fa lla there. .Pp -You must call this function from the driver's attach function. +This function must be called from the driver's attach function. .It Fn fddi_ifattach "ifp" "lla" -corresponding function for FDDI devices. +Corresponding function for FDDI devices. .It Fn ether_addmulti "sa" "ec" .It Fn ether_delmulti "sa" "ec" Add @@ -115,7 +115,7 @@ and .Dv SIOCDELMULTI requests. -If they return +If these return .Er ENETRESET , the hardware multicast filter must be reinitialized. .Pp @@ -129,6 +129,7 @@ is mapped to a range describing all the Ethernet address space reserved for IPv4 multicast addresses. .Pp +The .Fn ether_addmulti returns .Er EAFNOSUPPORT @@ -140,6 +141,7 @@ the multicast list really changed and the driver should synchronize its hardware filter with it. .Pp +The .Fn ether_delmulti returns, in addition to the above errors, .Er ENXIO @@ -147,14 +149,16 @@ can't be found in the list of multicast addresses. .It Fn fddi_addmulti "sa" "ec" .It Fn fddi_delmulti "sa" "ec" -corresponding functions for FDDI devices. +Corresponding functions for FDDI devices. .It Fn ETHER_NEXT_MULTI "step" "enm" -is a macro to step through all of the ether_multi records, one at a time. +A macro to step through all of the +.Em ether_multi +records, one at a time. The current position is remembered in .Fa step , which the caller must provide. .It Fn ETHER_FIRST_MULTI "step" "ec" "enm" -must be called to initialize +A macro that must be called to initialize .Fa step and get the first record. Both macros return a @@ -162,10 +166,9 @@ .Fa enm when there are no remaining records. .It Fn ETHER_IS_MULTICAST "addr" -returns 1, if +A macro that returns 1, if .Fa addr points to an Ethernet/FDDI multicast (or broadcast) address. -Implemented as a macro. .El .Sh SEE ALSO .Xr arp 9
CVS commit: src/dist/dhcp/dst
Module Name:src
Committed By: drochner
Date: Mon Jan 25 20:33:57 UTC 2010
Modified Files:
src/dist/dhcp/dst: dst_api.c prandom.c
Log Message:
fix some cases where the EREPORT macro defined to null (as in the NetBSD
build) could change the behaviour of the code in unexpected ways
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/dist/dhcp/dst/dst_api.c
cvs rdiff -u -r1.4 -r1.5 src/dist/dhcp/dst/prandom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/dhcp/dst/dst_api.c
diff -u src/dist/dhcp/dst/dst_api.c:1.5 src/dist/dhcp/dst/dst_api.c:1.6
--- src/dist/dhcp/dst/dst_api.c:1.5 Thu Aug 11 17:13:21 2005
+++ src/dist/dhcp/dst/dst_api.c Mon Jan 25 20:33:57 2010
@@ -1,5 +1,5 @@
#ifndef LINT
-static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/dst_api.c,v 1.5 2005/08/11 17:13:21 drochner Exp $";
+static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/dst_api.c,v 1.6 2010/01/25 20:33:57 drochner Exp $";
#endif
/*
@@ -684,9 +684,10 @@
if (key_st->dk_func->from_dns_key(key_st, &rdata[start],
len - start) > 0)
return (key_st);
- } else
+ } else {
EREPORT(("dst_dnskey_to_public_key(): unsuppored alg %d\n",
alg));
+ }
SAFE_FREE(key_st);
return (key_st);
@@ -745,9 +746,10 @@
return (enc_len + loc);
else
return (-1);
- } else
+ } else {
EREPORT(("dst_key_to_dnskey(): Unsupported ALG %d\n",
key->dk_alg));
+ }
return (-1);
}
@@ -877,10 +879,11 @@
EREPORT(("dst_s_read_private_key_file(): Unknown keyfile %d.%d version for %s\n",
file_major, file_minor, name));
goto fail;
- } else if (file_major > major || file_minor > minor)
+ } else if (file_major > major || file_minor > minor) {
EREPORT((
"dst_s_read_private_key_file(): Keyfile %s version higher than mine %d.%d MAY FAIL\n",
name, file_major, file_minor));
+ }
while (*p++ != '\n') ; /* skip to end of line */
Index: src/dist/dhcp/dst/prandom.c
diff -u src/dist/dhcp/dst/prandom.c:1.4 src/dist/dhcp/dst/prandom.c:1.5
--- src/dist/dhcp/dst/prandom.c:1.4 Thu Aug 11 17:13:21 2005
+++ src/dist/dhcp/dst/prandom.c Mon Jan 25 20:33:57 2010
@@ -1,5 +1,5 @@
#ifndef LINT
-static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/prandom.c,v 1.4 2005/08/11 17:13:21 drochner Exp $";
+static const char rcsid[] = "$Header: /cvsroot/src/dist/dhcp/dst/prandom.c,v 1.5 2010/01/25 20:33:57 drochner Exp $";
#endif
/*
* Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -850,8 +850,9 @@
i = dst_sign_data(SIG_MODE_ALL, my_key, NULL,
(u_char *) counter, hb_size,
semi_old, sizeof(semi_old));
- if (i != hb_size)
+ if (i != hb_size) {
EREPORT(("HMAC SIGNATURE FAILURE %d\n", i));
+ }
cnt++;
if (size - out < i) /* Not all data is needed */
semi_loc = i = size - out;
CVS commit: src/sys/net
Module Name:src
Committed By: pooka
Date: Mon Jan 25 22:18:17 UTC 2010
Modified Files:
src/sys/net: bpf.c bpf.h bpf_stub.c
Log Message:
Make bpf dynamically loadable.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/net/bpf.c
cvs rdiff -u -r1.52 -r1.53 src/sys/net/bpf.h
cvs rdiff -u -r1.3 -r1.4 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.c
diff -u src/sys/net/bpf.c:1.153 src/sys/net/bpf.c:1.154
--- src/sys/net/bpf.c:1.153 Tue Jan 19 22:08:00 2010
+++ src/sys/net/bpf.c Mon Jan 25 22:18:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.153 2010/01/19 22:08:00 pooka Exp $ */
+/* $NetBSD: bpf.c,v 1.154 2010/01/25 22:18:17 pooka Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.153 2010/01/19 22:08:00 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.154 2010/01/25 22:18:17 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -58,6 +58,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -359,13 +361,8 @@
d->bd_bif = 0;
}
-
-/*
- * bpfilterattach() is called at boot time.
- */
-/* ARGSUSED */
-void
-bpfilterattach(int n)
+static int
+doinit(void)
{
mutex_init(&bpf_mtx, MUTEX_DEFAULT, IPL_NONE);
@@ -375,6 +372,20 @@
bpf_gstats.bs_recv = 0;
bpf_gstats.bs_drop = 0;
bpf_gstats.bs_capt = 0;
+
+ return 0;
+}
+
+/*
+ * bpfilterattach() is called at boot time.
+ */
+/* ARGSUSED */
+void
+bpfilterattach(int n)
+{
+ static ONCE_DECL(control);
+
+ RUN_ONCE(&control, doinit);
}
/*
@@ -1910,9 +1921,43 @@
.bpf_mtap_sl_out = bpf_mtap_sl_out,
};
-void
-bpf_setops()
+MODULE(MODULE_CLASS_DRIVER, bpf, NULL);
+
+static int
+bpf_modcmd(modcmd_t cmd, void *arg)
{
+ devmajor_t bmajor, cmajor;
+ int error;
+
+ bmajor = cmajor = NODEVMAJOR;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ bpfilterattach(0);
+ error = devsw_attach("bpf", NULL, &bmajor,
+ &bpf_cdevsw, &cmajor);
+ if (error == EEXIST)
+ error = 0; /* maybe built-in ... improve eventually */
+ if (error)
+ break;
+
+ bpf_ops_handover_enter(&bpf_ops_kernel);
+ atomic_swap_ptr(&bpf_ops, &bpf_ops_kernel);
+ bpf_ops_handover_exit();
+ break;
+
+ case MODULE_CMD_FINI:
+ /*
+ * bpf_ops is not (yet) referenced in the callers before
+ * attach. maybe other issues too. "safety first".
+ */
+ error = EOPNOTSUPP;
+ break;
- bpf_ops = &bpf_ops_kernel;
+ default:
+ error = ENOTTY;
+ break;
+ }
+
+ return error;
}
Index: src/sys/net/bpf.h
diff -u src/sys/net/bpf.h:1.52 src/sys/net/bpf.h:1.53
--- src/sys/net/bpf.h:1.52 Tue Jan 19 22:08:00 2010
+++ src/sys/net/bpf.h Mon Jan 25 22:18:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.h,v 1.52 2010/01/19 22:08:00 pooka Exp $ */
+/* $NetBSD: bpf.h,v 1.53 2010/01/25 22:18:17 pooka Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -276,6 +276,9 @@
extern struct bpf_ops *bpf_ops;
void bpf_setops(void);
+void bpf_ops_handover_enter(struct bpf_ops *);
+void bpf_ops_handover_exit(void);
+
void bpfilterattach(int);
int bpf_validate(struct bpf_insn *, int);
Index: src/sys/net/bpf_stub.c
diff -u src/sys/net/bpf_stub.c:1.3 src/sys/net/bpf_stub.c:1.4
--- src/sys/net/bpf_stub.c:1.3 Tue Jan 19 23:11:10 2010
+++ src/sys/net/bpf_stub.c Mon Jan 25 22:18:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_stub.c,v 1.3 2010/01/19 23:11:10 pooka Exp $ */
+/* $NetBSD: bpf_stub.c,v 1.4 2010/01/25 22:18:17 pooka Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,18 +27,119 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bpf_stub.c,v 1.3 2010/01/19 23:11:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf_stub.c,v 1.4 2010/01/25 22:18:17 pooka Exp $");
#include
+#include
#include
#include
+struct laglist {
+ struct ifnet *lag_ifp;
+ u_int lag_dlt;
+ u_int lag_hlen;
+ struct bpf_if **lag_drvp;
+
+ TAILQ_ENTRY(laglist) lag_entries;
+};
+
+static TAILQ_HEAD(, laglist) lagdrvs = TAILQ_HEAD_INITIALIZER(lagdrvs);
+
+static void bpf_stub_attach(struct ifnet *, u_int, u_int, struct bpf_if **);
+static void bpf_stub_detach(struct ifnet *);
+
+static void bpf_stub_null(void);
+static void bpf_stub_warn(void);
+
+static kmutex_t handovermtx;
+static kcondvar_t handovercv;
+static bool handover;
+
+struct bpf_ops bpf_ops_stub = {
+ .bpf_attach = bpf_stub_attach,
+ .bpf_detach = bpf_stub_detach,
+ .bpf_change_type = (void *)bpf_stub_null,
+
+ .bpf_tap = (void *)bpf_stub_warn,
+ .bpf_mtap = (void *)bpf_stub_warn,
+ .bpf_mtap2 = (void *)bpf_stub_warn,
+ .bpf_mtap_af = (void *)bpf_stub_warn,
+ .bpf_mtap_et = (void *)bpf_stub_warn,
+ .bpf_mtap_sl_in = (void *)bpf_stub_warn,
+ .bpf_mtap_sl_out = (void *)bpf_stub_warn,
+};
+struct bpf_ops *bpf_ops;
+
static void
-bpf_stub_attach(struct ifnet *ipf, u_int dlt, u_int hlen, struct bpf_if **drvp)
+bpf_stub_attach(struct ifnet
CVS commit: src
Module Name:src
Committed By: pooka
Date: Mon Jan 25 22:21:28 UTC 2010
Modified Files:
src/distrib/sets/lists/modules: mi
src/sys/modules: Makefile
Added Files:
src/sys/modules/bpf: Makefile
Log Message:
add bpf kmod
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.37 -r1.38 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/bpf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.5 src/distrib/sets/lists/modules/mi:1.6
--- src/distrib/sets/lists/modules/mi:1.5 Sat Dec 5 20:11:02 2009
+++ src/distrib/sets/lists/modules/mi Mon Jan 25 22:21:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.5 2009/12/05 20:11:02 pooka Exp $
+# $NetBSD: mi,v 1.6 2010/01/25 22:21:28 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -14,6 +14,8 @@
./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules kmod
./@MODULEDIR@/aiobase-kernel-modules kmod
./@MODULEDIR@/aio/aio.kmod base-kernel-modules kmod
+./@MODULEDIR@/bpfbase-kernel-modules kmod
+./@MODULEDIR@/bpf/bpf.kmod base-kernel-modules kmod
./@MODULEDIR@/cd9660base-kernel-modules kmod
./@MODULEDIR@/cd9660/cd9660.kmod base-kernel-modules kmod
./@MODULEDIR@/codabase-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.37 src/sys/modules/Makefile:1.38
--- src/sys/modules/Makefile:1.37 Tue Jan 5 20:49:04 2010
+++ src/sys/modules/Makefile Mon Jan 25 22:21:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2010/01/05 20:49:04 dyoung Exp $
+# $NetBSD: Makefile,v 1.38 2010/01/25 22:21:28 pooka Exp $
.include
@@ -8,6 +8,7 @@
SUBDIR+= accf_httpready
SUBDIR+= adosfs
SUBDIR+= aio
+SUBDIR+= bpf
SUBDIR+= cd9660
SUBDIR+= coda
SUBDIR+= coda5
Added files:
Index: src/sys/modules/bpf/Makefile
diff -u /dev/null src/sys/modules/bpf/Makefile:1.1
--- /dev/null Mon Jan 25 22:21:28 2010
+++ src/sys/modules/bpf/Makefile Mon Jan 25 22:21:28 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/01/25 22:21:28 pooka Exp $
+#
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/net
+
+KMOD= bpf
+# XXX: bpf_filter.c maybe needs to be its own module (or made
+# inseparable from bpfilter?)
+SRCS= bpf.c bpf_filter.c
+
+.include
CVS commit: src/sys/rump/net/rumptest
Module Name:src
Committed By: pooka
Date: Mon Jan 25 22:25:38 UTC 2010
Modified Files:
src/sys/rump/net/rumptest: rumptest_net.c
Log Message:
In case opening /dev/bpf fails, try to load bpf kmod and try again.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 src/sys/rump/net/rumptest/rumptest_net.c:1.16
--- src/sys/rump/net/rumptest/rumptest_net.c:1.15 Tue Jan 19 17:51:03 2010
+++ src/sys/rump/net/rumptest/rumptest_net.c Mon Jan 25 22:25:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumptest_net.c,v 1.15 2010/01/19 17:51:03 pooka Exp $ */
+/* $NetBSD: rumptest_net.c,v 1.16 2010/01/25 22:25:38 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,6 +29,7 @@
*/
#include
+#include
#include
#include
#include
@@ -189,12 +190,37 @@
struct bpf_hdr *bhdr;
void *buf;
struct ifreq ifr;
- int bpfd;
+ int bpfd, modfd;
u_int bpflen, x;
bpfd = rump_sys_open("/dev/bpf", O_RDWR);
- if (bpfd == -1)
- err(1, "bpf open");
+
+ /* fail? try to load kernel module */
+ if (bpfd == -1) {
+ modctl_load_t ml;
+
+ /* XXX: struct stat size */
+ modfd = open("./bpf.kmod", O_RDONLY);
+ if (modfd == -1)
+ err(1, "no bpf, no bpf kmod");
+ close(modfd);
+
+ rump_pub_etfs_register("/bpf.kmod",
+ "./bpf.kmod", RUMP_ETFS_REG);
+ ml.ml_filename = "/bpf.kmod";
+ ml.ml_flags = 0;
+ ml.ml_props = NULL;
+ ml.ml_propslen = 0;
+
+ if (rump_sys_modctl(MODCTL_LOAD, &ml) == -1)
+ err(1, "load bpf module");
+ /* XXX: I "know" it's 256 XXX */
+ rump_sys_mknod("/dev/bpf", 0777 | S_IFCHR, makedev(256,0));
+
+ bpfd = rump_sys_open("/dev/bpf", O_RDWR);
+ if (bpfd == -1)
+ err(1, "open bpf");
+ }
if (rump_sys_ioctl(bpfd, BIOCGBLEN, &bpflen) == -1)
err(1, "BIOCGBLEN");
CVS commit: src/sys/rump/net/rumptest
Module Name:src Committed By: pooka Date: Mon Jan 25 22:26:19 UTC 2010 Modified Files: src/sys/rump/net/rumptest: Makefile Log Message: need rumpvfs for etfs_register() and sys_mknod() To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 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.8 src/sys/rump/net/rumptest/Makefile:1.9 --- src/sys/rump/net/rumptest/Makefile:1.8 Tue Jan 19 22:47:46 2010 +++ src/sys/rump/net/rumptest/Makefile Mon Jan 25 22:26:19 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/01/19 22:47:46 pooka Exp $ +# $NetBSD: Makefile,v 1.9 2010/01/25 22:26:19 pooka Exp $ # PROG= rumptest_net @@ -9,6 +9,8 @@ LDADD= -lrump -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_virtif \ -lrumpuser -lpthread CPPFLAGS+= -DFULL_NETWORK_STACK +# for loading bpf module +LDADD+= -lrumpvfs # uncomment for bpf support #LDADD+= -lrumpdev_bpf -lrumpdev -lrumpvfs
CVS commit: src/sys/net
Module Name:src Committed By: pooka Date: Tue Jan 26 01:06:23 UTC 2010 Modified Files: src/sys/net: bpf.c Log Message: Include sys/atomic.h now that it's used but gets stealth-included only on some archs. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/net/bpf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/bpf.c diff -u src/sys/net/bpf.c:1.154 src/sys/net/bpf.c:1.155 --- src/sys/net/bpf.c:1.154 Mon Jan 25 22:18:17 2010 +++ src/sys/net/bpf.c Tue Jan 26 01:06:23 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bpf.c,v 1.154 2010/01/25 22:18:17 pooka Exp $ */ +/* $NetBSD: bpf.c,v 1.155 2010/01/26 01:06:23 pooka Exp $ */ /* * Copyright (c) 1990, 1991, 1993 @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.154 2010/01/25 22:18:17 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.155 2010/01/26 01:06:23 pooka Exp $"); #if defined(_KERNEL_OPT) #include "opt_bpf.h" @@ -60,6 +60,7 @@ #include #include #include +#include #include #include
CVS commit: src/sys/arch/sparc
Module Name:src
Committed By: mrg
Date: Tue Jan 26 03:06:01 UTC 2010
Modified Files:
src/sys/arch/sparc/include: proc.h
src/sys/arch/sparc/sparc: machdep.c
Log Message:
convert fpulock into fpu_mtx.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/include/proc.h
cvs rdiff -u -r1.300 -r1.301 src/sys/arch/sparc/sparc/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/sparc/include/proc.h
diff -u src/sys/arch/sparc/include/proc.h:1.16 src/sys/arch/sparc/include/proc.h:1.17
--- src/sys/arch/sparc/include/proc.h:1.16 Sat Nov 21 04:04:07 2009
+++ src/sys/arch/sparc/include/proc.h Tue Jan 26 03:06:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.16 2009/11/21 04:04:07 rmind Exp $ */
+/* $NetBSD: proc.h,v 1.17 2010/01/26 03:06:01 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -66,17 +66,17 @@
/*
* FPU context switch lock
* Prevent interrupts that grab the kernel lock
+ * XXX mrg: remove (s) argument
*/
-extern struct simplelock fpulock;
+extern kmutex_t fpu_mtx;
#define FPU_LOCK(s) do { \
- s = splclock(); \
- simple_lock(&fpulock); \
+ (void)&(s); \
+ mutex_enter(&fpu_mtx); \
} while (/* CONSTCOND */ 0)
#define FPU_UNLOCK(s) do { \
- simple_unlock(&fpulock); \
- splx(s); \
+ mutex_exit(&fpu_mtx); \
} while (/* CONSTCOND */ 0)
#endif /* _SPARC_PROC_H_ */
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.300 src/sys/arch/sparc/sparc/machdep.c:1.301
--- src/sys/arch/sparc/sparc/machdep.c:1.300 Sun Jan 3 23:03:21 2010
+++ src/sys/arch/sparc/sparc/machdep.c Tue Jan 26 03:06:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.300 2010/01/03 23:03:21 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.301 2010/01/26 03:06:01 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.300 2010/01/03 23:03:21 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.301 2010/01/26 03:06:01 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@@ -102,6 +102,7 @@
#include
#include
#include
+#include
#include /* we use uvm.kernel_object */
@@ -139,7 +140,7 @@
int physmem;
-struct simplelock fpulock = SIMPLELOCK_INITIALIZER;
+kmutex_t fpu_mtx;
/*
* safepri is a safe priority for sleep to set for a spin-wait
@@ -338,6 +339,8 @@
printf("avail memory = %s\n", pbuf);
pmap_redzone();
+
+ mutex_init(&fpu_mtx, MUTEX_DEFAULT, IPL_SCHED);
}
/*
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: cliff
Date: Tue Jan 26 04:37:38 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: db_interface.c
Log Message:
fix macros used for printing cp0 regs
To generate a diff of this commit:
cvs rdiff -u -r1.64.16.14 -r1.64.16.15 src/sys/arch/mips/mips/db_interface.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/mips/mips/db_interface.c
diff -u src/sys/arch/mips/mips/db_interface.c:1.64.16.14 src/sys/arch/mips/mips/db_interface.c:1.64.16.15
--- src/sys/arch/mips/mips/db_interface.c:1.64.16.14 Wed Jan 20 09:04:35 2010
+++ src/sys/arch/mips/mips/db_interface.c Tue Jan 26 04:37:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.64.16.14 2010/01/20 09:04:35 matt Exp $ */
+/* $NetBSD: db_interface.c,v 1.64.16.15 2010/01/26 04:37:38 cliff Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.64.16.14 2010/01/20 09:04:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.64.16.15 2010/01/26 04:37:38 cliff Exp $");
#include "opt_cputype.h" /* which mips CPUs do we support? */
#include "opt_ddb.h"
@@ -405,54 +405,36 @@
"", __val); \
} while (0)
-/* XXX not 64-bit ABI safe! */
-#define SHOW64(reg, name) \
-do { \
- uint64_t __val; \
- \
- __asm volatile( \
- ".set push \n\t" \
- ".set mips3 \n\t" \
- ".set noat \n\t" \
- "dmfc0 %0,$" ___STRING(reg) " \n\t" \
- "dsll %L0,%0,32 \n\t" \
- "dsrl %L0,%L0,32 \n\t" \
- "dsrl %M0,%0,32 \n\t" \
- ".set pop" \
- : "=r"(__val)); \
- printf(" %s:%*s %#"PRIx64"\n", name, FLDWIDTH - (int) strlen(name), \
- "", __val); \
-} while (0)
+#define SHOW64(reg, name) MIPS64_SHOW64(reg, 0, name)
-#define MIPS64_SHOW32(num, sel, name) \
+#define MIPS64_SHOW32(num, sel, name) \
do { \
uint32_t __val; \
\
+ KASSERT (CPUIS64BITS); \
__asm volatile( \
".set push \n\t" \
".set mips64 \n\t" \
- "mfc0 %0,$" ___STRING(num) "," ___STRING(sel) "\n\t" \
+ "mfc0 %0,$%1,%2 \n\t" \
".set pop \n\t" \
- : "=r"(__val)); \
+ : "=r"(__val) : "n"(num), "n"(sel)); \
printf(" %s:%*s %#x\n", name, FLDWIDTH - (int) strlen(name), \
"", __val); \
} while (0)
/* XXX not 64-bit ABI safe! */
-#define MIPS64_SHOW64(num, sel, name) \
+#define MIPS64_SHOW64(num, sel, name) \
do { \
uint64_t __val; \
\
+ KASSERT (CPUIS64BITS); \
__asm volatile( \
".set push \n\t" \
".set mips64 \n\t" \
".set noat \n\t" \
- "dmfc0 %0,$" ___STRING(num) "," ___STRING(sel) "\n\t" \
- "dsll %L0,%0,32 \n\t" \
- "dsrl %L0,%L0,32 \n\t" \
- "dsrl %M0,%0,32 \n\t" \
+ "dmfc0 %0,$%1,%2 \n\t" \
".set pop" \
- : "=r"(__val)); \
+ : "=r"(__val) : "n"(num), "n"(sel)); \
printf(" %s:%*s %#"PRIx64"\n", name, FLDWIDTH - (int) strlen(name), \
"", __val); \
} while (0)
CVS commit: [matt-nb5-mips64] src/sys/kern
Module Name:src
Committed By: cliff
Date: Tue Jan 26 04:41:07 UTC 2010
Modified Files:
src/sys/kern [matt-nb5-mips64]: kern_subr.c
Log Message:
fix bug in setroot() where device_class() would be called
with NULL pointer arg if root is specified in config but
the specified device does not exist in the system.
To generate a diff of this commit:
cvs rdiff -u -r1.192.4.1 -r1.192.4.1.4.1 src/sys/kern/kern_subr.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_subr.c
diff -u src/sys/kern/kern_subr.c:1.192.4.1 src/sys/kern/kern_subr.c:1.192.4.1.4.1
--- src/sys/kern/kern_subr.c:1.192.4.1 Mon Nov 17 18:56:05 2008
+++ src/sys/kern/kern_subr.c Tue Jan 26 04:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_subr.c,v 1.192.4.1 2008/11/17 18:56:05 snj Exp $ */
+/* $NetBSD: kern_subr.c,v 1.192.4.1.4.1 2010/01/26 04:41:07 cliff Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.192.4.1 2008/11/17 18:56:05 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.192.4.1.4.1 2010/01/26 04:41:07 cliff Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -786,6 +786,7 @@
* find a reasonable network interface for "rootspec".
*/
vops = vfs_getopsbyname("nfs");
+printf("%s:%d\n", __func__, __LINE__);
if (vops != NULL && vops->vfs_mountroot == mountroot &&
rootspec == NULL &&
(bootdv == NULL || device_class(bootdv) != DV_IFNET)) {
@@ -974,11 +975,20 @@
*/
/*
+ * if rootspec is not configured, ask (again)
+ */
+ dv = finddevice(rootspec);
+ if (dv == NULL) {
+ printf("device %s not configured\n", rootspec);
+ boothowto |= RB_ASKNAME;
+ goto top;
+ }
+
+ /*
* If it's a network interface, we can bail out
* early.
*/
- dv = finddevice(rootspec);
- if (dv != NULL && device_class(dv) == DV_IFNET) {
+ if (device_class(dv) == DV_IFNET) {
rootdv = dv;
goto haveroot;
}
@@ -1011,6 +1021,7 @@
root_device = rootdv;
+printf("%s:%d\n", __func__, __LINE__);
switch (device_class(rootdv)) {
case DV_IFNET:
case DV_DISK:
CVS commit: [matt-nb5-mips64] src/sys/kern
Module Name:src
Committed By: cliff
Date: Tue Jan 26 04:51:03 UTC 2010
Modified Files:
src/sys/kern [matt-nb5-mips64]: kern_subr.c
Log Message:
remove debug prints
To generate a diff of this commit:
cvs rdiff -u -r1.192.4.1.4.1 -r1.192.4.1.4.2 src/sys/kern/kern_subr.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_subr.c
diff -u src/sys/kern/kern_subr.c:1.192.4.1.4.1 src/sys/kern/kern_subr.c:1.192.4.1.4.2
--- src/sys/kern/kern_subr.c:1.192.4.1.4.1 Tue Jan 26 04:41:07 2010
+++ src/sys/kern/kern_subr.c Tue Jan 26 04:51:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_subr.c,v 1.192.4.1.4.1 2010/01/26 04:41:07 cliff Exp $ */
+/* $NetBSD: kern_subr.c,v 1.192.4.1.4.2 2010/01/26 04:51:03 cliff Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.192.4.1.4.1 2010/01/26 04:41:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.192.4.1.4.2 2010/01/26 04:51:03 cliff Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -786,7 +786,6 @@
* find a reasonable network interface for "rootspec".
*/
vops = vfs_getopsbyname("nfs");
-printf("%s:%d\n", __func__, __LINE__);
if (vops != NULL && vops->vfs_mountroot == mountroot &&
rootspec == NULL &&
(bootdv == NULL || device_class(bootdv) != DV_IFNET)) {
@@ -1020,8 +1019,6 @@
haveroot:
root_device = rootdv;
-
-printf("%s:%d\n", __func__, __LINE__);
switch (device_class(rootdv)) {
case DV_IFNET:
case DV_DISK:
CVS commit: src/usr.sbin/accton
Module Name:src Committed By: mrg Date: Tue Jan 26 06:03:02 UTC 2010 Modified Files: src/usr.sbin/accton: accton.8 Log Message: remove the HISTORY section that merely claimed this manual page was new (but it was written in 1994 :-) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/accton/accton.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/accton/accton.8 diff -u src/usr.sbin/accton/accton.8:1.12 src/usr.sbin/accton/accton.8:1.13 --- src/usr.sbin/accton/accton.8:1.12 Tue Jan 29 07:05:30 2008 +++ src/usr.sbin/accton/accton.8 Tue Jan 26 06:03:02 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: accton.8,v 1.12 2008/01/29 07:05:30 wiz Exp $ +.\" $NetBSD: accton.8,v 1.13 2010/01/26 06:03:02 mrg Exp $ .\" .\" Copyright (c) 1993 Christopher G. Demetriou .\" All rights reserved. @@ -80,7 +80,3 @@ .Xr lastcomm 1 , .Xr acct 5 , .Xr sa 8 -.Sh HISTORY -The -.Nm -command has existed nearly forever, but this man page is new.
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Tue Jan 26 07:12:06 UTC 2010 Modified Files: src/share/man/man9: sysmon_taskq.9 Log Message: Instead of "general purpose task queue", call it "general purpose system monitoring task queue". Also include a paragraph about the intended usage. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/sysmon_taskq.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/sysmon_taskq.9 diff -u src/share/man/man9/sysmon_taskq.9:1.2 src/share/man/man9/sysmon_taskq.9:1.3 --- src/share/man/man9/sysmon_taskq.9:1.2 Mon Jan 25 18:25:08 2010 +++ src/share/man/man9/sysmon_taskq.9 Tue Jan 26 07:12:06 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysmon_taskq.9,v 1.2 2010/01/25 18:25:08 jruoho Exp $ +.\" $NetBSD: sysmon_taskq.9,v 1.3 2010/01/26 07:12:06 jruoho Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -32,7 +32,7 @@ .Os .Sh NAME .Nm sysmon_taskq -.Nd simple general purpose task queue +.Nd general purpose system monitoring task queue .Sh SYNOPSIS .In dev/sysmon/sysmon_taskq.h .Ft int @@ -44,6 +44,10 @@ It can be used to run callbacks that require thread context, but do not warrant the use of a more fine-grained solution. .Pp +Although the intended usage is related to the context of system monitoring +and power management, also other comparable functions are suitable for +.Nm . +.Pp The .Fn sysmon_task_queue_sched enqueues
CVS commit: src/share/dict
Module Name:src Committed By: mbalmer Date: Tue Jan 26 07:16:41 UTC 2010 Modified Files: src/share/dict: web2 Log Message: What a pleasure to fix a typo in Webster's... (Though the typo most probably was not in it). To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/share/dict/web2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/dict/web2 diff -u src/share/dict/web2:1.16 src/share/dict/web2:1.17 --- src/share/dict/web2:1.16 Tue Jan 30 13:10:49 2007 +++ src/share/dict/web2 Tue Jan 26 07:16:41 2010 @@ -190316,6 +190316,7 @@ structure structured structureless +structurelessness structurely structurist strudel @@ -190413,7 +190414,6 @@ stuccoyer stuck stuckling -stucturelessness stud studbook studder
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Tue Jan 26 07:53:25 UTC 2010 Modified Files: src/share/man/man9: sysmon_taskq.9 Log Message: Document also rest of the functions. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/sysmon_taskq.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/sysmon_taskq.9 diff -u src/share/man/man9/sysmon_taskq.9:1.3 src/share/man/man9/sysmon_taskq.9:1.4 --- src/share/man/man9/sysmon_taskq.9:1.3 Tue Jan 26 07:12:06 2010 +++ src/share/man/man9/sysmon_taskq.9 Tue Jan 26 07:53:25 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysmon_taskq.9,v 1.3 2010/01/26 07:12:06 jruoho Exp $ +.\" $NetBSD: sysmon_taskq.9,v 1.4 2010/01/26 07:53:25 jruoho Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -35,6 +35,12 @@ .Nd general purpose system monitoring task queue .Sh SYNOPSIS .In dev/sysmon/sysmon_taskq.h +.Ft void +.Fn sysmon_task_queue_preinit "void" +.Ft void +.Fn sysmon_task_queue_init "void" +.Ft void +.Fn sysmon_task_queue_fini "void" .Ft int .Fn sysmon_task_queue_sched "u_int pri" "void (*func)(void *)" "void *arg" .Sh DESCRIPTION @@ -47,6 +53,16 @@ Although the intended usage is related to the context of system monitoring and power management, also other comparable functions are suitable for .Nm . +.Sh FUNCTIONS +The necessary internal data structures +are initialized during system startup by +.Fn sysmon_task_queue_preinit . +Before actual usage, a machine-independent +procedure should finish the initialization +by calling +.Fn sysmon_task_queue_init . +This will create a kernel thread that can be later halted by +.Fn sysmon_task_queue_fini . .Pp The .Fn sysmon_task_queue_sched
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Tue Jan 26 07:58:16 UTC 2010 Modified Files: src/share/man/man9: sysmon_taskq.9 Log Message: Clarify that sysmon_task_queue_init() should be called from arch-specific routine. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/sysmon_taskq.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/sysmon_taskq.9 diff -u src/share/man/man9/sysmon_taskq.9:1.4 src/share/man/man9/sysmon_taskq.9:1.5 --- src/share/man/man9/sysmon_taskq.9:1.4 Tue Jan 26 07:53:25 2010 +++ src/share/man/man9/sysmon_taskq.9 Tue Jan 26 07:58:16 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysmon_taskq.9,v 1.4 2010/01/26 07:53:25 jruoho Exp $ +.\" $NetBSD: sysmon_taskq.9,v 1.5 2010/01/26 07:58:16 jruoho Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -57,7 +57,7 @@ The necessary internal data structures are initialized during system startup by .Fn sysmon_task_queue_preinit . -Before actual usage, a machine-independent +Before actual usage, a machine-dependent procedure should finish the initialization by calling .Fn sysmon_task_queue_init .
