CVS commit: src
Module Name:src Committed By: christos Date: Sat Sep 18 03:05:20 UTC 2021 Modified Files: src: UPDATING src/include: mntopts.h src/sbin/mount_ffs: mount_ffs.c src/sbin/tunefs: tunefs.c src/sys/sys: fstypes.h src/sys/ufs/ffs: ffs_vfsops.c fs.h src/usr.sbin/dumpfs: dumpfs.c Log Message: Change the default for ACLs to be posix1e instead of nfsv4 to match FreeBSD. Requested by chuq. To generate a diff of this commit: cvs rdiff -u -r1.320 -r1.321 src/UPDATING cvs rdiff -u -r1.19 -r1.20 src/include/mntopts.h cvs rdiff -u -r1.29 -r1.30 src/sbin/mount_ffs/mount_ffs.c cvs rdiff -u -r1.54 -r1.55 src/sbin/tunefs/tunefs.c cvs rdiff -u -r1.40 -r1.41 src/sys/sys/fstypes.h cvs rdiff -u -r1.372 -r1.373 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.68 -r1.69 src/sys/ufs/ffs/fs.h cvs rdiff -u -r1.64 -r1.65 src/usr.sbin/dumpfs/dumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.320 src/UPDATING:1.321 --- src/UPDATING:1.320 Sat Aug 21 05:59:45 2021 +++ src/UPDATING Fri Sep 17 23:05:19 2021 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.320 2021/08/21 09:59:45 andvar Exp $ +$NetBSD: UPDATING,v 1.321 2021/09/18 03:05:19 christos Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -19,6 +19,11 @@ See also: BUILDING, build.sh, Makefile. Recent changes: ^^^ +20210917: + Changed MNT_ACLS to default to POSIX1e ACLs instead of NFSv4 + ACLs, to be compatible with FreeBSD. If you are using NFSv4 ACLs + and have "acls" in /etc/fstab you'll need to change it to "nfs4acls". + 20210711: Updated GMP sources may require cleaning in tools/gmp and/or in external/lgpl3/gmp/lib, particularly if GCC itself does not build. Index: src/include/mntopts.h diff -u src/include/mntopts.h:1.19 src/include/mntopts.h:1.20 --- src/include/mntopts.h:1.19 Sat May 16 14:31:47 2020 +++ src/include/mntopts.h Fri Sep 17 23:05:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mntopts.h,v 1.19 2020/05/16 18:31:47 christos Exp $ */ +/* $NetBSD: mntopts.h,v 1.20 2021/09/18 03:05:20 christos Exp $ */ /*- * Copyright (c) 1994 @@ -44,6 +44,7 @@ struct mntopt { /* User-visible MNT_ flags. */ #define MOPT_ACLS { "acls", 0, MNT_ACLS, 0 } +#define MOPT_NFS4ACLS { "nfs4acls", 0, MNT_NFS4ACLS, 0 } #define MOPT_POSIX1EACLS { "posix1eacls",0, MNT_POSIX1EACLS, 0 } #define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 } #define MOPT_NOCOREDUMP { "coredump", 1, MNT_NOCOREDUMP, 0 } Index: src/sbin/mount_ffs/mount_ffs.c diff -u src/sbin/mount_ffs/mount_ffs.c:1.29 src/sbin/mount_ffs/mount_ffs.c:1.30 --- src/sbin/mount_ffs/mount_ffs.c:1.29 Sat May 16 14:31:47 2020 +++ src/sbin/mount_ffs/mount_ffs.c Fri Sep 17 23:05:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mount_ffs.c,v 1.29 2020/05/16 18:31:47 christos Exp $ */ +/* $NetBSD: mount_ffs.c,v 1.30 2021/09/18 03:05:20 christos Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 19 #if 0 static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95"; #else -__RCSID("$NetBSD: mount_ffs.c,v 1.29 2020/05/16 18:31:47 christos Exp $"); +__RCSID("$NetBSD: mount_ffs.c,v 1.30 2021/09/18 03:05:20 christos Exp $"); #endif #endif /* not lint */ @@ -64,7 +64,7 @@ __dead static void ffs_usage(void); static const struct mntopt mopts[] = { MOPT_STDOPTS, - MOPT_ACLS, + MOPT_NFS4ACLS, MOPT_POSIX1EACLS, MOPT_ASYNC, MOPT_SYNC, Index: src/sbin/tunefs/tunefs.c diff -u src/sbin/tunefs/tunefs.c:1.54 src/sbin/tunefs/tunefs.c:1.55 --- src/sbin/tunefs/tunefs.c:1.54 Wed Nov 25 21:06:01 2020 +++ src/sbin/tunefs/tunefs.c Fri Sep 17 23:05:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tunefs.c,v 1.54 2020/11/26 02:06:01 dholland Exp $ */ +/* $NetBSD: tunefs.c,v 1.55 2021/09/18 03:05:20 christos Exp $ */ /* * Copyright (c) 1983, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = "@(#)tunefs.c 8.3 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: tunefs.c,v 1.54 2020/11/26 02:06:01 dholland Exp $"); +__RCSID("$NetBSD: tunefs.c,v 1.55 2021/09/18 03:05:20 christos Exp $"); #endif #endif /* not lint */ @@ -361,21 +361,21 @@ main(int argc, char *argv[]) if (aflag) { name = "ACLs"; if (strcmp(avalue, "enable") == 0) { - if (sblock.fs_flags & FS_ACLS) { + if (sblock.fs_flags & FS_NFS4ACLS) { warnx("%s remains unchanged as enabled", name); } else if (sblock.fs_flags & FS_POSIX1EACLS) { warnx("%s and POSIX.1e ACLs are mutually " "exclusive", name); } else { -sblock.fs_flags |= FS_ACLS; +sblock.fs_flags |= FS_NFS4ACLS;
CVS commit: src
Module Name:src Committed By: christos Date: Sat Sep 18 03:05:20 UTC 2021 Modified Files: src: UPDATING src/include: mntopts.h src/sbin/mount_ffs: mount_ffs.c src/sbin/tunefs: tunefs.c src/sys/sys: fstypes.h src/sys/ufs/ffs: ffs_vfsops.c fs.h src/usr.sbin/dumpfs: dumpfs.c Log Message: Change the default for ACLs to be posix1e instead of nfsv4 to match FreeBSD. Requested by chuq. To generate a diff of this commit: cvs rdiff -u -r1.320 -r1.321 src/UPDATING cvs rdiff -u -r1.19 -r1.20 src/include/mntopts.h cvs rdiff -u -r1.29 -r1.30 src/sbin/mount_ffs/mount_ffs.c cvs rdiff -u -r1.54 -r1.55 src/sbin/tunefs/tunefs.c cvs rdiff -u -r1.40 -r1.41 src/sys/sys/fstypes.h cvs rdiff -u -r1.372 -r1.373 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.68 -r1.69 src/sys/ufs/ffs/fs.h cvs rdiff -u -r1.64 -r1.65 src/usr.sbin/dumpfs/dumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Sat Sep 18 01:47:11 UTC 2021 Modified Files: src: build.sh src/distrib/sets: maketars src/external/gpl3/binutils/dist/bfd/doc: Makefile.in src/external/gpl3/binutils/dist/binutils: Makefile.in src/external/gpl3/gcc/lib/liblto_plugin: Makefile src/external/gpl3/gcc/usr.bin: Makefile.prog src/external/gpl3/gcc/usr.bin/backend: Makefile src/external/gpl3/gcc/usr.bin/common: Makefile src/external/gpl3/gcc/usr.bin/common-target: Makefile src/external/gpl3/gcc/usr.bin/frontend: Makefile src/external/gpl3/gcc/usr.bin/host-libiberty: Makefile src/external/gpl3/gcc/usr.bin/libcpp: Makefile src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile src/external/gpl3/gdb/bin/gdb: Makefile src/external/gpl3/gdb/bin/gdbserver: Makefile src/external/gpl3/gdb/bin/gdbtui: Makefile src/external/gpl3/gdb/lib/libgdb: Makefile src/external/gpl3/gdb/lib/libgdbsupport: Makefile src/external/lgpl3/gmp/dist: Makefile.in src/external/lgpl3/gmp/lib/libgmp: Makefile src/tools/binutils: Makefile src/tools/compat: Makefile src/tools/fdisk: Makefile src/tools/gcc: Makefile src/tools/gmp: Makefile src/tools/sunlabel: Makefile src/tools/uudecode: Makefile src/tools/vgrind: Makefile src/tools/xz-include: Makefile Log Message: Patch the build script and toolchain to allow passing through HOST_CPPFLAGS, HOST_CXXFLAGS, but not LIBRARY_PATH because it breaks the build. These variables are necessary to support building NetBSD from a GNU Guix or NixOS host, where /usr/include, /lib, and all but /bin/sh do not exist. In many cases, support for HOST_CPPFLAGS was incomplete. From Ryan Sundberg To generate a diff of this commit: cvs rdiff -u -r1.357 -r1.358 src/build.sh cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/maketars cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/bfd/doc/Makefile.in cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/binutils/dist/binutils/Makefile.in cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/liblto_plugin/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/Makefile.prog cvs rdiff -u -r1.65 -r1.66 src/external/gpl3/gcc/usr.bin/backend/Makefile cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/common/Makefile cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gcc/usr.bin/common-target/Makefile cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/usr.bin/frontend/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/libcpp/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gdb/bin/gdb/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/bin/gdbserver/Makefile cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/bin/gdbtui/Makefile cvs rdiff -u -r1.31 -r1.32 src/external/gpl3/gdb/lib/libgdb/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libgdbsupport/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/dist/Makefile.in cvs rdiff -u -r1.28 -r1.29 src/external/lgpl3/gmp/lib/libgmp/Makefile cvs rdiff -u -r1.32 -r1.33 src/tools/binutils/Makefile cvs rdiff -u -r1.89 -r1.90 src/tools/compat/Makefile cvs rdiff -u -r1.7 -r1.8 src/tools/fdisk/Makefile cvs rdiff -u -r1.104 -r1.105 src/tools/gcc/Makefile cvs rdiff -u -r1.4 -r1.5 src/tools/gmp/Makefile cvs rdiff -u -r1.4 -r1.5 src/tools/sunlabel/Makefile cvs rdiff -u -r1.3 -r1.4 src/tools/uudecode/Makefile cvs rdiff -u -r1.3 -r1.4 src/tools/vgrind/Makefile cvs rdiff -u -r1.3 -r1.4 src/tools/xz-include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.357 src/build.sh:1.358 --- src/build.sh:1.357 Fri Sep 17 17:22:38 2021 +++ src/build.sh Fri Sep 17 21:47:07 2021 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.357 2021/09/17 21:22:38 joerg Exp $ +# $NetBSD: build.sh,v 1.358 2021/09/18 01:47:07 christos Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -473,6 +473,8 @@ level of source directory" # These variables can be overridden via "-V var=value" if # you know what you are doing. # + unsetmakeenv C_INCLUDE_PATH + unsetmakeenv CPLUS_INCLUDE_PATH unsetmakeenv INFODIR unsetmakeenv LESSCHARSET unsetmakeenv MAKEFLAGS @@ -1972,7 +1974,7 @@ createmakewrapper() eval cat
CVS commit: src
Module Name:src Committed By: christos Date: Sat Sep 18 01:47:11 UTC 2021 Modified Files: src: build.sh src/distrib/sets: maketars src/external/gpl3/binutils/dist/bfd/doc: Makefile.in src/external/gpl3/binutils/dist/binutils: Makefile.in src/external/gpl3/gcc/lib/liblto_plugin: Makefile src/external/gpl3/gcc/usr.bin: Makefile.prog src/external/gpl3/gcc/usr.bin/backend: Makefile src/external/gpl3/gcc/usr.bin/common: Makefile src/external/gpl3/gcc/usr.bin/common-target: Makefile src/external/gpl3/gcc/usr.bin/frontend: Makefile src/external/gpl3/gcc/usr.bin/host-libiberty: Makefile src/external/gpl3/gcc/usr.bin/libcpp: Makefile src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile src/external/gpl3/gdb/bin/gdb: Makefile src/external/gpl3/gdb/bin/gdbserver: Makefile src/external/gpl3/gdb/bin/gdbtui: Makefile src/external/gpl3/gdb/lib/libgdb: Makefile src/external/gpl3/gdb/lib/libgdbsupport: Makefile src/external/lgpl3/gmp/dist: Makefile.in src/external/lgpl3/gmp/lib/libgmp: Makefile src/tools/binutils: Makefile src/tools/compat: Makefile src/tools/fdisk: Makefile src/tools/gcc: Makefile src/tools/gmp: Makefile src/tools/sunlabel: Makefile src/tools/uudecode: Makefile src/tools/vgrind: Makefile src/tools/xz-include: Makefile Log Message: Patch the build script and toolchain to allow passing through HOST_CPPFLAGS, HOST_CXXFLAGS, but not LIBRARY_PATH because it breaks the build. These variables are necessary to support building NetBSD from a GNU Guix or NixOS host, where /usr/include, /lib, and all but /bin/sh do not exist. In many cases, support for HOST_CPPFLAGS was incomplete. From Ryan Sundberg To generate a diff of this commit: cvs rdiff -u -r1.357 -r1.358 src/build.sh cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/maketars cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/bfd/doc/Makefile.in cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/binutils/dist/binutils/Makefile.in cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/liblto_plugin/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/Makefile.prog cvs rdiff -u -r1.65 -r1.66 src/external/gpl3/gcc/usr.bin/backend/Makefile cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/common/Makefile cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gcc/usr.bin/common-target/Makefile cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/usr.bin/frontend/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/host-libiberty/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/libcpp/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gdb/bin/gdb/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/bin/gdbserver/Makefile cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/bin/gdbtui/Makefile cvs rdiff -u -r1.31 -r1.32 src/external/gpl3/gdb/lib/libgdb/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libgdbsupport/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/dist/Makefile.in cvs rdiff -u -r1.28 -r1.29 src/external/lgpl3/gmp/lib/libgmp/Makefile cvs rdiff -u -r1.32 -r1.33 src/tools/binutils/Makefile cvs rdiff -u -r1.89 -r1.90 src/tools/compat/Makefile cvs rdiff -u -r1.7 -r1.8 src/tools/fdisk/Makefile cvs rdiff -u -r1.104 -r1.105 src/tools/gcc/Makefile cvs rdiff -u -r1.4 -r1.5 src/tools/gmp/Makefile cvs rdiff -u -r1.4 -r1.5 src/tools/sunlabel/Makefile cvs rdiff -u -r1.3 -r1.4 src/tools/uudecode/Makefile cvs rdiff -u -r1.3 -r1.4 src/tools/vgrind/Makefile cvs rdiff -u -r1.3 -r1.4 src/tools/xz-include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_lfs
Module Name:src Committed By: christos Date: Fri Sep 17 22:41:48 UTC 2021 Modified Files: src/sbin/fsck_lfs: vnode.h Log Message: Fix the function pointer declaration to something lint likes. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sbin/fsck_lfs/vnode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_lfs/vnode.h diff -u src/sbin/fsck_lfs/vnode.h:1.5 src/sbin/fsck_lfs/vnode.h:1.6 --- src/sbin/fsck_lfs/vnode.h:1.5 Thu Jun 8 20:13:08 2017 +++ src/sbin/fsck_lfs/vnode.h Fri Sep 17 18:41:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vnode.h,v 1.5 2017/06/09 00:13:08 chs Exp $ */ +/* $NetBSD: vnode.h,v 1.6 2021/09/17 22:41:48 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. * All rights reserved. @@ -72,5 +72,5 @@ int raw_vop_bmap(struct uvnode *, daddr_ void vnode_destroy(struct uvnode *); struct uvnode *vget(void *, ino_t); -void register_vget(void *, struct uvnode *(void *, ino_t)); +void register_vget(void *, struct uvnode *(*)(void *, ino_t)); void vfs_init(void);
CVS commit: src/sbin/fsck_lfs
Module Name:src Committed By: christos Date: Fri Sep 17 22:41:48 UTC 2021 Modified Files: src/sbin/fsck_lfs: vnode.h Log Message: Fix the function pointer declaration to something lint likes. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sbin/fsck_lfs/vnode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Sep 17 21:22:38 UTC 2021 Modified Files: src: build.sh Log Message: Fix timestamp extraction logic for Mercurial repos to use UTC. Extend logic to also cover "hg archive". To generate a diff of this commit: cvs rdiff -u -r1.356 -r1.357 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.356 src/build.sh:1.357 --- src/build.sh:1.356 Thu Sep 9 15:00:01 2021 +++ src/build.sh Fri Sep 17 21:22:38 2021 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.356 2021/09/09 15:00:01 martin Exp $ +# $NetBSD: build.sh,v 1.357 2021/09/17 21:22:38 joerg Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -1972,7 +1972,7 @@ createmakewrapper() eval cat <
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Sep 17 21:22:38 UTC 2021 Modified Files: src: build.sh Log Message: Fix timestamp extraction logic for Mercurial repos to use UTC. Extend logic to also cover "hg archive". To generate a diff of this commit: cvs rdiff -u -r1.356 -r1.357 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Fri Sep 17 21:15:19 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: decl.c Log Message: downgrade bitfield in union to a warnings (ldpd uses it). To generate a diff of this commit: cvs rdiff -u -r1.240 -r1.241 src/usr.bin/xlint/lint1/decl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/lint1/decl.c diff -u src/usr.bin/xlint/lint1/decl.c:1.240 src/usr.bin/xlint/lint1/decl.c:1.241 --- src/usr.bin/xlint/lint1/decl.c:1.240 Mon Sep 13 02:11:51 2021 +++ src/usr.bin/xlint/lint1/decl.c Fri Sep 17 17:15:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: decl.c,v 1.240 2021/09/13 06:11:51 rillig Exp $ */ +/* $NetBSD: decl.c,v 1.241 2021/09/17 21:15:19 christos Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -38,7 +38,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: decl.c,v 1.240 2021/09/13 06:11:51 rillig Exp $"); +__RCSID("$NetBSD: decl.c,v 1.241 2021/09/17 21:15:19 christos Exp $"); #endif #include @@ -1129,7 +1129,7 @@ declare_bit_field(sym_t *dsym, tspec_t * } if (dsym->s_scl == MOU) { /* illegal use of bit-field */ - error(41); + warning(41); dsym->s_type->t_bitfield = false; dsym->s_bitfield = false; }
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Fri Sep 17 21:15:19 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: decl.c Log Message: downgrade bitfield in union to a warnings (ldpd uses it). To generate a diff of this commit: cvs rdiff -u -r1.240 -r1.241 src/usr.bin/xlint/lint1/decl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: christos Date: Fri Sep 17 21:06:35 UTC 2021 Modified Files: src/usr.sbin/fstyp: exfat.c hfsplus.c Log Message: remove lint hacks now that lint supports _Static_assert To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/fstyp/exfat.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/fstyp/hfsplus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/fstyp/exfat.c diff -u src/usr.sbin/fstyp/exfat.c:1.5 src/usr.sbin/fstyp/exfat.c:1.6 --- src/usr.sbin/fstyp/exfat.c:1.5 Fri Sep 17 10:49:03 2021 +++ src/usr.sbin/fstyp/exfat.c Fri Sep 17 17:06:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: exfat.c,v 1.5 2021/09/17 14:49:03 christos Exp $ */ +/* $NetBSD: exfat.c,v 1.6 2021/09/17 21:06:35 christos Exp $ */ /* * Copyright (c) 2017 Conrad Meyer @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ #include -__RCSID("$NetBSD: exfat.c,v 1.5 2021/09/17 14:49:03 christos Exp $"); +__RCSID("$NetBSD: exfat.c,v 1.6 2021/09/17 21:06:35 christos Exp $"); #include #include @@ -116,9 +116,7 @@ struct exfat_dirent { #define xde_set_chksum u.xde_primary_.xde_set_chksum_ #define xde_prim_flags u.xde_primary_.xde_prim_flags_ #define xde_sec_flags u.xde_secondary_.xde_sec_flags_ -#ifndef __lint__ _Static_assert(sizeof(struct exfat_dirent) == 32, "spec"); -#endif struct exfat_de_label { uint8_t xdel_type; /* XDE_TYPE_VOL_LABEL */ @@ -126,9 +124,7 @@ struct exfat_de_label { uint16_t xdel_vol_lbl[11]; uint8_t xdel_reserved[8]; } __packed; -#ifndef __lint__ _Static_assert(sizeof(struct exfat_de_label) == 32, "spec"); -#endif #define MAIN_BOOT_REGION_SECT 0 #define BACKUP_BOOT_REGION_SECT 12 Index: src/usr.sbin/fstyp/hfsplus.c diff -u src/usr.sbin/fstyp/hfsplus.c:1.2 src/usr.sbin/fstyp/hfsplus.c:1.3 --- src/usr.sbin/fstyp/hfsplus.c:1.2 Fri Sep 17 10:49:03 2021 +++ src/usr.sbin/fstyp/hfsplus.c Fri Sep 17 17:06:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hfsplus.c,v 1.2 2021/09/17 14:49:03 christos Exp $ */ +/* $NetBSD: hfsplus.c,v 1.3 2021/09/17 21:06:35 christos Exp $ */ /* * Copyright (c) 2019 Conrad Meyer . All rights reserved. * @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ #include -__RCSID("$NetBSD: hfsplus.c,v 1.2 2021/09/17 14:49:03 christos Exp $"); +__RCSID("$NetBSD: hfsplus.c,v 1.3 2021/09/17 21:06:35 christos Exp $"); #include #include @@ -96,9 +96,7 @@ struct hfsp_vol_hdr { hfsp_fork_data hp_attributesFile; hfsp_fork_data hp_startupFile; }; -#ifndef __lint__ _Static_assert(sizeof(struct hfsp_vol_hdr) == 512, ""); -#endif int fstyp_hfsp(FILE *fp, char *label, size_t size)
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: christos Date: Fri Sep 17 21:06:35 UTC 2021 Modified Files: src/usr.sbin/fstyp: exfat.c hfsplus.c Log Message: remove lint hacks now that lint supports _Static_assert To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/fstyp/exfat.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/fstyp/hfsplus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Fri Sep 17 21:06:04 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y lex.c Log Message: Extra commit to fix the actual wrong comment before: Add _Static_assert grammar and keyword To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.366 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.82 -r1.83 src/usr.bin/xlint/lint1/lex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/lint1/cgram.y diff -u src/usr.bin/xlint/lint1/cgram.y:1.365 src/usr.bin/xlint/lint1/cgram.y:1.366 --- src/usr.bin/xlint/lint1/cgram.y:1.365 Fri Sep 17 16:17:30 2021 +++ src/usr.bin/xlint/lint1/cgram.y Fri Sep 17 17:06:04 2021 @@ -1,5 +1,5 @@ %{ -/* $NetBSD: cgram.y,v 1.365 2021/09/17 20:17:30 christos Exp $ */ +/* $NetBSD: cgram.y,v 1.366 2021/09/17 21:06:04 christos Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -35,7 +35,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: cgram.y,v 1.365 2021/09/17 20:17:30 christos Exp $"); +__RCSID("$NetBSD: cgram.y,v 1.366 2021/09/17 21:06:04 christos Exp $"); #endif #include @@ -1571,8 +1571,8 @@ designator: /* C99 6.7.8 "Initializati ; static_assert_declaration: - T_STATIC_ASSERT T_LPAREN constant_expr T_COMMA T_STRING T_RPAREN T_SEMI - | T_STATIC_ASSERT T_LPAREN constant_expr T_RPAREN T_SEMI + T_STATIC_ASSERT T_LPAREN constant_expr T_COMMA T_STRING T_RPAREN T_SEMI /* C11 */ + | T_STATIC_ASSERT T_LPAREN constant_expr T_RPAREN T_SEMI /* C23 */ ; range: Index: src/usr.bin/xlint/lint1/lex.c diff -u src/usr.bin/xlint/lint1/lex.c:1.82 src/usr.bin/xlint/lint1/lex.c:1.83 --- src/usr.bin/xlint/lint1/lex.c:1.82 Fri Sep 17 16:17:30 2021 +++ src/usr.bin/xlint/lint1/lex.c Fri Sep 17 17:06:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: lex.c,v 1.82 2021/09/17 20:17:30 christos Exp $ */ +/* $NetBSD: lex.c,v 1.83 2021/09/17 21:06:04 christos Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -38,7 +38,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: lex.c,v 1.82 2021/09/17 20:17:30 christos Exp $"); +__RCSID("$NetBSD: lex.c,v 1.83 2021/09/17 21:06:04 christos Exp $"); #endif #include @@ -217,7 +217,7 @@ static struct kwtab { kwdef_type( "signed", SIGNED, 1,0,0,0,3), kwdef_keyword( "sizeof", T_SIZEOF), kwdef_sclass( "static", STATIC, 0,0,0,0,1), - kwdef_keyword( "_Static_assert",T_STATIC_ASSERT), + kwdef_keyword( "_Static_assert", T_STATIC_ASSERT), kwdef_gcc_attr( "strfmon", T_AT_FORMAT_STRFMON), kwdef_gcc_attr( "strftime", T_AT_FORMAT_STRFTIME), kwdef_gcc_attr( "string", T_AT_STRING),
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Fri Sep 17 21:06:04 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y lex.c Log Message: Extra commit to fix the actual wrong comment before: Add _Static_assert grammar and keyword To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.366 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.82 -r1.83 src/usr.bin/xlint/lint1/lex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Fri Sep 17 20:17:30 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y lex.c Log Message: remove the lint kludges To generate a diff of this commit: cvs rdiff -u -r1.364 -r1.365 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.81 -r1.82 src/usr.bin/xlint/lint1/lex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/lint1/cgram.y diff -u src/usr.bin/xlint/lint1/cgram.y:1.364 src/usr.bin/xlint/lint1/cgram.y:1.365 --- src/usr.bin/xlint/lint1/cgram.y:1.364 Tue Sep 14 15:44:40 2021 +++ src/usr.bin/xlint/lint1/cgram.y Fri Sep 17 16:17:30 2021 @@ -1,5 +1,5 @@ %{ -/* $NetBSD: cgram.y,v 1.364 2021/09/14 19:44:40 rillig Exp $ */ +/* $NetBSD: cgram.y,v 1.365 2021/09/17 20:17:30 christos Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -35,7 +35,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: cgram.y,v 1.364 2021/09/14 19:44:40 rillig Exp $"); +__RCSID("$NetBSD: cgram.y,v 1.365 2021/09/17 20:17:30 christos Exp $"); #endif #include @@ -211,6 +211,7 @@ anonymize(sym_t *s) %token T_SWITCH %token T_SYMBOLRENAME %token T_WHILE +%token T_STATIC_ASSERT %token T_ATTRIBUTE %token T_AT_ALIAS @@ -761,6 +762,7 @@ declaration: /* C99 6.7 */ } | begin_type_declaration_specifiers end_type type_init_declarators T_SEMI + | static_assert_declaration ; begin_type_declaration_specifiers: /* see C99 6.7 */ @@ -993,6 +995,7 @@ struct_declaration: /* C99 6.7.2.1 */ $$ = NULL; } } + | static_assert_declaration | error T_SEMI { symtyp = FVFT; $$ = NULL; @@ -1567,6 +1570,11 @@ designator: /* C99 6.7.8 "Initializati } ; +static_assert_declaration: + T_STATIC_ASSERT T_LPAREN constant_expr T_COMMA T_STRING T_RPAREN T_SEMI + | T_STATIC_ASSERT T_LPAREN constant_expr T_RPAREN T_SEMI + ; + range: constant_expr { $$.lo = to_int_constant($1, true); Index: src/usr.bin/xlint/lint1/lex.c diff -u src/usr.bin/xlint/lint1/lex.c:1.81 src/usr.bin/xlint/lint1/lex.c:1.82 --- src/usr.bin/xlint/lint1/lex.c:1.81 Sun Sep 5 12:03:55 2021 +++ src/usr.bin/xlint/lint1/lex.c Fri Sep 17 16:17:30 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: lex.c,v 1.81 2021/09/05 16:03:55 rillig Exp $ */ +/* $NetBSD: lex.c,v 1.82 2021/09/17 20:17:30 christos Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -38,7 +38,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: lex.c,v 1.81 2021/09/05 16:03:55 rillig Exp $"); +__RCSID("$NetBSD: lex.c,v 1.82 2021/09/17 20:17:30 christos Exp $"); #endif #include @@ -217,6 +217,7 @@ static struct kwtab { kwdef_type( "signed", SIGNED, 1,0,0,0,3), kwdef_keyword( "sizeof", T_SIZEOF), kwdef_sclass( "static", STATIC, 0,0,0,0,1), + kwdef_keyword( "_Static_assert",T_STATIC_ASSERT), kwdef_gcc_attr( "strfmon", T_AT_FORMAT_STRFMON), kwdef_gcc_attr( "strftime", T_AT_FORMAT_STRFTIME), kwdef_gcc_attr( "string", T_AT_STRING),
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Fri Sep 17 20:17:30 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y lex.c Log Message: remove the lint kludges To generate a diff of this commit: cvs rdiff -u -r1.364 -r1.365 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.81 -r1.82 src/usr.bin/xlint/lint1/lex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: thorpej Date: Fri Sep 17 16:16:18 UTC 2021 Modified Files: src/sys/arch/sparc/sparc: promlib.c Log Message: Don't include in the _STANDALONE case. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sparc/sparc/promlib.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/sparc/promlib.c diff -u src/sys/arch/sparc/sparc/promlib.c:1.49 src/sys/arch/sparc/sparc/promlib.c:1.50 --- src/sys/arch/sparc/sparc/promlib.c:1.49 Wed Sep 15 17:33:08 2021 +++ src/sys/arch/sparc/sparc/promlib.c Fri Sep 17 16:16:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: promlib.c,v 1.49 2021/09/15 17:33:08 thorpej Exp $ */ +/* $NetBSD: promlib.c,v 1.50 2021/09/17 16:16:18 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.49 2021/09/15 17:33:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.50 2021/09/17 16:16:18 thorpej Exp $"); #if defined(_KERNEL_OPT) #include "opt_sparc_arch.h" @@ -45,12 +45,11 @@ __KERNEL_RCSID(0, "$NetBSD: promlib.c,v #include #include -#include - #ifdef _STANDALONE #include #define malloc(s,t,f) alloc(s) #else +#include #include #include #endif /* _STANDALONE */
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: thorpej Date: Fri Sep 17 16:16:18 UTC 2021 Modified Files: src/sys/arch/sparc/sparc: promlib.c Log Message: Don't include in the _STANDALONE case. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sparc/sparc/promlib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: christos Date: Fri Sep 17 14:49:03 UTC 2021 Modified Files: src/usr.sbin/fstyp: exfat.c hfsplus.c Log Message: XXX: Teach lint about _Static_assert... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fstyp/exfat.c cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/fstyp/hfsplus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/fstyp/exfat.c diff -u src/usr.sbin/fstyp/exfat.c:1.4 src/usr.sbin/fstyp/exfat.c:1.5 --- src/usr.sbin/fstyp/exfat.c:1.4 Sun Jan 24 09:37:32 2021 +++ src/usr.sbin/fstyp/exfat.c Fri Sep 17 10:49:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: exfat.c,v 1.4 2021/01/24 14:37:32 tkusumi Exp $ */ +/* $NetBSD: exfat.c,v 1.5 2021/09/17 14:49:03 christos Exp $ */ /* * Copyright (c) 2017 Conrad Meyer @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ #include -__RCSID("$NetBSD: exfat.c,v 1.4 2021/01/24 14:37:32 tkusumi Exp $"); +__RCSID("$NetBSD: exfat.c,v 1.5 2021/09/17 14:49:03 christos Exp $"); #include #include @@ -116,7 +116,9 @@ struct exfat_dirent { #define xde_set_chksum u.xde_primary_.xde_set_chksum_ #define xde_prim_flags u.xde_primary_.xde_prim_flags_ #define xde_sec_flags u.xde_secondary_.xde_sec_flags_ +#ifndef __lint__ _Static_assert(sizeof(struct exfat_dirent) == 32, "spec"); +#endif struct exfat_de_label { uint8_t xdel_type; /* XDE_TYPE_VOL_LABEL */ @@ -124,7 +126,9 @@ struct exfat_de_label { uint16_t xdel_vol_lbl[11]; uint8_t xdel_reserved[8]; } __packed; +#ifndef __lint__ _Static_assert(sizeof(struct exfat_de_label) == 32, "spec"); +#endif #define MAIN_BOOT_REGION_SECT 0 #define BACKUP_BOOT_REGION_SECT 12 Index: src/usr.sbin/fstyp/hfsplus.c diff -u src/usr.sbin/fstyp/hfsplus.c:1.1 src/usr.sbin/fstyp/hfsplus.c:1.2 --- src/usr.sbin/fstyp/hfsplus.c:1.1 Fri Dec 27 06:06:23 2019 +++ src/usr.sbin/fstyp/hfsplus.c Fri Sep 17 10:49:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hfsplus.c,v 1.1 2019/12/27 11:06:23 tkusumi Exp $ */ +/* $NetBSD: hfsplus.c,v 1.2 2021/09/17 14:49:03 christos Exp $ */ /* * Copyright (c) 2019 Conrad Meyer . All rights reserved. * @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ #include -__RCSID("$NetBSD: hfsplus.c,v 1.1 2019/12/27 11:06:23 tkusumi Exp $"); +__RCSID("$NetBSD: hfsplus.c,v 1.2 2021/09/17 14:49:03 christos Exp $"); #include #include @@ -96,7 +96,9 @@ struct hfsp_vol_hdr { hfsp_fork_data hp_attributesFile; hfsp_fork_data hp_startupFile; }; +#ifndef __lint__ _Static_assert(sizeof(struct hfsp_vol_hdr) == 512, ""); +#endif int fstyp_hfsp(FILE *fp, char *label, size_t size)
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: christos Date: Fri Sep 17 14:49:03 UTC 2021 Modified Files: src/usr.sbin/fstyp: exfat.c hfsplus.c Log Message: XXX: Teach lint about _Static_assert... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fstyp/exfat.c cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/fstyp/hfsplus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: christos Date: Fri Sep 17 14:48:32 UTC 2021 Modified Files: src/usr.sbin/fstyp: Makefile Log Message: Use CPPFLAGS for -D and -I so that lint works. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/fstyp/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/fstyp/Makefile diff -u src/usr.sbin/fstyp/Makefile:1.11 src/usr.sbin/fstyp/Makefile:1.12 --- src/usr.sbin/fstyp/Makefile:1.11 Tue Feb 2 16:31:11 2021 +++ src/usr.sbin/fstyp/Makefile Fri Sep 17 10:48:31 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2021/02/02 21:31:11 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2021/09/17 14:48:31 christos Exp $ .include @@ -14,19 +14,21 @@ MAN= fstyp.8 WARNS?= 6 .if (${MKZFS} != "no") -CFLAGS+= -DHAVE_ZFS COPTS.zfs.c+= -Wno-unknown-pragmas COPTS.zfs.c+= -Wno-sign-conversion COPTS.zfs.c+= -Wno-strict-prototypes -COPTS.zfs.c+= -I${NETBSDSRCDIR}/external -COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/include -COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys -COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/head -COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/lib/libzpool/common -COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common -COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common/fs/zfs -COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/lib/libnvpair LDADD+= -lnvpair -lzfs + +OSNET=${NETBSDSRCDIR}/external/cddl/osnet +CPPFLAGS+= -DHAVE_ZFS +CPPFLAGS.zfs.c+= -I${NETBSDSRCDIR}/external +CPPFLAGS.zfs.c+= -I${OSNET}/include +CPPFLAGS.zfs.c+= -I${OSNET}/sys +CPPFLAGS.zfs.c+= -I${OSNET}/dist/head +CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libzpool/common +CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common +CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common/fs/zfs +CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libnvpair .endif CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-error=address-of-packed-member
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: christos Date: Fri Sep 17 14:48:32 UTC 2021 Modified Files: src/usr.sbin/fstyp: Makefile Log Message: Use CPPFLAGS for -D and -I so that lint works. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/fstyp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: kre Date: Fri Sep 17 14:09:00 UTC 2021 Modified Files: src/distrib/sets/lists/base: mi Log Message: Re-instate /usr/lib/dtrace which seems to have been accidentally deleted in the previous update. To generate a diff of this commit: cvs rdiff -u -r1.1282 -r1.1283 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1282 src/distrib/sets/lists/base/mi:1.1283 --- src/distrib/sets/lists/base/mi:1.1282 Thu Sep 16 23:32:49 2021 +++ src/distrib/sets/lists/base/mi Fri Sep 17 14:09:00 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1282 2021/09/16 23:32:49 christos Exp $ +# $NetBSD: mi,v 1.1283 2021/09/17 14:09:00 kre Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1350,6 +1350,7 @@ ./usr/lib/clang/13.0.0/lib base-sys-usr ./usr/lib/clang/13.0.0/lib/netbsd base-sys-usr ./usr/lib/clang/13.0.0/share base-sys-usr +./usr/lib/dtracebase-sys-usr dtrace ./usr/lib/dtrace/errno.d base-sys-usr dtrace ./usr/lib/dtrace/psinfo.d base-sys-usr dtrace ./usr/lib/dtrace/signal.d base-sys-usr dtrace
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: kre Date: Fri Sep 17 14:09:00 UTC 2021 Modified Files: src/distrib/sets/lists/base: mi Log Message: Re-instate /usr/lib/dtrace which seems to have been accidentally deleted in the previous update. To generate a diff of this commit: cvs rdiff -u -r1.1282 -r1.1283 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Fri Sep 17 13:02:52 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Sprinkle a little delay. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/if_urtwn.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/if_urtwn.c diff -u src/sys/dev/usb/if_urtwn.c:1.99 src/sys/dev/usb/if_urtwn.c:1.100 --- src/sys/dev/usb/if_urtwn.c:1.99 Fri Sep 17 13:00:20 2021 +++ src/sys/dev/usb/if_urtwn.c Fri Sep 17 13:02:52 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtwn.c,v 1.99 2021/09/17 13:00:20 nat Exp $ */ +/* $NetBSD: if_urtwn.c,v 1.100 2021/09/17 13:02:52 nat Exp $ */ /* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */ /*- @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.99 2021/09/17 13:00:20 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.100 2021/09/17 13:02:52 nat Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -3088,6 +3088,7 @@ urtwn_r92c_power_on(struct urtwn_softc * /* Unlock ISO/CLK/Power control register. */ urtwn_write_1(sc, R92C_RSV_CTRL, 0); + DELAY(5); /* Move SPS into PWM mode. */ urtwn_write_1(sc, R92C_SPS0_CTRL, 0x2b); DELAY(5); @@ -3153,6 +3154,9 @@ urtwn_r92c_power_on(struct urtwn_softc * urtwn_write_2(sc, R92C_CR, reg); urtwn_write_1(sc, 0xfe10, 0x19); + + urtwn_delay_ms(sc, 1); + return 0; }
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Fri Sep 17 13:02:52 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Sprinkle a little delay. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/if_urtwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Fri Sep 17 13:00:20 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Initialize firmware mailbox counter when firmware is reset. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/dev/usb/if_urtwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Fri Sep 17 13:00:20 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Initialize firmware mailbox counter when firmware is reset. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/dev/usb/if_urtwn.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/if_urtwn.c diff -u src/sys/dev/usb/if_urtwn.c:1.98 src/sys/dev/usb/if_urtwn.c:1.99 --- src/sys/dev/usb/if_urtwn.c:1.98 Fri Sep 17 12:58:31 2021 +++ src/sys/dev/usb/if_urtwn.c Fri Sep 17 13:00:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtwn.c,v 1.98 2021/09/17 12:58:31 nat Exp $ */ +/* $NetBSD: if_urtwn.c,v 1.99 2021/09/17 13:00:20 nat Exp $ */ /* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */ /*- @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.98 2021/09/17 12:58:31 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.99 2021/09/17 13:00:20 nat Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -3362,7 +3362,10 @@ urtwn_fw_reset(struct urtwn_softc *sc) KASSERT(mutex_owned(>sc_write_mtx)); /* Tell 8051 to reset itself. */ + mutex_enter(>sc_fwcmd_mtx); urtwn_write_1(sc, R92C_HMETFR + 3, 0x20); + sc->fwcur = 0; + mutex_exit(>sc_fwcmd_mtx); /* Wait until 8051 resets by itself. */ for (ntries = 0; ntries < 100; ntries++) { @@ -3404,6 +3407,11 @@ urtwn_r88e_fw_reset(struct urtwn_softc * } DELAY(50); + mutex_enter(>sc_fwcmd_mtx); + /* Init firmware commands ring. */ + sc->fwcur = 0; + mutex_exit(>sc_fwcmd_mtx); + } static int
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Fri Sep 17 12:58:31 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Serialize sending of firmware commands to device. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/sys/dev/usb/if_urtwn.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/if_urtwn.c diff -u src/sys/dev/usb/if_urtwn.c:1.97 src/sys/dev/usb/if_urtwn.c:1.98 --- src/sys/dev/usb/if_urtwn.c:1.97 Fri Sep 17 12:55:10 2021 +++ src/sys/dev/usb/if_urtwn.c Fri Sep 17 12:58:31 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtwn.c,v 1.97 2021/09/17 12:55:10 nat Exp $ */ +/* $NetBSD: if_urtwn.c,v 1.98 2021/09/17 12:58:31 nat Exp $ */ /* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */ /*- @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.97 2021/09/17 12:55:10 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.98 2021/09/17 12:58:31 nat Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1106,7 +1106,6 @@ urtwn_fw_cmd(struct urtwn_softc *sc, uin mutex_enter(>sc_fwcmd_mtx); fwcur = sc->fwcur; sc->fwcur = (sc->fwcur + 1) % R92C_H2C_NBOX; - mutex_exit(>sc_fwcmd_mtx); /* Wait for current FW box to be empty. */ for (ntries = 0; ntries < 100; ntries++) { @@ -1117,6 +1116,7 @@ urtwn_fw_cmd(struct urtwn_softc *sc, uin if (ntries == 100) { aprint_error_dev(sc->sc_dev, "could not send firmware command %d\n", id); + mutex_exit(>sc_fwcmd_mtx); return ETIMEDOUT; } @@ -1145,6 +1145,7 @@ urtwn_fw_cmd(struct urtwn_softc *sc, uin } else { urtwn_write_region(sc, R92C_HMEBOX(fwcur), cp, len); } + mutex_exit(>sc_fwcmd_mtx); return 0; }
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Fri Sep 17 12:58:31 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Serialize sending of firmware commands to device. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/sys/dev/usb/if_urtwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Fri Sep 17 12:55:10 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Use urtwn_delay_ms were possibile. NFC intended. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/dev/usb/if_urtwn.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/if_urtwn.c diff -u src/sys/dev/usb/if_urtwn.c:1.96 src/sys/dev/usb/if_urtwn.c:1.97 --- src/sys/dev/usb/if_urtwn.c:1.96 Tue Mar 2 22:21:38 2021 +++ src/sys/dev/usb/if_urtwn.c Fri Sep 17 12:55:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtwn.c,v 1.96 2021/03/02 22:21:38 nat Exp $ */ +/* $NetBSD: if_urtwn.c,v 1.97 2021/09/17 12:55:10 nat Exp $ */ /* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */ /*- @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.96 2021/03/02 22:21:38 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.97 2021/09/17 12:55:10 nat Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1112,7 +1112,7 @@ urtwn_fw_cmd(struct urtwn_softc *sc, uin for (ntries = 0; ntries < 100; ntries++) { if (!(urtwn_read_1(sc, R92C_HMETFR) & (1 << fwcur))) break; - DELAY(2000); + urtwn_delay_ms(sc, 2); } if (ntries == 100) { aprint_error_dev(sc->sc_dev, @@ -1195,16 +1195,16 @@ urtwn_rf_read(struct urtwn_softc *sc, in urtwn_bb_write(sc, R92C_HSSI_PARAM2(0), reg[0] & ~R92C_HSSI_PARAM2_READ_EDGE); - DELAY(1000); + urtwn_delay_ms(sc, 1); urtwn_bb_write(sc, R92C_HSSI_PARAM2(chain), RW(reg[chain], R92C_HSSI_PARAM2_READ_ADDR, addr) | R92C_HSSI_PARAM2_READ_EDGE); - DELAY(1000); + urtwn_delay_ms(sc, 1); urtwn_bb_write(sc, R92C_HSSI_PARAM2(0), reg[0] | R92C_HSSI_PARAM2_READ_EDGE); - DELAY(1000); + urtwn_delay_ms(sc, 1); if (urtwn_bb_read(sc, R92C_HSSI_PARAM1(chain)) & R92C_HSSI_PARAM1_PI) { val = urtwn_bb_read(sc, R92C_HSPI_READBACK(chain));
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Fri Sep 17 12:55:10 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Use urtwn_delay_ms were possibile. NFC intended. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/dev/usb/if_urtwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: rin Date: Fri Sep 17 10:15:35 UTC 2021 Modified Files: src/sys/dev/ic: wdc.c Log Message: wdc_sataprobe: Fix lock leak when atabus_alloc_drives() fails. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/sys/dev/ic/wdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: rin Date: Fri Sep 17 10:15:35 UTC 2021 Modified Files: src/sys/dev/ic: wdc.c Log Message: wdc_sataprobe: Fix lock leak when atabus_alloc_drives() fails. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/sys/dev/ic/wdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/wdc.c diff -u src/sys/dev/ic/wdc.c:1.306 src/sys/dev/ic/wdc.c:1.307 --- src/sys/dev/ic/wdc.c:1.306 Mon Jan 4 15:14:32 2021 +++ src/sys/dev/ic/wdc.c Fri Sep 17 10:15:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: wdc.c,v 1.306 2021/01/04 15:14:32 skrll Exp $ */ +/* $NetBSD: wdc.c,v 1.307 2021/09/17 10:15:35 rin Exp $ */ /* * Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.306 2021/01/04 15:14:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.307 2021/09/17 10:15:35 rin Exp $"); #include "opt_ata.h" #include "opt_wdc.h" @@ -245,8 +245,10 @@ wdc_sataprobe(struct ata_channel *chp) "cl=0x%x ch=0x%x\n", device_xname(chp->ch_atac->atac_dev), chp->ch_channel, sc, sn, cl, ch), DEBUG_PROBE); - if (atabus_alloc_drives(chp, wdc->wdc_maxdrives) != 0) + if (atabus_alloc_drives(chp, wdc->wdc_maxdrives) != 0) { + ata_channel_unlock(chp); return; + } /* * sc and sn are supposed to be 0x1 for ATAPI, but in some * cases we get wrong values here, so ignore it.
CVS commit: src
Module Name:src Committed By: andvar Date: Fri Sep 17 08:13:06 UTC 2021 Modified Files: src/lib/libperfuse: fuse.h src/sys/arch/arm/at91: at91rm9200reg.h at91sam9260reg.h at91sam9261reg.h src/sys/arch/arm/ep93xx: ep93xxreg.h src/sys/arch/arm/ixp12x0: ixp12x0reg.h src/sys/arch/mips/cavium/dev: octeon_pko.c src/sys/dev/marvell: if_mvxpe.c Log Message: some love to double letters (in comments). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libperfuse/fuse.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91rm9200reg.h \ src/sys/arch/arm/at91/at91sam9261reg.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/at91/at91sam9260reg.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ep93xx/ep93xxreg.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ixp12x0/ixp12x0reg.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/cavium/dev/octeon_pko.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/marvell/if_mvxpe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libperfuse/fuse.h diff -u src/lib/libperfuse/fuse.h:1.7 src/lib/libperfuse/fuse.h:1.8 --- src/lib/libperfuse/fuse.h:1.7 Tue Oct 18 17:56:31 2016 +++ src/lib/libperfuse/fuse.h Fri Sep 17 08:13:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: fuse.h,v 1.7 2016/10/18 17:56:31 christos Exp $ */ +/* $NetBSD: fuse.h,v 1.8 2021/09/17 08:13:06 andvar Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. @@ -453,7 +453,7 @@ struct fuse_fallocate_in { }; #if 0 /* Duplicated in perfuse.h to avoid making fuse.h public */ -/* Send from kernel to proces */ +/* Send from kernel to process */ struct fuse_in_header { uint32_t len; uint32_t opcode; Index: src/sys/arch/arm/at91/at91rm9200reg.h diff -u src/sys/arch/arm/at91/at91rm9200reg.h:1.3 src/sys/arch/arm/at91/at91rm9200reg.h:1.4 --- src/sys/arch/arm/at91/at91rm9200reg.h:1.3 Fri Oct 23 06:53:13 2009 +++ src/sys/arch/arm/at91/at91rm9200reg.h Fri Sep 17 08:13:06 2021 @@ -1,5 +1,5 @@ -/* $Id: at91rm9200reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ -/* $NetBSD: at91rm9200reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ +/* $Id: at91rm9200reg.h,v 1.4 2021/09/17 08:13:06 andvar Exp $ */ +/* $NetBSD: at91rm9200reg.h,v 1.4 2021/09/17 08:13:06 andvar Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -76,7 +76,7 @@ * * Some device registers are statically mapped on upper address region. * because we have to access them before bus_space is initialized. - * Most devices are dynamicaly mapped by bus_space_map(). In this case, + * Most devices are dynamically mapped by bus_space_map(). In this case, * the actual mapped (virtual) address are not cared by device drivers. */ Index: src/sys/arch/arm/at91/at91sam9261reg.h diff -u src/sys/arch/arm/at91/at91sam9261reg.h:1.3 src/sys/arch/arm/at91/at91sam9261reg.h:1.4 --- src/sys/arch/arm/at91/at91sam9261reg.h:1.3 Fri Oct 23 06:53:13 2009 +++ src/sys/arch/arm/at91/at91sam9261reg.h Fri Sep 17 08:13:06 2021 @@ -1,5 +1,5 @@ -/* $Id: at91sam9261reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ -/* $NetBSD: at91sam9261reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ +/* $Id: at91sam9261reg.h,v 1.4 2021/09/17 08:13:06 andvar Exp $ */ +/* $NetBSD: at91sam9261reg.h,v 1.4 2021/09/17 08:13:06 andvar Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -84,7 +84,7 @@ * * Some device registers are statically mapped on upper address region. * because we have to access them before bus_space is initialized. - * Most devices are dynamicaly mapped by bus_space_map(). In this case, + * Most devices are dynamically mapped by bus_space_map(). In this case, * the actual mapped (virtual) address are not cared by device drivers. */ Index: src/sys/arch/arm/at91/at91sam9260reg.h diff -u src/sys/arch/arm/at91/at91sam9260reg.h:1.1 src/sys/arch/arm/at91/at91sam9260reg.h:1.2 --- src/sys/arch/arm/at91/at91sam9260reg.h:1.1 Fri Nov 4 17:20:54 2011 +++ src/sys/arch/arm/at91/at91sam9260reg.h Fri Sep 17 08:13:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: at91sam9260reg.h,v 1.1 2011/11/04 17:20:54 aymeric Exp $ */ +/* $NetBSD: at91sam9260reg.h,v 1.2 2021/09/17 08:13:06 andvar Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -84,7 +84,7 @@ * * Some device registers are statically mapped on upper address region. * because we have to access them before bus_space is initialized. - * Most devices are dynamicaly mapped by bus_space_map(). In this case, + * Most devices are dynamically mapped by bus_space_map(). In this case, * the actual mapped (virtual) address are not cared by device drivers. */ Index: src/sys/arch/arm/ep93xx/ep93xxreg.h diff -u src/sys/arch/arm/ep93xx/ep93xxreg.h:1.7 src/sys/arch/arm/ep93xx/ep93xxreg.h:1.8 --- src/sys/arch/arm/ep93xx/ep93xxreg.h:1.7 Fri Oct 23 00:39:30 2009 +++ src/sys/arch/arm/ep93xx/ep93xxreg.h Fri Sep 17 08:13:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ep93xxreg.h,v 1.7 2009/10/23
CVS commit: src
Module Name:src Committed By: andvar Date: Fri Sep 17 08:13:06 UTC 2021 Modified Files: src/lib/libperfuse: fuse.h src/sys/arch/arm/at91: at91rm9200reg.h at91sam9260reg.h at91sam9261reg.h src/sys/arch/arm/ep93xx: ep93xxreg.h src/sys/arch/arm/ixp12x0: ixp12x0reg.h src/sys/arch/mips/cavium/dev: octeon_pko.c src/sys/dev/marvell: if_mvxpe.c Log Message: some love to double letters (in comments). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libperfuse/fuse.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91rm9200reg.h \ src/sys/arch/arm/at91/at91sam9261reg.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/at91/at91sam9260reg.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ep93xx/ep93xxreg.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ixp12x0/ixp12x0reg.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/cavium/dev/octeon_pko.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/marvell/if_mvxpe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.