CVS commit: src/external/gpl3/binutils/dist/gas
Module Name:src Committed By: tron Date: Fri Sep 11 10:41:43 UTC 2009 Modified Files: src/external/gpl3/binutils/dist/gas: remap.c Log Message: Avoid using alloca(3) to unbreak SSP builds. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/binutils/dist/gas/remap.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/gpl3/binutils/dist/gas/remap.c diff -u src/external/gpl3/binutils/dist/gas/remap.c:1.1.1.1 src/external/gpl3/binutils/dist/gas/remap.c:1.2 --- src/external/gpl3/binutils/dist/gas/remap.c:1.1.1.1 Tue Aug 18 09:30:15 2009 +++ src/external/gpl3/binutils/dist/gas/remap.c Fri Sep 11 10:41:42 2009 @@ -82,8 +82,8 @@ return filename; name = filename + map-old_len; name_len = strlen (name) + 1; - s = (char *) alloca (name_len + map-new_len); + s = (char *) xmalloc (name_len + map-new_len); memcpy (s, map-new_prefix, map-new_len); memcpy (s + map-new_len, name, name_len); - return xstrdup (s); + return s; }
CVS commit: src/sbin/routed/rtquery
Module Name:src Committed By: wiz Date: Fri Sep 11 11:44:38 UTC 2009 Modified Files: src/sbin/routed/rtquery: rtquery.8 Log Message: Add xref to pkgsrc/net/gated, so people know where to find gated(8). Improve markup of RFCs in SEE ALSO. Sort options. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sbin/routed/rtquery/rtquery.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/routed/rtquery/rtquery.8 diff -u src/sbin/routed/rtquery/rtquery.8:1.19 src/sbin/routed/rtquery/rtquery.8:1.20 --- src/sbin/routed/rtquery/rtquery.8:1.19 Tue Sep 23 12:14:49 2003 +++ src/sbin/routed/rtquery/rtquery.8 Fri Sep 11 11:44:38 2009 @@ -1,6 +1,6 @@ -.\ $NetBSD: rtquery.8,v 1.19 2003/09/23 12:14:49 wiz Exp $ +.\ $NetBSD: rtquery.8,v 1.20 2009/09/11 11:44:38 wiz Exp $ .\ -.Dd June 1, 1996 +.Dd September 11, 2009 .Dt RTQUERY 8 .Os .Sh NAME @@ -8,10 +8,10 @@ .Nd query routing daemons for their routing tables .Sh SYNOPSIS .Nm -.Op Fl np1 -.Op Fl w Ar timeout -.Op Fl r Ar addr +.Op Fl 1np .Op Fl a Ar secret +.Op Fl r Ar addr +.Op Fl w Ar timeout .Ar host ... .Nm .Op Fl t Ar op @@ -114,8 +114,15 @@ .El .Sh SEE ALSO .Xr gated 8 , -.Xr routed 8 -.br -RFC\ 1058 - Routing Information Protocol, RIPv1 -.br -RFC\ 1723 - Routing Information Protocol, RIPv2 +.Xr routed 8 , +.Pa pkgsrc/net/gated +.Rs +.%R RFC 1058 +.%T Routing Information Protocol, RIPv1 +.%D 1988 +.Re +.Rs +.%R RFC 1723 +.%T Routing Information Protocol, RIPv2 +.%D 1994 +.Re
CVS commit: src/sys/arch/ofppc/stand/ofwboot
Module Name:src
Committed By: phx
Date: Fri Sep 11 12:00:13 UTC 2009
Modified Files:
src/sys/arch/ofppc/stand/ofwboot: Makefile ofdev.c ofdev.h version
Added Files:
src/sys/arch/ofppc/stand/ofwboot: mbr.c mbr.h rdb.c rdb.h
Log Message:
Added support for RDB partitions.
Moved MBR parition code out of ofdev.c into mbr.c.
Tested on Pegasos2 (RDB and MBR) and RS6000.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/ofppc/stand/ofwboot/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/ofppc/stand/ofwboot/mbr.c \
src/sys/arch/ofppc/stand/ofwboot/mbr.h \
src/sys/arch/ofppc/stand/ofwboot/rdb.c \
src/sys/arch/ofppc/stand/ofwboot/rdb.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ofppc/stand/ofwboot/ofdev.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ofppc/stand/ofwboot/ofdev.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ofppc/stand/ofwboot/version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ofppc/stand/ofwboot/Makefile
diff -u src/sys/arch/ofppc/stand/ofwboot/Makefile:1.24 src/sys/arch/ofppc/stand/ofwboot/Makefile:1.25
--- src/sys/arch/ofppc/stand/ofwboot/Makefile:1.24 Mon Jan 12 07:49:57 2009
+++ src/sys/arch/ofppc/stand/ofwboot/Makefile Fri Sep 11 12:00:12 2009
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2009/01/12 07:49:57 tsutsui Exp $
+# $NetBSD: Makefile,v 1.25 2009/09/11 12:00:12 phx Exp $
S!= cd ${.CURDIR}/../../../.. ; pwd
PROG= ofwboot
-SRCS= ofwstart.S Locore.c boot.c ofdev.c net.c netif_of.c vers.c
+SRCS= ofwstart.S Locore.c boot.c ofdev.c net.c netif_of.c
+SRCS+= mbr.c rdb.c vers.c
CFLAGS+= -msoft-float -Wno-main -ffreestanding
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
#CPPFLAGS+= -g -DALLOC_TRACE -DDEBUG #-DOFW_DEBUG -DNETIF_DEBUG
Index: src/sys/arch/ofppc/stand/ofwboot/ofdev.c
diff -u src/sys/arch/ofppc/stand/ofwboot/ofdev.c:1.16 src/sys/arch/ofppc/stand/ofwboot/ofdev.c:1.17
--- src/sys/arch/ofppc/stand/ofwboot/ofdev.c:1.16 Mon Jan 12 07:49:57 2009
+++ src/sys/arch/ofppc/stand/ofwboot/ofdev.c Fri Sep 11 12:00:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdev.c,v 1.16 2009/01/12 07:49:57 tsutsui Exp $ */
+/* $NetBSD: ofdev.c,v 1.17 2009/09/11 12:00:12 phx Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -37,8 +37,6 @@
#include ofdev.h
#include sys/param.h
-#include sys/disklabel.h
-#include sys/bootblock.h
#include netinet/in.h
@@ -52,6 +50,8 @@
#include net.h
#include openfirm.h
+#include mbr.h
+#include rdb.h
extern char bootdev[];
@@ -120,7 +120,7 @@
return 0;
}
-static int
+int
strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
size_t *rsize)
{
@@ -186,76 +186,6 @@
char opened_name[256];
int floppyboot;
-static u_long
-get_long(const void *p)
-{
- const unsigned char *cp = p;
-
- return cp[0] | (cp[1] 8) | (cp[2] 16) | (cp[3] 24);
-}
-
-/*
- * Find a valid disklabel.
- */
-static int
-search_label(struct of_dev *devp, u_long off, char *buf, struct disklabel *lp,
-u_long off0)
-{
- size_t read;
- struct mbr_partition *p;
- int i;
- u_long poff;
- static int recursion;
-
- if (strategy(devp, F_READ, off, DEV_BSIZE, buf, read)
- || read != DEV_BSIZE)
- return ERDLAB;
-
- if (*(u_int16_t *)buf[MBR_MAGIC_OFFSET] != sa_htole16(MBR_MAGIC))
- return ERDLAB;
-
- if (recursion++ = 1)
- off0 += off;
- for (p = (struct mbr_partition *)(buf + MBR_PART_OFFSET), i = 0;
- i MBR_PART_COUNT; i++, p++) {
- if (p-mbrp_type == MBR_PTYPE_NETBSD
-#ifdef COMPAT_386BSD_MBRPART
- || (p-mbrp_type == MBR_PTYPE_386BSD
- (printf(WARNING: old BSD partition ID!\n), 1)
- /* XXX XXX - libsa printf() is void */ )
-#endif
- ) {
- poff = get_long(p-mbrp_start) + off0;
- if (strategy(devp, F_READ, poff + LABELSECTOR,
- DEV_BSIZE, buf, read) == 0
- read == DEV_BSIZE) {
-if (!getdisklabel(buf, lp)) {
- recursion--;
- return 0;
-}
- }
- if (strategy(devp, F_READ, off, DEV_BSIZE, buf, read)
- || read != DEV_BSIZE) {
-recursion--;
-return ERDLAB;
- }
- } else if (p-mbrp_type == MBR_PTYPE_EXT) {
- poff = get_long(p-mbrp_start);
- if (!search_label(devp, poff, buf, lp, off0)) {
-recursion--;
-return 0;
- }
- if (strategy(devp, F_READ, off, DEV_BSIZE, buf, read)
- || read != DEV_BSIZE) {
-recursion--;
-return ERDLAB;
- }
- }
- }
-
- recursion--;
- return ERDLAB;
-}
int
devopen(struct open_file *of, const char *name, char **file)
@@ -263,11 +193,12 @@
char *cp;
char partition;
char fname[256];
- char buf[DEV_BSIZE];
struct disklabel label;
int handle, part;
size_t read;
int error = 0;
+ /* allow disk blocks up to 65536 bytes */
+ char buf[DEV_BSIZE7];
if (ofdev.handle != -1)
panic(devopen);
@@ -326,14 +257,19 @@
ofdev.type = OFDEV_DISK;
ofdev.bsize = DEV_BSIZE;
- /* First try to find a disklabel without MBR partitions */
+
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: phx
Date: Fri Sep 11 13:11:16 UTC 2009
Modified Files:
src/sys/arch/amiga/dev: clock.c
Log Message:
Reverted last change after discussion with the author, Michael L. Hitch:
http://mail-index.netbsd.org/port-amiga/2009/08/14/msg007164.html
We have a full 32-bit counter, so the masking is not needed.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amiga/dev/clock.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/amiga/dev/clock.c
diff -u src/sys/arch/amiga/dev/clock.c:1.48 src/sys/arch/amiga/dev/clock.c:1.49
--- src/sys/arch/amiga/dev/clock.c:1.48 Sun Dec 7 03:48:43 2008
+++ src/sys/arch/amiga/dev/clock.c Fri Sep 11 13:11:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.48 2008/12/07 03:48:43 mhitch Exp $ */
+/* $NetBSD: clock.c,v 1.49 2009/09/11 13:11:15 phx Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.48 2008/12/07 03:48:43 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.49 2009/09/11 13:11:15 phx Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -112,7 +112,7 @@
static struct timecounter clk_timecounter = {
clk_getcounter, /* get_timecount */
0, /* no poll_pps */
- 0x0fffu, /* counter_mask */
+ ~0u, /* counter_mask */
0, /* frequency */
clock, /* name, overriden later */
100, /* quality */
@@ -159,7 +159,6 @@
clockattach(struct device *pdp, struct device *dp, void *auxp)
{
const char *clockchip;
- u_int counter_mask;
unsigned short interval;
#ifdef DRACO
u_char dracorev;
@@ -189,14 +188,8 @@
amiga_clk_interval = (eclockfreq / hz);
- counter_mask = 0x8000;
- while (counter_mask != 0 (counter_mask amiga_clk_interval) == 0)
- counter_mask = 1;
- counter_mask -= 1;
-
clk_timecounter.tc_name = clockchip;
clk_timecounter.tc_frequency = eclockfreq;
- clk_timecounter.tc_counter_mask = counter_mask;
fast_delay_limit = UINT_MAX / amiga_clk_interval;
CVS commit: src/sys/dev
Module Name:src
Committed By: tron
Date: Fri Sep 11 13:36:37 UTC 2009
Modified Files:
src/sys/dev: cgd.c
Log Message:
Fix incomplete conversion from stack buffers to heap buffers.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/cgd.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/cgd.c
diff -u src/sys/dev/cgd.c:1.59 src/sys/dev/cgd.c:1.60
--- src/sys/dev/cgd.c:1.59 Fri Sep 11 09:28:34 2009
+++ src/sys/dev/cgd.c Fri Sep 11 13:36:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.59 2009/09/11 09:28:34 tron Exp $ */
+/* $NetBSD: cgd.c,v 1.60 2009/09/11 13:36:37 tron Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.59 2009/09/11 09:28:34 tron Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.60 2009/09/11 13:36:37 tron Exp $);
#include sys/types.h
#include sys/param.h
@@ -792,7 +792,7 @@
DIAGCONDPANIC(sizeof(daddr_t) blocksize,
(cgd_cipher: sizeof(daddr_t) blocksize));
- memset(zero_iv, 0x0, sizeof(zero_iv));
+ memset(zero_iv, 0x0, blocksize);
dstuio.uio_iov = dstiov;
dstuio.uio_iovcnt = 2;
@@ -811,13 +811,13 @@
dstiov[1].iov_base = dst;
srciov[1].iov_base = src;
- memset(blkno_buf, 0x0, sizeof(blkno_buf));
+ memset(blkno_buf, 0x0, blocksize);
blkno2blkno_buf(blkno_buf, blkno);
if (dir == CGD_CIPHER_DECRYPT) {
dstuio.uio_iovcnt = 1;
srcuio.uio_iovcnt = 1;
IFDEBUG(CGDB_CRYPTO, hexprint(step 0: blkno_buf,
- blkno_buf, sizeof(blkno_buf)));
+ blkno_buf, blocksize));
cipher(cs-sc_cdata.cf_priv, dstuio, srcuio,
zero_iv, CGD_CIPHER_ENCRYPT);
memcpy(blkno_buf, sink, blocksize);
@@ -826,10 +826,10 @@
}
IFDEBUG(CGDB_CRYPTO, hexprint(step 1: blkno_buf,
- blkno_buf, sizeof(blkno_buf)));
+ blkno_buf, blocksize));
cipher(cs-sc_cdata.cf_priv, dstuio, srcuio, zero_iv, dir);
IFDEBUG(CGDB_CRYPTO, hexprint(step 2: sink,
- sink, sizeof(sink)));
+ sink, blocksize));
dst += secsize;
src += secsize;
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: tsutsui
Date: Fri Sep 11 15:59:07 UTC 2009
Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c
Log Message:
Fix botch around argument check in ext2fs_mount(). Taken from ffs_vfsops.c.
Fixes LOCKDEBUG panic which is the same one mentioned in PR kern/41078
on trying to mount_ext2fs against a raw device, while that panic
seems to have another route cause around module_autoload() in
sys/miscfs/specfs/spec_vnops.c:spec_open().
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.144 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.145
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.144 Mon Jun 29 05:08:18 2009
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Fri Sep 11 15:59:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.144 2009/06/29 05:08:18 dholland Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.145 2009/09/11 15:59:07 tsutsui Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.144 2009/06/29 05:08:18 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.145 2009/09/11 15:59:07 tsutsui Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -384,14 +384,16 @@
* updating the mount is okay (for example, as far as securelevel goes)
* which leaves us with the normal check.
*/
- accessmode = VREAD;
- if (update ?
- (mp-mnt_iflag IMNT_WANTRDWR) != 0 :
- (mp-mnt_flag MNT_RDONLY) == 0)
- accessmode |= VWRITE;
- vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
- error = genfs_can_mount(devvp, accessmode, l-l_cred);
- VOP_UNLOCK(devvp, 0);
+ if (error == 0) {
+ accessmode = VREAD;
+ if (update ?
+ (mp-mnt_iflag IMNT_WANTRDWR) != 0 :
+ (mp-mnt_flag MNT_RDONLY) == 0)
+ accessmode |= VWRITE;
+ vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
+ error = genfs_can_mount(devvp, accessmode, l-l_cred);
+ VOP_UNLOCK(devvp, 0);
+ }
if (error) {
vrele(devvp);
CVS commit: src
Module Name:src
Committed By: mrg
Date: Fri Sep 11 16:01:59 UTC 2009
Modified Files:
src/compat/external/lib: Makefile
src/distrib/sets/lists/base: md.amd64 md.sparc64
Added Files:
src/compat/external/gpl3/binutils/lib: Makefile
src/compat/external/gpl3/binutils/lib/libbfd: Makefile
src/compat/external/gpl3/binutils/lib/libiberty: Makefile
src/compat/external/gpl3/binutils/lib/libopcodes: Makefile
Log Message:
build binutils 2.19 compat libraries. this lets HAVE_BINUTILS=219
work for amd64, and probably for sparc64.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/external/gpl3/binutils/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r0 -r1.1 \
src/compat/external/gpl3/binutils/lib/libiberty/Makefile
cvs rdiff -u -r0 -r1.1 \
src/compat/external/gpl3/binutils/lib/libopcodes/Makefile
cvs rdiff -u -r1.8 -r1.9 src/compat/external/lib/Makefile
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/base/md.sparc64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.8 src/compat/external/lib/Makefile:1.9
--- src/compat/external/lib/Makefile:1.8 Wed Jun 10 12:48:06 2009
+++ src/compat/external/lib/Makefile Fri Sep 11 16:01:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/06/10 12:48:06 christos Exp $
+# $NetBSD: Makefile,v 1.9 2009/09/11 16:01:59 mrg Exp $
#
# This Makefile exists to provide a single point to build
@@ -21,4 +21,8 @@
SUBDIR+= ../bsd/bind/lib
SUBDIR+= ../bsd/file/lib
+.if ${MKBINUTILS} != no ${HAVE_BINUTILS} == 219
+SUBDIR+=../gpl3/binutils/lib
+.endif
+
.include bsd.subdir.mk
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.67 src/distrib/sets/lists/base/md.amd64:1.68
--- src/distrib/sets/lists/base/md.amd64:1.67 Tue Sep 8 07:08:01 2009
+++ src/distrib/sets/lists/base/md.amd64 Fri Sep 11 16:01:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.67 2009/09/08 07:08:01 skrll Exp $
+# $NetBSD: md.amd64,v 1.68 2009/09/11 16:01:59 mrg Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -138,8 +138,10 @@
./usr/lib/i386/libnetpgp.so.2.0 base-compat-shlib compat,pic
./usr/lib/i386/libobjc.so.3 base-compat-shlib compat,pic
./usr/lib/i386/libobjc.so.3.0 base-compat-shlib compat,pic
-./usr/lib/i386/libopcodes.so.3 base-compat-shlib compat,pic,binutils
-./usr/lib/i386/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils
+./usr/lib/i386/libopcodes.so.3 base-compat-shlib compat,pic,binutils=216
+./usr/lib/i386/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils=216
+./usr/lib/i386/libopcodes.so.4 base-compat-shlib compat,pic,binutils=219
+./usr/lib/i386/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils=219
./usr/lib/i386/libossaudio.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libossaudio.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libp2k.so.1 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.59 src/distrib/sets/lists/base/md.sparc64:1.60
--- src/distrib/sets/lists/base/md.sparc64:1.59 Thu Sep 3 15:35:59 2009
+++ src/distrib/sets/lists/base/md.sparc64 Fri Sep 11 16:01:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.59 2009/09/03 15:35:59 pooka Exp $
+# $NetBSD: md.sparc64,v 1.60 2009/09/11 16:01:59 mrg Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root
./usr/bin/fdformatbase-util-bin
@@ -132,8 +132,10 @@
./usr/lib/sparc/libnetpgp.so.2.0 base-compat-shlib compat,pic
./usr/lib/sparc/libobjc.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/libobjc.so.3.0 base-compat-shlib compat,pic
-./usr/lib/sparc/libopcodes.so.3 base-compat-shlib compat,pic
-./usr/lib/sparc/libopcodes.so.3.0 base-compat-shlib compat,pic
+./usr/lib/sparc/libopcodes.so.3 base-compat-shlib compat,pic,binutils=216
+./usr/lib/sparc/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils=216
+./usr/lib/sparc/libopcodes.so.4 base-compat-shlib compat,pic,binutils=219
+./usr/lib/sparc/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils=219
./usr/lib/sparc/libossaudio.so.1 base-compat-shlib compat,pic
./usr/lib/sparc/libossaudio.so.1.0 base-compat-shlib compat,pic
./usr/lib/sparc/libp2k.so.1 base-compat-shlib compat,pic
Added files:
Index: src/compat/external/gpl3/binutils/lib/Makefile
diff -u /dev/null src/compat/external/gpl3/binutils/lib/Makefile:1.1
--- /dev/null Fri Sep 11 16:01:59 2009
+++ src/compat/external/gpl3/binutils/lib/Makefile Fri Sep 11 16:01:58 2009
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2009/09/11
CVS commit: src
Module Name:src
Committed By: apb
Date: Fri Sep 11 18:17:04 UTC 2009
Modified Files:
src/doc: CHANGES
src/etc: rc rc.subr
src/etc/defaults: rc.conf
src/share/man/man5: rc.conf.5
src/share/man/man8: rc.8 rc.subr.8
Log Message:
Add a postprocessor to /etc/rc, which logs messages to /var/run/rc.log,
and which can suppress output in silent mode. Silent mode is enabled
via the new rc_silent variable, which defaults to a value that depends
on the kern.boothowto sysctl.
Part of the /etc/rc silent changes requested in PR 41946
and proposed in tech-userlevel.
To generate a diff of this commit:
cvs rdiff -u -r1.1287 -r1.1288 src/doc/CHANGES
cvs rdiff -u -r1.163 -r1.164 src/etc/rc
cvs rdiff -u -r1.77 -r1.78 src/etc/rc.subr
cvs rdiff -u -r1.104 -r1.105 src/etc/defaults/rc.conf
cvs rdiff -u -r1.132 -r1.133 src/share/man/man5/rc.conf.5
cvs rdiff -u -r1.31 -r1.32 src/share/man/man8/rc.8
cvs rdiff -u -r1.22 -r1.23 src/share/man/man8/rc.subr.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1287 src/doc/CHANGES:1.1288
--- src/doc/CHANGES:1.1287 Fri Sep 11 18:14:58 2009
+++ src/doc/CHANGES Fri Sep 11 18:17:04 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1287 $
+# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1288 $
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -389,3 +389,6 @@
build.sh: Add a modules operation which builds kernel modules and
installs them into DESTDIR. [jnemeth 20090907]
sysctl(7): Add kern.boothowto variable. [apb 20090911]
+ rc(8): Output is now logged to /var/run/rc.log. A new rc_silent
+ option, enabled if the kernel is booted in silent mode,
+ suppresses output to the console. [apb 20090911]
Index: src/etc/rc
diff -u src/etc/rc:1.163 src/etc/rc:1.164
--- src/etc/rc:1.163 Fri Apr 10 16:18:04 2009
+++ src/etc/rc Fri Sep 11 18:17:04 2009
@@ -1,9 +1,10 @@
#!/bin/sh
#
-# $NetBSD: rc,v 1.163 2009/04/10 16:18:04 joerg Exp $
+# $NetBSD: rc,v 1.164 2009/09/11 18:17:04 apb Exp $
#
# rc --
-# Run the scripts in /etc/rc.d with rcorder.
+# Run the scripts in /etc/rc.d with rcorder, and log output
+# to /var/run/rc.log.
# System startup script run by init(8) on autoboot or after single-user.
# Output and error are redirected to console by init, and the console
@@ -13,10 +14,16 @@
export PATH=/sbin:/bin:/usr/sbin:/usr/bin
umask 022
-. /etc/rc.subr
+if [ -e ./rc.subr ] ; then
+ . ./rc.subr # for testing
+else
+ . /etc/rc.subr
+fi
. /etc/rc.conf
_rc_conf_loaded=true
+: ${RC_LOG_FILE:=/var/run/rc.log}
+
if ! checkyesno rc_configured; then
echo /etc/rc.conf is not configured. Multiuser boot aborted.
exit 1
@@ -27,24 +34,363 @@
rc_fast=yes # run_rc_command(): do fast booting
fi
-stty status '^T'
+#
+# Completely ignore INT and QUIT at the outer level. The rc_real_work()
+# function should do something different.
+#
+trap '' INT QUIT
-# Set shell to ignore SIGINT, but not children;
-# shell catches SIGQUIT and returns to single user.
#
-trap : INT
-trap echo 'Boot interrupted.'; exit 1 QUIT
+# This string will be used to mark lines of meta-data sent over the pipe
+# from the rc_real_work() function to the rc_postprocess() function. Lines
+# not so marked are assumed to be output from rc.d scripts.
+#
+# This string is long and unique to ensure that it does not accidentally
+# appear in output from any rc.d script. It must not contain any
+# characters that are special to glob expansion ('*', '?', '[', or ']').
+#
+rc_metadata_prefix=$0:$$:metadata:;
-date
+# Child scripts may sometimes want to print directly to the original
+# stdout and stderr, bypassing the pipe to the postprocessor. These
+# _rc_*_fd variables are private, shared with /etc/rc.subr, but not
+# intended to be used directly by child scripts. (Child scripts
+# may use rc.subr's no_rc_postprocess function.)
+#
+_rc_original_stdout_fd=7; export _rc_original_stdout_fd
+_rc_original_stderr_fd=8; export _rc_original_stderr_fd
+eval exec ${_rc_original_stdout_fd}1
+eval exec ${_rc_original_stderr_fd}2
-scripts=$(for rcd in ${rc_directories:-/etc/rc.d}; do
- test -d ${rcd} echo ${rcd}/*;
-done)
-files=$(rcorder -s nostart ${rc_rcorder_flags} ${scripts})
+#
+# rc_real_work
+# Do the real work. Output from this function will be piped into
+# rc_postprocess(), and some of the output will be marked as
+# metadata.
+#
+# The body of this function is defined using (...), not {...}, to force
+# it to run in a subshell.
+#
+rc_real_work()
+(
+ stty status '^T'
+
+ # print_rc_metadata() wants to be able to print to the pipe
+ # that goes to our postprocessor, even if its in a context
+ # with redirected output.
+ #
+ _rc_postprocessor_fd=9 ; export _rc_postprocessor_fd
+ eval exec ${_rc_postprocessor_fd}1
+
+ # Print a metadata line when we exit
CVS commit: src/etc/rc.d
Module Name:src
Committed By: apb
Date: Fri Sep 11 18:17:43 UTC 2009
Modified Files:
src/etc/rc.d: bootconf.sh
Log Message:
Adapt /etc/rc.d/bootconf.sh script to the new /etc/rc:
Add KEYWORD: interactive so that the script's prompts work,
and use rc_print_metadata to add a message to the log.
Part of the /etc/rc silent changes requested in PR 41946
and proposed in tech-userlevel.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/etc/rc.d/bootconf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/bootconf.sh
diff -u src/etc/rc.d/bootconf.sh:1.11 src/etc/rc.d/bootconf.sh:1.12
--- src/etc/rc.d/bootconf.sh:1.11 Sun Sep 6 12:30:45 2009
+++ src/etc/rc.d/bootconf.sh Fri Sep 11 18:17:43 2009
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $NetBSD: bootconf.sh,v 1.11 2009/09/06 12:30:45 apb Exp $
+# $NetBSD: bootconf.sh,v 1.12 2009/09/11 18:17:43 apb Exp $
#
# PROVIDE: bootconf
# REQUIRE: mountcritlocal
+# KEYWORD: interactive
$_rc_subr_loaded . /etc/rc.subr
@@ -66,6 +67,8 @@
fi
done
+ rc_print_metadata note:Using configuration \${conf}\
+
case $conf in
current|default)
;;
CVS commit: src/etc/rc.d
Module Name:src
Committed By: apb
Date: Fri Sep 11 18:18:03 UTC 2009
Modified Files:
src/etc/rc.d: cgd
Log Message:
Adapt /etc/rc.d/cgd script to the new /etc/rc:
Add KEYWORD: interactive so that prompting for passwords work, and
use print_rc_normal to print a message that could safely be suppressed.
Part of the /etc/rc silent changes requested in PR 41946
and proposed in tech-userlevel.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/etc/rc.d/cgd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/cgd
diff -u src/etc/rc.d/cgd:1.6 src/etc/rc.d/cgd:1.7
--- src/etc/rc.d/cgd:1.6 Tue Apr 21 16:08:57 2009
+++ src/etc/rc.d/cgd Fri Sep 11 18:18:03 2009
@@ -1,11 +1,12 @@
#!/bin/sh
#
-# $NetBSD: cgd,v 1.6 2009/04/21 16:08:57 joerg Exp $
+# $NetBSD: cgd,v 1.7 2009/09/11 18:18:03 apb Exp $
#
# PROVIDE: cgd
# REQUIRE: rndctl
# BEFORE: DISKS
+# KEYWORD: interactive
$_rc_subr_loaded . /etc/rc.subr
@@ -17,7 +18,7 @@
cgd_start()
{
if [ -f /etc/cgd/cgd.conf ]; then
- echo Configuring CGD devices.
+ print_rc_normal Configuring CGD devices.
cgdconfig -C
fi
}
CVS commit: src/sys/netbt
Module Name:src Committed By: plunky Date: Fri Sep 11 18:35:50 UTC 2009 Modified Files: src/sys/netbt: hci.h Log Message: add feature bits from 3.0 specification To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/netbt/hci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netbt/hci.h diff -u src/sys/netbt/hci.h:1.32 src/sys/netbt/hci.h:1.33 --- src/sys/netbt/hci.h:1.32 Tue Sep 1 18:02:44 2009 +++ src/sys/netbt/hci.h Fri Sep 11 18:35:50 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: hci.h,v 1.32 2009/09/01 18:02:44 plunky Exp $ */ +/* $NetBSD: hci.h,v 1.33 2009/09/11 18:35:50 plunky Exp $ */ /*- * Copyright (c) 2005 Iain Hibbert. @@ -54,7 +54,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: hci.h,v 1.32 2009/09/01 18:02:44 plunky Exp $ + * $Id: hci.h,v 1.33 2009/09/11 18:35:50 plunky Exp $ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.6 2005/01/07 01:45:43 imp Exp $ */ @@ -168,8 +168,13 @@ /* --- byte 7 */ #define HCI_LMP_LINK_SUPERVISION_TO 0x01 #define HCI_LMP_INQ_RSP_TX_POWER 0x02 +#define HCI_LMP_ENHANCED_POWER_CONTROL 0x04 #define HCI_LMP_EXTENDED_FEATURES 0x80 +/* page 1 of extended features */ +/* --- byte 0 */ +#define HCI_LMP_SSP 0x01 + /* Link types */ #define HCI_LINK_SCO 0x00 /* Voice */ #define HCI_LINK_ACL 0x01 /* Data */
CVS commit: src/usr.sbin/btconfig
Module Name:src
Committed By: plunky
Date: Fri Sep 11 19:22:15 UTC 2009
Modified Files:
src/usr.sbin/btconfig: btconfig.c
Log Message:
print features from 3.0 + HS spec, including extended features
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/btconfig/btconfig.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/btconfig/btconfig.c
diff -u src/usr.sbin/btconfig/btconfig.c:1.16 src/usr.sbin/btconfig/btconfig.c:1.17
--- src/usr.sbin/btconfig/btconfig.c:1.16 Tue Sep 1 18:04:33 2009
+++ src/usr.sbin/btconfig/btconfig.c Fri Sep 11 19:22:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btconfig.c,v 1.16 2009/09/01 18:04:33 plunky Exp $ */
+/* $NetBSD: btconfig.c,v 1.17 2009/09/11 19:22:15 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2006 Itronix, Inc. All rights reserved.);
-__RCSID($NetBSD: btconfig.c,v 1.16 2009/09/01 18:04:33 plunky Exp $);
+__RCSID($NetBSD: btconfig.c,v 1.17 2009/09/11 19:22:15 plunky Exp $);
#include sys/ioctl.h
#include sys/param.h
@@ -70,7 +70,9 @@
void print_class(const char *);
void print_voice(int);
void tag(const char *);
-void print_features(const char *, uint8_t *);
+void print_features(const char *, uint8_t, uint8_t *);
+void print_features0(uint8_t *);
+void print_features1(uint8_t *);
void do_inquiry(void);
void print_result(int, struct result *, int);
@@ -785,7 +787,19 @@
return;
load_value(HCI_CMD_READ_LOCAL_FEATURES, buf, HCI_FEATURES_SIZE);
- print_features(\tfeatures:, buf);
+ if ((buf[7] HCI_LMP_EXTENDED_FEATURES) == 0) {
+ print_features(\tfeatures:, 0, buf);
+ } else {
+ buf[0] = 0;
+
+ do {
+ hci_req(HCI_CMD_READ_LOCAL_EXTENDED_FEATURES, 0,
+buf, 1,
+buf, HCI_FEATURES_SIZE + 2);
+
+ print_features(\tfeatures page#%d:, buf[0], buf + 2);
+ } while (buf[0]++ buf[1]);
+ }
}
void
@@ -816,10 +830,23 @@
}
void
-print_features(const char *str, uint8_t *f)
+print_features(const char *fmt, uint8_t page, uint8_t *f)
{
- width = printf(%s, str);
+ width = printf(fmt, page);
+
+ switch(page) {
+ case 0: print_features0(f); break;
+ case 1: print_features1(f); break;
+ default: break;
+ }
+
+ tag(NULL);
+}
+
+void
+print_features0(uint8_t *f)
+{
/* --- byte 0 */
if (*f HCI_LMP_3SLOT) tag(3 slot);
@@ -894,9 +921,16 @@
/* --- byte 7 */
if (*f HCI_LMP_LINK_SUPERVISION_TO)tag(link supervision timeout changed);
if (*f HCI_LMP_INQ_RSP_TX_POWER) tag(inquiry rsp TX power level);
+ if (*f HCI_LMP_ENHANCED_POWER_CONTROL)tag(enhanced power control);
if (*f HCI_LMP_EXTENDED_FEATURES) tag(extended features);
+}
- tag(NULL);
+void
+print_features1(uint8_t *f)
+{
+
+ /* --- byte 0 */
+ if (*f HCI_LMP_SSP) tag(secure simple pairing);
}
void
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: phx
Date: Fri Sep 11 19:43:08 UTC 2009
Modified Files:
src/sys/arch/amiga/dev: clock.c
Log Message:
Handle the situation of a wrapped interval counter, while the hardclock()
interrupt was not yet executed to update the hardclock_ticks variable.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amiga/dev/clock.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/amiga/dev/clock.c
diff -u src/sys/arch/amiga/dev/clock.c:1.49 src/sys/arch/amiga/dev/clock.c:1.50
--- src/sys/arch/amiga/dev/clock.c:1.49 Fri Sep 11 13:11:15 2009
+++ src/sys/arch/amiga/dev/clock.c Fri Sep 11 19:43:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.49 2009/09/11 13:11:15 phx Exp $ */
+/* $NetBSD: clock.c,v 1.50 2009/09/11 19:43:08 phx Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.49 2009/09/11 13:11:15 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.50 2009/09/11 19:43:08 phx Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -326,6 +326,8 @@
static u_int
clk_getcounter(struct timecounter *tc)
{
+ static int last_hardclock_ticks;
+ static u_int last_clock_tick = 0;
int old_hardclock_ticks;
u_int clock_tick;
@@ -334,6 +336,19 @@
clock_tick = clk_gettick();
} while (old_hardclock_ticks != hardclock_ticks);
+ /*
+ * Handle the situation of a wrapped interval counter, while
+ * the hardclock() interrupt was not yet executed to update
+ * hardclock_ticks.
+ */
+ if (last_hardclock_ticks old_hardclock_ticks)
+ old_hardclock_ticks = last_hardclock_ticks;
+ if (clock_tick last_clock_tick
+ old_hardclock_ticks == last_hardclock_ticks)
+ old_hardclock_ticks++;
+ last_hardclock_ticks = old_hardclock_ticks;
+ last_clock_tick = clock_tick;
+
return old_hardclock_ticks * amiga_clk_interval + clock_tick;
}
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Fri Sep 11 19:43:26 UTC 2009 Modified Files: src/share/man/man7: sysctl.7 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man7/sysctl.7 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/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.23 src/share/man/man7/sysctl.7:1.24 --- src/share/man/man7/sysctl.7:1.23 Fri Sep 11 18:14:58 2009 +++ src/share/man/man7/sysctl.7 Fri Sep 11 19:43:26 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.23 2009/09/11 18:14:58 apb Exp $ +.\ $NetBSD: sysctl.7,v 1.24 2009/09/11 19:43:26 wiz Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\ -.Dd May 18, 2009 +.Dd September 11, 2009 .Dt SYSCTL 7 .Os .Sh NAME
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Fri Sep 11 19:44:03 UTC 2009 Modified Files: src/share/man/man9: boothowto.9 Log Message: Bump date for previous; add comma in enumeration. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/boothowto.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/boothowto.9 diff -u src/share/man/man9/boothowto.9:1.3 src/share/man/man9/boothowto.9:1.4 --- src/share/man/man9/boothowto.9:1.3 Fri Sep 11 18:14:58 2009 +++ src/share/man/man9/boothowto.9 Fri Sep 11 19:44:03 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: boothowto.9,v 1.3 2009/09/11 18:14:58 apb Exp $ +.\ $NetBSD: boothowto.9,v 1.4 2009/09/11 19:44:03 wiz Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 4, 2009 +.Dd September 11, 2009 .Dt BOOTHOWTO 9 .Os .Sh NAME @@ -259,7 +259,7 @@ .\ RB_USERCONF .Xr userconf 4 , .\ sysctl kern.boothowto -.Xr sysctl 7 +.Xr sysctl 7 , .\ sets boothowto .Xr boot 8 , .\ .Xr crash 8 ,
CVS commit: src/share/man
Module Name:src Committed By: wiz Date: Fri Sep 11 19:47:27 UTC 2009 Modified Files: src/share/man/man5: rc.conf.5 src/share/man/man8: rc.8 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/share/man/man5/rc.conf.5 cvs rdiff -u -r1.32 -r1.33 src/share/man/man8/rc.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.133 src/share/man/man5/rc.conf.5:1.134 --- src/share/man/man5/rc.conf.5:1.133 Fri Sep 11 18:17:04 2009 +++ src/share/man/man5/rc.conf.5 Fri Sep 11 19:47:27 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: rc.conf.5,v 1.133 2009/09/11 18:17:04 apb Exp $ +.\ $NetBSD: rc.conf.5,v 1.134 2009/09/11 19:47:27 wiz Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -55,7 +55,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd September 3, 2009 +.Dd September 11, 2009 .Dt RC.CONF 5 .Os .Sh NAME @@ -197,7 +197,7 @@ skipped. .It Sy rc_silent Boolean value. -If true then the usual output is suppresses, and +If true then the usual output is suppressed, and .Xr rc 8 invokes the command specified in the .Va rc_silent_cmd Index: src/share/man/man8/rc.8 diff -u src/share/man/man8/rc.8:1.32 src/share/man/man8/rc.8:1.33 --- src/share/man/man8/rc.8:1.32 Fri Sep 11 18:17:04 2009 +++ src/share/man/man8/rc.8 Fri Sep 11 19:47:27 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: rc.8,v 1.32 2009/09/11 18:17:04 apb Exp $ +.\ $NetBSD: rc.8,v 1.33 2009/09/11 19:47:27 wiz Exp $ .\ .\ Copyright (c) 2000-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 6, 2007 +.Dd September 11, 2009 .Dt RC 8 .Os .Sh NAME
CVS commit: src/share/man/man8
Module Name:src Committed By: wiz Date: Fri Sep 11 19:48:52 UTC 2009 Modified Files: src/share/man/man8: rc.subr.8 Log Message: Bump date for previous. Whitespace nit. Use Nm instead of Xr to itself. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man8/rc.subr.8 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/man8/rc.subr.8 diff -u src/share/man/man8/rc.subr.8:1.23 src/share/man/man8/rc.subr.8:1.24 --- src/share/man/man8/rc.subr.8:1.23 Fri Sep 11 18:17:04 2009 +++ src/share/man/man8/rc.subr.8 Fri Sep 11 19:48:52 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: rc.subr.8,v 1.23 2009/09/11 18:17:04 apb Exp $ +.\ $NetBSD: rc.subr.8,v 1.24 2009/09/11 19:48:52 wiz Exp $ .\ .\ Copyright (c) 2002-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 25, 2008 +.Dd September 11, 2009 .Dt RC.SUBR 8 .Os .Sh NAME @@ -270,7 +270,7 @@ .Pa /var/run/rc.log file, and will appear on the console regardless of the value of -.Va rc_silent. +.Va rc_silent . This is expected to be useful for interactive commands, and this mechanism is automatically used by .Ic run_rc_command @@ -308,7 +308,7 @@ is reserved for internal use by .Xr rc 8 and -.Xr rc.subr 8 . +.Nm . .It Ic print_rc_normal Ar string Print the specified .Ar string
CVS commit: src/sys/netinet6
Module Name:src
Committed By: dyoung
Date: Fri Sep 11 20:10:06 UTC 2009
Modified Files:
src/sys/netinet6: in6_proto.c
Log Message:
Nothing uses sockaddr_in6_cmp() right now, and the generic
sockaddr_cmp() is probably as fast or faster than calling
sockaddr_in6_cmp() through a function pointer, so let's stop
compiling it.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/netinet6/in6_proto.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/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.85 src/sys/netinet6/in6_proto.c:1.86
--- src/sys/netinet6/in6_proto.c:1.85 Fri Aug 21 16:52:43 2009
+++ src/sys/netinet6/in6_proto.c Fri Sep 11 20:10:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.85 2009/08/21 16:52:43 tsutsui Exp $ */
+/* $NetBSD: in6_proto.c,v 1.86 2009/09/11 20:10:06 dyoung Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in6_proto.c,v 1.85 2009/08/21 16:52:43 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: in6_proto.c,v 1.86 2009/09/11 20:10:06 dyoung Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -424,6 +424,7 @@
.dom_rtcache = LIST_HEAD_INITIALIZER(inet6domain.dom_rtcache)
};
+#if 0
int
sockaddr_in6_cmp(const struct sockaddr *lsa, const struct sockaddr *rsa)
{
@@ -445,6 +446,7 @@
return lsin6-sin6_len - rsin6-sin6_len;
}
+#endif
/*
* Internet configuration info
CVS commit: xsrc
Module Name:xsrc
Committed By: snj
Date: Fri Sep 11 21:17:34 UTC 2009
Modified Files:
xsrc/external/mit/expat/dist/lib: xmltok_impl.c
xsrc/xfree/xc/extras/expat/lib: xmltok_impl.c
Log Message:
Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/expat/dist/lib/xmltok_impl.c
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/expat/dist/lib/xmltok_impl.c
diff -u xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.2
--- xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 Tue Jul 29 05:35:07 2008
+++ xsrc/external/mit/expat/dist/lib/xmltok_impl.c Fri Sep 11 21:17:34 2009
@@ -1744,7 +1744,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
Index: xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
diff -u xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.2
--- xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 Fri Mar 5 14:26:09 2004
+++ xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c Fri Sep 11 21:17:34 2009
@@ -1741,7 +1741,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
CVS commit: src/etc/rc.d
Module Name:src
Committed By: cegger
Date: Fri Sep 11 21:25:07 UTC 2009
Modified Files:
src/etc/rc.d: network
Log Message:
backout rev. 1.59. Will be re-done differently.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/etc/rc.d/network
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.59 src/etc/rc.d/network:1.60
--- src/etc/rc.d/network:1.59 Tue Sep 8 08:56:33 2009
+++ src/etc/rc.d/network Fri Sep 11 21:25:07 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.59 2009/09/08 08:56:33 cegger Exp $
+# $NetBSD: network,v 1.60 2009/09/11 21:25:07 cegger Exp $
#
# PROVIDE: network
@@ -12,7 +12,6 @@
name=network
start_cmd=network_start
stop_cmd=network_stop
-fstab_file=/etc/fstab
nl='
' # a newline
@@ -55,26 +54,6 @@
domainname $domainname
fi
- # Do not flush routes if root file system is nfs mounted in /etc/fstab,
- # or the nfs server is unreachable if it is in a different subnet,
- # otherwise.
- while read fs_spec fs_file fs_vfstype fs_mntops fs_freq fs_passno
- do
- case ${fs_spec}:${fs_file}:${fs_passno} in
- \#*|'':*)
- continue # skip comment or blank line
- ;;
- *:/:*) case ${fs_spec} in
- *:*)
-echo Not flushing routes. /: nfs mounted
-flushroutes=NO
-;;
- esac
- ;;
- esac
- done ${fstab_file}
-
-
# Flush all routes just to make sure it is clean
if checkyesno flushroutes; then
/sbin/route -qn flush
CVS commit: src
Module Name:src
Committed By: dyoung
Date: Fri Sep 11 22:06:29 UTC 2009
Modified Files:
src/sbin/ifconfig: af_inet.c af_inet6.c util.c util.h
src/sys/kern: uipc_domain.c uipc_socket.c
src/sys/net: if.c if.h
src/sys/netinet: in.c
src/sys/netinet6: in6.c in6.h in6_proto.c scope6.c
src/sys/sys: domain.h socket.h socketvar.h
Log Message:
Make ifconfig(8) set and display preference numbers for IPv6
addresses. Make the kernel support SIOC[SG]IFADDRPREF for IPv6
interface addresses.
In in6ifa_ifpforlinklocal(), consult preference numbers before
making an otherwise arbitrary choice of in6_ifaddr. Otherwise,
preference numbers are *not* consulted by the kernel, but that will
be rather easy for somebody with a little bit of free time to fix.
Please note that setting the preference number for a link-local
IPv6 address does not work right, yet, but that ought to be fixed
soon.
In support of the changes above,
1 Add a method to struct domain for externalizing a sockaddr, and
provide an implementation for IPv6. Expect more work in this area: it
may be more proper to say that the IPv6 implementation internalizes
a sockaddr. Add sockaddr_externalize().
2 Add a subroutine, sofamily(), that returns a struct socket's address
family or AF_UNSPEC.
3 Make a lot of IPv4-specific code generic, and move it from
sys/netinet/ to sys/net/ for re-use by IPv6 parts of the kernel and
ifconfig(8).
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/ifconfig/af_inet.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/ifconfig/af_inet6.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/ifconfig/util.c
cvs rdiff -u -r1.7 -r1.8 src/sbin/ifconfig/util.h
cvs rdiff -u -r1.83 -r1.84 src/sys/kern/uipc_domain.c
cvs rdiff -u -r1.189 -r1.190 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.234 -r1.235 src/sys/net/if.c
cvs rdiff -u -r1.143 -r1.144 src/sys/net/if.h
cvs rdiff -u -r1.134 -r1.135 src/sys/netinet/in.c
cvs rdiff -u -r1.152 -r1.153 src/sys/netinet6/in6.c
cvs rdiff -u -r1.67 -r1.68 src/sys/netinet6/in6.h
cvs rdiff -u -r1.86 -r1.87 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet6/scope6.c
cvs rdiff -u -r1.28 -r1.29 src/sys/sys/domain.h
cvs rdiff -u -r1.95 -r1.96 src/sys/sys/socket.h
cvs rdiff -u -r1.120 -r1.121 src/sys/sys/socketvar.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/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.13 src/sbin/ifconfig/af_inet.c:1.14
--- src/sbin/ifconfig/af_inet.c:1.13 Fri Aug 7 19:35:55 2009
+++ src/sbin/ifconfig/af_inet.c Fri Sep 11 22:06:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet.c,v 1.13 2009/08/07 19:35:55 dyoung Exp $ */
+/* $NetBSD: af_inet.c,v 1.14 2009/09/11 22:06:29 dyoung Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: af_inet.c,v 1.13 2009/08/07 19:35:55 dyoung Exp $);
+__RCSID($NetBSD: af_inet.c,v 1.14 2009/09/11 22:06:29 dyoung Exp $);
#endif /* not lint */
#include sys/param.h
@@ -63,7 +63,6 @@
static void in_commit_address(prop_dictionary_t, prop_dictionary_t);
static void in_alias(const char *, prop_dictionary_t, prop_dictionary_t,
struct in_aliasreq *);
-static void in_preference(const char *, const struct sockaddr *);
static struct afswtch af = {
.af_name = inet, .af_af = AF_INET, .af_status = in_status,
@@ -139,46 +138,12 @@
}
}
-static int16_t
-in_get_preference(const char *ifname, const struct sockaddr *sa)
-{
- struct if_addrprefreq ifap;
- int s;
-
- if ((s = getsock(AF_INET)) == -1) {
- if (errno == EPROTONOSUPPORT)
- return 0;
- err(EXIT_FAILURE, socket);
- }
- memset(ifap, 0, sizeof(ifap));
- estrlcpy(ifap.ifap_name, ifname, sizeof(ifap.ifap_name));
- memcpy(ifap.ifap_addr, sa, MIN(sizeof(ifap.ifap_addr), sa-sa_len));
- if (ioctl(s, SIOCGIFADDRPREF, ifap) == -1) {
- if (errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT)
- return 0;
- warn(SIOCGIFADDRPREF);
- }
- return ifap.ifap_preference;
-}
-
-static void
-in_preference(const char *ifname, const struct sockaddr *sa)
-{
- int16_t preference;
-
- if (lflag)
- return;
-
- preference = in_get_preference(ifname, sa);
- printf( preference % PRId16, preference);
-}
-
static void
in_status(prop_dictionary_t env, prop_dictionary_t oenv, bool force)
{
struct ifaddrs *ifap, *ifa;
struct in_aliasreq ifra;
- int printprefs = 0;
+ bool printprefs = false;
const char *ifname;
if ((ifname = getifname(env)) == NULL)
@@ -187,19 +152,8 @@
if (getifaddrs(ifap) != 0)
err(EXIT_FAILURE, getifaddrs);
- /* Print address preference numbers if any address has a non-zero
- * preference assigned.
- */
- for (ifa = ifap; ifa != NULL; ifa = ifa-ifa_next) {
- if (strcmp(ifname, ifa-ifa_name) != 0)
- continue;
- if (ifa-ifa_addr-sa_family != AF_INET)
- continue;
- if (in_get_preference(ifa-ifa_name, ifa-ifa_addr) != 0) {
-
CVS commit: src/sys/sys
Module Name:src Committed By: dyoung Date: Fri Sep 11 22:07:43 UTC 2009 Modified Files: src/sys/sys: param.h Log Message: Bump version for the change to struct domain. To generate a diff of this commit: cvs rdiff -u -r1.351 -r1.352 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.351 src/sys/sys/param.h:1.352 --- src/sys/sys/param.h:1.351 Wed Sep 2 15:45:10 2009 +++ src/sys/sys/param.h Fri Sep 11 22:07:43 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.351 2009/09/02 15:45:10 tls Exp $ */ +/* $NetBSD: param.h,v 1.352 2009/09/11 22:07:43 dyoung Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 599001600 /* NetBSD 5.99.16 */ +#define __NetBSD_Version__ 599001700 /* NetBSD 5.99.17 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: xsrc/external/mit/xf86-video-vmware/dist
Module Name:xsrc Committed By: snj Date: Fri Sep 11 22:22:45 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-vmware/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29797 Log Message: initial import of xf86-video-vmware-10.16.8 Status: Vendor Tag: xorg Release Tags: xf86-video-vmware-10-16-8 U xsrc/external/mit/xf86-video-vmware/dist/depcomp U xsrc/external/mit/xf86-video-vmware/dist/install-sh U xsrc/external/mit/xf86-video-vmware/dist/missing U xsrc/external/mit/xf86-video-vmware/dist/config.guess U xsrc/external/mit/xf86-video-vmware/dist/configure.ac U xsrc/external/mit/xf86-video-vmware/dist/ltmain.sh U xsrc/external/mit/xf86-video-vmware/dist/ChangeLog U xsrc/external/mit/xf86-video-vmware/dist/README U xsrc/external/mit/xf86-video-vmware/dist/COPYING U xsrc/external/mit/xf86-video-vmware/dist/configure U xsrc/external/mit/xf86-video-vmware/dist/config.sub U xsrc/external/mit/xf86-video-vmware/dist/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/aclocal.m4 U xsrc/external/mit/xf86-video-vmware/dist/config.h.in U xsrc/external/mit/xf86-video-vmware/dist/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.h U xsrc/external/mit/xf86-video-vmware/dist/src/guest_os.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrlproto.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_modes.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_overlay.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarevideo.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.c U xsrc/external/mit/xf86-video-vmware/dist/src/svga_reg.h U xsrc/external/mit/xf86-video-vmware/dist/src/includeCheck.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/src/vm_basic_types.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_limits.h U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_struct.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_escape.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarecurs.c U xsrc/external/mit/xf86-video-vmware/dist/src/vm_device_version.h U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarexinerama.c U xsrc/external/mit/xf86-video-vmware/dist/man/vmware.man U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-vmware/include
Module Name:xsrc Committed By: snj Date: Fri Sep 11 22:25:09 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-vmware/include: config.h Log Message: Update for 10.16.8. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-vmware/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-vmware/include/config.h diff -u xsrc/external/mit/xf86-video-vmware/include/config.h:1.2 xsrc/external/mit/xf86-video-vmware/include/config.h:1.3 --- xsrc/external/mit/xf86-video-vmware/include/config.h:1.2 Sat Aug 22 01:02:05 2009 +++ xsrc/external/mit/xf86-video-vmware/include/config.h Fri Sep 11 22:25:09 2009 @@ -52,13 +52,13 @@ #define PACKAGE_NAME xf86-video-vmware /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-vmware 10.16.7 +#define PACKAGE_STRING xf86-video-vmware 10.16.8 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-vmware /* Define to the version of this package. */ -#define PACKAGE_VERSION 10.16.7 +#define PACKAGE_VERSION 10.16.8 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 10 @@ -67,10 +67,10 @@ #define PACKAGE_VERSION_MINOR 16 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 7 +#define PACKAGE_VERSION_PATCHLEVEL 8 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 10.16.7 +#define VERSION 10.16.8
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: mrg Date: Fri Sep 11 22:32:50 UTC 2009 Modified Files: src/distrib/sets/lists/modules: mi Log Message: add ./etc/mtree/set.modules so that modules.tgz is created with actual files in it, rather than a 20 byte .gz file (ie, empty file.) HI JNEMETH! To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/modules/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/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.1 src/distrib/sets/lists/modules/mi:1.2 --- src/distrib/sets/lists/modules/mi:1.1 Mon Sep 7 02:27:29 2009 +++ src/distrib/sets/lists/modules/mi Fri Sep 11 22:32:50 2009 @@ -1,7 +1,8 @@ -# $NetBSD: mi,v 1.1 2009/09/07 02:27:29 jnemeth Exp $ +# $NetBSD: mi,v 1.2 2009/09/11 22:32:50 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # +./etc/mtree/set.modulesmodules-sys-root kmod ./stand/@MACHINE@base-kernel-modules kmod ./stand/@MACHINE@/@OSRELEASE@ base-kernel-modules kmod ./@MODULEDIR@ base-kernel-modules kmod
CVS commit: src/external/gpl3/binutils/lib/libbfd
Module Name:src
Committed By: mrg
Date: Fri Sep 11 22:36:12 UTC 2009
Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
Log Message:
replace a LDADD/DPADD with LIBDPLIBS
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/lib/libbfd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.2 src/external/gpl3/binutils/lib/libbfd/Makefile:1.3
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.2 Thu Sep 3 08:24:06 2009
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Fri Sep 11 22:36:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/09/03 08:24:06 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/11 22:36:12 mrg Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -27,8 +27,7 @@
SHLIB_MAJOR= 11
SHLIB_MINOR= 0
-DPADD= ${LIBZ}
-LDADD= -lz
+LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHINE_ARCH} -I${DIST}/include -I. \
CVS commit: src/compat/external/gpl3/binutils/lib/libbfd
Module Name:src
Committed By: mrg
Date: Fri Sep 11 22:36:39 UTC 2009
Modified Files:
src/compat/external/gpl3/binutils/lib/libbfd: Makefile
Log Message:
regenerate this based on the non-compat version updating.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/compat/external/gpl3/binutils/lib/libbfd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.1 src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.2
--- src/compat/external/gpl3/binutils/lib/libbfd/Makefile:1.1 Fri Sep 11 16:01:58 2009
+++ src/compat/external/gpl3/binutils/lib/libbfd/Makefile Fri Sep 11 22:36:39 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/09/11 16:01:58 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/11 22:36:39 mrg Exp $
# Generated from: NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp
NOLINT= # defined
@@ -6,6 +6,7 @@
NONLS= # defined
NOINFO= # defined
NOSHARE= # defined
+LIBDPLIBS= z ${.CURDIR}/../../../../../lib/libz
NOCHECKVER= # defined
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: mrg Date: Fri Sep 11 22:36:53 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.sparc64 Log Message: fix build for HAVE_BINUTILS=219. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/base/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.60 src/distrib/sets/lists/base/md.sparc64:1.61 --- src/distrib/sets/lists/base/md.sparc64:1.60 Fri Sep 11 16:01:59 2009 +++ src/distrib/sets/lists/base/md.sparc64 Fri Sep 11 22:36:53 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.60 2009/09/11 16:01:59 mrg Exp $ +# $NetBSD: md.sparc64,v 1.61 2009/09/11 22:36:53 mrg Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin @@ -52,8 +52,10 @@ ./usr/lib/sparc/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic ./usr/lib/sparc/libasn1.so.8 base-compat-shlib compat,pic ./usr/lib/sparc/libasn1.so.8.0 base-compat-shlib compat,pic -./usr/lib/sparc/libbfd.so.10 base-compat-shlib compat,pic -./usr/lib/sparc/libbfd.so.10.0 base-compat-shlib compat,pic +./usr/lib/sparc/libbfd.so.10 base-compat-shlib compat,pic,binutils=216 +./usr/lib/sparc/libbfd.so.10.0 base-compat-shlib compat,pic,binutils=216 +./usr/lib/sparc/libbfd.so.11 base-compat-shlib compat,pic,binutils=219 +./usr/lib/sparc/libbfd.so.11.0 base-compat-shlib compat,pic,binutils=219 ./usr/lib/sparc/libbind9.so.4 base-compat-shlib compat,pic ./usr/lib/sparc/libbind9.so.4.0 base-compat-shlib compat,pic ./usr/lib/sparc/libbluetooth.so.4 base-compat-shlib compat,pic
CVS commit: [netbsd-5] xsrc
Module Name:xsrc
Committed By: bouyer
Date: Fri Sep 11 23:00:48 UTC 2009
Modified Files:
xsrc/external/mit/expat/dist/lib [netbsd-5]: xmltok_impl.c
xsrc/xfree/xc/extras/expat/lib [netbsd-5]: xmltok_impl.c
Log Message:
Pull up following revision(s) (requested by snj in ticket #951):
external/mit/expat/dist/lib/xmltok_impl.c: revision 1.2
xfree/xc/extras/expat/lib/xmltok_impl.c: revision 1.2
Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
xsrc/external/mit/expat/dist/lib/xmltok_impl.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.20.1 \
xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/expat/dist/lib/xmltok_impl.c
diff -u xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1.2.1
--- xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 Tue Jul 29 05:35:07 2008
+++ xsrc/external/mit/expat/dist/lib/xmltok_impl.c Fri Sep 11 23:00:48 2009
@@ -1744,7 +1744,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
Index: xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
diff -u xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2.20.1
--- xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 Fri Mar 5 14:26:09 2004
+++ xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c Fri Sep 11 23:00:48 2009
@@ -1741,7 +1741,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Fri Sep 11 23:01:27 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: ticket #951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.67 src/doc/CHANGES-5.1:1.1.2.68 --- src/doc/CHANGES-5.1:1.1.2.67 Thu Sep 10 07:43:28 2009 +++ src/doc/CHANGES-5.1 Fri Sep 11 23:01:27 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.67 2009/09/10 07:43:28 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.68 2009/09/11 23:01:27 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -2429,3 +2429,9 @@ Fix cp(1) from ntfs, addressing PR kern/38531. [pooka, ticket #942] +xsrc/external/mit/expat/dist/lib/xmltok_impl.c 1.2 +xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c 1.2 + + Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425. + [snj, ticket #951] +
CVS commit: [netbsd-5-0] xsrc
Module Name:xsrc
Committed By: bouyer
Date: Fri Sep 11 23:02:02 UTC 2009
Modified Files:
xsrc/external/mit/expat/dist/lib [netbsd-5-0]: xmltok_impl.c
xsrc/xfree/xc/extras/expat/lib [netbsd-5-0]: xmltok_impl.c
Log Message:
Pull up following revision(s) (requested by snj in ticket #951):
external/mit/expat/dist/lib/xmltok_impl.c: revision 1.2
xfree/xc/extras/expat/lib/xmltok_impl.c: revision 1.2
Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \
xsrc/external/mit/expat/dist/lib/xmltok_impl.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.22.1 \
xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/expat/dist/lib/xmltok_impl.c
diff -u xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1.4.1
--- xsrc/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 Tue Jul 29 05:35:07 2008
+++ xsrc/external/mit/expat/dist/lib/xmltok_impl.c Fri Sep 11 23:02:02 2009
@@ -1744,7 +1744,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
Index: xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
diff -u xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2.22.1
--- xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 Fri Mar 5 14:26:09 2004
+++ xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c Fri Sep 11 23:02:02 2009
@@ -1741,7 +1741,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Fri Sep 11 23:02:24 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: ticket #951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.12 src/doc/CHANGES-5.0.2:1.1.2.13 --- src/doc/CHANGES-5.0.2:1.1.2.12 Thu Sep 10 07:42:49 2009 +++ src/doc/CHANGES-5.0.2 Fri Sep 11 23:02:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.12 2009/09/10 07:42:49 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.13 2009/09/11 23:02:24 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -238,3 +238,9 @@ anymore by default. [tnozaki, ticket #938] +xsrc/external/mit/expat/dist/lib/xmltok_impl.c 1.2 +xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c 1.2 + + Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425. + [snj, ticket #951] +
CVS commit: [netbsd-4] xsrc/xfree/xc/extras/expat/lib
Module Name:xsrc
Committed By: bouyer
Date: Fri Sep 11 23:03:19 UTC 2009
Modified Files:
xsrc/xfree/xc/extras/expat/lib [netbsd-4]: xmltok_impl.c
Log Message:
Pull up following revision(s) (requested by snj in ticket #1359):
xfree/xc/extras/expat/lib/xmltok_impl.c: revision 1.2
Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.16.1 \
xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
diff -u xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2.16.1
--- xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 Fri Mar 5 14:26:09 2004
+++ xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c Fri Sep 11 23:03:19 2009
@@ -1741,7 +1741,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
CVS commit: [netbsd-4-0] xsrc/xfree/xc/extras/expat/lib
Module Name:xsrc
Committed By: bouyer
Date: Fri Sep 11 23:03:49 UTC 2009
Modified Files:
xsrc/xfree/xc/extras/expat/lib [netbsd-4-0]: xmltok_impl.c
Log Message:
Pull up following revision(s) (requested by snj in ticket #1359):
xfree/xc/extras/expat/lib/xmltok_impl.c: revision 1.2
Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.18.1 \
xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c
diff -u xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2.18.1
--- xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c:1.1.1.2 Fri Mar 5 14:26:09 2004
+++ xsrc/xfree/xc/extras/expat/lib/xmltok_impl.c Fri Sep 11 23:03:49 2009
@@ -1741,7 +1741,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Fri Sep 11 23:04:16 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket #1359 To generate a diff of this commit: cvs rdiff -u -r1.1.2.57 -r1.1.2.58 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.57 src/doc/CHANGES-4.0.2:1.1.2.58 --- src/doc/CHANGES-4.0.2:1.1.2.57 Sat Sep 5 13:59:27 2009 +++ src/doc/CHANGES-4.0.2 Fri Sep 11 23:04:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.57 2009/09/05 13:59:27 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.58 2009/09/11 23:04:16 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -865,3 +865,8 @@ any data structures. [mlelstv, ticket #1358] +xfree/xc/extras/expat/lib/xmltok_impl.c 1.2 + + Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425. + [snj, ticket #1359] +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Fri Sep 11 23:04:33 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: ticket #1359 To generate a diff of this commit: cvs rdiff -u -r1.1.2.176 -r1.1.2.177 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.176 src/doc/CHANGES-4.1:1.1.2.177 --- src/doc/CHANGES-4.1:1.1.2.176 Sat Sep 5 13:59:42 2009 +++ src/doc/CHANGES-4.1 Fri Sep 11 23:04:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.176 2009/09/05 13:59:42 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.177 2009/09/11 23:04:33 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3789,3 +3789,8 @@ any data structures. [mlelstv, ticket #1358] +xfree/xc/extras/expat/lib/xmltok_impl.c 1.2 + + Apply revisions 1.14 and 1.15 from expat CVS to fix SA36425. + [snj, ticket #1359] +
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: dyoung
Date: Fri Sep 11 23:22:28 UTC 2009
Modified Files:
src/sbin/ifconfig: carp.c
Log Message:
This should fix 'carpdev ifname' or, at least, not break it more
badly than before.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sbin/ifconfig/carp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/carp.c
diff -u src/sbin/ifconfig/carp.c:1.12 src/sbin/ifconfig/carp.c:1.13
--- src/sbin/ifconfig/carp.c:1.12 Tue Jul 15 21:27:58 2008
+++ src/sbin/ifconfig/carp.c Fri Sep 11 23:22:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: carp.c,v 1.12 2008/07/15 21:27:58 dyoung Exp $ */
+/* $NetBSD: carp.c,v 1.13 2009/09/11 23:22:28 dyoung Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: carp.c,v 1.12 2008/07/15 21:27:58 dyoung Exp $);
+__RCSID($NetBSD: carp.c,v 1.13 2009/09/11 23:22:28 dyoung Exp $);
#endif /* not lint */
#include sys/param.h
@@ -257,18 +257,18 @@
setcarpdev(prop_dictionary_t env, prop_dictionary_t oenv)
{
struct carpreq carpr;
- prop_data_t data;
+ prop_string_t s;
- data = (prop_data_t)prop_dictionary_get(env, carpdev);
- if (data == NULL) {
+ s = (prop_string_t)prop_dictionary_get(env, carpdev);
+ if (s == NULL) {
errno = ENOENT;
return -1;
}
carp_get(env, carpr);
- strlcpy(carpr.carpr_carpdev, prop_data_data_nocopy(data),
- MIN(sizeof(carpr.carpr_carpdev), prop_data_size(data)));
+ strlcpy(carpr.carpr_carpdev, prop_string_cstring_nocopy(s),
+ sizeof(carpr.carpr_carpdev));
carp_set(env, carpr);
return 0;
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Fri Sep 11 23:51:26 UTC 2009 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: locore.S mips_machdep.c Log Message: Add code to probe TLB for VA/PA/PG_MASK sizes Increase waynames to include 8-way. To generate a diff of this commit: cvs rdiff -u -r1.167.38.2 -r1.167.38.3 src/sys/arch/mips/mips/locore.S cvs rdiff -u -r1.205.4.1.2.1.2.7 -r1.205.4.1.2.1.2.8 \ src/sys/arch/mips/mips/mips_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/mips/mips/locore.S diff -u src/sys/arch/mips/mips/locore.S:1.167.38.2 src/sys/arch/mips/mips/locore.S:1.167.38.3 --- src/sys/arch/mips/mips/locore.S:1.167.38.2 Mon Sep 7 22:05:45 2009 +++ src/sys/arch/mips/mips/locore.S Fri Sep 11 23:51:25 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.167.38.2 2009/09/07 22:05:45 matt Exp $ */ +/* $NetBSD: locore.S,v 1.167.38.3 2009/09/11 23:51:25 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -530,6 +530,98 @@ nop END(mips_cp0_status_write) +#ifdef MIPS3_PLUS + .set push + .set mips3 +/* + * uint64_t mips_cp0_tlb_entry_hi_probe(void); + * + * Write 1s to the VPN field of Entry_Hi0 to see how many VA bits + * are implemented. Assumes that interrupts are disabled. + */ +LEAF(mips_cp0_tlb_entry_hi_probe) + dmfc0 t0, MIPS_COP_0_TLB_HI + li v0, -4096 /* all 1s except low 12 bits */ + dsll v0, v0, 2 /* except the top 2 */ + dsrl v0, v0, 2 + dmtc0 v0, MIPS_COP_0_TLB_HI + COP0_SYNC + nop + nop + dmfc0 v0, MIPS_COP_0_TLB_HI + dmtc0 t0, MIPS_COP_0_TLB_HI + COP0_SYNC + nop +#ifdef __mips_o32 + nop +#if BYTE_ORDER == BIG_ENDIAN + srl v1, v0, 0 + dsra v0, v0, 32 +#endif +#if BYTE_ORDER == LITTLE_ENDIAN + dsra v1, v0, 32 + srl v0, v0, 0 +#endif +#endif /* __mips_o32 */ + j ra + nop +END(mips_cp0_tlb_entry_hi_probe) + +/* + * uint64_t mips_cp0_tlb_entry_lo_probe(void); + * + * Write 1s to the PFN field of Entry_Lo0 to see how many + * PA bits are implemented. Assumes that interrupts are disabled. + */ +LEAF(mips_cp0_tlb_entry_lo_probe) + dmfc0 t0, MIPS_COP_0_TLB_LO0 + li v0, -64 /* all 1s except low 6 bits */ + dmtc0 v0, MIPS_COP_0_TLB_LO0 + COP0_SYNC + nop + nop + dmfc0 v0, MIPS_COP_0_TLB_LO0 + dmtc0 t0, MIPS_COP_0_TLB_LO0 + COP0_SYNC + nop +#ifdef __mips_o32 + nop +#if BYTE_ORDER == BIG_ENDIAN + srl v1, v0, 0 + dsra v0, v0, 32 +#endif +#if BYTE_ORDER == LITTLE_ENDIAN + dsra v1, v0, 32 + srl v0, v0, 0 +#endif +#endif /* __mips_o32 */ + j ra + nop +END(mips_cp0_tlb_entry_lo_probe) + .set pop + +/* + * uint32_t mips_cp0_tlb_page_mask_probe(void); + * + * Write 1s to the RPN field of Entry_Lo0 to see how many PA bits are implemented. + * Assumes that interrupts are disabled. + */ +LEAF(mips_cp0_tlb_page_mask_probe) + mfc0 t0, MIPS_COP_0_TLB_PG_MASK + lui v0, 0x + srl v0, v0, 3 + mtc0 v0, MIPS_COP_0_TLB_PG_MASK + COP0_SYNC + nop + nop + mfc0 v0, MIPS_COP_0_TLB_PG_MASK + mtc0 t0, MIPS_COP_0_TLB_PG_MASK + COP0_SYNC + nop + j ra + nop +END(mips_cp0_tlb_page_mask_probe) +#endif /* MIPS3_PLUS */ #if !defined(NOFPU) !defined(SOFTFLOAT) /* Index: src/sys/arch/mips/mips/mips_machdep.c diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.7 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.8 --- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.7 Tue Sep 8 08:11:29 2009 +++ src/sys/arch/mips/mips/mips_machdep.c Fri Sep 11 23:51:25 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.7 2009/09/08 08:11:29 matt Exp $ */ +/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.8 2009/09/11 23:51:25 matt Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -112,7 +112,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.7 2009/09/08 08:11:29 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.8 2009/09/11 23:51:25 matt Exp $); #include opt_cputype.h @@ -166,6 +166,14 @@ u_long cpu_dump_mempagecnt(void); int cpu_dump(void); +#if defined(MIPS3_PLUS) +uint32_t mips_cp0_tlb_page_mask_probe(void); +uint64_t mips_cp0_tlb_entry_hi_probe(void); +uint64_t mips_cp0_tlb_entry_lo_probe(void); + +static void mips3_tlb_probe(void); +#endif + #if defined(MIPS1) static void mips1_vector_init(void); extern const struct locoresw mips1_locoresw; @@ -206,6 +214,11 @@ uint64_t mips3_xkphys_cached; #endif u_int mips3_pg_shift; +#ifdef MIPS3_PLUS +uint64_t mips3_tlb_vpn_mask; +uint64_t mips3_tlb_pfn_mask; +uint32_t mips3_tlb_pg_mask; +#endif struct user *proc0paddr; struct segtab *segbase = (void *)(MIPS_KSEG2_START + 0x1eadbeef); @@ -916,6 +929,7 @@ case CPU_ARCH_MIPS3: case CPU_ARCH_MIPS4: #if defined(MIPS3_5900) /* XXX */ + mips3_tlb_probe(); mips3_cp0_pg_mask_write(MIPS3_PG_SIZE_4K); mips3_cp0_wired_write(0); mips5900_TBIA(mips_num_tlb_entries);
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Sat Sep 12 00:03:28 UTC 2009 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: mips_machdep.c Log Message: Fix PFN width calculation. To generate a diff of this commit: cvs rdiff -u -r1.205.4.1.2.1.2.8 -r1.205.4.1.2.1.2.9 \ src/sys/arch/mips/mips/mips_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/mips/mips/mips_machdep.c diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.8 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.9 --- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.8 Fri Sep 11 23:51:25 2009 +++ src/sys/arch/mips/mips/mips_machdep.c Sat Sep 12 00:03:27 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.8 2009/09/11 23:51:25 matt Exp $ */ +/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.9 2009/09/12 00:03:27 matt Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -112,7 +112,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.8 2009/09/11 23:51:25 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.9 2009/09/12 00:03:27 matt Exp $); #include opt_cputype.h @@ -1132,7 +1132,7 @@ i = ffs(~(mips3_tlb_vpn_mask 31)) + 30; printf(, %d%cB (%d-bit) VAs, 1 (i % 10), sufx[(i / 10) - 1], i); - for (i = 64, pfn_mask = mips3_tlb_pfn_mask; + for (i = 64, pfn_mask = mips3_tlb_pfn_mask 6; pfn_mask 0; i--, pfn_mask = 1) ; printf(, %d%cB (%d-bit) PAs,
CVS commit: [matt-nb5-mips64] src/gnu/dist/binutils/bfd
Module Name:src Committed By: matt Date: Sat Sep 12 00:50:22 UTC 2009 Modified Files: src/gnu/dist/binutils/bfd [matt-nb5-mips64]: elf.c Log Message: Recognize $L as a local symbol. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.32.1 src/gnu/dist/binutils/bfd/elf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/binutils/bfd/elf.c diff -u src/gnu/dist/binutils/bfd/elf.c:1.6 src/gnu/dist/binutils/bfd/elf.c:1.6.32.1 --- src/gnu/dist/binutils/bfd/elf.c:1.6 Thu Feb 2 22:03:53 2006 +++ src/gnu/dist/binutils/bfd/elf.c Sat Sep 12 00:50:21 2009 @@ -6312,6 +6312,10 @@ if (name[0] == '.' name[1] == 'L') return TRUE; + /* Normal local symbols start with ``$L''. */ + if (name[0] == '$' name[1] == 'L') +return TRUE; + /* At least some SVR4 compilers (e.g., UnixWare 2.1 cc) generate DWARF debugging symbols starting with ``..''. */ if (name[0] == '.' name[1] == '.')
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: tsutsui
Date: Sat Sep 12 01:43:52 UTC 2009
Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c
Log Message:
Pull a fix for mount function from ffs_vfsops.c rev1.186:
Change ffs_mount, in MNT_UPDATE case, to check dev_t's for equality
instead of just vnode pointers. Fixes erroneous does not match mounted
device errors from mount(8) in the presence of MFS /dev, init.root, c.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.145 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.146
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.145 Fri Sep 11 15:59:07 2009
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Sep 12 01:43:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.145 2009/09/11 15:59:07 tsutsui Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.146 2009/09/12 01:43:52 tsutsui Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.145 2009/09/11 15:59:07 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.146 2009/09/12 01:43:52 tsutsui Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -362,8 +362,15 @@
* used for our initial mount
*/
ump = VFSTOUFS(mp);
- if (devvp != ump-um_devvp)
-error = EINVAL;
+ if (devvp != ump-um_devvp) {
+if (devvp-v_rdev != ump-um_devvp-v_rdev)
+ error = EINVAL;
+else {
+ vrele(devvp);
+ devvp = ump-um_devvp;
+ vref(devvp);
+}
+ }
}
} else {
if (!update) {
CVS commit: src/sys/ufs/ext2fs
Module Name:src Committed By: tsutsui Date: Sat Sep 12 02:25:39 UTC 2009 Modified Files: src/sys/ufs/ext2fs: ext2fs_vfsops.c Log Message: Pull a fix from ffs_vfsops.c rev 1.248: Fix bug introduced in revision 1.174(*) where a NULL fspec with an MNT_UPDATE command would always return EINVAL. This broke fsck on root, where fsck'ing a dirty root would always return an error causing rc to resort in a reboot. (*) This is Apply the NFS exports list rototill patch change in ext2fs_vfsops.c rev 1.91. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_vfsops.c diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.146 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.147 --- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.146 Sat Sep 12 01:43:52 2009 +++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Sep 12 02:25:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_vfsops.c,v 1.146 2009/09/12 01:43:52 tsutsui Exp $ */ +/* $NetBSD: ext2fs_vfsops.c,v 1.147 2009/09/12 02:25:39 tsutsui Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1994 @@ -65,7 +65,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.146 2009/09/12 01:43:52 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.147 2009/09/12 02:25:39 tsutsui Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -478,7 +478,7 @@ fs-e2fs_fmod = 1; } if (args-fspec == NULL) - return EINVAL; + return 0; } error = set_statvfs_info(path, UIO_USERSPACE, args-fspec,
CVS commit: src/sys/ufs/ext2fs
Module Name:src Committed By: tsutsui Date: Sat Sep 12 02:32:14 UTC 2009 Modified Files: src/sys/ufs/ext2fs: ext2fs_vfsops.c Log Message: Add a missed brelse(9) call after bread(9) in ext2fs_reload(). This may close PR kern/28712 (ext2fs hang on mount after fsck). To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_vfsops.c diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.147 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.148 --- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.147 Sat Sep 12 02:25:39 2009 +++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Sep 12 02:32:14 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_vfsops.c,v 1.147 2009/09/12 02:25:39 tsutsui Exp $ */ +/* $NetBSD: ext2fs_vfsops.c,v 1.148 2009/09/12 02:32:14 tsutsui Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1994 @@ -65,7 +65,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.147 2009/09/12 02:25:39 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.148 2009/09/12 02:32:14 tsutsui Exp $); #if defined(_KERNEL_OPT) #include opt_compat_netbsd.h @@ -583,6 +583,7 @@ howmany(fs-e2fs_ncg, fs-e2fs_bsize / sizeof(struct ext2_gd)); fs-e2fs_ipb = fs-e2fs_bsize / EXT2_DINODE_SIZE(fs); fs-e2fs_itpg = fs-e2fs.e2fs_ipg / fs-e2fs_ipb; + brelse(bp, 0); /* * Step 3: re-read summary information from disk.
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: tsutsui
Date: Sat Sep 12 02:50:38 UTC 2009
Modified Files:
src/sys/ufs/ext2fs: ext2fs_extern.h ext2fs_vfsops.c
Log Message:
Reduce diffs a bit between ext2fs_reload() and ffs_reload().
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.148 -r1.149 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_extern.h
diff -u src/sys/ufs/ext2fs/ext2fs_extern.h:1.39 src/sys/ufs/ext2fs/ext2fs_extern.h:1.40
--- src/sys/ufs/ext2fs/ext2fs_extern.h:1.39 Sat Jun 28 01:34:05 2008
+++ src/sys/ufs/ext2fs/ext2fs_extern.h Sat Sep 12 02:50:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_extern.h,v 1.39 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: ext2fs_extern.h,v 1.40 2009/09/12 02:50:38 tsutsui Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -138,7 +138,7 @@
/* ext2fs_vfsops.c */
VFS_PROTOS(ext2fs);
-int ext2fs_reload(struct mount *, kauth_cred_t);
+int ext2fs_reload(struct mount *, kauth_cred_t, struct lwp *);
int ext2fs_mountfs(struct vnode *, struct mount *);
int ext2fs_flushfiles(struct mount *, int);
int ext2fs_sbupdate(struct ufsmount *, int);
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.148 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.149
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.148 Sat Sep 12 02:32:14 2009
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Sep 12 02:50:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.148 2009/09/12 02:32:14 tsutsui Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.149 2009/09/12 02:50:38 tsutsui Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.148 2009/09/12 02:32:14 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.149 2009/09/12 02:50:38 tsutsui Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -461,7 +461,7 @@
}
if (mp-mnt_flag MNT_RELOAD) {
- error = ext2fs_reload(mp, l-l_cred);
+ error = ext2fs_reload(mp, l-l_cred, l);
if (error)
return (error);
}
@@ -522,9 +522,8 @@
* 6) re-read inode data for all active vnodes.
*/
int
-ext2fs_reload(struct mount *mountp, kauth_cred_t cred)
+ext2fs_reload(struct mount *mp, kauth_cred_t cred, struct lwp *l)
{
- struct lwp *l = curlwp;
struct vnode *vp, *mvp, *devvp;
struct inode *ip;
struct buf *bp;
@@ -533,14 +532,16 @@
struct partinfo dpart;
int i, size, error;
void *cp;
+ struct ufsmount *ump;
- if ((mountp-mnt_flag MNT_RDONLY) == 0)
+ if ((mp-mnt_flag MNT_RDONLY) == 0)
return (EINVAL);
+ ump = VFSTOUFS(mp);
/*
* Step 1: invalidate all cached meta-data.
*/
- devvp = VFSTOUFS(mountp)-um_devvp;
+ devvp = ump-um_devvp;
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
error = vinvalbuf(devvp, 0, cred, l, 0, 0);
VOP_UNLOCK(devvp, 0);
@@ -559,13 +560,13 @@
return (error);
}
newfs = (struct ext2fs *)bp-b_data;
- error = ext2fs_checksb(newfs, (mountp-mnt_flag MNT_RDONLY) != 0);
+ error = ext2fs_checksb(newfs, (mp-mnt_flag MNT_RDONLY) != 0);
if (error) {
brelse(bp, 0);
return (error);
}
- fs = VFSTOUFS(mountp)-um_e2fs;
+ fs = ump-um_e2fs;
/*
* copy in new superblock, and compute in-memory values
*/
@@ -605,17 +606,17 @@
}
/* Allocate a marker vnode. */
- if ((mvp = vnalloc(mountp)) == NULL)
- return (ENOMEM);
+ if ((mvp = vnalloc(mp)) == NULL)
+ return ENOMEM;
/*
* NOTE: not using the TAILQ_FOREACH here since in this loop vgone()
* and vclean() can be called indirectly
*/
mutex_enter(mntvnode_lock);
loop:
- for (vp = TAILQ_FIRST(mountp-mnt_vnodelist); vp; vp = vunmark(mvp)) {
+ for (vp = TAILQ_FIRST(mp-mnt_vnodelist); vp; vp = vunmark(mvp)) {
vmark(mvp, vp);
- if (vp-v_mount != mountp || vismarker(vp))
+ if (vp-v_mount != mp || vismarker(vp))
continue;
/*
* Step 4: invalidate all inactive vnodes.
CVS commit: [matt-nb5-mips64] src/sys/compat/netbsd32
Module Name:src
Committed By: matt
Date: Sat Sep 12 04:57:20 UTC 2009
Modified Files:
src/sys/compat/netbsd32 [matt-nb5-mips64]: netbsd32_sysent.c
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.77.4.1 -r1.77.4.1.4.1 \
src/sys/compat/netbsd32/netbsd32_sysent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.77.4.1 src/sys/compat/netbsd32/netbsd32_sysent.c:1.77.4.1.4.1
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.77.4.1 Tue Nov 25 17:32:27 2008
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Sat Sep 12 04:57:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.77.4.1 2008/11/25 17:32:27 snj Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.77.4.1.4.1 2009/09/12 04:57:20 matt Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_sysent.c,v 1.77.4.1 2008/11/25 17:32:27 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_sysent.c,v 1.77.4.1.4.1 2009/09/12 04:57:20 matt Exp $);
#if defined(_KERNEL_OPT)
#include opt_nfsserver.h
@@ -465,9 +465,9 @@
#endif
{ 0, 0, 0,
sys_nosys }, /* 172 = unimplemented */
- { ns(struct netbsd32_pread_args), 0,
+ { ns(struct netbsd32_pread_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
(sy_call_t *)netbsd32_pread }, /* 173 = netbsd32_pread */
- { ns(struct netbsd32_pwrite_args), 0,
+ { ns(struct netbsd32_pwrite_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
(sy_call_t *)netbsd32_pwrite }, /* 174 = netbsd32_pwrite */
{ ns(struct compat_30_netbsd32_ntp_gettime_args), 0,
(sy_call_t *)compat_30(netbsd32_ntp_gettime) },/* 175 = compat_30_netbsd32_ntp_gettime */
@@ -524,15 +524,15 @@
(sy_call_t *)netbsd32_setrlimit }, /* 195 = netbsd32_setrlimit */
{ ns(struct compat_12_netbsd32_getdirentries_args), 0,
(sy_call_t *)compat_12(netbsd32_getdirentries) },/* 196 = compat_12_netbsd32_getdirentries */
- { ns(struct netbsd32_mmap_args), 0,
+ { ns(struct netbsd32_mmap_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG6_64,
(sy_call_t *)netbsd32_mmap }, /* 197 = netbsd32_mmap */
- { ns(struct netbsd32_sys___syscall_args), SYCALL_INDIRECT,
+ { ns(struct netbsd32_sys___syscall_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG0_64 | SYCALL_RET_64 | SYCALL_INDIRECT,
(sy_call_t *)netbsd32_sys___syscall },/* 198 = __syscall */
- { ns(struct netbsd32_lseek_args), 0,
+ { ns(struct netbsd32_lseek_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG2_64 | SYCALL_RET_64,
(sy_call_t *)netbsd32_lseek }, /* 199 = netbsd32_lseek */
- { ns(struct netbsd32_truncate_args), 0,
+ { ns(struct netbsd32_truncate_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG2_64,
(sy_call_t *)netbsd32_truncate }, /* 200 = netbsd32_truncate */
- { ns(struct netbsd32_ftruncate_args), 0,
+ { ns(struct netbsd32_ftruncate_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG2_64,
(sy_call_t *)netbsd32_ftruncate }, /* 201 = netbsd32_ftruncate */
{ ns(struct netbsd32___sysctl_args), 0,
(sy_call_t *)netbsd32___sysctl }, /* 202 = netbsd32___sysctl */
@@ -787,9 +787,9 @@
(sy_call_t *)netbsd32___clone }, /* 287 = netbsd32___clone */
{ ns(struct netbsd32_fktrace_args), 0,
(sy_call_t *)netbsd32_fktrace }, /* 288 = netbsd32_fktrace */
- { ns(struct netbsd32_preadv_args), 0,
+ { ns(struct netbsd32_preadv_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
(sy_call_t *)netbsd32_preadv }, /* 289 = netbsd32_preadv */
- { ns(struct netbsd32_pwritev_args), 0,
+ { ns(struct netbsd32_pwritev_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
(sy_call_t *)netbsd32_pwritev }, /* 290 = netbsd32_pwritev */
{ ns(struct netbsd32___sigaction14_args), 0,
(sy_call_t *)netbsd32___sigaction14 },/* 291 = netbsd32___sigaction14 */
@@ -932,7 +932,7 @@
sys_nosys }, /* 352 = unimplemented */
{ 0, 0, 0,
sys_nosys }, /* 353 = unimplemented */
- { ns(struct netbsd32_fsync_range_args), 0,
+ { ns(struct netbsd32_fsync_range_args), SYCALL_NARGS64_VAL(2) | SYCALL_ARG3_64 | SYCALL_ARG2_64,
(sy_call_t *)netbsd32_fsync_range },/* 354 = netbsd32_fsync_range */
{ ns(struct netbsd32_uuidgen_args), 0,
(sy_call_t *)netbsd32_uuidgen }, /* 355 = netbsd32_uuidgen */
@@ -1056,7 +1056,7 @@
sys_nosys }, /* 414 = unimplemented */
{ 0, 0, 0,
sys_nosys }, /* 415 = unimplemented */
- { ns(struct netbsd32___posix_fadvise50_args), 0,
+ { ns(struct netbsd32___posix_fadvise50_args), SYCALL_NARGS64_VAL(2) | SYCALL_ARG3_64 | SYCALL_ARG2_64,
(sy_call_t *)netbsd32___posix_fadvise50 },/* 416 = netbsd32___posix_fadvise50 */
{ 0, 0, 0,
sys_nosys }, /* 417 = filler */
