CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Fri May 20 06:06:59 UTC 2011
Modified Files:
src/sys/dev/mii: ihphy.c inbmphyreg.h
Log Message:
82579 support.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/inbmphyreg.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/dev/mii/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.1 src/sys/dev/mii/ihphy.c:1.2
--- src/sys/dev/mii/ihphy.c:1.1 Sat Nov 27 20:15:27 2010
+++ src/sys/dev/mii/ihphy.c Fri May 20 06:06:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ihphy.c,v 1.1 2010/11/27 20:15:27 christos Exp $ */
+/* $NetBSD: ihphy.c,v 1.2 2011/05/20 06:06:59 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ihphy.c,v 1.1 2010/11/27 20:15:27 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ihphy.c,v 1.2 2011/05/20 06:06:59 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -96,6 +96,8 @@
static const struct mii_phydesc ihphys[] = {
{ MII_OUI_INTEL, MII_MODEL_INTEL_I82577,
MII_STR_INTEL_I82577 },
+ { MII_OUI_INTEL, MII_MODEL_INTEL_I82579,
+ MII_STR_INTEL_I82579 },
{ 0,0,
NULL },
Index: src/sys/dev/mii/inbmphyreg.h
diff -u src/sys/dev/mii/inbmphyreg.h:1.2 src/sys/dev/mii/inbmphyreg.h:1.3
--- src/sys/dev/mii/inbmphyreg.h:1.2 Sun Mar 7 11:07:01 2010
+++ src/sys/dev/mii/inbmphyreg.h Fri May 20 06:06:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: inbmphyreg.h,v 1.2 2010/03/07 11:07:01 msaitoh Exp $ */
+/* $NetBSD: inbmphyreg.h,v 1.3 2011/05/20 06:06:59 msaitoh Exp $ */
/***
Copyright (c) 2001-2005, Intel Corporation
All rights reserved.
@@ -92,6 +92,9 @@
#define HV_INTC_FC_PAGE_START 768
#define BM_PORT_CTRL_PAGE 769
+#define HV_KMRN_MODE_CTRL BME1000_REG(BM_PORT_CTRL_PAGE, 16)
+#define HV_KMRN_MDIO_SLOW 0x0400
+
#define IGP3_KMRN_DIAG BME1000_REG(770, 19)
#define IGP3_KMRN_DIAG_PCS_LOCK_LOSS (1 1)
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: tsutsui Date: Fri May 20 06:26:58 UTC 2011 Modified Files: src/sys/arch/zaurus/conf: GENERIC Log Message: Comment out options COMPAT_09, COMAPT_10, COMPAT_11, and COMPAT_12. (no NetBSD/arm32 binary release before 1.3) To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/zaurus/conf/GENERIC 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/zaurus/conf/GENERIC diff -u src/sys/arch/zaurus/conf/GENERIC:1.36 src/sys/arch/zaurus/conf/GENERIC:1.37 --- src/sys/arch/zaurus/conf/GENERIC:1.36 Sat May 14 15:02:29 2011 +++ src/sys/arch/zaurus/conf/GENERIC Fri May 20 06:26:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.36 2011/05/14 15:02:29 nonaka Exp $ +# $NetBSD: GENERIC,v 1.37 2011/05/20 06:26:58 tsutsui Exp $ # # GENERIC machine description file # @@ -85,10 +85,10 @@ options INET6 # IPv6 # Compatibility options -options COMPAT_09 # NetBSD 0.9, -options COMPAT_10 # NetBSD 1.0, -options COMPAT_11 # NetBSD 1.1, -options COMPAT_12 # NetBSD 1.2, +#options COMPAT_09 # NetBSD 0.9, +#options COMPAT_10 # NetBSD 1.0, +#options COMPAT_11 # NetBSD 1.1, +#options COMPAT_12 # NetBSD 1.2, options COMPAT_13 # NetBSD 1.3, options COMPAT_14 # NetBSD 1.4, options COMPAT_15 # NetBSD 1.5,
CVS commit: src/usr.bin/error
Module Name:src Committed By: wiz Date: Fri May 20 07:07:37 UTC 2011 Modified Files: src/usr.bin/error: error.1 Log Message: Sort options, merge single letter options in synopsis. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.bin/error/error.1 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/error/error.1 diff -u src/usr.bin/error/error.1:1.15 src/usr.bin/error/error.1:1.16 --- src/usr.bin/error/error.1:1.15 Thu May 19 22:55:53 2011 +++ src/usr.bin/error/error.1 Fri May 20 07:07:37 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: error.1,v 1.15 2011/05/19 22:55:53 christos Exp $ +.\ $NetBSD: error.1,v 1.16 2011/05/20 07:07:37 wiz Exp $ .\ .\ Copyright (c) 1980, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -37,32 +37,32 @@ .Nd analyze and disperse compiler error messages .Sh SYNOPSIS .Nm +.Op Fl nqSsTv .Op Fl I Ar ignorefile -.Op Fl n .Pp Fl p Ar filelevel -.Op Fl q -.Op Fl S -.Op Fl s -.Op Fl T .Op Fl t Ar suffixlist -.Op Fl v .Op name .Sh DESCRIPTION .Nm analyzes and optionally disperses the diagnostic error messages produced by a number of compilers and language processors to the source -file and line where the errors occurred. It can replace the painful, +file and line where the errors occurred. +It can replace the painful, traditional methods of scribbling abbreviations of errors on paper, and permits error messages and source code to be viewed simultaneously without machinations of multiple windows in a screen editor. .Pp Options are: -.Bl -tag -width Ds +.Bl -tag -width XpXfilelevelXX .It Fl n Do .Em not touch any files; all error messages are sent to the standard output. +.It Fl p Ar filelevel +Interpret filenumber as a level of path component names to skip, +similar to +.Xr patch 1 . .It Fl q The user is .Ar queried @@ -73,19 +73,13 @@ option implies that all referenced files (except those referring to discarded error messages) are to be touched. -.It Fl v -After all files have been touched, -overlay the visual editor -.Xr \vi 1 -with it set up to edit all files touched, -and positioned in the first touched file at the first error. -If -.Xr \vi 1 -can't be found, try -.Xr \ex 1 -or -.Xr \ed 1 -from standard places. +.It Fl S +Show the errors in unsorted order (as they come from the error file). +.It Fl s +Print out +.Em statistics +regarding the error categorization. +Not too useful. .It Fl T Terse output. .It Fl t @@ -99,17 +93,19 @@ allows .Nm to touch files ending with ``.c'', ``.y'', ``.foo*'' and ``.h''. -.It Fl p Ar filelevel -Interpret filenumber as a level of path component names to skip, -similar to -.Xr patch 1 . -.It Fl S -Show the errors in unsorted order (as they come from the error file). -.It Fl s -Print out -.Em statistics -regarding the error categorization. -Not too useful. +.It Fl v +After all files have been touched, +overlay the visual editor +.Xr \vi 1 +with it set up to edit all files touched, +and positioned in the first touched file at the first error. +If +.Xr \vi 1 +can't be found, try +.Xr \ex 1 +or +.Xr \ed 1 +from standard places. .El .Pp .Nm
CVS commit: src/usr.bin/error
Module Name:src Committed By: wiz Date: Fri May 20 07:08:25 UTC 2011 Modified Files: src/usr.bin/error: error.1 Log Message: Fix macro name in SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/error/error.1 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/error/error.1 diff -u src/usr.bin/error/error.1:1.16 src/usr.bin/error/error.1:1.17 --- src/usr.bin/error/error.1:1.16 Fri May 20 07:07:37 2011 +++ src/usr.bin/error/error.1 Fri May 20 07:08:24 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: error.1,v 1.16 2011/05/20 07:07:37 wiz Exp $ +.\ $NetBSD: error.1,v 1.17 2011/05/20 07:08:24 wiz Exp $ .\ .\ Copyright (c) 1980, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -39,7 +39,7 @@ .Nm .Op Fl nqSsTv .Op Fl I Ar ignorefile -.Pp Fl p Ar filelevel +.Op Fl p Ar filelevel .Op Fl t Ar suffixlist .Op name .Sh DESCRIPTION
CVS commit: src/usr.bin/error
Module Name:src
Committed By: wiz
Date: Fri May 20 07:09:52 UTC 2011
Modified Files:
src/usr.bin/error: main.c
Log Message:
Sync usage with man page.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/error/main.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/error/main.c
diff -u src/usr.bin/error/main.c:1.18 src/usr.bin/error/main.c:1.19
--- src/usr.bin/error/main.c:1.18 Thu May 19 22:55:53 2011
+++ src/usr.bin/error/main.c Fri May 20 07:09:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.18 2011/05/19 22:55:53 christos Exp $ */
+/* $NetBSD: main.c,v 1.19 2011/05/20 07:09:52 wiz Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)main.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: main.c,v 1.18 2011/05/19 22:55:53 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.19 2011/05/20 07:09:52 wiz Exp $);
#endif /* not lint */
#include signal.h
@@ -297,7 +297,7 @@
static void
usage(void)
{
- fprintf(stderr, Usage: %s [-nqSsTv] [-I ignorename]
- [-t suffixlist] [-p level] infile\n, getprogname());
+ fprintf(stderr, Usage: %s [-nqSsTv] [-I ignorefile]
+ [-p filelevel] [-t suffixlist] [name]\n, getprogname());
exit(1);
}
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: tsutsui Date: Fri May 20 07:47:53 UTC 2011 Modified Files: src/sys/arch/zaurus/conf: INSTALL Log Message: Shrink INSTALL kerenl more: - disable KERNFS (install ramdisk uses /sbin/dmesg directly) - disable mice, audio, uk(4), and wsfont(4) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/conf/INSTALL 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/zaurus/conf/INSTALL diff -u src/sys/arch/zaurus/conf/INSTALL:1.7 src/sys/arch/zaurus/conf/INSTALL:1.8 --- src/sys/arch/zaurus/conf/INSTALL:1.7 Thu May 5 09:07:59 2011 +++ src/sys/arch/zaurus/conf/INSTALL Fri May 20 07:47:53 2011 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.7 2011/05/05 09:07:59 nonaka Exp $ +# $NetBSD: INSTALL,v 1.8 2011/05/20 07:47:53 tsutsui Exp $ # # INSTALL config file (GENERIC with memory disk root) # @@ -20,6 +20,7 @@ no options INSECURE +no file-system KERNFS no file-system NULLFS no file-system PROCFS no file-system PTYFS @@ -43,8 +44,20 @@ no options DDB_HISTORY_SIZE no options SYMTAB_SPACE +no ztp0 at pxaip? +no wsmouse* at ztp? + +no zaudio0 at pxaip? +no audio* at zaudio? + +no ums* at uhidev? +no wsmouse* at ums? + +no uk* at scsibus? + no pseudo-device vnd no options VND_COMPRESSION no pseudo-device accf_data no pseudo-device accf_http no pseudo-device ksyms +no pseudo-device wsfont
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: tsutsui Date: Fri May 20 07:49:31 UTC 2011 Modified Files: src/sys/arch/zaurus/conf: GENERIC Log Message: Enable cd* at atapibus? for some USB CD/DVD drives. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/zaurus/conf/GENERIC 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/zaurus/conf/GENERIC diff -u src/sys/arch/zaurus/conf/GENERIC:1.37 src/sys/arch/zaurus/conf/GENERIC:1.38 --- src/sys/arch/zaurus/conf/GENERIC:1.37 Fri May 20 06:26:58 2011 +++ src/sys/arch/zaurus/conf/GENERIC Fri May 20 07:49:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.37 2011/05/20 06:26:58 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.38 2011/05/20 07:49:31 tsutsui Exp $ # # GENERIC machine description file # @@ -289,6 +289,15 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives uk* at scsibus? target ? lun ? # SCSI unknown +# ATAPI bus support +atapibus* at atapi? + +# ATAPI devices +cd* at atapibus? drive ? # ATAPI CD-ROM drives +#sd* at atapibus? drive ? # ATAPI disk drives +#st* at atapibus? drive ? # ATAPI tape drives +#uk* at atapibus? drive ? # ATAPI unknown + # USB audio #uaudio* at uhub? port ? configuration ?
CVS commit: src/distrib/zaurus/ramdisk
Module Name:src
Committed By: tsutsui
Date: Fri May 20 07:54:13 UTC 2011
Modified Files:
src/distrib/zaurus/ramdisk: list
Log Message:
- disable chio(1) and slattach(8)
- use x_ed (no crypt support) and x_gzip (no compress and bz2 support)
- add back mount_cd9660 for USB CD/DVD drives
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/zaurus/ramdisk/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/zaurus/ramdisk/list
diff -u src/distrib/zaurus/ramdisk/list:1.16 src/distrib/zaurus/ramdisk/list:1.17
--- src/distrib/zaurus/ramdisk/list:1.16 Fri May 6 18:32:59 2011
+++ src/distrib/zaurus/ramdisk/list Fri May 20 07:54:12 2011
@@ -1,10 +1,10 @@
-# $NetBSD: list,v 1.16 2011/05/06 18:32:59 tsutsui Exp $
+# $NetBSD: list,v 1.17 2011/05/20 07:54:12 tsutsui Exp $
# usr.bin/less has to be first, otherwise the ramdisk.mk generation fails
SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin
PROG bin/cat
-PROG bin/chio
+#PROG bin/chio
PROG bin/chmod
PROG bin/cp
PROG bin/dd
@@ -32,6 +32,7 @@
PROG sbin/init
PROG sbin/mknod
PROG sbin/mount
+PROG sbin/mount_cd9660
PROG sbin/mount_ffs
PROG sbin/mount_msdos
PROG sbin/mount_nfs
@@ -42,7 +43,7 @@
PROG sbin/route
PROG sbin/scsictl
PROG sbin/shutdown
-PROG sbin/slattach
+#PROG sbin/slattach
PROG sbin/swapctl
PROG sbin/umount
@@ -57,11 +58,13 @@
# init invokes the shell as -sh
ARGVLN sh -sh
+SPECIAL ed srcdir distrib/utils/x_ed
+SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
-LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS libhack.o -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
# various files that we need in /etc for the install
COPY ${NETBSDSRCDIR}/etc/group etc/group
CVS commit: src
Module Name:src
Committed By: tsutsui
Date: Fri May 20 07:57:07 UTC 2011
Modified Files:
src/distrib/zaurus/ramdisk: Makefile
src/sys/arch/zaurus/conf: INSTALL
Log Message:
Shrink ramdisk size to 2048KB.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/zaurus/ramdisk/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/zaurus/ramdisk/Makefile
diff -u src/distrib/zaurus/ramdisk/Makefile:1.13 src/distrib/zaurus/ramdisk/Makefile:1.14
--- src/distrib/zaurus/ramdisk/Makefile:1.13 Fri May 6 18:33:59 2011
+++ src/distrib/zaurus/ramdisk/Makefile Fri May 20 07:57:07 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2011/05/06 18:33:59 tsutsui Exp $
+# $NetBSD: Makefile,v 1.14 2011/05/20 07:57:07 tsutsui Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2144k
+IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 14
WARNS= 1
Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.8 src/sys/arch/zaurus/conf/INSTALL:1.9
--- src/sys/arch/zaurus/conf/INSTALL:1.8 Fri May 20 07:47:53 2011
+++ src/sys/arch/zaurus/conf/INSTALL Fri May 20 07:57:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.8 2011/05/20 07:47:53 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.9 2011/05/20 07:57:07 tsutsui Exp $
#
# INSTALL config file (GENERIC with memory disk root)
#
@@ -9,7 +9,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=4288 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=4096 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# for reduce kernel size.
CVS commit: src/distrib/zaurus/ramdisk
Module Name:src Committed By: tsutsui Date: Fri May 20 07:59:44 UTC 2011 Modified Files: src/distrib/zaurus/ramdisk: list Log Message: Remove gnu/usr.bin from SRCDIRS. (no sources there) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/zaurus/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/zaurus/ramdisk/list diff -u src/distrib/zaurus/ramdisk/list:1.17 src/distrib/zaurus/ramdisk/list:1.18 --- src/distrib/zaurus/ramdisk/list:1.17 Fri May 20 07:54:12 2011 +++ src/distrib/zaurus/ramdisk/list Fri May 20 07:59:44 2011 @@ -1,7 +1,7 @@ -# $NetBSD: list,v 1.17 2011/05/20 07:54:12 tsutsui Exp $ +# $NetBSD: list,v 1.18 2011/05/20 07:59:44 tsutsui Exp $ # usr.bin/less has to be first, otherwise the ramdisk.mk generation fails -SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin +SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin PROG bin/cat #PROG bin/chio
CVS commit: [matt-nb5-mips64] src
Module Name:src Committed By: matt Date: Fri May 20 08:11:34 UTC 2011 Modified Files: src [matt-nb5-mips64]: UPDATING src/crypto/dist/openssl/ssl [matt-nb5-mips64]: s3_clnt.c src/crypto/dist/ssh [matt-nb5-mips64]: sftp-glob.c sftp.c ssh_config ssh_config.5 sshd_config.5 src/distrib/amd64/floppies/common [matt-nb5-mips64]: boot.cfg src/distrib/notes/common [matt-nb5-mips64]: contents xfer src/distrib/notes/macppc [matt-nb5-mips64]: prep.OPENFIRMWARE src/distrib/utils/sysinst [matt-nb5-mips64]: mbr.c msg.mbr.de msg.mbr.en msg.mbr.es msg.mbr.fr msg.mbr.pl src/doc [matt-nb5-mips64]: 3RDPARTY BUILDING.mdoc CHANGES LAST_MINUTE README.files src/gnu/dist/binutils/gas [matt-nb5-mips64]: atof-generic.c src/gnu/dist/binutils/gas/config [matt-nb5-mips64]: atof-vax.c src/lib/libc/gen [matt-nb5-mips64]: glob.3 glob.c src/lib/libc/misc [matt-nb5-mips64]: initfini.c src/lib/libc/stdlib [matt-nb5-mips64]: exit.c src/lib/libpthread [matt-nb5-mips64]: pthread.c src/libexec/httpd [matt-nb5-mips64]: bozohttpd.c src/sbin/disklabel [matt-nb5-mips64]: interact.c src/sys/arch/amd64/amd64 [matt-nb5-mips64]: locore.S machdep.c mptramp.S netbsd32_machdep.c src/sys/arch/amd64/include [matt-nb5-mips64]: segments.h src/sys/arch/amiga/amiga [matt-nb5-mips64]: amiga_init.c locore.s src/sys/arch/amiga/dev [matt-nb5-mips64]: kbd.c src/sys/arch/i386/i386 [matt-nb5-mips64]: machdep.c pmc.c trap.c vector.S src/sys/arch/i386/isa [matt-nb5-mips64]: npx.c src/sys/arch/i386/stand/misc [matt-nb5-mips64]: Makefile src/sys/arch/x86/include [matt-nb5-mips64]: cpu.h cpuvar.h src/sys/arch/x86/x86 [matt-nb5-mips64]: cpu.c identcpu.c pmap.c via_padlock.c src/sys/arch/xen/x86 [matt-nb5-mips64]: cpu.c src/sys/coda [matt-nb5-mips64]: coda.h coda_venus.c coda_vnops.c src/sys/conf [matt-nb5-mips64]: copyright src/sys/dev/usb [matt-nb5-mips64]: ehci.c src/sys/dist/ipf/netinet [matt-nb5-mips64]: ip_fil_netbsd.c src/sys/gdbscripts [matt-nb5-mips64]: lwps src/sys/kern [matt-nb5-mips64]: exec_subr.c kern_pax.c vfs_wapbl.c vfs_xattr.c src/sys/miscfs/genfs [matt-nb5-mips64]: genfs_io.c genfs_node.h genfs_vnops.c src/sys/net [matt-nb5-mips64]: bpf_filter.c if.c src/sys/netinet [matt-nb5-mips64]: tcp_input.c src/sys/netinet6 [matt-nb5-mips64]: udp6_output.c src/sys/netsmb [matt-nb5-mips64]: mchain.h smb_dev.h smb_subr.c smb_subr.h subr_mchain.c src/sys/nfs [matt-nb5-mips64]: nfs_bio.c src/sys/opencrypto [matt-nb5-mips64]: crypto.c cryptodev.c cryptodev.h cryptosoft.c cryptosoft.h cryptosoft_xform.c deflate.c deflate.h files.opencrypto xform.c xform.h src/sys/ufs/ufs [matt-nb5-mips64]: ufs_inode.c src/sys/uvm [matt-nb5-mips64]: uvm_pager.h src/usr.bin/sort [matt-nb5-mips64]: sort.c Added Files: src/doc [matt-nb5-mips64]: CHANGES-5.1 src/sys/arch/i386/stand/misc [matt-nb5-mips64]: rawr32.exe.uue src/sys/opencrypto [matt-nb5-mips64]: ocryptodev.c ocryptodev.h Removed Files: src/doc [matt-nb5-mips64]: CHANGES-5.0.1 src/sys/arch/i386/stand/misc [matt-nb5-mips64]: rawr32.zip.uue rawr32src.zip.uue Log Message: bring matt-nb5-mips64 up to date with netbsd-5-1-RELEASE (except compat). To generate a diff of this commit: cvs rdiff -u -r1.178.2.1.2.1.2.1 -r1.178.2.1.2.1.2.2 src/UPDATING cvs rdiff -u -r1.12.4.1 -r1.12.4.1.4.1 src/crypto/dist/openssl/ssl/s3_clnt.c cvs rdiff -u -r1.13 -r1.13.30.1 src/crypto/dist/ssh/sftp-glob.c cvs rdiff -u -r1.23 -r1.23.14.1 src/crypto/dist/ssh/sftp.c cvs rdiff -u -r1.14 -r1.14.12.1 src/crypto/dist/ssh/ssh_config cvs rdiff -u -r1.16 -r1.16.14.1 src/crypto/dist/ssh/ssh_config.5 cvs rdiff -u -r1.15 -r1.15.14.1 src/crypto/dist/ssh/sshd_config.5 cvs rdiff -u -r1.1.8.1 -r1.1.8.1.4.1 \ src/distrib/amd64/floppies/common/boot.cfg cvs rdiff -u -r1.143.2.6 -r1.143.2.6.4.1 src/distrib/notes/common/contents cvs rdiff -u -r1.63.2.1 -r1.63.2.1.4.1 src/distrib/notes/common/xfer cvs rdiff -u -r1.11.2.1 -r1.11.2.1.4.1 \ src/distrib/notes/macppc/prep.OPENFIRMWARE cvs rdiff -u -r1.79.20.1 -r1.79.20.2 src/distrib/utils/sysinst/mbr.c cvs rdiff -u -r1.8 -r1.8.28.1 src/distrib/utils/sysinst/msg.mbr.de cvs rdiff -u -r1.13 -r1.13.36.1 src/distrib/utils/sysinst/msg.mbr.en cvs rdiff -u -r1.4 -r1.4.36.1 src/distrib/utils/sysinst/msg.mbr.es cvs rdiff -u -r1.14 -r1.14.34.1 src/distrib/utils/sysinst/msg.mbr.fr cvs rdiff -u -r1.11 -r1.11.34.1 src/distrib/utils/sysinst/msg.mbr.pl cvs rdiff -u -r1.647.2.6 -r1.647.2.6.4.1 src/doc/3RDPARTY cvs rdiff -u -r1.67.2.2 -r1.67.2.2.4.1 src/doc/BUILDING.mdoc cvs rdiff -u -r1.1142.2.7 -r1.1142.2.7.4.1
CVS commit: src/doc
Module Name:src Committed By: matt Date: Fri May 20 08:12:46 UTC 2011 Modified Files: src/doc: BRANCHES Log Message: Note new base tag for matt-nb5-mips64 To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.306 src/doc/BRANCHES:1.307 --- src/doc/BRANCHES:1.306 Mon May 2 20:48:27 2011 +++ src/doc/BRANCHES Fri May 20 08:12:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.306 2011/05/02 20:48:27 rmind Exp $ +# $NetBSD: BRANCHES,v 1.307 2011/05/20 08:12:46 matt Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -423,7 +423,7 @@ Status: Active Start Date: 2009-08-01 End Date: -Base Tag: netbsd-5-0-1-RELEASE +Base Tag: netbsd-5-1-RELEASE Maintainer: Matt Thomas m...@netbsd.org Scope: kernel userland Notes:
CVS commit: src/etc/etc.zaurus
Module Name:src Committed By: tsutsui Date: Fri May 20 08:17:40 UTC 2011 Modified Files: src/etc/etc.zaurus: MAKEDEV.conf Log Message: No floppy on zaurus. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/etc/etc.zaurus/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.zaurus/MAKEDEV.conf diff -u src/etc/etc.zaurus/MAKEDEV.conf:1.6 src/etc/etc.zaurus/MAKEDEV.conf:1.7 --- src/etc/etc.zaurus/MAKEDEV.conf:1.6 Tue Apr 21 03:00:58 2009 +++ src/etc/etc.zaurus/MAKEDEV.conf Fri May 20 08:17:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.6 2009/04/21 03:00:58 nonaka Exp $ +# $NetBSD: MAKEDEV.conf,v 1.7 2011/05/20 08:17:40 tsutsui Exp $ all_md) makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 ld0 @@ -18,8 +18,8 @@ makedev cfs ;; -ramdisk|floppy) - makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 ld0 +ramdisk) + makedev std wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 ld0 makedev tty0 tty1 opty makedev st0 st1 cd0 cd1 makedev wscons
CVS commit: src/etc/etc.zaurus
Module Name:src Committed By: tsutsui Date: Fri May 20 08:29:05 UTC 2011 Modified Files: src/etc/etc.zaurus: MAKEDEV.conf Log Message: Also remove fd0 and fd1 from target all_md. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/etc/etc.zaurus/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.zaurus/MAKEDEV.conf diff -u src/etc/etc.zaurus/MAKEDEV.conf:1.7 src/etc/etc.zaurus/MAKEDEV.conf:1.8 --- src/etc/etc.zaurus/MAKEDEV.conf:1.7 Fri May 20 08:17:40 2011 +++ src/etc/etc.zaurus/MAKEDEV.conf Fri May 20 08:29:05 2011 @@ -1,7 +1,7 @@ -# $NetBSD: MAKEDEV.conf,v 1.7 2011/05/20 08:17:40 tsutsui Exp $ +# $NetBSD: MAKEDEV.conf,v 1.8 2011/05/20 08:29:05 tsutsui Exp $ all_md) - makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 ld0 + makedev wscons wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 ld0 makedev tty0 tty1 st0 st1 ch0 cd0 cd1 makedev uk0 uk1 ss0 makedev lpa0 lpt0
CVS commit: src/external/mit/xorg/etc/etc.zaurus
Module Name:src
Committed By: tsutsui
Date: Fri May 20 08:40:05 UTC 2011
Added Files:
src/external/mit/xorg/etc/etc.zaurus: Makefile.inc xorg.conf
Log Message:
Add sample xorg.conf file for zaurus.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/etc/etc.zaurus/Makefile.inc \
src/external/mit/xorg/etc/etc.zaurus/xorg.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/etc/etc.zaurus/Makefile.inc
diff -u /dev/null src/external/mit/xorg/etc/etc.zaurus/Makefile.inc:1.1
--- /dev/null Fri May 20 08:40:05 2011
+++ src/external/mit/xorg/etc/etc.zaurus/Makefile.inc Fri May 20 08:40:04 2011
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2011/05/20 08:40:04 tsutsui Exp $
+
+XORGCONF_FILES= etc.${MACHINE}/xorg.conf
Index: src/external/mit/xorg/etc/etc.zaurus/xorg.conf
diff -u /dev/null src/external/mit/xorg/etc/etc.zaurus/xorg.conf:1.1
--- /dev/null Fri May 20 08:40:05 2011
+++ src/external/mit/xorg/etc/etc.zaurus/xorg.conf Fri May 20 08:40:04 2011
@@ -0,0 +1,57 @@
+# $NetBSD: xorg.conf,v 1.1 2011/05/20 08:40:04 tsutsui Exp $
+
+Section ServerLayout
+ Identifier wsfb
+ Screen 0 Screen0 0 0
+ InputDevice TouchScreen0 CorePointer
+ InputDevice Keyboard0 CoreKeyboard
+EndSection
+
+Section Files
+# FontPath /usr/pkg/lib/X11/fonts/TTF/
+EndSection
+
+Section InputDevice
+ Identifier Keyboard0
+ Driver kbd
+ Option XkbModel sl-c3x00
+EndSection
+
+Section InputDevice
+ Identifier TouchScreen0
+ Driver ws
+
+ Option device /dev/wsmouse
+ Option ZAxisMapping 4 5
+
+ Option MinX 0
+ Option MaxX 479
+ Option MinY 0
+ Option MaxY 639
+
+ Option Rotate CW
+EndSection
+
+Section Device
+ Identifier Wsdisplay0
+ Driver wsfb
+
+ Option Rotate CW
+EndSection
+
+Section Monitor
+ Identifier Monitor
+ VendorName Sharp
+ ModelName Zaurus
+EndSection
+
+Section Screen
+ Identifier Screen0
+ Device Wsdisplay0
+ Monitor Monitor
+ DefaultDepth 16
+
+ SubSection Display
+ Depth 16
+ EndSubSection
+EndSection
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: tsutsui Date: Fri May 20 09:01:39 UTC 2011 Modified Files: src/sys/arch/zaurus/conf: GENERIC Log Message: Move pseudo-device bpfilter to proper place. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/zaurus/conf/GENERIC 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/zaurus/conf/GENERIC diff -u src/sys/arch/zaurus/conf/GENERIC:1.38 src/sys/arch/zaurus/conf/GENERIC:1.39 --- src/sys/arch/zaurus/conf/GENERIC:1.38 Fri May 20 07:49:31 2011 +++ src/sys/arch/zaurus/conf/GENERIC Fri May 20 09:01:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.38 2011/05/20 07:49:31 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.39 2011/05/20 09:01:39 tsutsui Exp $ # # GENERIC machine description file # @@ -360,6 +360,7 @@ options VND_COMPRESSION # compressed vnd(4) # network pseudo-devices +pseudo-device bpfilter# Berkeley packet filter pseudo-device loop # network loopback # @@ -386,4 +387,3 @@ # wscons pseudo-devices pseudo-device wsmux # mouse keyboard multiplexor pseudo-device wsfont -pseudo-device bpfilter# Berkeley packet filter
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: tsutsui Date: Fri May 20 09:06:02 UTC 2011 Modified Files: src/sys/arch/zaurus/conf: GENERIC Log Message: Remove unnecessary count arguments from some pseudo-devices. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/zaurus/conf/GENERIC 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/zaurus/conf/GENERIC diff -u src/sys/arch/zaurus/conf/GENERIC:1.39 src/sys/arch/zaurus/conf/GENERIC:1.40 --- src/sys/arch/zaurus/conf/GENERIC:1.39 Fri May 20 09:01:39 2011 +++ src/sys/arch/zaurus/conf/GENERIC Fri May 20 09:06:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.39 2011/05/20 09:01:39 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.40 2011/05/20 09:06:02 tsutsui Exp $ # # GENERIC machine description file # @@ -356,7 +356,7 @@ # disk/mass storage pseudo-devices pseudo-device md # memory disk device (ramdisk) -pseudo-device vnd 4 # disk-like interface to files +pseudo-device vnd # disk-like interface to files options VND_COMPRESSION # compressed vnd(4) # network pseudo-devices @@ -382,7 +382,7 @@ #pseudo-device nsmb # experimental - SMB requester # a pseudo device needed for verified exec -#pseudo-device veriexec1 +#pseudo-device veriexec # wscons pseudo-devices pseudo-device wsmux # mouse keyboard multiplexor
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: reinoud Date: Fri May 20 09:23:37 UTC 2011 Modified Files: src/sys/dev/scsipi: cd.c Log Message: Fix size reporting for DVD+R/DL and BluRay's; the value was trunced due to a 32 bit trunc due to a lacking type cast. The number of sectors for such media can be more than 132-1. To generate a diff of this commit: cvs rdiff -u -r1.302 -r1.303 src/sys/dev/scsipi/cd.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/scsipi/cd.c diff -u src/sys/dev/scsipi/cd.c:1.302 src/sys/dev/scsipi/cd.c:1.303 --- src/sys/dev/scsipi/cd.c:1.302 Sun Apr 4 21:36:22 2010 +++ src/sys/dev/scsipi/cd.c Fri May 20 09:23:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cd.c,v 1.302 2010/04/04 21:36:22 martin Exp $ */ +/* $NetBSD: cd.c,v 1.303 2011/05/20 09:23:37 reinoud Exp $ */ /*- * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation, @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.302 2010/04/04 21:36:22 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.303 2011/05/20 09:23:37 reinoud Exp $); #include rnd.h @@ -1850,7 +1850,7 @@ /* overwrite only with a sane value */ if (track_start + track_size = 100) -*size = track_start + track_size; +*size = (u_long) track_start + track_size; } }
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: tsutsui Date: Fri May 20 09:25:15 UTC 2011 Modified Files: src/sys/arch/zaurus/conf: GENERIC Log Message: Add (commented out) options MODULAR. Just works fine as other arm ports. This will be mandatory because zbsdmod.o loader has size (5MB) restriction. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/zaurus/conf/GENERIC 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/zaurus/conf/GENERIC diff -u src/sys/arch/zaurus/conf/GENERIC:1.40 src/sys/arch/zaurus/conf/GENERIC:1.41 --- src/sys/arch/zaurus/conf/GENERIC:1.40 Fri May 20 09:06:02 2011 +++ src/sys/arch/zaurus/conf/GENERIC Fri May 20 09:25:15 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.40 2011/05/20 09:06:02 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.41 2011/05/20 09:25:15 tsutsui Exp $ # # GENERIC machine description file # @@ -117,6 +117,9 @@ options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support +# Loadable kernel module support +#options MODULAR # new style module(7) framework + # Device options # Miscellaneous kernel options
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: tsutsui Date: Fri May 20 09:28:32 UTC 2011 Modified Files: src/distrib/sets/lists/xserver: md.zaurus Log Message: Add /etc/X11/xorg.conf. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xserver/md.zaurus 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/xserver/md.zaurus diff -u src/distrib/sets/lists/xserver/md.zaurus:1.4 src/distrib/sets/lists/xserver/md.zaurus:1.5 --- src/distrib/sets/lists/xserver/md.zaurus:1.4 Wed Mar 9 18:55:56 2011 +++ src/distrib/sets/lists/xserver/md.zaurus Fri May 20 09:28:32 2011 @@ -1,3 +1,4 @@ +./etc/X11/xorg.conf -unknown- xorg ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: tsutsui Date: Fri May 20 09:29:09 UTC 2011 Modified Files: src/distrib/sets/lists/xserver: md.zaurus Log Message: Add RCSId. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xserver/md.zaurus 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/xserver/md.zaurus diff -u src/distrib/sets/lists/xserver/md.zaurus:1.5 src/distrib/sets/lists/xserver/md.zaurus:1.6 --- src/distrib/sets/lists/xserver/md.zaurus:1.5 Fri May 20 09:28:32 2011 +++ src/distrib/sets/lists/xserver/md.zaurus Fri May 20 09:29:08 2011 @@ -1,3 +1,4 @@ +# $NetBSD: md.zaurus,v 1.6 2011/05/20 09:29:08 tsutsui Exp $ ./etc/X11/xorg.conf -unknown- xorg ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg
CVS commit: src/tests/lib/libobjc
Module Name:src
Committed By: joerg
Date: Fri May 20 13:03:45 UTC 2011
Modified Files:
src/tests/lib/libobjc: Makefile
Log Message:
Test case requires the GCC specific thread extension for Objective C, so
only enable the test if GCC is present and disable other compiler.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libobjc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libobjc/Makefile
diff -u src/tests/lib/libobjc/Makefile:1.1 src/tests/lib/libobjc/Makefile:1.2
--- src/tests/lib/libobjc/Makefile:1.1 Sun Jul 18 12:41:51 2010
+++ src/tests/lib/libobjc/Makefile Fri May 20 13:03:45 2011
@@ -1,8 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2010/07/18 12:41:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/20 13:03:45 joerg Exp $
TESTSDIR= ${TESTSBASE}/lib/libobjc
+.include bsd.own.mk
+
+UNSUPPORTED_COMPILER.clang= # defined
+UNSUPPORTED_COMPILER.pcc= # defined
+
+.if !empty(AVAILABLE_COMPILER:Mgcc)
TESTS_C= t_threads
+.endif
+
SRCS.t_threads= t_threads.m
WARNS?= 4
CFLAGS+= -pthread
CVS commit: src/sys/modules/compat_netbsd32
Module Name:src
Committed By: joerg
Date: Fri May 20 13:08:07 UTC 2011
Modified Files:
src/sys/modules/compat_netbsd32: Makefile
Log Message:
LLVM's assembler parser doesn't support .code32 yet, so disable it.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/compat_netbsd32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.5 src/sys/modules/compat_netbsd32/Makefile:1.6
--- src/sys/modules/compat_netbsd32/Makefile:1.5 Tue Jan 4 20:52:53 2011
+++ src/sys/modules/compat_netbsd32/Makefile Fri May 20 13:08:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/01/04 20:52:53 pgoyette Exp $
+# $NetBSD: Makefile,v 1.6 2011/05/20 13:08:07 joerg Exp $
.include ../Makefile.inc
.include ../Makefile.assym
@@ -9,6 +9,8 @@
CPPFLAGS+= -DEXEC_ELF32 -DEXEC_ELF64 -DEXEC_AOUT
CPPFLAGS+= -DP1003_1B_SEMAPHORE -DCOREDUMP -DKERN_SA
+COPTS.netbsd32_sigcode.S+= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
.PATH: ${S}/compat/netbsd32
SRCS+= netbsd32_compat_09.c netbsd32_compat_10.c
SRCS+= netbsd32_compat_12.c netbsd32_compat_13.c
CVS commit: src/sys/modules/compat_linux32
Module Name:src
Committed By: joerg
Date: Fri May 20 13:11:40 UTC 2011
Modified Files:
src/sys/modules/compat_linux32: Makefile
Log Message:
LLVM's assembler parser doesn't support .code32 yet, so disable it as
needed.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/compat_linux32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_linux32/Makefile
diff -u src/sys/modules/compat_linux32/Makefile:1.5 src/sys/modules/compat_linux32/Makefile:1.6
--- src/sys/modules/compat_linux32/Makefile:1.5 Sat Feb 14 13:56:41 2009
+++ src/sys/modules/compat_linux32/Makefile Fri May 20 13:11:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/02/14 13:56:41 abs Exp $
+# $NetBSD: Makefile,v 1.6 2011/05/20 13:11:40 joerg Exp $
.include ../Makefile.inc
.include ../Makefile.assym
@@ -8,6 +8,8 @@
CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG -DCOMPAT_LINUX
CPPFLAGS+= -DCOMPAT_LINUX32 -DCOMPAT_NETBSD32
+COPTS.linux32_sigcode.S+= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
.PATH: ${S}/compat/linux32/common
SRCS+= linux32_dirent.c linux32_exec.c linux32_exec_elf32.c linux32_fcntl.c
SRCS+= linux32_ioctl.c linux32_misc.c linux32_mman.c
CVS commit: src/sys/arch/xen/conf
Module Name:src
Committed By: joerg
Date: Fri May 20 13:12:59 UTC 2011
Modified Files:
src/sys/arch/xen/conf: Makefile.xen
Log Message:
LLVM's assembler parser doesn't support .code32 yet, so disable it as
needed.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/xen/conf/Makefile.xen
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/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.31 src/sys/arch/xen/conf/Makefile.xen:1.32
--- src/sys/arch/xen/conf/Makefile.xen:1.31 Wed Jan 12 23:12:12 2011
+++ src/sys/arch/xen/conf/Makefile.xen Fri May 20 13:12:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xen,v 1.31 2011/01/12 23:12:12 joerg Exp $
+# $NetBSD: Makefile.xen,v 1.32 2011/05/20 13:12:59 joerg Exp $
# NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp
# Makefile for NetBSD
@@ -55,6 +55,9 @@
##
KERN_AS= obj
+AFLAGS.linux32_sigcode.S+= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+AFLAGS.netbsd32_sigcode.S+= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
##
## (4) local objects, compile rules, and dependencies
##
CVS commit: src/sys/arch/x86/acpi
Module Name:src
Committed By: joerg
Date: Fri May 20 13:14:58 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: Makefile.wakecode.inc
Log Message:
LLVM's assembler parser doesn't support .code32 yet, so disable it as
needed.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/acpi/Makefile.wakecode.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/Makefile.wakecode.inc
diff -u src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.4 src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.5
--- src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.4 Sun Jan 18 13:55:31 2009
+++ src/sys/arch/x86/acpi/Makefile.wakecode.inc Fri May 20 13:14:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.wakecode.inc,v 1.4 2009/01/18 13:55:31 hans Exp $
+# $NetBSD: Makefile.wakecode.inc,v 1.5 2011/05/20 13:14:58 joerg Exp $
# FreeBSD: src/sys/i386/acpica/Makefile,v 1.3 2002/05/01 21:54:07 peter Exp
ACPI_WAKECODE_S= ${S}/arch/${MACHINE}/acpi/acpi_wakecode.S
@@ -8,9 +8,12 @@
SED=${TOOL_SED:Q} \
${HOST_SH}
+AFLAGS.acpi_wakecode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
+
+
acpi_wakecode.h: ${ACPI_WAKECODE_S} ${ACPI_GENWAKECODE}
${_MKTARGET_CREATE}
- ${CC} -I${.CURDIR} -c ${ACPI_WAKECODE_S}
+ ${CC} ${AFLAGS.acpi_wakecode.S} -c ${ACPI_WAKECODE_S}
${LD} -M -Map acpi_wakecode.bin.map -z defs -nostdlib \
--oformat binary -e wakeup_16 -Ttext 0 \
-o acpi_wakecode.bin acpi_wakecode.o
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: joerg Date: Fri May 20 13:17:12 UTC 2011 Modified Files: src/sys/arch/i386/i386: busfunc.S Log Message: The %dx argument for in/out is not a memory reference, so don't use the feature of GNU as to hide it as such. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/i386/busfunc.S 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/i386/i386/busfunc.S diff -u src/sys/arch/i386/i386/busfunc.S:1.7 src/sys/arch/i386/i386/busfunc.S:1.8 --- src/sys/arch/i386/i386/busfunc.S:1.7 Wed May 5 17:42:19 2010 +++ src/sys/arch/i386/i386/busfunc.S Fri May 20 13:17:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: busfunc.S,v 1.7 2010/05/05 17:42:19 dyoung Exp $ */ +/* $NetBSD: busfunc.S,v 1.8 2011/05/20 13:17:12 joerg Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include machine/asm.h -__KERNEL_RCSID(0, $NetBSD: busfunc.S,v 1.7 2010/05/05 17:42:19 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: busfunc.S,v 1.8 2011/05/20 13:17:12 joerg Exp $); #include assym.h @@ -157,7 +157,7 @@ movl 24(%esp), %ecx jne 1f rep - insb (%dx), %es:(%edi) + insb %dx, %es:(%edi) popl %edi ret .align 16 @@ -184,7 +184,7 @@ movl 24(%esp), %ecx jne 1f rep - insw (%dx), %es:(%edi) + insw %dx, %es:(%edi) popl %edi ret .align 16 @@ -211,7 +211,7 @@ movl 24(%esp), %ecx jne 1f rep - insl (%dx), %es:(%edi) + insl %dx, %es:(%edi) popl %edi ret .align 16 @@ -242,7 +242,7 @@ movl 24(%esp), %ecx jne 1f rep - outsb %ds:(%esi), (%dx) + outsb %ds:(%esi), %dx popl %esi ret .align 16 @@ -269,7 +269,7 @@ movl 24(%esp), %ecx jne 1f rep - outsw %ds:(%esi),(%dx) + outsw %ds:(%esi), %dx popl %esi ret .align 16 @@ -296,7 +296,7 @@ movl 24(%esp), %ecx jne 1f rep - outsl %ds:(%esi),(%dx) + outsl %ds:(%esi), %dx popl %esi ret .align 16
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: joerg
Date: Fri May 20 13:18:42 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
LLVM's assembler parser doesn't support .code32 yet, so disable it as
needed.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amd64/conf/Makefile.amd64
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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.30 src/sys/arch/amd64/conf/Makefile.amd64:1.31
--- src/sys/arch/amd64/conf/Makefile.amd64:1.30 Wed Jan 12 23:12:11 2011
+++ src/sys/arch/amd64/conf/Makefile.amd64 Fri May 20 13:18:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.30 2011/01/12 23:12:11 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.31 2011/05/20 13:18:42 joerg Exp $
# Makefile for NetBSD
#
@@ -64,6 +64,11 @@
spl.o: ${AMD64}/amd64/spl.S assym.h
${NORMAL_S}
+AFLAGS.locore.S= -no-integrated-as
+AFLAGS.mptramp.S= -no-integrated-as
+AFLAGS.linux32_sigcode.S= -no-integrated-as
+AFLAGS.netbsd32_sigcode.S= -no-integrated-as
+
##
## (5) link settings
##
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: joerg Date: Fri May 20 13:19:59 UTC 2011 Modified Files: src/sys/arch/amd64/conf: Makefile.amd64 Log Message: Reuse -x assembler-with-cpp from sys.mk. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/conf/Makefile.amd64 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/amd64/conf/Makefile.amd64 diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.31 src/sys/arch/amd64/conf/Makefile.amd64:1.32 --- src/sys/arch/amd64/conf/Makefile.amd64:1.31 Fri May 20 13:18:42 2011 +++ src/sys/arch/amd64/conf/Makefile.amd64 Fri May 20 13:19:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.amd64,v 1.31 2011/05/20 13:18:42 joerg Exp $ +# $NetBSD: Makefile.amd64,v 1.32 2011/05/20 13:19:59 joerg Exp $ # Makefile for NetBSD # @@ -37,7 +37,6 @@ CPPFLAGS+= -Damd64 -Dx86_64 CFLAGS+= -mcmodel=kernel CFLAGS+= -mno-red-zone -AFLAGS+= -x assembler-with-cpp ## ## (3) libkern and compat
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: joerg
Date: Fri May 20 13:21:19 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Really apply the -no-integrated-as only for clang.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/conf/Makefile.amd64
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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.32 src/sys/arch/amd64/conf/Makefile.amd64:1.33
--- src/sys/arch/amd64/conf/Makefile.amd64:1.32 Fri May 20 13:19:59 2011
+++ src/sys/arch/amd64/conf/Makefile.amd64 Fri May 20 13:21:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.32 2011/05/20 13:19:59 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.33 2011/05/20 13:21:19 joerg Exp $
# Makefile for NetBSD
#
@@ -63,10 +63,10 @@
spl.o: ${AMD64}/amd64/spl.S assym.h
${NORMAL_S}
-AFLAGS.locore.S= -no-integrated-as
-AFLAGS.mptramp.S= -no-integrated-as
-AFLAGS.linux32_sigcode.S= -no-integrated-as
-AFLAGS.netbsd32_sigcode.S= -no-integrated-as
+AFLAGS.locore.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
+AFLAGS.mptramp.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
+AFLAGS.linux32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
+AFLAGS.netbsd32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
##
## (5) link settings
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: joerg
Date: Fri May 20 13:21:54 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Drop redundant -I.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amd64/conf/Makefile.amd64
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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.33 src/sys/arch/amd64/conf/Makefile.amd64:1.34
--- src/sys/arch/amd64/conf/Makefile.amd64:1.33 Fri May 20 13:21:19 2011
+++ src/sys/arch/amd64/conf/Makefile.amd64 Fri May 20 13:21:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.33 2011/05/20 13:21:19 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.34 2011/05/20 13:21:54 joerg Exp $
# Makefile for NetBSD
#
@@ -63,10 +63,10 @@
spl.o: ${AMD64}/amd64/spl.S assym.h
${NORMAL_S}
-AFLAGS.locore.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
-AFLAGS.mptramp.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
-AFLAGS.linux32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
-AFLAGS.netbsd32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:} -I${.CURDIR}
+AFLAGS.locore.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+AFLAGS.mptramp.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+AFLAGS.linux32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+AFLAGS.netbsd32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
##
## (5) link settings
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: joerg
Date: Fri May 20 13:22:30 UTC 2011
Modified Files:
src/sys/arch/i386/conf: Makefile.i386
Log Message:
LLVM's assembler parser doesn't support .code16 yet, so disable it as
needed.
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/i386/conf/Makefile.i386
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/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.168 src/sys/arch/i386/conf/Makefile.i386:1.169
--- src/sys/arch/i386/conf/Makefile.i386:1.168 Wed Jan 12 23:12:12 2011
+++ src/sys/arch/i386/conf/Makefile.i386 Fri May 20 13:22:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.168 2011/01/12 23:12:12 joerg Exp $
+# $NetBSD: Makefile.i386,v 1.169 2011/05/20 13:22:30 joerg Exp $
# Makefile for NetBSD
#
@@ -35,6 +35,7 @@
##
CPPFLAGS+= -Di386
AFLAGS+= -x assembler-with-cpp
+AFLAGS.mptramp.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
##
## (3) libkern and compat
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: joerg
Date: Fri May 20 13:22:54 UTC 2011
Modified Files:
src/sys/arch/i386/conf: Makefile.i386
Log Message:
Use -x assembler-with-cpp from sys.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/arch/i386/conf/Makefile.i386
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/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.169 src/sys/arch/i386/conf/Makefile.i386:1.170
--- src/sys/arch/i386/conf/Makefile.i386:1.169 Fri May 20 13:22:30 2011
+++ src/sys/arch/i386/conf/Makefile.i386 Fri May 20 13:22:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.169 2011/05/20 13:22:30 joerg Exp $
+# $NetBSD: Makefile.i386,v 1.170 2011/05/20 13:22:53 joerg Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,7 @@
## (2) compile settings
##
CPPFLAGS+= -Di386
-AFLAGS+= -x assembler-with-cpp
+
AFLAGS.mptramp.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
##
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: joerg Date: Fri May 20 13:32:35 UTC 2011 Modified Files: src/sys/arch/amd64/amd64: locore.S Log Message: Be more explicit that the w part of %r11 is meant. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/amd64/amd64/locore.S 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/amd64/amd64/locore.S diff -u src/sys/arch/amd64/amd64/locore.S:1.64 src/sys/arch/amd64/amd64/locore.S:1.65 --- src/sys/arch/amd64/amd64/locore.S:1.64 Mon Dec 20 00:25:24 2010 +++ src/sys/arch/amd64/amd64/locore.S Fri May 20 13:32:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.64 2010/12/20 00:25:24 matt Exp $ */ +/* $NetBSD: locore.S,v 1.65 2011/05/20 13:32:35 joerg Exp $ */ /* * Copyright-o-rama! @@ -1132,8 +1132,8 @@ swapgs #endif INTR_RESTORE_GPRS - movw $(LSEL(LUDATA_SEL, SEL_UPL)),%r11 - movw %r11,%ds + movw $(LSEL(LUDATA_SEL, SEL_UPL)), %r11w + movw %r11w,%ds addq $TF_REGSIZE+16,%rsp /* + T_xxx and error code */ #ifndef XEN popq %rcx /* return rip */
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: joerg Date: Fri May 20 13:33:11 UTC 2011 Modified Files: src/sys/arch/amd64/amd64: busfunc.S Log Message: The %dx argument of in/out is not a memory reference, so don't use it as such. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/amd64/busfunc.S 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/amd64/amd64/busfunc.S diff -u src/sys/arch/amd64/amd64/busfunc.S:1.9 src/sys/arch/amd64/amd64/busfunc.S:1.10 --- src/sys/arch/amd64/amd64/busfunc.S:1.9 Wed May 5 16:53:57 2010 +++ src/sys/arch/amd64/amd64/busfunc.S Fri May 20 13:33:11 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: busfunc.S,v 1.9 2010/05/05 16:53:57 dyoung Exp $ */ +/* $NetBSD: busfunc.S,v 1.10 2011/05/20 13:33:11 joerg Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -170,7 +170,7 @@ movq %rcx, %rdi movq %r8, %rcx rep - insb (%dx), %es:(%rdi) + insb %dx, %es:(%rdi) ret .align 16 1: @@ -192,7 +192,7 @@ movq %rcx, %rdi movq %r8, %rcx rep - insw (%dx), %es:(%rdi) + insw %dx, %es:(%rdi) ret .align 16 1: @@ -214,7 +214,7 @@ movq %rcx, %rdi movq %r8, %rcx rep - insl (%dx), %es:(%rdi) + insl %dx, %es:(%rdi) ret .align 16 1: @@ -258,7 +258,7 @@ movq %rcx, %rsi movq %r8, %rcx rep - outsb %ds:(%rsi), (%dx) + outsb %ds:(%rsi), %dx ret .align 16 1: @@ -280,7 +280,7 @@ movq %rcx, %rsi movq %r8, %rcx rep - outsw %ds:(%rsi), (%dx) + outsw %ds:(%rsi), %dx ret .align 16 1: @@ -302,7 +302,7 @@ movq %rcx, %rsi movq %r8, %rcx rep - outsl %ds:(%rsi), (%dx) + outsl %ds:(%rsi), %dx ret .align 16 1:
CVS commit: [matt-nb5-mips64] src/usr.bin/sort
Module Name:src
Committed By: matt
Date: Fri May 20 13:34:11 UTC 2011
Modified Files:
src/usr.bin/sort [matt-nb5-mips64]: fsort.c msort.c sort.h
Log Message:
bring matt-nb5-mips64 up to date with netbsd-5-1-RELEASE
To generate a diff of this commit:
cvs rdiff -u -r1.32.12.1 -r1.32.12.2 src/usr.bin/sort/fsort.c
cvs rdiff -u -r1.18.12.1 -r1.18.12.2 src/usr.bin/sort/msort.c
cvs rdiff -u -r1.19.12.1 -r1.19.12.2 src/usr.bin/sort/sort.h
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/sort/fsort.c
diff -u src/usr.bin/sort/fsort.c:1.32.12.1 src/usr.bin/sort/fsort.c:1.32.12.2
--- src/usr.bin/sort/fsort.c:1.32.12.1 Wed Apr 21 05:27:12 2010
+++ src/usr.bin/sort/fsort.c Fri May 20 13:34:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fsort.c,v 1.32.12.1 2010/04/21 05:27:12 matt Exp $ */
+/* fsort.c,v 1.32.12.1 2010/04/21 05:27:12 matt Exp */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
#include fsort.h
#ifndef lint
-__RCSID($NetBSD: fsort.c,v 1.32.12.1 2010/04/21 05:27:12 matt Exp $);
+__RCSID(fsort.c,v 1.32.12.1 2010/04/21 05:27:12 matt Exp);
__SCCSID(@(#)fsort.c 8.1 (Berkeley) 6/6/93);
#endif /* not lint */
@@ -98,7 +98,7 @@
int file_no;
int max_recs = DEBUG('m') ? 16 : MAXNUM;
- buffer = malloc(bufsize);
+ buffer = allocrec(NULL, bufsize);
bufend = (u_char *)buffer + bufsize;
/* Allocate double length keymap for radix_sort */
keylist = malloc(2 * max_recs * sizeof(*keylist));
@@ -157,7 +157,7 @@
/* c == BUFFEND, and we can process more data */
/* Allocate a larger buffer for this lot of data */
bufsize *= 2;
- nbuffer = realloc(buffer, bufsize);
+ nbuffer = allocrec(buffer, bufsize);
if (!nbuffer) {
err(2, failed to realloc buffer to %zu bytes,
bufsize);
Index: src/usr.bin/sort/msort.c
diff -u src/usr.bin/sort/msort.c:1.18.12.1 src/usr.bin/sort/msort.c:1.18.12.2
--- src/usr.bin/sort/msort.c:1.18.12.1 Wed Apr 21 05:27:12 2010
+++ src/usr.bin/sort/msort.c Fri May 20 13:34:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msort.c,v 1.18.12.1 2010/04/21 05:27:12 matt Exp $ */
+/* msort.c,v 1.18.12.1 2010/04/21 05:27:12 matt Exp */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include fsort.h
#ifndef lint
-__RCSID($NetBSD: msort.c,v 1.18.12.1 2010/04/21 05:27:12 matt Exp $);
+__RCSID(msort.c,v 1.18.12.1 2010/04/21 05:27:12 matt Exp);
__SCCSID(@(#)msort.c 8.1 (Berkeley) 6/6/93);
#endif /* not lint */
@@ -209,7 +209,7 @@
for (nfiles = i = 0; i fstack_count; i++) {
cfile = fstack[i];
if (cfile-rec == NULL) {
- cfile-rec = emalloc(DEFLLEN);
+ cfile-rec = allocrec(NULL, DEFLLEN);
cfile-end = (u_char *)cfile-rec + DEFLLEN;
}
rewind(cfile-fp);
@@ -222,7 +222,7 @@
if (c == BUFFEND) {
/* Double buffer size */
sz = (cfile-end - (u_char *)cfile-rec) * 2;
-cfile-rec = erealloc(cfile-rec, sz);
+cfile-rec = allocrec(cfile-rec, sz);
cfile-end = (u_char *)cfile-rec + sz;
continue;
}
@@ -248,7 +248,7 @@
* output file - maintaining one record from each file in the sorted
* list.
*/
- new_rec = emalloc(DEFLLEN);
+ new_rec = allocrec(NULL, DEFLLEN);
new_end = (u_char *)new_rec + DEFLLEN;
for (;;) {
cfile = flist[0];
@@ -266,7 +266,7 @@
if (c == BUFFEND) {
/* Buffer not large enough - double in size */
sz = (new_end - (u_char *)new_rec) * 2;
- new_rec = erealloc(new_rec, sz);
+ new_rec = allocrec(new_rec, sz);
new_end = (u_char *)new_rec +sz;
continue;
}
Index: src/usr.bin/sort/sort.h
diff -u src/usr.bin/sort/sort.h:1.19.12.1 src/usr.bin/sort/sort.h:1.19.12.2
--- src/usr.bin/sort/sort.h:1.19.12.1 Wed Apr 21 05:27:12 2010
+++ src/usr.bin/sort/sort.h Fri May 20 13:34:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.h,v 1.19.12.1 2010/04/21 05:27:12 matt Exp $ */
+/* $NetBSD: sort.h,v 1.19.12.2 2011/05/20 13:34:11 matt Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -174,6 +174,7 @@
#define DEBUG(ch) (debug_flags (1 ((ch) 31)))
extern unsigned int debug_flags;
+RECHEADER *allocrec(RECHEADER *, size_t);
void append(RECHEADER **, int, FILE *, void (*)(const RECHEADER *, FILE *));
void concat(FILE *, FILE *);
length_t enterkey(RECHEADER *, const u_char *, u_char *, size_t, struct field *);
CVS commit: src/regress/sys/uvm
Module Name:src
Committed By: joerg
Date: Fri May 20 13:36:12 UTC 2011
Modified Files:
src/regress/sys/uvm: Makefile
src/regress/sys/uvm/stack_exec: Makefile
src/regress/sys/uvm/stack_noexec: Makefile
Log Message:
Require GCC for compilation
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/regress/sys/uvm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/regress/sys/uvm/stack_exec/Makefile
cvs rdiff -u -r1.3 -r1.4 src/regress/sys/uvm/stack_noexec/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/sys/uvm/Makefile
diff -u src/regress/sys/uvm/Makefile:1.7 src/regress/sys/uvm/Makefile:1.8
--- src/regress/sys/uvm/Makefile:1.7 Tue Sep 9 00:16:05 2008
+++ src/regress/sys/uvm/Makefile Fri May 20 13:36:12 2011
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2008/09/09 00:16:05 gmcgarry Exp $
+# $NetBSD: Makefile,v 1.8 2011/05/20 13:36:12 joerg Exp $
+
+.include bsd.own.mk
SUBDIR+= mmap loan1
-.if !defined(HAVE_PCC)
+.if !empty(SUPPORTED_CC:Mgcc)
SUBDIR+= stack_exec
.endif
@@ -12,7 +14,7 @@
#
STACKNOX_ARCHS= alpha i386 powerpc sparc sparc64 x86_64
-.if !defined(HAVE_PCC) !empty(STACKNOX_ARCHS:M${MACHINE_ARCH})
+.if !empty(SUPPORTED_CC:Mgcc) !empty(STACKNOX_ARCHS:M${MACHINE_ARCH})
SUBDIR+= stack_noexec
.endif
Index: src/regress/sys/uvm/stack_exec/Makefile
diff -u src/regress/sys/uvm/stack_exec/Makefile:1.2 src/regress/sys/uvm/stack_exec/Makefile:1.3
--- src/regress/sys/uvm/stack_exec/Makefile:1.2 Sat Oct 14 20:57:10 2006
+++ src/regress/sys/uvm/stack_exec/Makefile Fri May 20 13:36:12 2011
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2006/10/14 20:57:10 bjh21 Exp $
+# $NetBSD: Makefile,v 1.3 2011/05/20 13:36:12 joerg Exp $
NOMAN= #
PROG= tramptest
LDADD= -lpthread
+UNSUPPORTED_COMPILER.clang=
+UNSUPPORTED_COMPILER.pcc=
+
regress: ${PROG}
@if ./tramptest; then \
echo PASSED; \
Index: src/regress/sys/uvm/stack_noexec/Makefile
diff -u src/regress/sys/uvm/stack_noexec/Makefile:1.3 src/regress/sys/uvm/stack_noexec/Makefile:1.4
--- src/regress/sys/uvm/stack_noexec/Makefile:1.3 Sat Oct 14 20:57:10 2006
+++ src/regress/sys/uvm/stack_noexec/Makefile Fri May 20 13:36:12 2011
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2006/10/14 20:57:10 bjh21 Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/20 13:36:12 joerg Exp $
NOMAN= #
+UNSUPPORTED_COMPILER.clang=
+UNSUPPORTED_COMPILER.pcc=
+
.include bsd.own.mk
#
# tramptest.c relies on a trampoline generated by gcc,
CVS commit: src/gnu/lib/libobjc4
Module Name:src Committed By: joerg Date: Fri May 20 13:38:52 UTC 2011 Modified Files: src/gnu/lib/libobjc4: Makefile Log Message: Clang doesn't support some of the GNU extensions here, so disable it. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/gnu/lib/libobjc4/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/lib/libobjc4/Makefile diff -u src/gnu/lib/libobjc4/Makefile:1.12 src/gnu/lib/libobjc4/Makefile:1.13 --- src/gnu/lib/libobjc4/Makefile:1.12 Sun Jan 11 03:09:35 2009 +++ src/gnu/lib/libobjc4/Makefile Fri May 20 13:38:52 2011 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2009/01/11 03:09:35 christos Exp $ +# $NetBSD: Makefile,v 1.13 2011/05/20 13:38:52 joerg Exp $ REQUIRETOOLS= yes NOLINT= # defined +UNSUPPORTED_COMPILER.clang= # defined + .include bsd.own.mk LIB= objc
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Fri May 20 13:40:04 UTC 2011
Modified Files:
src/external/bsd/llvm: Makefile.inc
Log Message:
Update LLVM/Clang snapshot to create the correct relocation when memory
locations are used as immediates on AMD64.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.8 src/external/bsd/llvm/Makefile.inc:1.9
--- src/external/bsd/llvm/Makefile.inc:1.8 Thu May 19 21:06:01 2011
+++ src/external/bsd/llvm/Makefile.inc Fri May 20 13:40:04 2011
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.8 2011/05/19 21:06:01 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.9 2011/05/20 13:40:04 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include bsd.own.mk
-LLVM_REVISION= 131671
-CLANG_REVISION= 131671
+LLVM_REVISION= 131689
+CLANG_REVISION= 131689
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
CVS commit: [matt-nb5-mips64] src/sys/sys
Module Name:src Committed By: matt Date: Fri May 20 14:14:52 UTC 2011 Modified Files: src/sys/sys [matt-nb5-mips64]: cpu_data.h Log Message: ci_node_id - ci_package_id (match current) To generate a diff of this commit: cvs rdiff -u -r1.27.16.2 -r1.27.16.3 src/sys/sys/cpu_data.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/cpu_data.h diff -u src/sys/sys/cpu_data.h:1.27.16.2 src/sys/sys/cpu_data.h:1.27.16.3 --- src/sys/sys/cpu_data.h:1.27.16.2 Fri Apr 29 08:13:53 2011 +++ src/sys/sys/cpu_data.h Fri May 20 14:14:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_data.h,v 1.27.16.2 2011/04/29 08:13:53 matt Exp $ */ +/* cpu_data.h,v 1.27.16.2 2011/04/29 08:13:53 matt Exp */ /*- * Copyright (c) 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -113,7 +113,7 @@ #define ci_spin_locks2 ci_data.cpu_spin_locks2 #define ci_lkdebug_recurse ci_data.cpu_lkdebug_recurse -#define ci_node_id ci_data.cpu_node_id +#define ci_package_id ci_data.cpu_package_id #define ci_core_id ci_data.cpu_core_id #define ci_smt_id ci_data.cpu_smt_id
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Fri May 20 14:27:48 UTC 2011
Modified Files:
src/share/mk: sys.mk
Log Message:
Fully support per-target AFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.105 src/share/mk/sys.mk:1.106
--- src/share/mk/sys.mk:1.105 Thu Apr 7 01:40:32 2011
+++ src/share/mk/sys.mk Fri May 20 14:27:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.105 2011/04/07 01:40:32 joerg Exp $
+# $NetBSD: sys.mk,v 1.106 2011/05/20 14:27:48 joerg Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run NetBSD.
@@ -13,11 +13,11 @@
AS?= as
AFLAGS?=
-COMPILE.s?= ${CC} ${AFLAGS} -c
-LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
+COMPILE.s?= ${CC} ${AFLAGS} ${AFLAGS.${:T}} -c
+LINK.s?= ${CC} ${AFLAGS} ${AFLAGS.${:T}} ${LDFLAGS}
_ASM_TRADITIONAL_CPP= -x assembler-with-cpp
-COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP} -c
-LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
+COMPILE.S?= ${CC} ${AFLAGS} ${AFLAGS.${:T}} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP} -c
+LINK.S?= ${CC} ${AFLAGS} ${AFLAGS.${:T}} ${CPPFLAGS} ${LDFLAGS}
CC?= cc
.if ${MACHINE_ARCH} == alpha || \
CVS commit: [matt-nb5-mips64] src/sys/dev/mii
Module Name:src Committed By: matt Date: Fri May 20 14:35:25 UTC 2011 Modified Files: src/sys/dev/mii [matt-nb5-mips64]: miidevs Log Message: Add entry for AR8316 Switch To generate a diff of this commit: cvs rdiff -u -r1.78.10.2 -r1.78.10.3 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.78.10.2 src/sys/dev/mii/miidevs:1.78.10.3 --- src/sys/dev/mii/miidevs:1.78.10.2 Tue Apr 20 22:55:48 2010 +++ src/sys/dev/mii/miidevs Fri May 20 14:35:25 2011 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.78.10.2 2010/04/20 22:55:48 matt Exp $ +miidevs,v 1.78.10.2 2010/04/20 22:55:48 matt Exp /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -114,6 +114,7 @@ /* Attansic PHYs */ model ATTANSIC L1 0x0001 L1 10/100/1000 PHY model ATTANSIC L2 0x0002 L2 10/100 PHY +model ATTANSIC AR8316 0x0004 AR8316 Switch /* Altima Communications PHYs */ /* Don't know the model for ACXXX */
CVS commit: [matt-nb5-mips64] src/sys/dev/mii
Module Name:src Committed By: matt Date: Fri May 20 14:37:49 UTC 2011 Modified Files: src/sys/dev/mii [matt-nb5-mips64]: miidevs Log Message: Restore $NetBSD$ To generate a diff of this commit: cvs rdiff -u -r1.78.10.3 -r1.78.10.4 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.78.10.3 src/sys/dev/mii/miidevs:1.78.10.4 --- src/sys/dev/mii/miidevs:1.78.10.3 Fri May 20 14:35:25 2011 +++ src/sys/dev/mii/miidevs Fri May 20 14:37:49 2011 @@ -1,4 +1,4 @@ -miidevs,v 1.78.10.2 2010/04/20 22:55:48 matt Exp +$NetBSD: miidevs,v 1.78.10.4 2011/05/20 14:37:49 matt Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
CVS commit: [matt-nb5-mips64] src/sys/dev/mii
Module Name:src Committed By: matt Date: Fri May 20 14:41:01 UTC 2011 Modified Files: src/sys/dev/mii [matt-nb5-mips64]: miidevs Log Message: One more try to get RCSID correct. To generate a diff of this commit: cvs rdiff -u -r1.78.10.4 -r1.78.10.5 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.78.10.4 src/sys/dev/mii/miidevs:1.78.10.5 --- src/sys/dev/mii/miidevs:1.78.10.4 Fri May 20 14:37:49 2011 +++ src/sys/dev/mii/miidevs Fri May 20 14:41:01 2011 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.78.10.4 2011/05/20 14:37:49 matt Exp $ +$NetBSD: miidevs,v 1.78.10.5 2011/05/20 14:41:01 matt Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
CVS commit: [matt-nb5-mips64] src/sys/dev/mii
Module Name:src
Committed By: matt
Date: Fri May 20 14:42:20 UTC 2011
Modified Files:
src/sys/dev/mii [matt-nb5-mips64]: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.81.10.2 -r1.81.10.3 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.71.10.2 -r1.71.10.3 src/sys/dev/mii/miidevs_data.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/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.81.10.2 src/sys/dev/mii/miidevs.h:1.81.10.3
--- src/sys/dev/mii/miidevs.h:1.81.10.2 Wed Apr 21 00:27:39 2010
+++ src/sys/dev/mii/miidevs.h Fri May 20 14:42:20 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.81.10.2 2010/04/21 00:27:39 matt Exp $ */
+/* $NetBSD: miidevs.h,v 1.81.10.3 2011/05/20 14:42:20 matt Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.78.10.2 2010/04/20 22:55:48 matt Exp
+ * NetBSD: miidevs,v 1.78.10.5 2011/05/20 14:41:01 matt Exp
*/
/*-
@@ -125,6 +125,8 @@
#define MII_STR_ATTANSIC_L1 L1 10/100/1000 PHY
#define MII_MODEL_ATTANSIC_L2 0x0002
#define MII_STR_ATTANSIC_L2 L2 10/100 PHY
+#define MII_MODEL_ATTANSIC_AR8316 0x0004
+#define MII_STR_ATTANSIC_AR8316 AR8316 Switch
/* Altima Communications PHYs */
/* Don't know the model for ACXXX */
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.71.10.2 src/sys/dev/mii/miidevs_data.h:1.71.10.3
--- src/sys/dev/mii/miidevs_data.h:1.71.10.2 Wed Apr 21 00:27:39 2010
+++ src/sys/dev/mii/miidevs_data.h Fri May 20 14:42:20 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.71.10.2 2010/04/21 00:27:39 matt Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.71.10.3 2011/05/20 14:42:20 matt Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.78.10.2 2010/04/20 22:55:48 matt Exp
+ * NetBSD: miidevs,v 1.78.10.5 2011/05/20 14:41:01 matt Exp
*/
/*-
@@ -41,6 +41,7 @@
{ MII_OUI_ATHEROS, MII_MODEL_ATHEROS_F2, MII_STR_ATHEROS_F2 },
{ MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_L1, MII_STR_ATTANSIC_L1 },
{ MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_L2, MII_STR_ATTANSIC_L2 },
+ { MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_AR8316, MII_STR_ATTANSIC_AR8316 },
{ MII_OUI_ALTIMA, MII_MODEL_ALTIMA_ACXXX, MII_STR_ALTIMA_ACXXX },
{ MII_OUI_ALTIMA, MII_MODEL_ALTIMA_AC101, MII_STR_ALTIMA_AC101 },
{ MII_OUI_ALTIMA, MII_MODEL_ALTIMA_AC101L, MII_STR_ALTIMA_AC101L },
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src
Committed By: he
Date: Fri May 20 14:49:54 UTC 2011
Modified Files:
src/sys/arch/sparc/stand/ofwboot: loadfile_machdep.c ofdev.c
Added Files:
src/sys/arch/sparc/stand/ofwboot: net.h
Log Message:
Put the external functions from net.c in it's own header file and
include it, and do some other minimal adjustments to bring this
back to a buildable state.
OK'ed by martin@
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc/stand/ofwboot/net.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc/stand/ofwboot/ofdev.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/stand/ofwboot/loadfile_machdep.c
diff -u src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.7 src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.8
--- src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.7 Mon May 18 11:39:30 2009
+++ src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c Fri May 20 14:49:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.c,v 1.7 2009/05/18 11:39:30 nakayama Exp $ */
+/* $NetBSD: loadfile_machdep.c,v 1.8 2011/05/20 14:49:54 he Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -30,6 +30,7 @@
*/
#include lib/libsa/stand.h
+#include lib/libkern/libkern.h
#include machine/pte.h
#include machine/cpu.h
Index: src/sys/arch/sparc/stand/ofwboot/ofdev.c
diff -u src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.28 src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.29
--- src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.28 Sun Apr 4 21:49:15 2010
+++ src/sys/arch/sparc/stand/ofwboot/ofdev.c Fri May 20 14:49:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdev.c,v 1.28 2010/04/04 21:49:15 martin Exp $ */
+/* $NetBSD: ofdev.c,v 1.29 2011/05/20 14:49:54 he Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -55,6 +55,7 @@
#include machine/promlib.h
#include ofdev.h
+#include net.h
#include boot.h
extern char bootdev[];
@@ -545,7 +546,7 @@
if (!strncmp(*file,/tftp:,6)) {
*file += 6;
memcpy(file_system[0], file_system_tftp, sizeof file_system[0]);
- if (net_tftp_bootp(of-f_devdata)) {
+ if (net_tftp_bootp((int**)of-f_devdata)) {
net_close(ofdev);
goto bad;
}
Added files:
Index: src/sys/arch/sparc/stand/ofwboot/net.h
diff -u /dev/null src/sys/arch/sparc/stand/ofwboot/net.h:1.1
--- /dev/null Fri May 20 14:49:54 2011
+++ src/sys/arch/sparc/stand/ofwboot/net.h Fri May 20 14:49:54 2011
@@ -0,0 +1,42 @@
+/* $NetBSD: net.h,v 1.1 2011/05/20 14:49:54 he Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _OFWBOOT_NET_H
+#define _OFWBOOT_NET_H
+
+extern int net_open(struct of_dev *);
+extern int net_close(struct of_dev *);
+extern int net_mountroot_bootparams(void);
+extern int net_mountroot_bootp(void);
+extern int net_tftp_bootp(int **);
+extern int net_mountroot(void);
+
+#endif /* _OFWBOOT_NET_H */
CVS commit: src/sys/arch/i386/stand/mbr
Module Name:src
Committed By: joerg
Date: Fri May 20 15:05:02 UTC 2011
Modified Files:
src/sys/arch/i386/stand/mbr: Makefile.mbr
Log Message:
mbr.S and gpt.S want to reassign ., so don't use the integrated
assembler for now.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/mbr/Makefile.mbr
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/i386/stand/mbr/Makefile.mbr
diff -u src/sys/arch/i386/stand/mbr/Makefile.mbr:1.17 src/sys/arch/i386/stand/mbr/Makefile.mbr:1.18
--- src/sys/arch/i386/stand/mbr/Makefile.mbr:1.17 Fri Nov 20 17:28:19 2009
+++ src/sys/arch/i386/stand/mbr/Makefile.mbr Fri May 20 15:05:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mbr,v 1.17 2009/11/20 17:28:19 dsl Exp $
+# $NetBSD: Makefile.mbr,v 1.18 2011/05/20 15:05:02 joerg Exp $
S= ${.CURDIR}/../../../../..
@@ -41,6 +41,9 @@
LOADADDR= 0x8800
+AFLAGS.mbr.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+AFLAGS.gpt.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
${PROG}: ${OBJS}
${_MKTARGET_LINK}
${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${LOADADDR} ${OBJS}
CVS commit: [matt-nb5-mips64] src
Module Name:src
Committed By: matt
Date: Fri May 20 15:05:13 UTC 2011
Modified Files:
src/distrib/sets/lists/comp [matt-nb5-mips64]: mi
src/tools [matt-nb5-mips64]: Makefile
src/usr.bin [matt-nb5-mips64]: Makefile
Added Files:
src/tools/mkubootimage [matt-nb5-mips64]: Makefile
src/usr.bin/mkubootimage [matt-nb5-mips64]: Makefile crc32.c
mkubootimage.c uboot.h
Log Message:
Backport mkubootimage from -current
To generate a diff of this commit:
cvs rdiff -u -r1.1201.2.9.2.1.2.5 -r1.1201.2.9.2.1.2.6 \
src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.124 -r1.124.8.1 src/tools/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/tools/mkubootimage/Makefile
cvs rdiff -u -r1.171 -r1.171.6.1 src/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/usr.bin/mkubootimage/Makefile
cvs rdiff -u -r0 -r1.2.4.2 src/usr.bin/mkubootimage/crc32.c
cvs rdiff -u -r0 -r1.6.2.2 src/usr.bin/mkubootimage/mkubootimage.c
cvs rdiff -u -r0 -r1.3.2.2 src/usr.bin/mkubootimage/uboot.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1201.2.9.2.1.2.5 src/distrib/sets/lists/comp/mi:1.1201.2.9.2.1.2.6
--- src/distrib/sets/lists/comp/mi:1.1201.2.9.2.1.2.5 Fri Apr 29 07:43:18 2011
+++ src/distrib/sets/lists/comp/mi Fri May 20 15:05:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1201.2.9.2.1.2.5 2011/04/29 07:43:18 matt Exp $
+# mi,v 1.1201.2.9.2.1.2.5 2011/04/29 07:43:18 matt Exp
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -44,6 +44,7 @@
./usr/bin/lordercomp-util-bin
./usr/bin/menuc comp-c-bin
./usr/bin/mkstr comp-c-bin
+./usr/bin/mkubootimagecomp-util-bin
./usr/bin/msgattribcomp-c-bin
./usr/bin/msgc comp-c-bin
./usr/bin/msgcatcomp-c-bin
@@ -2892,6 +2893,7 @@
./usr/libdata/debug/usr/bin/mklocale.debug comp-locale-debug debug
./usr/libdata/debug/usr/bin/mkstr.debug comp-c-debug debug
./usr/libdata/debug/usr/bin/mktemp.debug comp-util-debug debug
+./usr/libdata/debug/usr/bin/mkubootimage.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/modstat.debug comp-util-debug !modular,debug
./usr/libdata/debug/usr/bin/mset.debug comp-tn3270-debug debug
./usr/libdata/debug/usr/bin/msgattrib.debug comp-c-debug debug
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.124 src/tools/Makefile:1.124.8.1
--- src/tools/Makefile:1.124 Sat Oct 25 22:12:41 2008
+++ src/tools/Makefile Fri May 20 15:05:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2008/10/25 22:12:41 apb Exp $
+# Makefile,v 1.124 2008/10/25 22:12:41 apb Exp
.include bsd.own.mk
@@ -102,6 +102,11 @@
SUBDIR+= hp300-mkboot
.endif
+.if ${MACHINE} == evbarm || ${MACHINE} == evbmips || \
+${MACHINE} == evbppc || ${MACHINE} == sandpoint
+SUBDIR+= mkubootimage
+.endif
+
check_MKTOOLS: .PHONY .NOTMAIN
.if ${MKTOOLS:Uyes} == no
@echo '*** WARNING: MKTOOLS is set to no; this will prevent building and'
Index: src/usr.bin/Makefile
diff -u src/usr.bin/Makefile:1.171 src/usr.bin/Makefile:1.171.6.1
--- src/usr.bin/Makefile:1.171 Wed Oct 29 16:49:33 2008
+++ src/usr.bin/Makefile Fri May 20 15:05:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.171 2008/10/29 16:49:33 christos Exp $
+# Makefile,v 1.171 2008/10/29 16:49:33 christos Exp
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include bsd.own.mk
@@ -15,8 +15,8 @@
gzip head hexdump iconv id indent innetgr ipcrm ipcs join jot \
kdump ktrace ktruss lam last lastcomm ldd leave less \
lex locale locate lock logger login logname look lorder m4 \
- machine mail make man menuc mesg midiplay mixerctl mkcsmapper \
- mkdep mkesdb mkfifo mklocale mkstr mktemp moduli msgc msgs \
+ machine mail make man menuc mesg midiplay mixerctl mkcsmapper mkdep \
+ mkesdb mkfifo mklocale mkstr mktemp mkubootimage moduli msgc msgs \
netgroup netstat newgrp newsyslog nfsstat nice nl nohup nvi \
pagesize passwd paste patch pathchk pkill pmap pmc pr \
printenv printf progress pwhash qsubst quota radioctl rdist \
Added files:
Index: src/tools/mkubootimage/Makefile
diff -u /dev/null src/tools/mkubootimage/Makefile:1.1.4.2
--- /dev/null Fri May 20 15:05:13 2011
+++ src/tools/mkubootimage/Makefile Fri May 20 15:05:11 2011
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1.4.2 2011/05/20 15:05:11 matt Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}mkubootimage
+HOST_SRCDIR= usr.bin/mkubootimage
+
+HOST_CPPFLAGS+= -I${.CURDIR}
+
+.include ${.CURDIR}/../Makefile.host
Index: src/usr.bin/mkubootimage/Makefile
diff -u /dev/null src/usr.bin/mkubootimage/Makefile:1.1.4.2
--- /dev/null Fri May 20 15:05:13 2011
+++ src/usr.bin/mkubootimage/Makefile Fri May 20 15:05:11 2011
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1.4.2 2011/05/20 15:05:11 matt Exp $
+
+PROG= mkubootimage
+SRCS= mkubootimage.c crc32.c
+NOMAN= # defined
+
+.include bsd.prog.mk
Index: src/usr.bin/mkubootimage/crc32.c
CVS commit: src/external/mit/xorg/etc
Module Name:src Committed By: tsutsui Date: Fri May 20 16:35:39 UTC 2011 Modified Files: src/external/mit/xorg/etc/etc.dreamcast: xorg.conf.jpkbd xorg.conf.uskbd src/external/mit/xorg/etc/etc.hpc: xorg.conf.640x240-jp xorg.conf.640x240-us xorg.conf.640x480-jp xorg.conf.640x480-us xorg.conf.800x600-jp xorg.conf.800x600-us src/external/mit/xorg/etc/etc.hpcarm: xorg.conf.ws003sh xorg.conf.ws007sh xorg.conf.ws011sh xorg.conf.ws020sh Log Message: Add RCSId. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd diff -u src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.1 src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.2 --- src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.1 Fri Nov 12 17:05:49 2010 +++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd Fri May 20 16:35:38 2011 @@ -1,3 +1,5 @@ +# $NetBSD: xorg.conf.jpkbd,v 1.2 2011/05/20 16:35:38 tsutsui Exp $ + Section ServerLayout Identifier wsfb Screen 0 Screen0 0 0 Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd diff -u src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.1 src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.2 --- src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.1 Fri Nov 12 17:05:49 2010 +++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd Fri May 20 16:35:38 2011 @@ -1,3 +1,5 @@ +# $NetBSD: xorg.conf.uskbd,v 1.2 2011/05/20 16:35:38 tsutsui Exp $ + Section ServerLayout Identifier wsfb Screen 0 Screen0 0 0 Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.1 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.2 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.1 Sat Nov 13 02:07:28 2010 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp Fri May 20 16:35:38 2011 @@ -1,3 +1,5 @@ +# $NetBSD: xorg.conf.640x240-jp,v 1.2 2011/05/20 16:35:38 tsutsui Exp $ + Section ServerLayout Identifier wsfb Screen 0 Screen0 0 0 Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.1 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.2 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.1 Sat Nov 13 02:07:28 2010 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us Fri May 20 16:35:38 2011 @@ -1,3 +1,5 @@ +# $NetBSD: xorg.conf.640x240-us,v 1.2 2011/05/20 16:35:38 tsutsui Exp $ + Section ServerLayout Identifier wsfb Screen 0 Screen0 0 0 Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp:1.1 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp:1.2 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp:1.1 Sat Nov 13 02:07:28 2010 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp Fri May 20 16:35:38 2011 @@ -1,3 +1,5 @@ +# $NetBSD: xorg.conf.640x480-jp,v 1.2 2011/05/20 16:35:38 tsutsui Exp $ + Section ServerLayout Identifier wsfb Screen 0 Screen0 0 0 Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us:1.1 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us:1.2 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us:1.1 Sat Nov 13 02:07:28 2010 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us Fri May 20 16:35:38 2011 @@ -1,3 +1,5 @@ +# $NetBSD: xorg.conf.640x480-us,v 1.2 2011/05/20 16:35:38 tsutsui Exp $ + Section ServerLayout Identifier wsfb Screen 0 Screen0 0 0 Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp:1.1 src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp:1.2 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp:1.1 Sat Nov 13 02:07:28 2010 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp Fri May 20 16:35:38 2011 @@ -1,3 +1,5 @@ +# $NetBSD:
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Fri May 20 16:38:25 UTC 2011 Modified Files: src/sys/arch/evbmips/conf [matt-nb5-mips64]: ALCHEMY MALTA RB153 Log Message: bump SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.20.8.2 -r1.20.8.3 src/sys/arch/evbmips/conf/ALCHEMY cvs rdiff -u -r1.48.8.3 -r1.48.8.4 src/sys/arch/evbmips/conf/MALTA cvs rdiff -u -r1.2.58.1 -r1.2.58.2 src/sys/arch/evbmips/conf/RB153 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/evbmips/conf/ALCHEMY diff -u src/sys/arch/evbmips/conf/ALCHEMY:1.20.8.2 src/sys/arch/evbmips/conf/ALCHEMY:1.20.8.3 --- src/sys/arch/evbmips/conf/ALCHEMY:1.20.8.2 Fri Jan 29 00:16:57 2010 +++ src/sys/arch/evbmips/conf/ALCHEMY Fri May 20 16:38:25 2011 @@ -1,11 +1,11 @@ -# $NetBSD: ALCHEMY,v 1.20.8.2 2010/01/29 00:16:57 matt Exp $ +# ALCHEMY,v 1.20.8.2 2010/01/29 00:16:57 matt Exp # # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500, # DBAu1000 and DBAu1500 evaluation boards. include arch/evbmips/conf/std.alchemy -#ident ALCHEMY-$Revision: 1.20.8.2 $ +#ident ALCHEMY-1.20.8.2 maxusers 32 @@ -48,7 +48,7 @@ options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=425000 # size for embedded symbol table +options SYMTAB_SPACE=475000 # size for embedded symbol table # Compatibility options #options COMPAT_43 # compatibility with 4.3BSD binaries Index: src/sys/arch/evbmips/conf/MALTA diff -u src/sys/arch/evbmips/conf/MALTA:1.48.8.3 src/sys/arch/evbmips/conf/MALTA:1.48.8.4 --- src/sys/arch/evbmips/conf/MALTA:1.48.8.3 Fri Jan 29 00:16:57 2010 +++ src/sys/arch/evbmips/conf/MALTA Fri May 20 16:38:25 2011 @@ -1,10 +1,10 @@ -# $NetBSD: MALTA,v 1.48.8.3 2010/01/29 00:16:57 matt Exp $ +# MALTA,v 1.48.8.3 2010/01/29 00:16:57 matt Exp include arch/evbmips/conf/std.malta #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MALTA-$Revision: 1.48.8.3 $ +#ident MALTA-1.48.8.3 maxusers 32 @@ -39,7 +39,7 @@ options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=40 # size for embedded symbol table +options SYMTAB_SPACE=41 # size for embedded symbol table # Compatibility options #options COMPAT_43 # compatibility with 4.3BSD binaries Index: src/sys/arch/evbmips/conf/RB153 diff -u src/sys/arch/evbmips/conf/RB153:1.2.58.1 src/sys/arch/evbmips/conf/RB153:1.2.58.2 --- src/sys/arch/evbmips/conf/RB153:1.2.58.1 Fri Jan 29 00:16:58 2010 +++ src/sys/arch/evbmips/conf/RB153 Fri May 20 16:38:25 2011 @@ -1,11 +1,11 @@ -# $NetBSD: RB153,v 1.2.58.1 2010/01/29 00:16:58 matt Exp $ -# $Id: RB153,v 1.2.58.1 2010/01/29 00:16:58 matt Exp $ +# RB153,v 1.2.58.1 2010/01/29 00:16:58 matt Exp +# RB153,v 1.2.58.1 2010/01/29 00:16:58 matt Exp # # Example kernel config for the RouterBOARD 153. include arch/evbmips/conf/std.adm5120 -#ident GENERIC-$Revision: 1.2.58.1 $ +#ident GENERIC-1.2.58.1 maxusers 32 @@ -35,7 +35,7 @@ options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table makeoptions CPUFLAGS=-march=4kc -options SYMTAB_SPACE=38 # size for embedded symbol table +options SYMTAB_SPACE=41 # size for embedded symbol table #options MEMORY_DISK_HOOKS #options MEMORY_DISK_IS_ROOT # Force root on ram-disk
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/adm5120
Module Name:src Committed By: matt Date: Fri May 20 16:38:52 UTC 2011 Modified Files: src/sys/arch/evbmips/adm5120 [matt-nb5-mips64]: machdep.c Log Message: Update to new definitions of savectx and mips_vector_init To generate a diff of this commit: cvs rdiff -u -r1.6.10.5 -r1.6.10.6 src/sys/arch/evbmips/adm5120/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/evbmips/adm5120/machdep.c diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.5 src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.6 --- src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.5 Sun Mar 21 17:38:33 2010 +++ src/sys/arch/evbmips/adm5120/machdep.c Fri May 20 16:38:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.6.10.5 2010/03/21 17:38:33 cliff Exp $ */ +/* machdep.c,v 1.6.10.5 2010/03/21 17:38:33 cliff Exp */ /*- * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. @@ -107,7 +107,7 @@ */ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.6.10.5 2010/03/21 17:38:33 cliff Exp $); +__KERNEL_RCSID(0, machdep.c,v 1.6.10.5 2010/03/21 17:38:33 cliff Exp); #include opt_ddb.h #include opt_kgdb.h @@ -327,7 +327,7 @@ * functions called during startup. * Also clears the I+D caches. */ - mips_vector_init(NULL); + mips_vector_init(NULL, false); /* * Set the VM page size. @@ -506,7 +506,7 @@ static int waittime = -1; /* Take a snapshot before clobbering any registers. */ - savectx(curlwp-l_addr); + savectx(lwp_getpcb(curlwp)); /* If always halt was specified as a boot flag, obey. */ if (boothowto RB_HALT)
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf
Module Name:src
Committed By: matt
Date: Fri May 20 16:49:23 UTC 2011
Modified Files:
src/sys/arch/evbmips/conf [matt-nb5-mips64]: Makefile.evbmips.inc
Log Message:
Add NEED_SREC and NEED_BINARY blocks so these don't need to be copied
repeated.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.96.1 src/sys/arch/evbmips/conf/Makefile.evbmips.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/conf/Makefile.evbmips.inc
diff -u src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.2 src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.2.96.1
--- src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.2 Thu Nov 24 12:54:29 2005
+++ src/sys/arch/evbmips/conf/Makefile.evbmips.inc Fri May 20 16:49:23 2011
@@ -1,6 +1,16 @@
-# $NetBSD: Makefile.evbmips.inc,v 1.2 2005/11/24 12:54:29 dbj Exp $
+# Makefile.evbmips.inc,v 1.2 2005/11/24 12:54:29 dbj Exp
-SYSTEM_LD_TAIL_EXTRA=; \
+.if defined(NEED_SREC) ${NEED_SREC} != no
+SYSTEM_LD_TAIL_EXTRA+=; \
echo ${STRIP} -O srec -o $@.srec $@; \
${STRIP} -O srec -o $@.srec $@
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@}
+.endif
+
+.if defined(NEED_BINARY) ${NEED_BINARY} != no
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo ${OBJCOPY} -S -O binary $@ $@.bin; \
+ ${OBJCOPY} -S -O binary $@ $@.bin
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+.endif
CVS commit: [netbsd-5] src/include
Module Name:src Committed By: bouyer Date: Fri May 20 19:18:37 UTC 2011 Modified Files: src/include [netbsd-5]: inttypes.h stddef.h stdlib.h wchar.h Log Message: Pull up following revision(s) (requested by joerg in ticket #1611): include/inttypes.h: revision 1.7 include/stddef.h: revision 1.16 include/wchar.h: revision 1.28 include/stdlib.h: revision 1.90 Don't define wchar_t for c++; it is native in the language. From Alexander Nasonov To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.4.1 src/include/inttypes.h cvs rdiff -u -r1.15 -r1.15.26.1 src/include/stddef.h cvs rdiff -u -r1.85 -r1.85.4.1 src/include/stdlib.h cvs rdiff -u -r1.27 -r1.27.8.1 src/include/wchar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/inttypes.h diff -u src/include/inttypes.h:1.6 src/include/inttypes.h:1.6.4.1 --- src/include/inttypes.h:1.6 Mon Aug 4 21:19:45 2008 +++ src/include/inttypes.h Fri May 20 19:18:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: inttypes.h,v 1.6 2008/08/04 21:19:45 matt Exp $ */ +/* $NetBSD: inttypes.h,v 1.6.4.1 2011/05/20 19:18:37 bouyer Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #include sys/inttypes.h #include machine/ansi.h -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/stddef.h diff -u src/include/stddef.h:1.15 src/include/stddef.h:1.15.26.1 --- src/include/stddef.h:1.15 Mon Aug 21 16:58:29 2006 +++ src/include/stddef.h Fri May 20 19:18:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stddef.h,v 1.15 2006/08/21 16:58:29 thorpej Exp $ */ +/* $NetBSD: stddef.h,v 1.15.26.1 2011/05/20 19:18:37 bouyer Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -45,7 +45,7 @@ #undef _BSD_SIZE_T_ #endif -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/stdlib.h diff -u src/include/stdlib.h:1.85 src/include/stdlib.h:1.85.4.1 --- src/include/stdlib.h:1.85 Sat Jun 21 00:58:00 2008 +++ src/include/stdlib.h Fri May 20 19:18:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stdlib.h,v 1.85 2008/06/21 00:58:00 gmcgarry Exp $ */ +/* $NetBSD: stdlib.h,v 1.85.4.1 2011/05/20 19:18:37 bouyer Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -48,7 +48,7 @@ #undef _BSD_SIZE_T_ #endif -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/wchar.h diff -u src/include/wchar.h:1.27 src/include/wchar.h:1.27.8.1 --- src/include/wchar.h:1.27 Mon Apr 28 20:22:54 2008 +++ src/include/wchar.h Fri May 20 19:18:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wchar.h,v 1.27 2008/04/28 20:22:54 martin Exp $ */ +/* $NetBSD: wchar.h,v 1.27.8.1 2011/05/20 19:18:37 bouyer Exp $ */ /*- * Copyright (c)1999 Citrus Project, @@ -66,7 +66,7 @@ #include stdio.h /* for FILE* */ -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif
CVS commit: [netbsd-5-1] src/include
Module Name:src Committed By: bouyer Date: Fri May 20 19:18:44 UTC 2011 Modified Files: src/include [netbsd-5-1]: inttypes.h stddef.h stdlib.h wchar.h Log Message: Pull up following revision(s) (requested by joerg in ticket #1611): include/inttypes.h: revision 1.7 include/stddef.h: revision 1.16 include/wchar.h: revision 1.28 include/stdlib.h: revision 1.90 Don't define wchar_t for c++; it is native in the language. From Alexander Nasonov To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.14.1 src/include/inttypes.h cvs rdiff -u -r1.15 -r1.15.36.1 src/include/stddef.h cvs rdiff -u -r1.85 -r1.85.12.1 src/include/stdlib.h cvs rdiff -u -r1.27 -r1.27.18.1 src/include/wchar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/inttypes.h diff -u src/include/inttypes.h:1.6 src/include/inttypes.h:1.6.14.1 --- src/include/inttypes.h:1.6 Mon Aug 4 21:19:45 2008 +++ src/include/inttypes.h Fri May 20 19:18:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: inttypes.h,v 1.6 2008/08/04 21:19:45 matt Exp $ */ +/* $NetBSD: inttypes.h,v 1.6.14.1 2011/05/20 19:18:43 bouyer Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #include sys/inttypes.h #include machine/ansi.h -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/stddef.h diff -u src/include/stddef.h:1.15 src/include/stddef.h:1.15.36.1 --- src/include/stddef.h:1.15 Mon Aug 21 16:58:29 2006 +++ src/include/stddef.h Fri May 20 19:18:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stddef.h,v 1.15 2006/08/21 16:58:29 thorpej Exp $ */ +/* $NetBSD: stddef.h,v 1.15.36.1 2011/05/20 19:18:44 bouyer Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -45,7 +45,7 @@ #undef _BSD_SIZE_T_ #endif -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/stdlib.h diff -u src/include/stdlib.h:1.85 src/include/stdlib.h:1.85.12.1 --- src/include/stdlib.h:1.85 Sat Jun 21 00:58:00 2008 +++ src/include/stdlib.h Fri May 20 19:18:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: stdlib.h,v 1.85 2008/06/21 00:58:00 gmcgarry Exp $ */ +/* $NetBSD: stdlib.h,v 1.85.12.1 2011/05/20 19:18:44 bouyer Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -48,7 +48,7 @@ #undef _BSD_SIZE_T_ #endif -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif Index: src/include/wchar.h diff -u src/include/wchar.h:1.27 src/include/wchar.h:1.27.18.1 --- src/include/wchar.h:1.27 Mon Apr 28 20:22:54 2008 +++ src/include/wchar.h Fri May 20 19:18:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wchar.h,v 1.27 2008/04/28 20:22:54 martin Exp $ */ +/* $NetBSD: wchar.h,v 1.27.18.1 2011/05/20 19:18:44 bouyer Exp $ */ /*- * Copyright (c)1999 Citrus Project, @@ -66,7 +66,7 @@ #include stdio.h /* for FILE* */ -#ifdef _BSD_WCHAR_T_ +#if defined(_BSD_WCHAR_T_) !defined(__cplusplus) typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Fri May 20 19:19:57 UTC 2011
Modified Files:
src/sys/dev/pci [netbsd-5]: if_lii.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1612):
sys/dev/pci/if_lii.c: revision 1.10
PR/41258: Elias Benali: Try to get the ethernet address from the BIOS before
failing.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/dev/pci/if_lii.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_lii.c
diff -u src/sys/dev/pci/if_lii.c:1.5 src/sys/dev/pci/if_lii.c:1.5.4.1
--- src/sys/dev/pci/if_lii.c:1.5 Tue Jul 8 12:39:27 2008
+++ src/sys/dev/pci/if_lii.c Fri May 20 19:19:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lii.c,v 1.5 2008/07/08 12:39:27 sborrill Exp $ */
+/* $NetBSD: if_lii.c,v 1.5.4.1 2011/05/20 19:19:57 bouyer Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_lii.c,v 1.5 2008/07/08 12:39:27 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_lii.c,v 1.5.4.1 2011/05/20 19:19:57 bouyer Exp $);
#include bpfilter.h
@@ -547,17 +547,18 @@
}
if (found 2) {
- aprint_error_dev(sc-sc_dev, error reading MAC address\n);
- return 1;
- }
-
- addr0 = htole32(addr0);
- addr1 = htole32(addr1);
-
- if ((addr0 == 0xff (addr1 0x) == 0x) ||
- (addr0 == 0 (addr1 0x) == 0)) {
+ /* Make sure we try the BIOS method before giving up */
addr0 = htole32(AT_READ_4(sc, ATL2_MAC_ADDR_0));
addr1 = htole32(AT_READ_4(sc, ATL2_MAC_ADDR_1));
+ if ((addr0 == 0xff (addr1 0x) == 0x) ||
+ (addr0 == 0 (addr1 0x) == 0)) {
+ aprint_error_dev(sc-sc_dev,
+ error reading MAC address\n);
+ return 1;
+ }
+ } else {
+ addr0 = htole32(addr0);
+ addr1 = htole32(addr1);
}
ea[0] = (addr1 0xff00) 8;
CVS commit: [netbsd-5] src
Module Name:src Committed By: bouyer Date: Fri May 20 19:21:33 UTC 2011 Modified Files: src/etc [netbsd-5]: MAKEDEV.tmpl src/share/man/man8 [netbsd-5]: MAKEDEV.8 Log Message: Pull up following revision(s) (requested by dholland in ticket #1613): etc/MAKEDEV.tmpl: revision 1.133 share/man/man8/MAKEDEV.8: revision 1.38 Make device node for altq JoBS. Should fix palindromic PR/43034. To generate a diff of this commit: cvs rdiff -u -r1.113.2.7 -r1.113.2.8 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.32.2.1 -r1.32.2.2 src/share/man/man8/MAKEDEV.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.113.2.7 src/etc/MAKEDEV.tmpl:1.113.2.8 --- src/etc/MAKEDEV.tmpl:1.113.2.7 Sat Sep 26 19:52:09 2009 +++ src/etc/MAKEDEV.tmpl Fri May 20 19:21:32 2011 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.113.2.7 2009/09/26 19:52:09 snj Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.113.2.8 2011/05/20 19:21:32 bouyer Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1455,7 +1455,7 @@ altq) makedir altq 755 unit=0 - for dev in altq cbq wfq afm fifoq red rio localq hfsc cdnr blue priq + for dev in altq cbq wfq afm fifoq red rio localq hfsc cdnr blue priq jobs do mkdev altq/$dev c %altq_chr% $unit 644 unit=$(($unit + 1)) Index: src/share/man/man8/MAKEDEV.8 diff -u src/share/man/man8/MAKEDEV.8:1.32.2.1 src/share/man/man8/MAKEDEV.8:1.32.2.2 --- src/share/man/man8/MAKEDEV.8:1.32.2.1 Sat Sep 26 19:52:09 2009 +++ src/share/man/man8/MAKEDEV.8 Fri May 20 19:21:32 2011 @@ -6,7 +6,7 @@ .\ *** DO NOT EDIT - any changes will be lost!!! .\ *** -- .\ -.\ $NetBSD: MAKEDEV.8,v 1.32.2.1 2009/09/26 19:52:09 snj Exp $ +.\ $NetBSD: MAKEDEV.8,v 1.32.2.2 2011/05/20 19:21:32 bouyer Exp $ .\ .\ Copyright (c) 2001, 2003, 2007, 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -35,7 +35,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 6, 2008 +.Dd March 23, 2010 .Dt MAKEDEV 8 .Os .Sh NAME @@ -573,6 +573,8 @@ . It Ar uscanner# USB scanners, see .Xr \uscanner 4 +. It Ar ttyHS# +USB Option N.V. modems . It Ar ttyU# USB modems, see .Xr \ucom 4
CVS commit: [netbsd-5] src/usr.bin/patch
Module Name:src Committed By: bouyer Date: Fri May 20 19:22:20 UTC 2011 Modified Files: src/usr.bin/patch [netbsd-5]: patch.c Log Message: Pull up following revision(s) (requested by dholland in ticket #1614): usr.bin/patch/patch.c: revision 1.28 Exit with EXIT_FAILURE for invalid arguments. PR 43517. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.4.1 src/usr.bin/patch/patch.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/patch/patch.c diff -u src/usr.bin/patch/patch.c:1.27 src/usr.bin/patch/patch.c:1.27.4.1 --- src/usr.bin/patch/patch.c:1.27 Fri Sep 19 18:33:34 2008 +++ src/usr.bin/patch/patch.c Fri May 20 19:22:20 2011 @@ -1,7 +1,7 @@ /* * $OpenBSD: patch.c,v 1.45 2007/04/18 21:52:24 sobrado Exp $ * $DragonFly: src/usr.bin/patch/patch.c,v 1.10 2008/08/10 23:39:56 joerg Exp $ - * $NetBSD: patch.c,v 1.27 2008/09/19 18:33:34 joerg Exp $ + * $NetBSD: patch.c,v 1.27.4.1 2011/05/20 19:22:20 bouyer Exp $ */ /* @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: patch.c,v 1.27 2008/09/19 18:33:34 joerg Exp $); +__RCSID($NetBSD: patch.c,v 1.27.4.1 2011/05/20 19:22:20 bouyer Exp $); #include sys/types.h #include sys/stat.h @@ -623,7 +623,7 @@ [-r rej-name] [-V t | nil | never] [-x number] [-z backup-ext]\n [--posix] [origfile [patchfile]]\n patch patchfile\n); - my_exit(EXIT_SUCCESS); + my_exit(EXIT_FAILURE); } /*
CVS commit: [netbsd-5] src/sys/dev/raidframe
Module Name:src Committed By: bouyer Date: Fri May 20 19:24:54 UTC 2011 Modified Files: src/sys/dev/raidframe [netbsd-5]: rf_netbsdkintf.c Log Message: Pull up following revision(s) (requested by buhrow in ticket #1615): sys/dev/raidframe/rf_netbsdkintf.c: revision 1.280 via patch PR/44340: Brian Buhrow: Raid sets containing wedges cannot be unconfigured and reconfigured without a reboot. To generate a diff of this commit: cvs rdiff -u -r1.250.4.10 -r1.250.4.11 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.10 src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.11 --- src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.10 Fri Jan 7 23:27:51 2011 +++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri May 20 19:24:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.250.4.10 2011/01/07 23:27:51 riz Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.250.4.11 2011/05/20 19:24:54 bouyer Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -139,7 +139,7 @@ ***/ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.250.4.10 2011/01/07 23:27:51 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.250.4.11 2011/05/20 19:24:54 bouyer Exp $); #include sys/param.h #include sys/errno.h @@ -851,6 +851,7 @@ free(cf, M_RAIDFRAME); /* Detach the disk. */ + dkwedge_delall(rs-sc_dkdev); disk_detach(rs-sc_dkdev); disk_destroy(rs-sc_dkdev); } @@ -1201,6 +1202,7 @@ free(cf, M_RAIDFRAME); /* Detach the disk. */ + dkwedge_delall(rs-sc_dkdev); disk_detach(rs-sc_dkdev); disk_destroy(rs-sc_dkdev);
CVS commit: [netbsd-5] src/sys/sys
Module Name:src Committed By: bouyer Date: Fri May 20 19:26:01 UTC 2011 Modified Files: src/sys/sys [netbsd-5]: bitops.h Log Message: Pull up following revision(s) (requested by jym in ticket #1616): sys/sys/bitops.h: revision 1.8 Use fls64() only for types strictly bigger than 4 bytes. ok christos@. Will ask for a pull-up, using 64 bits ops even for 4-bytes int's is plain overkill. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/sys/bitops.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/bitops.h diff -u src/sys/sys/bitops.h:1.2 src/sys/sys/bitops.h:1.2.10.1 --- src/sys/sys/bitops.h:1.2 Mon Apr 28 20:24:10 2008 +++ src/sys/sys/bitops.h Fri May 20 19:26:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bitops.h,v 1.2 2008/04/28 20:24:10 martin Exp $ */ +/* $NetBSD: bitops.h,v 1.2.10.1 2011/05/20 19:26:01 bouyer Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -253,7 +253,7 @@ _ilog2_helper(_n, 2) \ _ilog2_helper(_n, 1) \ _ilog2_helper(_n, 0) \ - -1) : ((sizeof(_n) = 4 ? fls64(_n) : fls32(_n)) - 1) \ + -1) : ((sizeof(_n) 4 ? fls64(_n) : fls32(_n)) - 1) \ ) #endif /* _SYS_BITOPS_H_ */
CVS commit: [netbsd-5] src/sys/arch/x68k/dev
Module Name:src
Committed By: bouyer
Date: Fri May 20 19:28:06 UTC 2011
Modified Files:
src/sys/arch/x68k/dev [netbsd-5]: fd.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1617):
sys/arch/x68k/dev/fd.c: revision 1.94 via patch
Fix hangup on the first floppy access since 2008.
Problem was reported by isaki@.
On X680x0 (and most other machines other than ISA FDC),
the ready line from FDD is connected to FDC and fdc driver can
be notified of the ready state after fd_set_motor() by interrupts.
In this case no need to use callout(9) to wait the FDD motor stabilized,
and the callout(9) method used in ISA fdc(4) driver rather caused
infinite unhandled interrupts since callout(9) was no longer invoked
during interrupt storm after vmlocking2 merge, I guess.
Should be pulled up to netbsd-5.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.85.6.1 src/sys/arch/x68k/dev/fd.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/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.85 src/sys/arch/x68k/dev/fd.c:1.85.6.1
--- src/sys/arch/x68k/dev/fd.c:1.85 Sun Jun 29 09:44:11 2008
+++ src/sys/arch/x68k/dev/fd.c Fri May 20 19:28:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.85 2008/06/29 09:44:11 isaki Exp $ */
+/* $NetBSD: fd.c,v 1.85.6.1 2011/05/20 19:28:05 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.85 2008/06/29 09:44:11 isaki Exp $);
+__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.85.6.1 2011/05/20 19:28:05 bouyer Exp $);
#include rnd.h
#include opt_ddb.h
@@ -212,7 +212,9 @@
struct fd_type *sc_deftype; /* default type descriptor */
struct fd_type *sc_type; /* current type descriptor */
+#if 0 /* see comments in fd_motor_on() */
struct callout sc_motoron_ch;
+#endif
struct callout sc_motoroff_ch;
daddr_t sc_blkno; /* starting block number */
@@ -278,7 +280,9 @@
void fd_set_motor(struct fdc_softc *, int);
void fd_motor_off(void *);
+#if 0
void fd_motor_on(void *);
+#endif
int fdcresult(struct fdc_softc *);
int out_fdc(bus_space_tag_t, bus_space_handle_t, u_char);
void fdcstart(struct fdc_softc *);
@@ -566,7 +570,9 @@
struct fd_type *type = fd_types[0]; /* XXX 1.2MB */
int drive = fa-fa_drive;
+#if 0
callout_init(fd-sc_motoron_ch, 0);
+#endif
callout_init(fd-sc_motoroff_ch, 0);
fd-sc_dev = self;
@@ -790,6 +796,7 @@
splx(s);
}
+#if 0 /* on x68k motor on triggers interrupts by state change of ready line. */
void
fd_motor_on(void *arg)
{
@@ -805,6 +812,7 @@
(void) fdcintr(fdc);
splx(s);
}
+#endif
int
fdcresult(struct fdc_softc *fdc)
@@ -1078,9 +1086,11 @@
fd-sc_flags |= FD_MOTOR | FD_MOTOR_WAIT;
fd_set_motor(fdc, 0);
fdc-sc_state = MOTORWAIT;
+#if 0 /* no need to callout on x68k; motor on will trigger interrupts */
/* allow .5s for motor to stabilize */
callout_reset(fd-sc_motoron_ch, hz / 2,
fd_motor_on, fd);
+#endif
return 1;
}
/* Make sure the right drive is selected. */
@@ -1434,8 +1444,21 @@
goto doseek;
case MOTORWAIT:
+#if 0 /* on x68k motor on triggers interrupts by state change of ready line. */
if (fd-sc_flags FD_MOTOR_WAIT)
return 1; /* time's not up yet */
+#else
+ /* check drive ready by state change interrupt */
+ KASSERT(fd-sc_flags FD_MOTOR_WAIT);
+ out_fdc(iot, ioh, NE7CMD_SENSEI);
+ tmp = fdcresult(fdc);
+ if (tmp != 2 || (st0 0xc0) != 0xc0 /* ready changed */) {
+ printf(%s: unexpected interrupt during MOTORWAIT\n,
+ device_xname(fd-sc_dev));
+ return 1;
+ }
+ fd-sc_flags = ~FD_MOTOR_WAIT;
+#endif
goto doseek;
default:
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Fri May 20 19:28:57 UTC 2011
Modified Files:
src/sys/kern [netbsd-5]: kern_acct.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1618):
sys/kern/kern_acct.c: revision 1.91
Fix up sign-compare issue checking for free space. Should fix PR 43413
where accounting doesn't suspend properly.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.86.12.1 src/sys/kern/kern_acct.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_acct.c
diff -u src/sys/kern/kern_acct.c:1.86 src/sys/kern/kern_acct.c:1.86.12.1
--- src/sys/kern/kern_acct.c:1.86 Thu Apr 24 18:39:23 2008
+++ src/sys/kern/kern_acct.c Fri May 20 19:28:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_acct.c,v 1.86 2008/04/24 18:39:23 ad Exp $ */
+/* $NetBSD: kern_acct.c,v 1.86.12.1 2011/05/20 19:28:56 bouyer Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_acct.c,v 1.86 2008/04/24 18:39:23 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_acct.c,v 1.86.12.1 2011/05/20 19:28:56 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -174,7 +174,7 @@
{
int error;
struct statvfs *sb;
- int64_t bavail;
+ fsblkcnt_t bavail;
sb = kmem_alloc(sizeof(*sb), KM_SLEEP);
if (sb == NULL)
@@ -185,7 +185,11 @@
return (error);
}
- bavail = sb-f_bfree - sb-f_bresvd;
+ if (sb-f_bfree sb-f_bresvd) {
+ bavail = 0;
+ } else {
+ bavail = sb-f_bfree - sb-f_bresvd;
+ }
switch (acct_state) {
case ACCT_SUSPENDED:
CVS commit: [netbsd-5] src/sys/ufs/ufs
Module Name:src Committed By: bouyer Date: Fri May 20 19:30:10 UTC 2011 Modified Files: src/sys/ufs/ufs [netbsd-5]: ufs_extattr.c Log Message: Pull up following revision(s) (requested by manu in ticket #1619): sys/ufs/ufs/ufs_extattr.c: revision 1.26 via patch The lwp member of struct componentname was removed a long time ago. Fix broken build with UFS_EXTATTR_AUTOSTART by removing it here as well. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.21.14.1 src/sys/ufs/ufs/ufs_extattr.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/ufs/ufs_extattr.c diff -u src/sys/ufs/ufs/ufs_extattr.c:1.21 src/sys/ufs/ufs/ufs_extattr.c:1.21.14.1 --- src/sys/ufs/ufs/ufs_extattr.c:1.21 Fri Mar 21 21:55:01 2008 +++ src/sys/ufs/ufs/ufs_extattr.c Fri May 20 19:30:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_extattr.c,v 1.21 2008/03/21 21:55:01 ad Exp $ */ +/* $NetBSD: ufs_extattr.c,v 1.21.14.1 2011/05/20 19:30:09 bouyer Exp $ */ /*- * Copyright (c) 1999-2002 Robert N. M. Watson @@ -48,7 +48,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_extattr.c,v 1.21 2008/03/21 21:55:01 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_extattr.c,v 1.21.14.1 2011/05/20 19:30:09 bouyer Exp $); #include opt_ffs.h @@ -263,7 +263,6 @@ memset(cnp, 0, sizeof(cnp)); cnp.cn_nameiop = LOOKUP; cnp.cn_flags = ISLASTCN | lockparent; - cnp.cn_lwp = l; cnp.cn_cred = l-l_cred; cnp.cn_pnbuf = PNBUF_GET(); cnp.cn_nameptr = cnp.cn_pnbuf;
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src Committed By: bouyer Date: Fri May 20 19:31:47 UTC 2011 Modified Files: src/sys/dev/usb [netbsd-5]: ehci.c Log Message: Pull up following revision(s) (requested by drochner in ticket #1620): sys/dev/usb/ehci.c: revision 1.174 in alloc_sqtd_chain(), deal with the case where a data packet ends exactly at a page boundary, and the FORCE_SHORT_XFER was set by the client (which causes that an empty descriptor is needed to terminate the transfer), from Gordon McNutt per PR kern/44883 (fixed a bit differently than the proposed patch for aesthetical reasons -- avoids the page pointer to come into unexpexted area earlier) To generate a diff of this commit: cvs rdiff -u -r1.154.4.2 -r1.154.4.3 src/sys/dev/usb/ehci.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/ehci.c diff -u src/sys/dev/usb/ehci.c:1.154.4.2 src/sys/dev/usb/ehci.c:1.154.4.3 --- src/sys/dev/usb/ehci.c:1.154.4.2 Sat Jun 12 01:05:44 2010 +++ src/sys/dev/usb/ehci.c Fri May 20 19:31:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.154.4.2 2010/06/12 01:05:44 riz Exp $ */ +/* $NetBSD: ehci.c,v 1.154.4.3 2011/05/20 19:31:46 bouyer Exp $ */ /* * Copyright (c) 2004-2008 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.154.4.2 2010/06/12 01:05:44 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.154.4.3 2011/05/20 19:31:46 bouyer Exp $); #include ohci.h #include uhci.h @@ -2706,7 +2706,8 @@ usb_syncmem(cur-dma, cur-offs, sizeof(cur-qtd), BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); DPRINTFN(10,(ehci_alloc_sqtd_chain: extend chain\n)); - dataphys += curlen; + if (len) + dataphys += curlen; cur = next; } cur-qtd.qtd_status |= htole32(EHCI_QTD_IOC);
CVS commit: [netbsd-5] src/sys/arch/x68k/x68k
Module Name:src
Committed By: bouyer
Date: Fri May 20 19:32:44 UTC 2011
Modified Files:
src/sys/arch/x68k/x68k [netbsd-5]: disksubr.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1621):
sys/arch/x68k/x68k/disksubr.c: revision 1.34
Fix buffer overrun in readdisklabel(9) (and writedisklabel(9))
that causes unexpected panic during installation and
DIAGNOSTIC pool assertions.
Also fix bp-b_flags in writedisklabel(9) error path.
The problem was reported from Y.Sugahara during XM6i development,
and this fix is confirmed on both X68030 (by me) and XM6i (by Sugahara).
XXX: broken dkbad support (which makes struct cpu_disklabel larger
XXX: than 512 bytes) should be removed...
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.20.1 src/sys/arch/x68k/x68k/disksubr.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/x68k/x68k/disksubr.c
diff -u src/sys/arch/x68k/x68k/disksubr.c:1.33 src/sys/arch/x68k/x68k/disksubr.c:1.33.20.1
--- src/sys/arch/x68k/x68k/disksubr.c:1.33 Wed Jan 2 11:48:32 2008
+++ src/sys/arch/x68k/x68k/disksubr.c Fri May 20 19:32:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.33 2008/01/02 11:48:32 ad Exp $ */
+/* $NetBSD: disksubr.c,v 1.33.20.1 2011/05/20 19:32:44 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.33 2008/01/02 11:48:32 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.33.20.1 2011/05/20 19:32:44 bouyer Exp $);
#include opt_compat_netbsd.h
@@ -69,7 +69,7 @@
struct buf *bp;
struct disklabel *dlp;
const char *msg = NULL;
- int i, labelsz;
+ int i, bsdlabelsz, humanlabelsz;
if (osdep)
dp = osdep-dosparts;
@@ -90,15 +90,19 @@
lp-d_partitions[0].p_offset = 0;
/* get a buffer and initialize it */
- bp = geteblk((int)lp-d_secsize);
+ bsdlabelsz =
+ howmany(LABELOFFSET + sizeof(struct disklabel), lp-d_secsize)
+ * lp-d_secsize;
+ humanlabelsz =
+ howmany(sizeof(struct cpu_disklabel), lp-d_secsize)
+ * lp-d_secsize;
+ bp = geteblk(MAX(bsdlabelsz, humanlabelsz));
bp-b_dev = dev;
/* read BSD disklabel first */
bp-b_blkno = LABELSECTOR;
bp-b_cylinder = LABELSECTOR/lp-d_secpercyl;
- labelsz = howmany(LABELOFFSET+sizeof(struct disklabel), lp-d_secsize)
- * lp-d_secsize;
- bp-b_bcount = labelsz; /* to support 512B/sector disks */
+ bp-b_bcount = bsdlabelsz; /* to support 512B/sector disks */
bp-b_flags |= B_READ;
(*strat)(bp);
@@ -109,7 +113,7 @@
}
for (dlp = (struct disklabel *)bp-b_data;
dlp = (struct disklabel *)
- ((char *)bp-b_data + labelsz - sizeof(*dlp));
+ ((char *)bp-b_data + bsdlabelsz - sizeof(*dlp));
dlp = (struct disklabel *)((uint8_t *)dlp + sizeof(long))) {
if (dlp-d_magic != DISKMAGIC || dlp-d_magic2 != DISKMAGIC) {
if (msg == NULL)
@@ -135,9 +139,7 @@
bp-b_blkno = DOSPARTOFF * DEF_BSIZE / lp-d_secsize;
/* DOSPARTOFF in DEV_BSIZE unit */
bp-b_cylinder = DOSBBSECTOR / lp-d_secpercyl;
- labelsz = howmany(sizeof(struct cpu_disklabel),
- lp-d_secsize) * lp-d_secsize;
- bp-b_bcount = labelsz; /* to support 512B/sector disks */
+ bp-b_bcount = humanlabelsz; /* to support 512B/sector disks */
bp-b_oflags = ~(BO_DONE);
(*strat)(bp);
@@ -313,7 +315,7 @@
struct dos_partition *dp = 0;
struct buf *bp;
struct disklabel *dlp;
- int error, labelsz, i;
+ int error, bsdlabelsz, humanlabelsz, i;
const char *np;
if (osdep)
@@ -326,15 +328,19 @@
parttbl_consistency_check(lp, dp);
/* get a buffer and initialize it */
- bp = geteblk((int)lp-d_secsize);
+ bsdlabelsz =
+ howmany(LABELOFFSET + sizeof(struct disklabel), lp-d_secsize)
+ * lp-d_secsize;
+ humanlabelsz =
+ howmany(sizeof(struct cpu_disklabel), lp-d_secsize)
+ * lp-d_secsize;
+ bp = geteblk(MAX(bsdlabelsz, humanlabelsz));
bp-b_dev = dev;
/* attempt to write BSD disklabel first */
bp-b_blkno = LABELSECTOR;
bp-b_cylinder = LABELSECTOR / lp-d_secpercyl;
- labelsz = howmany(LABELOFFSET+sizeof(struct disklabel), lp-d_secsize)
- * lp-d_secsize;
- bp-b_bcount = labelsz; /* to support 512B/sector disks */
+ bp-b_bcount = bsdlabelsz; /* to support 512B/sector disks */
bp-b_flags |= B_READ;
(*strat)(bp);
@@ -344,7 +350,7 @@
error = ESRCH;
for (dlp = (struct disklabel *)bp-b_data;
dlp = (struct disklabel *)
- ((char *)bp-b_data + labelsz - sizeof(*dlp));
+ ((char *)bp-b_data + bsdlabelsz - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp-d_magic == DISKMAGIC dlp-d_magic2 == DISKMAGIC
dkcksum(dlp) == 0) {
@@ -370,6 +376,7 @@
bp-b_blkno = DOSBBSECTOR;
bp-b_bcount = lp-d_secsize;
bp-b_oflags = ~(BO_DONE);
+ bp-b_flags = ~(B_WRITE);
bp-b_flags |= B_READ;
bp-b_cylinder = DOSBBSECTOR / lp-d_secpercyl;
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Fri May 20 19:32:58 UTC 2011 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.1 Log Message: ticket 1611 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/doc/CHANGES-5.1.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.1 diff -u src/doc/CHANGES-5.1.1:1.1.2.25 src/doc/CHANGES-5.1.1:1.1.2.26 --- src/doc/CHANGES-5.1.1:1.1.2.25 Thu May 19 19:53:03 2011 +++ src/doc/CHANGES-5.1.1 Fri May 20 19:32:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.1,v 1.1.2.25 2011/05/19 19:53:03 bouyer Exp $ +# $NetBSD: CHANGES-5.1.1,v 1.1.2.26 2011/05/20 19:32:58 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.1.1 release: @@ -2422,3 +2422,12 @@ Fixes CVE-2011-996 [spz, ticket #1603] +include/inttypes.h1.7 +include/stddef.h1.16 +include/stdlib.h1.90 +include/wchar.h 1.28 + + Don't define wchar_t for c++; it is native in the language. + From Alexander Nasonov + [joerg, ticket #1611] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Fri May 20 19:33:39 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: tickets 1611-1621 To generate a diff of this commit: cvs rdiff -u -r1.1.2.78 -r1.1.2.79 src/doc/CHANGES-5.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.2 diff -u src/doc/CHANGES-5.2:1.1.2.78 src/doc/CHANGES-5.2:1.1.2.79 --- src/doc/CHANGES-5.2:1.1.2.78 Thu May 19 21:14:39 2011 +++ src/doc/CHANGES-5.2 Fri May 20 19:33:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.78 2011/05/19 21:14:39 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.79 2011/05/20 19:33:38 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -5160,3 +5160,76 @@ missing files [mbalmer, ticket #1610] +include/inttypes.h1.7 +include/stddef.h1.16 +include/stdlib.h1.90 +include/wchar.h 1.28 + + Don't define wchar_t for c++; it is native in the language. + From Alexander Nasonov + [joerg, ticket #1611] + +sys/dev/pci/if_lii.c1.10 + + PR/41258: Elias Benali: Try to get the ethernet address from the BIOS + before failing. + [dholland, ticket #1612] + +etc/MAKEDEV.tmpl1.133 +share/man/man8/MAKEDEV.8 1.38 + + Make device node for altq JoBS. Should fix palindromic PR/43034. + [dholland, ticket #1613] + +usr.bin/patch/patch.c1.28 + + Exit with EXIT_FAILURE for invalid arguments. PR 43517. + [dholland, ticket #1614] + +sys/dev/raidframe/rf_netbsdkintf.c 1.280 via patch + + PR/44340: Brian Buhrow: Raid sets containing wedges cannot be + unconfigured and reconfigured without a reboot. + [buhrow, ticket #1615] + +sys/sys/bitops.h1.8 + + Use fls64() only for types strictly bigger than 4 bytes. + [jym, ticket #1616] + +sys/arch/x68k/dev/fd.c1.94 via patch + + Fix hangup on the first floppy access since 2008. + Problem was reported by isaki@. + [tsutsui, ticket #1617] + +sys/kern/kern_acct.c1.91 + + Fix up sign-compare issue checking for free space. Should fix PR 43413 + where accounting doesn't suspend properly. + [dholland, ticket #1618] + +sys/ufs/ufs/ufs_extattr.c 1.26 via patch + + The lwp member of struct componentname was removed a long time ago. + Fix broken build with UFS_EXTATTR_AUTOSTART by removing it here as well. + [manu, ticket #1619] + +sys/dev/usb/ehci.c1.174 + + in alloc_sqtd_chain(), deal with the case where a data packet ends + exactly at a page boundary, and the FORCE_SHORT_XFER was set by the + client (which causes that an empty descriptor is needed to terminate + the transfer), from Gordon McNutt per PR kern/44883 + (fixed a bit differently than the proposed patch for aesthetical + reasons -- avoids the page pointer to come into unexpexted area earlier) + [drochner, ticket #1620] + +sys/arch/x68k/x68k/disksubr.c 1.34 + + Fix buffer overrun in readdisklabel(9) (and writedisklabel(9)) + that causes unexpected panic during installation and + DIAGNOSTIC pool assertions. + Also fix bp-b_flags in writedisklabel(9) error path. + [tsutsui, ticket #1621] +
CVS commit: [netbsd-5] src/share/man/man8
Module Name:src Committed By: bouyer Date: Fri May 20 19:39:56 UTC 2011 Modified Files: src/share/man/man8 [netbsd-5]: MAKEDEV.8 Log Message: Revert pullup-5 #1613 for this file, only MAKEDEV.tmpl was supposed to be changed for this ticket. To generate a diff of this commit: cvs rdiff -u -r1.32.2.2 -r1.32.2.3 src/share/man/man8/MAKEDEV.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/MAKEDEV.8 diff -u src/share/man/man8/MAKEDEV.8:1.32.2.2 src/share/man/man8/MAKEDEV.8:1.32.2.3 --- src/share/man/man8/MAKEDEV.8:1.32.2.2 Fri May 20 19:21:32 2011 +++ src/share/man/man8/MAKEDEV.8 Fri May 20 19:39:55 2011 @@ -6,7 +6,7 @@ .\ *** DO NOT EDIT - any changes will be lost!!! .\ *** -- .\ -.\ $NetBSD: MAKEDEV.8,v 1.32.2.2 2011/05/20 19:21:32 bouyer Exp $ +.\ $NetBSD: MAKEDEV.8,v 1.32.2.3 2011/05/20 19:39:55 bouyer Exp $ .\ .\ Copyright (c) 2001, 2003, 2007, 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -35,7 +35,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 23, 2010 +.Dd September 6, 2008 .Dt MAKEDEV 8 .Os .Sh NAME @@ -573,8 +573,6 @@ . It Ar uscanner# USB scanners, see .Xr \uscanner 4 -. It Ar ttyHS# -USB Option N.V. modems . It Ar ttyU# USB modems, see .Xr \ucom 4
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Fri May 20 19:40:44 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ajust file list for ticket 1613 To generate a diff of this commit: cvs rdiff -u -r1.1.2.79 -r1.1.2.80 src/doc/CHANGES-5.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.2 diff -u src/doc/CHANGES-5.2:1.1.2.79 src/doc/CHANGES-5.2:1.1.2.80 --- src/doc/CHANGES-5.2:1.1.2.79 Fri May 20 19:33:38 2011 +++ src/doc/CHANGES-5.2 Fri May 20 19:40:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.79 2011/05/20 19:33:38 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.80 2011/05/20 19:40:43 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -5176,7 +5176,6 @@ [dholland, ticket #1612] etc/MAKEDEV.tmpl1.133 -share/man/man8/MAKEDEV.8 1.38 Make device node for altq JoBS. Should fix palindromic PR/43034. [dholland, ticket #1613]
CVS commit: src/crypto/external/bsd/heimdal/lib/libkrb5
Module Name:src
Committed By: joerg
Date: Fri May 20 20:09:37 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
Revert, breaks the build.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.2 Fri May 20 02:04:59 2011
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Fri May 20 20:09:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/20 02:04:59 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/05/20 20:09:37 joerg Exp $
USE_FORT?= yes # network protocol library
@@ -17,7 +17,6 @@
crypto ${SSLBASE}/lib/libcrypto \
asn1 ${HEIMBASE}/lib/libasn1 \
com_err ${HEIMBASE}/lib/libcom_err \
- ipc ${HEIMBASE}/lib/libipc \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase
CVS commit: src/gnu/usr.bin/gcc4
Module Name:src Committed By: joerg Date: Fri May 20 21:35:02 UTC 2011 Modified Files: src/gnu/usr.bin/gcc4: Makefile.inc Log Message: Force GNU89 mode for GCC itself to deal with the non-standard extern inline mess. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/gnu/usr.bin/gcc4/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/gcc4/Makefile.inc diff -u src/gnu/usr.bin/gcc4/Makefile.inc:1.2 src/gnu/usr.bin/gcc4/Makefile.inc:1.3 --- src/gnu/usr.bin/gcc4/Makefile.inc:1.2 Sat May 13 01:18:37 2006 +++ src/gnu/usr.bin/gcc4/Makefile.inc Fri May 20 21:35:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2006/05/13 01:18:37 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.3 2011/05/20 21:35:02 joerg Exp $ .include bsd.own.mk @@ -58,3 +58,6 @@ CPPFLAGS+= -DNO_SHARED_LIBGCC_MULTILIB .endif .endif + +# This depends on the extern inline mess, so downgrade to something safe. +CFLAGS+= -std=gnu89
CVS commit: src
Module Name:src
Committed By: nakayama
Date: Fri May 20 21:42:49 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.sparc md.sparc64
src/include: fenv.h
src/lib/libm: Makefile
src/lib/libm/arch/sparc64: fenv.c
src/sys/arch/sparc/include: Makefile ieeefp.h
src/sys/arch/sparc64/include: fenv.h
src/tests/lib/libc/stdlib: t_strtod.c
Added Files:
src/lib/libm/arch/sparc: fenv.c
src/sys/arch/sparc/include: fenv.h
Log Message:
Add fenv support for sparc. Mostly copied from sparc64 and share with it.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/comp/md.sparc
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.5 -r1.6 src/include/fenv.h
cvs rdiff -u -r1.109 -r1.110 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/sparc/fenv.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/arch/sparc64/fenv.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc/include/fenv.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/include/ieeefp.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/include/fenv.h
cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libc/stdlib/t_strtod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.sparc
diff -u src/distrib/sets/lists/comp/md.sparc:1.72 src/distrib/sets/lists/comp/md.sparc:1.73
--- src/distrib/sets/lists/comp/md.sparc:1.72 Thu Apr 14 10:07:49 2011
+++ src/distrib/sets/lists/comp/md.sparc Fri May 20 21:42:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.72 2011/04/14 10:07:49 mrg Exp $
+# $NetBSD: md.sparc,v 1.73 2011/05/20 21:42:48 nakayama Exp $
./usr/include/ieeefp.hcomp-c-include
./usr/include/sparccomp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -20,6 +20,7 @@
./usr/include/sparc/endian.h comp-c-include
./usr/include/sparc/endian_machdep.h comp-c-include
./usr/include/sparc/fbio.h comp-obsolete obsolete
+./usr/include/sparc/fenv.h comp-c-include
./usr/include/sparc/float.h comp-c-include
./usr/include/sparc/frame.h comp-c-include
./usr/include/sparc/fsr.h comp-c-include
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.97 src/distrib/sets/lists/comp/md.sparc64:1.98
--- src/distrib/sets/lists/comp/md.sparc64:1.97 Fri May 13 01:56:27 2011
+++ src/distrib/sets/lists/comp/md.sparc64 Fri May 20 21:42:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.97 2011/05/13 01:56:27 christos Exp $
+# $NetBSD: md.sparc64,v 1.98 2011/05/20 21:42:48 nakayama Exp $
./usr/include/ieeefp.hcomp-c-include
./usr/include/sparccomp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -20,6 +20,7 @@
./usr/include/sparc/endian.h comp-c-include
./usr/include/sparc/endian_machdep.h comp-c-include
./usr/include/sparc/fbio.h comp-obsolete obsolete
+./usr/include/sparc/fenv.h comp-c-include
./usr/include/sparc/float.h comp-c-include
./usr/include/sparc/frame.h comp-c-include
./usr/include/sparc/fsr.h comp-c-include
Index: src/include/fenv.h
diff -u src/include/fenv.h:1.5 src/include/fenv.h:1.6
--- src/include/fenv.h:1.5 Mon May 16 14:50:36 2011
+++ src/include/fenv.h Fri May 20 21:42:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.h,v 1.5 2011/05/16 14:50:36 martin Exp $ */
+/* $NetBSD: fenv.h,v 1.6 2011/05/20 21:42:48 nakayama Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if !defined(__i386__) !defined(__amd64__) !defined(__sparc_v9__)
+#if !defined(__i386__) !defined(__amd64__) !defined(__sparc__)
#error fenv.h is currently not supported for this architecture
#endif
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.109 src/lib/libm/Makefile:1.110
--- src/lib/libm/Makefile:1.109 Tue May 10 09:07:51 2011
+++ src/lib/libm/Makefile Fri May 20 21:42:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2011/05/10 09:07:51 jruoho Exp $
+# $NetBSD: Makefile,v 1.110 2011/05/20 21:42:48 nakayama Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -50,6 +50,9 @@
.if (${MACHINE_ARCH} == alpha)
.PATH: ${.CURDIR}/arch/alpha
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
+.elif (${MACHINE_ARCH} == sparc)
+.PATH: ${.CURDIR}/arch/sparc
+COMMON_SRCS+= fenv.c
.elif (${MACHINE_ARCH} == sparc64)
.PATH: ${.CURDIR}/arch/sparc64
COMMON_SRCS+= fenv.c
Index: src/lib/libm/arch/sparc64/fenv.c
diff -u src/lib/libm/arch/sparc64/fenv.c:1.1 src/lib/libm/arch/sparc64/fenv.c:1.2
--- src/lib/libm/arch/sparc64/fenv.c:1.1 Mon Jan 31 00:19:33 2011
+++ src/lib/libm/arch/sparc64/fenv.c Fri May 20 21:42:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.c,v 1.1 2011/01/31 00:19:33 christos Exp $ */
+/* $NetBSD: fenv.c,v 1.2 2011/05/20 21:42:49 nakayama Exp $ */
/*-
*
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: joerg Date: Fri May 20 21:43:40 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: lib/libobjc/t_threads is GCC-specific To generate a diff of this commit: cvs rdiff -u -r1.337 -r1.338 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.337 src/distrib/sets/lists/tests/mi:1.338 --- src/distrib/sets/lists/tests/mi:1.337 Wed May 18 03:07:37 2011 +++ src/distrib/sets/lists/tests/mi Fri May 20 21:43:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.337 2011/05/18 03:07:37 christos Exp $ +# $NetBSD: mi,v 1.338 2011/05/20 21:43:39 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -493,7 +493,7 @@ ./usr/libdata/debug/usr/tests/lib/libm/t_round.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libm/t_tanh.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libobjctests-lib-debug -./usr/libdata/debug/usr/tests/lib/libobjc/t_threads.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libobjc/t_threads.debug tests-lib-debug debug,atf,gcccmds ./usr/libdata/debug/usr/tests/lib/libposixtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libposix/bsdtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libposix/bsd/t_rename.debug tests-lib-debug debug,atf @@ -2113,7 +2113,7 @@ ./usr/tests/lib/libm/t_tanh tests-lib-tests atf ./usr/tests/lib/libobjctests-lib-tests atf ./usr/tests/lib/libobjc/Atffile tests-lib-tests atf -./usr/tests/lib/libobjc/t_threads tests-lib-tests atf +./usr/tests/lib/libobjc/t_threads tests-lib-tests atf,gcccmds ./usr/tests/lib/libposix tests-lib-tests atf ./usr/tests/lib/libposix/Atffile tests-lib-tests atf ./usr/tests/lib/libposix/bsd tests-lib-tests atf
CVS commit: src/gnu/lib/libgcc4
Module Name:src
Committed By: joerg
Date: Fri May 20 21:45:36 UTC 2011
Modified Files:
src/gnu/lib/libgcc4: Makefile.inc
Log Message:
Needs -fheinous-gnu-extensions when building with Clang
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/gnu/lib/libgcc4/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/lib/libgcc4/Makefile.inc
diff -u src/gnu/lib/libgcc4/Makefile.inc:1.20 src/gnu/lib/libgcc4/Makefile.inc:1.21
--- src/gnu/lib/libgcc4/Makefile.inc:1.20 Sun Mar 14 00:26:10 2010
+++ src/gnu/lib/libgcc4/Makefile.inc Fri May 20 21:45:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2010/03/14 00:26:10 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.21 2011/05/20 21:45:35 joerg Exp $
.if ${MKGCC} != no
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -150,3 +150,5 @@
touch ${.TARGET}
DPSRCS+= ${FAKEHEADERS}
CLEANFILES+= ${FAKEHEADERS}
+
+COPTS+= ${${ACTIVE_CC} == clang:?-fheinous-gnu-extensions:}
CVS commit: [netbsd-5] src
Module Name:src
Committed By: bouyer
Date: Fri May 20 21:50:10 UTC 2011
Modified Files:
src/doc [netbsd-5]: CHANGES-5.2
src/sys/fs/puffs [netbsd-5]: puffs_msgif.c
Log Message:
Revert ticket 1604, it does't build.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.80 -r1.1.2.81 src/doc/CHANGES-5.2
cvs rdiff -u -r1.72.4.2 -r1.72.4.3 src/sys/fs/puffs/puffs_msgif.c
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.2
diff -u src/doc/CHANGES-5.2:1.1.2.80 src/doc/CHANGES-5.2:1.1.2.81
--- src/doc/CHANGES-5.2:1.1.2.80 Fri May 20 19:40:43 2011
+++ src/doc/CHANGES-5.2 Fri May 20 21:50:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.80 2011/05/20 19:40:43 bouyer Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.81 2011/05/20 21:50:08 bouyer Exp $
A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
release:
@@ -5096,15 +5096,6 @@
Fixes CVE-2011-996
[spz, ticket #1603]
-sys/fs/puffs/puffs_msgif.c 1.84 via patch
-
- Apply patch from PR kern/44093 by yamt:
-
- Interrupt server wait only on certain signals (same set at nfs -i)
- instead of all signals. According to the PR this helps with
- git clone run on a puffs file system.
- [manu, ticket #1604]
-
etc/mtree/NetBSD.dist.base 1.87 via patch
share/i18n/csmapper/CBM/CBMINT%UCS.src 1.1
share/i18n/csmapper/CBM/Makefile.inc 1.1
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.72.4.2 src/sys/fs/puffs/puffs_msgif.c:1.72.4.3
--- src/sys/fs/puffs/puffs_msgif.c:1.72.4.2 Thu May 19 21:00:16 2011
+++ src/sys/fs/puffs/puffs_msgif.c Fri May 20 21:50:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.72.4.2 2011/05/19 21:00:16 bouyer Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.72.4.3 2011/05/20 21:50:09 bouyer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_msgif.c,v 1.72.4.2 2011/05/19 21:00:16 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_msgif.c,v 1.72.4.3 2011/05/20 21:50:09 bouyer Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -352,30 +352,17 @@
if (__predict_false((park-park_flags PARKFLAG_WANTREPLY)
(park-park_flags PARKFLAG_CALL) == 0
(l-l_flag LW_PENDSIG) != 0 sigispending(l, 0))) {
- sigset_t ss;
-
- /*
- * see the comment about signals in puffs_msg_wait.
- */
- sigpending1(l, ss);
- if (sigismember(ss, SIGINT) ||
- sigismember(ss, SIGTERM) ||
- sigismember(ss, SIGKILL) ||
- sigismember(ss, SIGHUP) ||
- sigismember(ss, SIGQUIT)) {
- park-park_flags |= PARKFLAG_HASERROR;
- preq-preq_rv = EINTR;
- if (PUFFSOP_OPCLASS(preq-preq_opclass) == PUFFSOP_VN
- (preq-preq_optype == PUFFS_VN_INACTIVE
- || preq-preq_optype == PUFFS_VN_RECLAIM)) {
- park-park_preq-preq_opclass |=
- PUFFSOPFLAG_FAF;
- park-park_flags = ~PARKFLAG_WANTREPLY;
- DPRINTF((puffs_msg_enqueue:
- converted to FAF %p\n, park));
- } else {
- return;
- }
+ park-park_flags |= PARKFLAG_HASERROR;
+ preq-preq_rv = EINTR;
+ if (PUFFSOP_OPCLASS(preq-preq_opclass) == PUFFSOP_VN
+ (preq-preq_optype == PUFFS_VN_INACTIVE
+ || preq-preq_optype == PUFFS_VN_RECLAIM)) {
+ park-park_preq-preq_opclass |= PUFFSOPFLAG_FAF;
+ park-park_flags = ~PARKFLAG_WANTREPLY;
+ DPRINTF((puffs_msg_enqueue: converted to FAF %p\n,
+ park));
+ } else {
+ return;
}
}
@@ -444,31 +431,11 @@
int
puffs_msg_wait(struct puffs_mount *pmp, struct puffs_msgpark *park)
{
- lwp_t *l = curlwp;
- proc_t *p = l-l_proc;
-struct puffs_req *preq = park-park_preq; /* XXX: hmmm */
- sigset_t ss;
- sigset_t oss;
+ struct puffs_req *preq = park-park_preq; /* XXX: hmmm */
struct mount *mp = PMPTOMP(pmp);
int error = 0;
int rv;
- /*
- * block unimportant signals.
- *
- * The set of important signals here was chosen to be same as
- * nfs interruptible mount.
- */
- sigfillset(ss);
- sigdelset(ss, SIGINT);
- sigdelset(ss, SIGTERM);
- sigdelset(ss, SIGKILL);
- sigdelset(ss, SIGHUP);
- sigdelset(ss, SIGQUIT);
- mutex_enter(p-p_lock);
- sigprocmask1(l, SIG_BLOCK, ss, oss);
- mutex_exit(p-p_lock);
-
mutex_enter(pmp-pmp_lock);
puffs_mp_reference(pmp);
mutex_exit(pmp-pmp_lock);
@@ -556,10 +523,6 @@
puffs_mp_release(pmp);
mutex_exit(pmp-pmp_lock);
- mutex_enter(p-p_lock);
- sigprocmask1(l, SIG_SETMASK, oss, NULL);
- mutex_exit(p-p_lock);
-
return rv;
}
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: nonaka Date: Fri May 20 21:56:46 UTC 2011 Modified Files: src/sys/arch/zaurus/conf: GENERIC Log Message: Uncommented out file-system CD9660. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/zaurus/conf/GENERIC 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/zaurus/conf/GENERIC diff -u src/sys/arch/zaurus/conf/GENERIC:1.41 src/sys/arch/zaurus/conf/GENERIC:1.42 --- src/sys/arch/zaurus/conf/GENERIC:1.41 Fri May 20 09:25:15 2011 +++ src/sys/arch/zaurus/conf/GENERIC Fri May 20 21:56:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.41 2011/05/20 09:25:15 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.42 2011/05/20 21:56:46 nonaka Exp $ # # GENERIC machine description file # @@ -54,7 +54,7 @@ file-system MFS # memory file system file-system NFS # Network File System client #file-system NTFS # Windows/NT file system (experimental) -#file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system CD9660 # ISO 9660 + Rock Ridge file system file-system MSDOSFS # MS-DOS file system #file-system FDESC # /dev/fd file-system KERNFS # /kern
CVS commit: src/gnu/usr.bin/gcc4
Module Name:src Committed By: joerg Date: Fri May 20 22:13:22 UTC 2011 Modified Files: src/gnu/usr.bin/gcc4: Makefile.inc Log Message: Put the -std=gnu89 into CPPFLAGS to make sure it gets applied after the -std=gnu99. Add a comment about this. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/gcc4/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/gcc4/Makefile.inc diff -u src/gnu/usr.bin/gcc4/Makefile.inc:1.3 src/gnu/usr.bin/gcc4/Makefile.inc:1.4 --- src/gnu/usr.bin/gcc4/Makefile.inc:1.3 Fri May 20 21:35:02 2011 +++ src/gnu/usr.bin/gcc4/Makefile.inc Fri May 20 22:13:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2011/05/20 21:35:02 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.4 2011/05/20 22:13:22 joerg Exp $ .include bsd.own.mk @@ -60,4 +60,5 @@ .endif # This depends on the extern inline mess, so downgrade to something safe. -CFLAGS+= -std=gnu89 +# CPPFLAGS is applied after CFLAGS, which gets the -std=gnu99 +CPPFLAGS+= -std=gnu89
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Fri May 20 22:21:32 UTC 2011
Modified Files:
src/libexec/ld.elf_so: Makefile
Log Message:
Explicitly disable linking against libgcc and friends.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/libexec/ld.elf_so/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.103 src/libexec/ld.elf_so/Makefile:1.104
--- src/libexec/ld.elf_so/Makefile:1.103 Wed Mar 9 23:10:07 2011
+++ src/libexec/ld.elf_so/Makefile Fri May 20 22:21:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2011/03/09 23:10:07 joerg Exp $
+# $NetBSD: Makefile,v 1.104 2011/05/20 22:21:32 joerg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -38,7 +38,7 @@
(${MACHINE_ARCH} == vax)) \
${MKPIC} != no
-LDFLAGS+= -shared -symbolic -nostartfiles
+LDFLAGS+= -shared -symbolic -nostartfiles -nodefaultlibs
LDFLAGS+= -Wl,-static
LDFLAGS+= -Wl,--warn-shared-textrel
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Fri May 20 22:22:45 UTC 2011
Modified Files:
src/libexec/ld.elf_so: Makefile
Log Message:
Disable use of various X86 extensions since _rtld_bind_start doesn't
save the necessary registers.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/libexec/ld.elf_so/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.104 src/libexec/ld.elf_so/Makefile:1.105
--- src/libexec/ld.elf_so/Makefile:1.104 Fri May 20 22:21:32 2011
+++ src/libexec/ld.elf_so/Makefile Fri May 20 22:22:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2011/05/20 22:21:32 joerg Exp $
+# $NetBSD: Makefile,v 1.105 2011/05/20 22:22:44 joerg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -93,6 +93,10 @@
#DBG= -g
DBG= -O3 -fomit-frame-pointer
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+DBG+= -mno-3dnow -mno-mmx -mno-sse -mno-sse2 -mno-sse3
+.endif
+
.if ${SHLIBDIR} != ${LIBDIR}
CPPFLAGS+= -DRTLD_DEFAULT_LIBRARY_PATH=\${SHLIBDIR}:${LIBDIR}\
.endif
CVS commit: src/sys/arch/i386/stand
Module Name:src
Committed By: joerg
Date: Fri May 20 22:29:56 UTC 2011
Modified Files:
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/cdboot: Makefile
src/sys/arch/i386/stand/dosboot: Makefile
src/sys/arch/i386/stand/fatboot: Makefile.fat
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/i386/stand/netboot: Makefile.netboot
src/sys/arch/i386/stand/pxeboot: Makefile
Log Message:
Disable integrated assembler for files that use .code16 or .code32 for
now. Disable Clang completely for bootxx and netboot for now until the
size issue has been sorted out.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/cdboot/Makefile
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/fatboot/Makefile.fat
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/stand/netboot/Makefile.netboot
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/stand/pxeboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.50 src/sys/arch/i386/stand/boot/Makefile.boot:1.51
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.50 Sat Feb 26 18:22:58 2011
+++ src/sys/arch/i386/stand/boot/Makefile.boot Fri May 20 22:29:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.50 2011/02/26 18:22:58 jakllsch Exp $
+# $NetBSD: Makefile.boot,v 1.51 2011/05/20 22:29:55 joerg Exp $
S= ${.CURDIR}/../../../../..
@@ -7,6 +7,8 @@
NEWVERSWHAT?= BIOS Boot
VERSIONFILE?= ${.CURDIR}/../version
+AFLAGS.biosboot.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
SOURCES?= biosboot.S boot2.c conf.c devopen.c exec.c
SRCS= ${SOURCES}
.if !make(depend)
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.39 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.40
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.39 Thu May 27 06:58:14 2010
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Fri May 20 22:29:55 2011
@@ -1,7 +1,13 @@
-# $NetBSD: Makefile.bootxx,v 1.39 2010/05/27 06:58:14 dholland Exp $
+# $NetBSD: Makefile.bootxx,v 1.40 2011/05/20 22:29:55 joerg Exp $
S= ${.CURDIR}/../../../../..
+UNSUPPORTED_COMPILER.clang= # defined
+
+AFLAGS.bootxx.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+AFLAGS.label.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+AFLAGS.pbr.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
PIE_CFLAGS=
PIE_LDFLAGS=
PIE_AFLAGS=
Index: src/sys/arch/i386/stand/cdboot/Makefile
diff -u src/sys/arch/i386/stand/cdboot/Makefile:1.11 src/sys/arch/i386/stand/cdboot/Makefile:1.12
--- src/sys/arch/i386/stand/cdboot/Makefile:1.11 Sun Jan 2 02:31:32 2011
+++ src/sys/arch/i386/stand/cdboot/Makefile Fri May 20 22:29:55 2011
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2011/01/02 02:31:32 jakllsch Exp $
+# $NetBSD: Makefile,v 1.12 2011/05/20 22:29:55 joerg Exp $
S= ${.CURDIR}/../../../..
+AFLAGS.cdboot.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
NOMAN= # defined
.include bsd.own.mk
Index: src/sys/arch/i386/stand/dosboot/Makefile
diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.25 src/sys/arch/i386/stand/dosboot/Makefile:1.26
--- src/sys/arch/i386/stand/dosboot/Makefile:1.25 Mon Mar 30 09:22:52 2009
+++ src/sys/arch/i386/stand/dosboot/Makefile Fri May 20 22:29:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/03/30 09:22:52 tsutsui Exp $
+# $NetBSD: Makefile,v 1.26 2011/05/20 22:29:55 joerg Exp $
S= ${.CURDIR}/../../../..
@@ -9,6 +9,9 @@
STARTFILE= ${DOSSTART}
RELOC= 0x100
+AFLAGS.dosboot.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+AFLAGS.start_dos.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
SRCS= main.c devopen.c exec.c
CPPFLAGS+= -DSLOW # for libz
Index: src/sys/arch/i386/stand/fatboot/Makefile.fat
diff -u src/sys/arch/i386/stand/fatboot/Makefile.fat:1.5 src/sys/arch/i386/stand/fatboot/Makefile.fat:1.6
--- src/sys/arch/i386/stand/fatboot/Makefile.fat:1.5 Mon Mar 30 09:22:52 2009
+++ src/sys/arch/i386/stand/fatboot/Makefile.fat Fri May 20 22:29:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fat,v 1.5 2009/03/30 09:22:52 tsutsui Exp $
+# $NetBSD: Makefile.fat,v 1.6 2011/05/20 22:29:56 joerg Exp $
S= ${.CURDIR}/../../../../..
@@ -10,6 +10,8 @@
LIBCRTEND= # nothing
LIBC= # nothing
+AFLAGS.fatboot.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+
PIE_CFLAGS=
PIE_LDFLAGS=
PIE_AFLAGS=
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.31
CVS commit: src/usr.bin/error
Module Name:src Committed By: christos Date: Sat May 21 00:43:31 UTC 2011 Modified Files: src/usr.bin/error: error.h Log Message: remove unused. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/error/error.h 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/error/error.h diff -u src/usr.bin/error/error.h:1.16 src/usr.bin/error/error.h:1.17 --- src/usr.bin/error/error.h:1.16 Thu May 19 18:55:53 2011 +++ src/usr.bin/error/error.h Fri May 20 20:43:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: error.h,v 1.16 2011/05/19 22:55:53 christos Exp $ */ +/* $NetBSD: error.h,v 1.17 2011/05/21 00:43:31 christos Exp $ */ /* * Copyright (c) 1980, 1993 @@ -108,7 +108,6 @@ extern FILE *errorfile; /* where error file comes from */ extern FILE *queryfile; /* where the query responses from the user come from*/ -extern char *processname; extern char *scriptname; extern const char *suffixlist;
CVS commit: src/usr.bin/error
Module Name:src
Committed By: christos
Date: Sat May 21 00:43:42 UTC 2011
Modified Files:
src/usr.bin/error: main.c
Log Message:
- KNF
- more static
- fix argument parsing.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/error/main.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/error/main.c
diff -u src/usr.bin/error/main.c:1.19 src/usr.bin/error/main.c:1.20
--- src/usr.bin/error/main.c:1.19 Fri May 20 03:09:52 2011
+++ src/usr.bin/error/main.c Fri May 20 20:43:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.19 2011/05/20 07:09:52 wiz Exp $ */
+/* $NetBSD: main.c,v 1.20 2011/05/21 00:43:42 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)main.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: main.c,v 1.19 2011/05/20 07:09:52 wiz Exp $);
+__RCSID($NetBSD: main.c,v 1.20 2011/05/21 00:43:42 christos Exp $);
#endif /* not lint */
#include signal.h
@@ -53,7 +53,7 @@
#include pathnames.h
FILE *errorfile; /* where error file comes from */
-FILE *queryfile; /* where the query responses from the user come from*/
+FILE *queryfile; /* input for the query responses from the user */
int nignored;
char **names_ignored;
@@ -70,7 +70,6 @@
static char default_currentfilename[] = ;
char *currentfilename = default_currentfilename;
-char *processname;
boolean query = false; /* query the operator if touch files */
boolean terse = false; /* Terse output */
@@ -172,14 +171,22 @@
argv += optind;
argc -= optind;
+
+ switch (argc) {
+ case 0:
+ break;
+ case 1:
+ if ((errorfile = fopen(argv[0], r)) == NULL)
+ err(1, Cannot open `%s' to read errors, argv[0]);
+ break;
+ default:
+ usage();
+ }
+
if (notouch)
suffixlist = 0;
- if (argc 1) {
- if (argc 3)
- usage();
- if ((errorfile = fopen(argv[1], r)) == NULL)
- err(1, Cannot open `%s' to read errors, argv[1]);
- }
+
+
if ((queryfile = fopen(im_on, r)) == NULL) {
if (query)
err(1, Cannot open `%s' to query the user, im_on);
@@ -198,28 +205,35 @@
findfiles(nerrors, errors, nfiles, files);
#define P(msg, arg) fprintf(stdout, msg, arg)
if (pr_summary) {
- if (nunknown)
- P(%d Errors are unclassifiable.\n, nunknown);
- if (nignore)
- P(%d Errors are classifiable, but totally discarded.\n,nignore);
- if (nsyncerrors)
- P(%d Errors are synchronization errors.\n, nsyncerrors);
- if (nignore)
- P(%d Errors are discarded because they refer to sacrosinct files.\n, ndiscard);
- if (nnulled)
- P(%d Errors are nulled because they refer to specific functions.\n, nnulled);
- if (nnonspec)
- P(%d Errors are not specific to any file.\n, nnonspec);
- if (nthisfile)
- P(%d Errors are specific to a given file, but not to a line.\n, nthisfile);
- if (ntrue)
- P(%d Errors are true errors, and can be inserted into the files.\n, ntrue);
+ if (nunknown)
+ P(%d Errors are unclassifiable.\n, nunknown);
+ if (nignore)
+ P(%d Errors are classifiable, but totally
+ discarded.\n, nignore);
+ if (nsyncerrors)
+ P(%d Errors are synchronization errors.\n,
+ nsyncerrors);
+ if (nignore)
+ P(%d Errors are discarded because they refer to
+ sacrosinct files.\n, ndiscard);
+ if (nnulled)
+ P(%d Errors are nulled because they refer to specific
+ functions.\n, nnulled);
+ if (nnonspec)
+ P(%d Errors are not specific to any file.\n,
+ nnonspec);
+ if (nthisfile)
+ P(%d Errors are specific to a given file, but not
+ to a line.\n, nthisfile);
+ if (ntrue)
+ P(%d Errors are true errors, and can be inserted
+ into the files.\n, ntrue);
}
filenames(nfiles, files);
fflush(stdout);
if (touchfiles(nfiles, files, ed_argc, ed_argv) edit_files)
forkvi(ed_argc, ed_argv);
- return (0);
+ return 0;
}
static void
@@ -281,17 +295,17 @@
*/
ep1 = *epp1; ep2 = *epp2;
if (ep1 == 0 || ep2 == 0)
- return (0);
- if ((NOTSORTABLE(ep1-error_e_class)) ^ (NOTSORTABLE(ep2-error_e_class))) {
- return (NOTSORTABLE(ep1-error_e_class) ? -1 : 1);
+ return 0;
+ if (NOTSORTABLE(ep1-error_e_class) ^ NOTSORTABLE(ep2-error_e_class)) {
+ return NOTSORTABLE(ep1-error_e_class) ? -1 : 1;
}
if (NOTSORTABLE(ep1-error_e_class)) /* then both are */
- return (ep1-error_no - ep2-error_no);
+ return ep1-error_no - ep2-error_no;
order = strcmp(ep1-error_text[0], ep2-error_text[0]);
if (order == 0) {
- return (ep1-error_line - ep2-error_line);
+ return ep1-error_line - ep2-error_line;
}
- return (order);
+ return order;
}
static void
CVS commit: src/usr.bin/error
Module Name:src
Committed By: christos
Date: Sat May 21 00:43:53 UTC 2011
Modified Files:
src/usr.bin/error: touch.c
Log Message:
use warn/err.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/error/touch.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/error/touch.c
diff -u src/usr.bin/error/touch.c:1.24 src/usr.bin/error/touch.c:1.25
--- src/usr.bin/error/touch.c:1.24 Thu May 19 22:00:45 2011
+++ src/usr.bin/error/touch.c Fri May 20 20:43:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: touch.c,v 1.24 2011/05/20 02:00:45 christos Exp $ */
+/* $NetBSD: touch.c,v 1.25 2011/05/21 00:43:52 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)touch.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: touch.c,v 1.24 2011/05/20 02:00:45 christos Exp $);
+__RCSID($NetBSD: touch.c,v 1.25 2011/05/21 00:43:52 christos Exp $);
#endif /* not lint */
#include sys/param.h
@@ -47,6 +47,7 @@
#include unistd.h
#include util.h
#include stdarg.h
+#include err.h
#include error.h
#include pathnames.h
@@ -574,8 +575,7 @@
o_name = name;
if ((o_touchedfile = fopen(name, r)) == NULL) {
- fprintf(stderr, %s: Can't open file \%s\ to touch (read).\n,
- processname, name);
+ warn(Can't open file `%s' to touch (read), name);
return true;
}
if ((tmpdir = getenv(TMPDIR)) == NULL)
@@ -584,10 +584,9 @@
fd = -1;
if ((fd = mkstemp(n_name)) == -1 ||
(n_touchedfile = fdopen(fd, w)) == NULL) {
+ warn(Can't open file `%s' to touch (write), name);
if (fd != -1)
close(fd);
- fprintf(stderr,%s: Can't open file \%s\ to touch (write).\n,
- processname, name);
return true;
}
tempfileopen = true;
@@ -647,9 +646,8 @@
* Catastrophe in temporary area: file system full?
*/
botch = 1;
- fprintf(stderr,
- %s: write failure: No errors inserted in \%s\\n,
- processname, o_name);
+ warn(write failure: No errors inserted in `%s',
+ o_name);
}
}
fclose(n_touchedfile);
@@ -664,14 +662,11 @@
localfile = NULL;
temp = NULL;
if ((localfile = fopen(o_name, w)) == NULL) {
- fprintf(stderr,
-%s: Can't open file \%s\ to overwrite.\n,
-processname, o_name);
+ warn(Can't open file `%s' to overwrite, o_name);
botch++;
}
if ((temp = fopen(n_name, r)) == NULL) {
- fprintf(stderr, %s: Can't open file \%s\ to read.\n,
-processname, n_name);
+ warn(Can't open file `%s' to read, n_name);
botch++;
}
if (!botch)
@@ -681,11 +676,9 @@
if (temp != NULL)
fclose(temp);
}
- if (oktorm == 0) {
- fprintf(stderr, %s: Catastrophe: A copy of \%s\: was saved in \%s\\n,
- processname, o_name, n_name);
- exit(1);
- }
+ if (oktorm == 0)
+ errx(1, Catastrophe: A copy of `%s': was saved in `%s',
+ o_name, n_name);
/*
* Kiss the temp file good bye
*/
@@ -722,7 +715,7 @@
nwrote = fwrite(base, 1, n, preciousfile);
if (nwrote == n)
return (1);
- perror(processname);
+ warn(write failed);
switch (inquire(terse
? Botch overwriting: retry?
: Botch overwriting the source file: retry? )) {
CVS commit: [rmind-uvmplock] src/sys
Module Name:src
Committed By: rmind
Date: Sat May 21 03:35:22 UTC 2011
Modified Files:
src/sys/fs/hfs [rmind-uvmplock]: hfs_vfsops.c
src/sys/ufs/lfs [rmind-uvmplock]: lfs_vnops.c
Log Message:
Fix the build.
To generate a diff of this commit:
cvs rdiff -u -r1.25.4.2 -r1.25.4.3 src/sys/fs/hfs/hfs_vfsops.c
cvs rdiff -u -r1.226.4.5 -r1.226.4.6 src/sys/ufs/lfs/lfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/hfs/hfs_vfsops.c
diff -u src/sys/fs/hfs/hfs_vfsops.c:1.25.4.2 src/sys/fs/hfs/hfs_vfsops.c:1.25.4.3
--- src/sys/fs/hfs/hfs_vfsops.c:1.25.4.2 Thu May 19 03:43:01 2011
+++ src/sys/fs/hfs/hfs_vfsops.c Sat May 21 03:35:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hfs_vfsops.c,v 1.25.4.2 2011/05/19 03:43:01 rmind Exp $ */
+/* $NetBSD: hfs_vfsops.c,v 1.25.4.3 2011/05/21 03:35:21 rmind Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hfs_vfsops.c,v 1.25.4.2 2011/05/19 03:43:01 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: hfs_vfsops.c,v 1.25.4.3 2011/05/21 03:35:21 rmind Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -546,7 +546,7 @@
return 0;
/* Allocate a new vnode/inode. */
- error = getnewvnode(VT_HFS, mp, hfs_vnodeop_p, NULL, vp)
+ error = getnewvnode(VT_HFS, mp, hfs_vnodeop_p, NULL, vp);
if (error) {
goto error;
}
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.226.4.5 src/sys/ufs/lfs/lfs_vnops.c:1.226.4.6
--- src/sys/ufs/lfs/lfs_vnops.c:1.226.4.5 Thu May 19 03:43:05 2011
+++ src/sys/ufs/lfs/lfs_vnops.c Sat May 21 03:35:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.226.4.5 2011/05/19 03:43:05 rmind Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.226.4.6 2011/05/21 03:35:22 rmind Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.226.4.5 2011/05/19 03:43:05 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.226.4.6 2011/05/21 03:35:22 rmind Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -474,7 +474,7 @@
if (fs-lfs_ronly)
return EROFS;
if (vpp == NULL) {
- return lfs_set_dirop(dvp, NULL)
+ return lfs_set_dirop(dvp, NULL);
}
error = getnewvnode(VT_LFS, dvp-v_mount, lfs_vnodeop_p, NULL, vpp);
if (error) {
CVS commit: [rmind-uvmplock] src/sys/fs
Module Name:src
Committed By: rmind
Date: Sat May 21 03:38:25 UTC 2011
Modified Files:
src/sys/fs/union [rmind-uvmplock]: union_subr.c
src/sys/fs/unionfs [rmind-uvmplock]: unionfs_subr.c
Log Message:
Finish v_interlock sharing bits for union/unionfs.
To generate a diff of this commit:
cvs rdiff -u -r1.35.4.3 -r1.35.4.4 src/sys/fs/union/union_subr.c
cvs rdiff -u -r1.5.4.4 -r1.5.4.5 src/sys/fs/unionfs/unionfs_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/union/union_subr.c
diff -u src/sys/fs/union/union_subr.c:1.35.4.3 src/sys/fs/union/union_subr.c:1.35.4.4
--- src/sys/fs/union/union_subr.c:1.35.4.3 Thu May 19 03:43:02 2011
+++ src/sys/fs/union/union_subr.c Sat May 21 03:38:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: union_subr.c,v 1.35.4.3 2011/05/19 03:43:02 rmind Exp $ */
+/* $NetBSD: union_subr.c,v 1.35.4.4 2011/05/21 03:38:24 rmind Exp $ */
/*
* Copyright (c) 1994
@@ -72,7 +72,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.35.4.3 2011/05/19 03:43:02 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.35.4.4 2011/05/21 03:38:24 rmind Exp $);
#include sys/param.h
#include sys/systm.h
@@ -507,7 +507,12 @@
lowersz = va.va_size;
hash = UNION_HASH(uppervp, lowervp);
- error = getnewvnode(VT_UNION, mp, union_vnodeop_p, NULL, vpp); /* TODO */
+ /*
+ * Get a new vnode and share the lock with upper layer vnode,
+ * unless layers are inverted.
+ */
+ error = getnewvnode(VT_UNION, mp, union_vnodeop_p,
+ (uppervp != NULLVP ? uppervp : lowervp), vpp);
if (error) {
if (uppervp) {
if (dvp == uppervp)
Index: src/sys/fs/unionfs/unionfs_subr.c
diff -u src/sys/fs/unionfs/unionfs_subr.c:1.5.4.4 src/sys/fs/unionfs/unionfs_subr.c:1.5.4.5
--- src/sys/fs/unionfs/unionfs_subr.c:1.5.4.4 Thu May 19 03:43:02 2011
+++ src/sys/fs/unionfs/unionfs_subr.c Sat May 21 03:38:25 2011
@@ -91,12 +91,13 @@
return (EINVAL);
}
- unp = kmem_zalloc(sizeof(*unp), KM_SLEEP);
- if (unp == NULL)
- return (ENOMEM);
- error = getnewvnode(VT_UNION, mp, unionfs_vnodeop_p, NULL, vp); /* TODO */
+ /*
+ * Get a new vnode and share the lock with upper layer vnode,
+ * unless layers are inverted.
+ */
+ error = getnewvnode(VT_UNION, mp, unionfs_vnodeop_p,
+ (uppervp != NULLVP ? uppervp : lowervp), vp);
if (error != 0) {
- kmem_free(unp, sizeof(*unp));
return (error);
}
if (dvp != NULLVP)
@@ -106,6 +107,7 @@
if (lowervp != NULLVP)
vref(lowervp);
+ unp = kmem_zalloc(sizeof(*unp), KM_SLEEP);
unp-un_vnode = vp;
unp-un_uppervp = uppervp;
unp-un_lowervp = lowervp;
CVS commit: [rmind-uvmplock] src/sys/dev
Module Name:src Committed By: rmind Date: Sat May 21 03:39:17 UTC 2011 Modified Files: src/sys/dev [rmind-uvmplock]: mm.c Log Message: - Use MIN() instead of min(). - Use __read_mostly and __cacheline_aligned. To generate a diff of this commit: cvs rdiff -u -r1.13.16.5 -r1.13.16.6 src/sys/dev/mm.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/mm.c diff -u src/sys/dev/mm.c:1.13.16.5 src/sys/dev/mm.c:1.13.16.6 --- src/sys/dev/mm.c:1.13.16.5 Sun Mar 6 01:38:45 2011 +++ src/sys/dev/mm.c Sat May 21 03:39:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mm.c,v 1.13.16.5 2011/03/06 01:38:45 rmind Exp $ */ +/* $NetBSD: mm.c,v 1.13.16.6 2011/05/21 03:39:17 rmind Exp $ */ /*- * Copyright (c) 2002, 2008, 2010 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mm.c,v 1.13.16.5 2011/03/06 01:38:45 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: mm.c,v 1.13.16.6 2011/05/21 03:39:17 rmind Exp $); #include opt_compat_netbsd.h @@ -49,9 +49,9 @@ #include uvm/uvm_extern.h -static void * dev_zero_page; -static kmutex_t dev_mem_lock; -static vaddr_t dev_mem_addr; +static void * dev_zero_page __read_mostly; +static kmutex_t dev_mem_lock __cacheline_aligned; +static vaddr_t dev_mem_addr __read_mostly; static dev_type_read(mm_readwrite); static dev_type_ioctl(mm_ioctl); @@ -162,7 +162,7 @@ return error; } offset = uio-uio_offset PAGE_MASK; - len = min(uio-uio_resid, PAGE_SIZE - offset); + len = MIN(uio-uio_resid, PAGE_SIZE - offset); #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS /* Is physical address directly mapped? Return VA. */ @@ -220,7 +220,7 @@ * Otherwise, we operate in page-by-page basis. */ offset = uio-uio_offset PAGE_MASK; - len = min(uio-uio_resid, PAGE_SIZE - offset); + len = MIN(uio-uio_resid, PAGE_SIZE - offset); prot = (uio-uio_rw == UIO_WRITE) ? VM_PROT_WRITE : VM_PROT_READ; md_kva = false; @@ -273,7 +273,7 @@ * Read in page-by-page basis, caller will continue. * Cut appropriately for a single/last-iteration cases. */ - len = min(iov-iov_len, PAGE_SIZE); + len = MIN(iov-iov_len, PAGE_SIZE); return uiomove(dev_zero_page, len, uio); }
