CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: riastradh
Date: Wed Feb 19 05:52:52 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c
Log Message:
Define VOP_STRATEGY on zfs device nodes too.
Fixes eternal hangs in attempts to do I/O on device nodes on zfs.
XXX pullup
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.58 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.59
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.58 Sat Feb 15 19:03:15 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Wed Feb 19 05:52:52 2020
@@ -6375,6 +6375,7 @@ const struct vnodeopv_entry_desc zfs_spe
{ _mmap_desc, spec_mmap },
{ _islocked_desc, zfs_netbsd_islocked },
{ _advlock_desc, spec_advlock },
+ { _strategy_desc, spec_strategy },
{ _print_desc, zfs_netbsd_print },
{ _fcntl_desc, zfs_netbsd_fcntl },
{ NULL, NULL }
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: thorpej
Date: Wed Feb 19 02:51:54 UTC 2020
Modified Files:
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/ep93xx: epe.c
Log Message:
When a media change is requested, don't just all (*if_init)(). That's
needlessly disruptive and incompatible with future locking changes.
We can use both ether_mediachange() and ether_mediastatus() instead.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/ep93xx/epe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.31 src/sys/arch/arm/at91/at91emac.c:1.32
--- src/sys/arch/arm/at91/at91emac.c:1.31 Tue Feb 11 15:09:14 2020
+++ src/sys/arch/arm/at91/at91emac.c Wed Feb 19 02:51:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: at91emac.c,v 1.31 2020/02/11 15:09:14 skrll Exp $ */
+/* $NetBSD: at91emac.c,v 1.32 2020/02/19 02:51:54 thorpej Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.31 2020/02/11 15:09:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.32 2020/02/19 02:51:54 thorpej Exp $");
#include
#include
@@ -93,8 +93,6 @@ static void emac_attach(device_t, device
static void emac_init(struct emac_softc *);
static int emac_intr(void* arg);
static int emac_gctx(struct emac_softc *);
-static int emac_mediachange(struct ifnet *);
-static void emac_mediastatus(struct ifnet *, struct ifmediareq *);
int emac_mii_readreg (device_t, int, int, uint16_t *);
int emac_mii_writereg (device_t, int, int, uint16_t);
void emac_statchg (struct ifnet *);
@@ -467,8 +465,8 @@ emac_init(struct emac_softc *sc)
mii->mii_writereg = emac_mii_writereg;
mii->mii_statchg = emac_statchg;
sc->sc_ec.ec_mii = mii;
- ifmedia_init(>mii_media, IFM_IMASK, emac_mediachange,
- emac_mediastatus);
+ ifmedia_init(>mii_media, IFM_IMASK, ether_mediachange,
+ ether_mediastatus);
mii_attach((device_t )sc, mii, 0x, MII_PHY_ANY,
MII_OFFSET_ANY, 0);
ifmedia_set(>mii_media, IFM_ETHER | IFM_AUTO);
@@ -506,25 +504,6 @@ emac_init(struct emac_softc *sc)
ether_ifattach(ifp, (sc)->sc_enaddr);
}
-static int
-emac_mediachange(struct ifnet *ifp)
-{
- if (ifp->if_flags & IFF_UP)
- emac_ifinit(ifp);
- return (0);
-}
-
-static void
-emac_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
-{
- struct emac_softc *sc = ifp->if_softc;
-
- mii_pollstat(>sc_mii);
- ifmr->ifm_active = sc->sc_mii.mii_media_active;
- ifmr->ifm_status = sc->sc_mii.mii_media_status;
-}
-
-
int
emac_mii_readreg(device_t self, int phy, int reg, uint16_t *val)
{
Index: src/sys/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.47 src/sys/arch/arm/ep93xx/epe.c:1.48
--- src/sys/arch/arm/ep93xx/epe.c:1.47 Mon Feb 3 13:58:05 2020
+++ src/sys/arch/arm/ep93xx/epe.c Wed Feb 19 02:51:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.47 2020/02/03 13:58:05 skrll Exp $ */
+/* $NetBSD: epe.c,v 1.48 2020/02/19 02:51:54 thorpej Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.47 2020/02/03 13:58:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.48 2020/02/19 02:51:54 thorpej Exp $");
#include
#include
@@ -96,7 +96,6 @@ static void epe_attach(device_t, device_
static void epe_init(struct epe_softc *);
static int epe_intr(void* arg);
static int epe_gctx(struct epe_softc *);
-static int epe_mediachange(struct ifnet *);
int epe_mii_readreg (device_t, int, int, uint16_t *);
int epe_mii_writereg (device_t, int, int, uint16_t);
void epe_statchg (struct ifnet *);
@@ -401,7 +400,7 @@ epe_init(struct epe_softc *sc)
mii->mii_writereg = epe_mii_writereg;
mii->mii_statchg = epe_statchg;
sc->sc_ec.ec_mii = mii;
- ifmedia_init(>mii_media, IFM_IMASK, epe_mediachange,
+ ifmedia_init(>mii_media, IFM_IMASK, ether_mediachange,
ether_mediastatus);
mii_attach(sc->sc_dev, mii, 0x, MII_PHY_ANY,
MII_OFFSET_ANY, 0);
@@ -440,14 +439,6 @@ epe_init(struct epe_softc *sc)
ether_ifattach(ifp, (sc)->sc_enaddr);
}
-static int
-epe_mediachange(struct ifnet *ifp)
-{
- if (ifp->if_flags & IFF_UP)
- epe_ifinit(ifp);
- return 0;
-}
-
int
epe_mii_readreg(device_t self, int phy, int reg, uint16_t *val)
{
CVS commit: src/external/historical/nawk/dist
Module Name:src
Committed By: christos
Date: Tue Feb 18 21:29:39 UTC 2020
Modified Files:
src/external/historical/nawk/dist: proctab.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/historical/nawk/dist/proctab.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/historical/nawk/dist/proctab.c
diff -u src/external/historical/nawk/dist/proctab.c:1.5 src/external/historical/nawk/dist/proctab.c:1.6
--- src/external/historical/nawk/dist/proctab.c:1.5 Tue Feb 18 16:12:21 2020
+++ src/external/historical/nawk/dist/proctab.c Tue Feb 18 16:29:39 2020
@@ -1,55 +1,52 @@
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
#include
#include "awk.h"
-#include "awkgram.h"
+#include "ytab.h"
-static const char * const printname[95] = {
- "FIRSTTOKEN", /* 258 */
- "PROGRAM", /* 259 */
- "PASTAT", /* 260 */
- "PASTAT2", /* 261 */
- "XBEGIN", /* 262 */
- "XEND", /* 263 */
- "NL", /* 264 */
- "ARRAY", /* 265 */
- "MATCH", /* 266 */
- "NOTMATCH", /* 267 */
- "MATCHOP", /* 268 */
- "FINAL", /* 269 */
- "DOT", /* 270 */
- "ALL", /* 271 */
- "CCL", /* 272 */
- "NCCL", /* 273 */
- "CHAR", /* 274 */
- "OR", /* 275 */
- "STAR", /* 276 */
- "QUEST", /* 277 */
- "PLUS", /* 278 */
- "EMPTYRE", /* 279 */
- "ZERO", /* 280 */
- "AND", /* 281 */
- "BOR", /* 282 */
- "APPEND", /* 283 */
- "EQ", /* 284 */
- "GE", /* 285 */
- "GT", /* 286 */
- "LE", /* 287 */
- "LT", /* 288 */
- "NE", /* 289 */
- "IN", /* 290 */
- "ARG", /* 291 */
- "BLTIN", /* 292 */
- "BREAK", /* 293 */
- "CLOSE", /* 294 */
- "CONTINUE", /* 295 */
- "DELETE", /* 296 */
- "DO", /* 297 */
- "EXIT", /* 298 */
- "FOR", /* 299 */
- "FUNC", /* 300 */
+static const char * const printname[96] = {
+ "FIRSTTOKEN", /* 257 */
+ "PROGRAM", /* 258 */
+ "PASTAT", /* 259 */
+ "PASTAT2", /* 260 */
+ "XBEGIN", /* 261 */
+ "XEND", /* 262 */
+ "NL", /* 263 */
+ "ARRAY", /* 264 */
+ "MATCH", /* 265 */
+ "NOTMATCH", /* 266 */
+ "MATCHOP", /* 267 */
+ "FINAL", /* 268 */
+ "DOT", /* 269 */
+ "ALL", /* 270 */
+ "CCL", /* 271 */
+ "NCCL", /* 272 */
+ "CHAR", /* 273 */
+ "OR", /* 274 */
+ "STAR", /* 275 */
+ "QUEST", /* 276 */
+ "PLUS", /* 277 */
+ "EMPTYRE", /* 278 */
+ "ZERO", /* 279 */
+ "AND", /* 280 */
+ "BOR", /* 281 */
+ "APPEND", /* 282 */
+ "EQ", /* 283 */
+ "GE", /* 284 */
+ "GT", /* 285 */
+ "LE", /* 286 */
+ "LT", /* 287 */
+ "NE", /* 288 */
+ "IN", /* 289 */
+ "ARG", /* 290 */
+ "BLTIN", /* 291 */
+ "BREAK", /* 292 */
+ "CLOSE", /* 293 */
+ "CONTINUE", /* 294 */
+ "DELETE", /* 295 */
+ "DO", /* 296 */
+ "EXIT", /* 297 */
+ "FOR", /* 298 */
+ "FUNC", /* 299 */
+ "GENSUB", /* 300 */
"SUB", /* 301 */
"GSUB", /* 302 */
"IF", /* 303 */
@@ -105,7 +102,7 @@ static const char * const printname[95]
};
-Cell *(*proctab[95])(Node **, int) = {
+Cell *(*proctab[96])(Node **, int) = {
nullproc, /* FIRSTTOKEN */
program, /* PROGRAM */
pastat, /* PASTAT */
@@ -149,6 +146,7 @@ Cell *(*proctab[95])(Node **, int) = {
jump, /* EXIT */
forstat, /* FOR */
nullproc, /* FUNC */
+ gensub, /* GENSUB */
sub, /* SUB */
gsub, /* GSUB */
ifstat, /* IF */
CVS commit: src/external/historical/nawk/dist
Module Name:src
Committed By: christos
Date: Tue Feb 18 21:29:31 UTC 2020
Modified Files:
src/external/historical/nawk/dist: maketab.c
Log Message:
use the correct header name.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/historical/nawk/dist/maketab.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/historical/nawk/dist/maketab.c
diff -u src/external/historical/nawk/dist/maketab.c:1.3 src/external/historical/nawk/dist/maketab.c:1.4
--- src/external/historical/nawk/dist/maketab.c:1.3 Tue Feb 18 16:12:21 2020
+++ src/external/historical/nawk/dist/maketab.c Tue Feb 18 16:29:30 2020
@@ -36,7 +36,7 @@ THIS SOFTWARE.
#include
#include
#include "awk.h"
-#include "awktab.h"
+#include "awkgram.h"
struct xx
{ int token;
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Feb 18 21:14:16 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new awk To generate a diff of this commit: cvs rdiff -u -r1.1690 -r1.1691 src/doc/3RDPARTY cvs rdiff -u -r1.2649 -r1.2650 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1690 src/doc/3RDPARTY:1.1691 --- src/doc/3RDPARTY:1.1690 Thu Feb 13 07:23:39 2020 +++ src/doc/3RDPARTY Tue Feb 18 16:14:16 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1690 2020/02/13 12:23:39 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1691 2020/02/18 21:14:16 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -932,12 +932,12 @@ Notes: Delete the otherOS directory before importing. Package: nawk -Version: 2012-12-20 -Current Vers: 2018-08-27 +Version: 2020-02-18 +Current Vers: 2020-02-18 Maintainer: Brian Kernighan Archive Site: https://github.com/onetrueawk/awk Home Page: http://www.cs.princeton.edu/~bwk/btl.mirror/ -Date: 2019-08-13 +Date: 2020-02-18 Mailing List: Responsible: jdolecek License: BSD-like Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2649 src/doc/CHANGES:1.2650 --- src/doc/CHANGES:1.2649 Sun Feb 9 11:06:17 2020 +++ src/doc/CHANGES Tue Feb 18 16:14:16 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2649 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2650 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -143,3 +143,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: that are collated when they are queried. [thorpej 20200201] realpath(1): Ported from FreeBSD. [kamil 20200202] kernel: Remove azalia(4). [jmcneill 20200209] + awk(1): Import 20200218 [christos 20200218]
CVS import: src/external/historical/nawk/dist
Module Name:src Committed By: christos Date: Tue Feb 18 20:50:49 UTC 2020 Update of /cvsroot/src/external/historical/nawk/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25210 Log Message: Last import was 2010 when there was no ChangeLog yet. I've worked with upstream to merge all our changes and this includes many other fixes including new operator support etc. The change to pass an extra "isnew" argument to open was not preserved as none of the tests supplied with the PR fail. This also adds the testsuite and all the bugs fixed since then. Status: Vendor Tag: NAWK Release Tags: NAWK20200218 N src/external/historical/nawk/dist/ChangeLog C src/external/historical/nawk/dist/FIXES N src/external/historical/nawk/dist/LICENSE N src/external/historical/nawk/dist/README.md N src/external/historical/nawk/dist/REGRESS N src/external/historical/nawk/dist/TODO C src/external/historical/nawk/dist/awk.1 C src/external/historical/nawk/dist/awk.h C src/external/historical/nawk/dist/awkgram.y C src/external/historical/nawk/dist/b.c C src/external/historical/nawk/dist/lex.c C src/external/historical/nawk/dist/lib.c C src/external/historical/nawk/dist/main.c C src/external/historical/nawk/dist/makefile C src/external/historical/nawk/dist/maketab.c C src/external/historical/nawk/dist/parse.c C src/external/historical/nawk/dist/proctab.c C src/external/historical/nawk/dist/proto.h C src/external/historical/nawk/dist/run.c C src/external/historical/nawk/dist/tran.c C src/external/historical/nawk/dist/ytab.c U src/external/historical/nawk/dist/ytab.h N src/external/historical/nawk/dist/testdir/Compare.T1 N src/external/historical/nawk/dist/testdir/Compare.drek N src/external/historical/nawk/dist/testdir/Compare.p N src/external/historical/nawk/dist/testdir/Compare.t N src/external/historical/nawk/dist/testdir/Compare.tt N src/external/historical/nawk/dist/testdir/NOTES N src/external/historical/nawk/dist/testdir/README.TESTS N src/external/historical/nawk/dist/testdir/REGRESS N src/external/historical/nawk/dist/testdir/T.-f-f N src/external/historical/nawk/dist/testdir/T.argv N src/external/historical/nawk/dist/testdir/T.arnold N src/external/historical/nawk/dist/testdir/T.beebe N src/external/historical/nawk/dist/testdir/T.builtin N src/external/historical/nawk/dist/testdir/T.chem N src/external/historical/nawk/dist/testdir/T.close N src/external/historical/nawk/dist/testdir/T.clv N src/external/historical/nawk/dist/testdir/T.delete N src/external/historical/nawk/dist/testdir/T.errmsg N src/external/historical/nawk/dist/testdir/T.expr N src/external/historical/nawk/dist/testdir/T.exprconv N src/external/historical/nawk/dist/testdir/T.flags N src/external/historical/nawk/dist/testdir/T.func N src/external/historical/nawk/dist/testdir/T.gawk N src/external/historical/nawk/dist/testdir/T.getline N src/external/historical/nawk/dist/testdir/T.latin1 N src/external/historical/nawk/dist/testdir/T.lilly N src/external/historical/nawk/dist/testdir/bib N src/external/historical/nawk/dist/testdir/T.main N src/external/historical/nawk/dist/testdir/T.misc N src/external/historical/nawk/dist/testdir/T.nextfile N src/external/historical/nawk/dist/testdir/T.overflow N src/external/historical/nawk/dist/testdir/T.re N src/external/historical/nawk/dist/testdir/T.recache N src/external/historical/nawk/dist/testdir/T.redir N src/external/historical/nawk/dist/testdir/T.split N src/external/historical/nawk/dist/testdir/T.sub N src/external/historical/nawk/dist/testdir/T.system N src/external/historical/nawk/dist/testdir/arnold-fixes.tar N src/external/historical/nawk/dist/testdir/bundle.awk N src/external/historical/nawk/dist/testdir/chem.awk N src/external/historical/nawk/dist/testdir/cleanup N src/external/historical/nawk/dist/testdir/countries N src/external/historical/nawk/dist/testdir/ctimes N src/external/historical/nawk/dist/testdir/echo.c N src/external/historical/nawk/dist/testdir/funstack.awk N src/external/historical/nawk/dist/testdir/funstack.in N src/external/historical/nawk/dist/testdir/funstack.ok N src/external/historical/nawk/dist/testdir/ind N src/external/historical/nawk/dist/testdir/latin1 N src/external/historical/nawk/dist/testdir/lilly.ifile N src/external/historical/nawk/dist/testdir/lilly.out N src/external/historical/nawk/dist/testdir/lilly.progs N src/external/historical/nawk/dist/testdir/lsd1.p N src/external/historical/nawk/dist/testdir/p.1 N src/external/historical/nawk/dist/testdir/p.10 N src/external/historical/nawk/dist/testdir/p.11 N src/external/historical/nawk/dist/testdir/p.12 N src/external/historical/nawk/dist/testdir/p.13 N src/external/historical/nawk/dist/testdir/p.14 N src/external/historical/nawk/dist/testdir/p.15 N src/external/historical/nawk/dist/testdir/p.16 N src/external/historical/nawk/dist/testdir/p.17 N src/external/historical/nawk/dist/testdir/p.18 N src/external/historical/nawk/dist/testdir/p.19 N src/external/historical/nawk/dist/testdir/p.2 N
CVS commit: src/sys
Module Name:src
Committed By: chs
Date: Tue Feb 18 20:23:18 UTC 2020
Modified Files:
src/sys/kern: init_main.c
src/sys/miscfs/genfs: genfs_io.c
src/sys/rump/librump/rumpkern: rump.c
src/sys/rump/librump/rumpvfs: vm_vfs.c
src/sys/ufs/lfs: lfs_bio.c lfs_extern.h lfs_inode.h lfs_segment.c
lfs_syscalls.c lfs_vfsops.c
src/sys/uvm: uvm.h uvm_extern.h uvm_pager.c uvm_pdaemon.c uvm_swap.c
Log Message:
remove the aiodoned thread. I originally added this to provide a thread context
for doing page cache iodone work, but since then biodone() has changed to
hand off all iodone work to a softint thread, so we no longer need the
special-purpose aiodoned thread.
To generate a diff of this commit:
cvs rdiff -u -r1.520 -r1.521 src/sys/kern/init_main.c
cvs rdiff -u -r1.84 -r1.85 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.340 -r1.341 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.36 -r1.37 src/sys/rump/librump/rumpvfs/vm_vfs.c
cvs rdiff -u -r1.144 -r1.145 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.114 -r1.115 src/sys/ufs/lfs/lfs_extern.h
cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/lfs/lfs_inode.h
cvs rdiff -u -r1.281 -r1.282 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.175 -r1.176 src/sys/ufs/lfs/lfs_syscalls.c
cvs rdiff -u -r1.369 -r1.370 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.73 -r1.74 src/sys/uvm/uvm.h
cvs rdiff -u -r1.219 -r1.220 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.120 -r1.121 src/sys/uvm/uvm_pager.c
cvs rdiff -u -r1.123 -r1.124 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.185 -r1.186 src/sys/uvm/uvm_swap.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/init_main.c
diff -u src/sys/kern/init_main.c:1.520 src/sys/kern/init_main.c:1.521
--- src/sys/kern/init_main.c:1.520 Sat Feb 15 18:12:15 2020
+++ src/sys/kern/init_main.c Tue Feb 18 20:23:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.520 2020/02/15 18:12:15 ad Exp $ */
+/* $NetBSD: init_main.c,v 1.521 2020/02/18 20:23:17 chs Exp $ */
/*-
* Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.520 2020/02/15 18:12:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.521 2020/02/18 20:23:17 chs Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -720,11 +720,6 @@ main(void)
NULL, NULL, "ioflush"))
panic("fork syncer");
- /* Create the aiodone daemon kernel thread. */
- if (workqueue_create(_queue, "aiodoned",
- uvm_aiodone_worker, NULL, PRI_VM, IPL_NONE, WQ_MPSAFE))
- panic("fork aiodoned");
-
/* Wait for final configure threads to complete. */
config_finalize_mountroot();
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.84 src/sys/miscfs/genfs/genfs_io.c:1.85
--- src/sys/miscfs/genfs/genfs_io.c:1.84 Wed Jan 15 17:55:44 2020
+++ src/sys/miscfs/genfs/genfs_io.c Tue Feb 18 20:23:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.84 2020/01/15 17:55:44 ad Exp $ */
+/* $NetBSD: genfs_io.c,v 1.85 2020/02/18 20:23:17 chs Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.84 2020/01/15 17:55:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.85 2020/02/18 20:23:17 chs Exp $");
#include
#include
@@ -606,9 +606,6 @@ genfs_getpages_read(struct vnode *vp, st
if (kva == 0)
return EBUSY;
- if (uvm.aiodone_queue == NULL)
- async = 0;
-
mbp = getiobuf(vp, true);
mbp->b_bufsize = totalbytes;
mbp->b_data = (void *)kva;
@@ -616,7 +613,7 @@ genfs_getpages_read(struct vnode *vp, st
mbp->b_cflags = BC_BUSY;
if (async) {
mbp->b_flags = B_READ | B_ASYNC;
- mbp->b_iodone = uvm_aio_biodone;
+ mbp->b_iodone = uvm_aio_aiodone;
} else {
mbp->b_flags = B_READ;
mbp->b_iodone = NULL;
@@ -1396,9 +1393,8 @@ genfs_gop_write(struct vnode *vp, struct
UVMPAGER_MAPIN_WRITE | UVMPAGER_MAPIN_WAITOK);
len = npages << PAGE_SHIFT;
- KASSERT(uvm.aiodone_queue != NULL);
error = genfs_do_io(vp, off, kva, len, flags, UIO_WRITE,
- uvm_aio_biodone);
+ uvm_aio_aiodone);
return error;
}
@@ -1429,9 +1425,8 @@ genfs_gop_write_rwmap(struct vnode *vp,
UVMPAGER_MAPIN_READ | UVMPAGER_MAPIN_WAITOK);
len = npages << PAGE_SHIFT;
- KASSERT(uvm.aiodone_queue != NULL);
error = genfs_do_io(vp, off, kva, len, flags, UIO_WRITE,
- uvm_aio_biodone);
+ uvm_aio_aiodone);
return error;
}
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.340 src/sys/rump/librump/rumpkern/rump.c:1.341
--- src/sys/rump/librump/rumpkern/rump.c:1.340 Mon Feb 10 03:23:29 2020
+++ src/sys/rump/librump/rumpkern/rump.c Tue Feb 18 20:23:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.340 2020/02/10 03:23:29 riastradh Exp $ */
+/* $NetBSD: rump.c,v 1.341 2020/02/18 20:23:17 chs
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Tue Feb 18 17:50:21 UTC 2020
Modified Files:
src/sys/dev/usb: motg.c
Log Message:
Fix wrong KASSERT in motg abort.
This has been wrong since last summer when we did the transition to
xfer->ux_status = USBD_CANCELLED earlier.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/motg.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/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.29 src/sys/dev/usb/motg.c:1.30
--- src/sys/dev/usb/motg.c:1.29 Sat Feb 15 13:56:55 2020
+++ src/sys/dev/usb/motg.c Tue Feb 18 17:50:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.29 2020/02/15 13:56:55 riastradh Exp $ */
+/* $NetBSD: motg.c,v 1.30 2020/02/18 17:50:20 riastradh Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.29 2020/02/15 13:56:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.30 2020/02/18 17:50:20 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2234,7 +2234,6 @@ motg_abortx(struct usbd_xfer *xfer)
}
if (otgpipe->hw_ep->xfer == xfer) {
- KASSERT(xfer->ux_status == USBD_IN_PROGRESS);
otgpipe->hw_ep->xfer = NULL;
if (otgpipe->hw_ep->ep_number > 0) {
/* select endpoint */
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: riastradh
Date: Tue Feb 18 17:50:32 UTC 2020
Modified Files:
src/sys/ufs/ffs: ffs_alloc.c
Log Message:
Fix non-DIAGNOSTIC build with UVM_PAGE_TRKOWN.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/ufs/ffs/ffs_alloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.164 src/sys/ufs/ffs/ffs_alloc.c:1.165
--- src/sys/ufs/ffs/ffs_alloc.c:1.164 Sun Apr 14 15:55:24 2019
+++ src/sys/ufs/ffs/ffs_alloc.c Tue Feb 18 17:50:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.164 2019/04/14 15:55:24 kardel Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.165 2020/02/18 17:50:32 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.164 2019/04/14 15:55:24 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.165 2020/02/18 17:50:32 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -208,7 +208,7 @@ ffs_alloc(struct inode *ip, daddr_t lbn,
ffs_lblktosize(fs, (voff_t)lbn) < round_page(vp->v_size) &&
((vp->v_vflag & VV_MAPPED) != 0 || (size & PAGE_MASK) != 0 ||
ffs_blkoff(fs, size) != 0)) {
- struct vm_page *pg;
+ struct vm_page *pg __diagused;
struct uvm_object *uobj = >v_uobj;
voff_t off = trunc_page(ffs_lblktosize(fs, lbn));
voff_t endoff = round_page(ffs_lblktosize(fs, lbn) + size);
@@ -328,7 +328,7 @@ ffs_realloccg(struct inode *ip, daddr_t
*/
if (ITOV(ip)->v_type == VREG) {
- struct vm_page *pg;
+ struct vm_page *pg __diagused;
struct uvm_object *uobj = (ip)->v_uobj;
voff_t off = trunc_page(ffs_lblktosize(fs, lbprev));
voff_t endoff = round_page(ffs_lblktosize(fs, lbprev) + osize);
CVS commit: src/sys/arch/mips/cavium/dev
Module Name:src
Committed By: thorpej
Date: Tue Feb 18 15:00:42 UTC 2020
Modified Files:
src/sys/arch/mips/cavium/dev: if_cnmac.c
Log Message:
- Use ether_mediachange().
- Don't call the media change function directly from the init
function; bounce through mii_ifmedia_change().
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mips/cavium/dev/if_cnmac.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/cavium/dev/if_cnmac.c
diff -u src/sys/arch/mips/cavium/dev/if_cnmac.c:1.16 src/sys/arch/mips/cavium/dev/if_cnmac.c:1.17
--- src/sys/arch/mips/cavium/dev/if_cnmac.c:1.16 Wed Jan 29 05:30:14 2020
+++ src/sys/arch/mips/cavium/dev/if_cnmac.c Tue Feb 18 15:00:42 2020
@@ -1,8 +1,8 @@
-/* $NetBSD: if_cnmac.c,v 1.16 2020/01/29 05:30:14 thorpej Exp $ */
+/* $NetBSD: if_cnmac.c,v 1.17 2020/02/18 15:00:42 thorpej Exp $ */
#include
#if 0
-__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.16 2020/01/29 05:30:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.17 2020/02/18 15:00:42 thorpej Exp $");
#endif
#include "opt_octeon.h"
@@ -121,7 +121,6 @@ static void octeon_eth_mii_statchg(struc
static int octeon_eth_mediainit(struct octeon_eth_softc *);
static void octeon_eth_mediastatus(struct ifnet *, struct ifmediareq *);
-static int octeon_eth_mediachange(struct ifnet *);
static inline void octeon_eth_send_queue_flush_prefetch(struct octeon_eth_softc *);
static inline void octeon_eth_send_queue_flush_fetch(struct octeon_eth_softc *);
@@ -546,7 +545,7 @@ octeon_eth_mediainit(struct octeon_eth_s
sc->sc_ethercom.ec_mii = mii;
/* Initialize ifmedia structures. */
- ifmedia_init(>mii_media, 0, octeon_eth_mediachange,
+ ifmedia_init(>mii_media, 0, ether_mediachange,
octeon_eth_mediastatus);
phy = prop_dictionary_get(device_properties(sc->sc_dev), "phy-addr");
@@ -586,16 +585,6 @@ octeon_eth_mediastatus(struct ifnet *ifp
sc->sc_gmx_port->sc_port_flowflags;
}
-static int
-octeon_eth_mediachange(struct ifnet *ifp)
-{
- struct octeon_eth_softc *sc = ifp->if_softc;
-
- mii_mediachg(>sc_mii);
-
- return 0;
-}
-
/* send buffer garbage collection */
static inline void
@@ -1226,7 +1215,7 @@ octeon_eth_init(struct ifnet *ifp)
} else {
octeon_gmx_port_enable(sc->sc_gmx_port, 1);
}
- octeon_eth_mediachange(ifp);
+ mii_ifmedia_change(>sc_mii);
octeon_gmx_set_filter(sc->sc_gmx_port);
CVS commit: src/sys/arch/arm/xscale
Module Name:src
Committed By: thorpej
Date: Tue Feb 18 14:49:32 UTC 2020
Modified Files:
src/sys/arch/arm/xscale: ixp425_if_npe.c
Log Message:
Use ether_mediastatus().
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/xscale/ixp425_if_npe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xscale/ixp425_if_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.46 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.47
--- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.46 Tue Feb 4 05:16:18 2020
+++ src/sys/arch/arm/xscale/ixp425_if_npe.c Tue Feb 18 14:49:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_if_npe.c,v 1.46 2020/02/04 05:16:18 thorpej Exp $ */
+/* $NetBSD: ixp425_if_npe.c,v 1.47 2020/02/18 14:49:32 thorpej Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler. All rights reserved.
@@ -28,7 +28,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.46 2020/02/04 05:16:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.47 2020/02/18 14:49:32 thorpej Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -192,7 +192,6 @@ static int npe_activate(struct npe_softc
#if 0
static void npe_deactivate(struct npe_softc *);
#endif
-static void npe_ifmedia_status(struct ifnet *, struct ifmediareq *);
static void npe_setmac(struct npe_softc *, const u_char *);
static void npe_getmac(struct npe_softc *);
static void npe_txdone(int, void *);
@@ -301,7 +300,7 @@ npe_attach(device_t parent, device_t sel
sc->sc_ethercom.ec_mii = mii;
ifmedia_init(>mii_media, IFM_IMASK, ether_mediachange,
- npe_ifmedia_status);
+ ether_mediastatus);
mii_attach(sc->sc_dev, mii, 0x, MII_PHY_ANY,
MII_OFFSET_ANY, MIIF_DOPAUSE);
@@ -684,20 +683,6 @@ npe_deactivate(struct npe_softc *sc);
}
#endif
-/*
- * Notify the world which media we're using.
- */
-static void
-npe_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
-{
- struct npe_softc *sc = ifp->if_softc;
-
- mii_pollstat(>sc_mii);
-
- ifmr->ifm_active = sc->sc_mii.mii_media_active;
- ifmr->ifm_status = sc->sc_mii.mii_media_status;
-}
-
static void
npe_addstats(struct npe_softc *sc)
{
CVS commit: src/tests/dev/audio
Module Name:src
Committed By: isaki
Date: Tue Feb 18 12:11:27 UTC 2020
Modified Files:
src/tests/dev/audio: audiotest.c
Log Message:
Add tests.
AUDIO_SETINFO_channels
AUDIO_SETINFO_sample_rate
AUDIO_SETINFO_sample_rate_0
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/dev/audio/audiotest.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/audio/audiotest.c
diff -u src/tests/dev/audio/audiotest.c:1.4 src/tests/dev/audio/audiotest.c:1.5
--- src/tests/dev/audio/audiotest.c:1.4 Fri Feb 14 13:20:48 2020
+++ src/tests/dev/audio/audiotest.c Tue Feb 18 12:11:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audiotest.c,v 1.4 2020/02/14 13:20:48 isaki Exp $ */
+/* $NetBSD: audiotest.c,v 1.5 2020/02/18 12:11:26 isaki Exp $ */
/*
* Copyright (C) 2019 Tetsuya Isaki. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__RCSID("$NetBSD: audiotest.c,v 1.4 2020/02/14 13:20:48 isaki Exp $");
+__RCSID("$NetBSD: audiotest.c,v 1.5 2020/02/18 12:11:26 isaki Exp $");
#include
#include
@@ -5405,6 +5405,176 @@ DEF(AUDIO_SETINFO_params_simul)
}
/*
+ * AUDIO_SETINFO(encoding/precision) is tested in AUDIO_GETENC_range below.
+ */
+
+/*
+ * Check whether the number of channels can be set.
+ */
+DEF(AUDIO_SETINFO_channels)
+{
+ struct audio_info ai;
+ int mode;
+ int r;
+ int fd;
+ int i;
+ struct {
+ int ch;
+ bool expected;
+ } table[] = {
+ { 0, false },
+ { 1, true }, /* monaural */
+ { 2, true }, /* stereo */
+ { 3, true }, /* multi channels */
+ { 12, true }, /* upper limit */
+ { 13, false },
+ };
+
+ TEST("AUDIO_SETINFO_channels");
+ if (netbsd < 8) {
+ /*
+ * On NetBSD7, the result depends the hardware and there is
+ * no way to know it.
+ */
+ XP_SKIP("The test doesn't make sense on NetBSD7");
+ return;
+ }
+
+ mode = openable_mode();
+ fd = OPEN(devaudio, mode);
+ REQUIRED_SYS_OK(fd);
+
+ for (i = 0; i < (int)__arraycount(table); i++) {
+ int ch = table[i].ch;
+ bool expected = table[i].expected;
+
+ AUDIO_INITINFO();
+ if (mode != O_RDONLY)
+ ai.play.channels = ch;
+ if (mode != O_WRONLY)
+ ai.record.channels = ch;
+ r = IOCTL(fd, AUDIO_SETINFO, , "channels=%d", ch);
+ if (expected) {
+ /* Expects to succeed */
+ XP_SYS_EQ(0, r);
+
+ r = IOCTL(fd, AUDIO_GETBUFINFO, , "");
+ XP_SYS_EQ(0, r);
+ if (mode != O_RDONLY)
+XP_EQ(ch, ai.play.channels);
+ if (mode != O_WRONLY)
+XP_EQ(ch, ai.record.channels);
+ } else {
+ /* Expects to fail */
+ XP_SYS_NG(EINVAL, r);
+ }
+ }
+
+ r = CLOSE(fd);
+ XP_SYS_EQ(0, r);
+}
+
+/*
+ * Check whether the sample rate can be set.
+ */
+DEF(AUDIO_SETINFO_sample_rate)
+{
+ struct audio_info ai;
+ int mode;
+ int r;
+ int fd;
+ int i;
+ struct {
+ int freq;
+ bool expected;
+ } table[] = {
+ {999, false },
+ { 1000, true }, /* lower limit */
+ { 48000, true },
+ { 192000, true }, /* upper limit */
+ { 192001, false },
+ };
+
+ TEST("AUDIO_SETINFO_sample_rate");
+ if (netbsd < 8) {
+ /*
+ * On NetBSD7, the result depends the hardware and there is
+ * no way to know it.
+ */
+ XP_SKIP("The test doesn't make sense on NetBSD7");
+ return;
+ }
+
+ mode = openable_mode();
+ fd = OPEN(devaudio, mode);
+ REQUIRED_SYS_OK(fd);
+
+ for (i = 0; i < (int)__arraycount(table); i++) {
+ int freq = table[i].freq;
+ bool expected = table[i].expected;
+
+ AUDIO_INITINFO();
+ if (mode != O_RDONLY)
+ ai.play.sample_rate = freq;
+ if (mode != O_WRONLY)
+ ai.record.sample_rate = freq;
+ r = IOCTL(fd, AUDIO_SETINFO, , "sample_rate=%d", freq);
+ if (expected) {
+ /* Expects to succeed */
+ XP_SYS_EQ(0, r);
+
+ r = IOCTL(fd, AUDIO_GETBUFINFO, , "");
+ XP_SYS_EQ(0, r);
+ if (mode != O_RDONLY)
+XP_EQ(freq, ai.play.sample_rate);
+ if (mode != O_WRONLY)
+XP_EQ(freq, ai.record.sample_rate);
+ } else {
+ /* Expects to fail */
+ XP_SYS_NG(EINVAL, r);
+ }
+ }
+
+ r = CLOSE(fd);
+ XP_SYS_EQ(0, r);
+}
+
+/*
+ * SETINFO(sample_rate = 0) should fail correctly.
+ */
+DEF(AUDIO_SETINFO_sample_rate_0)
+{
+ struct audio_info ai;
+ int mode;
+ int r;
+ int fd;
+
+ TEST("AUDIO_SETINFO_sample_rate_0");
+ if (netbsd < 9) {
+ /*
+ * On NetBSD7,8 this will block system call and you will not
+ * even be able to shutdown...
+ */
+ XP_SKIP("This will cause an infinate loop in the kernel");
+ return;
+ }
+
+ mode = openable_mode();
+ fd = OPEN(devaudio, mode);
+ REQUIRED_SYS_OK(fd);
+
+ AUDIO_INITINFO();
+ ai.play.sample_rate = 0;
+ ai.record.sample_rate = 0;
+ r = IOCTL(fd, AUDIO_SETINFO, , "sample_rate=0");
+ /* Expects to fail */
+ XP_SYS_NG(EINVAL, r);
+
+ r = CLOSE(fd);
+ XP_SYS_EQ(0, r);
+}
+
+/*
* Check whether the pause/unpause works.
*/
void
@@ -6385,6 +6555,9 @@ struct testentry testtable[] = {
ENT(AUDIO_SETINFO_params_set_RDWR_2),
ENT(AUDIO_SETINFO_params_set_RDWR_3),
ENT(AUDIO_SETINFO_params_simul),
+ ENT(AUDIO_SETINFO_channels),
+
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Tue Feb 18 10:33:38 UTC 2020 Modified Files: src/sys/arch/arm/arm32: genassym.cf Log Message: G/C To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/arch/arm/arm32/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/genassym.cf diff -u src/sys/arch/arm/arm32/genassym.cf:1.87 src/sys/arch/arm/arm32/genassym.cf:1.88 --- src/sys/arch/arm/arm32/genassym.cf:1.87 Sat Feb 15 08:16:11 2020 +++ src/sys/arch/arm/arm32/genassym.cf Tue Feb 18 10:33:38 2020 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.87 2020/02/15 08:16:11 skrll Exp $ +# $NetBSD: genassym.cf,v 1.88 2020/02/18 10:33:38 skrll Exp $ # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -94,7 +94,6 @@ define KERNEL_BASE KERNEL_BASE define VM_MIN_ADDRESS VM_MIN_ADDRESS define VM_MAXUSER_ADDRESS VM_MAXUSER_ADDRESS -define PV_PA offsetof(pv_addr_t, pv_pa) define PMAP_DOMAIN_KERNEL PMAP_DOMAIN_KERNEL define DOMAIN_CLIENT DOMAIN_CLIENT define DOMAIN_DEFAULT DOMAIN_DEFAULT @@ -156,9 +155,6 @@ define MAXCPUS MAXCPUS # Important offsets into the lwp and proc structs & associated constants define L_PCB offsetof(struct lwp, l_addr) define L_CPU offsetof(struct lwp, l_cpu) -define L_PRIORITY offsetof(struct lwp, l_priority) -define L_WCHAN offsetof(struct lwp, l_wchan) -define L_STAT offsetof(struct lwp, l_stat) define L_PROC offsetof(struct lwp, l_proc) define L_PRIVATE offsetof(struct lwp, l_private) define L_FLAG offsetof(struct lwp, l_flag)
