CVS commit: [netbsd-6] src/external/bsd/cron/dist
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 06:22:35 UTC 2014
Modified Files:
src/external/bsd/cron/dist [netbsd-6]: entry.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1087):
external/bsd/cron/dist/entry.c: revision 1.5
PR/48944: cron ignores '?' (question mark) time field
Fix the obvious merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/bsd/cron/dist/entry.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/cron/dist/entry.c
diff -u src/external/bsd/cron/dist/entry.c:1.4 src/external/bsd/cron/dist/entry.c:1.4.8.1
--- src/external/bsd/cron/dist/entry.c:1.4 Thu Jul 15 20:03:28 2010
+++ src/external/bsd/cron/dist/entry.c Thu Aug 7 06:22:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: entry.c,v 1.4 2010/07/15 20:03:28 christos Exp $ */
+/* $NetBSD: entry.c,v 1.4.8.1 2014/08/07 06:22:35 msaitoh Exp $ */
/*
* Copyright 1988,1990,1993,1994 by Paul Vixie
@@ -26,7 +26,7 @@
#if 0
static char rcsid[] = Id: entry.c,v 1.17 2004/01/23 18:56:42 vixie Exp;
#else
-__RCSID($NetBSD: entry.c,v 1.4 2010/07/15 20:03:28 christos Exp $);
+__RCSID($NetBSD: entry.c,v 1.4.8.1 2014/08/07 06:22:35 msaitoh Exp $);
#endif
#endif
@@ -479,7 +479,6 @@ get_range(bitstr_t *bits, int low, int h
if (ch == EOF)
return (EOF);
} else if (ch == '?') {
- } else if (ch == '?') {
qmark = TRUE;
ch = get_char(file);
if (ch == EOF)
CVS commit: [netbsd-6] src/distrib/sets/lists/comp
Module Name:src Committed By: msaitoh Date: Thu Aug 7 06:35:33 UTC 2014 Modified Files: src/distrib/sets/lists/comp [netbsd-6]: md.amd64 Log Message: Pull up following revision(s) (requested by mlelstv in ticket #1089): distrib/sets/lists/comp/md.amd64via patch Fix build failure for MKDEBUG+MKCRYPTO_RC5 on amd64. To generate a diff of this commit: cvs rdiff -u -r1.155.2.12 -r1.155.2.13 src/distrib/sets/lists/comp/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.155.2.12 src/distrib/sets/lists/comp/md.amd64:1.155.2.13 --- src/distrib/sets/lists/comp/md.amd64:1.155.2.12 Fri Apr 11 10:59:02 2014 +++ src/distrib/sets/lists/comp/md.amd64 Thu Aug 7 06:35:33 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.155.2.12 2014/04/11 10:59:02 msaitoh Exp $ +# $NetBSD: md.amd64,v 1.155.2.13 2014/08/07 06:35:33 msaitoh Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -1063,6 +1063,7 @@ ./usr/libdata/debug/usr/lib/i386/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/i386/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug ./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug comp-compat-shlib compat,pic,debug +./usr/libdata/debug/usr/lib/i386/libcrypto_rc5.so.7.0.debug comp-compat-shlib crypto,crypto_rc5,compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libcrypto.so.8.2.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libcurses.so.7.0.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libdes.so.8.2.debug comp-compat-shlib compat,pic,debug
CVS commit: [netbsd-6] src/sys/arch/sun3/conf
Module Name:src Committed By: msaitoh Date: Thu Aug 7 06:36:36 UTC 2014 Modified Files: src/sys/arch/sun3/conf [netbsd-6]: DISKLESS Log Message: Pull up following revision(s) (requested by abs in ticket #1091): sys/arch/sun3/conf/DISKLESS: revision 1.69 Enable ie0 in DISKLESS for sun3/110 To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.63.8.1 src/sys/arch/sun3/conf/DISKLESS 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/sun3/conf/DISKLESS diff -u src/sys/arch/sun3/conf/DISKLESS:1.63 src/sys/arch/sun3/conf/DISKLESS:1.63.8.1 --- src/sys/arch/sun3/conf/DISKLESS:1.63 Thu Jun 30 20:09:37 2011 +++ src/sys/arch/sun3/conf/DISKLESS Thu Aug 7 06:36:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.63 2011/06/30 20:09:37 wiz Exp $ +# $NetBSD: DISKLESS,v 1.63.8.1 2014/08/07 06:36:36 msaitoh Exp $ # DISKLESS - Root and swap on NFS # Desktop machines only (3/50, 3/60, 3/110) @@ -115,7 +115,7 @@ ms0 at zsc0 channel 1 # mouse # # Intel Ethernet (onboard, or VME) -#ie0 at obio0 addr 0x0C ipl 3 +ie0 at obio0 addr 0x0C ipl 3 #ie1 at vme2 addr 0xe88000 ipl 3 vect 0x75 # Lance Ethernet (only onboard)
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Aug 7 06:49:06 UTC 2014 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Add one more TODO: - We should check XXX'ed comments. To generate a diff of this commit: cvs rdiff -u -r1.287 -r1.288 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.287 src/sys/dev/pci/if_wm.c:1.288 --- src/sys/dev/pci/if_wm.c:1.287 Wed Aug 6 02:55:50 2014 +++ src/sys/dev/pci/if_wm.c Thu Aug 7 06:49:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.287 2014/08/06 02:55:50 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.288 2014/08/07 06:49:06 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -72,6 +72,7 @@ * * TODO (in order of importance): * + * - Check XXX'ed comments * - Internal SERDES mode newer than or equal to 82575. * - EEE (Energy Efficiency Ethernet) * - MSI/MSI-X @@ -81,7 +82,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.287 2014/08/06 02:55:50 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.288 2014/08/07 06:49:06 msaitoh Exp $); #include sys/param.h #include sys/systm.h
CVS commit: [netbsd-6] src
Module Name:src Committed By: msaitoh Date: Thu Aug 7 06:52:53 UTC 2014 Modified Files: src/doc [netbsd-6]: 3RDPARTY src/etc/namedb [netbsd-6]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1093): doc/3RDPARTY: revision 1.1126 etc/namedb/root.cache: revision 1.18 Update root.cache to 2014060201. Now B.ROOT-SERVERS.NET and C.ROOT-SERVERS.NET has an record. Update root.cache entry. To generate a diff of this commit: cvs rdiff -u -r1.909.2.21 -r1.909.2.22 src/doc/3RDPARTY cvs rdiff -u -r1.16.4.3 -r1.16.4.4 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.909.2.21 src/doc/3RDPARTY:1.909.2.22 --- src/doc/3RDPARTY:1.909.2.21 Wed May 21 21:23:14 2014 +++ src/doc/3RDPARTY Thu Aug 7 06:52:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.21 2014/05/21 21:23:14 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.22 2014/08/07 06:52:53 msaitoh Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -995,8 +995,8 @@ Notes: Old versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS). Package: root.cache -Version: 2011060800 (Jun 8, 2011) -Current Vers: 2011060800 (Jun 8, 2011) +Version: 2014060201 (June 2, 2014) +Current Vers: 2014060201 (June 2, 2014) Maintainer: InterNIC Archive Site: ftp://ftp.internic.net/domain/named.root Home Page: ftp://ftp.internic.net/domain/named.root Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.3 src/etc/namedb/root.cache:1.16.4.4 --- src/etc/namedb/root.cache:1.16.4.3 Tue Jul 1 03:31:38 2014 +++ src/etc/namedb/root.cache Thu Aug 7 06:52:53 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.3 2014/07/01 03:31:38 taca Exp $ +; $NetBSD: root.cache,v 1.16.4.4 2014/08/07 06:52:53 msaitoh Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the cache . file @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Jan 3, 2013 -; related version of root zone: 2013010300 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -23,11 +23,13 @@ A.ROOT-SERVERS.NET. 360 AA ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; ; FORMERLY TERP.UMD.EDU ;
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: msaitoh Date: Thu Aug 7 06:59:33 UTC 2014 Modified Files: src/doc [netbsd-6-1]: 3RDPARTY src/etc/namedb [netbsd-6-1]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1093): doc/3RDPARTY: revision 1.1126 etc/namedb/root.cache: revision 1.18 Update root.cache to 2014060201. Now B.ROOT-SERVERS.NET and C.ROOT-SERVERS.NET has an record. Update root.cache entry. To generate a diff of this commit: cvs rdiff -u -r1.909.2.19.2.2 -r1.909.2.19.2.3 src/doc/3RDPARTY cvs rdiff -u -r1.16.4.1 -r1.16.4.1.2.1 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.909.2.19.2.2 src/doc/3RDPARTY:1.909.2.19.2.3 --- src/doc/3RDPARTY:1.909.2.19.2.2 Wed May 21 21:22:55 2014 +++ src/doc/3RDPARTY Thu Aug 7 06:59:33 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.19.2.2 2014/05/21 21:22:55 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.19.2.3 2014/08/07 06:59:33 msaitoh Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -995,8 +995,8 @@ Notes: Old versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS). Package: root.cache -Version: 2011060800 (Jun 8, 2011) -Current Vers: 2011060800 (Jun 8, 2011) +Version: 2014060201 (June 2, 2014) +Current Vers: 2014060201 (June 2, 2014) Maintainer: InterNIC Archive Site: ftp://ftp.internic.net/domain/named.root Home Page: ftp://ftp.internic.net/domain/named.root Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.4.1 src/etc/namedb/root.cache:1.16.4.1.2.1 --- src/etc/namedb/root.cache:1.16.4.1 Sun Jan 13 18:57:48 2013 +++ src/etc/namedb/root.cache Thu Aug 7 06:59:33 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.4.1 2013/01/13 18:57:48 bouyer Exp $ +; $NetBSD: root.cache,v 1.16.4.1.2.1 2014/08/07 06:59:33 msaitoh Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the cache . file @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Jan 3, 2013 -; related version of root zone: 2013010300 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -23,11 +23,13 @@ A.ROOT-SERVERS.NET. 360 AA ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; ; FORMERLY TERP.UMD.EDU ;
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: msaitoh Date: Thu Aug 7 07:37:59 UTC 2014 Modified Files: src/doc [netbsd-6-0]: 3RDPARTY src/etc/namedb [netbsd-6-0]: root.cache Log Message: Pull up following revision(s) (requested by taca in ticket #1093): doc/3RDPARTY: revision 1.1126 etc/namedb/root.cache: revision 1.18 Update root.cache to 2014060201. Now B.ROOT-SERVERS.NET and C.ROOT-SERVERS.NET has an record. Update root.cache entry. To generate a diff of this commit: cvs rdiff -u -r1.909.2.14.2.6 -r1.909.2.14.2.7 src/doc/3RDPARTY cvs rdiff -u -r1.16.10.1 -r1.16.10.2 src/etc/namedb/root.cache Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.909.2.14.2.6 src/doc/3RDPARTY:1.909.2.14.2.7 --- src/doc/3RDPARTY:1.909.2.14.2.6 Wed May 21 21:22:39 2014 +++ src/doc/3RDPARTY Thu Aug 7 07:37:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.14.2.6 2014/05/21 21:22:39 bouyer Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.14.2.7 2014/08/07 07:37:59 msaitoh Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -995,8 +995,8 @@ Notes: Old versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS). Package: root.cache -Version: 2011060800 (Jun 8, 2011) -Current Vers: 2011060800 (Jun 8, 2011) +Version: 2014060201 (June 2, 2014) +Current Vers: 2014060201 (June 2, 2014) Maintainer: InterNIC Archive Site: ftp://ftp.internic.net/domain/named.root Home Page: ftp://ftp.internic.net/domain/named.root Index: src/etc/namedb/root.cache diff -u src/etc/namedb/root.cache:1.16.10.1 src/etc/namedb/root.cache:1.16.10.2 --- src/etc/namedb/root.cache:1.16.10.1 Sun Jan 13 18:57:50 2013 +++ src/etc/namedb/root.cache Thu Aug 7 07:37:59 2014 @@ -1,4 +1,4 @@ -; $NetBSD: root.cache,v 1.16.10.1 2013/01/13 18:57:50 bouyer Exp $ +; $NetBSD: root.cache,v 1.16.10.2 2014/08/07 07:37:59 msaitoh Exp $ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the cache . file @@ -10,8 +10,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Jan 3, 2013 -; related version of root zone: 2013010300 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -23,11 +23,13 @@ A.ROOT-SERVERS.NET. 360 AA ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; ; FORMERLY C.PSI.NET ; .360 NSC.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 360 A 192.33.4.12 +C.ROOT-SERVERS.NET. 360 2001:500:2::C ; ; FORMERLY TERP.UMD.EDU ;
CVS commit: src/sys/netatalk
Module Name:src
Committed By: rtr
Date: Thu Aug 7 07:51:28 UTC 2014
Modified Files:
src/sys/netatalk: ddp_usrreq.c
Log Message:
suppress possibly used uninitialized warning on sgimips
from martin@
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/netatalk/ddp_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/netatalk/ddp_usrreq.c
diff -u src/sys/netatalk/ddp_usrreq.c:1.60 src/sys/netatalk/ddp_usrreq.c:1.61
--- src/sys/netatalk/ddp_usrreq.c:1.60 Thu Aug 7 01:02:30 2014
+++ src/sys/netatalk/ddp_usrreq.c Thu Aug 7 07:51:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_usrreq.c,v 1.60 2014/08/07 01:02:30 rtr Exp $ */
+/* $NetBSD: ddp_usrreq.c,v 1.61 2014/08/07 07:51:28 rtr Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ddp_usrreq.c,v 1.60 2014/08/07 01:02:30 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: ddp_usrreq.c,v 1.61 2014/08/07 07:51:28 rtr Exp $);
#include opt_mbuftrace.h
@@ -541,7 +541,7 @@ ddp_send(struct socket *so, struct mbuf
{
struct ddpcb *ddp = sotoddpcb(so);
int error = 0;
- int s;
+ int s = 0; /* XXX gcc 4.8 warns on sgimips */
KASSERT(solocked(so));
KASSERT(ddp != NULL);
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 08:01:37 UTC 2014
Modified Files:
src/sys/dev/usb [netbsd-6]: if_urndis.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1094):
sys/dev/usb/if_urndis.c: revision 1.7
PR/48963: kmem_free size mismatch causes panic when attaching urndis(4).
Fix the size passed in kmem_free in the urndis_ctrl_{query,set} functions
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 src/sys/dev/usb/if_urndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.3.2.1 src/sys/dev/usb/if_urndis.c:1.3.2.2
--- src/sys/dev/usb/if_urndis.c:1.3.2.1 Sat Nov 24 04:01:21 2012
+++ src/sys/dev/usb/if_urndis.c Thu Aug 7 08:01:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.3.2.1 2012/11/24 04:01:21 riz Exp $ */
+/* $NetBSD: if_urndis.c,v 1.3.2.2 2014/08/07 08:01:37 msaitoh Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_urndis.c,v 1.3.2.1 2012/11/24 04:01:21 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_urndis.c,v 1.3.2.2 2014/08/07 08:01:37 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -513,7 +513,7 @@ urndis_ctrl_query(struct urndis_softc *s
le32toh(msg-rm_devicevchdl)));
rval = urndis_ctrl_send(sc, msg, sizeof(*msg));
- kmem_free(msg, sizeof(*msg));
+ kmem_free(msg, sizeof(*msg) + qlen);
if (rval != RNDIS_STATUS_SUCCESS) {
printf(%s: query failed\n, DEVNAME(sc));
@@ -566,7 +566,7 @@ urndis_ctrl_set(struct urndis_softc *sc,
le32toh(msg-rm_devicevchdl)));
rval = urndis_ctrl_send(sc, msg, sizeof(*msg));
- kmem_free(msg, sizeof(*msg));
+ kmem_free(msg, sizeof(*msg) + len);
if (rval != RNDIS_STATUS_SUCCESS) {
printf(%s: set failed\n, DEVNAME(sc));
CVS commit: [netbsd-6-1] src/sys/dev/usb
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 08:05:24 UTC 2014
Modified Files:
src/sys/dev/usb [netbsd-6-1]: if_urndis.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1094):
sys/dev/usb/if_urndis.c: revision 1.7
PR/48963: kmem_free size mismatch causes panic when attaching urndis(4).
Fix the size passed in kmem_free in the urndis_ctrl_{query,set} functions
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.1.2.1 src/sys/dev/usb/if_urndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.3.2.1 src/sys/dev/usb/if_urndis.c:1.3.2.1.2.1
--- src/sys/dev/usb/if_urndis.c:1.3.2.1 Sat Nov 24 04:01:21 2012
+++ src/sys/dev/usb/if_urndis.c Thu Aug 7 08:05:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.3.2.1 2012/11/24 04:01:21 riz Exp $ */
+/* $NetBSD: if_urndis.c,v 1.3.2.1.2.1 2014/08/07 08:05:24 msaitoh Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_urndis.c,v 1.3.2.1 2012/11/24 04:01:21 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_urndis.c,v 1.3.2.1.2.1 2014/08/07 08:05:24 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -513,7 +513,7 @@ urndis_ctrl_query(struct urndis_softc *s
le32toh(msg-rm_devicevchdl)));
rval = urndis_ctrl_send(sc, msg, sizeof(*msg));
- kmem_free(msg, sizeof(*msg));
+ kmem_free(msg, sizeof(*msg) + qlen);
if (rval != RNDIS_STATUS_SUCCESS) {
printf(%s: query failed\n, DEVNAME(sc));
@@ -566,7 +566,7 @@ urndis_ctrl_set(struct urndis_softc *sc,
le32toh(msg-rm_devicevchdl)));
rval = urndis_ctrl_send(sc, msg, sizeof(*msg));
- kmem_free(msg, sizeof(*msg));
+ kmem_free(msg, sizeof(*msg) + len);
if (rval != RNDIS_STATUS_SUCCESS) {
printf(%s: set failed\n, DEVNAME(sc));
CVS commit: [netbsd-6-0] src/sys/dev/usb
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 08:06:37 UTC 2014
Modified Files:
src/sys/dev/usb [netbsd-6-0]: if_urndis.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1094):
sys/dev/usb/if_urndis.c: revision 1.7
PR/48963: kmem_free size mismatch causes panic when attaching urndis(4).
Fix the size passed in kmem_free in the urndis_ctrl_{query,set} functions
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/sys/dev/usb/if_urndis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.3.6.1 src/sys/dev/usb/if_urndis.c:1.3.6.2
--- src/sys/dev/usb/if_urndis.c:1.3.6.1 Sat Nov 24 04:01:30 2012
+++ src/sys/dev/usb/if_urndis.c Thu Aug 7 08:06:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.3.6.1 2012/11/24 04:01:30 riz Exp $ */
+/* $NetBSD: if_urndis.c,v 1.3.6.2 2014/08/07 08:06:37 msaitoh Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_urndis.c,v 1.3.6.1 2012/11/24 04:01:30 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_urndis.c,v 1.3.6.2 2014/08/07 08:06:37 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -513,7 +513,7 @@ urndis_ctrl_query(struct urndis_softc *s
le32toh(msg-rm_devicevchdl)));
rval = urndis_ctrl_send(sc, msg, sizeof(*msg));
- kmem_free(msg, sizeof(*msg));
+ kmem_free(msg, sizeof(*msg) + qlen);
if (rval != RNDIS_STATUS_SUCCESS) {
printf(%s: query failed\n, DEVNAME(sc));
@@ -566,7 +566,7 @@ urndis_ctrl_set(struct urndis_softc *sc,
le32toh(msg-rm_devicevchdl)));
rval = urndis_ctrl_send(sc, msg, sizeof(*msg));
- kmem_free(msg, sizeof(*msg));
+ kmem_free(msg, sizeof(*msg) + len);
if (rval != RNDIS_STATUS_SUCCESS) {
printf(%s: set failed\n, DEVNAME(sc));
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 08:13:44 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-6]: piixpm.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #1096):
sys/dev/pci/piixpm.c: revision 1.45
Consistently pass a struct piixpm_softc to piixpm_intr.
Prevents a crash on hardware interrupts.
To generate a diff of this commit:
cvs rdiff -u -r1.40.2.1 -r1.40.2.2 src/sys/dev/pci/piixpm.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/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.40.2.1 src/sys/dev/pci/piixpm.c:1.40.2.2
--- src/sys/dev/pci/piixpm.c:1.40.2.1 Fri Sep 20 03:49:00 2013
+++ src/sys/dev/pci/piixpm.c Thu Aug 7 08:13:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.40.2.1 2013/09/20 03:49:00 riz Exp $ */
+/* $NetBSD: piixpm.c,v 1.40.2.2 2014/08/07 08:13:44 msaitoh Exp $ */
/* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: piixpm.c,v 1.40.2.1 2013/09/20 03:49:00 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: piixpm.c,v 1.40.2.2 2014/08/07 08:13:44 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -500,7 +500,7 @@ piixpm_i2c_exec(void *cookie, i2c_op_t o
}
if (st PIIX_SMB_HS_BUSY)
goto timeout;
- piixpm_intr(smbus);
+ piixpm_intr(sc);
} else {
/* Wait for interrupt */
if (tsleep(sc, PRIBIO, iicexec, PIIXPM_TIMEOUT * hz))
@@ -535,8 +535,7 @@ timeout:
static int
piixpm_intr(void *arg)
{
- struct piixpm_smbus *smbus = arg;
- struct piixpm_softc *sc = smbus-softc;
+ struct piixpm_softc *sc = arg;
u_int8_t st;
u_int8_t *b;
size_t len;
CVS commit: src/sys
Module Name:src
Committed By: hannken
Date: Thu Aug 7 08:24:23 UTC 2014
Modified Files:
src/sys/fs/efs: efs_vfsops.c efs_vnops.c files.efs
src/sys/modules/efs: Makefile
src/sys/rump/fs/lib/libefs: Makefile
Removed Files:
src/sys/fs/efs: efs_ihash.c efs_ihash.h
Log Message:
Change efs from hashlist to vcache.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r0 src/sys/fs/efs/efs_ihash.c
cvs rdiff -u -r1.1 -r0 src/sys/fs/efs/efs_ihash.h
cvs rdiff -u -r1.25 -r1.26 src/sys/fs/efs/efs_vfsops.c
cvs rdiff -u -r1.32 -r1.33 src/sys/fs/efs/efs_vnops.c
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/efs/files.efs
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/efs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/fs/lib/libefs/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/fs/efs/efs_vfsops.c
diff -u src/sys/fs/efs/efs_vfsops.c:1.25 src/sys/fs/efs/efs_vfsops.c:1.26
--- src/sys/fs/efs/efs_vfsops.c:1.25 Wed Apr 16 18:55:18 2014
+++ src/sys/fs/efs/efs_vfsops.c Thu Aug 7 08:24:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: efs_vfsops.c,v 1.25 2014/04/16 18:55:18 maxv Exp $ */
+/* $NetBSD: efs_vfsops.c,v 1.26 2014/08/07 08:24:23 hannken Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble rum...@ephemeral.org
@@ -17,7 +17,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: efs_vfsops.c,v 1.25 2014/04/16 18:55:18 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: efs_vfsops.c,v 1.26 2014/08/07 08:24:23 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, $NetBSD: efs_vfsops.c
#include fs/efs/efs_dinode.h
#include fs/efs/efs_inode.h
#include fs/efs/efs_subr.h
-#include fs/efs/efs_ihash.h
MODULE(MODULE_CLASS_VFS, efs, NULL);
@@ -341,74 +340,53 @@ efs_statvfs(struct mount *mp, struct sta
/*
* Obtain a locked vnode for the given on-disk inode number.
*
- * We currently allocate a new vnode from getnewnode(), tack it with
- * our in-core inode structure (efs_inode), and read in the inode from
- * disk. The returned inode must be locked.
- *
* Returns 0 on success.
*/
static int
efs_vget(struct mount *mp, ino_t ino, struct vnode **vpp)
{
- int err;
- struct vnode *vp;
+ int error;
+
+ error = vcache_get(mp, ino, sizeof(ino), vpp);
+ if (error)
+ return error;
+ error = vn_lock(*vpp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(*vpp);
+ *vpp = NULL;
+ return error;
+ }
+ return 0;
+}
+
+/*
+ * Initialize this vnode / inode pair.
+ * Caller assures no other thread will try to load this inode.
+ */
+static int
+efs_loadvnode(struct mount *mp, struct vnode *vp,
+const void *key, size_t key_len, const void **new_key)
+{
+ int error;
+ ino_t ino;
struct efs_inode *eip;
struct efs_mount *emp;
+ KASSERT(key_len == sizeof(ino));
+ memcpy(ino, key, key_len);
emp = VFSTOEFS(mp);
- while (true) {
- *vpp = efs_ihashget(emp-em_dev, ino, LK_EXCLUSIVE);
- if (*vpp != NULL)
- return (0);
-
- err = getnewvnode(VT_EFS, mp, efs_vnodeop_p, NULL, vp);
- if (err)
- return (err);
-
- eip = pool_get(efs_inode_pool, PR_WAITOK);
-
- /*
- * See if anybody has raced us here. If not, continue
- * setting up the new inode, otherwise start over.
- */
- efs_ihashlock();
-
- if (efs_ihashget(emp-em_dev, ino, 0) == NULL)
- break;
-
- efs_ihashunlock();
- ungetnewvnode(vp);
- pool_put(efs_inode_pool, eip);
- }
-
- vp-v_vflag |= VV_LOCKSWORK;
+ eip = pool_get(efs_inode_pool, PR_WAITOK);
eip-ei_mode = 0;
eip-ei_lockf = NULL;
eip-ei_number = ino;
eip-ei_dev = emp-em_dev;
eip-ei_vp = vp;
- vp-v_data = eip;
- /*
- * Place the vnode on the hash chain. Doing so will lock the
- * vnode, so it's okay to drop the global lock and read in
- * the inode from disk.
- */
- efs_ihashins(eip);
- efs_ihashunlock();
-
- /*
- * Init genfs early, otherwise we'll trip up on genfs_node_destroy
- * in efs_reclaim when vput()ing in an error branch here.
- */
- genfs_node_init(vp, efs_genfsops);
-
- err = efs_read_inode(emp, ino, NULL, eip-ei_di);
- if (err) {
- vput(vp);
- *vpp = NULL;
- return (err);
+ error = efs_read_inode(emp, ino, NULL, eip-ei_di);
+ if (error) {
+ pool_put(efs_inode_pool, eip);
+ return error;
}
efs_sync_dinode_to_inode(eip);
@@ -416,9 +394,8 @@ efs_vget(struct mount *mp, ino_t ino, st
if (ino == EFS_ROOTINO !S_ISDIR(eip-ei_mode)) {
printf(efs: root inode (%lu) is not a directory!\n,
(ulong)EFS_ROOTINO);
- vput(vp);
- *vpp = NULL;
- return (EIO);
+ pool_put(efs_inode_pool, eip);
+ return EIO;
}
switch (eip-ei_mode S_IFMT) {
@@ -433,6 +410,7 @@ efs_vget(struct mount *mp, ino_t ino, st
break;
case S_IFDIR:
vp-v_type = VDIR;
+ vp-v_op = efs_vnodeop_p;
if (ino == EFS_ROOTINO)
vp-v_vflag |= VV_ROOT;
break;
@@ -443,27 +421,30 @@ efs_vget(struct mount *mp, ino_t ino, st
break;
case S_IFREG:
vp-v_type = VREG;
+ vp-v_op = efs_vnodeop_p;
break;
case
CVS commit: [netbsd-6] src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 08:33:36 UTC 2014
Modified Files:
src/sys/dev/pckbport [netbsd-6]: wskbdmap_mfii.c
src/sys/dev/usb [netbsd-6]: ukbdmap.c
Log Message:
Pull up following revision(s) (requested by mbalmer in ticket #1099):
sys/dev/usb/ukbdmap.c: revision 1.29
sys/dev/pckbport/wskbdmap_mfii.c: revision 1.25
Add a belgian keyboard layout, based on the french keyboard layout.
Fixes PR install/46871.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/pckbport/wskbdmap_mfii.c
cvs rdiff -u -r1.28 -r1.28.16.1 src/sys/dev/usb/ukbdmap.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/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.22 src/sys/dev/pckbport/wskbdmap_mfii.c:1.22.8.1
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.22 Fri Jul 22 23:22:38 2011
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Thu Aug 7 08:33:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.c,v 1.22 2011/07/22 23:22:38 christos Exp $ */
+/* $NetBSD: wskbdmap_mfii.c,v 1.22.8.1 2014/08/07 08:33:36 msaitoh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.22 2011/07/22 23:22:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.22.8.1 2014/08/07 08:33:36 msaitoh Exp $);
#include opt_wskbdmap.h
#include sys/types.h
@@ -408,6 +408,28 @@ static const keysym_t pckbd_keydesc_fr[]
KC(184), KS_Mode_switch, KS_Multi_key,
};
+static const keysym_t pckbd_keydesc_be[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(2), KS_ampersand, KS_1, KS_bar,
+KC(3), KS_eacute, KS_2, KS_at,
+KC(5), KS_apostrophe, KS_4,
+KC(6), KS_parenleft, KS_5,
+KC(7), KS_section, KS_6, KS_asciicircum,
+KC(8), KS_egrave, KS_7,
+KC(9), KS_exclam, KS_8,
+KC(10), KS_ccedilla, KS_9, KS_braceleft,
+KC(11), KS_agrave, KS_0, KS_braceright,
+KC(12), KS_parenright, KS_degree,
+KC(13), KS_minus, KS_underscore,
+KC(26), KS_dead_circumflex, KS_dead_diaeresis, KS_bracketleft,
+KC(27), KS_dollar, KS_asterisk, KS_bracketright,
+KC(43), KS_mu, KS_sterling, KS_grave,
+KC(40), KS_ugrave, KS_percent, KS_acute,
+KC(41), KS_twosuperior, KS_threesuperior,
+KC(53), KS_equal, KS_plus, KS_asciitilde,
+KC(86), KS_less, KS_greater, KS_backslash,
+};
+
static const keysym_t pckbd_keydesc_it[] = {
/* pos normal shifted altgr shift-altgr */
KC(3), KS_2, KS_quotedbl, KS_twosuperior,
@@ -777,6 +799,7 @@ const struct wscons_keydesc pckbd_keydes
KBD_MAP(KB_SF, KB_SG, pckbd_keydesc_sf),
KBD_MAP(KB_SF | KB_NODEAD, KB_SF, pckbd_keydesc_sg_nodead),
KBD_MAP(KB_FR, KB_US, pckbd_keydesc_fr),
+ KBD_MAP(KB_BE, KB_FR, pckbd_keydesc_be),
KBD_MAP(KB_DK, KB_US, pckbd_keydesc_dk),
KBD_MAP(KB_DK | KB_NODEAD, KB_DK, pckbd_keydesc_dk_nodead),
KBD_MAP(KB_IT, KB_US, pckbd_keydesc_it),
Index: src/sys/dev/usb/ukbdmap.c
diff -u src/sys/dev/usb/ukbdmap.c:1.28 src/sys/dev/usb/ukbdmap.c:1.28.16.1
--- src/sys/dev/usb/ukbdmap.c:1.28 Fri Apr 16 11:29:06 2010
+++ src/sys/dev/usb/ukbdmap.c Thu Aug 7 08:33:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbdmap.c,v 1.28 2010/04/16 11:29:06 ahoka Exp $ */
+/* $NetBSD: ukbdmap.c,v 1.28.16.1 2014/08/07 08:33:36 msaitoh Exp $ */
/*
* Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbdmap.c,v 1.28 2010/04/16 11:29:06 ahoka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbdmap.c,v 1.28.16.1 2014/08/07 08:33:36 msaitoh Exp $);
#include sys/types.h
#include dev/wscons/wsksymdef.h
@@ -416,6 +416,28 @@ Static const keysym_t ukbd_keydesc_fr[]
KC(230), KS_Mode_switch, KS_Multi_key,
};
+Static const keysym_t ukbd_keydesc_be[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(30), KS_ampersand, KS_1, KS_bar,
+KC(31), KS_eacute, KS_2, KS_at,
+KC(33), KS_apostrophe, KS_4,
+KC(34), KS_parenleft, KS_5,
+KC(35), KS_section, KS_6, KS_asciicircum,
+KC(36), KS_egrave, KS_7,
+KC(37), KS_exclam, KS_8,
+KC(38), KS_ccedilla, KS_9, KS_braceleft,
+KC(39), KS_agrave, KS_0, KS_braceright,
+KC(45), KS_parenright, KS_degree,
+KC(46), KS_minus, KS_underscore,
+KC(47), KS_dead_circumflex, KS_dead_diaeresis, KS_bracketleft,
+KC(48), KS_dollar, KS_asterisk, KS_bracketright,
+KC(50), KS_mu, KS_sterling, KS_grave,
+KC(52), KS_ugrave, KS_percent, KS_acute,
+KC(53), KS_twosuperior, KS_threesuperior,
+KC(56), KS_equal, KS_plus, KS_asciitilde,
+KC(100), KS_less, KS_greater, KS_backslash,
+};
+
Static const keysym_t ukbd_keydesc_it[] = {
/* pos normal shifted altgr shift-altgr
CVS commit: [netbsd-6] src/lib/libc/arch/sparc/gen
Module Name:src Committed By: msaitoh Date: Thu Aug 7 08:45:10 UTC 2014 Modified Files: src/lib/libc/arch/sparc/gen [netbsd-6]: _setjmp.S Log Message: Pull up following revision(s) (requested by nakayama in ticket #1100): lib/libc/arch/sparc/gen/_setjmp.S: revision 1.10 Use save instruction to set up a local stack frame. This fixes a segmentation fault caused by bash 4.3 on sparc64 kernels with 32-bit userland, bash uses _setjmp/_longjmp heavyly via sigsetjmp/siglongjmp since 4.3. For 32-bit compat library which is compiled with -mcpu=ultrasparc option (and define __sparc_v9__), use a similar code to 64-bit library. Use save instruction to set up a local stack frame. This fixes a segmentation fault caused by bash 4.3 on sparc64 kernels with 32-bit userland, bash uses _setjmp/_longjmp heavyly via sigsetjmp/siglongjmp since 4.3. For 32-bit compat library which is compiled with -mcpu=ultrasparc option (and define __sparc_v9__), use a similar code to 64-bit library. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.6.1 src/lib/libc/arch/sparc/gen/_setjmp.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/sparc/gen/_setjmp.S diff -u src/lib/libc/arch/sparc/gen/_setjmp.S:1.9 src/lib/libc/arch/sparc/gen/_setjmp.S:1.9.6.1 --- src/lib/libc/arch/sparc/gen/_setjmp.S:1.9 Sat Apr 30 23:41:12 2011 +++ src/lib/libc/arch/sparc/gen/_setjmp.S Thu Aug 7 08:45:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: _setjmp.S,v 1.9 2011/04/30 23:41:12 martin Exp $ */ +/* $NetBSD: _setjmp.S,v 1.9.6.1 2014/08/07 08:45:10 msaitoh Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include machine/trap.h #if defined(LIBC_SCCS) !defined(lint) -RCSID($NetBSD: _setjmp.S,v 1.9 2011/04/30 23:41:12 martin Exp $) +RCSID($NetBSD: _setjmp.S,v 1.9.6.1 2014/08/07 08:45:10 msaitoh Exp $) #endif /* LIBC_SCCS and not lint */ /* @@ -59,26 +59,46 @@ ENTRY(_setjmp) clr %o0 ! return 0 ENTRY(_longjmp) - sub %sp, 64, %sp ! set up a local stack frame - tst %o1 ! compute v ? v : 1 +#ifdef __sparc_v9__ + save %sp, -CCFSZ, %sp + flushw + /* + * We restore the saved stack pointer to %fp, then issue + * a `restore' instruction which will reload the register + * window from the stack. + */ + ld [%i0 + 16], %g3 + ld [%i0 + 24], %g2 + ld [%i0 + 48], %g4 + ld [%i0 + 52], %g7 + ld [%i0 + 4], %i7 /* restore return pc */ + ld [%i0 + 0], %fp /* and stack pointer */ + mov 1, %i0 + movrnz %i1, %i1, %i0 ! compute v ? v : 1 + ret + restore +#else + save %sp, -64, %sp ! set up a local stack frame + tst %i1 ! compute v ? v : 1 be,a 0f - mov 1, %o1 + mov 1, %i1 0: t ST_FLUSHWIN ! flush register windows out to the stack /* restore globals */ - ld [%o0 + 16], %g3 - ld [%o0 + 24], %g2 - ld [%o0 + 48], %g4 - ld [%o0 + 52], %g7 + ld [%i0 + 16], %g3 + ld [%i0 + 24], %g2 + ld [%i0 + 48], %g4 + ld [%i0 + 52], %g7 /* * We restore the saved stack pointer to %fp, then issue * a `restore' instruction which will reload the register * window from the stack. */ - ld [%o0+4], %o7 /* restore return pc */ - ld [%o0+0], %fp /* and stack pointer */ + ld [%i0+4], %i7 /* restore return pc */ + ld [%i0+0], %fp /* and stack pointer */ - retl ! success, return %o1 - restore %o1, 0, %o0 + ret ! success, return %i1 + restore %i1, 0, %o0 +#endif
CVS commit: [netbsd-6-1] src/lib/libc/arch/sparc/gen
Module Name:src Committed By: msaitoh Date: Thu Aug 7 08:53:40 UTC 2014 Modified Files: src/lib/libc/arch/sparc/gen [netbsd-6-1]: _setjmp.S Log Message: Pull up following revision(s) (requested by nakayama in ticket #1100): lib/libc/arch/sparc/gen/_setjmp.S: revision 1.10 Use save instruction to set up a local stack frame. This fixes a segmentation fault caused by bash 4.3 on sparc64 kernels with 32-bit userland, bash uses _setjmp/_longjmp heavyly via sigsetjmp/siglongjmp since 4.3. For 32-bit compat library which is compiled with -mcpu=ultrasparc option (and define __sparc_v9__), use a similar code to 64-bit library. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.18.1 src/lib/libc/arch/sparc/gen/_setjmp.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/sparc/gen/_setjmp.S diff -u src/lib/libc/arch/sparc/gen/_setjmp.S:1.9 src/lib/libc/arch/sparc/gen/_setjmp.S:1.9.18.1 --- src/lib/libc/arch/sparc/gen/_setjmp.S:1.9 Sat Apr 30 23:41:12 2011 +++ src/lib/libc/arch/sparc/gen/_setjmp.S Thu Aug 7 08:53:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: _setjmp.S,v 1.9 2011/04/30 23:41:12 martin Exp $ */ +/* $NetBSD: _setjmp.S,v 1.9.18.1 2014/08/07 08:53:40 msaitoh Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include machine/trap.h #if defined(LIBC_SCCS) !defined(lint) -RCSID($NetBSD: _setjmp.S,v 1.9 2011/04/30 23:41:12 martin Exp $) +RCSID($NetBSD: _setjmp.S,v 1.9.18.1 2014/08/07 08:53:40 msaitoh Exp $) #endif /* LIBC_SCCS and not lint */ /* @@ -59,26 +59,46 @@ ENTRY(_setjmp) clr %o0 ! return 0 ENTRY(_longjmp) - sub %sp, 64, %sp ! set up a local stack frame - tst %o1 ! compute v ? v : 1 +#ifdef __sparc_v9__ + save %sp, -CCFSZ, %sp + flushw + /* + * We restore the saved stack pointer to %fp, then issue + * a `restore' instruction which will reload the register + * window from the stack. + */ + ld [%i0 + 16], %g3 + ld [%i0 + 24], %g2 + ld [%i0 + 48], %g4 + ld [%i0 + 52], %g7 + ld [%i0 + 4], %i7 /* restore return pc */ + ld [%i0 + 0], %fp /* and stack pointer */ + mov 1, %i0 + movrnz %i1, %i1, %i0 ! compute v ? v : 1 + ret + restore +#else + save %sp, -64, %sp ! set up a local stack frame + tst %i1 ! compute v ? v : 1 be,a 0f - mov 1, %o1 + mov 1, %i1 0: t ST_FLUSHWIN ! flush register windows out to the stack /* restore globals */ - ld [%o0 + 16], %g3 - ld [%o0 + 24], %g2 - ld [%o0 + 48], %g4 - ld [%o0 + 52], %g7 + ld [%i0 + 16], %g3 + ld [%i0 + 24], %g2 + ld [%i0 + 48], %g4 + ld [%i0 + 52], %g7 /* * We restore the saved stack pointer to %fp, then issue * a `restore' instruction which will reload the register * window from the stack. */ - ld [%o0+4], %o7 /* restore return pc */ - ld [%o0+0], %fp /* and stack pointer */ + ld [%i0+4], %i7 /* restore return pc */ + ld [%i0+0], %fp /* and stack pointer */ - retl ! success, return %o1 - restore %o1, 0, %o0 + ret ! success, return %i1 + restore %i1, 0, %o0 +#endif
CVS commit: [netbsd-6-0] src/lib/libc/arch/sparc/gen
Module Name:src Committed By: msaitoh Date: Thu Aug 7 08:54:44 UTC 2014 Modified Files: src/lib/libc/arch/sparc/gen [netbsd-6-0]: _setjmp.S Log Message: Pull up following revision(s) (requested by nakayama in ticket #1100): lib/libc/arch/sparc/gen/_setjmp.S: revision 1.10 Use save instruction to set up a local stack frame. This fixes a segmentation fault caused by bash 4.3 on sparc64 kernels with 32-bit userland, bash uses _setjmp/_longjmp heavyly via sigsetjmp/siglongjmp since 4.3. For 32-bit compat library which is compiled with -mcpu=ultrasparc option (and define __sparc_v9__), use a similar code to 64-bit library. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.12.1 src/lib/libc/arch/sparc/gen/_setjmp.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/sparc/gen/_setjmp.S diff -u src/lib/libc/arch/sparc/gen/_setjmp.S:1.9 src/lib/libc/arch/sparc/gen/_setjmp.S:1.9.12.1 --- src/lib/libc/arch/sparc/gen/_setjmp.S:1.9 Sat Apr 30 23:41:12 2011 +++ src/lib/libc/arch/sparc/gen/_setjmp.S Thu Aug 7 08:54:44 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: _setjmp.S,v 1.9 2011/04/30 23:41:12 martin Exp $ */ +/* $NetBSD: _setjmp.S,v 1.9.12.1 2014/08/07 08:54:44 msaitoh Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include machine/trap.h #if defined(LIBC_SCCS) !defined(lint) -RCSID($NetBSD: _setjmp.S,v 1.9 2011/04/30 23:41:12 martin Exp $) +RCSID($NetBSD: _setjmp.S,v 1.9.12.1 2014/08/07 08:54:44 msaitoh Exp $) #endif /* LIBC_SCCS and not lint */ /* @@ -59,26 +59,46 @@ ENTRY(_setjmp) clr %o0 ! return 0 ENTRY(_longjmp) - sub %sp, 64, %sp ! set up a local stack frame - tst %o1 ! compute v ? v : 1 +#ifdef __sparc_v9__ + save %sp, -CCFSZ, %sp + flushw + /* + * We restore the saved stack pointer to %fp, then issue + * a `restore' instruction which will reload the register + * window from the stack. + */ + ld [%i0 + 16], %g3 + ld [%i0 + 24], %g2 + ld [%i0 + 48], %g4 + ld [%i0 + 52], %g7 + ld [%i0 + 4], %i7 /* restore return pc */ + ld [%i0 + 0], %fp /* and stack pointer */ + mov 1, %i0 + movrnz %i1, %i1, %i0 ! compute v ? v : 1 + ret + restore +#else + save %sp, -64, %sp ! set up a local stack frame + tst %i1 ! compute v ? v : 1 be,a 0f - mov 1, %o1 + mov 1, %i1 0: t ST_FLUSHWIN ! flush register windows out to the stack /* restore globals */ - ld [%o0 + 16], %g3 - ld [%o0 + 24], %g2 - ld [%o0 + 48], %g4 - ld [%o0 + 52], %g7 + ld [%i0 + 16], %g3 + ld [%i0 + 24], %g2 + ld [%i0 + 48], %g4 + ld [%i0 + 52], %g7 /* * We restore the saved stack pointer to %fp, then issue * a `restore' instruction which will reload the register * window from the stack. */ - ld [%o0+4], %o7 /* restore return pc */ - ld [%o0+0], %fp /* and stack pointer */ + ld [%i0+4], %i7 /* restore return pc */ + ld [%i0+0], %fp /* and stack pointer */ - retl ! success, return %o1 - restore %o1, 0, %o0 + ret ! success, return %i1 + restore %i1, 0, %o0 +#endif
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Thu Aug 7 08:58:55 UTC 2014 Modified Files: src/distrib/sets/lists/xdebug: md.x68k Log Message: Update for xorg To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/xdebug/md.x68k 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/xdebug/md.x68k diff -u src/distrib/sets/lists/xdebug/md.x68k:1.1 src/distrib/sets/lists/xdebug/md.x68k:1.2 --- src/distrib/sets/lists/xdebug/md.x68k:1.1 Wed Jan 16 21:11:19 2013 +++ src/distrib/sets/lists/xdebug/md.x68k Thu Aug 7 08:58:55 2014 @@ -1,3 +1,4 @@ -# $NetBSD: md.x68k,v 1.1 2013/01/16 21:11:19 christos Exp $ -./usr/libdata/debug/usr/X11R6/bin/X68k.debug -unknown- debug -./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug +# $NetBSD: md.x68k,v 1.2 2014/08/07 08:58:55 martin Exp $ +./usr/libdata/debug/usr/X11R6/bin/X68k.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11 +./usr/libdata/debug/usr/X11R7/bin/X68k.debug -unknown- debug,xorg
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: joerg
Date: Thu Aug 7 08:59:42 UTC 2014
Modified Files:
src/sys/arch/amiga/dev: sbic.c
Log Message:
Drop extra ().
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/amiga/dev/sbic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/sbic.c
diff -u src/sys/arch/amiga/dev/sbic.c:1.72 src/sys/arch/amiga/dev/sbic.c:1.73
--- src/sys/arch/amiga/dev/sbic.c:1.72 Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/dev/sbic.c Thu Aug 7 08:59:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.72 2014/01/22 00:25:16 christos Exp $ */
+/* $NetBSD: sbic.c,v 1.73 2014/08/07 08:59:42 joerg Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
#endif
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbic.c,v 1.72 2014/01/22 00:25:16 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbic.c,v 1.73 2014/08/07 08:59:42 joerg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2060,17 +2060,17 @@ sbicmsgin(struct sbic_softc *dev)
SET_SBIC_syn(regs,
SBIC_SYN(dev-sc_sync[dev-target].offset,
dev-sc_sync[dev-target].period));
- } else if ((dev-sc_msg[0] == MSG_REJECT)) {
+ } else if (dev-sc_msg[0] == MSG_REJECT) {
QPRINTF((REJECT));
/*
* we'll never REJECt a REJECT message..
*/
- } else if ((dev-sc_msg[0] == MSG_SAVE_DATA_PTR)) {
+ } else if (dev-sc_msg[0] == MSG_SAVE_DATA_PTR) {
QPRINTF((MSG_SAVE_DATA_PTR));
/*
* don't reject this either.
*/
- } else if ((dev-sc_msg[0] == MSG_DISCONNECT)) {
+ } else if (dev-sc_msg[0] == MSG_DISCONNECT) {
QPRINTF((DISCONNECT));
#ifdef DEBUG
if( reselect_debug1 dev-sc_msg[0] == MSG_DISCONNECT )
CVS commit: src/sys/arch/prep/prep
Module Name:src Committed By: joerg Date: Thu Aug 7 09:06:53 UTC 2014 Modified Files: src/sys/arch/prep/prep: locore.S Log Message: Use cmpwi. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/prep/prep/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/prep/prep/locore.S diff -u src/sys/arch/prep/prep/locore.S:1.18 src/sys/arch/prep/prep/locore.S:1.19 --- src/sys/arch/prep/prep/locore.S:1.18 Mon Jun 20 19:56:12 2011 +++ src/sys/arch/prep/prep/locore.S Thu Aug 7 09:06:53 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.18 2011/06/20 19:56:12 matt Exp $ */ +/* $NetBSD: locore.S,v 1.19 2014/08/07 09:06:53 joerg Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -120,7 +120,7 @@ __start: /* enable internal i/d-cache */ mfpvr 9 rlwinm 9,9,16,16,31 - cmpi 0,9,1 + cmpwi %r9,1 beq 3f /* not needed for 601 */ mfspr 11,SPR_HID0 andi. 0,11,HID0_DCE @@ -135,9 +135,9 @@ __start: mtspr SPR_HID0,11 /* enable caches */ sync isync - cmpi 0,9,4 /* check for 604 */ - cmpi 1,9,9 /* or 604e */ - cmpi 2,9,10 /* or mach5 */ + cmpwi %r9,4 /* check for 604 */ + cmpwi %cr1,%r9,9 /* or 604e */ + cmpwi %cr2,%r9,10 /* or mach5 */ cror 2,2,6 cror 2,2,10 bne 3f
CVS commit: [netbsd-6] xsrc/external/mit/xf86-video-wsfb/dist/src
Module Name:xsrc
Committed By: msaitoh
Date: Thu Aug 7 09:07:36 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src [netbsd-6]: wsfb_driver.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1101):
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c: revision 1.17
Call removeShadow only when shadowFB has been initialized.
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.2 -r1.13.2.3 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.2.2 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.2.3
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.2.2 Thu Feb 14 21:44:11 2013
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Thu Aug 7 09:07:36 2014
@@ -1058,7 +1058,8 @@ WsfbCloseScreen(int scrnIndex, ScreenPtr
TRACE_ENTER(WsfbCloseScreen);
pPixmap = pScreen-GetScreenPixmap(pScreen);
- shadowRemove(pScreen, pPixmap);
+ if (fPtr-shadowFB)
+ shadowRemove(pScreen, pPixmap);
if (pScrn-vtSema) {
WsfbRestore(pScrn);
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: joerg Date: Thu Aug 7 09:08:09 UTC 2014 Modified Files: src/sys/arch/powerpc/powerpc: openfirm.c Log Message: Panic after openfirm, it is not supposed to return. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/powerpc/openfirm.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/powerpc/powerpc/openfirm.c diff -u src/sys/arch/powerpc/powerpc/openfirm.c:1.24 src/sys/arch/powerpc/powerpc/openfirm.c:1.25 --- src/sys/arch/powerpc/powerpc/openfirm.c:1.24 Fri Feb 28 05:45:26 2014 +++ src/sys/arch/powerpc/powerpc/openfirm.c Thu Aug 7 09:08:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: openfirm.c,v 1.24 2014/02/28 05:45:26 matt Exp $ */ +/* $NetBSD: openfirm.c,v 1.25 2014/08/07 09:08:09 joerg Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -34,7 +34,7 @@ #include opt_multiprocessor.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: openfirm.c,v 1.24 2014/02/28 05:45:26 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: openfirm.c,v 1.25 2014/08/07 09:08:09 joerg Exp $); #include sys/param.h #include sys/systm.h @@ -615,8 +615,8 @@ OF_boot(const char *bootspec) ofw_stack(); ofbcopy(bootspec, OF_buf, l + 1); args.bootspec = OF_buf; - if (openfirmware(args) == -1) - panic(OF_boot didn't); + openfirmware(args); + panic(OF_boot didn't); } void
CVS commit: src/sys/arch/mvmeppc/mvmeppc
Module Name:src Committed By: joerg Date: Thu Aug 7 09:08:41 UTC 2014 Modified Files: src/sys/arch/mvmeppc/mvmeppc: locore.S Log Message: Use cmpwi. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvmeppc/mvmeppc/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/mvmeppc/locore.S diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.15 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.16 --- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.15 Mon Jun 20 19:56:12 2011 +++ src/sys/arch/mvmeppc/mvmeppc/locore.S Thu Aug 7 09:08:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.15 2011/06/20 19:56:12 matt Exp $ */ +/* $NetBSD: locore.S,v 1.16 2014/08/07 09:08:41 joerg Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -132,7 +132,7 @@ __start: /* enable internal i/d-cache */ mfpvr %r9 rlwinm %r9,%r9,16,16,31 - cmpi %cr0,%r9,1 + cmpwi %cr0,%r9,1 beq 3f /* not needed for 601 */ mfspr %r11,SPR_HID0 andi. %r0,%r11,HID0_DCE @@ -147,9 +147,9 @@ __start: mtspr SPR_HID0,%r11 /* enable caches */ sync isync - cmpi %cr0,%r9,4 /* check for 604 */ - cmpi %cr1,%r9,9 /* or 604e */ - cmpi %cr2,%r9,10 /* or mach5 */ + cmpwi %cr0,%r9,4 /* check for 604 */ + cmpwi %cr1,%r9,9 /* or 604e */ + cmpwi %cr2,%r9,10 /* or mach5 */ cror 2,2,6 cror 2,2,10 bne 3f
CVS commit: [netbsd-6-1] xsrc/external/mit/xf86-video-wsfb/dist/src
Module Name:xsrc
Committed By: msaitoh
Date: Thu Aug 7 09:10:10 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src [netbsd-6-1]: wsfb_driver.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1101):
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c: revision 1.17
Call removeShadow only when shadowFB has been initialized.
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.2 -r1.13.2.2.2.1 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.2.2 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.2.2.2.1
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.2.2 Thu Feb 14 21:44:11 2013
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Thu Aug 7 09:10:10 2014
@@ -1058,7 +1058,8 @@ WsfbCloseScreen(int scrnIndex, ScreenPtr
TRACE_ENTER(WsfbCloseScreen);
pPixmap = pScreen-GetScreenPixmap(pScreen);
- shadowRemove(pScreen, pPixmap);
+ if (fPtr-shadowFB)
+ shadowRemove(pScreen, pPixmap);
if (pScrn-vtSema) {
WsfbRestore(pScrn);
CVS commit: [netbsd-6-0] xsrc/external/mit/xf86-video-wsfb/dist/src
Module Name:xsrc
Committed By: msaitoh
Date: Thu Aug 7 09:12:36 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src [netbsd-6-0]: wsfb_driver.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1101):
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c: revision 1.17
Call removeShadow only when shadowFB has been initialized.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.4.1
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13 Fri Jul 22 15:12:01 2011
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Thu Aug 7 09:12:36 2014
@@ -989,7 +989,8 @@ WsfbCloseScreen(int scrnIndex, ScreenPtr
TRACE_ENTER(WsfbCloseScreen);
pPixmap = pScreen-GetScreenPixmap(pScreen);
- shadowRemove(pScreen, pPixmap);
+ if (fPtr-shadowFB)
+ shadowRemove(pScreen, pPixmap);
if (pScrn-vtSema) {
WsfbRestore(pScrn);
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 09:31:09 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-6]: if_vioif.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1102):
sys/dev/pci/if_vioif.c: revision 1.5
Don't set SOFTINT_MPSAFE to vioif_rx_softint
vioif_rx_softint calls vioif_populate_rx_mbufs that is not MPSAFE.
vioif_populate_rx_mbufs is also called via vioif_ioctl and so can
be called by two LWPs simultaneously, resulting in kernel panic.
PR kern/49007
To generate a diff of this commit:
cvs rdiff -u -r1.2.8.1 -r1.2.8.2 src/sys/dev/pci/if_vioif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.2.8.1 src/sys/dev/pci/if_vioif.c:1.2.8.2
--- src/sys/dev/pci/if_vioif.c:1.2.8.1 Sun May 12 16:38:06 2013
+++ src/sys/dev/pci/if_vioif.c Thu Aug 7 09:31:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.2.8.1 2013/05/12 16:38:06 riz Exp $ */
+/* $NetBSD: if_vioif.c,v 1.2.8.2 2014/08/07 09:31:09 msaitoh Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.2.8.1 2013/05/12 16:38:06 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.2.8.2 2014/08/07 09:31:09 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -557,7 +557,7 @@ vioif_attach(device_t parent, device_t s
}
}
- sc-sc_rx_softint = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE,
+ sc-sc_rx_softint = softint_establish(SOFTINT_NET,
vioif_rx_softint, sc);
if (sc-sc_rx_softint == NULL) {
aprint_error_dev(self, cannot establish softint\n);
CVS commit: [netbsd-6-1] src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 09:34:21 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-6-1]: if_vioif.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1102):
sys/dev/pci/if_vioif.c: revision 1.5
Don't set SOFTINT_MPSAFE to vioif_rx_softint
vioif_rx_softint calls vioif_populate_rx_mbufs that is not MPSAFE.
vioif_populate_rx_mbufs is also called via vioif_ioctl and so can
be called by two LWPs simultaneously, resulting in kernel panic.
PR kern/49007
To generate a diff of this commit:
cvs rdiff -u -r1.2.8.1 -r1.2.8.1.2.1 src/sys/dev/pci/if_vioif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.2.8.1 src/sys/dev/pci/if_vioif.c:1.2.8.1.2.1
--- src/sys/dev/pci/if_vioif.c:1.2.8.1 Sun May 12 16:38:06 2013
+++ src/sys/dev/pci/if_vioif.c Thu Aug 7 09:34:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.2.8.1 2013/05/12 16:38:06 riz Exp $ */
+/* $NetBSD: if_vioif.c,v 1.2.8.1.2.1 2014/08/07 09:34:21 msaitoh Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.2.8.1 2013/05/12 16:38:06 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.2.8.1.2.1 2014/08/07 09:34:21 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -557,7 +557,7 @@ vioif_attach(device_t parent, device_t s
}
}
- sc-sc_rx_softint = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE,
+ sc-sc_rx_softint = softint_establish(SOFTINT_NET,
vioif_rx_softint, sc);
if (sc-sc_rx_softint == NULL) {
aprint_error_dev(self, cannot establish softint\n);
CVS commit: [netbsd-6-0] src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 09:35:22 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-6-0]: if_vioif.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1102):
sys/dev/pci/if_vioif.c: revision 1.5
Don't set SOFTINT_MPSAFE to vioif_rx_softint
vioif_rx_softint calls vioif_populate_rx_mbufs that is not MPSAFE.
vioif_populate_rx_mbufs is also called via vioif_ioctl and so can
be called by two LWPs simultaneously, resulting in kernel panic.
PR kern/49007
To generate a diff of this commit:
cvs rdiff -u -r1.2.14.1 -r1.2.14.2 src/sys/dev/pci/if_vioif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.2.14.1 src/sys/dev/pci/if_vioif.c:1.2.14.2
--- src/sys/dev/pci/if_vioif.c:1.2.14.1 Sun May 12 16:38:33 2013
+++ src/sys/dev/pci/if_vioif.c Thu Aug 7 09:35:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.2.14.1 2013/05/12 16:38:33 riz Exp $ */
+/* $NetBSD: if_vioif.c,v 1.2.14.2 2014/08/07 09:35:22 msaitoh Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.2.14.1 2013/05/12 16:38:33 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.2.14.2 2014/08/07 09:35:22 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -557,7 +557,7 @@ vioif_attach(device_t parent, device_t s
}
}
- sc-sc_rx_softint = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE,
+ sc-sc_rx_softint = softint_establish(SOFTINT_NET,
vioif_rx_softint, sc);
if (sc-sc_rx_softint == NULL) {
aprint_error_dev(self, cannot establish softint\n);
CVS commit: [netbsd-6] src/sys/net
Module Name:src Committed By: msaitoh Date: Thu Aug 7 09:39:55 UTC 2014 Modified Files: src/sys/net [netbsd-6]: link_proto.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1103): sys/net/link_proto.crevision 1.17 Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan. PR kern/48997. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/net/link_proto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/link_proto.c diff -u src/sys/net/link_proto.c:1.7 src/sys/net/link_proto.c:1.7.8.1 --- src/sys/net/link_proto.c:1.7 Fri Oct 7 16:34:31 2011 +++ src/sys/net/link_proto.c Thu Aug 7 09:39:55 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: link_proto.c,v 1.7 2011/10/07 16:34:31 dyoung Exp $ */ +/* $NetBSD: link_proto.c,v 1.7.8.1 2014/08/07 09:39:55 msaitoh Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: link_proto.c,v 1.7 2011/10/07 16:34:31 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: link_proto.c,v 1.7.8.1 2014/08/07 09:39:55 msaitoh Exp $); #include sys/param.h #include sys/socket.h @@ -197,7 +197,8 @@ link_control(struct socket *so, unsigned splx(s); if (error != ENETRESET) return error; - else if ((ifp-if_flags IFF_RUNNING) != 0) + else if ((ifp-if_flags IFF_RUNNING) != 0 + ifp-if_init != NULL) return (*ifp-if_init)(ifp); else return 0;
CVS commit: [netbsd-6-1] src/sys/net
Module Name:src Committed By: msaitoh Date: Thu Aug 7 09:50:05 UTC 2014 Modified Files: src/sys/net [netbsd-6-1]: link_proto.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1103): sys/net/link_proto.crevision 1.17 Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan. PR kern/48997. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.22.1 src/sys/net/link_proto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/link_proto.c diff -u src/sys/net/link_proto.c:1.7 src/sys/net/link_proto.c:1.7.22.1 --- src/sys/net/link_proto.c:1.7 Fri Oct 7 16:34:31 2011 +++ src/sys/net/link_proto.c Thu Aug 7 09:50:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: link_proto.c,v 1.7 2011/10/07 16:34:31 dyoung Exp $ */ +/* $NetBSD: link_proto.c,v 1.7.22.1 2014/08/07 09:50:05 msaitoh Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: link_proto.c,v 1.7 2011/10/07 16:34:31 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: link_proto.c,v 1.7.22.1 2014/08/07 09:50:05 msaitoh Exp $); #include sys/param.h #include sys/socket.h @@ -197,7 +197,8 @@ link_control(struct socket *so, unsigned splx(s); if (error != ENETRESET) return error; - else if ((ifp-if_flags IFF_RUNNING) != 0) + else if ((ifp-if_flags IFF_RUNNING) != 0 + ifp-if_init != NULL) return (*ifp-if_init)(ifp); else return 0;
CVS commit: [netbsd-6-0] src/sys/net
Module Name:src Committed By: msaitoh Date: Thu Aug 7 09:53:29 UTC 2014 Modified Files: src/sys/net [netbsd-6-0]: link_proto.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1103): sys/net/link_proto.crevision 1.17 Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan. PR kern/48997. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.14.1 src/sys/net/link_proto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/link_proto.c diff -u src/sys/net/link_proto.c:1.7 src/sys/net/link_proto.c:1.7.14.1 --- src/sys/net/link_proto.c:1.7 Fri Oct 7 16:34:31 2011 +++ src/sys/net/link_proto.c Thu Aug 7 09:53:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: link_proto.c,v 1.7 2011/10/07 16:34:31 dyoung Exp $ */ +/* $NetBSD: link_proto.c,v 1.7.14.1 2014/08/07 09:53:29 msaitoh Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: link_proto.c,v 1.7 2011/10/07 16:34:31 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: link_proto.c,v 1.7.14.1 2014/08/07 09:53:29 msaitoh Exp $); #include sys/param.h #include sys/socket.h @@ -197,7 +197,8 @@ link_control(struct socket *so, unsigned splx(s); if (error != ENETRESET) return error; - else if ((ifp-if_flags IFF_RUNNING) != 0) + else if ((ifp-if_flags IFF_RUNNING) != 0 + ifp-if_init != NULL) return (*ifp-if_init)(ifp); else return 0;
CVS commit: [netbsd-6] src/doc
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 09:57:33 UTC 2014
Modified Files:
src/doc [netbsd-6]: CHANGES-6.2
Log Message:
Ticket 1087, 1089, 1091, 1093-1094, 1096 and 1099-1103.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.125 -r1.1.2.126 src/doc/CHANGES-6.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-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.125 src/doc/CHANGES-6.2:1.1.2.126
--- src/doc/CHANGES-6.2:1.1.2.125 Fri Jul 18 17:52:30 2014
+++ src/doc/CHANGES-6.2 Thu Aug 7 09:57:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.125 2014/07/18 17:52:30 snj Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.126 2014/08/07 09:57:33 msaitoh Exp $
A complete list of changes from the 6.1 release until the 6.2 release:
@@ -2980,3 +2980,66 @@ distrib/utils/sysinst/arch/alpha/md.c 1
Make sysinst deal correctly with Tru64 disklabels. PR#48697
[tsutsui, ticket #1080]
+external/bsd/cron/dist/entry.c 1.5
+
+ PR/48944: cron ignores '?' (question mark) time field.
+ [skrll, ticket #1087]
+
+distrib/sets/lists/comp/md.amd64 patch
+
+ Fix build failure for MKDEBUG+MKCRYPTO_RC5 on amd64.
+ [mlelstv, ticket #1089]
+
+sys/arch/sun3/conf/DISKLESS 1.69
+
+ Enable ie0 in DISKLESS for sun3/110
+ [abs, ticket #1091]
+
+doc/3RDPARTY 1.1126 via patch
+etc/namedb/root.cache1.18
+
+ Update root.cache to 2014060201.
+ [taca, ticket #1093]
+
+sys/dev/usb/if_urndis.c1.7
+
+ PR/48963: Fix the size passed in kmem_free in the
+ urndis_ctrl_{query,set} functions to prevent panic in urndis(4).
+ [skrll, ticket #1094]
+
+sys/dev/pci/piixpm.c1.45
+
+ Consistently pass a struct piixpm_softc to piixpm_intr.
+ Prevents a crash on hardware interrupts.
+ [hannken, ticket #1096]
+
+sys/dev/pckbport/wskbdmap_mfii.c 1.25
+sys/dev/usb/ukbdmap.c1.29
+
+ Add a belgian keyboard layout, based on the french keyboard layout.
+ Fixes PR install/46871.
+ [mbalmer, ticket #1099]
+
+lib/libc/arch/sparc/gen/_setjmp.S 1.10
+
+ Fix longjmp bug which causes a segmentation fault on sparc64
+ kernels with 32-bit userland.
+ [nakayama, ticket #1100]
+
+xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c 1.17
+
+ Fixes Xorg server segmentation fault on Xserver exit (and then screen
+ palette settings are not restored properly).
+ [tsutsui, ticket #1101]
+
+sys/dev/pci/if_vioif.c1.5
+
+ Don't set SOFTINT_MPSAFE to vioif_rx_softint to prevent kernel panic.
+ PR kern/49007.
+ [ozaki-r, ticket #1102]
+
+sys/net/link_proto.c1.17
+
+ Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan.
+ PR kern/48997.
+ [ozaki-r, ticket #1103]
CVS commit: [netbsd-6-1] src/doc
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 09:59:29 UTC 2014
Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.5
Log Message:
Ticket 1093-1094 and 1100-1103.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-6.1.5
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.1.5
diff -u src/doc/CHANGES-6.1.5:1.1.2.17 src/doc/CHANGES-6.1.5:1.1.2.18
--- src/doc/CHANGES-6.1.5:1.1.2.17 Fri Jul 18 02:52:43 2014
+++ src/doc/CHANGES-6.1.5 Thu Aug 7 09:59:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.5,v 1.1.2.17 2014/07/18 02:52:43 riz Exp $
+# $NetBSD: CHANGES-6.1.5,v 1.1.2.18 2014/08/07 09:59:29 msaitoh Exp $
A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5
release:
@@ -669,3 +669,38 @@ distrib/utils/sysinst/arch/alpha/md.c 1
Make sysinst deal correctly with Tru64 disklabels. PR#48697
[tsutsui, ticket #1080]
+doc/3RDPARTY 1.1126 via patch
+etc/namedb/root.cache1.18
+
+ Update root.cache to 2014060201.
+ [taca, ticket #1093]
+
+sys/dev/usb/if_urndis.c1.7
+
+ PR/48963: Fix the size passed in kmem_free in the
+ urndis_ctrl_{query,set} functions to prevent panic in urndis(4).
+ [skrll, ticket #1094]
+
+lib/libc/arch/sparc/gen/_setjmp.S 1.10
+
+ Fix longjmp bug which causes a segmentation fault on sparc64
+ kernels with 32-bit userland.
+ [nakayama, ticket #1100]
+
+xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c 1.17
+
+ Fixes Xorg server segmentation fault on Xserver exit (and then screen
+ palette settings are not restored properly).
+ [tsutsui, ticket #1101]
+
+sys/dev/pci/if_vioif.c1.5
+
+ Don't set SOFTINT_MPSAFE to vioif_rx_softint to prevent kernel panic.
+ PR kern/49007.
+ [ozaki-r, ticket #1102]
+
+sys/net/link_proto.c1.17
+
+ Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan.
+ PR kern/48997.
+ [ozaki-r, ticket #1103]
CVS commit: [netbsd-6-0] src/doc
Module Name:src
Committed By: msaitoh
Date: Thu Aug 7 10:00:09 UTC 2014
Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.6
Log Message:
Ticket 1093-1094 and 1100-1103.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-6.0.6
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.6
diff -u src/doc/CHANGES-6.0.6:1.1.2.17 src/doc/CHANGES-6.0.6:1.1.2.18
--- src/doc/CHANGES-6.0.6:1.1.2.17 Fri Jul 18 02:53:09 2014
+++ src/doc/CHANGES-6.0.6 Thu Aug 7 10:00:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.6,v 1.1.2.17 2014/07/18 02:53:09 riz Exp $
+# $NetBSD: CHANGES-6.0.6,v 1.1.2.18 2014/08/07 10:00:09 msaitoh Exp $
A complete list of changes from the NetBSD 6.0.5 release to the NetBSD 6.0.6
release:
@@ -669,3 +669,38 @@ distrib/utils/sysinst/arch/alpha/md.c 1
Make sysinst deal correctly with Tru64 disklabels. PR#48697
[tsutsui, ticket #1080]
+doc/3RDPARTY 1.1126 via patch
+etc/namedb/root.cache1.18
+
+ Update root.cache to 2014060201.
+ [taca, ticket #1093]
+
+sys/dev/usb/if_urndis.c1.7
+
+ PR/48963: Fix the size passed in kmem_free in the
+ urndis_ctrl_{query,set} functions to prevent panic in urndis(4).
+ [skrll, ticket #1094]
+
+lib/libc/arch/sparc/gen/_setjmp.S 1.10
+
+ Fix longjmp bug which causes a segmentation fault on sparc64
+ kernels with 32-bit userland.
+ [nakayama, ticket #1100]
+
+xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c 1.17
+
+ Fixes Xorg server segmentation fault on Xserver exit (and then screen
+ palette settings are not restored properly).
+ [tsutsui, ticket #1101]
+
+sys/dev/pci/if_vioif.c1.5
+
+ Don't set SOFTINT_MPSAFE to vioif_rx_softint to prevent kernel panic.
+ PR kern/49007.
+ [ozaki-r, ticket #1102]
+
+sys/net/link_proto.c1.17
+
+ Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan.
+ PR kern/48997.
+ [ozaki-r, ticket #1103]
CVS commit: src/sys/arch/mvmeppc/stand/libsa
Module Name:src Committed By: joerg Date: Thu Aug 7 13:56:57 UTC 2014 Modified Files: src/sys/arch/mvmeppc/stand/libsa: srt0.S Log Message: Use cmpw. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mvmeppc/stand/libsa/srt0.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/stand/libsa/srt0.S diff -u src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.4 src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.5 --- src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.4 Wed Jan 19 09:03:15 2011 +++ src/sys/arch/mvmeppc/stand/libsa/srt0.S Thu Aug 7 13:56:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.4 2011/01/19 09:03:15 he Exp $ */ +/* $NetBSD: srt0.S,v 1.5 2014/08/07 13:56:57 joerg Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ ENTRY(_start) sub %r15,%r14,%r13 /* Our size, in bytes */ mflr %r16 /* Get address we were loaded to */ subi %r16,%r16,0x4 /* Correct for branch */ - cmp %cr0,%r13,%r16 /* Do we need to relocate? */ + cmpw %r13,%r16 /* Do we need to relocate? */ beq _ASM_LABEL(clrbss) /* No relocation necessary */ li %r17,0x4 bgt 1f /* Relocate using forward copy? */
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jmmv Date: Thu Aug 7 14:22:13 UTC 2014 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add missing Kyuafile. To generate a diff of this commit: cvs rdiff -u -r1.582 -r1.583 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.582 src/distrib/sets/lists/tests/mi:1.583 --- src/distrib/sets/lists/tests/mi:1.582 Fri Jul 18 12:36:18 2014 +++ src/distrib/sets/lists/tests/mi Thu Aug 7 14:22:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.582 2014/07/18 12:36:18 christos Exp $ +# $NetBSD: mi,v 1.583 2014/08/07 14:22:13 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -843,6 +843,7 @@ ./usr/tests/bin/sh/t_wait tests-bin-tests atf ./usr/tests/bin/sh/dotcmd tests-bin-tests ./usr/tests/bin/sh/dotcmd/Atffile tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/Kyuafile tests-bin-tests atf,kyua ./usr/tests/bin/sh/dotcmd/break_case tests-bin-tests atf ./usr/tests/bin/sh/dotcmd/break_compound tests-bin-tests atf ./usr/tests/bin/sh/dotcmd/break_file tests-bin-tests atf
CVS commit: src
Module Name:src
Committed By: apb
Date: Thu Aug 7 15:15:48 UTC 2014
Modified Files:
src: build.sh
Log Message:
In the usage message, mention that the -m arg may be an alias.
Also adjust a comment around alias processing.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.290 src/build.sh:1.291
--- src/build.sh:1.290 Wed Aug 6 12:29:13 2014
+++ src/build.sh Thu Aug 7 15:15:48 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.290 2014/08/06 12:29:13 apb Exp $
+# $NetBSD: build.sh,v 1.291 2014/08/07 15:15:48 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -717,7 +717,8 @@ MACHINE=zaurus MACHINE_ARCH=earm ALIAS=
# getarch -- find the default MACHINE_ARCH for a MACHINE,
# or convert an alias to a MACHINE/MACHINE_ARCH pair.
#
-# Saves MACHINE in makewrappermachine before possibly modifying MACHINE.
+# Saves the original value of MACHINE in makewrappermachine before
+# alias processing.
#
# Sets MACHINE and MACHINE_ARCH if the input MACHINE value is
# recognised as an alias, or recognised as a machine that has a default
@@ -1001,7 +1002,10 @@ Usage: ${progname} [-EhnorUuxy] [-a arch
-j njobRun up to njob jobs in parallel; see make(1) -j.
-M obj Set obj root directory to obj; sets MAKEOBJDIRPREFIX.
Unsets MAKEOBJDIR.
--m machSet MACHINE to mach; not required if NetBSD native.
+-m machSet MACHINE to mach. Some mach values are actually
+ aliases that set MACHINE/MACHINE_ARCH pairs.
+ [Default: deduced from the host system if the host
+ OS is NetBSD]
-N noisy Set the noisyness (MAKEVERBOSE) level of the build:
0 Minimal output (quiet)
1 Describe what is occurring
@@ -1796,7 +1800,7 @@ createmakewrapper()
eval cat EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy make building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.290 2014/08/06 12:29:13 apb Exp $
+# Generated from: \$NetBSD: build.sh,v 1.291 2014/08/07 15:15:48 apb Exp $
# with these arguments: ${_args}
#
CVS commit: src/distrib/macppc/floppies/ramdisk
Module Name:src
Committed By: gdt
Date: Thu Aug 7 15:48:19 UTC 2014
Modified Files:
src/distrib/macppc/floppies/ramdisk: Makefile
Log Message:
I need 2244k for src/distrib/macppc/floppies/ramdisk, rather than
2240k. My build is normal, with a few uncommitted changes that really
shouldn't change the install situation. Because 2240k isn't near a
magic boundary, just increase it a hair.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/macppc/floppies/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.43 src/distrib/macppc/floppies/ramdisk/Makefile:1.44
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.43 Wed Aug 6 13:57:15 2014
+++ src/distrib/macppc/floppies/ramdisk/Makefile Thu Aug 7 15:48:19 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2014/08/06 13:57:15 martin Exp $
+# $NetBSD: Makefile,v 1.44 2014/08/07 15:48:19 gdt Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2240k
+IMAGESIZE= 2244k
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src
Module Name:src
Committed By: gdt
Date: Thu Aug 7 16:51:57 UTC 2014
Modified Files:
src/distrib/macppc/floppies/ramdisk: Makefile
src/sys/arch/macppc/conf: GENERIC_MD INSTALL
Log Message:
Get macppc to build again by adjusting sizes.
In addition to the ramdisk size, it is necessary to have matching MD
sizes. Increase the MD sizes, and leave a comment near the ramdisk
size to ease future changes.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/macppc/conf/GENERIC_MD
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/macppc/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.44 src/distrib/macppc/floppies/ramdisk/Makefile:1.45
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.44 Thu Aug 7 15:48:19 2014
+++ src/distrib/macppc/floppies/ramdisk/Makefile Thu Aug 7 16:51:57 2014
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.44 2014/08/07 15:48:19 gdt Exp $
+# $NetBSD: Makefile,v 1.45 2014/08/07 16:51:57 gdt Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2244k
+# This must be kept in sync with config option MEMORY_DISK_ROOT_SIZE
+# in both
+# src/sys/arch/macppc/conf/INSTALL
+# src/sys/arch/macppc/conf/GENERIC_MD
+IMAGESIZE= 2248k
MAKEFS_FLAGS= -f 15
WARNS= 1
Index: src/sys/arch/macppc/conf/GENERIC_MD
diff -u src/sys/arch/macppc/conf/GENERIC_MD:1.14 src/sys/arch/macppc/conf/GENERIC_MD:1.15
--- src/sys/arch/macppc/conf/GENERIC_MD:1.14 Wed Aug 6 14:23:53 2014
+++ src/sys/arch/macppc/conf/GENERIC_MD Thu Aug 7 16:51:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_MD,v 1.14 2014/08/06 14:23:53 martin Exp $
+# $NetBSD: GENERIC_MD,v 1.15 2014/08/07 16:51:56 gdt Exp $
#
# GENERIC_MD config file
#
@@ -8,5 +8,5 @@ include arch/macppc/conf/GENERIC
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=4480 # 2240 KiB
+options MEMORY_DISK_ROOT_SIZE=4496 # 2248 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
Index: src/sys/arch/macppc/conf/INSTALL
diff -u src/sys/arch/macppc/conf/INSTALL:1.121 src/sys/arch/macppc/conf/INSTALL:1.122
--- src/sys/arch/macppc/conf/INSTALL:1.121 Wed Aug 6 14:23:53 2014
+++ src/sys/arch/macppc/conf/INSTALL Thu Aug 7 16:51:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.121 2014/08/06 14:23:53 martin Exp $
+# $NetBSD: INSTALL,v 1.122 2014/08/07 16:51:56 gdt Exp $
#
# config file for INSTALL FLOPPY
#
@@ -17,7 +17,7 @@ options RTC_OFFSET=0 # hardware clock i
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=4480 # 2240 KiB
+options MEMORY_DISK_ROOT_SIZE=4496 # 2248 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
options USERCONF # userconf(4) support
CVS commit: src/include
Module Name:src
Committed By: christos
Date: Thu Aug 7 17:24:03 UTC 2014
Modified Files:
src/include: stdio.h
Log Message:
cast to LHS type and minor KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/include/stdio.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/stdio.h
diff -u src/include/stdio.h:1.90 src/include/stdio.h:1.91
--- src/include/stdio.h:1.90 Fri May 23 12:48:52 2014
+++ src/include/stdio.h Thu Aug 7 13:24:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.h,v 1.90 2014/05/23 16:48:52 joerg Exp $ */
+/* $NetBSD: stdio.h,v 1.91 2014/08/07 17:24:03 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -458,9 +458,9 @@ __END_DECLS
#if defined(__GNUC__) defined(__STDC__)
static __inline int __sputc(int _c, FILE *_p) {
if (--_p-_w = 0 || (_p-_w = _p-_lbfsize (char)_c != '\n'))
- return (*_p-_p++ = _c);
+ return *_p-_p++ = (unsigned char)_c;
else
- return (__swbuf(_c, _p));
+ return __swbuf(_c, _p);
}
#else
/*
CVS commit: src
Module Name:src
Committed By: apb
Date: Thu Aug 7 17:54:28 UTC 2014
Modified Files:
src: build.sh
Log Message:
Add a list-arch operation to build.sh.
This lists all known MACHINE/MACHINE_ARCH values, optionally
filtered by glob patterns given in the -m and -a options.
For example: build.sh -a '*arm*' list-arch
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.291 src/build.sh:1.292
--- src/build.sh:1.291 Thu Aug 7 15:15:48 2014
+++ src/build.sh Thu Aug 7 17:54:28 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.291 2014/08/07 15:15:48 apb Exp $
+# $NetBSD: build.sh,v 1.292 2014/08/07 17:54:28 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -848,6 +848,57 @@ validatearch()
esac
}
+# listarch -- list valid MACHINE/MACHINE_ARCH/ALIAS values,
+# optionally restricted to those where the MACHINE and/or MACHINE_ARCH
+# match specifed glob patterns.
+#
+listarch()
+{
+ local machglob=$1 archglob=$2
+ local IFS
+ local wildcard=*
+ local line xline frag
+ local line_matches_machine line_matches_arch
+ local found=false
+
+ # Empty machglob or archglob should match anything
+ : ${machglob:=${wildcard}}
+ : ${archglob:=${wildcard}}
+
+ IFS=${nl}
+ for line in ${valid_MACHINE_ARCH}; do
+ line=${line%%#*} # ignore comments
+ xline=$( IFS= ${tab} ; echo $line ) # normalise white space
+ [ -z ${xline} ] continue # skip blank or comment lines
+
+ line_matches_machine=false
+ line_matches_arch=false
+
+ IFS=
+ for frag in ${xline}; do
+ case ${frag} in
+ MACHINE=${machglob})
+line_matches_machine=true ;;
+ ALIAS=${machglob})
+line_matches_machine=true ;;
+ MACHINE_ARCH=${archglob})
+line_matches_arch=true ;;
+ esac
+ done
+
+ if $line_matches_machine $line_matches_arch; then
+ found=true
+ echo $line
+ fi
+ done
+ if ! $found; then
+ echo 2 No match for \
+ MACHINE=${machglob} MACHINE_ARCH=${archglob}
+ return 1
+ fi
+ return 0
+}
+
# nobomb_getmakevar --
# Given the name of a make variable in $1, print make's idea of the
# value of that variable, or return 1 if there's an error.
@@ -990,6 +1041,9 @@ Usage: ${progname} [-EhnorUuxy] [-a arch
disk-image=target Creae bootable disk image in
RELEASEDIR/RELEASEMACHINEDIR/binary/gzimg/target.img.gz.
params Display various make(1) parameters.
+list-arch Display a list of valid MACHINE/MACHINE_ARCH values,
+and exit. The list may be narrowed by passing glob
+patterns or exact values in MACHINE or MACHINE_ARCH.
Options:
-a archSet MACHINE_ARCH to arch. [Default: deduced from MACHINE]
@@ -1121,7 +1175,6 @@ parseoptions()
-m)
eval ${optargcmd}
MACHINE=${OPTARG}
- [ ${opt_a} != yes ] getarch
;;
-N)
@@ -1252,6 +1305,11 @@ parseoptions()
usage
;;
+ list-arch)
+ listarch ${MACHINE} ${MACHINE_ARCH}
+ exit $?
+ ;;
+
makewrapper|cleandir|obj|tools|build|distribution|release|sets|sourcesets|syspkgs|params)
;;
@@ -1800,7 +1858,7 @@ createmakewrapper()
eval cat EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy make building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.291 2014/08/07 15:15:48 apb Exp $
+# Generated from: \$NetBSD: build.sh,v 1.292 2014/08/07 17:54:28 apb Exp $
# with these arguments: ${_args}
#
CVS commit: src
Module Name:src
Committed By: apb
Date: Thu Aug 7 18:10:20 UTC 2014
Modified Files:
src: build.sh
Log Message:
MACHINE_ARCH from the environment may be overridden by getarch (based
on the MACHINE), but MACHINE_ARCH from the -a option should not be
overridden. The previous commit accidentally removed this behaviour.
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.292 src/build.sh:1.293
--- src/build.sh:1.292 Thu Aug 7 17:54:28 2014
+++ src/build.sh Thu Aug 7 18:10:20 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.292 2014/08/07 17:54:28 apb Exp $
+# $NetBSD: build.sh,v 1.293 2014/08/07 18:10:20 apb Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1097,7 +1097,7 @@ _usage_
parseoptions()
{
opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:X:xY:yZ:'
- opt_a=no
+ opt_a=false
if type getopts /dev/null 21; then
# Use POSIX getopts.
@@ -1128,7 +1128,7 @@ parseoptions()
-a)
eval ${optargcmd}
MACHINE_ARCH=${OPTARG}
- opt_a=yes
+ opt_a=true
;;
-B)
@@ -1370,12 +1370,16 @@ parseoptions()
# Set up MACHINE*. On a NetBSD host, these are allowed to be unset.
#
+ # MACHINE_ARCH from the environment may be overridden by getarch
+ # (based on the MACHINE), but MACHINE_ARCH from the -a option should
+ # not be overridden.
+ #
if [ -z ${MACHINE} ]; then
[ ${uname_s} = NetBSD ] ||
bomb MACHINE must be set, or -m must be used, for cross builds.
MACHINE=${uname_m}
fi
- [ -n ${MACHINE_ARCH} ] || getarch
+ $opt_a || getarch
validatearch
# Set up default make(1) environment.
@@ -1858,7 +1862,7 @@ createmakewrapper()
eval cat EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy make building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.292 2014/08/07 17:54:28 apb Exp $
+# Generated from: \$NetBSD: build.sh,v 1.293 2014/08/07 18:10:20 apb Exp $
# with these arguments: ${_args}
#
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: macallan Date: Thu Aug 7 19:05:18 UTC 2014 Modified Files: src/sys/arch/arm/omap: omapfb.c Log Message: remove obsolete comment To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/omap/omapfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/omap/omapfb.c diff -u src/sys/arch/arm/omap/omapfb.c:1.25 src/sys/arch/arm/omap/omapfb.c:1.26 --- src/sys/arch/arm/omap/omapfb.c:1.25 Wed Dec 18 12:54:01 2013 +++ src/sys/arch/arm/omap/omapfb.c Thu Aug 7 19:05:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: omapfb.c,v 1.25 2013/12/18 12:54:01 skrll Exp $ */ +/* $NetBSD: omapfb.c,v 1.26 2014/08/07 19:05:18 macallan Exp $ */ /* * Copyright (c) 2010 Michael Lorenz @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.25 2013/12/18 12:54:01 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.26 2014/08/07 19:05:18 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -915,10 +915,6 @@ omapfb_bitblt(struct omapfb_softc *sc, i int hstep, vstep; uint32_t saddr, daddr; - /* - * TODO: - * - use 32bit transfers if we're properly aligned - */ saddr = sc-sc_fbhwaddr + sc-sc_stride * ys + xs * bpp; daddr = sc-sc_fbhwaddr + sc-sc_stride * yd + xd * bpp;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Thu Aug 7 19:54:23 UTC 2014
Modified Files:
src/sys/dev/pci: if_wpi.c
Log Message:
scanning fixes
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/if_wpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.65 src/sys/dev/pci/if_wpi.c:1.66
--- src/sys/dev/pci/if_wpi.c:1.65 Thu Aug 7 02:28:52 2014
+++ src/sys/dev/pci/if_wpi.c Thu Aug 7 19:54:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.65 2014/08/07 02:28:52 jmcneill Exp $ */
+/* $NetBSD: if_wpi.c,v 1.66 2014/08/07 19:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.65 2014/08/07 02:28:52 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.66 2014/08/07 19:54:23 jmcneill Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -960,7 +960,7 @@ wpi_newstate(struct ieee80211com *ic, en
}
/* configuration has changed, set Tx power accordingly */
- if ((error = wpi_set_txpower(sc, ni-ni_chan, 1)) != 0) {
+ if ((error = wpi_set_txpower(sc, ic-ic_curchan, 1)) != 0) {
aprint_error_dev(sc-sc_dev,
could not set Tx power\n);
return error;
@@ -1447,7 +1447,7 @@ wpi_power_calibration(struct wpi_softc *
sc-temp = temp;
- if (wpi_set_txpower(sc, sc-sc_ic.ic_bss-ni_chan, 1) != 0) {
+ if (wpi_set_txpower(sc, sc-sc_ic.ic_curchan, 1) != 0) {
/* just warn, too bad for the automatic calibration... */
aprint_error_dev(sc-sc_dev, could not adjust Tx power\n);
}
@@ -1742,6 +1742,7 @@ wpi_notif_intr(struct wpi_softc *sc)
}
case WPI_START_SCAN:
{
+#if 0
struct wpi_start_scan *scan =
(struct wpi_start_scan *)(desc + 1);
@@ -1750,6 +1751,7 @@ wpi_notif_intr(struct wpi_softc *sc)
/* fix current channel */
ic-ic_bss-ni_chan = ic-ic_channels[scan-chan];
+#endif
break;
}
case WPI_STOP_SCAN:
@@ -2774,7 +2776,6 @@ wpi_scan(struct wpi_softc *sc, uint16_t
struct ieee80211_frame *wh;
struct ieee80211_rateset *rs;
struct ieee80211_channel *c;
- enum ieee80211_phymode mode;
uint8_t *frm;
int pktlen, error, nrates;
@@ -2808,27 +2809,31 @@ wpi_scan(struct wpi_softc *sc, uint16_t
hdr-cmd.id = WPI_ID_BROADCAST;
hdr-cmd.lifetime = htole32(WPI_LIFETIME_INFINITE);
/*
- * Move to the next channel if no packets are received within 5 msecs
+ * Move to the next channel if no packets are received within 10 msecs
* after sending the probe request (this helps to reduce the duration
* of active scans).
*/
- hdr-quiet = htole16(5); /* timeout in milliseconds */
+ hdr-quiet = htole16(10); /* timeout in milliseconds */
hdr-plcp_threshold = htole16(1); /* min # of packets */
if (flags IEEE80211_CHAN_A) {
hdr-crc_threshold = htole16(1);
/* send probe requests at 6Mbps */
hdr-cmd.rate = wpi_plcp_signal(12);
+ rs = ic-ic_sup_rates[IEEE80211_MODE_11A];
} else {
hdr-flags = htole32(WPI_CONFIG_24GHZ | WPI_CONFIG_AUTO);
/* send probe requests at 1Mbps */
hdr-cmd.rate = wpi_plcp_signal(2);
+ rs = ic-ic_sup_rates[IEEE80211_MODE_11G];
}
/* for directed scans, firmware inserts the essid IE itself */
- hdr-essid[0].id = IEEE80211_ELEMID_SSID;
- hdr-essid[0].len = ic-ic_des_esslen;
- memcpy(hdr-essid[0].data, ic-ic_des_essid, ic-ic_des_esslen);
+ if (ic-ic_des_esslen != 0) {
+ hdr-essid[0].id = IEEE80211_ELEMID_SSID;
+ hdr-essid[0].len = ic-ic_des_esslen;
+ memcpy(hdr-essid[0].data, ic-ic_des_essid, ic-ic_des_esslen);
+ }
/*
* Build a probe request frame. Most of the following code is a
@@ -2850,9 +2855,6 @@ wpi_scan(struct wpi_softc *sc, uint16_t
*frm++ = IEEE80211_ELEMID_SSID;
*frm++ = 0;
- mode = ieee80211_chan2mode(ic, ic-ic_ibss_chan);
- rs = ic-ic_sup_rates[mode];
-
/* add supported rates IE */
*frm++ = IEEE80211_ELEMID_RATES;
nrates = rs-rs_nrates;
@@ -2882,19 +2884,18 @@ wpi_scan(struct wpi_softc *sc, uint16_t
chan-chan = ieee80211_chan2ieee(ic, c);
chan-flags = 0;
- if (!(c-ic_flags IEEE80211_CHAN_PASSIVE)) {
+ if (!(c-ic_flags IEEE80211_CHAN_PASSIVE))
chan-flags |= WPI_CHAN_ACTIVE;
- if (ic-ic_des_esslen != 0)
-chan-flags |= WPI_CHAN_DIRECT;
- }
+ if (ic-ic_des_esslen != 0)
+ chan-flags |= WPI_CHAN_DIRECT;
chan-dsp_gain = 0x6e;
if (IEEE80211_IS_CHAN_5GHZ(c)) {
chan-rf_gain = 0x3b;
- chan-active = htole16(10);
+ chan-active = htole16(24);
chan-passive = htole16(110);
} else {
chan-rf_gain = 0x28;
- chan-active = htole16(20);
+ chan-active = htole16(36);
chan-passive = htole16(120);
}
hdr-nchan++;
@@ -2967,9 +2968,9 @@ wpi_config(struct wpi_softc *sc)
IEEE80211_ADDR_COPY(ic-ic_myaddr, CLLADDR(ifp-if_sadl));
IEEE80211_ADDR_COPY(sc-config.myaddr, ic-ic_myaddr);
/* set default channel */
-
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Thu Aug 7 20:05:10 UTC 2014 Modified Files: src/sys/sys: time.h Log Message: convert to unsigned multiplication. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/sys/time.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/time.h diff -u src/sys/sys/time.h:1.65 src/sys/sys/time.h:1.66 --- src/sys/sys/time.h:1.65 Thu Oct 27 12:12:52 2011 +++ src/sys/sys/time.h Thu Aug 7 16:05:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.65 2011/10/27 16:12:52 christos Exp $ */ +/* $NetBSD: time.h,v 1.66 2014/08/07 20:05:10 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -174,7 +174,7 @@ timespec2bintime(const struct timespec * bt-sec = ts-tv_sec; /* 18446744073 = int(2^64 / 10) */ - bt-frac = ts-tv_nsec * (uint64_t)18446744073LL; + bt-frac = (uint64_t)ts-tv_nsec * (uint64_t)18446744073LL; } static __inline void @@ -192,7 +192,7 @@ timeval2bintime(const struct timeval *tv bt-sec = tv-tv_sec; /* 18446744073709 = int(2^64 / 100) */ - bt-frac = tv-tv_usec * (uint64_t)18446744073709LL; + bt-frac = (uint64_t)tv-tv_usec * (uint64_t)18446744073709LL; } #endif /* !defined(_STANDALONE) */
CVS commit: src/doc
Module Name:src Committed By: apb Date: Thu Aug 7 21:32:11 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: Document build.sh list-arch To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.102 src/doc/BUILDING.mdoc:1.103 --- src/doc/BUILDING.mdoc:1.102 Sun Aug 3 09:25:02 2014 +++ src/doc/BUILDING.mdoc Thu Aug 7 21:32:11 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.102 2014/08/03 09:25:02 apb Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.103 2014/08/07 21:32:11 apb Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -33,7 +33,7 @@ .\ Toolchain prefix for commands .ds toolprefix nb . -.Dd August 3, 2014 +.Dd August 7, 2014 .Dt BUILDING 8 .Os NetBSD . @@ -1554,6 +1554,39 @@ Perform Perform .Dq make live-image . . +.It Sy list-arch +Prints a list of valid +.Sy MACHINE +and +.Sy MACHINE_ARCH +settings, the default +.Sy MACHINE_ARCH +for each +.Sy MACHINE , +and aliases for +.Sy MACHINE Ns No / Ns Sy MACHINE_ARCH +pairs, and then exits. +The +.Fl m +or +.Fl a +options (or both) may be used to specify glob patterns +that will be used to narrow the list of results; +for example, +.Dq Li build.sh -m 'evm*' -a '*arm*' list-arch +will list all known +.Sy MACHINE Ns No / Ns Sy MACHINE_ARCH +values in which either +.Sy MACHINE +or +.Sy ALIAS +matches the pattern +.Ql evb* , +and +.Sy MACHINE_ARCH +matches the pattern +.Ql *arm* . +. .El . .Pp @@ -1568,6 +1601,9 @@ Set the value of .Sy MACHINE_ARCH to .Ar arch . +See the +.Fl m +option for more information. . .It Fl B Ar buildid Set the value of @@ -1687,42 +1723,39 @@ Set the value of .Sy MACHINE to .Ar mach , -except in some special cases listed below. -This will also override any value of +unless the +.Ar mach +argument is an alias that refers to a +.Sy MACHINE Ns No / Ns Sy MACHINE_ARCH +pair, in which case both +.Sy MACHINE +and .Sy MACHINE_ARCH -in the process environment with a value deduced from -.Ar mach , -unless +are set from the alias. +Such aliases are interpreted entirely by +.Sy build.sh ; +they are not used by any other part of the build system. +The +.Sy MACHINE_ARCH +setting implied by +.Ar mach +will override any value of +.Sy MACHINE_ARCH +in the process environment, but will not override a value set by the .Fl a -is specified. +option. All cross builds require .Fl m , but if unset on a NetBSD host, the host's value of MACHINE will be detected and used automatically. .Pp -Some machines support multiple values for -.Sy MACHINE_ARCH . -The following special cases for the -.Ar mach -argument are defined to set the listed values of -.Sy MACHINE +See the +.Cm list-arch +operation for a way to get a list of valid +.Sy MACHINE and -.Sy MACHINE_ARCH : -.Bl -column evbmips-el MACHINE MACHINE_ARCH -offset indent -.It Sy mach Ta Sy MACHINE Ta Sy MACHINE_ARCH -.It evbarm Ta evbarm Ta (not set) -.It evbarm-eb Ta evbarm Ta armeb -.It evbarm-el Ta evbarm Ta arm -.It evbmips Ta evbmips Ta (not set) -.It evbmips-eb Ta evbmips Ta mipseb -.It evbmips-el Ta evbmips Ta mipsel -.It evbsh3 Ta evbsh3 Ta (not set) -.It evbsh3-eb Ta evbsh3 Ta sh3eb -.It evbsh3-el Ta evbsh3 Ta sh3el -.It sbmips Ta sbmips Ta (not set) -.It sbmips-eb Ta sbmips Ta mipseb -.It sbmips-el Ta sbmips Ta mipsel -.El +.Sy MACHINE_ARCH +settings. . .It Fl N Ar noiselevel Set the
CVS commit: src
Module Name:src Committed By: apb Date: Thu Aug 7 21:46:43 UTC 2014 Modified Files: src: BUILDING Log Message: regen BUILDING from doc/BUILDING.mdoc To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.108 src/BUILDING:1.109 --- src/BUILDING:1.108 Sun Aug 3 09:28:43 2014 +++ src/BUILDING Thu Aug 7 21:46:43 2014 @@ -846,10 +846,21 @@ BUILDING live-imagePerform ``make live-image''. + list-arch Prints a list of valid MACHINE and MACHINE_ARCH settings, + the default MACHINE_ARCH for each MACHINE, and aliases for + MACHINE/MACHINE_ARCH pairs, and then exits. The -m or -a + options (or both) may be used to specify glob patterns that + will be used to narrow the list of results; for example, + ``build.sh -m 'evm*' -a '*arm*' list-arch'' will list all + known MACHINE/MACHINE_ARCH values in which either MACHINE + or ALIAS matches the pattern `evb*', and MACHINE_ARCH + matches the pattern `*arm*'. + The following command line options alter the behaviour of the build.sh operations described above: - -a arch Set the value of MACHINE_ARCH to arch. + -a arch Set the value of MACHINE_ARCH to arch. See the -m option for + more information. -B buildid Set the value of BUILDID to buildid. This will also append the @@ -908,30 +919,19 @@ BUILDING relative path. If the directory does not already exist, build.sh will create it. - -m mach Set the value of MACHINE to mach, except in some special cases - listed below. This will also override any value of - MACHINE_ARCH in the process environment with a value deduced - from mach, unless -a is specified. All cross builds require - -m, but if unset on a NetBSD host, the host's value of MACHINE - will be detected and used automatically. - - Some machines support multiple values for MACHINE_ARCH. The - following special cases for the mach argument are defined to - set the listed values of MACHINE and MACHINE_ARCH: - - mach MACHINEMACHINE_ARCH - evbarmevbarm (not set) - evbarm-eb evbarm armeb - evbarm-el evbarm arm - evbmips evbmips(not set) - evbmips-ebevbmipsmipseb - evbmips-elevbmipsmipsel - evbsh3evbsh3 (not set) - evbsh3-eb evbsh3 sh3eb - evbsh3-el evbsh3 sh3el - sbmipssbmips (not set) - sbmips-eb sbmips mipseb - sbmips-el sbmips mipsel + -m mach Set the value of MACHINE to mach, unless the mach argument is + an alias that refers to a MACHINE/MACHINE_ARCH pair, in which + case both MACHINE and MACHINE_ARCH are set from the alias. + Such aliases are interpreted entirely by build.sh; they are not + used by any other part of the build system. The MACHINE_ARCH + setting implied by mach will override any value of MACHINE_ARCH + in the process environment, but will not override a value set + by the -a option. All cross builds require -m, but if unset on + a NetBSD host, the host's value of MACHINE will be detected and + used automatically. + + See the list-arch operation for a way to get a list of valid + MACHINE and MACHINE_ARCH settings. -N noiselevel Set the ``noisyness'' level of the build, by setting @@ -963,6 +963,16 @@ BUILDING by the values of several variables and by the location of the source directory. + Note that placing the obj directory location outside of the + default source tree hierarchy makes it easier to manually clear + out old files in the event the ``make cleandir'' operation is + unable to do so. (See CAVEATS below.) + + Note also that use of one of -M or -O is the only means of + building multiple machine architecture userlands from the same + source tree without cleaning between builds (in which case, one + would specify distinct obj locations for each). + -oSet the value of MKOBJDIRS to ``no''. Otherwise, it will be
CVS commit: src/doc
Module Name:src Committed By: apb Date: Thu Aug 7 21:45:27 UTC 2014 Modified Files: src/doc: BUILDING.mdoc Log Message: Add advice about avoiding common pitfalls. This is taken from the patch in PR 48741, by David H. Gutteridge, but I made small changes to wording and markup. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.103 src/doc/BUILDING.mdoc:1.104 --- src/doc/BUILDING.mdoc:1.103 Thu Aug 7 21:32:11 2014 +++ src/doc/BUILDING.mdoc Thu Aug 7 21:45:27 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.103 2014/08/07 21:32:11 apb Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.104 2014/08/07 21:45:27 apb Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1817,6 +1817,26 @@ Relying on this default is not recommend it is determined by complex rules that are influenced by the values of several variables and by the location of the source directory. +.Pp +Note that placing the +.Ar obj +directory location outside of the default source tree hierarchy makes +it easier to manually clear out old files in the event the +.Dq make cleandir +operation is unable to do so. +(See +.Sx CAVEATS +below.) +.Pp +Note also that use of one of +.Fl M +or +.Fl O +is the only means of building multiple machine architecture userlands +from the same source tree without cleaning between builds (in which +case, one would specify distinct +.Ar obj +locations for each). .It Fl o Set the value of .Sy MKOBJDIRS @@ -2048,3 +2068,15 @@ as and re-worked to .Sy TOOLCHAIN_MISSING after that. +. +.Sh CAVEATS +. +After significant updates to third-party components in the source +tree, the +.Dq make cleandir +operation may be insufficient to clean out old files in object +directories. +Instead, one may have to manually remove the files. +Consult the +.Pa UPDATING +file for notices concerning this.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Thu Aug 7 22:10:05 UTC 2014
Modified Files:
src/sys/dev/pci: if_wpi.c
Log Message:
Scan one channel at a time instead of trying to do them all at once and
trying to outsmart the ieee80211 state machine.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/if_wpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.66 src/sys/dev/pci/if_wpi.c:1.67
--- src/sys/dev/pci/if_wpi.c:1.66 Thu Aug 7 19:54:23 2014
+++ src/sys/dev/pci/if_wpi.c Thu Aug 7 22:10:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.66 2014/08/07 19:54:23 jmcneill Exp $ */
+/* $NetBSD: if_wpi.c,v 1.67 2014/08/07 22:10:05 jmcneill Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.66 2014/08/07 19:54:23 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.67 2014/08/07 22:10:05 jmcneill Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -143,7 +143,7 @@ static int wpi_get_power_index(struct wp
struct wpi_power_group *, struct ieee80211_channel *, int);
static int wpi_setup_beacon(struct wpi_softc *, struct ieee80211_node *);
static int wpi_auth(struct wpi_softc *);
-static int wpi_scan(struct wpi_softc *, uint16_t);
+static int wpi_scan(struct wpi_softc *);
static int wpi_config(struct wpi_softc *);
static void wpi_stop_master(struct wpi_softc *);
static int wpi_power_up(struct wpi_softc *);
@@ -877,6 +877,7 @@ wpi_newstate(struct ieee80211com *ic, en
struct ifnet *ifp = ic-ic_ifp;
struct wpi_softc *sc = ifp-if_softc;
struct ieee80211_node *ni;
+ enum ieee80211_state ostate = ic-ic_state;
int error;
callout_stop(sc-calib_to);
@@ -888,20 +889,18 @@ wpi_newstate(struct ieee80211com *ic, en
break;
sc-is_scanning = true;
- ieee80211_node_table_reset(ic-ic_scan);
- ic-ic_flags |= IEEE80211_F_SCAN | IEEE80211_F_ASCAN;
- /* make the link LED blink while we're scanning */
- wpi_set_led(sc, WPI_LED_LINK, 20, 2);
+ if (ostate != IEEE80211_S_SCAN) {
+ /* make the link LED blink while we're scanning */
+ wpi_set_led(sc, WPI_LED_LINK, 20, 2);
+ }
- if ((error = wpi_scan(sc, IEEE80211_CHAN_G)) != 0) {
+ if ((error = wpi_scan(sc)) != 0) {
aprint_error_dev(sc-sc_dev,
could not initiate scan\n);
- ic-ic_flags = ~(IEEE80211_F_SCAN | IEEE80211_F_ASCAN);
return error;
}
- ic-ic_state = nstate;
- return 0;
+ break;
case IEEE80211_S_ASSOC:
if (ic-ic_state != IEEE80211_S_RUN)
@@ -1750,28 +1749,24 @@ wpi_notif_intr(struct wpi_softc *sc)
scan-chan, le32toh(scan-status)));
/* fix current channel */
- ic-ic_bss-ni_chan = ic-ic_channels[scan-chan];
+ ic-ic_curchan = ic-ic_channels[scan-chan];
#endif
break;
}
case WPI_STOP_SCAN:
{
+#ifdef WPI_DEBUG
struct wpi_stop_scan *scan =
(struct wpi_stop_scan *)(desc + 1);
+#endif
DPRINTF((scan finished nchan=%d status=%d chan=%d\n,
scan-nchan, scan-status, scan-chan));
- if (scan-status == 1 scan-chan = 14) {
-/*
- * We just finished scanning 802.11g channels,
- * start scanning 802.11a ones.
- */
-if (wpi_scan(sc, IEEE80211_CHAN_A) == 0)
- break;
- }
sc-is_scanning = false;
- ieee80211_end_scan(ic);
+ if (ic-ic_state == IEEE80211_S_SCAN)
+ieee80211_next_scan(ic);
+
break;
}
}
@@ -2764,7 +2759,7 @@ wpi_auth(struct wpi_softc *sc)
* into a mbuf instead of using the pre-allocated set of commands.
*/
static int
-wpi_scan(struct wpi_softc *sc, uint16_t flags)
+wpi_scan(struct wpi_softc *sc)
{
struct ieee80211com *ic = sc-sc_ic;
struct wpi_tx_ring *ring = sc-cmdq;
@@ -2779,6 +2774,9 @@ wpi_scan(struct wpi_softc *sc, uint16_t
uint8_t *frm;
int pktlen, error, nrates;
+ if (ic-ic_curchan == NULL)
+ return EIO;
+
desc = ring-desc[ring-cur];
data = ring-data[ring-cur];
@@ -2809,14 +2807,14 @@ wpi_scan(struct wpi_softc *sc, uint16_t
hdr-cmd.id = WPI_ID_BROADCAST;
hdr-cmd.lifetime = htole32(WPI_LIFETIME_INFINITE);
/*
- * Move to the next channel if no packets are received within 10 msecs
+ * Move to the next channel if no packets are received within 5 msecs
* after sending the probe request (this helps to reduce the duration
* of active scans).
*/
- hdr-quiet = htole16(10); /* timeout in milliseconds */
+ hdr-quiet = htole16(5); /* timeout in milliseconds */
hdr-plcp_threshold = htole16(1); /* min # of packets */
- if (flags IEEE80211_CHAN_A) {
+ if (ic-ic_curchan-ic_flags IEEE80211_CHAN_5GHZ) {
hdr-crc_threshold = htole16(1);
/* send probe requests at 6Mbps */
hdr-cmd.rate = wpi_plcp_signal(12);
@@ -2877,32 +2875,29 @@ wpi_scan(struct wpi_softc *sc, uint16_t
hdr-cmd.len = htole16(frm - (uint8_t *)wh);
chan = (struct wpi_scan_chan
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: jmcneill
Date: Fri Aug 8 02:27:40 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: intelfb.c
Log Message:
add a pmf shutdown handler to switch genfb into polling mode
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/i915drm/intelfb.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/external/bsd/drm2/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.7 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.8
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.7 Wed Aug 6 22:16:38 2014
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Fri Aug 8 02:27:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: intelfb.c,v 1.7 2014/08/06 22:16:38 jmcneill Exp $ */
+/* $NetBSD: intelfb.c,v 1.8 2014/08/08 02:27:40 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intelfb.c,v 1.7 2014/08/06 22:16:38 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: intelfb.c,v 1.8 2014/08/08 02:27:40 jmcneill Exp $);
#ifdef _KERNEL_OPT
#include vga.h
@@ -90,6 +90,7 @@ static int intelfb_genfb_ioctl(void *, v
static paddr_t intelfb_genfb_mmap(void *, void *, off_t, int);
static int intelfb_genfb_enable_polling(void *);
static int intelfb_genfb_disable_polling(void *);
+static bool intelfb_genfb_shutdown(device_t, int);
static bool intelfb_genfb_setmode(struct genfb_softc *, int);
static const struct genfb_mode_callback intelfb_genfb_mode_callback = {
@@ -244,6 +245,9 @@ intelfb_setconfig_task(struct i915drmkms
}
sc-sc_attached = true;
+ pmf_device_register1(sc-sc_dev, NULL, NULL,
+ intelfb_genfb_shutdown);
+
drm_fb_helper_set_config(sc-sc_ifa.ifa_fb_helper);
/* Success! */
@@ -421,6 +425,13 @@ intelfb_genfb_disable_polling(void *cook
}
static bool
+intelfb_genfb_shutdown(device_t self, int flags)
+{
+ genfb_enable_polling(self);
+ return true;
+}
+
+static bool
intelfb_genfb_setmode(struct genfb_softc *genfb, int mode)
{
struct intelfb_softc *sc = (struct intelfb_softc *)genfb;
CVS commit: src/sys
Module Name:src
Committed By: rtr
Date: Fri Aug 8 03:05:45 UTC 2014
Modified Files:
src/sys/dev: kttcp.c
src/sys/kern: uipc_socket.c uipc_usrreq.c
src/sys/net: if_gre.c link_proto.c raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap_socket.c rfcomm.h rfcomm_socket.c
rfcomm_upper.c sco_socket.c
src/sys/netinet: raw_ip.c tcp_input.c tcp_usrreq.c udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: protosw.h
Log Message:
split PRU_RCVD function out of pr_generic() usrreq switches and put into
separate functions
- always KASSERT(solocked(so)) even if not implemented
- replace calls to pr_generic() with req = PRU_RCVD with calls to
pr_rcvd()
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/kttcp.c
cvs rdiff -u -r1.232 -r1.233 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.167 -r1.168 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.158 -r1.159 src/sys/net/if_gre.c
cvs rdiff -u -r1.22 -r1.23 src/sys/net/link_proto.c
cvs rdiff -u -r1.50 -r1.51 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.161 -r1.162 src/sys/net/rtsock.c
cvs rdiff -u -r1.61 -r1.62 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.38 -r1.39 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.29 -r1.30 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netbt/rfcomm.h
cvs rdiff -u -r1.31 -r1.32 src/sys/netbt/rfcomm_socket.c \
src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.20 -r1.21 src/sys/netbt/rfcomm_upper.c
cvs rdiff -u -r1.143 -r1.144 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.333 -r1.334 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.198 -r1.199 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.215 -r1.216 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.134 -r1.135 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.113 -r1.114 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.41 -r1.42 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.22 -r1.23 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.43 -r1.44 src/sys/netnatm/natm.c
cvs rdiff -u -r1.56 -r1.57 src/sys/rump/net/lib/libsockin/sockin.c
cvs rdiff -u -r1.58 -r1.59 src/sys/sys/protosw.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/kttcp.c
diff -u src/sys/dev/kttcp.c:1.36 src/sys/dev/kttcp.c:1.37
--- src/sys/dev/kttcp.c:1.36 Tue Aug 5 07:55:31 2014
+++ src/sys/dev/kttcp.c Fri Aug 8 03:05:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.36 2014/08/05 07:55:31 rtr Exp $ */
+/* $NetBSD: kttcp.c,v 1.37 2014/08/08 03:05:44 rtr Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kttcp.c,v 1.36 2014/08/05 07:55:31 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: kttcp.c,v 1.37 2014/08/08 03:05:44 rtr Exp $);
#include sys/param.h
#include sys/types.h
@@ -635,8 +635,7 @@ kttcp_soreceive(struct socket *so, unsig
* get it filled again.
*/
if ((pr-pr_flags PR_WANTRCVD) so-so_pcb) {
-(*pr-pr_usrreqs-pr_generic)(so, PRU_RCVD, NULL,
-(struct mbuf *)(long)flags, NULL, NULL);
+(*pr-pr_usrreqs-pr_rcvd)(so, flags, l);
}
SBLASTRECORDCHK(so-so_rcv,
kttcp_soreceive sbwait 2);
@@ -675,8 +674,7 @@ kttcp_soreceive(struct socket *so, unsig
SBLASTRECORDCHK(so-so_rcv, kttcp_soreceive 4);
SBLASTMBUFCHK(so-so_rcv, kttcp_soreceive 4);
if (pr-pr_flags PR_WANTRCVD so-so_pcb) {
- (*pr-pr_usrreqs-pr_generic)(so, PRU_RCVD, NULL,
- (struct mbuf *)(long)flags, NULL, NULL);
+ (*pr-pr_usrreqs-pr_rcvd)(so, flags, l);
}
}
if (orig_resid == resid orig_resid
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.232 src/sys/kern/uipc_socket.c:1.233
--- src/sys/kern/uipc_socket.c:1.232 Tue Aug 5 07:55:31 2014
+++ src/sys/kern/uipc_socket.c Fri Aug 8 03:05:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.232 2014/08/05 07:55:31 rtr Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.233 2014/08/08 03:05:45 rtr Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.232 2014/08/05 07:55:31 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.233 2014/08/08 03:05:45 rtr Exp $);
#include opt_compat_netbsd.h
#include opt_sock_counters.h
@@ -1532,8 +1532,7 @@ soreceive(struct socket *so, struct mbuf
* get it filled again.
*/
if ((pr-pr_flags PR_WANTRCVD) so-so_pcb)
-(*pr-pr_usrreqs-pr_generic)(so, PRU_RCVD,
-NULL, (struct mbuf *)(long)flags, NULL, l);
+(*pr-pr_usrreqs-pr_rcvd)(so, flags, l);
SBLASTRECORDCHK(so-so_rcv, soreceive sbwait 2);
SBLASTMBUFCHK(so-so_rcv, soreceive sbwait 2);
if (wakeup_state
CVS commit: [netbsd-6] src/sys/compat
Module Name:src Committed By: msaitoh Date: Fri Aug 8 03:13:33 UTC 2014 Modified Files: src/sys/compat/linux/common [netbsd-6]: linux_socketcall.c src/sys/compat/linux32/common [netbsd-6]: linux32_socketcall.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1104): sys/compat/linux32/common/linux32_socketcall.c: revision 1.9 sys/compat/linux/common/linux_socketcall.c: revision 1.44 If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@ To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.36.1 \ src/sys/compat/linux/common/linux_socketcall.c cvs rdiff -u -r1.7 -r1.7.22.1 \ src/sys/compat/linux32/common/linux32_socketcall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_socketcall.c diff -u src/sys/compat/linux/common/linux_socketcall.c:1.39 src/sys/compat/linux/common/linux_socketcall.c:1.39.36.1 --- src/sys/compat/linux/common/linux_socketcall.c:1.39 Thu Jul 3 14:07:09 2008 +++ src/sys/compat/linux/common/linux_socketcall.c Fri Aug 8 03:13:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.39.36.1 2014/08/08 03:13:33 msaitoh Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39.36.1 2014/08/08 03:13:33 msaitoh Exp $); #include sys/param.h #include sys/kernel.h @@ -123,7 +123,7 @@ linux_sys_socketcall(struct lwp *l, cons struct linux_socketcall_dummy_args lda; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG(uap, args), lda, Index: src/sys/compat/linux32/common/linux32_socketcall.c diff -u src/sys/compat/linux32/common/linux32_socketcall.c:1.7 src/sys/compat/linux32/common/linux32_socketcall.c:1.7.22.1 --- src/sys/compat/linux32/common/linux32_socketcall.c:1.7 Wed Nov 19 18:36:04 2008 +++ src/sys/compat/linux32/common/linux32_socketcall.c Fri Aug 8 03:13:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socketcall.c,v 1.7 2008/11/19 18:36:04 ad Exp $ */ +/* $NetBSD: linux32_socketcall.c,v 1.7.22.1 2014/08/08 03:13:33 msaitoh Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.7 2008/11/19 18:36:04 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.7.22.1 2014/08/08 03:13:33 msaitoh Exp $); #include sys/types.h #include sys/param.h @@ -96,7 +96,7 @@ linux32_sys_socketcall(struct lwp *l, co union linux32_socketcall_args ua; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG_P32(uap, args), ua,
CVS commit: [netbsd-6-1] src/sys/compat
Module Name:src Committed By: msaitoh Date: Fri Aug 8 03:14:02 UTC 2014 Modified Files: src/sys/compat/linux/common [netbsd-6-1]: linux_socketcall.c src/sys/compat/linux32/common [netbsd-6-1]: linux32_socketcall.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1104): sys/compat/linux32/common/linux32_socketcall.c: revision 1.9 sys/compat/linux/common/linux_socketcall.c: revision 1.44 If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@ To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.44.1 \ src/sys/compat/linux/common/linux_socketcall.c cvs rdiff -u -r1.7 -r1.7.28.1 \ src/sys/compat/linux32/common/linux32_socketcall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_socketcall.c diff -u src/sys/compat/linux/common/linux_socketcall.c:1.39 src/sys/compat/linux/common/linux_socketcall.c:1.39.44.1 --- src/sys/compat/linux/common/linux_socketcall.c:1.39 Thu Jul 3 14:07:09 2008 +++ src/sys/compat/linux/common/linux_socketcall.c Fri Aug 8 03:14:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.39.44.1 2014/08/08 03:14:02 msaitoh Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39.44.1 2014/08/08 03:14:02 msaitoh Exp $); #include sys/param.h #include sys/kernel.h @@ -123,7 +123,7 @@ linux_sys_socketcall(struct lwp *l, cons struct linux_socketcall_dummy_args lda; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG(uap, args), lda, Index: src/sys/compat/linux32/common/linux32_socketcall.c diff -u src/sys/compat/linux32/common/linux32_socketcall.c:1.7 src/sys/compat/linux32/common/linux32_socketcall.c:1.7.28.1 --- src/sys/compat/linux32/common/linux32_socketcall.c:1.7 Wed Nov 19 18:36:04 2008 +++ src/sys/compat/linux32/common/linux32_socketcall.c Fri Aug 8 03:14:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socketcall.c,v 1.7 2008/11/19 18:36:04 ad Exp $ */ +/* $NetBSD: linux32_socketcall.c,v 1.7.28.1 2014/08/08 03:14:02 msaitoh Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.7 2008/11/19 18:36:04 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.7.28.1 2014/08/08 03:14:02 msaitoh Exp $); #include sys/types.h #include sys/param.h @@ -96,7 +96,7 @@ linux32_sys_socketcall(struct lwp *l, co union linux32_socketcall_args ua; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG_P32(uap, args), ua,
CVS commit: [netbsd-6-0] src/sys/compat
Module Name:src Committed By: msaitoh Date: Fri Aug 8 03:14:10 UTC 2014 Modified Files: src/sys/compat/linux/common [netbsd-6-0]: linux_socketcall.c src/sys/compat/linux32/common [netbsd-6-0]: linux32_socketcall.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1104): sys/compat/linux32/common/linux32_socketcall.c: revision 1.9 sys/compat/linux/common/linux_socketcall.c: revision 1.44 If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@ To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.40.1 \ src/sys/compat/linux/common/linux_socketcall.c cvs rdiff -u -r1.7 -r1.7.26.1 \ src/sys/compat/linux32/common/linux32_socketcall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_socketcall.c diff -u src/sys/compat/linux/common/linux_socketcall.c:1.39 src/sys/compat/linux/common/linux_socketcall.c:1.39.40.1 --- src/sys/compat/linux/common/linux_socketcall.c:1.39 Thu Jul 3 14:07:09 2008 +++ src/sys/compat/linux/common/linux_socketcall.c Fri Aug 8 03:14:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.39.40.1 2014/08/08 03:14:10 msaitoh Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39.40.1 2014/08/08 03:14:10 msaitoh Exp $); #include sys/param.h #include sys/kernel.h @@ -123,7 +123,7 @@ linux_sys_socketcall(struct lwp *l, cons struct linux_socketcall_dummy_args lda; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG(uap, args), lda, Index: src/sys/compat/linux32/common/linux32_socketcall.c diff -u src/sys/compat/linux32/common/linux32_socketcall.c:1.7 src/sys/compat/linux32/common/linux32_socketcall.c:1.7.26.1 --- src/sys/compat/linux32/common/linux32_socketcall.c:1.7 Wed Nov 19 18:36:04 2008 +++ src/sys/compat/linux32/common/linux32_socketcall.c Fri Aug 8 03:14:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socketcall.c,v 1.7 2008/11/19 18:36:04 ad Exp $ */ +/* $NetBSD: linux32_socketcall.c,v 1.7.26.1 2014/08/08 03:14:10 msaitoh Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.7 2008/11/19 18:36:04 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.7.26.1 2014/08/08 03:14:10 msaitoh Exp $); #include sys/types.h #include sys/param.h @@ -96,7 +96,7 @@ linux32_sys_socketcall(struct lwp *l, co union linux32_socketcall_args ua; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG_P32(uap, args), ua,
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Aug 8 03:47:21 UTC 2014 Modified Files: src/sys/dev/pci [netbsd-6]: agp_i810.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1105): src/sys/dev/pci/agp_i810.c 1.108-1.110 via patch. Bind i810 dcache pages at the requested offset, not at VA start. From John D Baker in PR xsrc/48344. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.73.10.1 src/sys/dev/pci/agp_i810.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/agp_i810.c diff -u src/sys/dev/pci/agp_i810.c:1.73 src/sys/dev/pci/agp_i810.c:1.73.10.1 --- src/sys/dev/pci/agp_i810.c:1.73 Mon Apr 4 20:37:56 2011 +++ src/sys/dev/pci/agp_i810.c Fri Aug 8 03:47:21 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: agp_i810.c,v 1.73 2011/04/04 20:37:56 dyoung Exp $ */ +/* $NetBSD: agp_i810.c,v 1.73.10.1 2014/08/08 03:47:21 msaitoh Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.73 2011/04/04 20:37:56 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.73.10.1 2014/08/08 03:47:21 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -1028,7 +1028,8 @@ agp_i810_bind_memory(struct agp_softc *s return EINVAL; for (i = 0; i mem-am_size; i += AGP_PAGE_SIZE) - agp_i810_write_gtt_entry(isc, i, i | 3); + agp_i810_write_gtt_entry(isc, offset + i, i | 3); + mem-am_offset = offset; mem-am_is_bound = 1; return 0; } @@ -1057,7 +1058,8 @@ agp_i810_unbind_memory(struct agp_softc return EINVAL; for (i = 0; i mem-am_size; i += AGP_PAGE_SIZE) - agp_i810_write_gtt_entry(isc, i, 0); + agp_i810_write_gtt_entry(isc, mem-am_offset + i, 0); + mem-am_offset = 0; mem-am_is_bound = 0; return 0; }
CVS commit: [netbsd-6-0] src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Aug 8 03:51:59 UTC 2014 Modified Files: src/sys/dev/pci [netbsd-6-0]: agp_i810.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1105): src/sys/dev/pci/agp_i810.c 1.108-1.110 via patch. Bind i810 dcache pages at the requested offset, not at VA start. From John D Baker in PR xsrc/48344. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.73.16.1 src/sys/dev/pci/agp_i810.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/agp_i810.c diff -u src/sys/dev/pci/agp_i810.c:1.73 src/sys/dev/pci/agp_i810.c:1.73.16.1 --- src/sys/dev/pci/agp_i810.c:1.73 Mon Apr 4 20:37:56 2011 +++ src/sys/dev/pci/agp_i810.c Fri Aug 8 03:51:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: agp_i810.c,v 1.73 2011/04/04 20:37:56 dyoung Exp $ */ +/* $NetBSD: agp_i810.c,v 1.73.16.1 2014/08/08 03:51:59 msaitoh Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.73 2011/04/04 20:37:56 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.73.16.1 2014/08/08 03:51:59 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -1028,7 +1028,8 @@ agp_i810_bind_memory(struct agp_softc *s return EINVAL; for (i = 0; i mem-am_size; i += AGP_PAGE_SIZE) - agp_i810_write_gtt_entry(isc, i, i | 3); + agp_i810_write_gtt_entry(isc, offset + i, i | 3); + mem-am_offset = offset; mem-am_is_bound = 1; return 0; } @@ -1057,7 +1058,8 @@ agp_i810_unbind_memory(struct agp_softc return EINVAL; for (i = 0; i mem-am_size; i += AGP_PAGE_SIZE) - agp_i810_write_gtt_entry(isc, i, 0); + agp_i810_write_gtt_entry(isc, mem-am_offset + i, 0); + mem-am_offset = 0; mem-am_is_bound = 0; return 0; }
CVS commit: [netbsd-6-1] src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Aug 8 03:51:31 UTC 2014 Modified Files: src/sys/dev/pci [netbsd-6-1]: agp_i810.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1105): src/sys/dev/pci/agp_i810.c 1.108-1.110 via patch. Bind i810 dcache pages at the requested offset, not at VA start. From John D Baker in PR xsrc/48344. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.73.24.1 src/sys/dev/pci/agp_i810.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/agp_i810.c diff -u src/sys/dev/pci/agp_i810.c:1.73 src/sys/dev/pci/agp_i810.c:1.73.24.1 --- src/sys/dev/pci/agp_i810.c:1.73 Mon Apr 4 20:37:56 2011 +++ src/sys/dev/pci/agp_i810.c Fri Aug 8 03:51:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: agp_i810.c,v 1.73 2011/04/04 20:37:56 dyoung Exp $ */ +/* $NetBSD: agp_i810.c,v 1.73.24.1 2014/08/08 03:51:31 msaitoh Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.73 2011/04/04 20:37:56 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.73.24.1 2014/08/08 03:51:31 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -1028,7 +1028,8 @@ agp_i810_bind_memory(struct agp_softc *s return EINVAL; for (i = 0; i mem-am_size; i += AGP_PAGE_SIZE) - agp_i810_write_gtt_entry(isc, i, i | 3); + agp_i810_write_gtt_entry(isc, offset + i, i | 3); + mem-am_offset = offset; mem-am_is_bound = 1; return 0; } @@ -1057,7 +1058,8 @@ agp_i810_unbind_memory(struct agp_softc return EINVAL; for (i = 0; i mem-am_size; i += AGP_PAGE_SIZE) - agp_i810_write_gtt_entry(isc, i, 0); + agp_i810_write_gtt_entry(isc, mem-am_offset + i, 0); + mem-am_offset = 0; mem-am_is_bound = 0; return 0; }
CVS commit: [netbsd-6]
Module Name:xsrc Committed By: msaitoh Date: Fri Aug 8 05:47:57 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-mga [netbsd-6]: Makefile xsrc/external/mit/xf86-video-mga/dist [netbsd-6]: ChangeLog INSTALL Makefile.in aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-mga/dist/man [netbsd-6]: Makefile.am Makefile.in mga.man xsrc/external/mit/xf86-video-mga/dist/src [netbsd-6]: Makefile.am Makefile.in binding.h client.h mga.h mga_arc.c mga_bios.c mga_common.h mga_dac3026.c mga_dacG.c mga_dga.c mga_dh.c mga_dri.c mga_dri.h mga_dripriv.h mga_driver.c mga_exa.c mga_g450pll.c mga_hwcurs.c mga_macros.h mga_merge.c mga_merge.h mga_reg.h mga_sarea.h mga_shadow.c mga_storm.c mga_vga.c mga_video.c mgareg_flags.h xsrc/external/mit/xf86-video-mga/dist/util [netbsd-6]: Makefile.in stormdwg.c Added Files: xsrc/external/mit/xf86-video-mga/dist/src [netbsd-6]: compat-api.h Removed Files: xsrc/external/mit/xf86-video-mga/dist/src [netbsd-6]: clientlx.c mga_esc.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1106): src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile 1.10-1.12 xsrc/external/mit/xf86-video-mga/dist/ChangeLog 1.1.1.6-1.1.1.7 xsrc/external/mit/xf86-video-mga/dist/INSTALL 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/Makefile.in 1.1.1.6-1.1.1.7 xsrc/external/mit/xf86-video-mga/dist/aclocal.m41.1.1.6-1.1.1.7 xsrc/external/mit/xf86-video-mga/dist/config.guess 1.1.1.5-1.1.1.6 xsrc/external/mit/xf86-video-mga/dist/config.h.in 1.1.1.5-1.1.1.6 xsrc/external/mit/xf86-video-mga/dist/config.sub1.1.1.5-1.1.1.6 xsrc/external/mit/xf86-video-mga/dist/configure 1.1.1.6-1.1.1.7 xsrc/external/mit/xf86-video-mga/dist/configure.ac 1.1.1.6-1.1.1.7 xsrc/external/mit/xf86-video-mga/dist/depcomp 1.1.1.5-1.1.1.6 xsrc/external/mit/xf86-video-mga/dist/install-sh1.1.1.5-1.1.1.6 xsrc/external/mit/xf86-video-mga/dist/ltmain.sh 1.1.1.6 xsrc/external/mit/xf86-video-mga/dist/missing 1.1.1.4-1.1.1.5 xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am 1.1.1.5 xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in 1.1.1.6-1.1.1.7 xsrc/external/mit/xf86-video-mga/dist/man/mga.man 1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am 1.1.1.2-1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in 1.1.1.6-1.1.1.7 xsrc/external/mit/xf86-video-mga/dist/src/binding.h 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/client.h 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/clientlx.cdelete xsrc/external/mit/xf86-video-mga/dist/src/compat-api.h 1.1.1.1 xsrc/external/mit/xf86-video-mga/dist/src/mga.h 1.1.1.5-1.1.1.6 xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c 1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c 1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c 1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c 1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c 1.1.1.3-1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c 1.1.1.6-1.1.1.7 xsrc/external/mit/xf86-video-mga/dist/src/mga_esc.c delete xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c 1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c 1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c 1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c 1.1.1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h 1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h 1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c 1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c 1.1.1.4-1.1.1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c 1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c 1.1.1.4
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 8 05:50:41 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 1104-1106. To generate a diff of this commit: cvs rdiff -u -r1.1.2.126 -r1.1.2.127 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.126 src/doc/CHANGES-6.2:1.1.2.127 --- src/doc/CHANGES-6.2:1.1.2.126 Thu Aug 7 09:57:33 2014 +++ src/doc/CHANGES-6.2 Fri Aug 8 05:50:41 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.126 2014/08/07 09:57:33 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.127 2014/08/08 05:50:41 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -3043,3 +3043,82 @@ sys/net/link_proto.c1.17 Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan. PR kern/48997. [ozaki-r, ticket #1103] + +sys/compat/linux/common/linux_socketcall.c 1.44 +sys/compat/linux32/common/linux32_socketcall.c 1.9 + + If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's + not a good idea; but not proven harmful. With the help of njoly@. + [maxv, ticket #1104] + +sys/dev/pci/agp_i810.c1.108-1.110 via patch. + + Bind i810 dcache pages at the requested offset, not at VA start. + From John D Baker in PR xsrc/48344. + [riastradh, ticket #1105] + +src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile 1.10-1.12 +xsrc/external/mit/xf86-video-mga/dist/ChangeLog 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/INSTALL 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/Makefile.in 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/aclocal.m4 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/config.guess 1.1.1.5-1.1.1.6 +xsrc/external/mit/xf86-video-mga/dist/config.h.in 1.1.1.5-1.1.1.6 +xsrc/external/mit/xf86-video-mga/dist/config.sub 1.1.1.5-1.1.1.6 +xsrc/external/mit/xf86-video-mga/dist/configure 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/configure.ac 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/depcomp 1.1.1.5-1.1.1.6 +xsrc/external/mit/xf86-video-mga/dist/install-sh 1.1.1.5-1.1.1.6 +xsrc/external/mit/xf86-video-mga/dist/ltmain.sh 1.1.1.6 +xsrc/external/mit/xf86-video-mga/dist/missing 1.1.1.4-1.1.1.5 +xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am 1.1.1.5 +xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/man/mga.man 1.1.1.3 +xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am 1.1.1.2-1.1.1.3 +xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/src/binding.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/src/client.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/src/clientlx.c delete +xsrc/external/mit/xf86-video-mga/dist/src/compat-api.h 1.1.1.1 +xsrc/external/mit/xf86-video-mga/dist/src/mga.h 1.1.1.5-1.1.1.6 +xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c 1.1.1.3 +xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c 1.1.1.4 +xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c 1.3 +xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c 1.1.1.4 +xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c 1.1.1.3 +xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c 1.1.1.3 +xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c 1.1.1.3-1.1.1.4 +xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/src/mga_esc.c delete +xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c 1.2 +xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c 1.1.1.3 +xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c 1.1.1.3 +xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c 1.1.1.5 +xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h 1.1.1.4 +xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c 1.1.1.4 +xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c 1.1.1.4-1.1.1.5 +xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c 1.3 +xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c 1.1.1.4 +xsrc/external/mit/xf86-video-mga/dist/src/mgareg_flags.h 1.1.1.2 +xsrc/external/mit/xf86-video-mga/dist/util/Makefile.in 1.1.1.6-1.1.1.7 +xsrc/external/mit/xf86-video-mga/dist/util/stormdwg.c 1.1.1.2 + + Sync with -current (completely the same as of 2014/08/08): + - Added support for G200ER. + - Added support for G200SE Pilot3. + - Optimize use of bandwidth and increase maximum resolution to + 1920x1200. + - Delete support for MGA's proprietary HAL:
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 8 05:51:12 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.5 Log Message: Ticket 1104-1105. To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-6.1.5 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.1.5 diff -u src/doc/CHANGES-6.1.5:1.1.2.18 src/doc/CHANGES-6.1.5:1.1.2.19 --- src/doc/CHANGES-6.1.5:1.1.2.18 Thu Aug 7 09:59:29 2014 +++ src/doc/CHANGES-6.1.5 Fri Aug 8 05:51:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.5,v 1.1.2.18 2014/08/07 09:59:29 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.5,v 1.1.2.19 2014/08/08 05:51:12 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5 release: @@ -704,3 +704,16 @@ sys/net/link_proto.c1.17 Don't assume if_init is always set. if_init may be NULL, e.g., if_vlan. PR kern/48997. [ozaki-r, ticket #1103] + +sys/compat/linux/common/linux_socketcall.c 1.44 +sys/compat/linux32/common/linux32_socketcall.c 1.9 + + If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's + not a good idea; but not proven harmful. With the help of njoly@. + [maxv, ticket #1104] + +sys/dev/pci/agp_i810.c1.108-1.110 via patch. + + Bind i810 dcache pages at the requested offset, not at VA start. + From John D Baker in PR xsrc/48344. + [riastradh, ticket #1105]
