CVS commit: src/tests/sbin/route
Module Name:src
Committed By: jruoho
Date: Sat Mar 17 08:34:55 UTC 2012
Modified Files:
src/tests/sbin/route: t_missing.sh
Log Message:
PR bin/42179 was fixed; remove xfail.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/sbin/route/t_missing.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/route/t_missing.sh
diff -u src/tests/sbin/route/t_missing.sh:1.2 src/tests/sbin/route/t_missing.sh:1.3
--- src/tests/sbin/route/t_missing.sh:1.2 Wed May 11 22:08:12 2011
+++ src/tests/sbin/route/t_missing.sh Sat Mar 17 08:34:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_missing.sh,v 1.2 2011/05/11 22:08:12 njoly Exp $
+# $NetBSD: t_missing.sh,v 1.3 2012/03/17 08:34:55 jruoho Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,13 +30,11 @@
atf_test_case missing
missing_head() {
- atf_set descr Check route(8) with a missing argument
+ atf_set descr Check route(8) with a missing argument (PR bin/42179)
}
missing_body() {
- atf_expect_fail PR bin/42179
-
atf_check -s exit:1 \
-e not-inline:route: writing to routing socket: Invalid argument\n \
route -n get
CVS commit: src/bin/chio
Module Name:src Committed By: wiz Date: Sat Mar 17 11:09:29 UTC 2012 Modified Files: src/bin/chio: chio.1 Log Message: Use Lk. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/bin/chio/chio.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/chio/chio.1 diff -u src/bin/chio/chio.1:1.15 src/bin/chio/chio.1:1.16 --- src/bin/chio/chio.1:1.15 Wed Apr 30 13:10:46 2008 +++ src/bin/chio/chio.1 Sat Mar 17 11:09:29 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: chio.1,v 1.15 2008/04/30 13:10:46 martin Exp $ +.\ $NetBSD: chio.1,v 1.16 2012/03/17 11:09:29 wiz Exp $ .\ .\ Copyright (c) 1996, 1998, 1999 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -250,7 +250,8 @@ Returns status of all elements in the se The .Nm program and SCSI changer driver were originally written by Jason R. Thorpe -for And Communications, http://www.and.com/. +for +.Lk http://www.and.com/ And Communications . Additional development was done by Jason R. Thorpe for the Numerical Aerospace Simulation Facility, NASA Ames Research Center.
CVS commit: src/external/bsd/bind/dist
Module Name:src Committed By: dholland Date: Sat Mar 17 11:10:33 UTC 2012 Modified Files: src/external/bsd/bind/dist: bind2netbsd Log Message: Make a quick note about adding a short summary of changes to the cvs import message. Currently you can't prepare that in advance and then use cvs import -F file to supply the log message in a file. Will file a PR on cvs for this. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/dist/bind2netbsd 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/bind/dist/bind2netbsd diff -u src/external/bsd/bind/dist/bind2netbsd:1.5 src/external/bsd/bind/dist/bind2netbsd:1.6 --- src/external/bsd/bind/dist/bind2netbsd:1.5 Sat Oct 8 19:28:38 2011 +++ src/external/bsd/bind/dist/bind2netbsd Sat Mar 17 11:10:33 2012 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: bind2netbsd,v 1.5 2011/10/08 19:28:38 christos Exp $ +# $NetBSD: bind2netbsd,v 1.6 2012/03/17 11:10:33 dholland Exp $ # # Copyright (c) 2000 The NetBSD Foundation, Inc. # All rights reserved. @@ -44,6 +44,10 @@ # /usr/src/external/bsd/bind/include # - check makefiles to see if any extra sources have been added. # - update distrib/sets if necessary. +# +# Note that properly the import message should include a short summary +# of changes since the previous import rather than just Import bind 9.x.y. +# if [ $# -ne 2 ]; then echo bind2netbsd src dest; exit 1; fi
CVS commit: src/share/man/man8/man8.macppc
Module Name:src
Committed By: wiz
Date: Sat Mar 17 11:11:36 UTC 2012
Modified Files:
src/share/man/man8/man8.macppc: ofwboot.8
Log Message:
Use Lk.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/man/man8/man8.macppc/ofwboot.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/man8.macppc/ofwboot.8
diff -u src/share/man/man8/man8.macppc/ofwboot.8:1.10 src/share/man/man8/man8.macppc/ofwboot.8:1.11
--- src/share/man/man8/man8.macppc/ofwboot.8:1.10 Sun Mar 11 23:42:07 2012
+++ src/share/man/man8/man8.macppc/ofwboot.8 Sat Mar 17 11:11:35 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: ofwboot.8,v 1.10 2012/03/11 23:42:07 njoly Exp $
+.\ $NetBSD: ofwboot.8,v 1.11 2012/03/17 11:11:35 wiz Exp $
.\
.\ Copyright (c) 2001 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -259,7 +259,7 @@ included.
.It macppccd.iso
bootable CDROM image for all supported systems.
Usually located at
-.Pa ftp://ftp.NetBSD.org/pub/NetBSD/iso/{RELEASE}/macppccd.iso
+.Lk ftp://ftp.NetBSD.org/pub/NetBSD/iso/{RELEASE}/macppccd.iso
.El
.Sh EXAMPLES
.Bl -item
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src Committed By: wiz Date: Sat Mar 17 11:13:03 UTC 2012 Modified Files: src/usr.sbin/hdaudioctl: hdaudioctl.8 Log Message: Use Lk. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/hdaudioctl/hdaudioctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/hdaudioctl/hdaudioctl.8 diff -u src/usr.sbin/hdaudioctl/hdaudioctl.8:1.2 src/usr.sbin/hdaudioctl/hdaudioctl.8:1.3 --- src/usr.sbin/hdaudioctl/hdaudioctl.8:1.2 Sun Oct 11 09:25:19 2009 +++ src/usr.sbin/hdaudioctl/hdaudioctl.8 Sat Mar 17 11:13:03 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: hdaudioctl.8,v 1.2 2009/10/11 09:25:19 wiz Exp $ +.\ $NetBSD: hdaudioctl.8,v 1.3 2012/03/17 11:13:03 wiz Exp $ .\ .\ Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk .\ All rights reserved. @@ -92,7 +92,7 @@ command first appeared in is based on two separate programs written by .An Jared McNeill Aq jmcne...@netbsd.org under contract by -.An Precedence Technologies Ltd Aq http://www.precedence.co.uk/ . +.Lk http://www.precedence.co.uk/ Precedence Technologies Ltd . Integration into one program and writing this manual page was done by .An Stephen Borrill Aq sborr...@netbsd.org . .Sh CAVEATS
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Mar 17 11:15:42 UTC 2012 Modified Files: src/share/man/man4: ebus.4 Log Message: Use %U. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/ebus.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ebus.4 diff -u src/share/man/man4/ebus.4:1.6 src/share/man/man4/ebus.4:1.7 --- src/share/man/man4/ebus.4:1.6 Thu May 29 14:51:25 2008 +++ src/share/man/man4/ebus.4 Sat Mar 17 11:15:42 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: ebus.4,v 1.6 2008/05/29 14:51:25 mrg Exp $ +.\ $NetBSD: ebus.4,v 1.7 2012/03/17 11:15:42 wiz Exp $ .\ .\ Copyright (c) 1999 Matthew R. Green .\ All rights reserved. @@ -56,5 +56,5 @@ SCSI DMA. .%B Peripheral Component Interconnect Input Output Controller .%V Part\ No.:\ 802-7837-01 .%D March 1997 -.%O http://www.sun.com/oem/products/manuals/802-7837.pdf; +.%U http://www.sun.com/oem/products/manuals/802-7837.pdf .Re
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 11:45:00 UTC 2012
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
Always check index against array bound; keep only the printf under
DIAGNOSTIC. Suggested by matthew green
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 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.188 src/sys/dev/usb/ehci.c:1.189
--- src/sys/dev/usb/ehci.c:1.188 Thu Mar 15 18:38:37 2012
+++ src/sys/dev/usb/ehci.c Sat Mar 17 11:45:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.188 2012/03/15 18:38:37 bouyer Exp $ */
+/* $NetBSD: ehci.c,v 1.189 2012/03/17 11:45:00 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.188 2012/03/15 18:38:37 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.189 2012/03/17 11:45:00 bouyer Exp $);
#include ohci.h
#include uhci.h
@@ -2712,12 +2712,12 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *
ehci_physaddr_t a = dataphys + i * EHCI_PAGE_SIZE;
if (i != 0) /* use offset only in first buffer */
a = EHCI_PAGE(a);
-#ifdef DIAGNOSTIC
if (i = EHCI_QTD_NBUFFERS) {
+#ifdef DIAGNOSTIC
printf(ehci_alloc_sqtd_chain: i=%d\n, i);
+#endif
goto nomem;
}
-#endif
cur-qtd.qtd_buffer[i] = htole32(a);
cur-qtd.qtd_buffer_hi[i] = 0;
}
CVS commit: src/share/man/man8/man8.macppc
Module Name:src
Committed By: wiz
Date: Sat Mar 17 12:25:11 UTC 2012
Modified Files:
src/share/man/man8/man8.macppc: ofwboot.8
Log Message:
njoly remarks that Lk doesn't make sense here, since it won't ever resolve
correctly due to using ${RELEASE} in the URL. Revert previous.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/man/man8/man8.macppc/ofwboot.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/man8.macppc/ofwboot.8
diff -u src/share/man/man8/man8.macppc/ofwboot.8:1.11 src/share/man/man8/man8.macppc/ofwboot.8:1.12
--- src/share/man/man8/man8.macppc/ofwboot.8:1.11 Sat Mar 17 11:11:35 2012
+++ src/share/man/man8/man8.macppc/ofwboot.8 Sat Mar 17 12:25:11 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: ofwboot.8,v 1.11 2012/03/17 11:11:35 wiz Exp $
+.\ $NetBSD: ofwboot.8,v 1.12 2012/03/17 12:25:11 wiz Exp $
.\
.\ Copyright (c) 2001 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -259,7 +259,7 @@ included.
.It macppccd.iso
bootable CDROM image for all supported systems.
Usually located at
-.Lk ftp://ftp.NetBSD.org/pub/NetBSD/iso/{RELEASE}/macppccd.iso
+.Pa ftp://ftp.NetBSD.org/pub/NetBSD/iso/{RELEASE}/macppccd.iso
.El
.Sh EXAMPLES
.Bl -item
CVS commit: src
Module Name:src
Committed By: nakayama
Date: Sat Mar 17 12:42:31 UTC 2012
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
src/tests/lib/libppath: Makefile plist_to_c
Log Message:
Use toolchain awk to make them buildable on Solaris 10.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libppath/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libppath/plist_to_c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10 Tue Aug 2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Sat Mar 17 12:42:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2012/03/17 12:42:31 nakayama Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -52,6 +52,6 @@ COPTS.loadmod.c= -Wno-error
.include bsd.lib.mk
sdksyms.c: sdksyms.sh
- CPP='$(CPP)' AWK='$(AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
+ CPP='$(CPP)' AWK='$(TOOL_AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
sdksyms.d: sdksyms.c
CLEANFILES+= sdksyms.c
Index: src/tests/lib/libppath/Makefile
diff -u src/tests/lib/libppath/Makefile:1.3 src/tests/lib/libppath/Makefile:1.4
--- src/tests/lib/libppath/Makefile:1.3 Fri Jan 20 15:06:47 2012
+++ src/tests/lib/libppath/Makefile Sat Mar 17 12:42:31 2012
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2012/01/20 15:06:47 tsutsui Exp $
+# $Id: Makefile,v 1.4 2012/03/17 12:42:31 nakayama Exp $
.include bsd.own.mk
@@ -16,7 +16,7 @@ CPPFLAGS+=-I$(.OBJDIR)
echo extern const char ${.TARGET:S,.h$,,} []; ${.TARGET}
.plist.c:
- ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} ${.IMPSRC} ${.TARGET}
+ AWK=${TOOL_AWK:Q} ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} ${.IMPSRC} ${.TARGET}
CLEANFILES+=personnel.c personnel.h
Index: src/tests/lib/libppath/plist_to_c
diff -u src/tests/lib/libppath/plist_to_c:1.1 src/tests/lib/libppath/plist_to_c:1.2
--- src/tests/lib/libppath/plist_to_c:1.1 Thu Aug 25 19:09:46 2011
+++ src/tests/lib/libppath/plist_to_c Sat Mar 17 12:42:31 2012
@@ -12,7 +12,7 @@ if [ $# -ne 1 ]; then
fi
sed 's/\([\]\)/\\\1/g' | \
-awk -v sym=$1 '
+${AWK:-awk} -v sym=$1 '
BEGIN { printf const char sym [] = \; }
{ printf $0 \\n; }
END { print \;; }'
CVS commit: src/share/man/man4/man4.hp700
Module Name:src Committed By: wiz Date: Sat Mar 17 14:29:19 UTC 2012 Modified Files: src/share/man/man4/man4.hp700: cpu.4 Log Message: Fix table, addresses PR 46214 by Nicolas Joly. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.hp700/cpu.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.hp700/cpu.4 diff -u src/share/man/man4/man4.hp700/cpu.4:1.3 src/share/man/man4/man4.hp700/cpu.4:1.4 --- src/share/man/man4/man4.hp700/cpu.4:1.3 Tue Mar 13 19:25:42 2012 +++ src/share/man/man4/man4.hp700/cpu.4 Sat Mar 17 14:29:18 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cpu.4,v 1.3 2012/03/13 19:25:42 njoly Exp $ +.\ $NetBSD: cpu.4,v 1.4 2012/03/17 14:29:18 wiz Exp $ .\ .\ $OpenBSD: cpu.4tbl,v 1.19 2004/04/08 16:17:09 mickey Exp $ .\ @@ -46,8 +46,7 @@ for the reverse list). .Pp .in +\n(dIu .TS -.\ tab (:) ; -l l l l l l l +tab (:) ; l l l l l l l l l l l l l l _ _ _ _ _ _ _
CVS commit: src/share/man/man9
Module Name:src Committed By: njoly Date: Sat Mar 17 14:42:13 UTC 2012 Modified Files: src/share/man/man9: kauth.9 Log Message: Small typo. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/share/man/man9/kauth.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/kauth.9 diff -u src/share/man/man9/kauth.9:1.99 src/share/man/man9/kauth.9:1.100 --- src/share/man/man9/kauth.9:1.99 Wed Mar 14 11:51:54 2012 +++ src/share/man/man9/kauth.9 Sat Mar 17 14:42:13 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: kauth.9,v 1.99 2012/03/14 11:51:54 wiz Exp $ +.\ $NetBSD: kauth.9,v 1.100 2012/03/17 14:42:13 njoly Exp $ .\ .\ Copyright (c) 2005, 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -753,7 +753,7 @@ Check if retrieving privileged informati Check if setting parameters on the device is allowed. .It Dv KAUTH_REQ_NETWORK_INTERFACE_SETPRIV Check if setting privileged parameters on the device is allowed. -.it Dv KAUTH_REQ_NETWORK_INTERFACE_FIRMWARE +.It Dv KAUTH_REQ_NETWORK_INTERFACE_FIRMWARE Check if manipulating the firmware on a network interface device is allowed. .El .Pp
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Sat Mar 17 16:40:14 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/lib/libc/gen: Makefile
Added Files:
src/tests/lib/libc/gen: t_realpath.c
Log Message:
Add few basic tests for realpath(3).
To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.34 -r1.35 src/tests/lib/libc/gen/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/gen/t_realpath.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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.443 src/distrib/sets/lists/tests/mi:1.444
--- src/distrib/sets/lists/tests/mi:1.443 Sat Mar 17 16:35:02 2012
+++ src/distrib/sets/lists/tests/mi Sat Mar 17 16:40:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.443 2012/03/17 16:35:02 jruoho Exp $
+# $NetBSD: mi,v 1.444 2012/03/17 16:40:14 jruoho Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -394,6 +394,7 @@
./usr/libdata/debug/usr/tests/lib/libc/gen/t_pause.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_raise.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_randomid.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/gen/t_realpath.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_rbstress.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libc/gen/t_setdomainname.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_sethostname.debug tests-lib-debug debug,atf
@@ -2029,6 +2030,7 @@
./usr/tests/lib/libc/gen/t_pause tests-lib-tests atf
./usr/tests/lib/libc/gen/t_raise tests-lib-tests atf
./usr/tests/lib/libc/gen/t_randomid tests-lib-tests atf
+./usr/tests/lib/libc/gen/t_realpath tests-lib-tests atf
./usr/tests/lib/libc/gen/t_rbstress tests-obsolete obsolete
./usr/tests/lib/libc/gen/t_setdomainname tests-lib-tests atf
./usr/tests/lib/libc/gen/t_sethostname tests-lib-tests atf
Index: src/tests/lib/libc/gen/Makefile
diff -u src/tests/lib/libc/gen/Makefile:1.34 src/tests/lib/libc/gen/Makefile:1.35
--- src/tests/lib/libc/gen/Makefile:1.34 Mon Feb 13 21:03:08 2012
+++ src/tests/lib/libc/gen/Makefile Sat Mar 17 16:40:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/02/13 21:03:08 martin Exp $
+# $NetBSD: Makefile,v 1.35 2012/03/17 16:40:14 jruoho Exp $
.include bsd.own.mk
@@ -26,6 +26,7 @@ TESTS_C+= t_nice
TESTS_C+= t_pause
TESTS_C+= t_raise
TESTS_C+= t_randomid
+TESTS_C+= t_realpath
TESTS_C+= t_setdomainname
TESTS_C+= t_sethostname
TESTS_C+= t_siginfo
Added files:
Index: src/tests/lib/libc/gen/t_realpath.c
diff -u /dev/null src/tests/lib/libc/gen/t_realpath.c:1.1
--- /dev/null Sat Mar 17 16:40:14 2012
+++ src/tests/lib/libc/gen/t_realpath.c Sat Mar 17 16:40:14 2012
@@ -0,0 +1,152 @@
+/* $NetBSD: t_realpath.c,v 1.1 2012/03/17 16:40:14 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include sys/cdefs.h
+__RCSID($NetBSD: t_realpath.c,v 1.1 2012/03/17 16:40:14 jruoho Exp $);
+
+#include sys/param.h
+
+#include atf-c.h
+#include fcntl.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include unistd.h
+
+static const struct {
+ const char *path;
+ const char *result;
+} paths[] = {
+
+ { /, / },
+ { ///, / },
+ { , NULL },
+ {, NULL
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Sat Mar 17 16:48:35 UTC 2012
Modified Files:
src/sys/sys: cdefs.h
Log Message:
use __inline to fix nspr's configure issue
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/sys/cdefs.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/cdefs.h
diff -u src/sys/sys/cdefs.h:1.94 src/sys/sys/cdefs.h:1.95
--- src/sys/sys/cdefs.h:1.94 Wed Mar 14 20:09:08 2012
+++ src/sys/sys/cdefs.h Sat Mar 17 12:48:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.94 2012/03/15 00:09:08 christos Exp $ */
+/* $NetBSD: cdefs.h,v 1.95 2012/03/17 16:48:35 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -534,8 +534,8 @@
(~((1ULL (sizeof(t) * NBBY)) - 1)) : 0ULL)
#ifndef __ASSEMBLER__
-static inline long long __zeroll(void) { return 0; }
-static inline int __negative_p(double x) { return x 0; }
+static __inline long long __zeroll(void) { return 0; }
+static __inline int __negative_p(double x) { return x 0; }
#else
#define __zeroll() (0LL)
#define __negative_p(x) ((x) 0)
CVS commit: src/tests
Module Name:src
Committed By: jruoho
Date: Sat Mar 17 17:15:29 UTC 2012
Modified Files:
src/tests: Makefile
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/cc: Makefile t_hello.sh
Removed Files:
src/tests/toolchain: Makefile
src/tests/toolchain/cc: Makefile t_hello.sh
Log Message:
Deprecate tests/toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/tests/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/toolchain/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/toolchain/cc/Makefile
cvs rdiff -u -r1.6 -r0 src/tests/toolchain/cc/t_hello.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/cc/Makefile \
src/tests/usr.bin/cc/t_hello.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.35 src/tests/Makefile:1.36
--- src/tests/Makefile:1.35 Sat Mar 17 16:33:10 2012
+++ src/tests/Makefile Sat Mar 17 17:15:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2012/03/17 16:33:10 jruoho Exp $
+# $NetBSD: Makefile,v 1.36 2012/03/17 17:15:28 jruoho Exp $
.include bsd.own.mk
@@ -8,7 +8,7 @@ TESTSDIR= ${TESTSBASE}
ATFFILE= yes
SUBDIR= bin dev examples fs games include ipf kernel lib libexec net
-SUBDIR+= rump sbin sys toolchain usr.bin usr.sbin
+SUBDIR+= rump sbin sys usr.bin usr.sbin
. if ${MKKMOD} != no
SUBDIR+= modules
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.8 src/tests/usr.bin/Makefile:1.9
--- src/tests/usr.bin/Makefile:1.8 Sat Mar 17 16:33:11 2012
+++ src/tests/usr.bin/Makefile Sat Mar 17 17:15:29 2012
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2012/03/17 16:33:11 jruoho Exp $
+# $NetBSD: Makefile,v 1.9 2012/03/17 17:15:29 jruoho Exp $
#
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/usr.bin
-TESTS_SUBDIRS= awk basename bzip2 config cut \
+TESTS_SUBDIRS= awk basename bzip2 cc config cut \
diff dirname grep gzip id m4 make mkdep \
pr rump_server shmif_dumpbus sdiff sort unifdef xlint
Added files:
Index: src/tests/usr.bin/cc/Makefile
diff -u /dev/null src/tests/usr.bin/cc/Makefile:1.1
--- /dev/null Sat Mar 17 17:15:30 2012
+++ src/tests/usr.bin/cc/Makefile Sat Mar 17 17:15:29 2012
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 17:15:29 jruoho Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/usr.bin/cc
+
+TESTS_SH= t_hello
+
+.include bsd.test.mk
Index: src/tests/usr.bin/cc/t_hello.sh
diff -u /dev/null src/tests/usr.bin/cc/t_hello.sh:1.1
--- /dev/null Sat Mar 17 17:15:30 2012
+++ src/tests/usr.bin/cc/t_hello.sh Sat Mar 17 17:15:29 2012
@@ -0,0 +1,123 @@
+# $NetBSD: t_hello.sh,v 1.1 2012/03/17 17:15:29 jruoho Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case hello
+hello_head() {
+ atf_set descr compile and run \hello world\
+ atf_set require.progs cc
+}
+
+atf_test_case hello_pic
+hello_pic_head() {
+ atf_set descr compile and run PIC \hello world\
+ atf_set require.progs cc
+}
+
+atf_test_case hello32
+hello32_head() {
+ atf_set descr compile and run \hello world\ for/in netbsd32 emulation
+ atf_set require.progs cc file diff cat
+}
+
+hello_body() {
+ cat test.c EOF
+#include stdio.h
+#include stdlib.h
+int main(void) {printf(hello world\n);exit(0);}
+EOF
+ atf_check -s exit:0 -o ignore -e ignore cc -o hello test.c
+ atf_check -s exit:0 -o inline:hello world\n ./hello
+}
+
+hello_pic_body() {
+ cat test.c EOF
+#include stdlib.h
+int main(void) {callpic();exit(0);}
+EOF
+ cat pic.c EOF
+#include stdio.h
+int callpic(void) {printf(hello
CVS commit: src
Module Name:src Committed By: jruoho Date: Sat Mar 17 17:16:41 UTC 2012 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Log Message: Adjust set lists and mtree. To generate a diff of this commit: cvs rdiff -u -r1.444 -r1.445 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.63 -r1.64 src/etc/mtree/NetBSD.dist.tests 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.444 src/distrib/sets/lists/tests/mi:1.445 --- src/distrib/sets/lists/tests/mi:1.444 Sat Mar 17 16:40:14 2012 +++ src/distrib/sets/lists/tests/mi Sat Mar 17 17:16:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.444 2012/03/17 16:40:14 jruoho Exp $ +# $NetBSD: mi,v 1.445 2012/03/17 17:16:41 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2752,11 +2752,11 @@ ./usr/tests/syscall/t_truncate tests-obsolete obsolete ./usr/tests/syscall/t_umask tests-obsolete obsolete ./usr/tests/syscall/t_unlink tests-obsolete obsolete -./usr/tests/toolchaintests-syscall-tests atf -./usr/tests/toolchain/Atffile tests-syscall-tests atf -./usr/tests/toolchain/cc tests-syscall-tests atf -./usr/tests/toolchain/cc/Atffile tests-syscall-tests atf -./usr/tests/toolchain/cc/t_hello tests-syscall-tests atf +./usr/tests/toolchaintests-obsolete obsolete +./usr/tests/toolchain/Atffile tests-obsolete obsolete +./usr/tests/toolchain/cc tests-obsolete obsolete +./usr/tests/toolchain/cc/Atffile tests-obsolete obsolete +./usr/tests/toolchain/cc/t_hello tests-obsolete obsolete ./usr/tests/usr.bintests-usr.bin-tests ./usr/tests/usr.bin/Atffile tests-usr.bin-tests atf ./usr/tests/usr.bin/awktests-usr.bin-tests @@ -2797,6 +2797,9 @@ ./usr/tests/usr.bin/bzip2/d_sample2.ref tests-usr.bin-tests atf ./usr/tests/usr.bin/bzip2/d_sample3.bz2 tests-usr.bin-tests atf ./usr/tests/usr.bin/bzip2/d_sample3.ref tests-usr.bin-tests atf +./usr/tests/usr.bin/cctests-usr.bin-tests +./usr/tests/usr.bin/cc/Atffile tests-usr.bin-tests atf +./usr/tests/usr.bin/cc/t_hello tests-usr.bin-tests atf ./usr/tests/usr.bin/config tests-usr.bin-tests ./usr/tests/usr.bin/config/Atffile tests-usr.bin-tests atf ./usr/tests/usr.bin/config/Makefile.regress tests-usr.bin-tests atf Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.63 src/etc/mtree/NetBSD.dist.tests:1.64 --- src/etc/mtree/NetBSD.dist.tests:1.63 Sat Mar 17 16:35:02 2012 +++ src/etc/mtree/NetBSD.dist.tests Sat Mar 17 17:16:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.63 2012/03/17 16:35:02 jruoho Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.64 2012/03/17 17:16:41 jruoho Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -259,12 +259,11 @@ ./usr/tests/sbin/sysctl ./usr/tests/sys ./usr/tests/sys/rc -./usr/tests/toolchain -./usr/tests/toolchain/cc ./usr/tests/usr.bin ./usr/tests/usr.bin/awk ./usr/tests/usr.bin/basename ./usr/tests/usr.bin/bzip2 +./usr/tests/usr.bin/cc ./usr/tests/usr.bin/config ./usr/tests/usr.bin/config/support ./usr/tests/usr.bin/config/support/arch
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:17:07 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-6]: umass_quirks.c usbdevs
Log Message:
Pull up following revision(s) (requested by riz in ticket #90):
sys/dev/usb/usbdevs: revision 1.610
sys/dev/usb/umass_quirks.c: revision 1.93
add product ID for the Kingston DataTraveler 100 G2.
Add quirk for Kingston DataTraveler 100 G2 (which apparently has
a Toshiba vendor ID)
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.92.2.1 src/sys/dev/usb/umass_quirks.c
cvs rdiff -u -r1.607.2.1 -r1.607.2.2 src/sys/dev/usb/usbdevs
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/umass_quirks.c
diff -u src/sys/dev/usb/umass_quirks.c:1.92 src/sys/dev/usb/umass_quirks.c:1.92.2.1
--- src/sys/dev/usb/umass_quirks.c:1.92 Fri Dec 23 00:51:47 2011
+++ src/sys/dev/usb/umass_quirks.c Sat Mar 17 17:17:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_quirks.c,v 1.92 2011/12/23 00:51:47 jakllsch Exp $ */
+/* $NetBSD: umass_quirks.c,v 1.92.2.1 2012/03/17 17:17:07 bouyer Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass_quirks.c,v 1.92 2011/12/23 00:51:47 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass_quirks.c,v 1.92.2.1 2012/03/17 17:17:07 bouyer Exp $);
#ifdef _KERNEL_OPT
#include opt_umass.h
@@ -319,6 +319,15 @@ Static const struct umass_quirk umass_qu
NULL, NULL
},
+ /* Also, some Kingston pendrives have Toshiba vendor ID */
+ { { USB_VENDOR_TOSHIBA, USB_PRODUCT_KINGSTON_DT100_G2 },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
/* HP USB pendrives don't like being told to lock the door */
{ { USB_VENDOR_HP, USB_PRODUCT_HP_V125W },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.607.2.1 src/sys/dev/usb/usbdevs:1.607.2.2
--- src/sys/dev/usb/usbdevs:1.607.2.1 Sun Feb 19 18:43:47 2012
+++ src/sys/dev/usb/usbdevs Sat Mar 17 17:17:06 2012
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.607.2.1 2012/02/19 18:43:47 riz Exp $
+$NetBSD: usbdevs,v 1.607.2.2 2012/03/17 17:17:06 bouyer Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1707,6 +1707,7 @@ product KINGSTON DT102_G2 0x1624 DT 102
product KINGSTON DT101_II 0x1625 DT 101 II
product KINGSTON DTMINI10 0x162c DT Mini 10
product KINGSTON DT101_G2 0x1642 DT 101 G2
+product KINGSTON DT100_G2 0x6544 DT 100 G2
/* Kodak products */
product KODAK DC220 0x0100 Digital Science DC220
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:20:00 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-6]: usbdevs.h usbdevs_data.h
Log Message:
regen for ticket #90: add product ID for the Kingston DataTraveler 100 G2.
To generate a diff of this commit:
cvs rdiff -u -r1.600.2.1 -r1.600.2.2 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.601.2.1 -r1.601.2.2 src/sys/dev/usb/usbdevs_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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.600.2.1 src/sys/dev/usb/usbdevs.h:1.600.2.2
--- src/sys/dev/usb/usbdevs.h:1.600.2.1 Sun Feb 19 18:45:04 2012
+++ src/sys/dev/usb/usbdevs.h Sat Mar 17 17:19:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.600.2.1 2012/02/19 18:45:04 riz Exp $ */
+/* $NetBSD: usbdevs.h,v 1.600.2.2 2012/03/17 17:19:59 bouyer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -1714,6 +1714,7 @@
#define USB_PRODUCT_KINGSTON_DT101_II 0x1625 /* DT 101 II */
#define USB_PRODUCT_KINGSTON_DTMINI10 0x162c /* DT Mini 10 */
#define USB_PRODUCT_KINGSTON_DT101_G2 0x1642 /* DT 101 G2 */
+#define USB_PRODUCT_KINGSTON_DT100_G2 0x6544 /* DT 100 G2 */
/* Kodak products */
#define USB_PRODUCT_KODAK_DC220 0x0100 /* Digital Science DC220 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.601.2.1 src/sys/dev/usb/usbdevs_data.h:1.601.2.2
--- src/sys/dev/usb/usbdevs_data.h:1.601.2.1 Sun Feb 19 18:45:04 2012
+++ src/sys/dev/usb/usbdevs_data.h Sat Mar 17 17:19:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.601.2.1 2012/02/19 18:45:04 riz Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.601.2.2 2012/03/17 17:19:59 bouyer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -5211,6 +5211,10 @@ const struct usb_product usb_products[]
DT 101 G2,
},
{
+ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT100_G2,
+ DT 100 G2,
+ },
+ {
USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC220,
Digital Science DC220,
},
@@ -8823,4 +8827,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1694;
+const int usb_nproducts = 1695;
CVS commit: [netbsd-6] src/etc/root
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:22:54 UTC 2012
Modified Files:
src/etc/root [netbsd-6]: dot.cshrc dot.profile
Log Message:
Pull up following revision(s) (requested by he in ticket #109):
etc/root/dot.cshrc: revision 1.23
etc/root/dot.cshrc: revision 1.24
etc/root/dot.profile: revision 1.26
Can't use Bourne shell syntax here... (Even in comments, for PKG_PATH.)
Point first to 6.0 packages, then to packages for 5.1 or 5.0.
The latter have reduced usefullness in -current or netbsd-6 until
we have a compat50 package.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.4.1 src/etc/root/dot.cshrc
cvs rdiff -u -r1.25 -r1.25.4.1 src/etc/root/dot.profile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/root/dot.cshrc
diff -u src/etc/root/dot.cshrc:1.22 src/etc/root/dot.cshrc:1.22.4.1
--- src/etc/root/dot.cshrc:1.22 Tue Jun 21 05:31:29 2011
+++ src/etc/root/dot.cshrc Sat Mar 17 17:22:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: dot.cshrc,v 1.22 2011/06/21 05:31:29 erh Exp $
+# $NetBSD: dot.cshrc,v 1.22.4.1 2012/03/17 17:22:54 bouyer Exp $
alias h history
alias j jobs -l
@@ -22,8 +22,9 @@ setenv BLOCKSIZE 1k
# Uncomment the following line(s) to install binary packages
# from ftp.NetBSD.org via pkg_add. (See also pkg_install.conf)
-#setenv PKG_PATH ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.1/All
-#setenv PKG_PATH ${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.0/All
+#setenv PKG_PATH ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -m`/6.0/All
+#setenv PKG_PATH ${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -m`/5.1/All
+#setenv PKG_PATH ${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -m`/5.0/All
set history=1000
set path=(/sbin /usr/sbin /bin /usr/bin /usr/pkg/sbin /usr/pkg/bin /usr/X11R7/bin /usr/X11R6/bin /usr/local/sbin /usr/local/bin)
Index: src/etc/root/dot.profile
diff -u src/etc/root/dot.profile:1.25 src/etc/root/dot.profile:1.25.4.1
--- src/etc/root/dot.profile:1.25 Tue Jun 21 05:31:29 2011
+++ src/etc/root/dot.profile Sat Mar 17 17:22:54 2012
@@ -1,11 +1,12 @@
-# $NetBSD: dot.profile,v 1.25 2011/06/21 05:31:29 erh Exp $
+# $NetBSD: dot.profile,v 1.25.4.1 2012/03/17 17:22:54 bouyer Exp $
export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin
export PATH=${PATH}:/usr/X11R7/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin
# Uncomment the following line(s) to install binary packages
# from ftp.NetBSD.org via pkg_add. (See also pkg_install.conf)
-#export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.1/All
+#export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/6.0/All
+#export PKG_PATH=${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.1/All
#export PKG_PATH=${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.0/All
export BLOCKSIZE=1k
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Sat Mar 17 17:23:34 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/kernel: Makefile
src/tests/lib/libc/sys: Makefile
Added Files:
src/tests/lib/libc/sys: t_lwp_ctl.c
Removed Files:
src/tests/kernel: t_lwpctl.c
Log Message:
Move the _lwp_ctl(2) preemption counter check to the right place.
To generate a diff of this commit:
cvs rdiff -u -r1.445 -r1.446 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.24 -r1.25 src/tests/kernel/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/kernel/t_lwpctl.c
cvs rdiff -u -r1.20 -r1.21 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_lwp_ctl.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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.445 src/distrib/sets/lists/tests/mi:1.446
--- src/distrib/sets/lists/tests/mi:1.445 Sat Mar 17 17:16:41 2012
+++ src/distrib/sets/lists/tests/mi Sat Mar 17 17:23:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.445 2012/03/17 17:16:41 jruoho Exp $
+# $NetBSD: mi,v 1.446 2012/03/17 17:23:34 jruoho Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -333,7 +333,7 @@
./usr/libdata/debug/usr/tests/kernel/t_extent.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_filedesc.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_lock.debug tests-kernel-tests debug,atf
-./usr/libdata/debug/usr/tests/kernel/t_lwpctl.debug tests-kernel-tests debug,atf
+./usr/libdata/debug/usr/tests/kernel/t_lwpctl.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_mkdir.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_pipe.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/t_poll3w.debug tests-obsolete obsolete
@@ -536,6 +536,7 @@
./usr/libdata/debug/usr/tests/lib/libc/sys/t_kill.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_link.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_listen.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_lwp_ctl.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_mincore.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_mkdir.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_mkfifo.debug tests-lib-debug debug,atf
@@ -1954,7 +1955,7 @@
./usr/tests/kernel/t_extent tests-kernel-tests atf
./usr/tests/kernel/t_filedesc tests-kernel-tests atf
./usr/tests/kernel/t_lock tests-kernel-tests atf
-./usr/tests/kernel/t_lwpctl tests-kernel-tests atf
+./usr/tests/kernel/t_lwpctl tests-obsolete obsolete
./usr/tests/kernel/t_mkdir tests-obsolete obsolete
./usr/tests/kernel/t_pipe tests-obsolete obsolete
./usr/tests/kernel/t_poll3w tests-obsolete obsolete
@@ -2258,6 +2259,7 @@
./usr/tests/lib/libc/sys/t_kill tests-lib-tests atf
./usr/tests/lib/libc/sys/t_link tests-lib-tests atf
./usr/tests/lib/libc/sys/t_listen tests-lib-tests atf
+./usr/tests/lib/libc/sys/t_lwp_ctl tests-lib-tests atf
./usr/tests/lib/libc/sys/t_mincore tests-lib-tests atf
./usr/tests/lib/libc/sys/t_mkdir tests-lib-tests atf
./usr/tests/lib/libc/sys/t_mkfifo tests-lib-tests atf
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.24 src/tests/kernel/Makefile:1.25
--- src/tests/kernel/Makefile:1.24 Mon Feb 13 21:03:06 2012
+++ src/tests/kernel/Makefile Sat Mar 17 17:23:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/02/13 21:03:06 martin Exp $
+# $NetBSD: Makefile,v 1.25 2012/03/17 17:23:34 jruoho Exp $
NOMAN= # defined
@@ -9,7 +9,6 @@ TESTSDIR= ${TESTSBASE}/kernel
TESTS_SUBDIRS= kqueue tty
TESTS_C= t_lock
-TESTS_C+= t_lwpctl
TESTS_C+= t_pty
TESTS_C+= t_rnd
TESTS_C+= t_extattrctl
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.20 src/tests/lib/libc/sys/Makefile:1.21
--- src/tests/lib/libc/sys/Makefile:1.20 Thu Nov 17 01:14:12 2011
+++ src/tests/lib/libc/sys/Makefile Sat Mar 17 17:23:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/11/17 01:14:12 christos Exp $
+# $NetBSD: Makefile,v 1.21 2012/03/17 17:23:34 jruoho Exp $
MKMAN= no
@@ -28,6 +28,7 @@ TESTS_C+= t_kevent
TESTS_C+= t_kill
TESTS_C+= t_link
TESTS_C+= t_listen
+TESTS_C+= t_lwp_ctl
TESTS_C+= t_mincore
TESTS_C+= t_mkdir
TESTS_C+= t_mkfifo
Added files:
Index: src/tests/lib/libc/sys/t_lwp_ctl.c
diff -u /dev/null src/tests/lib/libc/sys/t_lwp_ctl.c:1.1
--- /dev/null Sat Mar 17 17:23:34 2012
+++ src/tests/lib/libc/sys/t_lwp_ctl.c Sat Mar 17 17:23:34 2012
@@ -0,0 +1,75 @@
+/* $NetBSD: t_lwp_ctl.c,v 1.1 2012/03/17 17:23:34 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation,
CVS commit: [netbsd-6] src/sys/dev/pci/hdaudio
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:26:07 UTC 2012
Modified Files:
src/sys/dev/pci/hdaudio [netbsd-6]: hdafg.c
Log Message:
Pull up following revision(s) (requested by lars in ticket #111):
sys/dev/pci/hdaudio/hdafg.c: revision 1.16
call kmem_free with the right address in hdafg_detach for sc_widgets
the former code let to memory corruption
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/dev/pci/hdaudio/hdafg.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/hdaudio/hdafg.c
diff -u src/sys/dev/pci/hdaudio/hdafg.c:1.15 src/sys/dev/pci/hdaudio/hdafg.c:1.15.2.1
--- src/sys/dev/pci/hdaudio/hdafg.c:1.15 Wed Dec 21 02:16:57 2011
+++ src/sys/dev/pci/hdaudio/hdafg.c Sat Mar 17 17:26:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.15 2011/12/21 02:16:57 jmcneill Exp $ */
+/* $NetBSD: hdafg.c,v 1.15.2.1 2012/03/17 17:26:07 bouyer Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.15 2011/12/21 02:16:57 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.15.2.1 2012/03/17 17:26:07 bouyer Exp $);
#include sys/types.h
#include sys/param.h
@@ -3733,7 +3733,7 @@ static int
hdafg_detach(device_t self, int flags)
{
struct hdafg_softc *sc = device_private(self);
- struct hdaudio_widget *w = sc-sc_widgets;
+ struct hdaudio_widget *wl, *w = sc-sc_widgets;
struct hdaudio_assoc *as = sc-sc_assocs;
struct hdaudio_control *ctl = sc-sc_ctls;
struct hdaudio_mixer *mx = sc-sc_mixers;
@@ -3755,10 +3755,10 @@ hdafg_detach(device_t self, int flags)
/* restore bios pin widget configuration */
for (nid = sc-sc_startnode; nid sc-sc_endnode; nid++) {
- w = hdafg_widget_lookup(sc, nid);
- if (w == NULL || w-w_type != COP_AWCAP_TYPE_PIN_COMPLEX)
+ wl = hdafg_widget_lookup(sc, nid);
+ if (wl == NULL || wl-w_type != COP_AWCAP_TYPE_PIN_COMPLEX)
continue;
- hdafg_widget_setconfig(w, w-w_pin.biosconfig);
+ hdafg_widget_setconfig(wl, wl-w_pin.biosconfig);
}
if (w)
CVS commit: [netbsd-6] src/gnu/dist/groff
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:28:41 UTC 2012
Modified Files:
src/gnu/dist/groff [netbsd-6]: mdate.sh
src/gnu/dist/groff/contrib/mm [netbsd-6]: groff_mmse.man
Log Message:
Pull up following revision(s) (requested by plunky in ticket #112):
gnu/dist/groff/contrib/mm/groff_mmse.man: revision 1.2
gnu/dist/groff/contrib/mm/groff_mmse.man: revision 1.3
gnu/dist/groff/mdate.sh: revision 1.2
use character escapes for non-ASCII chars, according to mandoc_char(7)
Fix typo, now this has a NAME section.
format the generated manpage date as per Dd macro, for consistency
(although this field is a free-form footer, mandoc -Tlint warns about it)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.56.1 src/gnu/dist/groff/mdate.sh
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.56.1 \
src/gnu/dist/groff/contrib/mm/groff_mmse.man
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/groff/mdate.sh
diff -u src/gnu/dist/groff/mdate.sh:1.1.1.2 src/gnu/dist/groff/mdate.sh:1.1.1.2.56.1
--- src/gnu/dist/groff/mdate.sh:1.1.1.2 Mon Jun 30 17:51:43 2003
+++ src/gnu/dist/groff/mdate.sh Sat Mar 17 17:28:41 2012
@@ -38,5 +38,5 @@ NR == 2 {
}
else
year = $(NF-1);
- print $(NF-2), full[$(NF-3)], year
+ printf %s %d, %d, full[$(NF-3)], $(NF-2), year
}'
Index: src/gnu/dist/groff/contrib/mm/groff_mmse.man
diff -u src/gnu/dist/groff/contrib/mm/groff_mmse.man:1.1.1.1 src/gnu/dist/groff/contrib/mm/groff_mmse.man:1.1.1.1.56.1
--- src/gnu/dist/groff/contrib/mm/groff_mmse.man:1.1.1.1 Mon Jun 30 17:51:43 2003
+++ src/gnu/dist/groff/contrib/mm/groff_mmse.man Sat Mar 17 17:28:40 2012
@@ -3,8 +3,8 @@
.\ Skrivet av Jörgen Hägg, Lund, Sverige
.\
.TH GROFF_MMSE @MAN7EXT@ @MDATE@ Groff Version @VERSION@
-.SH NAMN
-groff_mmse \- svenska mm makro för groff
+.SH NAME
+groff_mmse \- svenska mm makro f\(:or groff
.SH SYNTAX
.B groff
.B \-m@TMAC_M_PREFIX@mse
@@ -15,26 +15,26 @@ groff_mmse \- svenska mm makro för groff
.IR filer .\|.\|.
]
.SH BESKRIVNING
-\fBm@TMAC_M_PREFIX@mse\fP är en svensk variant av \fBm@TMAC_M_PREFIX@m\fP. Alla texter
-är översatta. En A4 sida får text som är 13 cm bred, 3.5 cm indragning
-samt är 28.5 cm hög.
-Det finns stöd för brevuppställning enligt svensk standard
-för vänster och högerjusterad text.
+\fBm@TMAC_M_PREFIX@mse\fP \(:ar en svensk variant av \fBm@TMAC_M_PREFIX@m\fP. Alla texter
+\(:ar \(:oversatta. En A4 sida f\(oar text som \(:ar 13 cm bred, 3.5 cm indragning
+samt \(:ar 28.5 cm h\(:og.
+Det finns st\(:od f\(:or brevuppst\(:allning enligt svensk standard
+f\(:or v\(:anster och h\(:ogerjusterad text.
.LP
-\fBCOVER\fP kan använda \fIse_ms\fP som argument. Detta ger ett
-svenskt försättsblad.
-Se \fBgroff_mm(@MAN7EXT@)\fP för övriga detaljer.
+\fBCOVER\fP kan anv\(:anda \fIse_ms\fP som argument. Detta ger ett
+svenskt f\(:ors\(:attsblad.
+Se \fBgroff_mm(@MAN7EXT@)\fP f\(:or \(:ovriga detaljer.
.SH BREV
-Tillgängliga brevtyper:
+Tillg\(:angliga brevtyper:
.TP
.B .LT SVV
-Vänsterställd löptext med adressat i position T0 (vänsterställt).
+V\(:ansterst\(:alld l\(:optext med adressat i position T0 (v\(:ansterst\(:allt).
.TP
.B .LT SVH
-Högerställd löptext med adressat i position T4 (passar
-fönsterkuvert).
+H\(:ogerst\(:alld l\(:optext med adressat i position T4 (passar
+f\(:onsterkuvert).
.LP
-Följande extra LO-variabler används.
+F\(:oljande extra LO-variabler anv\(:ands.
.TP
.B .LO DNAMN\fI namn\fP
Anger dokumentets namn.
@@ -44,8 +44,8 @@ Anger dokumentets namn.
Mottagarens datum, anges under \fBErt datum:\fP (\fBLetMDAT\fP).
.TP
.br
-.B .LO BIL\fI sträng\fP
-Anger bilaga, nummer eller sträng med \fBBilaga\fP (\fBLetBIL\fP)
+.B .LO BIL\fI str\(:ang\fP
+Anger bilaga, nummer eller str\(:ang med \fBBilaga\fP (\fBLetBIL\fP)
som prefix.
.TP
.br
@@ -58,21 +58,21 @@ Anger dokumentbeteckning eller dokumentn
.TP
.br
.B .LO BET\fI beteckning\fP
-Anger beteckning (ärendebeteckning i form av diarienummer eller liknande).
+Anger beteckning (\(:arendebeteckning i form av diarienummer eller liknande).
.TP
.br
.B .LO SIDOR\fI antal\fP
Anger totala antalet sidor och skrivs ut efter sidnumret inom
parenteser.
.LP
-Om makrot \fB.TP\fP är definierat anropas det efter utskrift av brevhuvudet.
-Där lägger man lämpligen in postadress och annat som brevfot.
+Om makrot \fB.TP\fP \(:ar definierat anropas det efter utskrift av brevhuvudet.
+D\(:ar l\(:agger man l\(:ampligen in postadress och annat som brevfot.
.SH SKRIVET AV
-Jörgen Hägg, Lund, Sweden jorgen.h...@axis.se
+J\(:orgen H\(:agg, Lund, Sweden jorgen.h...@axis.se
.SH FILER
.B @MACRODIR@/tmac.@TMAC_M_PREFIX@mse
.B @TMAC_MDIR@/se_*.cov
-.SH SE OCKSÅ
+.SH SE OCKS\(oA
.BR groff (@MAN1EXT@),
.BR @g@troff (@MAN1EXT@),
.BR @g@tbl (@MAN1EXT@),
CVS commit: [netbsd-6] src/sys/uvm
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:29:34 UTC 2012
Modified Files:
src/sys/uvm [netbsd-6]: uvm_km.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #113):
sys/uvm/uvm_km.c: revision 1.123
uvm_km_kmem_alloc: return ENOMEM on failure in PMAP_MAP_POOLPAGE case.
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.1 -r1.120.2.2 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.120.2.1 src/sys/uvm/uvm_km.c:1.120.2.2
--- src/sys/uvm/uvm_km.c:1.120.2.1 Wed Feb 22 18:56:48 2012
+++ src/sys/uvm/uvm_km.c Sat Mar 17 17:29:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.120.2.1 2012/02/22 18:56:48 riz Exp $ */
+/* $NetBSD: uvm_km.c,v 1.120.2.2 2012/03/17 17:29:34 bouyer Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -120,7 +120,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.120.2.1 2012/02/22 18:56:48 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.120.2.2 2012/03/17 17:29:34 bouyer Exp $);
#include opt_uvmhist.h
@@ -731,6 +731,7 @@ again:
uvm_wait(plpg);
goto again;
}
+ return ENOMEM;
}
va = PMAP_MAP_POOLPAGE(VM_PAGE_TO_PHYS(pg));
if (__predict_false(va == 0)) {
@@ -768,7 +769,7 @@ again:
return ENOMEM;
}
}
-
+
pg-flags = ~PG_BUSY; /* new page */
UVM_PAGE_OWN(pg, NULL);
pmap_kenter_pa(loopva, VM_PAGE_TO_PHYS(pg),
@@ -815,4 +816,3 @@ uvm_km_va_starved_p(void)
return (free (total / 10));
}
-
CVS commit: [netbsd-6] src/sys/arch/hppa/hppa
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:33:08 UTC 2012
Modified Files:
src/sys/arch/hppa/hppa [netbsd-6]: trap.c vm_machdep.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #114):
sys/arch/hppa/hppa/trap.c: revision 1.99
sys/arch/hppa/hppa/vm_machdep.c: revision 1.51
sys/arch/hppa/hppa/vm_machdep.c: revision 1.52
Deal with setting of space registers and protection ids for posix_spawn.
Thanks to martin for the help.
Remove WIP code.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.97.2.1 src/sys/arch/hppa/hppa/trap.c
cvs rdiff -u -r1.49 -r1.49.10.1 src/sys/arch/hppa/hppa/vm_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/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.97 src/sys/arch/hppa/hppa/trap.c:1.97.2.1
--- src/sys/arch/hppa/hppa/trap.c:1.97 Mon Feb 13 01:07:37 2012
+++ src/sys/arch/hppa/hppa/trap.c Sat Mar 17 17:33:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.97 2012/02/13 01:07:37 martin Exp $ */
+/* $NetBSD: trap.c,v 1.97.2.1 2012/03/17 17:33:08 bouyer Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.97 2012/02/13 01:07:37 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.97.2.1 2012/03/17 17:33:08 bouyer Exp $);
/* #define INTRDEBUG */
/* #define TRAPDEBUG */
@@ -1009,7 +1009,28 @@ child_return(void *arg)
void
cpu_spawn_return(struct lwp *l)
{
-
+ struct proc *p = l-l_proc;
+ pmap_t pmap = p-p_vmspace-vm_map.pmap;
+ pa_space_t space = pmap-pm_space;
+ struct trapframe *tf = l-l_md.md_regs;
+
+ /* Load all of the user's space registers. */
+ tf-tf_sr0 = tf-tf_sr1 = tf-tf_sr3 = tf-tf_sr2 =
+ tf-tf_sr4 = tf-tf_sr5 = tf-tf_sr6 = space;
+ tf-tf_iisq_head = tf-tf_iisq_tail = space;
+
+ /* Load the protection registers */
+ tf-tf_pidr1 = tf-tf_pidr2 = pmap-pm_pid;
+
+ /*
+ * theoretically these could be inherited from the father,
+ * but just in case.
+ */
+ tf-tf_sr7 = HPPA_SID_KERNEL;
+ mfctl(CR_EIEM, tf-tf_eiem);
+ tf-tf_ipsw = PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I /* | PSW_L */ |
+ (curcpu()-ci_psw PSW_O);
+
userret(l, l-l_md.md_regs-tf_iioq_head, 0);
#ifdef DEBUG
frame_sanity_check(__func__, __LINE__, 0, l-l_md.md_regs, l);
Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.49 src/sys/arch/hppa/hppa/vm_machdep.c:1.49.10.1
--- src/sys/arch/hppa/hppa/vm_machdep.c:1.49 Thu Feb 24 04:28:45 2011
+++ src/sys/arch/hppa/hppa/vm_machdep.c Sat Mar 17 17:33:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.49 2011/02/24 04:28:45 joerg Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.49.10.1 2012/03/17 17:33:08 bouyer Exp $ */
/* $OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.49 2011/02/24 04:28:45 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.49.10.1 2012/03/17 17:33:08 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -81,9 +81,6 @@ void
cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
void (*func)(void *), void *arg)
{
- struct proc *p = l2-l_proc;
- pmap_t pmap = p-p_vmspace-vm_map.pmap;
- pa_space_t space = pmap-pm_space;
struct pcb *pcb1, *pcb2;
struct trapframe *tf;
register_t sp, osp;
@@ -128,22 +125,28 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
/* Fill out all the PAs we are going to need in locore. */
cpu_activate_pcb(l2);
- /* Load all of the user's space registers. */
- tf-tf_sr0 = tf-tf_sr1 = tf-tf_sr3 = tf-tf_sr2 =
- tf-tf_sr4 = tf-tf_sr5 = tf-tf_sr6 = space;
- tf-tf_iisq_head = tf-tf_iisq_tail = space;
-
- /* Load the protection registers */
- tf-tf_pidr1 = tf-tf_pidr2 = pmap-pm_pid;
-
- /*
- * theoretically these could be inherited from the father,
- * but just in case.
- */
- tf-tf_sr7 = HPPA_SID_KERNEL;
- mfctl(CR_EIEM, tf-tf_eiem);
- tf-tf_ipsw = PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I /* | PSW_L */ |
- (curcpu()-ci_psw PSW_O);
+ if (__predict_true(l2-l_proc-p_vmspace != NULL)) {
+ struct proc *p = l2-l_proc;
+ pmap_t pmap = p-p_vmspace-vm_map.pmap;
+ pa_space_t space = pmap-pm_space;
+
+ /* Load all of the user's space registers. */
+ tf-tf_sr0 = tf-tf_sr1 = tf-tf_sr3 = tf-tf_sr2 =
+ tf-tf_sr4 = tf-tf_sr5 = tf-tf_sr6 = space;
+ tf-tf_iisq_head = tf-tf_iisq_tail = space;
+
+ /* Load the protection registers */
+ tf-tf_pidr1 = tf-tf_pidr2 = pmap-pm_pid;
+
+ /*
+ * theoretically these could be inherited from the father,
+ * but just in case.
+ */
+ tf-tf_sr7 = HPPA_SID_KERNEL;
+ mfctl(CR_EIEM, tf-tf_eiem);
+ tf-tf_ipsw = PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I /* | PSW_L */ |
+ (curcpu()-ci_psw PSW_O);
+ }
/*
* Set up return value registers as libc:fork() expects
@@ -313,3 +316,4
CVS commit: [netbsd-6] src/usr.bin/ktruss
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:33:56 UTC 2012
Modified Files:
src/usr.bin/ktruss [netbsd-6]: makeerrnos.sh
Log Message:
Pull up following revision(s) (requested by dyoung in ticket #115):
usr.bin/ktruss/makeerrnos.sh: revision 1.6
Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more
portable. The latter is not supported by Mac OS X Lion.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.22.1 src/usr.bin/ktruss/makeerrnos.sh
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/ktruss/makeerrnos.sh
diff -u src/usr.bin/ktruss/makeerrnos.sh:1.5 src/usr.bin/ktruss/makeerrnos.sh:1.5.22.1
--- src/usr.bin/ktruss/makeerrnos.sh:1.5 Sun Oct 19 22:10:05 2008
+++ src/usr.bin/ktruss/makeerrnos.sh Sat Mar 17 17:33:56 2012
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makeerrnos.sh,v 1.5 2008/10/19 22:10:05 apb Exp $
+# $NetBSD: makeerrnos.sh,v 1.5.22.1 2012/03/17 17:33:56 bouyer Exp $
if [ $# -ne 3 ]; then
echo usage: makeerrnos.sh errno.h signal.h output
@@ -35,7 +35,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
lines=`wc -l $CFILE | ${AWK} ' { print $1; } ' -`
@@ -59,7 +59,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
elines=`grep '{ SIG' $CFILE | wc -l`
CVS commit: src/tests/sbin/ifconfig
Module Name:src
Committed By: jruoho
Date: Sat Mar 17 17:39:44 UTC 2012
Modified Files:
src/tests/sbin/ifconfig: t_nonexistent.sh
Log Message:
Add '-e ignore to atf-check(1) and remove xfail. Pointed by njoly@.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/sbin/ifconfig/t_nonexistent.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/ifconfig/t_nonexistent.sh
diff -u src/tests/sbin/ifconfig/t_nonexistent.sh:1.2 src/tests/sbin/ifconfig/t_nonexistent.sh:1.3
--- src/tests/sbin/ifconfig/t_nonexistent.sh:1.2 Wed May 11 22:08:12 2011
+++ src/tests/sbin/ifconfig/t_nonexistent.sh Sat Mar 17 17:39:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_nonexistent.sh,v 1.2 2011/05/11 22:08:12 njoly Exp $
+# $NetBSD: t_nonexistent.sh,v 1.3 2012/03/17 17:39:44 jruoho Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,9 +35,10 @@ nonexistent_head() {
nonexistent_body() {
- atf_expect_fail PR bin/43141
-
- atf_check -s not-exit:0 ifconfig nonexistent0 1.2.3.4/24
+ # Cf. PR bin/43141.
+ #
+ atf_check -s not-exit:0 -e ignore \
+ ifconfig nonexistent0 1.2.3.4/24
}
atf_init_test_cases() {
CVS commit: [netbsd-6] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:40:08 UTC 2012
Modified Files:
src/sbin/newfs_lfs [netbsd-6]: make_lfs.c
src/sys/ufs/lfs [netbsd-6]: lfs.h lfs_alloc.c lfs_bio.c lfs_segment.c
lfs_vfsops.c lfs_vnops.c
src/tests/fs/vfs [netbsd-6]: t_renamerace.c t_rmdirrace.c
Log Message:
Pull up following revision(s) (requested by perseant in ticket #116):
sys/ufs/lfs/lfs_alloc.c: revision 1.112
tests/fs/vfs/t_rmdirrace.c: revision 1.9
tests/fs/vfs/t_renamerace.c: revision 1.25
sys/ufs/lfs/lfs_vnops.c: revision 1.240
sys/ufs/lfs/lfs_segment.c: revision 1.224
sys/ufs/lfs/lfs_bio.c: revision 1.122
sys/ufs/lfs/lfs_vfsops.c: revision 1.294
sbin/newfs_lfs/make_lfs.c: revision 1.19
sys/ufs/lfs/lfs.h: revision 1.136
Pass t_renamerace and t_rmdirrace tests.
Adapt dholland@'s fix to ufs_rename to fix PR kern/43582. Address several
other MP locking issues discovered during the course of investigating the
same problem.
Removed extraneous vn_lock() calls on the Ifile, since the Ifile writes
are controlled by the segment lock.
Fix PR kern/45982 by deemphasizing the estimate of how much metadata
will fill the empty space on disk when the disk is nearly empty
(t_renamerace crates a lot of inode blocks on a tiny empty disk).
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/sbin/newfs_lfs/make_lfs.c
cvs rdiff -u -r1.135 -r1.135.2.1 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.111 -r1.111.8.1 src/sys/ufs/lfs/lfs_alloc.c
cvs rdiff -u -r1.121 -r1.121.2.1 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.223 -r1.223.2.1 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.293 -r1.293.2.1 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.239 -r1.239.2.1 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.24 -r1.24.4.1 src/tests/fs/vfs/t_renamerace.c
cvs rdiff -u -r1.8 -r1.8.4.1 src/tests/fs/vfs/t_rmdirrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_lfs/make_lfs.c
diff -u src/sbin/newfs_lfs/make_lfs.c:1.18 src/sbin/newfs_lfs/make_lfs.c:1.18.2.1
--- src/sbin/newfs_lfs/make_lfs.c:1.18 Thu Feb 2 03:50:32 2012
+++ src/sbin/newfs_lfs/make_lfs.c Sat Mar 17 17:40:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: make_lfs.c,v 1.18 2012/02/02 03:50:32 perseant Exp $ */
+/* $NetBSD: make_lfs.c,v 1.18.2.1 2012/03/17 17:40:08 bouyer Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = @(#)lfs.c 8.5 (Berkeley) 5/24/95;
#else
-__RCSID($NetBSD: make_lfs.c,v 1.18 2012/02/02 03:50:32 perseant Exp $);
+__RCSID($NetBSD: make_lfs.c,v 1.18.2.1 2012/03/17 17:40:08 bouyer Exp $);
#endif
#endif /* not lint */
@@ -496,7 +496,7 @@ make_lfs(int devfd, uint secsize, struct
if (fs-lfs_resvseg MIN_RESV_SEGS)
fs-lfs_resvseg = MIN_RESV_SEGS;
- if(fs-lfs_nseg (3 * CM_MAG_NUM * fs-lfs_minfreeseg) / CM_MAG_DEN + 1
+ if(fs-lfs_nseg (4 * fs-lfs_minfreeseg)
|| fs-lfs_nseg LFS_MIN_SBINTERVAL + 1)
{
if(seg_size == 0 ssize (bsize1)) {
Index: src/sys/ufs/lfs/lfs.h
diff -u src/sys/ufs/lfs/lfs.h:1.135 src/sys/ufs/lfs/lfs.h:1.135.2.1
--- src/sys/ufs/lfs/lfs.h:1.135 Mon Jan 2 22:10:44 2012
+++ src/sys/ufs/lfs/lfs.h Sat Mar 17 17:40:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.135 2012/01/02 22:10:44 perseant Exp $ */
+/* $NetBSD: lfs.h,v 1.135.2.1 2012/03/17 17:40:07 bouyer Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -1027,13 +1027,23 @@ struct lfs_inode_ext {
/*
* Estimate number of clean blocks not available for writing because
* they will contain metadata or overhead. This is calculated as
- * (dmeta / # dirty segments) * (# clean segments).
+ *
+ * E = ((C * M / D) * D + (0) * (T - D)) / T
+ * or more simply
+ * E = (C * M) / T
+ *
+ * where
+ * C is the clean space,
+ * D is the dirty space,
+ * M is the dirty metadata, and
+ * T = C + D is the total space on disk.
+ *
+ * This approximates the old formula of E = C * M / D when D is close to T,
+ * but avoids falsely reporting disk full when the sample size (D) is small.
*/
-#define CM_MAG_NUM 3
-#define CM_MAG_DEN 2
#define LFS_EST_CMETA(F) (int32_t)(( \
-(CM_MAG_NUM * ((F)-lfs_dmeta * (int64_t)(F)-lfs_nclean)) / \
-(CM_MAG_DEN * ((F)-lfs_nseg - (F)-lfs_nclean
+ ((F)-lfs_dmeta * (int64_t)(F)-lfs_nclean) / \
+ ((F)-lfs_nseg)))
/* Estimate total size of the disk not including metadata */
#define LFS_EST_NONMETA(F) ((F)-lfs_dsize - (F)-lfs_dmeta - LFS_EST_CMETA(F))
Index: src/sys/ufs/lfs/lfs_alloc.c
diff -u src/sys/ufs/lfs/lfs_alloc.c:1.111 src/sys/ufs/lfs/lfs_alloc.c:1.111.8.1
--- src/sys/ufs/lfs/lfs_alloc.c:1.111 Sun Jun 12 03:36:01 2011
+++ src/sys/ufs/lfs/lfs_alloc.c Sat Mar 17 17:40:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_alloc.c,v 1.111 2011/06/12 03:36:01 rmind Exp $ */
+/* $NetBSD: lfs_alloc.c,v 1.111.8.1
CVS commit: [netbsd-6] src/external/bsd/iscsi/dist
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:48:49 UTC 2012
Modified Files:
src/external/bsd/iscsi/dist/include [netbsd-6]: iscsiutil.h
src/external/bsd/iscsi/dist/src/lib [netbsd-6]: conffile.c disk.c
initiator.c parameters.c protocol.c util.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #118):
external/bsd/iscsi/dist/src/lib/initiator.c: revision 1.8
external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.3
external/bsd/iscsi/dist/src/lib/disk.c: revision 1.7
external/bsd/iscsi/dist/src/lib/parameters.c: revision 1.3
external/bsd/iscsi/dist/src/lib/util.c: revision 1.3
external/bsd/iscsi/dist/src/lib/conffile.c: revision 1.3
external/bsd/iscsi/dist/include/iscsiutil.h: revision 1.4
Add __printflike where needed. Fix various format string issues.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/iscsi/dist/include/iscsiutil.h
cvs rdiff -u -r1.2 -r1.2.8.1 src/external/bsd/iscsi/dist/src/lib/conffile.c \
src/external/bsd/iscsi/dist/src/lib/parameters.c \
src/external/bsd/iscsi/dist/src/lib/util.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/external/bsd/iscsi/dist/src/lib/disk.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/external/bsd/iscsi/dist/src/lib/initiator.c
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/iscsi/dist/src/lib/protocol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/include/iscsiutil.h
diff -u src/external/bsd/iscsi/dist/include/iscsiutil.h:1.3 src/external/bsd/iscsi/dist/include/iscsiutil.h:1.3.8.1
--- src/external/bsd/iscsi/dist/include/iscsiutil.h:1.3 Tue Jun 30 02:44:52 2009
+++ src/external/bsd/iscsi/dist/include/iscsiutil.h Sat Mar 17 17:48:49 2012
@@ -144,9 +144,12 @@ EXTERN uint32_t iscsi_debug_level;
* Debugging Functions
*/
void set_debug(const char *);
-void iscsi_trace(const int, const char *, ...);
-void iscsi_warn(const char *, const int, const char *, ...);
-void iscsi_err(const char *, const int, const char *, ...);
+void iscsi_trace(const int, const char *, ...)
+__printflike(2, 3);
+void iscsi_warn(const char *, const int, const char *, ...)
+__printflike(3, 4);
+void iscsi_err(const char *, const int, const char *, ...)
+__printflike(3, 4);
void iscsi_print_buffer(const char *, const size_t);
@@ -417,7 +420,7 @@ typedef struct {
} iscsi_worker_t;
#define ISCSI_WORKER_EXIT(ME) do { \
- iscsi_trace(TRACE_ISCSI_DEBUG ,__FILE__, __LINE__, exiting\n);\
+ iscsi_trace(TRACE_ISCSI_DEBUG, %s:%d: %s, __FILE__, __LINE__, exiting\n);\
(ME)-state |= ISCSI_WORKER_STATE_EXITING; \
return 0; \
/* NOTREACHED */ \
Index: src/external/bsd/iscsi/dist/src/lib/conffile.c
diff -u src/external/bsd/iscsi/dist/src/lib/conffile.c:1.2 src/external/bsd/iscsi/dist/src/lib/conffile.c:1.2.8.1
--- src/external/bsd/iscsi/dist/src/lib/conffile.c:1.2 Tue Jun 30 02:44:52 2009
+++ src/external/bsd/iscsi/dist/src/lib/conffile.c Sat Mar 17 17:48:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: conffile.c,v 1.2 2009/06/30 02:44:52 agc Exp $ */
+/* $NetBSD: conffile.c,v 1.2.8.1 2012/03/17 17:48:49 bouyer Exp $ */
/*
* Copyright © 2006 Alistair Crooks. All rights reserved.
@@ -206,7 +206,7 @@ safe_write_ent(FILE *fp, conffile_t *sp,
#endif
/* report an error and clear up */
-static int
+static __printflike(3, 4) int
report_error(FILE *fp, char *name, const char *fmt, ...)
{
va_list vp;
Index: src/external/bsd/iscsi/dist/src/lib/parameters.c
diff -u src/external/bsd/iscsi/dist/src/lib/parameters.c:1.2 src/external/bsd/iscsi/dist/src/lib/parameters.c:1.2.8.1
--- src/external/bsd/iscsi/dist/src/lib/parameters.c:1.2 Tue Jun 30 02:44:52 2009
+++ src/external/bsd/iscsi/dist/src/lib/parameters.c Sat Mar 17 17:48:49 2012
@@ -821,7 +821,7 @@ param_text_parse(iscsi_parameter_t * hea
}
if (strlen(value) ISCSI_PARAM_MAX_LEN) {
iscsi_err(__FILE__, __LINE__,
-strlen(value) %u\n, strlen(value));
+strlen(value) %zu\n, strlen(value));
PTP_CLEANUP;
return -1;
}
Index: src/external/bsd/iscsi/dist/src/lib/util.c
diff -u src/external/bsd/iscsi/dist/src/lib/util.c:1.2 src/external/bsd/iscsi/dist/src/lib/util.c:1.2.8.1
--- src/external/bsd/iscsi/dist/src/lib/util.c:1.2 Tue Jun 30 02:44:52 2009
+++ src/external/bsd/iscsi/dist/src/lib/util.c Sat Mar 17 17:48:49 2012
@@ -467,7 +467,7 @@ modify_iov(struct iovec ** iov_ptr, int
}
if (i == *iovc) {
iscsi_err(__FILE__, __LINE__,
- sum of iov lens (%u) offset (%u)\n, len, offset);
+ sum of iov lens (%zu) offset (%u)\n, len, offset);
return -1;
}
iov[i].iov_len -= disp;
@@ -493,7 +493,7 @@ modify_iov(struct iovec ** iov_ptr, int
}
if (i == *iovc) {
iscsi_err(__FILE__, __LINE__,
- sum of iovec lens (%u) length (%u)\n, len, length);
+ sum of iovec lens (%zu) length (%u)\n, len, length);
for
CVS commit: [netbsd-6] src/tests/lib/libc
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:49:55 UTC 2012
Modified Files:
src/tests/lib/libc/gen [netbsd-6]: t_humanize_number.c
src/tests/lib/libc/stdio [netbsd-6]: t_printf.c t_scanf.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #119):
tests/lib/libc/stdio/t_printf.c: revision 1.5
tests/lib/libc/stdio/t_scanf.c: revision 1.2
tests/lib/libc/gen/t_humanize_number.c: revision 1.6
Mark w_printf as __printflike and fix a format string error.
Fix format strings to properly quote %.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/tests/lib/libc/gen/t_humanize_number.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/tests/lib/libc/stdio/t_printf.c
cvs rdiff -u -r1.1 -r1.1.4.1 src/tests/lib/libc/stdio/t_scanf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_humanize_number.c
diff -u src/tests/lib/libc/gen/t_humanize_number.c:1.5 src/tests/lib/libc/gen/t_humanize_number.c:1.5.4.1
--- src/tests/lib/libc/gen/t_humanize_number.c:1.5 Thu Jul 7 09:49:59 2011
+++ src/tests/lib/libc/gen/t_humanize_number.c Sat Mar 17 17:49:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_humanize_number.c,v 1.5 2011/07/07 09:49:59 jruoho Exp $ */
+/* $NetBSD: t_humanize_number.c,v 1.5.4.1 2012/03/17 17:49:55 bouyer Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -112,7 +112,7 @@ const struct hnflags normal_flags[] = {
const char *formatflags(char *, size_t, const struct hnflags *, size_t, int);
void newline(void);
-void w_printf(const char *, ...);
+void w_printf(const char *, ...) __printflike(1, 2);
int main(int, char *[]);
const char *
@@ -226,7 +226,7 @@ ATF_TC_BODY(humanize_number_basic, tc)
(rv == -1 || strcmp(buf, ho-ho_retstr) == 0))
continue;
- w_printf(humanize_number(\%s\, %d, % PRId64 ,,
+ w_printf(humanize_number(\%s\, %zu, % PRId64 ,,
ho-ho_retstr, ho-ho_len, ho-ho_num);
w_printf(\%s\,, ho-ho_suffix);
w_printf(%s,, formatflags(fbuf, sizeof(fbuf), scale_flags,
Index: src/tests/lib/libc/stdio/t_printf.c
diff -u src/tests/lib/libc/stdio/t_printf.c:1.2 src/tests/lib/libc/stdio/t_printf.c:1.2.4.1
--- src/tests/lib/libc/stdio/t_printf.c:1.2 Wed Jul 13 11:17:03 2011
+++ src/tests/lib/libc/stdio/t_printf.c Sat Mar 17 17:49:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_printf.c,v 1.2 2011/07/13 11:17:03 jruoho Exp $ */
+/* $NetBSD: t_printf.c,v 1.2.4.1 2012/03/17 17:49:55 bouyer Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@ ATF_TC_HEAD(snprintf_dotzero, tc)
{
atf_tc_set_md_var(tc, descr, \
- PR lib/32951: %.0f formats (0.0,0.5] to \0.\);
+ PR lib/32951: %%.0f formats (0.0,0.5] to \0.\);
}
ATF_TC_BODY(snprintf_dotzero, tc)
Index: src/tests/lib/libc/stdio/t_scanf.c
diff -u src/tests/lib/libc/stdio/t_scanf.c:1.1 src/tests/lib/libc/stdio/t_scanf.c:1.1.4.1
--- src/tests/lib/libc/stdio/t_scanf.c:1.1 Fri Jul 8 06:38:04 2011
+++ src/tests/lib/libc/stdio/t_scanf.c Sat Mar 17 17:49:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_scanf.c,v 1.1 2011/07/08 06:38:04 jruoho Exp $ */
+/* $NetBSD: t_scanf.c,v 1.1.4.1 2012/03/17 17:49:55 bouyer Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@ ATF_TC_HEAD(sscanf_neghex, tc)
{
atf_tc_set_md_var(tc, descr, \
- PR lib/21691: %i and %x fail with negative hex numbers);
+ PR lib/21691: %%i and %%x fail with negative hex numbers);
}
ATF_TC_BODY(sscanf_neghex, tc)
CVS commit: [netbsd-6] src/lib/libc/arch/hppa/sys
Module Name:src Committed By: bouyer Date: Sat Mar 17 17:50:44 UTC 2012 Modified Files: src/lib/libc/arch/hppa/sys [netbsd-6]: brk.S sbrk.S Log Message: Pull up following revision(s) (requested by skrll in ticket #120): lib/libc/arch/hppa/sys/brk.S: revision 1.5 lib/libc/arch/hppa/sys/sbrk.S: revision 1.5 Use the _end symbol rather than the end symbol. Prevents version info problems in elflink.c for the heimdal libraries. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.8.1 src/lib/libc/arch/hppa/sys/brk.S \ src/lib/libc/arch/hppa/sys/sbrk.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/hppa/sys/brk.S diff -u src/lib/libc/arch/hppa/sys/brk.S:1.4 src/lib/libc/arch/hppa/sys/brk.S:1.4.8.1 --- src/lib/libc/arch/hppa/sys/brk.S:1.4 Tue Nov 3 05:07:25 2009 +++ src/lib/libc/arch/hppa/sys/brk.S Sat Mar 17 17:50:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: brk.S,v 1.4 2009/11/03 05:07:25 snj Exp $ */ +/* $NetBSD: brk.S,v 1.4.8.1 2012/03/17 17:50:44 bouyer Exp $ */ /* $OpenBSD: brk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */ @@ -31,11 +31,11 @@ #include SYS.h #if defined(LIBC_SCCS) !defined(lint) - RCSID($NetBSD: brk.S,v 1.4 2009/11/03 05:07:25 snj Exp $) + RCSID($NetBSD: brk.S,v 1.4.8.1 2012/03/17 17:50:44 bouyer Exp $) #endif /* LIBC_SCCS and not lint */ .import curbrk, data - .import end, data + .global _end #ifdef WEAK_ALIAS WEAK_ALIAS(brk, _brk) @@ -44,7 +44,7 @@ .data .export __minbrk, data __minbrk: - .long end + .long _end ENTRY(_brk,0) #ifdef PIC Index: src/lib/libc/arch/hppa/sys/sbrk.S diff -u src/lib/libc/arch/hppa/sys/sbrk.S:1.4 src/lib/libc/arch/hppa/sys/sbrk.S:1.4.8.1 --- src/lib/libc/arch/hppa/sys/sbrk.S:1.4 Tue Nov 3 05:07:25 2009 +++ src/lib/libc/arch/hppa/sys/sbrk.S Sat Mar 17 17:50:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: sbrk.S,v 1.4 2009/11/03 05:07:25 snj Exp $ */ +/* $NetBSD: sbrk.S,v 1.4.8.1 2012/03/17 17:50:44 bouyer Exp $ */ /* $OpenBSD: sbrk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */ @@ -31,10 +31,10 @@ #include SYS.h #if defined(LIBC_SCCS) !defined(lint) - RCSID($NetBSD: sbrk.S,v 1.4 2009/11/03 05:07:25 snj Exp $) + RCSID($NetBSD: sbrk.S,v 1.4.8.1 2012/03/17 17:50:44 bouyer Exp $) #endif /* LIBC_SCCS and not lint */ - .import end, data + .global _end #ifdef WEAK_ALIAS WEAK_ALIAS(sbrk, _sbrk) @@ -43,7 +43,7 @@ .data .export curbrk, data curbrk: - .long end + .long _end ENTRY(_sbrk,0) #ifdef PIC
CVS commit: [netbsd-6] src/lib/libcurses
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:51:48 UTC 2012
Modified Files:
src/lib/libcurses [netbsd-6]: clrtobot.c clrtoeol.c
Log Message:
Pull up following revision(s) (requested by blymn in ticket #121):
lib/libcurses/clrtoeol.c: revision 1.26
lib/libcurses/clrtobot.c: revision 1.22
PR/46049: Tim van der Molen:
clrtobot() and clrtoeol() do not set background attributes
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.8.1 src/lib/libcurses/clrtobot.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/lib/libcurses/clrtoeol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/clrtobot.c
diff -u src/lib/libcurses/clrtobot.c:1.21 src/lib/libcurses/clrtobot.c:1.21.8.1
--- src/lib/libcurses/clrtobot.c:1.21 Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/clrtobot.c Sat Mar 17 17:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: clrtobot.c,v 1.21 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: clrtobot.c,v 1.21.8.1 2012/03/17 17:51:47 bouyer Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)clrtobot.c 8.2 (Berkeley) 5/4/94;
#else
-__RCSID($NetBSD: clrtobot.c,v 1.21 2009/07/22 16:57:14 roy Exp $);
+__RCSID($NetBSD: clrtobot.c,v 1.21.8.1 2012/03/17 17:51:47 bouyer Exp $);
#endif
#endif/* not lint */
@@ -77,8 +77,8 @@ wclrtobot(WINDOW *win)
starty = win-cury;
startx = win-curx;
}
- if (__using_color win != curscr)
- attr = win-battr __COLOR;
+ if (win != curscr)
+ attr = win-battr __ATTRIBUTES;
else
attr = 0;
for (y = starty; y win-maxy; y++) {
@@ -89,12 +89,15 @@ wclrtobot(WINDOW *win)
if (sp-ch != win-bch || sp-attr != attr) {
#else
if (sp-ch != (wchar_t)btowc((int) win-bch) ||
- (sp-attr WA_ATTRIBUTES) != 0 || sp-nsp) {
+ (sp-attr WA_ATTRIBUTES) != attr || sp-nsp) {
#endif /* HAVE_WCHAR */
maxx = sp;
if (minx == -1)
minx = (int)(sp - win-alines[y]-line);
-sp-attr = attr;
+if (sp-attr __ALTCHARSET)
+ sp-attr = attr | __ALTCHARSET;
+else
+ sp-attr = attr;
#ifdef HAVE_WCHAR
sp-ch = ( wchar_t )btowc(( int ) win-bch);
if (_cursesi_copy_nsp(win-bnsp, sp) == ERR)
Index: src/lib/libcurses/clrtoeol.c
diff -u src/lib/libcurses/clrtoeol.c:1.25 src/lib/libcurses/clrtoeol.c:1.25.8.1
--- src/lib/libcurses/clrtoeol.c:1.25 Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/clrtoeol.c Sat Mar 17 17:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: clrtoeol.c,v 1.25 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: clrtoeol.c,v 1.25.8.1 2012/03/17 17:51:47 bouyer Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)clrtoeol.c 8.2 (Berkeley) 5/4/94;
#else
-__RCSID($NetBSD: clrtoeol.c,v 1.25 2009/07/22 16:57:14 roy Exp $);
+__RCSID($NetBSD: clrtoeol.c,v 1.25.8.1 2012/03/17 17:51:47 bouyer Exp $);
#endif
#endif/* not lint */
@@ -82,8 +82,8 @@ wclrtoeol(WINDOW *win)
end = win-alines[y]-line[win-maxx];
minx = -1;
maxx = win-alines[y]-line[x];
- if (__using_color win != curscr)
- attr = win-battr __COLOR;
+ if (win != curscr)
+ attr = win-battr __ATTRIBUTES;
else
attr = 0;
for (sp = maxx; sp end; sp++)
@@ -97,7 +97,7 @@ wclrtoeol(WINDOW *win)
maxx = sp;
if (minx == -1)
minx = (int) (sp - win-alines[y]-line);
- sp-attr = attr;
+ sp-attr = attr | (sp-attr __ALTCHARSET);
#ifdef HAVE_WCHAR
sp-ch = ( wchar_t )btowc(( int ) win-bch);
if (_cursesi_copy_nsp(win-bnsp, sp) == ERR)
CVS commit: [netbsd-6] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 17:53:01 UTC 2012
Modified Files:
src/sys/netinet [netbsd-6]: rfc6056.c
Log Message:
Pull up following revision(s) (requested by gson in ticket #122):
sys/netinet/rfc6056.c: revision 1.5
Fix random kernel memory corruption by algo_doublehash(). And by
random I don't mean just arbitary as in using an uninitialized
pointer, but random as in corrupting the contents of memory addresses
chosen using a crypto-strength random number generator.
I believe this is the likely cause of multiple reports of random
crashes over the last six months, including kern/45677 and kern/46096.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/netinet/rfc6056.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/netinet/rfc6056.c
diff -u src/sys/netinet/rfc6056.c:1.4 src/sys/netinet/rfc6056.c:1.4.4.1
--- src/sys/netinet/rfc6056.c:1.4 Sat Nov 19 22:51:25 2011
+++ src/sys/netinet/rfc6056.c Sat Mar 17 17:53:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rfc6056.c,v 1.4 2011/11/19 22:51:25 tls Exp $ */
+/* $NetBSD: rfc6056.c,v 1.4.4.1 2012/03/17 17:53:01 bouyer Exp $ */
/*
* Copyright 2011 Vlad Balan
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rfc6056.c,v 1.4 2011/11/19 22:51:25 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: rfc6056.c,v 1.4.4.1 2012/03/17 17:53:01 bouyer Exp $);
#include opt_inet.h
@@ -665,8 +665,9 @@ algo_doublehash(int algo, uint16_t *port
uint16_t count, num_ephemeral;
uint16_t mymin, mymax, lastport;
uint16_t *next_ephemeral;
- uint16_t offset, idx, myport;
+ uint16_t offset, myport;
static uint16_t dhtable[8];
+ size_t idx;
int error;
DPRINTF(%s called\n, __func__);
@@ -688,7 +689,7 @@ algo_doublehash(int algo, uint16_t *port
/* Ephemeral port selection function */
num_ephemeral = mymax - mymin + 1;
offset = Fhash(inp_hdr);
- idx = Fhash(inp_hdr); /* G */
+ idx = Fhash(inp_hdr) % __arraycount(dhtable); /* G */
count = num_ephemeral;
do {
CVS commit: [netbsd-6] src/sys/arch/sparc64/include
Module Name:src Committed By: bouyer Date: Sat Mar 17 17:54:22 UTC 2012 Modified Files: src/sys/arch/sparc64/include [netbsd-6]: param.h Log Message: Pull up following revision(s) (requested by martin in ticket #123): sys/arch/sparc64/include/param.h: revision 1.49 sys/arch/sparc64/include/param.h: revision 1.50 Restrict NKMEMPAGES to 2.5GB, otherwise we will run out of space in the kernel_map on machines with 8GB (or more) main memory. XXX: Moving KERNBASE/KERNEND is a better long term solution, but this allows those machines to boot now. Fix previous, which causes an integer overflow error in uvm_km.c on 32-bit kernels. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/arch/sparc64/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/include/param.h diff -u src/sys/arch/sparc64/include/param.h:1.48 src/sys/arch/sparc64/include/param.h:1.48.2.1 --- src/sys/arch/sparc64/include/param.h:1.48 Sat Feb 4 17:56:16 2012 +++ src/sys/arch/sparc64/include/param.h Sat Mar 17 17:54:22 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.48 2012/02/04 17:56:16 para Exp $ */ +/* $NetBSD: param.h,v 1.48.2.1 2012/03/17 17:54:22 bouyer Exp $ */ /* * Copyright (c) 1992, 1993 @@ -195,10 +195,12 @@ extern int nbpg, pgofset, pgshift; /* * Minimum size of the kernel kmem_arena in PAGE_SIZE-sized * logical pages. - * No enforced maximum on sparc64. + * Maximum of 2.5GB on sparc64 (it must fit into KERNEND - KERNBASE, and also + * leave space in the kernel_map for other allocations). */ #define NKMEMPAGES_MIN_DEFAULT ((64 * 1024 * 1024) PAGE_SHIFT) -#define NKMEMPAGES_MAX_UNLIMITED 1 +#undef NKMEMPAGES_MAX_UNLIMITED +#define NKMEMPAGES_MAX_DEFAULT ((2048UL * 1024 * 1024) PAGE_SHIFT) #ifdef _KERNEL #ifndef _LOCORE
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 17:55:47 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 90, 109-116, 118-123 To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.54 src/doc/CHANGES-6.0:1.1.2.55 --- src/doc/CHANGES-6.0:1.1.2.54 Thu Mar 15 08:53:56 2012 +++ src/doc/CHANGES-6.0 Sat Mar 17 17:55:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.54 2012/03/15 08:53:56 sborrill Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.55 2012/03/17 17:55:47 bouyer Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -1259,3 +1259,130 @@ usr.bin/last/want.c1.15-1.16 Fixes PR/39444. [dholland, ticket #117] +sys/dev/usb/umass_quirks.c 1.93 +sys/dev/usb/usbdevs1.610 +sys/dev/usb/usbdevs.hregen +sys/dev/usb/usbdevs_data.h regen + + Add quirk for Kingston DataTraveler 100 G2 (which apparently has + a Toshiba vendor ID) + [riz, ticket #90] + +etc/root/dot.cshrc1.23, 1.24 +etc/root/dot.profile1.26 + + Can't use Bourne shell syntax here... (Even in comments, for PKG_PATH.) + + Point first to 6.0 packages, then to packages for 5.1 or 5.0. + The latter have reduced usefullness in -current or netbsd-6 until + we have a compat50 package. + [he, ticket #109] + +external/bsd/pcc/dist/pcc/cc/ccom/gcc_compat.c 1.2 +external/bsd/pcc/dist/pcc/cc/ccom/pass1.h 1.2 + + recognise (but ignore) the __returns_twice__ GCC attribute + [plunky, ticket #110] + +sys/dev/pci/hdaudio/hdafg.c 1.16 + + call kmem_free with the right address in hdafg_detach for sc_widgets + the former code let to memory corruption + [lars, ticket #111] + +gnu/dist/groff/contrib/mm/groff_mmse.man 1.2, 1.3 +gnu/dist/groff/mdate.sh1.2 + + use character escapes for non-ASCII chars, according to mandoc_char(7) + format the generated manpage date as per Dd macro, for consistency + [plunky, ticket #112] + +sys/uvm/uvm_km.c1.123 + + uvm_km_kmem_alloc: return ENOMEM on failure in PMAP_MAP_POOLPAGE case. + [chs, ticket #113] + +sys/arch/hppa/hppa/trap.c 1.99 +sys/arch/hppa/hppa/vm_machdep.c 1.51, 1.52 + + Deal with setting of space registers and protection ids for posix_spawn. + Thanks to martin for the help. + [skrll, ticket #114] + +usr.bin/ktruss/makeerrnos.sh 1.6 + + Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more + portable. The latter is not supported by Mac OS X Lion. + [dyoung, ticket #115] + +sbin/newfs_lfs/make_lfs.c 1.19 +sys/ufs/lfs/lfs.h1.136 +sys/ufs/lfs/lfs_alloc.c1.112 +sys/ufs/lfs/lfs_bio.c1.122 +sys/ufs/lfs/lfs_segment.c 1.224 +sys/ufs/lfs/lfs_vfsops.c 1.294 +sys/ufs/lfs/lfs_vnops.c1.240 +tests/fs/vfs/t_renamerace.c 1.25 +tests/fs/vfs/t_rmdirrace.c 1.9 + + Pass t_renamerace and t_rmdirrace tests. + + Adapt dholland@'s fix to ufs_rename to fix PR kern/43582. + Address several other MP locking issues discovered during the + course of investigating the same problem. + + Fix PR kern/45982 by deemphasizing the estimate of how much metadata + will fill the empty space on disk when the disk is nearly empty + (t_renamerace crates a lot of inode blocks on a tiny empty disk). + [perseant, ticket #116] + +external/bsd/iscsi/dist/include/iscsiutil.h 1.4 +external/bsd/iscsi/dist/src/lib/conffile.c 1.3 +external/bsd/iscsi/dist/src/lib/disk.c 1.7 +external/bsd/iscsi/dist/src/lib/initiator.c 1.8 +external/bsd/iscsi/dist/src/lib/parameters.c 1.3 +external/bsd/iscsi/dist/src/lib/protocol.c 1.3 +external/bsd/iscsi/dist/src/lib/util.c 1.3 + + Add __printflike where needed. Fix various format string issues. + [joerg, ticket #118] + +tests/lib/libc/gen/t_humanize_number.c 1.6 +tests/lib/libc/stdio/t_printf.c 1.5 +tests/lib/libc/stdio/t_scanf.c 1.2 + + Mark w_printf as __printflike and fix a format string error. + Fix format strings to properly quote %. + [joerg, ticket #119] + +lib/libc/arch/hppa/sys/brk.S 1.5 +lib/libc/arch/hppa/sys/sbrk.S 1.5 + + Use the _end symbol rather than the end symbol. Prevents version info + problems in elflink.c for the heimdal libraries. + [skrll, ticket #120] + +lib/libcurses/clrtobot.c 1.22 +lib/libcurses/clrtoeol.c 1.26 + + PR/46049: Tim van der Molen: + clrtobot() and clrtoeol() do not set background attributes + [blymn, ticket #121] + +sys/netinet/rfc6056.c1.5 + + Fix random kernel memory corruption by algo_doublehash(). And by + random I don't mean just arbitary as in using an uninitialized + pointer, but random as in corrupting the contents of memory addresses + chosen using a crypto-strength random number generator. + + I believe this is the likely cause of multiple reports of random + crashes over the last six months, including kern/45677 and kern/46096. + [gson, ticket #122] +
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: hannken Date: Sat Mar 17 17:58:38 UTC 2012 Modified Files: src/sys/rump/librump/rumpkern: vm.c Log Message: Don't take a mutex we already took 6 lines above. To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/sys/rump/librump/rumpkern/vm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpkern/vm.c diff -u src/sys/rump/librump/rumpkern/vm.c:1.124 src/sys/rump/librump/rumpkern/vm.c:1.125 --- src/sys/rump/librump/rumpkern/vm.c:1.124 Mon Mar 5 13:43:56 2012 +++ src/sys/rump/librump/rumpkern/vm.c Sat Mar 17 17:58:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vm.c,v 1.124 2012/03/05 13:43:56 para Exp $ */ +/* $NetBSD: vm.c,v 1.125 2012/03/17 17:58:38 hannken Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.124 2012/03/05 13:43:56 para Exp $); +__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.125 2012/03/17 17:58:38 hannken Exp $); #include sys/param.h #include sys/atomic.h @@ -1110,7 +1110,6 @@ uvm_pageout(void *arg) rumpuser_dprintf(pagedaemoness: failed to reclaim memory ... sleeping (deadlock?)\n); cv_timedwait(pdaemoncv, pdaemonmtx, hz); - mutex_enter(pdaemonmtx); } }
CVS commit: src/lib/libc/cdb
Module Name:src Committed By: christos Date: Sat Mar 17 17:59:58 UTC 2012 Modified Files: src/lib/libc/cdb: Makefile.inc Log Message: hack to silence lint To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/cdb/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/lib/libc/cdb/Makefile.inc diff -u src/lib/libc/cdb/Makefile.inc:1.1 src/lib/libc/cdb/Makefile.inc:1.2 --- src/lib/libc/cdb/Makefile.inc:1.1 Sat Apr 24 20:54:46 2010 +++ src/lib/libc/cdb/Makefile.inc Sat Mar 17 13:59:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2010/04/25 00:54:46 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.2 2012/03/17 17:59:58 christos Exp $ # Constant database reader/writer @@ -19,3 +19,6 @@ MLINKS+= cdbw.3 cdbw_put_data.3 MLINKS+= cdbw.3 cdbw_put_key.3 MLINKS+= cdbw.3 cdbw_output.3 MLINKS+= cdbw.3 cdbw_close.3 + +# XXX: Fix the code instead +LINTFLAGS.cdbw.c += -X 132,259,298
CVS commit: src/tests/rump/rumpkern
Module Name:src
Committed By: hannken
Date: Sat Mar 17 18:00:29 UTC 2012
Modified Files:
src/tests/rump/rumpkern: t_vm.c
Log Message:
Starting with Rev. 1.191 of kern/subr_pool.c a pool has to be inactive
for at least 10 seconds before it can be reclaimed.
Change the uvmwait test timeout from 10 to 30 seconds so it has a chance
to reclaim memory and succeed.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/rump/rumpkern/t_vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/rumpkern/t_vm.c
diff -u src/tests/rump/rumpkern/t_vm.c:1.2 src/tests/rump/rumpkern/t_vm.c:1.3
--- src/tests/rump/rumpkern/t_vm.c:1.2 Mon Jun 14 21:06:09 2010
+++ src/tests/rump/rumpkern/t_vm.c Sat Mar 17 18:00:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vm.c,v 1.2 2010/06/14 21:06:09 pooka Exp $ */
+/* $NetBSD: t_vm.c,v 1.3 2012/03/17 18:00:28 hannken Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@ ATF_TC_HEAD(uvmwait, tc)
{
atf_tc_set_md_var(tc, descr, Tests that uvm_wait works);
- atf_tc_set_md_var(tc, timeout, 10);
+ atf_tc_set_md_var(tc, timeout, 30);
}
#define UVMWAIT_LIMIT 1024*1024
CVS commit: src/lib/libc
Module Name:src Committed By: christos Date: Sat Mar 17 18:00:50 UTC 2012 Modified Files: src/lib/libc: Makefile.inc Log Message: make lint exit on warnings To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/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/lib/libc/Makefile.inc diff -u src/lib/libc/Makefile.inc:1.11 src/lib/libc/Makefile.inc:1.12 --- src/lib/libc/Makefile.inc:1.11 Tue Mar 13 18:37:51 2012 +++ src/lib/libc/Makefile.inc Sat Mar 17 14:00:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.11 2012/03/13 22:37:51 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.12 2012/03/17 18:00:50 christos Exp $ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # # All library objects contain sccsid strings by default; they may be @@ -41,7 +41,7 @@ CPPFLAGS+= -DYP .endif # Set lint to exit on warnings -#LINTFLAGS+= -w +LINTFLAGS+= -w # ignore 'empty translation unit' warnings. LINTFLAGS+= -X 272
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sat Mar 17 18:02:41 UTC 2012
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
allow file-specific lint flag additions
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/share/mk/bsd.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/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.213 src/share/mk/bsd.sys.mk:1.214
--- src/share/mk/bsd.sys.mk:1.213 Thu Mar 15 11:04:23 2012
+++ src/share/mk/bsd.sys.mk Sat Mar 17 14:02:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.213 2012/03/15 15:04:23 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.214 2012/03/17 18:02:41 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -199,7 +199,7 @@ STRIP?= strip
.c.ln:
${_MKTARGET_COMPILE}
- ${LINT} ${LINTFLAGS} \
+ ${LINT} ${LINTFLAGS} ${LINTFLAGS.${.IMPSRC:T}} \
${CPPFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
${CPPFLAGS.${.IMPSRC:T}:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
-i ${.IMPSRC}
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 18:29:40 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1724 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 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.145 src/doc/CHANGES-5.2:1.1.2.146 --- src/doc/CHANGES-5.2:1.1.2.145 Thu Mar 15 08:50:59 2012 +++ src/doc/CHANGES-5.2 Sat Mar 17 18:29:40 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.145 2012/03/15 08:50:59 sborrill Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.146 2012/03/17 18:29:40 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6090,3 +6090,47 @@ usr.bin/last/want.c1.15-1.16 Fixes PR/39444. [dholland, ticket #1744] +distrib/sets/lists/comp/mi 1.1512 via patch +include/link_elf.h1.10 via patch +lib/libc/dlfcn/dlfcn_elf.c 1.7 via patch +libexec/ld.elf_so/Makefile 1.94 - 1.96 via patch +libexec/ld.elf_so/arch/alpha/alpha_reloc.c 1.34, 1.35 via patch +libexec/ld.elf_so/arch/arm/mdreloc.c 1.31 - 1.33 via patch +libexec/ld.elf_so/arch/hppa/hppa_reloc.c 1.31, 1.32 via patch +libexec/ld.elf_so/arch/i386/mdreloc.c 1.29, 1.30 via patch +libexec/ld.elf_so/arch/m68k/mdreloc.c 1.25 via patch +libexec/ld.elf_so/arch/mips/mips_reloc.c 1.57, 1.58 via patch +libexec/ld.elf_so/arch/powerpc/ppc_reloc.c 1.44 via patch +libexec/ld.elf_so/arch/sh3/mdreloc.c 1.27 via patch +libexec/ld.elf_so/arch/sparc/mdreloc.c 1.43 via patch +libexec/ld.elf_so/arch/sparc64/mdreloc.c 1.46 via patch +libexec/ld.elf_so/arch/vax/mdreloc.c 1.26 via patch +libexec/ld.elf_so/arch/x86_64/mdreloc.c 1.36, 1.37 via patch +libexec/ld.elf_so/headers.c 1.36 via patch +libexec/ld.elf_so/load.c 1.37, 1.38 via patch +libexec/ld.elf_so/map_object.c 1.41 via patch +libexec/ld.elf_so/reloc.c 1.98 via patch +libexec/ld.elf_so/rtld.c 1.129 - 1.131 via patch +libexec/ld.elf_so/rtld.h 1.84, 1.89, 1.90, 1.95 via patch +libexec/ld.elf_so/symbol.c 1.50 - 1.52, 1.54 via patch +rescue/list.ldd 1.4 via patch +share/man/man3/Makefile1.56 via patch +share/man/man3/dl_iterate_phdr.3 1.1 via patch +sys/sys/exec_elf.h1.106 via patch +usr.bin/ldd/ldd.c1.15 via patch + + PR/39240: Satoshi Suetake: Don't fail when attempting to resolve + weak symbols when we are doing immediate binding, leave them alone + and they will be dealt with later during lazy binding. From skrll@ + + Implement negative cache checks for symbol lookups. + Uses the Donelist idea from FreeBSD. + + Use alloca(3) instead of local xmalloc for creating our DoneLists. + This allows threaded programs to use us a little better, PR lib/43005. + We need to disable SSP when using alloca. + + Implement dl_iterate_phdr. + Somewhat taken from FreeBSD. Manual page from OpenBSD. + [skrll, ticket #1724] +
CVS commit: [netbsd-5] src/sys/arch/x68k/stand
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:38:57 UTC 2012
Modified Files:
src/sys/arch/x68k/stand [netbsd-5]: Makefile.booters
src/sys/arch/x68k/stand/boot [netbsd-5]: version
src/sys/arch/x68k/stand/boot_ufs [netbsd-5]: Makefile
src/sys/arch/x68k/stand/boot_ustar [netbsd-5]: Makefile
src/sys/arch/x68k/stand/libsa [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1731):
sys/arch/x68k/stand/boot_ufs/Makefile: revision 1.26 via patch
sys/arch/x68k/stand/boot/version: revision 1.4 via patch
sys/arch/x68k/stand/libsa/Makefile: revision 1.27 via patch
sys/arch/x68k/stand/Makefile.booters: revision 1.7 via patch
sys/arch/x68k/stand/boot_ustar/Makefile: revision 1.19 via patch
Fix Error occurs, please reset boot problem on
X68030 + 060turbo in 060 mode, found on NetBSD booth
at OSC 2011 Hiroshima:
- use -D__daddr_t=int32_t for all bootloader files
to avoid 64 bit ops in FFS
- explicitly specify -m68020-60 to avoid 64 bit mulsl/mulul
instructions which need to be handled by 060SP emulation
but not available in 060turbo IPL ROM
(LFS still has uint64_t members even with 32bit daddr_t)
The problem was investigated (at least 1.6.2 bootloaders worked)
by Yasushi Oshima at OSC booth, and fixes have been confirmed
by Y.Sugahara on his 060turbo. Thanks everyone!
Should also be pulled up to netbsd-5.
Bump version to denote 060turbo boot fix.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.88.1 src/sys/arch/x68k/stand/Makefile.booters
cvs rdiff -u -r1.2 -r1.2.136.1 src/sys/arch/x68k/stand/boot/version
cvs rdiff -u -r1.23 -r1.23.4.1 src/sys/arch/x68k/stand/boot_ufs/Makefile
cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/arch/x68k/stand/boot_ustar/Makefile
cvs rdiff -u -r1.22 -r1.22.28.1 src/sys/arch/x68k/stand/libsa/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/x68k/stand/Makefile.booters
diff -u src/sys/arch/x68k/stand/Makefile.booters:1.4 src/sys/arch/x68k/stand/Makefile.booters:1.4.88.1
--- src/sys/arch/x68k/stand/Makefile.booters:1.4 Sun Dec 11 12:19:44 2005
+++ src/sys/arch/x68k/stand/Makefile.booters Sat Mar 17 18:38:57 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.4 2005/12/11 12:19:44 christos Exp $
+# $NetBSD: Makefile.booters,v 1.4.88.1 2012/03/17 18:38:57 bouyer Exp $
S?= ${.CURDIR}/../../../..
@@ -6,6 +6,8 @@ S?= ${.CURDIR}/../../../..
CFLAGS+= -ffreestanding
+CPPFLAGS+= -D__daddr_t=int32_t
+
machine-links:
-rm -f machine \
ln -s $S/arch/${MACHINE}/include machine
Index: src/sys/arch/x68k/stand/boot/version
diff -u src/sys/arch/x68k/stand/boot/version:1.2 src/sys/arch/x68k/stand/boot/version:1.2.136.1
--- src/sys/arch/x68k/stand/boot/version:1.2 Fri Nov 9 19:53:16 2001
+++ src/sys/arch/x68k/stand/boot/version Sat Mar 17 18:38:56 2012
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.2 2001/11/09 19:53:16 scw Exp $
+$NetBSD: version,v 1.2.136.1 2012/03/17 18:38:56 bouyer Exp $
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important - make sure the entries are appended on end, last item
@@ -7,3 +7,4 @@ is taken as the current.
0.3: xxboot, ancient monolithic bootstrap program.
1.0: Initial version of the libsa-based bootstrap loader.
1.1: loadfile() update to avoid backwards seeks for ELF Program Headers.
+1.1.1: Avoid exception on 68060 in UFS ops.
Index: src/sys/arch/x68k/stand/boot_ufs/Makefile
diff -u src/sys/arch/x68k/stand/boot_ufs/Makefile:1.23 src/sys/arch/x68k/stand/boot_ufs/Makefile:1.23.4.1
--- src/sys/arch/x68k/stand/boot_ufs/Makefile:1.23 Sat Oct 25 22:27:38 2008
+++ src/sys/arch/x68k/stand/boot_ufs/Makefile Sat Mar 17 18:38:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/10/25 22:27:38 apb Exp $
+# $NetBSD: Makefile,v 1.23.4.1 2012/03/17 18:38:56 bouyer Exp $
NOMAN= # defined
@@ -37,12 +37,13 @@ vers.c: ${VERSIONFILE}
${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
CFLAGS= -Os -fomit-frame-pointer
+CFLAGS+= -m68020-60
CFLAGS+= -W -Wall -Wstrict-prototypes -Wmissing-prototypes
CPPFLAGS+= -DTEXTADDR=0x$(TEXT) -DBOOT_TEXTADDR=0x$(BOOT_TEXT)
CPPFLAGS+= -DBOOT=\$(BOOT)\ -DBOOT_VERS=\$(VERSION)\
CPPFLAGS+= -DSCSI_ADHOC_BOOTPART
#CPPFLAGS+= -DBOOT_DEBUG
-CPPFLAGS+= -DUSE_FFS -DUSE_LFS -DUSE_UFS1 -DUSE_UFS2 -D__daddr_t=int32_t
+CPPFLAGS+= -DUSE_FFS -DUSE_LFS -DUSE_UFS1 -DUSE_UFS2
CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS} -I${S} -I. -D_STANDALONE
AFLAGS= ${CFLAGS:M-[ID]*}
.if ${OBJECT_FMT} == ELF
Index: src/sys/arch/x68k/stand/boot_ustar/Makefile
diff -u src/sys/arch/x68k/stand/boot_ustar/Makefile:1.15 src/sys/arch/x68k/stand/boot_ustar/Makefile:1.15.4.1
--- src/sys/arch/x68k/stand/boot_ustar/Makefile:1.15 Sat Oct 25 22:27:38 2008
+++ src/sys/arch/x68k/stand/boot_ustar/Makefile Sat Mar 17 18:38:57 2012
@@ -1,4 +1,4
CVS commit: [netbsd-5] src/sys/arch/x68k/dev
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:40:20 UTC 2012
Modified Files:
src/sys/arch/x68k/dev [netbsd-5]: kbd.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1732):
sys/arch/x68k/dev/kbd.c: revision 1.37
Calling psignal(9) (via EV_WAKEUP()) in interrupt handlers
could cause mutex error panic, so defer it via softint(9).
This should fix panic on heavy key strokes during running Xserver.
Should be pulled up to netbsd-5.
XXX: amiga and atari might have the similar problem?
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.6.1 src/sys/arch/x68k/dev/kbd.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/kbd.c
diff -u src/sys/arch/x68k/dev/kbd.c:1.35 src/sys/arch/x68k/dev/kbd.c:1.35.6.1
--- src/sys/arch/x68k/dev/kbd.c:1.35 Wed Jun 25 08:14:59 2008
+++ src/sys/arch/x68k/dev/kbd.c Sat Mar 17 18:40:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.35 2008/06/25 08:14:59 isaki Exp $ */
+/* $NetBSD: kbd.c,v 1.35.6.1 2012/03/17 18:40:20 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kbd.c,v 1.35 2008/06/25 08:14:59 isaki Exp $);
+__KERNEL_RCSID(0, $NetBSD: kbd.c,v 1.35.6.1 2012/03/17 18:40:20 bouyer Exp $);
#include ite.h
#include bell.h
@@ -350,7 +350,7 @@ kbdintr(void *arg)
fe-value = KEY_UP(c) ? VKEY_UP : VKEY_DOWN;
getmicrotime(fe-time);
sc-sc_events.ev_put = put;
- EV_WAKEUP(sc-sc_events);
+ softint_schedule(sc-sc_softintr_cookie);
return 0;
}
@@ -358,10 +358,14 @@ kbdintr(void *arg)
void
kbdsoftint(void *arg) /* what if ite is not configured? */
{
+ struct kbd_softc *sc = arg;
int s;
s = spltty();
+ if (sc-sc_event_mode)
+ EV_WAKEUP(sc-sc_events);
+
while(kbdgetoff kbdputoff)
ite_filter(kbdbuf[kbdgetoff++ KBDBUFMASK]);
kbdgetoff = kbdputoff = 0;
CVS commit: [netbsd-5] src/usr.sbin/cpuctl/arch
Module Name:src Committed By: bouyer Date: Sat Mar 17 18:41:16 UTC 2012 Modified Files: src/usr.sbin/cpuctl/arch [netbsd-5]: i386.c Log Message: Pull up following revision(s) (requested by sborrill in ticket #1735): usr.sbin/cpuctl/arch/i386.c: revision 1.29 Print CPU stepping level To generate a diff of this commit: cvs rdiff -u -r1.13.2.4 -r1.13.2.5 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/cpuctl/arch/i386.c diff -u src/usr.sbin/cpuctl/arch/i386.c:1.13.2.4 src/usr.sbin/cpuctl/arch/i386.c:1.13.2.5 --- src/usr.sbin/cpuctl/arch/i386.c:1.13.2.4 Sun Oct 4 00:16:53 2009 +++ src/usr.sbin/cpuctl/arch/i386.c Sat Mar 17 18:41:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.13.2.4 2009/10/04 00:16:53 snj Exp $ */ +/* $NetBSD: i386.c,v 1.13.2.5 2012/03/17 18:41:15 bouyer Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: i386.c,v 1.13.2.4 2009/10/04 00:16:53 snj Exp $); +__RCSID($NetBSD: i386.c,v 1.13.2.5 2012/03/17 18:41:15 bouyer Exp $); #endif /* not lint */ #include sys/types.h @@ -1498,9 +1498,10 @@ identifycpu(const char *cpuname) #endif aprint_normal_dev(ci-ci_dev, family %02x model %02x - extfamily %02x extmodel %02x\n, CPUID2FAMILY(ci-ci_signature), - CPUID2MODEL(ci-ci_signature), CPUID2EXTFAMILY(ci-ci_signature), - CPUID2EXTMODEL(ci-ci_signature)); + extfamily %02x extmodel %02x stepping %02x\n, + CPUID2FAMILY(ci-ci_signature), CPUID2MODEL(ci-ci_signature), + CPUID2EXTFAMILY(ci-ci_signature), CPUID2EXTMODEL(ci-ci_signature), + CPUID2STEPPING(ci-ci_signature)); } static const char *
CVS commit: [netbsd-5] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:44:08 UTC 2012
Modified Files:
src/doc [netbsd-5]: HACKS
src/sys/arch/sparc64/conf [netbsd-5]: Makefile.sparc64 files.sparc64
src/sys/arch/sparc64/sparc64 [netbsd-5]: locore.s
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1736):
sys/arch/sparc64/conf/Makefile.sparc64: revision 1.71
doc/HACKS: revision 1.123
sys/arch/sparc64/conf/files.sparc64: revision 1.138
sys/arch/sparc64/sparc64/locore.s: revision 1.340
Fix the root cause of the hack disable optimizations for uvm_bio.c
on 32 bit kernels.
gcc converts a division in the calculation of UBC_UMAP_ADDR macro
to multiplication (smul or combination of add/sll), and the
register of its result contains a garbage in upper 32 bits (the
upper 32 bits of smul/add/sll's result isn't zero cleared).
Then it passes to pseg_get{,_real} through pmap_extract without the
zero clear of upper 32 bits in the optimization case. So the
result of pseg_get and pmap_extact sometimes gets screwed up.
The hack has been resolved in the revision 1.340 of
sys/arch/sparc64/sparc64/locore.s.
To generate a diff of this commit:
cvs rdiff -u -r1.110.2.2 -r1.110.2.3 src/doc/HACKS
cvs rdiff -u -r1.67.4.1 -r1.67.4.2 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.118.20.1 -r1.118.20.2 \
src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.286.2.2 -r1.286.2.3 src/sys/arch/sparc64/sparc64/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/doc/HACKS
diff -u src/doc/HACKS:1.110.2.2 src/doc/HACKS:1.110.2.3
--- src/doc/HACKS:1.110.2.2 Sat Dec 6 21:27:36 2008
+++ src/doc/HACKS Sat Mar 17 18:44:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.110.2.2 2008/12/06 21:27:36 snj Exp $
+# $NetBSD: HACKS,v 1.110.2.3 2012/03/17 18:44:07 bouyer Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -542,18 +542,6 @@ port m68000
kcah
-port sparc64
-
- hack disable optimzations for uvm_bio.c on 32 bit kernels
- cdate Sun Mar 21 14:14:04 MET 2004
- who martin
- file sys/arch/sparc64/conf/Makefile.sparc64 : 1.53-1.54
- file sys/arch/sparc64/conf/files.sparc64 : 1.93
- descr
- The sparc compiler miscompiles uvm_bio.c when using
- any optimization. This results in ubc_release panics.
- kcah
-
port mips
hack mips-shared-linker-load-address
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.4.1 src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.4.2
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.4.1 Fri Aug 7 18:33:48 2009
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 17 18:44:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.67.4.1 2009/08/07 18:33:48 snj Exp $
+# $NetBSD: Makefile.sparc64,v 1.67.4.2 2012/03/17 18:44:07 bouyer Exp $
#=
#
@@ -57,7 +57,6 @@ CPPFLAGS+= -Dsparc64 -D__sparc64__
# 64-bit kernels
CPPFLAGS+= -D_LP64 -Wa,-Av9a
AFLAGS+= -Wa,-Av9a
-CC_NOOPT= ${NORMAL_C}
.if defined(PROF)
# Profiling is only supported in the medium low memory model.
CFLAGS+= -mcmodel=medlow
@@ -69,10 +68,6 @@ CFLAGS+= -mcmodel=medlow
# 32-bit kernels
CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultrasparc
AFLAGS+= -Wa,-Av8plusa
-# XXX
-# The sparc gcc version 3.3.3 (NetBSD nb1 20040301) does not compile this
-# file properly with higher optimizations
-CC_NOOPT= ${NORMAL_C:C/-O./-O0/}
.endif
CFLAGS+= -mno-fpu
AFLAGS+= -x assembler-with-cpp -traditional-cpp
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.118.20.1 src/sys/arch/sparc64/conf/files.sparc64:1.118.20.2
--- src/sys/arch/sparc64/conf/files.sparc64:1.118.20.1 Fri Oct 16 11:56:10 2009
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 17 18:44:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.118.20.1 2009/10/16 11:56:10 sborrill Exp $
+# $NetBSD: files.sparc64,v 1.118.20.2 2012/03/17 18:44:07 bouyer Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -251,8 +251,5 @@ file dev/md_root.c memory_disk_hooks
include arch/sparc64/conf/majors.sparc64
-# special compiler settings (no optimization if 32bit kernel)
-file uvm/uvm_bio.c compile-with ${CC_NOOPT}
-
# OpenFirmware convenience stuff
file dev/ofw/ofw_subr.c
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.286.2.2 src/sys/arch/sparc64/sparc64/locore.s:1.286.2.3
--- src/sys/arch/sparc64/sparc64/locore.s:1.286.2.2 Wed Mar 17 03:10:39 2010
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Mar 17 18:44:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.286.2.2 2010/03/17 03:10:39 snj Exp $ */
+/* $NetBSD: locore.s,v 1.286.2.3 2012/03/17 18:44:07 bouyer Exp $ */
/*
* Copyright (c)
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:45:10 UTC 2012
Modified Files:
src/doc [netbsd-5-0]: HACKS
src/sys/arch/sparc64/conf [netbsd-5-0]: Makefile.sparc64 files.sparc64
src/sys/arch/sparc64/sparc64 [netbsd-5-0]: locore.s
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1736):
sys/arch/sparc64/conf/Makefile.sparc64: revision 1.71
doc/HACKS: revision 1.123
sys/arch/sparc64/conf/files.sparc64: revision 1.138
sys/arch/sparc64/sparc64/locore.s: revision 1.340
Fix the root cause of the hack disable optimizations for uvm_bio.c
on 32 bit kernels.
gcc converts a division in the calculation of UBC_UMAP_ADDR macro
to multiplication (smul or combination of add/sll), and the
register of its result contains a garbage in upper 32 bits (the
upper 32 bits of smul/add/sll's result isn't zero cleared).
Then it passes to pseg_get{,_real} through pmap_extract without the
zero clear of upper 32 bits in the optimization case. So the
result of pseg_get and pmap_extact sometimes gets screwed up.
The hack has been resolved in the revision 1.340 of
sys/arch/sparc64/sparc64/locore.s.
To generate a diff of this commit:
cvs rdiff -u -r1.110.2.2 -r1.110.2.2.2.1 src/doc/HACKS
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.118 -r1.118.22.1 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.286.6.1 -r1.286.6.2 src/sys/arch/sparc64/sparc64/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/doc/HACKS
diff -u src/doc/HACKS:1.110.2.2 src/doc/HACKS:1.110.2.2.2.1
--- src/doc/HACKS:1.110.2.2 Sat Dec 6 21:27:36 2008
+++ src/doc/HACKS Sat Mar 17 18:45:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.110.2.2 2008/12/06 21:27:36 snj Exp $
+# $NetBSD: HACKS,v 1.110.2.2.2.1 2012/03/17 18:45:09 bouyer Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -542,18 +542,6 @@ port m68000
kcah
-port sparc64
-
- hack disable optimzations for uvm_bio.c on 32 bit kernels
- cdate Sun Mar 21 14:14:04 MET 2004
- who martin
- file sys/arch/sparc64/conf/Makefile.sparc64 : 1.53-1.54
- file sys/arch/sparc64/conf/files.sparc64 : 1.93
- descr
- The sparc compiler miscompiles uvm_bio.c when using
- any optimization. This results in ubc_release panics.
- kcah
-
port mips
hack mips-shared-linker-load-address
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.67 src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.8.1
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.67 Sat Aug 30 13:23:55 2008
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 17 18:45:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.67 2008/08/30 13:23:55 martin Exp $
+# $NetBSD: Makefile.sparc64,v 1.67.8.1 2012/03/17 18:45:09 bouyer Exp $
#=
#
@@ -57,7 +57,6 @@ CPPFLAGS+= -Dsparc64 -D__sparc64__
# 64-bit kernels
CPPFLAGS+= -D_LP64 -Wa,-Av9a
AFLAGS+= -Wa,-Av9a
-CC_NOOPT= ${NORMAL_C}
.if defined(PROF)
# Profiling is only supported in the medium low memory model.
CFLAGS+= -mcmodel=medlow
@@ -69,10 +68,6 @@ CFLAGS+= -mcmodel=medlow
# 32-bit kernels
CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultrasparc
AFLAGS+= -Wa,-Av8plusa
-# XXX
-# The sparc gcc version 3.3.3 (NetBSD nb1 20040301) does not compile this
-# file properly with higher optimizations
-CC_NOOPT= ${NORMAL_C:C/-O./-O0/}
.endif
CFLAGS+= -mno-fpu
AFLAGS+= -x assembler-with-cpp -traditional-cpp
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.118 src/sys/arch/sparc64/conf/files.sparc64:1.118.22.1
--- src/sys/arch/sparc64/conf/files.sparc64:1.118 Wed Feb 20 21:43:35 2008
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 17 18:45:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.118 2008/02/20 21:43:35 drochner Exp $
+# $NetBSD: files.sparc64,v 1.118.22.1 2012/03/17 18:45:09 bouyer Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -247,8 +247,5 @@ file dev/md_root.c memory_disk_hooks
include arch/sparc64/conf/majors.sparc64
-# special compiler settings (no optimization if 32bit kernel)
-file uvm/uvm_bio.c compile-with ${CC_NOOPT}
-
# OpenFirmware convenience stuff
file dev/ofw/ofw_subr.c
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.286.6.1 src/sys/arch/sparc64/sparc64/locore.s:1.286.6.2
--- src/sys/arch/sparc64/sparc64/locore.s:1.286.6.1 Fri Jun 5 18:29:46 2009
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Mar 17 18:45:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.286.6.1 2009/06/05 18:29:46 snj Exp $ */
+/* $NetBSD: locore.s,v 1.286.6.2 2012/03/17 18:45:10 bouyer Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo
CVS commit: [netbsd-5-0] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:45:46 UTC 2012
Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.3
Log Message:
ticket 1736
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-5.0.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.0.3
diff -u src/doc/CHANGES-5.0.3:1.1.2.64 src/doc/CHANGES-5.0.3:1.1.2.65
--- src/doc/CHANGES-5.0.3:1.1.2.64 Fri Mar 2 17:44:01 2012
+++ src/doc/CHANGES-5.0.3 Sat Mar 17 18:45:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.3,v 1.1.2.64 2012/03/02 17:44:01 riz Exp $
+# $NetBSD: CHANGES-5.0.3,v 1.1.2.65 2012/03/17 18:45:45 bouyer Exp $
A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3
release:
@@ -2962,3 +2962,21 @@ share/zoneinfo/zone.tabpatch
Update to tzdata2012b.
[apb, ticket #1734]
+doc/HACKS 1.123 via patch
+sys/arch/sparc64/conf/Makefile.sparc64 1.71 via patch
+sys/arch/sparc64/conf/files.sparc64 1.138 via patch
+sys/arch/sparc64/sparc64/locore.s 1.340 via patch
+
+ Fix the root cause of the hack disable optimizations for uvm_bio.c
+ on 32 bit kernels.
+
+ gcc converts a division in the calculation of UBC_UMAP_ADDR macro
+ to multiplication (smul or combination of add/sll), and the
+ register of its result contains a garbage in upper 32 bits (the
+ upper 32 bits of smul/add/sll's result isn't zero cleared).
+
+ Then it passes to pseg_get{,_real} through pmap_extract without the
+ zero clear of upper 32 bits in the optimization case. So the
+ result of pseg_get and pmap_extact sometimes gets screwed up.
+ [nakayama, ticket #1736]
+
CVS commit: [netbsd-5-1] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:46:30 UTC 2012
Modified Files:
src/doc [netbsd-5-1]: HACKS
src/sys/arch/sparc64/conf [netbsd-5-1]: Makefile.sparc64 files.sparc64
src/sys/arch/sparc64/sparc64 [netbsd-5-1]: locore.s
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1736):
sys/arch/sparc64/conf/Makefile.sparc64: revision 1.71
doc/HACKS: revision 1.123
sys/arch/sparc64/conf/files.sparc64: revision 1.138
sys/arch/sparc64/sparc64/locore.s: revision 1.340
Fix the root cause of the hack disable optimizations for uvm_bio.c
on 32 bit kernels.
gcc converts a division in the calculation of UBC_UMAP_ADDR macro
to multiplication (smul or combination of add/sll), and the
register of its result contains a garbage in upper 32 bits (the
upper 32 bits of smul/add/sll's result isn't zero cleared).
Then it passes to pseg_get{,_real} through pmap_extract without the
zero clear of upper 32 bits in the optimization case. So the
result of pseg_get and pmap_extact sometimes gets screwed up.
The hack has been resolved in the revision 1.340 of
sys/arch/sparc64/sparc64/locore.s.
To generate a diff of this commit:
cvs rdiff -u -r1.110.2.2 -r1.110.2.2.6.1 src/doc/HACKS
cvs rdiff -u -r1.67.4.1 -r1.67.4.1.2.1 \
src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.118.20.1 -r1.118.20.1.2.1 \
src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.286.2.2 -r1.286.2.2.2.1 \
src/sys/arch/sparc64/sparc64/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/doc/HACKS
diff -u src/doc/HACKS:1.110.2.2 src/doc/HACKS:1.110.2.2.6.1
--- src/doc/HACKS:1.110.2.2 Sat Dec 6 21:27:36 2008
+++ src/doc/HACKS Sat Mar 17 18:46:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.110.2.2 2008/12/06 21:27:36 snj Exp $
+# $NetBSD: HACKS,v 1.110.2.2.6.1 2012/03/17 18:46:29 bouyer Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -542,18 +542,6 @@ port m68000
kcah
-port sparc64
-
- hack disable optimzations for uvm_bio.c on 32 bit kernels
- cdate Sun Mar 21 14:14:04 MET 2004
- who martin
- file sys/arch/sparc64/conf/Makefile.sparc64 : 1.53-1.54
- file sys/arch/sparc64/conf/files.sparc64 : 1.93
- descr
- The sparc compiler miscompiles uvm_bio.c when using
- any optimization. This results in ubc_release panics.
- kcah
-
port mips
hack mips-shared-linker-load-address
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.4.1 src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.4.1.2.1
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.4.1 Fri Aug 7 18:33:48 2009
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 17 18:46:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.67.4.1 2009/08/07 18:33:48 snj Exp $
+# $NetBSD: Makefile.sparc64,v 1.67.4.1.2.1 2012/03/17 18:46:29 bouyer Exp $
#=
#
@@ -57,7 +57,6 @@ CPPFLAGS+= -Dsparc64 -D__sparc64__
# 64-bit kernels
CPPFLAGS+= -D_LP64 -Wa,-Av9a
AFLAGS+= -Wa,-Av9a
-CC_NOOPT= ${NORMAL_C}
.if defined(PROF)
# Profiling is only supported in the medium low memory model.
CFLAGS+= -mcmodel=medlow
@@ -69,10 +68,6 @@ CFLAGS+= -mcmodel=medlow
# 32-bit kernels
CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultrasparc
AFLAGS+= -Wa,-Av8plusa
-# XXX
-# The sparc gcc version 3.3.3 (NetBSD nb1 20040301) does not compile this
-# file properly with higher optimizations
-CC_NOOPT= ${NORMAL_C:C/-O./-O0/}
.endif
CFLAGS+= -mno-fpu
AFLAGS+= -x assembler-with-cpp -traditional-cpp
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.118.20.1 src/sys/arch/sparc64/conf/files.sparc64:1.118.20.1.2.1
--- src/sys/arch/sparc64/conf/files.sparc64:1.118.20.1 Fri Oct 16 11:56:10 2009
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 17 18:46:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.118.20.1 2009/10/16 11:56:10 sborrill Exp $
+# $NetBSD: files.sparc64,v 1.118.20.1.2.1 2012/03/17 18:46:29 bouyer Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -251,8 +251,5 @@ file dev/md_root.c memory_disk_hooks
include arch/sparc64/conf/majors.sparc64
-# special compiler settings (no optimization if 32bit kernel)
-file uvm/uvm_bio.c compile-with ${CC_NOOPT}
-
# OpenFirmware convenience stuff
file dev/ofw/ofw_subr.c
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.286.2.2 src/sys/arch/sparc64/sparc64/locore.s:1.286.2.2.2.1
--- src/sys/arch/sparc64/sparc64/locore.s:1.286.2.2 Wed Mar 17 03:10:39 2010
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Mar 17 18:46:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.286.2.2 2010/03/17 03:10:39 snj Exp $ */
+/* $NetBSD: locore.s,v
CVS commit: [netbsd-5-1] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:46:52 UTC 2012
Modified Files:
src/doc [netbsd-5-1]: CHANGES-5.1.3
Log Message:
ticket 1736
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-5.1.3
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.3
diff -u src/doc/CHANGES-5.1.3:1.1.2.5 src/doc/CHANGES-5.1.3:1.1.2.6
--- src/doc/CHANGES-5.1.3:1.1.2.5 Fri Mar 2 17:44:52 2012
+++ src/doc/CHANGES-5.1.3 Sat Mar 17 18:46:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.3,v 1.1.2.5 2012/03/02 17:44:52 riz Exp $
+# $NetBSD: CHANGES-5.1.3,v 1.1.2.6 2012/03/17 18:46:52 bouyer Exp $
A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3
release:
@@ -48,3 +48,21 @@ share/zoneinfo/zone.tabpatch
Update to tzdata2012b.
[apb, ticket #1734]
+doc/HACKS 1.123 via patch
+sys/arch/sparc64/conf/Makefile.sparc64 1.71 via patch
+sys/arch/sparc64/conf/files.sparc64 1.138 via patch
+sys/arch/sparc64/sparc64/locore.s 1.340 via patch
+
+ Fix the root cause of the hack disable optimizations for uvm_bio.c
+ on 32 bit kernels.
+
+ gcc converts a division in the calculation of UBC_UMAP_ADDR macro
+ to multiplication (smul or combination of add/sll), and the
+ register of its result contains a garbage in upper 32 bits (the
+ upper 32 bits of smul/add/sll's result isn't zero cleared).
+
+ Then it passes to pseg_get{,_real} through pmap_extract without the
+ zero clear of upper 32 bits in the optimization case. So the
+ result of pseg_get and pmap_extact sometimes gets screwed up.
+ [nakayama, ticket #1736]
+
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:52:01 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-5]: usbdevs.h usbdevs_data.h
Log Message:
Regen for ticket #1737
To generate a diff of this commit:
cvs rdiff -u -r1.515.4.8 -r1.515.4.9 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.516.4.8 -r1.516.4.9 src/sys/dev/usb/usbdevs_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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.515.4.8 src/sys/dev/usb/usbdevs.h:1.515.4.9
--- src/sys/dev/usb/usbdevs.h:1.515.4.8 Fri Nov 26 17:29:50 2010
+++ src/sys/dev/usb/usbdevs.h Sat Mar 17 18:52:00 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.515.4.8 2010/11/26 17:29:50 riz Exp $ */
+/* $NetBSD: usbdevs.h,v 1.515.4.9 2012/03/17 18:52:00 bouyer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: usbdevs,v 1.519.4.9 2012/03/17 18:51:18 bouyer Exp
*/
/*
@@ -107,6 +107,7 @@
#define USB_VENDOR_PLANTRONICS 0x047f /* Plantronics */
#define USB_VENDOR_KYOCERA 0x0482 /* Kyocera */
#define USB_VENDOR_STMICRO 0x0483 /* STMicroelectronics */
+#define USB_VENDOR_MEIZU 0x0492 /* Meizu Electronics */
#define USB_VENDOR_YAMAHA 0x0499 /* YAMAHA */
#define USB_VENDOR_COMPAQ 0x049f /* Compaq */
#define USB_VENDOR_HITACHI 0x04a4 /* Hitachi */
@@ -1379,7 +1380,11 @@
/* Kingston products */
#define USB_PRODUCT_KINGSTON_XX1 0x0008 /* Ethernet Adapter */
#define USB_PRODUCT_KINGSTON_KNU101TX 0x000a /* KNU101TX USB Ethernet */
+#define USB_PRODUCT_KINGSTON_DT102_G2 0x1624 /* DT 102 G2 */
+#define USB_PRODUCT_KINGSTON_DT101_II 0x1625 /* DT 101 II */
#define USB_PRODUCT_KINGSTON_DTMINI10 0x162c /* DT Mini 10 */
+#define USB_PRODUCT_KINGSTON_DT101_G2 0x1642 /* DT 101 G2 */
+#define USB_PRODUCT_KINGSTON_DT100_G2 0x6544 /* DT 100 G2 */
/* Kodak products */
#define USB_PRODUCT_KODAK_DC220 0x0100 /* Digital Science DC220 */
@@ -1491,6 +1496,9 @@
/* MediaGear products */
#define USB_PRODUCT_MEDIAGEAR_READER9IN1 0x5003 /* USB2.0 9 in 1 Reader */
+/* Meizo Electronics */
+#define USB_PRODUCT_MEIZU_M6_SL 0x0140 /* MiniPlayer M6 (SL) */
+
/* Melco, Inc products */
#define USB_PRODUCT_MELCO_LUATX1 0x0001 /* LUA-TX Ethernet */
#define USB_PRODUCT_MELCO_LUATX5 0x0005 /* LUA-TX Ethernet */
@@ -1786,6 +1794,7 @@
/* Philips products */
#define USB_PRODUCT_PHILIPS_DSS350 0x0101 /* DSS 350 Digital Speaker System */
#define USB_PRODUCT_PHILIPS_DSS 0x0104 /* DSS XXX Digital Speaker System */
+#define USB_PRODUCT_PHILIPS_SA235 0x016a /* SA235 */
#define USB_PRODUCT_PHILIPS_HUB 0x0201 /* hub */
#define USB_PRODUCT_PHILIPS_PCA645VC 0x0302 /* PCA645VC PC Camera */
#define USB_PRODUCT_PHILIPS_PCA646VC 0x0303 /* PCA646VC PC Camera */
@@ -1983,6 +1992,7 @@
#define USB_PRODUCT_SANDISK_SDDR09 0x0200 /* ImageMate SDDR-09 */
#define USB_PRODUCT_SANDISK_SDDR86 0x0621 /* ImageMate SDDR-86 */
#define USB_PRODUCT_SANDISK_SDDR75 0x0810 /* ImageMate SDDR-75 */
+#define USB_PRODUCT_SANDISK_SANSA_CLIP 0x7433 /* Sansa Clip */
/* Sanwa Supply products */
#define USB_PRODUCT_SANWASUPPLY_JYDV9USB 0x9806 /* JY-DV9USB gamepad */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.516.4.8 src/sys/dev/usb/usbdevs_data.h:1.516.4.9
--- src/sys/dev/usb/usbdevs_data.h:1.516.4.8 Fri Nov 26 17:29:50 2010
+++ src/sys/dev/usb/usbdevs_data.h Sat Mar 17 18:52:00 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.516.4.8 2010/11/26 17:29:50 riz Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.516.4.9 2012/03/17 18:52:00 bouyer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: usbdevs,v 1.519.4.9 2012/03/17 18:51:18 bouyer Exp
*/
/*
@@ -223,6 +223,10 @@ const struct usb_vendor usb_vendors[] =
STMicroelectronics,
},
{
+ USB_VENDOR_MEIZU,
+ Meizu Electronics,
+ },
+ {
USB_VENDOR_YAMAHA,
YAMAHA,
},
@@ -1863,7 +1867,7 @@ const struct usb_vendor usb_vendors[] =
GNU Radio USRP,
},
};
-const int usb_nvendors = 456;
+const int usb_nvendors = 457;
const struct usb_product usb_products[] = {
{
@@ -4083,10 +4087,26 @@ const struct usb_product usb_products[]
KNU101TX USB Ethernet,
},
{
+ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT102_G2,
+ DT 102 G2,
+ },
+ {
+ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT101_II,
+ DT 101 II,
+ },
+ {
USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DTMINI10,
DT Mini 10,
},
{
+ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT101_G2,
+ DT 101 G2,
+ },
+ {
+ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT100_G2,
+ DT 100 G2,
+ },
+ {
USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC220,
Digital Science DC220,
},
@@ -4407,6 +4427,10 @@ const struct usb_product usb_products[]
USB2.0 9 in 1 Reader,
},
{
+
CVS commit: [netbsd-5] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:52:59 UTC 2012
Modified Files:
src/doc [netbsd-5]: CHANGES-5.2
Log Message:
Tickets 1731, 1732, 1735 - 1737
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.146 -r1.1.2.147 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.146 src/doc/CHANGES-5.2:1.1.2.147
--- src/doc/CHANGES-5.2:1.1.2.146 Sat Mar 17 18:29:40 2012
+++ src/doc/CHANGES-5.2 Sat Mar 17 18:52:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.146 2012/03/17 18:29:40 bouyer Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.147 2012/03/17 18:52:59 bouyer Exp $
A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
release:
@@ -6134,3 +6134,66 @@ usr.bin/ldd/ldd.c1.15 via patch
Somewhat taken from FreeBSD. Manual page from OpenBSD.
[skrll, ticket #1724]
+sys/arch/x68k/stand/Makefile.booters 1.7 via patch
+sys/arch/x68k/stand/boot/version 1.4 via patch
+sys/arch/x68k/stand/boot_ufs/Makefile 1.26 via patch
+sys/arch/x68k/stand/boot_ustar/Makefile 1.19 via patch
+sys/arch/x68k/stand/libsa/Makefile 1.27 via patch
+
+ Fix Error occurs, please reset boot problem on
+ X68030 + 060turbo in 060 mode, found on NetBSD booth
+ at OSC 2011 Hiroshima:
+
+ - use -D__daddr_t=int32_t for all bootloader files
+ to avoid 64 bit ops in FFS
+ - explicitly specify -m68020-60 to avoid 64 bit mulsl/mulul
+ instructions which need to be handled by 060SP emulation
+ but not available in 060turbo IPL ROM
+ (LFS still has uint64_t members even with 32bit daddr_t)
+
+ Bump version to denote 060turbo boot fix.
+ [tsutsui, ticket #1731]
+
+sys/arch/x68k/dev/kbd.c1.37
+
+ Calling psignal(9) (via EV_WAKEUP()) in interrupt handlers
+ could cause mutex error panic, so defer it via softint(9).
+ This should fix panic on heavy key strokes during running Xserver.
+ [tsutsui, ticket #1732]
+
+usr.sbin/cpuctl/arch/i386.c 1.29
+
+ Print CPU stepping level
+ [sborrill, ticket #1735]
+
+doc/HACKS 1.123 via patch
+sys/arch/sparc64/conf/Makefile.sparc64 1.71 via patch
+sys/arch/sparc64/conf/files.sparc64 1.138 via patch
+sys/arch/sparc64/sparc64/locore.s 1.340 via patch
+
+ Fix the root cause of the hack disable optimizations for uvm_bio.c
+ on 32 bit kernels.
+
+ gcc converts a division in the calculation of UBC_UMAP_ADDR macro
+ to multiplication (smul or combination of add/sll), and the
+ register of its result contains a garbage in upper 32 bits (the
+ upper 32 bits of smul/add/sll's result isn't zero cleared).
+
+ Then it passes to pseg_get{,_real} through pmap_extract without the
+ zero clear of upper 32 bits in the optimization case. So the
+ result of pseg_get and pmap_extact sometimes gets screwed up.
+ [nakayama, ticket #1736]
+
+sys/dev/usb/usbdevspatch
+sys/dev/usb/umass_quirks.c patch
+
+ Add umass quirks for the following devices:
+ Kingston DT 102 G2
+ Kingston DT 101 II
+ Kingston DT Mini 10
+ Kingston DT 101 G2
+ Kingston DT 100 G2
+ Meizo Electronics MiniPlayer M6 (SL)
+ Philips SA235
+ Sandisk Sansa Clip
+ [riz, ticket #1737]
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:05:39 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-5]: pcidevs piixide.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1739):
sys/dev/pci/piixide.c: revision 1.58
sys/dev/pci/pcidevs: patch
Add support for Intel 6 Series Serial ATA Controller
To generate a diff of this commit:
cvs rdiff -u -r1.962.4.15 -r1.962.4.16 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.47.4.1 -r1.47.4.2 src/sys/dev/pci/piixide.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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.962.4.15 src/sys/dev/pci/pcidevs:1.962.4.16
--- src/sys/dev/pci/pcidevs:1.962.4.15 Mon Nov 22 03:39:08 2010
+++ src/sys/dev/pci/pcidevs Sat Mar 17 19:05:38 2012
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.962.4.15 2010/11/22 03:39:08 riz Exp $
+$NetBSD: pcidevs,v 1.962.4.16 2012/03/17 19:05:38 bouyer Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2312,6 +2312,31 @@ product INTEL 82840_AGP 0x1a23 82840 AG
product INTEL 82840_PCI 0x1a24 82840 PCI
product INTEL 82845_HB 0x1a30 82845 Host
product INTEL 82845_AGP 0x1a31 82845 AGP
+product INTEL 6SERIES_SATA_1 0x1c00 6 Series SATA
+product INTEL 6SERIES_SATA_2 0x1c01 6 Series SATA
+product INTEL 6SERIES_AHCI_1 0x1c02 6 Series AHCI
+product INTEL 6SERIES_AHCI_2 0x1c03 6 Series AHCI
+product INTEL 6SERIES_RAID_1 0x1c04 6 Series RAID
+product INTEL 6SERIES_RAID_2 0x1c05 6 Series RAID
+product INTEL 6SERIES_RAID_3 0x1c06 6 Series RAID
+product INTEL 6SERIES_SATA_3 0x1c08 6 Series SATA
+product INTEL 6SERIES_SATA_4 0x1c09 6 Series SATA
+product INTEL 6SERIES_PCIE_1 0x1c10 6 Series PCIE
+product INTEL 6SERIES_PCIE_2 0x1c12 6 Series PCIE
+product INTEL 6SERIES_PCIE_3 0x1c14 6 Series PCIE
+product INTEL 6SERIES_PCIE_4 0x1c16 6 Series PCIE
+product INTEL 6SERIES_PCIE_5 0x1c18 6 Series PCIE
+product INTEL 6SERIES_PCIE_6 0x1c1a 6 Series PCIE
+product INTEL 6SERIES_PCIE_7 0x1c1c 6 Series PCIE
+product INTEL 6SERIES_PCIE_8 0x1c1e 6 Series PCIE
+product INTEL 6SERIES_HDA 0x1c20 6 Series HD Audio
+product INTEL 6SERIES_SMB 0x1c22 6 Series SMBus
+product INTEL 6SERIES_THERM 0x1c24 6 Series Thermal
+product INTEL 6SERIES_DMI 0x1c25 6 Series DMI-PCI
+product INTEL 6SERIES_EHCI_1 0x1c26 6 Series USB
+product INTEL 6SERIES_EHCI_2 0x1c2d 6 Series USB
+product INTEL 6SERIES_MEI 0x1c3a 6 Series MEI
+product INTEL 6SERIES_KT 0x1c3d 6 Series KT
product INTEL 82801AA_LPC 0x2410 82801AA LPC Interface Bridge
product INTEL 82801AA_IDE 0x2411 82801AA IDE Controller
product INTEL 82801AA_USB 0x2412 82801AA USB Controller
Index: src/sys/dev/pci/piixide.c
diff -u src/sys/dev/pci/piixide.c:1.47.4.1 src/sys/dev/pci/piixide.c:1.47.4.2
--- src/sys/dev/pci/piixide.c:1.47.4.1 Fri Dec 18 05:48:07 2009
+++ src/sys/dev/pci/piixide.c Sat Mar 17 19:05:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: piixide.c,v 1.47.4.1 2009/12/18 05:48:07 snj Exp $ */
+/* $NetBSD: piixide.c,v 1.47.4.2 2012/03/17 19:05:39 bouyer Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: piixide.c,v 1.47.4.1 2009/12/18 05:48:07 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: piixide.c,v 1.47.4.2 2012/03/17 19:05:39 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -308,6 +308,30 @@ static const struct pciide_product_desc
Intel 3400 Serial ATA Controller,
piixsata_chip_map,
},
+ {
+ PCI_PRODUCT_INTEL_6SERIES_SATA_1,
+ 0,
+ Intel 6 Series Serial ATA Controller,
+ piixsata_chip_map,
+ },
+ {
+ PCI_PRODUCT_INTEL_6SERIES_SATA_2,
+ 0,
+ Intel 6 Series Serial ATA Controller,
+ piixsata_chip_map,
+ },
+ {
+ PCI_PRODUCT_INTEL_6SERIES_SATA_3,
+ 0,
+ Intel 6 Series Serial ATA Controller,
+ piixsata_chip_map,
+ },
+ {
+ PCI_PRODUCT_INTEL_6SERIES_SATA_4,
+ 0,
+ Intel 6 Series Serial ATA Controller,
+ piixsata_chip_map,
+ },
{ 0,
0,
NULL,
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:06:41 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-5]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket 1739
To generate a diff of this commit:
cvs rdiff -u -r1.963.4.15 -r1.963.4.16 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.962.4.15 -r1.962.4.16 src/sys/dev/pci/pcidevs_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/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.963.4.15 src/sys/dev/pci/pcidevs.h:1.963.4.16
--- src/sys/dev/pci/pcidevs.h:1.963.4.15 Mon Nov 22 03:40:00 2010
+++ src/sys/dev/pci/pcidevs.h Sat Mar 17 19:06:21 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.963.4.15 2010/11/22 03:40:00 riz Exp $ */
+/* $NetBSD: pcidevs.h,v 1.963.4.16 2012/03/17 19:06:21 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: pcidevs,v 1.962.4.16 2012/03/17 19:05:38 bouyer Exp
*/
/*
@@ -2319,6 +2319,31 @@
#define PCI_PRODUCT_INTEL_82840_PCI 0x1a24 /* 82840 PCI */
#define PCI_PRODUCT_INTEL_82845_HB 0x1a30 /* 82845 Host */
#define PCI_PRODUCT_INTEL_82845_AGP 0x1a31 /* 82845 AGP */
+#define PCI_PRODUCT_INTEL_6SERIES_SATA_1 0x1c00 /* 6 Series SATA */
+#define PCI_PRODUCT_INTEL_6SERIES_SATA_2 0x1c01 /* 6 Series SATA */
+#define PCI_PRODUCT_INTEL_6SERIES_AHCI_1 0x1c02 /* 6 Series AHCI */
+#define PCI_PRODUCT_INTEL_6SERIES_AHCI_2 0x1c03 /* 6 Series AHCI */
+#define PCI_PRODUCT_INTEL_6SERIES_RAID_1 0x1c04 /* 6 Series RAID */
+#define PCI_PRODUCT_INTEL_6SERIES_RAID_2 0x1c05 /* 6 Series RAID */
+#define PCI_PRODUCT_INTEL_6SERIES_RAID_3 0x1c06 /* 6 Series RAID */
+#define PCI_PRODUCT_INTEL_6SERIES_SATA_3 0x1c08 /* 6 Series SATA */
+#define PCI_PRODUCT_INTEL_6SERIES_SATA_4 0x1c09 /* 6 Series SATA */
+#define PCI_PRODUCT_INTEL_6SERIES_PCIE_1 0x1c10 /* 6 Series PCIE */
+#define PCI_PRODUCT_INTEL_6SERIES_PCIE_2 0x1c12 /* 6 Series PCIE */
+#define PCI_PRODUCT_INTEL_6SERIES_PCIE_3 0x1c14 /* 6 Series PCIE */
+#define PCI_PRODUCT_INTEL_6SERIES_PCIE_4 0x1c16 /* 6 Series PCIE */
+#define PCI_PRODUCT_INTEL_6SERIES_PCIE_5 0x1c18 /* 6 Series PCIE */
+#define PCI_PRODUCT_INTEL_6SERIES_PCIE_6 0x1c1a /* 6 Series PCIE */
+#define PCI_PRODUCT_INTEL_6SERIES_PCIE_7 0x1c1c /* 6 Series PCIE */
+#define PCI_PRODUCT_INTEL_6SERIES_PCIE_8 0x1c1e /* 6 Series PCIE */
+#define PCI_PRODUCT_INTEL_6SERIES_HDA 0x1c20 /* 6 Series HD Audio */
+#define PCI_PRODUCT_INTEL_6SERIES_SMB 0x1c22 /* 6 Series SMBus */
+#define PCI_PRODUCT_INTEL_6SERIES_THERM 0x1c24 /* 6 Series Thermal */
+#define PCI_PRODUCT_INTEL_6SERIES_DMI 0x1c25 /* 6 Series DMI-PCI */
+#define PCI_PRODUCT_INTEL_6SERIES_EHCI_1 0x1c26 /* 6 Series USB */
+#define PCI_PRODUCT_INTEL_6SERIES_EHCI_2 0x1c2d /* 6 Series USB */
+#define PCI_PRODUCT_INTEL_6SERIES_MEI 0x1c3a /* 6 Series MEI */
+#define PCI_PRODUCT_INTEL_6SERIES_KT 0x1c3d /* 6 Series KT */
#define PCI_PRODUCT_INTEL_82801AA_LPC 0x2410 /* 82801AA LPC Interface Bridge */
#define PCI_PRODUCT_INTEL_82801AA_IDE 0x2411 /* 82801AA IDE Controller */
#define PCI_PRODUCT_INTEL_82801AA_USB 0x2412 /* 82801AA USB Controller */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.15 src/sys/dev/pci/pcidevs_data.h:1.962.4.16
--- src/sys/dev/pci/pcidevs_data.h:1.962.4.15 Mon Nov 22 03:40:00 2010
+++ src/sys/dev/pci/pcidevs_data.h Sat Mar 17 19:06:21 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.962.4.15 2010/11/22 03:40:00 riz Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.962.4.16 2012/03/17 19:06:21 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: pcidevs,v 1.962.4.16 2012/03/17 19:05:38 bouyer Exp
*/
/*
@@ -8104,6 +8104,106 @@ static const struct pci_product pci_prod
82845 AGP,
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_SATA_1,
+ 6 Series SATA,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_SATA_2,
+ 6 Series SATA,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_AHCI_1,
+ 6 Series AHCI,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_AHCI_2,
+ 6 Series AHCI,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_RAID_1,
+ 6 Series RAID,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_RAID_2,
+ 6 Series RAID,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_RAID_3,
+ 6 Series RAID,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_SATA_3,
+ 6 Series SATA,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_SATA_4,
+ 6 Series SATA,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_PCIE_1,
+ 6 Series PCIE,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_PCIE_2,
+ 6 Series PCIE,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_PCIE_3,
+ 6 Series PCIE,
+ },
+ {
+
CVS commit: [netbsd-5]
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:11:19 UTC 2012
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-r128 [netbsd-5]:
Makefile
xsrc/external/mit/xf86-video-r128/dist/src [netbsd-5]: r128.h
r128_driver.c
Log Message:
Pull up following revision(s) (requested by phx in ticket #1740):
xsrc/external/mit/xf86-video-r128/dist/src/r128.h: revision 1.2
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c: revision 1.2
external/mit/xorg/server/drivers/xf86-video-r128/Makefile: revision 1.4
don't build fbdev support on powerpc and sparc64
sprinkle #if(n)def to allow building the driver without any fbdev support
whatsoever
while there do what the comment suggests and fall through to turning off
the backlight in all DPMS modes except on - leaving the backlight on while
turning the DAC off is kind of useless, isn't it?
To generate a diff of this commit:
cvs rdiff -u -r1.1.4.1 -r1.1.4.2 \
src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
xsrc/external/mit/xf86-video-r128/dist/src/r128.h
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.1.4.1 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.1.4.2
--- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.1.4.1 Thu Apr 23 02:26:10 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Sat Mar 17 19:11:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.4.1 2009/04/23 02:26:10 snj Exp $
+# $NetBSD: Makefile,v 1.1.4.2 2012/03/17 19:11:19 bouyer Exp $
DRIVER= xf86-video-r128
DRIVER_NAME= r128_drv
@@ -8,6 +8,10 @@ SRCS= r128_accel.c r128_cursor.c r128_dg
MAN= r128.4
+.if ${MACHINE_ARCH} == powerpc || ${MACHINE} == sparc64
+CPPFLAGS+= -DAVOID_FBDEV
+.endif
+
# Enable VGA support (esp. hw state save/restore) on i386 / amd64 platforms
.if ${MACHINE} == amd64 || ${MACHINE} == i386
CPPFLAGS+= -DWITH_VGAHW
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128.h
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.1.1.1 xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.1.1.1.2.1
--- xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.1.1.1 Sun Oct 12 23:10:25 2008
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128.h Sat Mar 17 19:11:19 2012
@@ -230,7 +230,9 @@ typedef struct {
int Chipset;
Bool Primary;
+#ifndef AVOID_FBDEV
Bool FBDev;
+#endif
unsigned long LinearAddr; /* Frame buffer physical address */
unsigned long MMIOAddr; /* MMIO region physical address */
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.1.1.1.2.1 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.1.1.1.2.2
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.1.1.1.2.1 Thu Sep 17 03:34:10 2009
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Sat Mar 17 19:11:19 2012
@@ -99,7 +99,11 @@
#ifdef WITH_VGAHW
#include vgaHW.h
#endif
+
+#ifndef AVOID_FBDEV
#include fbdevhw.h
+#endif
+
#include dixstruct.h
/* DPMS support. */
@@ -153,7 +157,9 @@ typedef enum {
OPTION_PANEL_WIDTH,
OPTION_PANEL_HEIGHT,
OPTION_PROG_FP_REGS,
+#ifndef AVOID_FBDEV
OPTION_FBDEV,
+#endif
OPTION_VIDEO_KEY,
OPTION_SHOW_CACHE,
OPTION_VGA_ACCESS
@@ -180,7 +186,9 @@ static const OptionInfoRec R128Options[]
{ OPTION_PANEL_WIDTH, PanelWidth, OPTV_INTEGER, {0}, FALSE },
{ OPTION_PANEL_HEIGHT, PanelHeight, OPTV_INTEGER, {0}, FALSE },
{ OPTION_PROG_FP_REGS, ProgramFPRegs,OPTV_BOOLEAN, {0}, FALSE },
+#ifndef AVOID_FBDEV
{ OPTION_FBDEV,UseFBDev, OPTV_BOOLEAN, {0}, FALSE },
+#endif
{ OPTION_VIDEO_KEY,VideoKey, OPTV_INTEGER, {0}, FALSE },
{ OPTION_SHOW_CACHE, ShowCache,OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_VGA_ACCESS, VGAAccess,OPTV_BOOLEAN, {0}, TRUE },
@@ -238,9 +246,12 @@ static Bool R128MapMMIO(ScrnInfoPtr pScr
{
R128InfoPtr info = R128PTR(pScrn);
+#ifndef AVOID_FBDEV
if (info-FBDev) {
info-MMIO = fbdevHWMapMMIO(pScrn);
-} else {
+} else
+#endif
+{
/* If the primary screen has already mapped the MMIO region,
use its pointer instead of mapping it a second time. */
if (info-IsSecondary) {
@@ -283,9 +294,12 @@ static Bool R128UnmapMMIO(ScrnInfoPtr pS
{
R128InfoPtr info = R128PTR(pScrn);
+#ifndef AVOID_FBDEV
if (info-FBDev)
fbdevHWUnmapMMIO(pScrn);
-else {
+else
+#endif
+
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:14:10 UTC 2012
Modified Files:
src/sys/kern [netbsd-5]: kern_sig.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1741):
sys/kern/kern_sig.c: revision 1.300
kpsignal2: do not make the signal pending twice when tracing the process,
also update a comment and add an assert. Fixes PR/42309 by Nicolas Joly.
To generate a diff of this commit:
cvs rdiff -u -r1.289.4.7 -r1.289.4.8 src/sys/kern/kern_sig.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_sig.c
diff -u src/sys/kern/kern_sig.c:1.289.4.7 src/sys/kern/kern_sig.c:1.289.4.8
--- src/sys/kern/kern_sig.c:1.289.4.7 Sat Feb 4 16:57:58 2012
+++ src/sys/kern/kern_sig.c Sat Mar 17 19:14:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.289.4.7 2012/02/04 16:57:58 bouyer Exp $ */
+/* $NetBSD: kern_sig.c,v 1.289.4.8 2012/03/17 19:14:08 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.7 2012/02/04 16:57:58 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.8 2012/03/17 19:14:08 bouyer Exp $);
#include opt_ptrace.h
#include opt_compat_sunos.h
@@ -1393,15 +1393,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
goto out;
} else {
/*
- * Process is stopped or stopping. If traced, then no
- * further action is necessary.
+ * Process is stopped or stopping.
+ * - If traced, then no action is needed, unless killing.
+ * - Run the process only if sending SIGCONT or SIGKILL.
*/
- if ((p-p_slflag PSL_TRACED) != 0 signo != SIGKILL)
+ if ((p-p_slflag PSL_TRACED) != 0 signo != SIGKILL) {
goto out;
-
- /*
- * Run the process only if sending SIGCONT or SIGKILL.
- */
+ }
if ((prop SA_CONT) != 0 || signo == SIGKILL) {
/*
* Re-adjust p_nstopchild if the process wasn't
@@ -1409,9 +1407,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
*/
p-p_stat = SACTIVE;
p-p_sflag = ~PS_STOPPING;
- if (!p-p_waited)
+ if (!p-p_waited) {
p-p_pptr-p_nstopchild--;
-
+ }
+ if (p-p_slflag PSL_TRACED) {
+KASSERT(signo == SIGKILL);
+goto deliver;
+ }
/*
* Do not make signal pending if SIGCONT is default.
*
@@ -1434,6 +1436,7 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
/*
* Make signal pending.
*/
+ KASSERT((p-p_slflag PSL_TRACED) == 0);
sigput(p-p_sigpend, p, kp);
deliver:
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:14:15 UTC 2012
Modified Files:
src/sys/kern [netbsd-5-0]: kern_sig.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1741):
sys/kern/kern_sig.c: revision 1.300
kpsignal2: do not make the signal pending twice when tracing the process,
also update a comment and add an assert. Fixes PR/42309 by Nicolas Joly.
To generate a diff of this commit:
cvs rdiff -u -r1.289.4.5.2.1 -r1.289.4.5.2.2 src/sys/kern/kern_sig.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_sig.c
diff -u src/sys/kern/kern_sig.c:1.289.4.5.2.1 src/sys/kern/kern_sig.c:1.289.4.5.2.2
--- src/sys/kern/kern_sig.c:1.289.4.5.2.1 Sat Jan 16 17:32:45 2010
+++ src/sys/kern/kern_sig.c Sat Mar 17 19:14:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.289.4.5.2.1 2010/01/16 17:32:45 bouyer Exp $ */
+/* $NetBSD: kern_sig.c,v 1.289.4.5.2.2 2012/03/17 19:14:15 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.5.2.1 2010/01/16 17:32:45 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.5.2.2 2012/03/17 19:14:15 bouyer Exp $);
#include opt_ptrace.h
#include opt_compat_sunos.h
@@ -1382,15 +1382,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
goto out;
} else {
/*
- * Process is stopped or stopping. If traced, then no
- * further action is necessary.
+ * Process is stopped or stopping.
+ * - If traced, then no action is needed, unless killing.
+ * - Run the process only if sending SIGCONT or SIGKILL.
*/
- if ((p-p_slflag PSL_TRACED) != 0 signo != SIGKILL)
+ if ((p-p_slflag PSL_TRACED) != 0 signo != SIGKILL) {
goto out;
-
- /*
- * Run the process only if sending SIGCONT or SIGKILL.
- */
+ }
if ((prop SA_CONT) != 0 || signo == SIGKILL) {
/*
* Re-adjust p_nstopchild if the process wasn't
@@ -1398,9 +1396,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
*/
p-p_stat = SACTIVE;
p-p_sflag = ~PS_STOPPING;
- if (!p-p_waited)
+ if (!p-p_waited) {
p-p_pptr-p_nstopchild--;
-
+ }
+ if (p-p_slflag PSL_TRACED) {
+KASSERT(signo == SIGKILL);
+goto deliver;
+ }
/*
* Do not make signal pending if SIGCONT is default.
*
@@ -1423,6 +1425,7 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
/*
* Make signal pending.
*/
+ KASSERT((p-p_slflag PSL_TRACED) == 0);
sigput(p-p_sigpend, p, kp);
deliver:
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:14:44 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1741 To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.65 src/doc/CHANGES-5.0.3:1.1.2.66 --- src/doc/CHANGES-5.0.3:1.1.2.65 Sat Mar 17 18:45:45 2012 +++ src/doc/CHANGES-5.0.3 Sat Mar 17 19:14:44 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.65 2012/03/17 18:45:45 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.66 2012/03/17 19:14:44 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2980,3 +2980,10 @@ sys/arch/sparc64/sparc64/locore.s 1.340 result of pseg_get and pmap_extact sometimes gets screwed up. [nakayama, ticket #1736] +sys/kern/kern_sig.c1.300 + + kpsignal2: do not make the signal pending twice when tracing the + process, also update a comment and add an assert. + Fixes PR/42309 by Nicolas Joly. + [christos, ticket #1741] +
CVS commit: [netbsd-5-1] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:15:12 UTC 2012
Modified Files:
src/sys/kern [netbsd-5-1]: kern_sig.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1741):
sys/kern/kern_sig.c: revision 1.300
kpsignal2: do not make the signal pending twice when tracing the process,
also update a comment and add an assert. Fixes PR/42309 by Nicolas Joly.
To generate a diff of this commit:
cvs rdiff -u -r1.289.4.6 -r1.289.4.6.2.1 src/sys/kern/kern_sig.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_sig.c
diff -u src/sys/kern/kern_sig.c:1.289.4.6 src/sys/kern/kern_sig.c:1.289.4.6.2.1
--- src/sys/kern/kern_sig.c:1.289.4.6 Sat Jan 16 17:32:52 2010
+++ src/sys/kern/kern_sig.c Sat Mar 17 19:15:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.289.4.6 2010/01/16 17:32:52 bouyer Exp $ */
+/* $NetBSD: kern_sig.c,v 1.289.4.6.2.1 2012/03/17 19:15:12 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.6 2010/01/16 17:32:52 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.289.4.6.2.1 2012/03/17 19:15:12 bouyer Exp $);
#include opt_ptrace.h
#include opt_compat_sunos.h
@@ -1382,15 +1382,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
goto out;
} else {
/*
- * Process is stopped or stopping. If traced, then no
- * further action is necessary.
+ * Process is stopped or stopping.
+ * - If traced, then no action is needed, unless killing.
+ * - Run the process only if sending SIGCONT or SIGKILL.
*/
- if ((p-p_slflag PSL_TRACED) != 0 signo != SIGKILL)
+ if ((p-p_slflag PSL_TRACED) != 0 signo != SIGKILL) {
goto out;
-
- /*
- * Run the process only if sending SIGCONT or SIGKILL.
- */
+ }
if ((prop SA_CONT) != 0 || signo == SIGKILL) {
/*
* Re-adjust p_nstopchild if the process wasn't
@@ -1398,9 +1396,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
*/
p-p_stat = SACTIVE;
p-p_sflag = ~PS_STOPPING;
- if (!p-p_waited)
+ if (!p-p_waited) {
p-p_pptr-p_nstopchild--;
-
+ }
+ if (p-p_slflag PSL_TRACED) {
+KASSERT(signo == SIGKILL);
+goto deliver;
+ }
/*
* Do not make signal pending if SIGCONT is default.
*
@@ -1423,6 +1425,7 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
/*
* Make signal pending.
*/
+ KASSERT((p-p_slflag PSL_TRACED) == 0);
sigput(p-p_sigpend, p, kp);
deliver:
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:15:29 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: ticket 1741 To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-5.1.3 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.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.6 src/doc/CHANGES-5.1.3:1.1.2.7 --- src/doc/CHANGES-5.1.3:1.1.2.6 Sat Mar 17 18:46:52 2012 +++ src/doc/CHANGES-5.1.3 Sat Mar 17 19:15:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.6 2012/03/17 18:46:52 bouyer Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.7 2012/03/17 19:15:29 bouyer Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -66,3 +66,10 @@ sys/arch/sparc64/sparc64/locore.s 1.340 result of pseg_get and pmap_extact sometimes gets screwed up. [nakayama, ticket #1736] +sys/kern/kern_sig.c1.300 + + kpsignal2: do not make the signal pending twice when tracing the + process, also update a comment and add an assert. + Fixes PR/42309 by Nicolas Joly. + [christos, ticket #1741] +
CVS commit: [netbsd-5] src/usr.bin/ktruss
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:16:09 UTC 2012
Modified Files:
src/usr.bin/ktruss [netbsd-5]: makeerrnos.sh
Log Message:
Pull up following revision(s) (requested by dyoung in ticket #1742):
usr.bin/ktruss/makeerrnos.sh: revision 1.6
Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more
portable. The latter is not supported by Mac OS X Lion.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.bin/ktruss/makeerrnos.sh
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/ktruss/makeerrnos.sh
diff -u src/usr.bin/ktruss/makeerrnos.sh:1.5 src/usr.bin/ktruss/makeerrnos.sh:1.5.2.1
--- src/usr.bin/ktruss/makeerrnos.sh:1.5 Sun Oct 19 22:10:05 2008
+++ src/usr.bin/ktruss/makeerrnos.sh Sat Mar 17 19:16:08 2012
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makeerrnos.sh,v 1.5 2008/10/19 22:10:05 apb Exp $
+# $NetBSD: makeerrnos.sh,v 1.5.2.1 2012/03/17 19:16:08 bouyer Exp $
if [ $# -ne 3 ]; then
echo usage: makeerrnos.sh errno.h signal.h output
@@ -35,7 +35,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
lines=`wc -l $CFILE | ${AWK} ' { print $1; } ' -`
@@ -59,7 +59,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
elines=`grep '{ SIG' $CFILE | wc -l`
CVS commit: [netbsd-5-1] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:17:04 UTC 2012
Modified Files:
src/doc [netbsd-5-1]: CHANGES-5.1.3
src/usr.bin/ktruss [netbsd-5-1]: makeerrnos.sh
Log Message:
ticket 1742
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-5.1.3
cvs rdiff -u -r1.5 -r1.5.12.1 src/usr.bin/ktruss/makeerrnos.sh
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.3
diff -u src/doc/CHANGES-5.1.3:1.1.2.7 src/doc/CHANGES-5.1.3:1.1.2.8
--- src/doc/CHANGES-5.1.3:1.1.2.7 Sat Mar 17 19:15:29 2012
+++ src/doc/CHANGES-5.1.3 Sat Mar 17 19:17:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.3,v 1.1.2.7 2012/03/17 19:15:29 bouyer Exp $
+# $NetBSD: CHANGES-5.1.3,v 1.1.2.8 2012/03/17 19:17:04 bouyer Exp $
A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3
release:
@@ -73,3 +73,9 @@ sys/kern/kern_sig.c1.300
Fixes PR/42309 by Nicolas Joly.
[christos, ticket #1741]
+usr.bin/ktruss/makeerrnos.sh 1.6
+
+ Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more
+ portable. The latter is not supported by Mac OS X Lion.
+ [dyoung, ticket #1742]
+
Index: src/usr.bin/ktruss/makeerrnos.sh
diff -u src/usr.bin/ktruss/makeerrnos.sh:1.5 src/usr.bin/ktruss/makeerrnos.sh:1.5.12.1
--- src/usr.bin/ktruss/makeerrnos.sh:1.5 Sun Oct 19 22:10:05 2008
+++ src/usr.bin/ktruss/makeerrnos.sh Sat Mar 17 19:17:04 2012
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makeerrnos.sh,v 1.5 2008/10/19 22:10:05 apb Exp $
+# $NetBSD: makeerrnos.sh,v 1.5.12.1 2012/03/17 19:17:04 bouyer Exp $
if [ $# -ne 3 ]; then
echo usage: makeerrnos.sh errno.h signal.h output
@@ -35,7 +35,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
lines=`wc -l $CFILE | ${AWK} ' { print $1; } ' -`
@@ -59,7 +59,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
elines=`grep '{ SIG' $CFILE | wc -l`
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:17:15 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1739 - 1742 To generate a diff of this commit: cvs rdiff -u -r1.1.2.147 -r1.1.2.148 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.147 src/doc/CHANGES-5.2:1.1.2.148 --- src/doc/CHANGES-5.2:1.1.2.147 Sat Mar 17 18:52:59 2012 +++ src/doc/CHANGES-5.2 Sat Mar 17 19:17:15 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.147 2012/03/17 18:52:59 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.148 2012/03/17 19:17:15 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6197,3 +6197,35 @@ sys/dev/usb/umass_quirks.c patch Philips SA235 Sandisk Sansa Clip [riz, ticket #1737] +sys/dev/pci/piixide.c1.58 +sys/dev/pci/pcidevspatch +sys/dev/pci/pcidevs.hpatch +sys/dev/pci/pcidevs_data.h patch + + Add support for Intel 6 Series Serial ATA Controller + [sborrill, ticket #1739] + +xsrc/external/mit/xf86-video-r128/dist/src/r128.h 1.2 +xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c 1.2 +external/mit/xorg/server/drivers/xf86-video-r128/Makefile 1.4 + + don't build fbdev support on powerpc and sparc64 + sprinkle #if(n)def to allow building the driver without any fbdev + support whatsoever + while there do what the comment suggests and fall through to turning off + the backlight in all DPMS modes except on + [phx, ticket #1740] + +sys/kern/kern_sig.c1.300 + + kpsignal2: do not make the signal pending twice when tracing the + process, also update a comment and add an assert. + Fixes PR/42309 by Nicolas Joly. + [christos, ticket #1741] + +usr.bin/ktruss/makeerrnos.sh 1.6 + + Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more + portable. The latter is not supported by Mac OS X Lion. + [dyoung, ticket #1742] +
CVS commit: [netbsd-5-0] src/usr.bin/ktruss
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:23:29 UTC 2012
Modified Files:
src/usr.bin/ktruss [netbsd-5-0]: makeerrnos.sh
Log Message:
Pull up following revision(s) (requested by dyoung in ticket #1742):
usr.bin/ktruss/makeerrnos.sh: revision 1.6
Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more
portable. The latter is not supported by Mac OS X Lion.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/usr.bin/ktruss/makeerrnos.sh
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/ktruss/makeerrnos.sh
diff -u src/usr.bin/ktruss/makeerrnos.sh:1.5 src/usr.bin/ktruss/makeerrnos.sh:1.5.8.1
--- src/usr.bin/ktruss/makeerrnos.sh:1.5 Sun Oct 19 22:10:05 2008
+++ src/usr.bin/ktruss/makeerrnos.sh Sat Mar 17 19:23:29 2012
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makeerrnos.sh,v 1.5 2008/10/19 22:10:05 apb Exp $
+# $NetBSD: makeerrnos.sh,v 1.5.8.1 2012/03/17 19:23:29 bouyer Exp $
if [ $# -ne 3 ]; then
echo usage: makeerrnos.sh errno.h signal.h output
@@ -35,7 +35,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
lines=`wc -l $CFILE | ${AWK} ' { print $1; } ' -`
@@ -59,7 +59,7 @@ ${AWK} '
END {
print { \0\, 0 },\n;
}
-' | sort -n +2 $CFILE
+' | sort -n -k 3 $CFILE
echo { 0L, 0},
}; $CFILE
elines=`grep '{ SIG' $CFILE | wc -l`
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:23:47 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1742 To generate a diff of this commit: cvs rdiff -u -r1.1.2.66 -r1.1.2.67 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.66 src/doc/CHANGES-5.0.3:1.1.2.67 --- src/doc/CHANGES-5.0.3:1.1.2.66 Sat Mar 17 19:14:44 2012 +++ src/doc/CHANGES-5.0.3 Sat Mar 17 19:23:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.66 2012/03/17 19:14:44 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.67 2012/03/17 19:23:46 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2987,3 +2987,9 @@ sys/kern/kern_sig.c1.300 Fixes PR/42309 by Nicolas Joly. [christos, ticket #1741] +usr.bin/ktruss/makeerrnos.sh 1.6 + + Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more + portable. The latter is not supported by Mac OS X Lion. + [dyoung, ticket #1742] +
CVS commit: [netbsd-5] src/sbin/mount
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:31:23 UTC 2012 Modified Files: src/sbin/mount [netbsd-5]: mount.8 Log Message: Pull up following revision(s) (requested by dholland in ticket #1743): sbin/mount/mount.8: revision 1.73 sbin/mount/mount.8: revision 1.74 Clarify UFS2 superblock format stuff. Bump date. Improve previous; thanks to tsutsui-san for reminding me of the proper reference. PR 45166 To generate a diff of this commit: cvs rdiff -u -r1.62.2.3 -r1.62.2.4 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.62.2.3 src/sbin/mount/mount.8:1.62.2.4 --- src/sbin/mount/mount.8:1.62.2.3 Thu Jan 22 23:03:17 2009 +++ src/sbin/mount/mount.8 Sat Mar 17 19:31:22 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount.8,v 1.62.2.3 2009/01/22 23:03:17 snj Exp $ +.\ $NetBSD: mount.8,v 1.62.2.4 2012/03/17 19:31:22 bouyer Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)mount.8 8.8 (Berkeley) 6/16/94 .\ -.Dd January 20, 2009 +.Dd July 22, 2011 .Dt MOUNT 8 .Os .Sh NAME @@ -292,7 +292,7 @@ It requires the .Dv SOFTDEP option to be enabled in the running kernel. .It Cm log -(FFS only with UFS2 superblock layout) +(FFS only) Mount the file system with .Xr wapbl 4 meta-data journaling. @@ -313,6 +313,16 @@ option to be enabled in the running kern See .Xr wapbl 4 for more information. +This option requires the +.Dq UFS2 +.Pq level 4 +superblock layout, which is the default for newly created FFSv1 and +FFSv2 file systems. +To update an old file system with an earlier superblock format, +use the +.Fl c +option of +.Xr fsck_ffs 8 . .It Cm symperm Recognize permission of symbolic link when reading or traversing link. .It Cm sync
CVS commit: [netbsd-5-0] src/sbin/mount
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:31:54 UTC 2012 Modified Files: src/sbin/mount [netbsd-5-0]: mount.8 Log Message: Pull up following revision(s) (requested by dholland in ticket #1743): sbin/mount/mount.8: revision 1.73 sbin/mount/mount.8: revision 1.74 Clarify UFS2 superblock format stuff. Bump date. Improve previous; thanks to tsutsui-san for reminding me of the proper reference. PR 45166 To generate a diff of this commit: cvs rdiff -u -r1.62.2.3 -r1.62.2.3.2.1 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.62.2.3 src/sbin/mount/mount.8:1.62.2.3.2.1 --- src/sbin/mount/mount.8:1.62.2.3 Thu Jan 22 23:03:17 2009 +++ src/sbin/mount/mount.8 Sat Mar 17 19:31:54 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount.8,v 1.62.2.3 2009/01/22 23:03:17 snj Exp $ +.\ $NetBSD: mount.8,v 1.62.2.3.2.1 2012/03/17 19:31:54 bouyer Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)mount.8 8.8 (Berkeley) 6/16/94 .\ -.Dd January 20, 2009 +.Dd July 22, 2011 .Dt MOUNT 8 .Os .Sh NAME @@ -292,7 +292,7 @@ It requires the .Dv SOFTDEP option to be enabled in the running kernel. .It Cm log -(FFS only with UFS2 superblock layout) +(FFS only) Mount the file system with .Xr wapbl 4 meta-data journaling. @@ -313,6 +313,16 @@ option to be enabled in the running kern See .Xr wapbl 4 for more information. +This option requires the +.Dq UFS2 +.Pq level 4 +superblock layout, which is the default for newly created FFSv1 and +FFSv2 file systems. +To update an old file system with an earlier superblock format, +use the +.Fl c +option of +.Xr fsck_ffs 8 . .It Cm symperm Recognize permission of symbolic link when reading or traversing link. .It Cm sync
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:32:13 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1743 To generate a diff of this commit: cvs rdiff -u -r1.1.2.67 -r1.1.2.68 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.67 src/doc/CHANGES-5.0.3:1.1.2.68 --- src/doc/CHANGES-5.0.3:1.1.2.67 Sat Mar 17 19:23:46 2012 +++ src/doc/CHANGES-5.0.3 Sat Mar 17 19:32:13 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.67 2012/03/17 19:23:46 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.68 2012/03/17 19:32:13 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2993,3 +2993,8 @@ usr.bin/ktruss/makeerrnos.sh 1.6 portable. The latter is not supported by Mac OS X Lion. [dyoung, ticket #1742] +sbin/mount/mount.81.73, 1.74 + + Clarify UFS2 superblock format stuff. Bump date. Fix PR 45166. + [dholland, ticket #1743] +
CVS commit: [netbsd-5-1] src/sbin/mount
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:32:43 UTC 2012 Modified Files: src/sbin/mount [netbsd-5-1]: mount.8 Log Message: Pull up following revision(s) (requested by dholland in ticket #1743): sbin/mount/mount.8: revision 1.73 sbin/mount/mount.8: revision 1.74 Clarify UFS2 superblock format stuff. Bump date. Improve previous; thanks to tsutsui-san for reminding me of the proper reference. PR 45166 To generate a diff of this commit: cvs rdiff -u -r1.62.2.3 -r1.62.2.3.6.1 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.62.2.3 src/sbin/mount/mount.8:1.62.2.3.6.1 --- src/sbin/mount/mount.8:1.62.2.3 Thu Jan 22 23:03:17 2009 +++ src/sbin/mount/mount.8 Sat Mar 17 19:32:43 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount.8,v 1.62.2.3 2009/01/22 23:03:17 snj Exp $ +.\ $NetBSD: mount.8,v 1.62.2.3.6.1 2012/03/17 19:32:43 bouyer Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)mount.8 8.8 (Berkeley) 6/16/94 .\ -.Dd January 20, 2009 +.Dd July 22, 2011 .Dt MOUNT 8 .Os .Sh NAME @@ -292,7 +292,7 @@ It requires the .Dv SOFTDEP option to be enabled in the running kernel. .It Cm log -(FFS only with UFS2 superblock layout) +(FFS only) Mount the file system with .Xr wapbl 4 meta-data journaling. @@ -313,6 +313,16 @@ option to be enabled in the running kern See .Xr wapbl 4 for more information. +This option requires the +.Dq UFS2 +.Pq level 4 +superblock layout, which is the default for newly created FFSv1 and +FFSv2 file systems. +To update an old file system with an earlier superblock format, +use the +.Fl c +option of +.Xr fsck_ffs 8 . .It Cm symperm Recognize permission of symbolic link when reading or traversing link. .It Cm sync
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:33:04 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: ticket 1743 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-5.1.3 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.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.8 src/doc/CHANGES-5.1.3:1.1.2.9 --- src/doc/CHANGES-5.1.3:1.1.2.8 Sat Mar 17 19:17:04 2012 +++ src/doc/CHANGES-5.1.3 Sat Mar 17 19:33:04 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.8 2012/03/17 19:17:04 bouyer Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.9 2012/03/17 19:33:04 bouyer Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -79,3 +79,8 @@ usr.bin/ktruss/makeerrnos.sh 1.6 portable. The latter is not supported by Mac OS X Lion. [dyoung, ticket #1742] +sbin/mount/mount.81.73, 1.74 + + Clarify UFS2 superblock format stuff. Bump date. Fix PR 45166. + [dholland, ticket #1743] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:33:22 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: ticket 1743 To generate a diff of this commit: cvs rdiff -u -r1.1.2.148 -r1.1.2.149 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.148 src/doc/CHANGES-5.2:1.1.2.149 --- src/doc/CHANGES-5.2:1.1.2.148 Sat Mar 17 19:17:15 2012 +++ src/doc/CHANGES-5.2 Sat Mar 17 19:33:21 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.148 2012/03/17 19:17:15 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.149 2012/03/17 19:33:21 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -6229,3 +6229,8 @@ usr.bin/ktruss/makeerrnos.sh 1.6 portable. The latter is not supported by Mac OS X Lion. [dyoung, ticket #1742] +sbin/mount/mount.81.73, 1.74 + + Clarify UFS2 superblock format stuff. Bump date. Fix PR 45166. + [dholland, ticket #1743] +
CVS commit: [netbsd-4-0] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:39:35 UTC 2012
Modified Files:
src/doc [netbsd-4-0]: HACKS
src/sys/arch/sparc64/conf [netbsd-4-0]: Makefile.sparc64 files.sparc64
src/sys/arch/sparc64/sparc64 [netbsd-4-0]: locore.s
Log Message:
Pull up following revision(s) via patch (requested by nakayama in ticket #1443):
sys/arch/sparc64/conf/Makefile.sparc64: revision 1.71
doc/HACKS: revision 1.123
sys/arch/sparc64/conf/files.sparc64: revision 1.138
sys/arch/sparc64/sparc64/locore.s: revision 1.340
Fix the root cause of the hack disable optimizations for uvm_bio.c
on 32 bit kernels.
gcc converts a division in the calculation of UBC_UMAP_ADDR macro
to multiplication (smul or combination of add/sll), and the
register of its result contains a garbage in upper 32 bits (the
upper 32 bits of smul/add/sll's result isn't zero cleared).
Then it passes to pseg_get{,_real} through pmap_extract without the
zero clear of upper 32 bits in the optimization case. So the
result of pseg_get and pmap_extact sometimes gets screwed up.
The hack has been resolved in the revision 1.340 of
sys/arch/sparc64/sparc64/locore.s.
To generate a diff of this commit:
cvs rdiff -u -r1.91.2.2 -r1.91.2.2.2.1 src/doc/HACKS
cvs rdiff -u -r1.62.12.1 -r1.62.12.1.4.1 \
src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.107 -r1.107.8.1 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.232.2.2.4.1 -r1.232.2.2.4.2 \
src/sys/arch/sparc64/sparc64/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/doc/HACKS
diff -u src/doc/HACKS:1.91.2.2 src/doc/HACKS:1.91.2.2.2.1
--- src/doc/HACKS:1.91.2.2 Thu Jul 19 14:38:17 2007
+++ src/doc/HACKS Sat Mar 17 19:39:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.91.2.2 2007/07/19 14:38:17 liamjfoy Exp $
+# $NetBSD: HACKS,v 1.91.2.2.2.1 2012/03/17 19:39:34 bouyer Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -569,18 +569,6 @@ port m68000
toolchains on sun2 with its maximum 4MB RAM)
kcah
-port sparc64
-
- hack disable optimzations for uvm_bio.c on 32 bit kernels
- cdate Sun Mar 21 14:14:04 MET 2004
- who martin
- file sys/arch/sparc64/conf/Makefile.sparc64 : 1.53-1.54
- file sys/arch/sparc64/conf/files.sparc64 : 1.93
- descr
- The sparc compiler miscompiles uvm_bio.c when using
- any optimization. This results in ubc_release panics.
- kcah
-
port macppc
hack remove inline from rotate_{left,right}
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.1 src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.1.4.1
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.1 Tue Jun 5 20:22:33 2007
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 17 19:39:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.62.12.1 2007/06/05 20:22:33 bouyer Exp $
+# $NetBSD: Makefile.sparc64,v 1.62.12.1.4.1 2012/03/17 19:39:32 bouyer Exp $
#=
#
@@ -57,7 +57,6 @@ CPPFLAGS+= -Dsparc64 -D__sparc64__
# 64-bit kernels
CPPFLAGS+= -D_LP64 -Wa,-Av9a
AFLAGS+= -Wa,-Av9a
-CC_NOOPT= ${NORMAL_C}
.if defined(PROF)
# Profiling is only supported in the medium low memory model.
CFLAGS+= -mcmodel=medlow
@@ -69,10 +68,6 @@ CFLAGS+= -mcmodel=medlow
# 32-bit kernels
CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultrasparc
AFLAGS+= -Wa,-Av8plusa
-# XXX
-# The sparc gcc version 3.3.3 (NetBSD nb1 20040301) does not compile this
-# file properly with higher optimizations
-CC_NOOPT= ${NORMAL_C:C/-O./-O0/}
.endif
CFLAGS+= -mno-fpu
AFLAGS+= -x assembler-with-cpp -traditional-cpp
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.107 src/sys/arch/sparc64/conf/files.sparc64:1.107.8.1
--- src/sys/arch/sparc64/conf/files.sparc64:1.107 Thu Nov 9 15:08:04 2006
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 17 19:39:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.107 2006/11/09 15:08:04 tsutsui Exp $
+# $NetBSD: files.sparc64,v 1.107.8.1 2012/03/17 19:39:33 bouyer Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -248,6 +248,3 @@ file netns/ns_cksum.c ns
file dev/md_root.c memory_disk_hooks
include arch/sparc64/conf/majors.sparc64
-
-# special compiler settings (no optimization if 32bit kernel)
-file uvm/uvm_bio.c compile-with ${CC_NOOPT}
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.232.2.2.4.1 src/sys/arch/sparc64/sparc64/locore.s:1.232.2.2.4.2
--- src/sys/arch/sparc64/sparc64/locore.s:1.232.2.2.4.1 Sun Jul 6 17:32:51 2008
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Mar 17 19:39:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.232.2.2.4.1 2008/07/06 17:32:51 bouyer Exp $ */
+/* $NetBSD:
CVS commit: [netbsd-4-0] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:40:06 UTC 2012
Modified Files:
src/doc [netbsd-4-0]: CHANGES-4.0.2
Log Message:
ticket 1443
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.96 -r1.1.2.97 src/doc/CHANGES-4.0.2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-4.0.2
diff -u src/doc/CHANGES-4.0.2:1.1.2.96 src/doc/CHANGES-4.0.2:1.1.2.97
--- src/doc/CHANGES-4.0.2:1.1.2.96 Fri Mar 2 17:49:02 2012
+++ src/doc/CHANGES-4.0.2 Sat Mar 17 19:40:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-4.0.2,v 1.1.2.96 2012/03/02 17:49:02 riz Exp $
+# $NetBSD: CHANGES-4.0.2,v 1.1.2.97 2012/03/17 19:40:06 bouyer Exp $
A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2
release:
@@ -1339,3 +1339,21 @@ share/zoneinfo/zone.tabpatch
Update to tzdata2012b.
[apb, ticket #1442]
+doc/HACKS 1.123 via patch
+sys/arch/sparc64/conf/Makefile.sparc64 1.71 via patch
+sys/arch/sparc64/conf/files.sparc64 1.138 via patch
+sys/arch/sparc64/sparc64/locore.s 1.340 via patch
+
+ Fix the root cause of the hack disable optimizations for uvm_bio.c
+ on 32 bit kernels.
+
+ gcc converts a division in the calculation of UBC_UMAP_ADDR macro
+ to multiplication (smul or combination of add/sll), and the
+ register of its result contains a garbage in upper 32 bits (the
+ upper 32 bits of smul/add/sll's result isn't zero cleared).
+
+ Then it passes to pseg_get{,_real} through pmap_extract without the
+ zero clear of upper 32 bits in the optimization case. So the
+ result of pseg_get and pmap_extact sometimes gets screwed up.
+ [nakayama, ticket #1443]
+
CVS commit: [netbsd-4] src
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:40:41 UTC 2012
Modified Files:
src/doc [netbsd-4]: HACKS
src/sys/arch/sparc64/conf [netbsd-4]: Makefile.sparc64 files.sparc64
src/sys/arch/sparc64/sparc64 [netbsd-4]: locore.s
Log Message:
Pull up following revision(s) via patch (requested by nakayama in ticket #1443):
sys/arch/sparc64/conf/Makefile.sparc64: revision 1.71
doc/HACKS: revision 1.123
sys/arch/sparc64/conf/files.sparc64: revision 1.138
sys/arch/sparc64/sparc64/locore.s: revision 1.340
Fix the root cause of the hack disable optimizations for uvm_bio.c
on 32 bit kernels.
gcc converts a division in the calculation of UBC_UMAP_ADDR macro
to multiplication (smul or combination of add/sll), and the
register of its result contains a garbage in upper 32 bits (the
upper 32 bits of smul/add/sll's result isn't zero cleared).
Then it passes to pseg_get{,_real} through pmap_extract without the
zero clear of upper 32 bits in the optimization case. So the
result of pseg_get and pmap_extact sometimes gets screwed up.
The hack has been resolved in the revision 1.340 of
sys/arch/sparc64/sparc64/locore.s.
To generate a diff of this commit:
cvs rdiff -u -r1.91.2.3 -r1.91.2.4 src/doc/HACKS
cvs rdiff -u -r1.62.12.1 -r1.62.12.2 \
src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.107 -r1.107.2.1 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.232.2.5 -r1.232.2.6 src/sys/arch/sparc64/sparc64/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/doc/HACKS
diff -u src/doc/HACKS:1.91.2.3 src/doc/HACKS:1.91.2.4
--- src/doc/HACKS:1.91.2.3 Mon Sep 29 20:23:31 2008
+++ src/doc/HACKS Sat Mar 17 19:40:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.91.2.3 2008/09/29 20:23:31 jdc Exp $
+# $NetBSD: HACKS,v 1.91.2.4 2012/03/17 19:40:41 bouyer Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -578,18 +578,6 @@ port m68000
toolchains on sun2 with its maximum 4MB RAM)
kcah
-port sparc64
-
- hack disable optimzations for uvm_bio.c on 32 bit kernels
- cdate Sun Mar 21 14:14:04 MET 2004
- who martin
- file sys/arch/sparc64/conf/Makefile.sparc64 : 1.53-1.54
- file sys/arch/sparc64/conf/files.sparc64 : 1.93
- descr
- The sparc compiler miscompiles uvm_bio.c when using
- any optimization. This results in ubc_release panics.
- kcah
-
port macppc
hack remove inline from rotate_{left,right}
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.1 src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.2
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.62.12.1 Tue Jun 5 20:22:33 2007
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 17 19:40:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.62.12.1 2007/06/05 20:22:33 bouyer Exp $
+# $NetBSD: Makefile.sparc64,v 1.62.12.2 2012/03/17 19:40:40 bouyer Exp $
#=
#
@@ -57,7 +57,6 @@ CPPFLAGS+= -Dsparc64 -D__sparc64__
# 64-bit kernels
CPPFLAGS+= -D_LP64 -Wa,-Av9a
AFLAGS+= -Wa,-Av9a
-CC_NOOPT= ${NORMAL_C}
.if defined(PROF)
# Profiling is only supported in the medium low memory model.
CFLAGS+= -mcmodel=medlow
@@ -69,10 +68,6 @@ CFLAGS+= -mcmodel=medlow
# 32-bit kernels
CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultrasparc
AFLAGS+= -Wa,-Av8plusa
-# XXX
-# The sparc gcc version 3.3.3 (NetBSD nb1 20040301) does not compile this
-# file properly with higher optimizations
-CC_NOOPT= ${NORMAL_C:C/-O./-O0/}
.endif
CFLAGS+= -mno-fpu
AFLAGS+= -x assembler-with-cpp -traditional-cpp
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.107 src/sys/arch/sparc64/conf/files.sparc64:1.107.2.1
--- src/sys/arch/sparc64/conf/files.sparc64:1.107 Thu Nov 9 15:08:04 2006
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 17 19:40:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.107 2006/11/09 15:08:04 tsutsui Exp $
+# $NetBSD: files.sparc64,v 1.107.2.1 2012/03/17 19:40:40 bouyer Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -248,6 +248,3 @@ file netns/ns_cksum.c ns
file dev/md_root.c memory_disk_hooks
include arch/sparc64/conf/majors.sparc64
-
-# special compiler settings (no optimization if 32bit kernel)
-file uvm/uvm_bio.c compile-with ${CC_NOOPT}
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.232.2.5 src/sys/arch/sparc64/sparc64/locore.s:1.232.2.6
--- src/sys/arch/sparc64/sparc64/locore.s:1.232.2.5 Thu Sep 25 19:40:12 2008
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Mar 17 19:40:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.232.2.5 2008/09/25 19:40:12 bouyer Exp $ */
+/* $NetBSD: locore.s,v 1.232.2.6 2012/03/17 19:40:41 bouyer Exp $ */
/*
*
CVS commit: [netbsd-4] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:41:02 UTC 2012
Modified Files:
src/doc [netbsd-4]: CHANGES-4.1
Log Message:
ticket 1443
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.235 -r1.1.2.236 src/doc/CHANGES-4.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-4.1
diff -u src/doc/CHANGES-4.1:1.1.2.235 src/doc/CHANGES-4.1:1.1.2.236
--- src/doc/CHANGES-4.1:1.1.2.235 Fri Mar 2 17:47:48 2012
+++ src/doc/CHANGES-4.1 Sat Mar 17 19:41:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-4.1,v 1.1.2.235 2012/03/02 17:47:48 riz Exp $
+# $NetBSD: CHANGES-4.1,v 1.1.2.236 2012/03/17 19:41:02 bouyer Exp $
A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1
release:
@@ -4600,3 +4600,21 @@ share/zoneinfo/zone.tabpatch
Update to tzdata2012b.
[apb, ticket #1442]
+doc/HACKS 1.123 via patch
+sys/arch/sparc64/conf/Makefile.sparc64 1.71 via patch
+sys/arch/sparc64/conf/files.sparc64 1.138 via patch
+sys/arch/sparc64/sparc64/locore.s 1.340 via patch
+
+ Fix the root cause of the hack disable optimizations for uvm_bio.c
+ on 32 bit kernels.
+
+ gcc converts a division in the calculation of UBC_UMAP_ADDR macro
+ to multiplication (smul or combination of add/sll), and the
+ register of its result contains a garbage in upper 32 bits (the
+ upper 32 bits of smul/add/sll's result isn't zero cleared).
+
+ Then it passes to pseg_get{,_real} through pmap_extract without the
+ zero clear of upper 32 bits in the optimization case. So the
+ result of pseg_get and pmap_extact sometimes gets screwed up.
+ [nakayama, ticket #1443]
+
CVS commit: [netbsd-6] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 19:51:46 UTC 2012
Modified Files:
src/sys/netinet [netbsd-6]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by jruoho in ticket #124):
sys/netinet/tcp_usrreq.c: revision 1.163
PR/46077: M. Nunberg: Stat should not fial on connecting socket.
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.162.2.1 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.162 src/sys/netinet/tcp_usrreq.c:1.162.2.1
--- src/sys/netinet/tcp_usrreq.c:1.162 Thu Feb 2 19:43:07 2012
+++ src/sys/netinet/tcp_usrreq.c Sat Mar 17 19:51:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.162 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.162 2012/02/02 19:43:07 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -267,11 +267,11 @@ tcp_usrreq(struct socket *so, int req,
* a (struct inpcb) pointed at by the socket, and this
* structure will point at a subsidary (struct tcpcb).
*/
-#ifndef INET6
- if (inp == 0 req != PRU_ATTACH)
-#else
- if ((inp == 0 in6p == 0) req != PRU_ATTACH)
+ if ((inp == 0
+#ifdef INET6
+ in6p == 0
#endif
+ ) (req != PRU_ATTACH req != PRU_SENSE))
{
error = EINVAL;
goto release;
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sat Mar 17 19:52:08 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: ticket 124 To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.55 src/doc/CHANGES-6.0:1.1.2.56 --- src/doc/CHANGES-6.0:1.1.2.55 Sat Mar 17 17:55:47 2012 +++ src/doc/CHANGES-6.0 Sat Mar 17 19:52:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.55 2012/03/17 17:55:47 bouyer Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.56 2012/03/17 19:52:08 bouyer Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -1386,3 +1386,8 @@ sys/arch/sparc64/include/param.h 1.49, kernel_map on machines with 8GB (or more) main memory. [martin, ticket #123] +sys/netinet/tcp_usrreq.c 1.163 + + PR/46077: M. Nunberg: Stat should not fial on connecting socket. + [jruoho, ticket #124] +
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: riz Date: Sat Mar 17 19:54:09 UTC 2012 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: Add drvctl to macppc GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/sys/arch/macppc/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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.298 src/sys/arch/macppc/conf/GENERIC:1.299 --- src/sys/arch/macppc/conf/GENERIC:1.298 Sat Mar 10 21:51:54 2012 +++ src/sys/arch/macppc/conf/GENERIC Sat Mar 17 19:54:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.298 2012/03/10 21:51:54 joerg Exp $ +# $NetBSD: GENERIC,v 1.299 2012/03/17 19:54:09 riz Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/macppc/conf/std.macppc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.298 $ +#ident GENERIC-$Revision: 1.299 $ maxusers 32 @@ -613,6 +613,9 @@ pseudo-device nsmb # SMB requester #pseudo-device pflog # PF log if pseudo-device putter # for puffs and pud +# userland interface to drivers, including autoconf and properties retrieval +pseudo-device drvctl + # Veriexec # # a pseudo device needed for veriexec
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: riz Date: Sat Mar 17 19:57:14 UTC 2012 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: Add autodiscover wedge support to macppc GENERIC, to allow use of GPT-partitioned disks in a similar way to amd64/i386. To generate a diff of this commit: cvs rdiff -u -r1.299 -r1.300 src/sys/arch/macppc/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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.299 src/sys/arch/macppc/conf/GENERIC:1.300 --- src/sys/arch/macppc/conf/GENERIC:1.299 Sat Mar 17 19:54:09 2012 +++ src/sys/arch/macppc/conf/GENERIC Sat Mar 17 19:57:14 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.299 2012/03/17 19:54:09 riz Exp $ +# $NetBSD: GENERIC,v 1.300 2012/03/17 19:57:14 riz Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/macppc/conf/std.macppc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.299 $ +#ident GENERIC-$Revision: 1.300 $ maxusers 32 @@ -81,6 +81,13 @@ options COMPAT_43 # and 4.3BSD #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER# Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#optionsDKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#optionsDKWEDGE_METHOD_MBR # Support MBR partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux)
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Sat Mar 17 20:01:15 UTC 2012
Modified Files:
src/lib/libc/gen: humanize_number.c
Log Message:
PR/44097: Yamamoto Takashi: Prevent overflow.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/humanize_number.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/humanize_number.c
diff -u src/lib/libc/gen/humanize_number.c:1.15 src/lib/libc/gen/humanize_number.c:1.16
--- src/lib/libc/gen/humanize_number.c:1.15 Tue Mar 13 17:13:36 2012
+++ src/lib/libc/gen/humanize_number.c Sat Mar 17 16:01:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: humanize_number.c,v 1.15 2012/03/13 21:13:36 christos Exp $ */
+/* $NetBSD: humanize_number.c,v 1.16 2012/03/17 20:01:14 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: humanize_number.c,v 1.15 2012/03/13 21:13:36 christos Exp $);
+__RCSID($NetBSD: humanize_number.c,v 1.16 2012/03/17 20:01:14 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -49,7 +49,7 @@ humanize_number(char *buf, size_t len, i
{
const char *prefixes, *sep;
int b, r, s1, s2, sign;
- int64_t divisor, max;
+ int64_t divisor, max, post = 1;
size_t i, baselen, maxscale;
_DIAGASSERT(buf != NULL);
@@ -89,12 +89,23 @@ humanize_number(char *buf, size_t len, i
buf[0] = '\0';
if (bytes 0) {
sign = -1;
- bytes *= -100;
baselen = 3; /* sign, digit, prefix */
+ if (-bytes INT64_MAX / 100)
+ bytes *= -100;
+ else {
+ bytes = -bytes;
+ post = 100;
+ baselen += 2;
+ }
} else {
sign = 1;
- bytes *= 100;
baselen = 2; /* digit, prefix */
+ if (bytes INT64_MAX / 100)
+ bytes *= 100;
+ else {
+ post = 100;
+ baselen += 2;
+ }
}
if (flags HN_NOSPACE)
sep = ;
@@ -128,6 +139,7 @@ humanize_number(char *buf, size_t len, i
} else
for (i = 0; i (size_t)scale i maxscale; i++)
bytes /= divisor;
+ bytes *= post;
/* If a value = 9.9 after rounding and ... */
if (bytes 995 i 0 flags HN_DECIMAL) {
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: christos
Date: Sat Mar 17 20:06:46 UTC 2012
Modified Files:
src/tests/lib/libc/gen: t_humanize_number.c
Log Message:
This does not fail anymore. Explain why the test was modified.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/gen/t_humanize_number.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_humanize_number.c
diff -u src/tests/lib/libc/gen/t_humanize_number.c:1.6 src/tests/lib/libc/gen/t_humanize_number.c:1.7
--- src/tests/lib/libc/gen/t_humanize_number.c:1.6 Wed Mar 14 21:44:07 2012
+++ src/tests/lib/libc/gen/t_humanize_number.c Sat Mar 17 16:06:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_humanize_number.c,v 1.6 2012/03/15 01:44:07 joerg Exp $ */
+/* $NetBSD: t_humanize_number.c,v 1.7 2012/03/17 20:06:46 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -247,7 +247,7 @@ ATF_TC(humanize_number_big);
ATF_TC_HEAD(humanize_number_big, tc)
{
- atf_tc_set_md_var(tc, descr, Test humanize big numbers);
+ atf_tc_set_md_var(tc, descr, Test humanize big numbers (PR/44097));
}
ATF_TC_BODY(humanize_number_big, tc)
@@ -255,26 +255,22 @@ ATF_TC_BODY(humanize_number_big, tc)
char buf[1024];
int rv;
- atf_tc_expect_fail(PR lib/44097);
-
/*
* Seems to work.
*/
(void)memset(buf, 0, sizeof(buf));
- rv = humanize_number(buf, 10, 1, ,
- HN_AUTOSCALE, HN_NOSPACE);
+ rv = humanize_number(buf, 10, 1, , HN_AUTOSCALE, HN_NOSPACE);
ATF_REQUIRE(rv != -1);
- ATF_REQUIRE(strcmp(buf, 1) == 0);
+ ATF_CHECK_STREQ(buf, 1);
/*
* A bogus value with large number.
*/
(void)memset(buf, 0, sizeof(buf));
- rv = humanize_number(buf, 10, INT64_MAX, ,
- HN_AUTOSCALE, HN_NOSPACE);
+ rv = humanize_number(buf, 10, INT64_MAX, , HN_AUTOSCALE, HN_NOSPACE);
ATF_REQUIRE(rv != -1);
ATF_REQUIRE(strcmp(buf, 0) != 0);
@@ -293,12 +289,14 @@ ATF_TC_BODY(humanize_number_big, tc)
/*
* Tight buffer.
*
- * The man page says that len must be at least 4, but...
+ * The man page says that len must be at least 4.
+ * 3 works, but anything less that will not. This
+ * is because baselen starts with 2 for positive
+ * numbers.
*/
(void)memset(buf, 0, sizeof(buf));
- rv = humanize_number(buf, 1, 1, ,
- HN_AUTOSCALE, HN_NOSPACE);
+ rv = humanize_number(buf, 3, 1, , HN_AUTOSCALE, HN_NOSPACE);
ATF_REQUIRE(rv != -1);
}
CVS commit: src/tests/lib/libc/gen
Module Name:src Committed By: christos Date: Sat Mar 17 20:10:08 UTC 2012 Modified Files: src/tests/lib/libc/gen: t_siginfo.c Log Message: annotate the PR that failed, and has been fixed. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libc/gen/t_siginfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/gen/t_siginfo.c diff -u src/tests/lib/libc/gen/t_siginfo.c:1.12 src/tests/lib/libc/gen/t_siginfo.c:1.13 --- src/tests/lib/libc/gen/t_siginfo.c:1.12 Sat Oct 1 13:46:10 2011 +++ src/tests/lib/libc/gen/t_siginfo.c Sat Mar 17 16:10:08 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: t_siginfo.c,v 1.12 2011/10/01 17:46:10 christos Exp $ */ +/* $NetBSD: t_siginfo.c,v 1.13 2012/03/17 20:10:08 christos Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -332,9 +332,6 @@ sigfpe_int_action(int signo, siginfo_t * atf_tc_fail(INTDIV handler called more than once); ATF_REQUIRE_EQ(info-si_signo, SIGFPE); - if (info-si_code == FPE_FLTDIV) - atf_tc_expect_fail(PR port-i386/43655 : integer div-by-zero - reports FPE_FLTDIV instead of FPE_INTDIV); ATF_REQUIRE_EQ(info-si_code, FPE_INTDIV); atf_tc_expect_pass(); ATF_REQUIRE_EQ(info-si_errno, 0); @@ -348,7 +345,7 @@ ATF_TC_HEAD(sigfpe_int, tc) atf_tc_set_md_var(tc, descr, Checks that signal trampoline correctly calls SIGFPE handler - for integer div-by-zero); + for integer div-by-zero PR/43655); } ATF_TC_BODY(sigfpe_int, tc)
CVS commit: src/tests/lib/libc/termios
Module Name:src
Committed By: christos
Date: Sat Mar 17 20:12:09 UTC 2012
Modified Files:
src/tests/lib/libc/termios: t_tcsetpgrp.c
Log Message:
this has been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/termios/t_tcsetpgrp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/termios/t_tcsetpgrp.c
diff -u src/tests/lib/libc/termios/t_tcsetpgrp.c:1.1 src/tests/lib/libc/termios/t_tcsetpgrp.c:1.2
--- src/tests/lib/libc/termios/t_tcsetpgrp.c:1.1 Sun May 1 07:39:38 2011
+++ src/tests/lib/libc/termios/t_tcsetpgrp.c Sat Mar 17 16:12:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_tcsetpgrp.c,v 1.1 2011/05/01 11:39:38 jruoho Exp $ */
+/* $NetBSD: t_tcsetpgrp.c,v 1.2 2012/03/17 20:12:09 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_tcsetpgrp.c,v 1.1 2011/05/01 11:39:38 jruoho Exp $);
+__RCSID($NetBSD: t_tcsetpgrp.c,v 1.2 2012/03/17 20:12:09 christos Exp $);
#include sys/wait.h
@@ -41,7 +41,8 @@ __RCSID($NetBSD: t_tcsetpgrp.c,v 1.1 20
ATF_TC(tcsetpgrp_err);
ATF_TC_HEAD(tcsetpgrp_err, tc)
{
- atf_tc_set_md_var(tc, descr, Test errors from tcsetpgrp(3));
+ atf_tc_set_md_var(tc, descr, Test errors from tcsetpgrp(3)
+ PR/41673);
}
ATF_TC_BODY(tcsetpgrp_err, tc)
@@ -52,8 +53,6 @@ ATF_TC_BODY(tcsetpgrp_err, tc)
if (isatty(STDIN_FILENO) == 0)
return;
- atf_tc_expect_fail(PR lib/41673);
-
pid = fork();
ATF_REQUIRE(pid = 0);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Mar 17 20:30:00 UTC 2012
Modified Files:
src/sys/dev/pci: autri.c autrivar.h
Log Message:
Split device_t
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/autri.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/autrivar.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/pci/autri.c
diff -u src/sys/dev/pci/autri.c:1.49 src/sys/dev/pci/autri.c:1.50
--- src/sys/dev/pci/autri.c:1.49 Mon Jan 30 19:41:18 2012
+++ src/sys/dev/pci/autri.c Sat Mar 17 20:29:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autri.c,v 1.49 2012/01/30 19:41:18 drochner Exp $ */
+/* $NetBSD: autri.c,v 1.50 2012/03/17 20:29:59 martin Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autri.c,v 1.49 2012/01/30 19:41:18 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: autri.c,v 1.50 2012/03/17 20:29:59 martin Exp $);
#include midi.h
@@ -286,7 +286,7 @@ autri_read_codec(void *sc_, uint8_t inde
break;
default:
printf(%s: autri_read_codec : unknown device\n,
- device_xname(sc-sc_dev));
+ device_xname(sc-sc_dev));
return -1;
}
@@ -298,7 +298,7 @@ autri_read_codec(void *sc_, uint8_t inde
if (count == 0x) {
printf(%s: Codec timeout. Busy reading AC'97 codec.\n,
- device_xname(sc-sc_dev));
+ device_xname(sc-sc_dev));
return -1;
}
@@ -314,7 +314,7 @@ autri_read_codec(void *sc_, uint8_t inde
if (count == 0x) {
printf(%s: Codec timeout. Busy reading AC'97 codec.\n,
- device_xname(sc-sc_dev));
+ device_xname(sc-sc_dev));
return -1;
}
@@ -360,7 +360,7 @@ autri_write_codec(void *sc_, uint8_t ind
break;
default:
printf(%s: autri_write_codec : unknown device.\n,
- device_xname(sc-sc_dev));
+ device_xname(sc-sc_dev));
return -1;
}
@@ -372,7 +372,7 @@ autri_write_codec(void *sc_, uint8_t ind
if (count == 0x) {
printf(%s: Codec timeout. Busy writing AC'97 codec\n,
- device_xname(sc-sc_dev));
+ device_xname(sc-sc_dev));
return -1;
}
@@ -443,7 +443,7 @@ autri_reset_codec(void *sc_)
break;
default:
printf(%s: autri_reset_codec : unknown device\n,
- device_xname(sc-sc_dev));
+ device_xname(sc-sc_dev));
return EOPNOTSUPP;
}
@@ -457,7 +457,7 @@ autri_reset_codec(void *sc_)
if (count == 0) {
printf(%s: Codec timeout. AC'97 is not ready for operation.\n,
- device_xname(sc-sc_dev));
+ device_xname(sc-sc_dev));
return ETIMEDOUT;
}
return 0;
@@ -524,6 +524,7 @@ autri_attach(device_t parent, device_t s
uint32_t reg;
sc = device_private(self);
+ sc-sc_dev = self;
pa = (struct pci_attach_args *)aux;
pc = pa-pa_pc;
@@ -536,7 +537,7 @@ autri_attach(device_t parent, device_t s
/* map register to memory */
if (pci_mapreg_map(pa, AUTRI_PCI_MEMORY_BASE,
PCI_MAPREG_TYPE_MEM, 0, sc-memt, sc-memh, NULL, NULL)) {
- aprint_error_dev(sc-sc_dev, can't map memory space\n);
+ aprint_error_dev(sc-sc_dev, can't map memory space\n);
return;
}
@@ -545,19 +546,19 @@ autri_attach(device_t parent, device_t s
/* map and establish the interrupt */
if (pci_intr_map(pa, ih)) {
- aprint_error_dev(sc-sc_dev, couldn't map interrupt\n);
+ aprint_error_dev(sc-sc_dev, couldn't map interrupt\n);
return;
}
intrstr = pci_intr_string(pc, ih);
sc-sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, autri_intr, sc);
if (sc-sc_ih == NULL) {
- aprint_error_dev(sc-sc_dev, couldn't establish interrupt);
+ aprint_error_dev(sc-sc_dev, couldn't establish interrupt);
if (intrstr != NULL)
aprint_error( at %s, intrstr);
aprint_error(\n);
return;
}
- aprint_normal_dev(sc-sc_dev, interrupting at %s\n, intrstr);
+ aprint_normal_dev(sc-sc_dev, interrupting at %s\n, intrstr);
sc-sc_dmatag = pa-pa_dmat;
sc-sc_pc = pc;
@@ -573,7 +574,6 @@ autri_attach(device_t parent, device_t s
/* attach AC'97 codec */
codec = sc-sc_codec;
- memcpy(codec-sc_dev, sc-sc_dev, sizeof(codec-sc_dev));
codec-sc = sc;
codec-host_if.arg = codec;
@@ -585,21 +585,21 @@ autri_attach(device_t parent, device_t s
r = ac97_attach(codec-host_if, self, sc-sc_lock);
if (r != 0) {
- aprint_error_dev(sc-sc_dev, can't attach codec (error 0x%X)\n, r);
+ aprint_error_dev(sc-sc_dev, can't attach codec (error 0x%X)\n, r);
return;
}
if (!pmf_device_register(self, NULL, autri_resume))
aprint_error_dev(self, couldn't establish power handler\n);
- audio_attach_mi(autri_hw_if, sc, sc-sc_dev);
+ audio_attach_mi(autri_hw_if, sc, sc-sc_dev);
#if NMIDI 0
- midi_attach_mi(autri_midi_hw_if, sc, sc-sc_dev);
+ midi_attach_mi(autri_midi_hw_if, sc, sc-sc_dev);
#endif
}
-CFATTACH_DECL(autri, sizeof(struct autri_softc),
+CFATTACH_DECL_NEW(autri, sizeof(struct autri_softc),
CVS commit: src/lib/libc/arch/sparc64
Module Name:src
Committed By: martin
Date: Sat Mar 17 20:48:59 UTC 2012
Modified Files:
src/lib/libc/arch/sparc64/gen: _lwp.c
src/lib/libc/arch/sparc64/softfloat: qp.c
Log Message:
Avoid lint warnings
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc64/gen/_lwp.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/sparc64/softfloat/qp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc64/gen/_lwp.c
diff -u src/lib/libc/arch/sparc64/gen/_lwp.c:1.6 src/lib/libc/arch/sparc64/gen/_lwp.c:1.7
--- src/lib/libc/arch/sparc64/gen/_lwp.c:1.6 Thu Feb 24 04:28:43 2011
+++ src/lib/libc/arch/sparc64/gen/_lwp.c Sat Mar 17 20:48:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: _lwp.c,v 1.6 2011/02/24 04:28:43 joerg Exp $ */
+/* $NetBSD: _lwp.c,v 1.7 2012/03/17 20:48:58 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: _lwp.c,v 1.6 2011/02/24 04:28:43 joerg Exp $);
+__RCSID($NetBSD: _lwp.c,v 1.7 2012/03/17 20:48:58 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -53,6 +53,7 @@ _lwp_makecontext(ucontext_t *u, void (*s
u-uc_stack.ss_sp = stack_base;
u-uc_stack.ss_size = stack_size;
+ /*LINTED*/
sp = (ulong *)(stack_base + stack_size);
sp = (ulong *)((ulong)sp ~0x0f);
@@ -62,6 +63,7 @@ _lwp_makecontext(ucontext_t *u, void (*s
sp[14] = (ulong)sp - 2047;
sp[15] = (ulong)_lwp_exit - 8;
+ /*LINTED*/
sp = (ulong *)((caddr_t)sp - 2047);
gr[_REG_PC] = (ulong) start;
Index: src/lib/libc/arch/sparc64/softfloat/qp.c
diff -u src/lib/libc/arch/sparc64/softfloat/qp.c:1.8 src/lib/libc/arch/sparc64/softfloat/qp.c:1.9
--- src/lib/libc/arch/sparc64/softfloat/qp.c:1.8 Wed Mar 14 17:03:10 2012
+++ src/lib/libc/arch/sparc64/softfloat/qp.c Sat Mar 17 20:48:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: qp.c,v 1.8 2012/03/14 17:03:10 martin Exp $ */
+/* $NetBSD: qp.c,v 1.9 2012/03/17 20:48:59 martin Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -271,15 +271,15 @@ _Qp_uxtoq(float128 *c, unsigned long a)
if (a 0x8000ULL) {
a = (a 1) | (a 1);
- *c = int64_to_float128(a);
+ *c = int64_to_float128((long long)a);
*c = float128_add(*c, *c);
} else
- *c = int64_to_float128(a);
+ *c = int64_to_float128((long long)a);
}
void
_Qp_xtoq(float128 *c, long a)
{
- *c = int64_to_float128(a);
+ *c = int64_to_float128((long long)a);
}
CVS commit: src/common/lib/libc/gen
Module Name:src
Committed By: martin
Date: Sat Mar 17 20:57:35 UTC 2012
Modified Files:
src/common/lib/libc/gen: bswap16.c
Log Message:
Mark linted
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/gen/bswap16.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gen/bswap16.c
diff -u src/common/lib/libc/gen/bswap16.c:1.3 src/common/lib/libc/gen/bswap16.c:1.4
--- src/common/lib/libc/gen/bswap16.c:1.3 Mon Jul 4 21:20:27 2011
+++ src/common/lib/libc/gen/bswap16.c Sat Mar 17 20:57:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap16.c,v 1.3 2011/07/04 21:20:27 joerg Exp $*/
+/* $NetBSD: bswap16.c,v 1.4 2012/03/17 20:57:35 martin Exp $*/
/*
* Written by Manuel Bouyer bou...@netbsd.org.
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: bswap16.c,v 1.3 2011/07/04 21:20:27 joerg Exp $);
+__RCSID($NetBSD: bswap16.c,v 1.4 2012/03/17 20:57:35 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#include sys/types.h
@@ -18,5 +18,6 @@ __RCSID($NetBSD: bswap16.c,v 1.3 2011/0
uint16_t
bswap16(uint16_t x)
{
+ /*LINTED*/
return ((x 8) 0xff00) | ((x 8) 0x00ff);
}
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Sat Mar 17 21:30:30 UTC 2012 Modified Files: src/sys/sys: types.h Log Message: PR/44847: Jukka Ruohonen: blksize_t should be signed. http://pubs.opengroup.org/onlinepubs/95399/basedefs/sys/types.h.html To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/sys/types.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/types.h diff -u src/sys/sys/types.h:1.88 src/sys/sys/types.h:1.89 --- src/sys/sys/types.h:1.88 Thu Jan 13 21:06:34 2011 +++ src/sys/sys/types.h Sat Mar 17 17:30:29 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.88 2011/01/14 02:06:34 rmind Exp $ */ +/* $NetBSD: types.h,v 1.89 2012/03/17 21:30:29 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1991, 1993, 1994 @@ -127,7 +127,7 @@ typedef int64_t longlong_t; /* for XDR typedef uint64_t u_longlong_t; /* for XDR */ typedef int64_t blkcnt_t; /* fs block count */ -typedef uint32_t blksize_t; /* fs optimal block size */ +typedef int32_t blksize_t; /* fs optimal block size */ #ifndef fsblkcnt_t typedef __fsblkcnt_t fsblkcnt_t; /* fs block count (statvfs) */
CVS commit: src/tests/include/sys
Module Name:src
Committed By: christos
Date: Sat Mar 17 21:31:30 UTC 2012
Modified Files:
src/tests/include/sys: t_types.c
Log Message:
this does not fail anymore
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/include/sys/t_types.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/include/sys/t_types.c
diff -u src/tests/include/sys/t_types.c:1.2 src/tests/include/sys/t_types.c:1.3
--- src/tests/include/sys/t_types.c:1.2 Mon Jul 11 12:12:56 2011
+++ src/tests/include/sys/t_types.c Sat Mar 17 17:31:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_types.c,v 1.2 2011/07/11 16:12:56 njoly Exp $ */
+/* $NetBSD: t_types.c,v 1.3 2012/03/17 21:31:29 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_types.c,v 1.2 2011/07/11 16:12:56 njoly Exp $);
+__RCSID($NetBSD: t_types.c,v 1.3 2012/03/17 21:31:29 christos Exp $);
#include sys/types.h
@@ -76,7 +76,8 @@ ATF_TC_BODY(types_limits, tc)
ATF_TC(types_signed);
ATF_TC_HEAD(types_signed, tc)
{
- atf_tc_set_md_var(tc, descr, Signed types(3));
+ atf_tc_set_md_var(tc, descr, Signed types(3)
+ PR/44847);
}
ATF_TC_BODY(types_signed, tc)
@@ -91,8 +92,6 @@ ATF_TC_BODY(types_signed, tc)
* As noted in types(3), the following
* types should be signed integers.
*/
- atf_tc_expect_fail(PR standards/44847);
-
bc = 0;
bs = 0;
off = 0;
CVS commit: src/tests/lib/libutil
Module Name:src
Committed By: christos
Date: Sat Mar 17 21:33:13 UTC 2012
Modified Files:
src/tests/lib/libutil: t_parsedate.c
Log Message:
mention the PR# in the description like everyone else.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libutil/t_parsedate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libutil/t_parsedate.c
diff -u src/tests/lib/libutil/t_parsedate.c:1.3 src/tests/lib/libutil/t_parsedate.c:1.4
--- src/tests/lib/libutil/t_parsedate.c:1.3 Sat Dec 17 14:07:34 2011
+++ src/tests/lib/libutil/t_parsedate.c Sat Mar 17 17:33:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_parsedate.c,v 1.3 2011/12/17 19:07:34 apb Exp $ */
+/* $NetBSD: t_parsedate.c,v 1.4 2012/03/17 21:33:13 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_parsedate.c,v 1.3 2011/12/17 19:07:34 apb Exp $);
+__RCSID($NetBSD: t_parsedate.c,v 1.4 2012/03/17 21:33:13 christos Exp $);
#include atf-c.h
#include util.h
@@ -38,13 +38,13 @@ ATF_TC(dates);
ATF_TC_HEAD(dates, tc)
{
- atf_tc_set_md_var(tc, descr, Test unambiguous dates);
+ atf_tc_set_md_var(tc, descr, Test unambiguous dates
+ PR/44255);
}
ATF_TC_BODY(dates, tc)
{
-// atf_tc_expect_fail(PR lib/44255);
ATF_CHECK(parsedate(69-09-10, NULL, NULL) != -1);
ATF_CHECK(parsedate(2006-11-17, NULL, NULL) != -1);
ATF_CHECK(parsedate(10/1/2000, NULL, NULL) != -1);
@@ -60,13 +60,13 @@ ATF_TC(times);
ATF_TC_HEAD(times, tc)
{
- atf_tc_set_md_var(tc, descr, Test times);
+ atf_tc_set_md_var(tc, descr, Test times
+ PR/44255);
}
ATF_TC_BODY(times, tc)
{
-// atf_tc_expect_fail(PR lib/44255);
ATF_CHECK(parsedate(10:01, NULL, NULL) != -1);
ATF_CHECK(parsedate(10:12pm, NULL, NULL) != -1);
ATF_CHECK(parsedate(12:11:01.12, NULL, NULL) != -1);
@@ -77,13 +77,13 @@ ATF_TC(relative);
ATF_TC_HEAD(relative, tc)
{
- atf_tc_set_md_var(tc, descr, Test relative items);
+ atf_tc_set_md_var(tc, descr, Test relative items
+ PR/44255);
}
ATF_TC_BODY(relative, tc)
{
-// atf_tc_expect_fail(PR lib/44255);
ATF_CHECK(parsedate(-1 month, NULL, NULL) != -1);
ATF_CHECK(parsedate(last friday, NULL, NULL) != -1);
ATF_CHECK(parsedate(one week ago, NULL, NULL) != -1);
CVS commit: src/lib/libc/arch/sparc64/gen
Module Name:src
Committed By: martin
Date: Sat Mar 17 21:35:06 UTC 2012
Modified Files:
src/lib/libc/arch/sparc64/gen: flt_rounds.c fpgetmask.c fpgetround.c
fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c longjmp.c
makecontext.c
Log Message:
delint
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sparc64/gen/flt_rounds.c \
src/lib/libc/arch/sparc64/gen/fpgetmask.c \
src/lib/libc/arch/sparc64/gen/fpgetround.c \
src/lib/libc/arch/sparc64/gen/fpsetround.c \
src/lib/libc/arch/sparc64/gen/makecontext.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/sparc64/gen/fpgetsticky.c \
src/lib/libc/arch/sparc64/gen/fpsetmask.c \
src/lib/libc/arch/sparc64/gen/fpsetsticky.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc64/gen/longjmp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc64/gen/flt_rounds.c
diff -u src/lib/libc/arch/sparc64/gen/flt_rounds.c:1.4 src/lib/libc/arch/sparc64/gen/flt_rounds.c:1.5
--- src/lib/libc/arch/sparc64/gen/flt_rounds.c:1.4 Sat Dec 24 23:10:08 2005
+++ src/lib/libc/arch/sparc64/gen/flt_rounds.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: flt_rounds.c,v 1.4 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: flt_rounds.c,v 1.5 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: flt_rounds.c,v 1.4 2005/12/24 23:10:08 perry Exp $);
+__RCSID($NetBSD: flt_rounds.c,v 1.5 2012/03/17 21:35:06 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#include sys/types.h
@@ -23,7 +23,7 @@ static const int map[] = {
int
__flt_rounds()
{
- int x;
+ uint32_t x;
__asm(st %%fsr,%0 : =m (*x));
return map[(x 30) 0x03];
Index: src/lib/libc/arch/sparc64/gen/fpgetmask.c
diff -u src/lib/libc/arch/sparc64/gen/fpgetmask.c:1.4 src/lib/libc/arch/sparc64/gen/fpgetmask.c:1.5
--- src/lib/libc/arch/sparc64/gen/fpgetmask.c:1.4 Sat Dec 24 23:10:08 2005
+++ src/lib/libc/arch/sparc64/gen/fpgetmask.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetmask.c,v 1.4 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpgetmask.c,v 1.5 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpgetmask.c,v 1.4 2005/12/24 23:10:08 perry Exp $);
+__RCSID($NetBSD: fpgetmask.c,v 1.5 2012/03/17 21:35:06 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
+#include sys/types.h
#include ieeefp.h
#ifdef __weak_alias
@@ -21,7 +22,7 @@ __weak_alias(fpgetmask,_fpgetmask)
fp_except
fpgetmask()
{
- int x;
+ uint32_t x;
__asm(st %%fsr,%0 : =m (*x));
return (x 23) 0x1f;
Index: src/lib/libc/arch/sparc64/gen/fpgetround.c
diff -u src/lib/libc/arch/sparc64/gen/fpgetround.c:1.4 src/lib/libc/arch/sparc64/gen/fpgetround.c:1.5
--- src/lib/libc/arch/sparc64/gen/fpgetround.c:1.4 Sat Dec 24 23:10:08 2005
+++ src/lib/libc/arch/sparc64/gen/fpgetround.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetround.c,v 1.4 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpgetround.c,v 1.5 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpgetround.c,v 1.4 2005/12/24 23:10:08 perry Exp $);
+__RCSID($NetBSD: fpgetround.c,v 1.5 2012/03/17 21:35:06 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
+#include sys/types.h
#include ieeefp.h
#ifdef __weak_alias
@@ -21,7 +22,7 @@ __weak_alias(fpgetround,_fpgetround)
fp_rnd
fpgetround()
{
- int x;
+ uint32_t x;
__asm(st %%fsr,%0 : =m (*x));
return (x 30) 0x03;
Index: src/lib/libc/arch/sparc64/gen/fpsetround.c
diff -u src/lib/libc/arch/sparc64/gen/fpsetround.c:1.4 src/lib/libc/arch/sparc64/gen/fpsetround.c:1.5
--- src/lib/libc/arch/sparc64/gen/fpsetround.c:1.4 Sat Dec 24 23:10:08 2005
+++ src/lib/libc/arch/sparc64/gen/fpsetround.c Sat Mar 17 21:35:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.4 2005/12/24 23:10:08 perry Exp $ */
+/* $NetBSD: fpsetround.c,v 1.5 2012/03/17 21:35:06 martin Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,11 +7,12 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpsetround.c,v 1.4 2005/12/24 23:10:08 perry Exp $);
+__RCSID($NetBSD: fpsetround.c,v 1.5 2012/03/17 21:35:06 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
+#include sys/types.h
#include ieeefp.h
#ifdef __weak_alias
@@ -33,5 +34,5 @@ fpsetround(rnd_dir)
__asm(ld %0,%%fsr : : m (*new));
- return (old 30) 0x03;
+ return ((uint32_t)old 30) 0x03;
}
Index: src/lib/libc/arch/sparc64/gen/makecontext.c
diff -u
CVS commit: src/common/lib/libc/gmon
Module Name:src
Committed By: martin
Date: Sat Mar 17 21:40:22 UTC 2012
Modified Files:
src/common/lib/libc/gmon: mcount.c
Log Message:
shut up lint
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/gmon/mcount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gmon/mcount.c
diff -u src/common/lib/libc/gmon/mcount.c:1.8 src/common/lib/libc/gmon/mcount.c:1.9
--- src/common/lib/libc/gmon/mcount.c:1.8 Mon Jan 5 18:06:57 2009
+++ src/common/lib/libc/gmon/mcount.c Sat Mar 17 21:40:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mcount.c,v 1.8 2009/01/05 18:06:57 pooka Exp $ */
+/* $NetBSD: mcount.c,v 1.9 2012/03/17 21:40:21 martin Exp $ */
/*
* Copyright (c) 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
#if 0
static char sccsid[] = @(#)mcount.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: mcount.c,v 1.8 2009/01/05 18:06:57 pooka Exp $);
+__RCSID($NetBSD: mcount.c,v 1.9 2012/03/17 21:40:21 martin Exp $);
#endif
#endif
@@ -93,11 +93,13 @@ extern struct gmonparam _gmondummy;
struct gmonparam *_m_gmon_alloc(void);
#endif
+#ifndef __LINT__
_MCOUNT_DECL __P((u_long, u_long))
#ifdef _KERNEL
__attribute__((__no_instrument_function__))
#endif
__used;
+#endif
/* XXX: make these interfaces */
#ifdef _RUMPKERNEL
@@ -124,6 +126,7 @@ _MCOUNT_DECL __P((u_long, u_long))
* both frompcindex and frompc. Any reasonable, modern compiler will
* perform this optimization.
*/
+#ifndef __LINT__
_MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
u_long frompc, selfpc;
{
@@ -258,6 +261,7 @@ overflow:
#endif
return;
}
+#endif
#ifdef MCOUNT
/*
CVS commit: src/sys/arch/sparc/include
Module Name:src
Committed By: martin
Date: Sat Mar 17 21:45:39 UTC 2012
Modified Files:
src/sys/arch/sparc/include: aout_machdep.h
Log Message:
mark reloc bitfield linted
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/include/aout_machdep.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/arch/sparc/include/aout_machdep.h
diff -u src/sys/arch/sparc/include/aout_machdep.h:1.9 src/sys/arch/sparc/include/aout_machdep.h:1.10
--- src/sys/arch/sparc/include/aout_machdep.h:1.9 Tue Dec 10 17:14:20 2002
+++ src/sys/arch/sparc/include/aout_machdep.h Sat Mar 17 21:45:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: aout_machdep.h,v 1.9 2002/12/10 17:14:20 thorpej Exp $ */
+/* $NetBSD: aout_machdep.h,v 1.10 2012/03/17 21:45:39 martin Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -52,6 +52,7 @@ struct relocation_info_sparc {
unsigned int r_symbolnum : 24, /* ordinal number of add symbol */
r_extern : 1, /* 1 if need to add symbol to value */
: 2; /* unused bits */
+ /*BITFIELDTYPE*/
enum reloc_type r_type : 5; /* relocation type time copy */
long r_addend; /* relocation addend */
};
CVS commit: src/sys/sys
Module Name:src
Committed By: martin
Date: Sat Mar 17 21:54:12 UTC 2012
Modified Files:
src/sys/sys: exec_aout.h
Log Message:
Remove some lint
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/sys/exec_aout.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/exec_aout.h
diff -u src/sys/sys/exec_aout.h:1.39 src/sys/sys/exec_aout.h:1.40
--- src/sys/sys/exec_aout.h:1.39 Thu Aug 20 22:07:49 2009
+++ src/sys/sys/exec_aout.h Sat Mar 17 21:54:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_aout.h,v 1.39 2009/08/20 22:07:49 he Exp $ */
+/* $NetBSD: exec_aout.h,v 1.40 2012/03/17 21:54:12 martin Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -88,16 +88,16 @@ struct exec {
* The macros below will set/get the needed fields.
*/
#define N_GETMAGIC(ex) \
-ex).a_midmag)0x) ? \
+uint32_t)(ex).a_midmag)0x) ? \
(be32toh((uint32_t)((ex).a_midmag))0x) : ((ex).a_midmag))
#define N_GETMAGIC2(ex) \
-ex).a_midmag)0x) ? \
+uint32_t)(ex).a_midmag)0x) ? \
(be32toh((uint32_t)((ex).a_midmag))0x) : (((ex).a_midmag) | 0x1))
#define N_GETMID(ex) \
-ex).a_midmag)0x) ? \
+uint32_t)(ex).a_midmag)0x) ? \
((be32toh((uint32_t)((ex).a_midmag))16)0x03ff) : MID_ZERO)
#define N_GETFLAG(ex) \
-ex).a_midmag)0x) ? \
+uint32_t)(ex).a_midmag)0x) ? \
((be32toh((uint32_t)((ex).a_midmag))26)0x3f) : 0)
#define N_SETMAGIC(ex,mag,mid,flag) \
((ex).a_midmag = htobe32((uint32_t) \
CVS commit: src/include
Module Name:src
Committed By: christos
Date: Sat Mar 17 21:57:48 UTC 2012
Modified Files:
src/include: netdb.h
Log Message:
Add AI_ADDRCONFIG
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/include/netdb.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/netdb.h
diff -u src/include/netdb.h:1.64 src/include/netdb.h:1.65
--- src/include/netdb.h:1.64 Wed May 5 13:12:29 2010
+++ src/include/netdb.h Sat Mar 17 17:57:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netdb.h,v 1.64 2010/05/05 17:12:29 christos Exp $ */
+/* $NetBSD: netdb.h,v 1.65 2012/03/17 21:57:48 christos Exp $ */
/*
* ++Copyright++ 1980, 1983, 1988, 1993
@@ -269,7 +269,9 @@ struct addrinfo {
#define AI_NUMERICSERV 0x0008 /* prevent service name resolution */
/* valid flags for addrinfo (not a standard def, apps should not use it) */
#define AI_MASK \
-(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV)
+(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \
+AI_ADDRCONFIG)
+#define AI_ADDRCONFIG 0x0400 /* only if any address is assigned */
#endif
#if (_POSIX_C_SOURCE - 0) = 200112L || (_XOPEN_SOURCE - 0) = 520 || \
CVS commit: src/usr.bin/fpr
Module Name:src Committed By: wiz Date: Sat Mar 17 22:10:52 UTC 2012 Modified Files: src/usr.bin/fpr: fpr.1 Log Message: Quote word that has the same letter as a macro. Fixes PR 46215 by Nicolas Joly. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.bin/fpr/fpr.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/fpr/fpr.1 diff -u src/usr.bin/fpr/fpr.1:1.10 src/usr.bin/fpr/fpr.1:1.11 --- src/usr.bin/fpr/fpr.1:1.10 Sun Mar 15 15:18:04 2009 +++ src/usr.bin/fpr/fpr.1 Sat Mar 17 22:10:51 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: fpr.1,v 1.10 2009/03/15 15:18:04 joerg Exp $ +.\ $NetBSD: fpr.1,v 1.11 2012/03/17 22:10:51 wiz Exp $ .\ .\ Copyright (c) 1989, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -58,7 +58,7 @@ The first character of each line determi .It Blank One line .It 0 Two lines .It 1 To first line of next page -.It + No advance +.It + \No advance .El .Ed .Pp
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: mrg
Date: Sat Mar 17 22:19:54 UTC 2012
Modified Files:
src/sys/arch/sparc64/sparc64: locore.s trap.c
Log Message:
port the corrected ECC error handling code from freebsd. i noticed my U10
took one of these and then hang. it shouldn't hang, there's a 'sir' here that
doesn't seem to reset properly. oh well.
tested by simulated a trap via 'ta 0x10' and considering that the same, but
it hasn't been tested against a real ECC error yet.
To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.169 -r1.170 src/sys/arch/sparc64/sparc64/trap.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/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.340 src/sys/arch/sparc64/sparc64/locore.s:1.341
--- src/sys/arch/sparc64/sparc64/locore.s:1.340 Sat Mar 3 03:17:32 2012
+++ src/sys/arch/sparc64/sparc64/locore.s Sat Mar 17 22:19:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.340 2012/03/03 03:17:32 nakayama Exp $ */
+/* $NetBSD: locore.s,v 1.341 2012/03/17 22:19:53 mrg Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -491,7 +491,7 @@ _C_LABEL(trapbase):
VTRAP(0x060, interrupt_vector); ! 060 = interrupt vector
TRAP(T_PA_WATCHPT) ! 061 = physical address data watchpoint
TRAP(T_VA_WATCHPT) ! 062 = virtual address data watchpoint
- UTRAP(T_ECCERR) ! We'll implement this one later
+ TRAP(T_ECCERR) ! 063 = corrected ECC error
ufast_IMMU_miss: ! 064 = fast instr access MMU miss
ldxa [%g0] ASI_IMMU_8KPTR, %g2 ! Load IMMU 8K TSB pointer
#ifdef NO_TSB
@@ -727,7 +727,7 @@ kdatafault:
VTRAP(0x060, interrupt_vector); ! 060 = interrupt vector
TRAP(T_PA_WATCHPT) ! 061 = physical address data watchpoint
TRAP(T_VA_WATCHPT) ! 062 = virtual address data watchpoint
- UTRAP(T_ECCERR) ! We'll implement this one later
+ TRAP(T_ECCERR) ! 063 = corrected ECC error
kfast_IMMU_miss: ! 064 = fast instr access MMU miss
ldxa [%g0] ASI_IMMU_8KPTR, %g2 ! Load IMMU 8K TSB pointer
#ifdef NO_TSB
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.169 src/sys/arch/sparc64/sparc64/trap.c:1.170
--- src/sys/arch/sparc64/sparc64/trap.c:1.169 Sun Feb 19 21:06:31 2012
+++ src/sys/arch/sparc64/sparc64/trap.c Sat Mar 17 22:19:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.169 2012/02/19 21:06:31 rmind Exp $ */
+/* $NetBSD: trap.c,v 1.170 2012/03/17 22:19:53 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.169 2012/02/19 21:06:31 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.170 2012/03/17 22:19:53 mrg Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -92,6 +92,8 @@ __KERNEL_RCSID(0, $NetBSD: trap.c,v 1.1
#include machine/svr4_32_machdep.h
#endif
+#include sparc64/sparc64/cache.h
+
#include sparc/fpu/fpu_extern.h
#ifndef offsetof
@@ -369,6 +371,7 @@ void text_access_fault(struct trapframe6
u_long sfsr);
void text_access_error(struct trapframe64 *, unsigned int, vaddr_t, u_long,
vaddr_t, u_long);
+void ecc_corrected_error(unsigned int type, vaddr_t pc);
#ifdef DEBUG
void print_trapframe(struct trapframe64 *);
@@ -538,6 +541,9 @@ trap(struct trapframe64 *tf, unsigned in
/* Enable the FPU */
tf-tf_tstate |= TSTATE_PEF;
return;
+ } else if (type == T_ECCERR) {
+ ecc_corrected_error(type, pc);
+ return;
}
goto dopanic;
}
@@ -853,6 +859,9 @@ badtrap:
ksi.ksi_code = FPE_INTOVF;
ksi.ksi_addr = (void *)pc;
break;
+ case T_ECCERR:
+ ecc_corrected_error(type, pc);
+ break;
}
if (sig != 0) {
ksi.ksi_signo = sig;
@@ -1609,3 +1618,48 @@ out:
}
#endif
}
+
+/*
+ * Handle an ECC corrected event.
+ */
+void
+ecc_corrected_error(unsigned int type, vaddr_t pc)
+{
+ uint64_t eeer, afar, afsr;
+ char buf[128];
+ int s;
+
+ /* Clear the error */
+ eeer = ldxa(0, ASI_ERROR_EN_REG);
+ s = intr_disable();
+ stxa(0, ASI_ERROR_EN_REG,
+ eeer ~(P_EER_NCEEN | P_EER_CEEN));
+ membar_Sync();
+ intr_restore(s);
+
+ /* Flush the caches in order ensure no corrupt data got installed. */
+ blast_dcache();
+ blast_icache();
+
+#if 0
+ /* Ensure the caches are still turned on (should be). */
+ cache_enable(PCPU_GET(impl));
+#endif
+
+ /* Grab the current AFSR/AFAR, and clear the error from the AFSR. */
+ afar = ldxa(0, ASI_AFAR);
+ afsr = ldxa(0, ASI_AFSR);
+ s = intr_disable();
+ stxa(0, ASI_AFSR, ldxa(0, ASI_AFSR));
+ membar_Sync();
+ intr_restore(s);
+ /* XXX: count the error */
+ snprintb(buf, sizeof(buf), AFSR_BITS, afsr);
+ printf(corrected ECC error: pc %p afsr %PRIx64 (%s) addr %PRIx64\n, (void *)pc, afsr, buf, afar);
+
+ /* Turn (non-)correctable error reporting back on. */
+ s = intr_disable();
+ stxa(0, ASI_ERROR_EN_REG, eeer);
+ membar_Sync();
+
CVS commit: src/tests/usr.bin/awk
Module Name:src
Committed By: christos
Date: Sat Mar 17 23:23:00 UTC 2012
Modified Files:
src/tests/usr.bin/awk: d_period.out t_awk.sh
Log Message:
The problem has been fixed and the test is broken. awk always uses the
C locale for LC_NUMERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/awk/d_period.out
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/awk/t_awk.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/awk/d_period.out
diff -u src/tests/usr.bin/awk/d_period.out:1.1 src/tests/usr.bin/awk/d_period.out:1.2
--- src/tests/usr.bin/awk/d_period.out:1.1 Sun Mar 11 14:36:00 2012
+++ src/tests/usr.bin/awk/d_period.out Sat Mar 17 19:22:59 2012
@@ -1 +1 @@
-0,875
+0.875
Index: src/tests/usr.bin/awk/t_awk.sh
diff -u src/tests/usr.bin/awk/t_awk.sh:1.3 src/tests/usr.bin/awk/t_awk.sh:1.4
--- src/tests/usr.bin/awk/t_awk.sh:1.3 Sun Mar 11 14:36:01 2012
+++ src/tests/usr.bin/awk/t_awk.sh Sat Mar 17 19:22:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_awk.sh,v 1.3 2012/03/11 18:36:01 jruoho Exp $
+# $NetBSD: t_awk.sh,v 1.4 2012/03/17 23:22:59 christos Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -99,7 +99,6 @@ period_head() {
period_body() {
export LANG=ru_RU.KOI8-R
- atf_expect_fail PR bin/42320
h_check period -v x=0.5
}
CVS commit: src/bin/cat
Module Name:src
Committed By: christos
Date: Sat Mar 17 23:35:29 UTC 2012
Modified Files:
src/bin/cat: cat.c
Log Message:
fix signed blksize_t lossage.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/bin/cat/cat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/cat/cat.c
diff -u src/bin/cat/cat.c:1.47 src/bin/cat/cat.c:1.48
--- src/bin/cat/cat.c:1.47 Sat Jul 19 20:52:39 2008
+++ src/bin/cat/cat.c Sat Mar 17 19:35:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cat.c,v 1.47 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: cat.c,v 1.48 2012/03/17 23:35:28 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = @(#)cat.c 8.2 (Berkeley) 4/27/95;
#else
-__RCSID($NetBSD: cat.c,v 1.47 2008/07/20 00:52:39 lukem Exp $);
+__RCSID($NetBSD: cat.c,v 1.48 2012/03/17 23:35:28 christos Exp $);
#endif
#endif /* not lint */
@@ -295,8 +295,8 @@ raw_cat(int rfd)
if (buf == NULL) {
struct stat sbuf;
- if (fstat(wfd, sbuf) == 0
- sbuf.st_blksize sizeof(fb_buf)) {
+ if (fstat(wfd, sbuf) == 0 sbuf.st_blksize 0
+ (size_t)sbuf.st_blksize sizeof(fb_buf)) {
bsize = sbuf.st_blksize;
buf = malloc(bsize);
}
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: mrg Date: Sat Mar 17 23:47:13 UTC 2012 Modified Files: src/sys/arch/sparc64/sparc64: trap.c Log Message: count ECC corrected traps with evcnt(9). To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/sys/arch/sparc64/sparc64/trap.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/sparc64/sparc64/trap.c diff -u src/sys/arch/sparc64/sparc64/trap.c:1.170 src/sys/arch/sparc64/sparc64/trap.c:1.171 --- src/sys/arch/sparc64/sparc64/trap.c:1.170 Sat Mar 17 22:19:53 2012 +++ src/sys/arch/sparc64/sparc64/trap.c Sat Mar 17 23:47:13 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.170 2012/03/17 22:19:53 mrg Exp $ */ +/* $NetBSD: trap.c,v 1.171 2012/03/17 23:47:13 mrg Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved. @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.170 2012/03/17 22:19:53 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.171 2012/03/17 23:47:13 mrg Exp $); #include opt_ddb.h #include opt_multiprocessor.h @@ -159,6 +159,10 @@ int trapdebug = 0/*|TDB_SYSCALL|TDB_STOP #define Debugger() #endif +struct evcnt ecc_corrected = +EVCNT_INITIALIZER(EVCNT_TYPE_MISC,0,ECC,corrected); +EVCNT_ATTACH_STATIC(ecc_corrected); + /* * Initial FPU state is all registers == all 1s, everything else == all 0s. * This makes every floating point register a signalling NaN, with sign bit @@ -1653,7 +1657,7 @@ ecc_corrected_error(unsigned int type, v stxa(0, ASI_AFSR, ldxa(0, ASI_AFSR)); membar_Sync(); intr_restore(s); - /* XXX: count the error */ + ecc_corrected.ev_count++; snprintb(buf, sizeof(buf), AFSR_BITS, afsr); printf(corrected ECC error: pc %p afsr %PRIx64 (%s) addr %PRIx64\n, (void *)pc, afsr, buf, afar);
CVS commit: src/lib/libc/sys
Module Name:src
Committed By: christos
Date: Sun Mar 18 02:04:40 UTC 2012
Modified Files:
src/lib/libc/sys: sched.c
Log Message:
fail as the man page says sched_rr_get_interval should.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/sys/sched.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/sys/sched.c
diff -u src/lib/libc/sys/sched.c:1.3 src/lib/libc/sys/sched.c:1.4
--- src/lib/libc/sys/sched.c:1.3 Tue Mar 13 17:13:48 2012
+++ src/lib/libc/sys/sched.c Sat Mar 17 22:04:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sched.c,v 1.3 2012/03/13 21:13:48 christos Exp $ */
+/* $NetBSD: sched.c,v 1.4 2012/03/18 02:04:39 christos Exp $ */
/*
* Copyright (c) 2008, Mindaugas Rasiukevicius rmind at NetBSD org
@@ -27,12 +27,13 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: sched.c,v 1.3 2012/03/13 21:13:48 christos Exp $);
+__RCSID($NetBSD: sched.c,v 1.4 2012/03/18 02:04:39 christos Exp $);
#include string.h
#include unistd.h
#include errno.h
#include sched.h
+#include signal.h
#include sys/param.h
#include sys/types.h
@@ -123,6 +124,8 @@ int
sched_rr_get_interval(pid_t pid, struct timespec *interval)
{
+ if (pid kill(pid, 0) == -1)
+ return -1;
interval-tv_sec = 0;
interval-tv_nsec = sysconf(_SC_SCHED_RT_TS) * 1000;
return 0;
CVS commit: src/tests/lib/librt
Module Name:src
Committed By: christos
Date: Sun Mar 18 02:14:16 UTC 2012
Modified Files:
src/tests/lib/librt: t_sched.c
Log Message:
this should be fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/librt/t_sched.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librt/t_sched.c
diff -u src/tests/lib/librt/t_sched.c:1.2 src/tests/lib/librt/t_sched.c:1.3
--- src/tests/lib/librt/t_sched.c:1.2 Fri Mar 25 05:39:19 2011
+++ src/tests/lib/librt/t_sched.c Sat Mar 17 22:14:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sched.c,v 1.2 2011/03/25 09:39:19 jruoho Exp $ */
+/* $NetBSD: t_sched.c,v 1.3 2012/03/18 02:14:16 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_sched.c,v 1.2 2011/03/25 09:39:19 jruoho Exp $);
+__RCSID($NetBSD: t_sched.c,v 1.3 2012/03/18 02:14:16 christos Exp $);
#include sched.h
#include limits.h
@@ -188,7 +188,8 @@ ATF_TC_BODY(sched_setscheduler_4, tc)
ATF_TC(sched_rr_get_interval_1);
ATF_TC_HEAD(sched_rr_get_interval_1, tc)
{
- atf_tc_set_md_var(tc, descr, Test sched_rr_get_interval(3), #1);
+ atf_tc_set_md_var(tc, descr, Test sched_rr_get_interval(3), #1
+ PR/44768);
atf_tc_set_md_var(tc, require.user, root);
}
@@ -203,7 +204,6 @@ ATF_TC_BODY(sched_rr_get_interval_1, tc)
/*
* This should fail with ESRCH for invalid PID.
*/
- atf_tc_expect_fail(PR lib/44768);
ATF_REQUIRE(sched_rr_get_interval(-INT_MAX, tv) != 0);
}
CVS commit: src/sys/fs/sysvbfs
Module Name:src
Committed By: christos
Date: Sun Mar 18 02:40:56 UTC 2012
Modified Files:
src/sys/fs/sysvbfs: bfs.c bfs.h sysvbfs_vnops.c
Log Message:
handle file resizing.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/fs/sysvbfs/bfs.c
cvs rdiff -u -r1.5 -r1.6 src/sys/fs/sysvbfs/bfs.h
cvs rdiff -u -r1.41 -r1.42 src/sys/fs/sysvbfs/sysvbfs_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/sysvbfs/bfs.c
diff -u src/sys/fs/sysvbfs/bfs.c:1.13 src/sys/fs/sysvbfs/bfs.c:1.14
--- src/sys/fs/sysvbfs/bfs.c:1.13 Mon Jul 26 09:43:26 2010
+++ src/sys/fs/sysvbfs/bfs.c Sat Mar 17 22:40:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bfs.c,v 1.13 2010/07/26 13:43:26 njoly Exp $ */
+/* $NetBSD: bfs.c,v 1.14 2012/03/18 02:40:55 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bfs.c,v 1.13 2010/07/26 13:43:26 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: bfs.c,v 1.14 2012/03/18 02:40:55 christos Exp $);
#define BFS_DEBUG
#include sys/param.h
@@ -57,6 +57,7 @@ MALLOC_JUSTDEFINE(M_BFS, sysvbfs core,
#define __FREE(a, s, t) free(a)
#endif
#include fs/sysvbfs/bfs.h
+#include fs/sysvbfs/sysvbfs.h
#ifdef BFS_DEBUG
#define DPRINTF(on, fmt, args...) if (on) printf(fmt, ##args)
@@ -506,6 +507,21 @@ bfs_file_lookup(const struct bfs *bfs, c
return true;
}
+void
+bfs_file_setsize(struct vnode *v, size_t size)
+{
+ struct sysvbfs_node *bnode = v-v_data;
+ struct bfs_inode *inode = bnode-inode;
+
+ bnode-size = size;
+ uvm_vnp_setsize(v, bnode-size);
+ inode-end_sector = bnode-data_block +
+ (ROUND_SECTOR(bnode-size) DEV_BSHIFT) - 1;
+ inode-eof_offset_byte = bnode-data_block * DEV_BSIZE +
+ bnode-size - 1;
+ bnode-update_mtime = true;
+}
+
bool
bfs_dirent_lookup_by_inode(const struct bfs *bfs, int inode,
struct bfs_dirent **dirent)
Index: src/sys/fs/sysvbfs/bfs.h
diff -u src/sys/fs/sysvbfs/bfs.h:1.5 src/sys/fs/sysvbfs/bfs.h:1.6
--- src/sys/fs/sysvbfs/bfs.h:1.5 Mon Apr 28 16:24:02 2008
+++ src/sys/fs/sysvbfs/bfs.h Sat Mar 17 22:40:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bfs.h,v 1.5 2008/04/28 20:24:02 martin Exp $ */
+/* $NetBSD: bfs.h,v 1.6 2012/03/18 02:40:55 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -142,6 +142,8 @@ struct sector_io_ops {
bool (*write_n)(void *, uint8_t *, daddr_t, int);
};
+struct vnode;
+
int bfs_init2(struct bfs **, int, struct sector_io_ops *, bool);
void bfs_fini(struct bfs *);
int bfs_file_read(const struct bfs *, const char *, void *, size_t, size_t *);
@@ -153,10 +155,11 @@ int bfs_file_rename(struct bfs *, const
bool bfs_file_lookup(const struct bfs *, const char *, int *, int *,
size_t *);
size_t bfs_file_size(const struct bfs_inode *);
+void bfs_file_setsize(struct vnode *, size_t);
+
bool bfs_dump(const struct bfs *);
/* filesystem ops */
-struct vnode;
int sysvbfs_bfs_init(struct bfs **, struct vnode *);
void sysvbfs_bfs_fini(struct bfs *);
bool bfs_inode_lookup(const struct bfs *, ino_t, struct bfs_inode **);
Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.41 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.42
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.41 Tue Mar 13 14:40:50 2012
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c Sat Mar 17 22:40:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vnops.c,v 1.41 2012/03/13 18:40:50 elad Exp $ */
+/* $NetBSD: sysvbfs_vnops.c,v 1.42 2012/03/18 02:40:55 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysvbfs_vnops.c,v 1.41 2012/03/13 18:40:50 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysvbfs_vnops.c,v 1.42 2012/03/18 02:40:55 christos Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -359,11 +359,28 @@ sysvbfs_setattr(void *arg)
attr-gid = gid;
}
+ if (vap-va_size != VNOVAL)
+ switch (vp-v_type) {
+ case VDIR:
+ return EISDIR;
+ case VCHR:
+ case VBLK:
+ case VFIFO:
+ break;
+ case VREG:
+ if (vp-v_mount-mnt_flag MNT_RDONLY)
+return EROFS;
+ bfs_file_setsize(vp, vap-va_size);
+ break;
+ default:
+ return EOPNOTSUPP;
+ }
+
if (vap-va_mode != (mode_t)VNOVAL) {
mode_t mode = vap-va_mode;
error = kauth_authorize_vnode(cred, KAUTH_VNODE_WRITE_SECURITY,
- vp, NULL, genfs_can_chmod(vp-v_type, cred, attr-uid, attr-gid,
- mode));
+ vp, NULL, genfs_can_chmod(vp-v_type, cred, attr-uid,
+ attr-gid, mode));
if (error)
return error;
attr-mode = mode;
@@ -373,7 +390,8 @@ sysvbfs_setattr(void *arg)
(vap-va_mtime.tv_sec != VNOVAL) ||
(vap-va_ctime.tv_sec != VNOVAL)) {
error = kauth_authorize_vnode(cred, KAUTH_VNODE_WRITE_TIMES, vp,
- NULL, genfs_can_chtimes(vp, vap-va_vaflags, attr-uid, cred));
+ NULL, genfs_can_chtimes(vp, vap-va_vaflags,
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: mrg Date: Sun Mar 18 05:26:58 UTC 2012 Modified Files: src/sys/arch/sparc64/dev: central.c ebus_mainbus.c fhc.c fhc_central.c fhc_mainbus.c pcf8591_envctrl.c pcfiic_ebus.c pld_wdog.c pyro.c schizo.c tda.c upa.c Log Message: add missing __KERNEL_RCSID(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/dev/central.c \ src/sys/arch/sparc64/dev/fhc.c src/sys/arch/sparc64/dev/fhc_central.c \ src/sys/arch/sparc64/dev/fhc_mainbus.c \ src/sys/arch/sparc64/dev/pcfiic_ebus.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/ebus_mainbus.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/dev/pcf8591_envctrl.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc64/dev/pld_wdog.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/pyro.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc64/dev/schizo.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/dev/tda.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc64/dev/upa.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/sparc64/dev/central.c diff -u src/sys/arch/sparc64/dev/central.c:1.2 src/sys/arch/sparc64/dev/central.c:1.3 --- src/sys/arch/sparc64/dev/central.c:1.2 Mon Aug 1 08:36:39 2011 +++ src/sys/arch/sparc64/dev/central.c Sun Mar 18 05:26:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: central.c,v 1.2 2011/08/01 08:36:39 mrg Exp $ */ +/* $NetBSD: central.c,v 1.3 2012/03/18 05:26:58 mrg Exp $ */ /* $OpenBSD: central.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */ /* @@ -27,6 +27,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: central.c,v 1.3 2012/03/18 05:26:58 mrg Exp $); + #include sys/types.h #include sys/param.h #include sys/systm.h Index: src/sys/arch/sparc64/dev/fhc.c diff -u src/sys/arch/sparc64/dev/fhc.c:1.2 src/sys/arch/sparc64/dev/fhc.c:1.3 --- src/sys/arch/sparc64/dev/fhc.c:1.2 Fri Aug 12 08:24:01 2011 +++ src/sys/arch/sparc64/dev/fhc.c Sun Mar 18 05:26:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fhc.c,v 1.2 2011/08/12 08:24:01 jdc Exp $ */ +/* $NetBSD: fhc.c,v 1.3 2012/03/18 05:26:58 mrg Exp $ */ /* $OpenBSD: fhc.c,v 1.17 2010/11/11 17:58:23 miod Exp $ */ /* @@ -27,6 +27,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: fhc.c,v 1.3 2012/03/18 05:26:58 mrg Exp $); + #include sys/types.h #include sys/param.h #include sys/systm.h Index: src/sys/arch/sparc64/dev/fhc_central.c diff -u src/sys/arch/sparc64/dev/fhc_central.c:1.2 src/sys/arch/sparc64/dev/fhc_central.c:1.3 --- src/sys/arch/sparc64/dev/fhc_central.c:1.2 Mon Aug 1 08:36:39 2011 +++ src/sys/arch/sparc64/dev/fhc_central.c Sun Mar 18 05:26:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fhc_central.c,v 1.2 2011/08/01 08:36:39 mrg Exp $ */ +/* $NetBSD: fhc_central.c,v 1.3 2012/03/18 05:26:58 mrg Exp $ */ /* $OpenBSD: fhc_central.c,v 1.5 2004/09/27 18:32:35 jason Exp $ */ /* @@ -27,6 +27,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: fhc_central.c,v 1.3 2012/03/18 05:26:58 mrg Exp $); + #include sys/types.h #include sys/param.h #include sys/systm.h Index: src/sys/arch/sparc64/dev/fhc_mainbus.c diff -u src/sys/arch/sparc64/dev/fhc_mainbus.c:1.2 src/sys/arch/sparc64/dev/fhc_mainbus.c:1.3 --- src/sys/arch/sparc64/dev/fhc_mainbus.c:1.2 Mon Aug 1 08:36:39 2011 +++ src/sys/arch/sparc64/dev/fhc_mainbus.c Sun Mar 18 05:26:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fhc_mainbus.c,v 1.2 2011/08/01 08:36:39 mrg Exp $ */ +/* $NetBSD: fhc_mainbus.c,v 1.3 2012/03/18 05:26:58 mrg Exp $ */ /* $OpenBSD: fhc_mainbus.c,v 1.4 2004/09/27 18:32:35 jason Exp $ */ /* @@ -27,6 +27,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: fhc_mainbus.c,v 1.3 2012/03/18 05:26:58 mrg Exp $); + #include sys/types.h #include sys/param.h #include sys/systm.h Index: src/sys/arch/sparc64/dev/pcfiic_ebus.c diff -u src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.2 src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.3 --- src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.2 Fri Jul 1 18:48:36 2011 +++ src/sys/arch/sparc64/dev/pcfiic_ebus.c Sun Mar 18 05:26:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pcfiic_ebus.c,v 1.2 2011/07/01 18:48:36 dyoung Exp $ */ +/* $NetBSD: pcfiic_ebus.c,v 1.3 2012/03/18 05:26:58 mrg Exp $ */ /* $OpenBSD: pcfiic_ebus.c,v 1.13 2008/06/08 03:07:40 deraadt Exp $ */ /* @@ -17,6 +17,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: pcfiic_ebus.c,v 1.3 2012/03/18 05:26:58 mrg Exp $); + /* * Device specific driver for the EBus i2c devices found on some sun4u * systems. On systems not having a boot-bus controller the i2c devices Index: src/sys/arch/sparc64/dev/ebus_mainbus.c diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.8 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.9 ---
