CVS commit: src/external/bsd/openpam/dist/lib
Module Name:src Committed By: christos Date: Wed Aug 15 06:16:41 UTC 2012 Modified Files: src/external/bsd/openpam/dist/lib: openpam_dynamic.c Log Message: PR/46801: Izumi Tsutsui: - downgrade the error of not finding a file to load to a debug message. Statically linked OpenPAM (like on sun2) does not have shared objects. - make sure we preserve errno around dlclose() which will call munmap() XXX: Pullup to 6 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openpam/dist/lib/openpam_dynamic.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/openpam/dist/lib/openpam_dynamic.c diff -u src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.3 src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.4 --- src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.3 Tue Jan 3 13:56:49 2012 +++ src/external/bsd/openpam/dist/lib/openpam_dynamic.c Wed Aug 15 02:16:41 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: openpam_dynamic.c,v 1.3 2012/01/03 18:56:49 christos Exp $ */ +/* $NetBSD: openpam_dynamic.c,v 1.4 2012/08/15 06:16:41 christos Exp $ */ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. @@ -123,11 +123,14 @@ openpam_dynamic(const char *path) } return (module); buf_err: + serrno = errno; if (dlh != NULL) dlclose(dlh); FREE(module); + errno = serrno; err: - openpam_log(PAM_LOG_ERROR, %s: %s, epath, strerror(errno)); + openpam_log(errno == ENOENT ? PAM_LOG_DEBUG : PAM_LOG_ERROR, %s: %s, + epath, strerror(errno)); return (NULL); }
CVS commit: src/sys/arch/amd64/include
Module Name:src Committed By: sborrill Date: Wed Aug 15 08:09:57 UTC 2012 Modified Files: src/sys/arch/amd64/include: vmparam.h Log Message: Bump VM_PHYSSEG_MAX to 16 from 10. Modern IBM hardware requires VM_PHYSSEG_MAX to be turned up to 11 to avoid an early panic. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amd64/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/include/vmparam.h diff -u src/sys/arch/amd64/include/vmparam.h:1.30 src/sys/arch/amd64/include/vmparam.h:1.31 --- src/sys/arch/amd64/include/vmparam.h:1.30 Mon May 7 16:16:44 2012 +++ src/sys/arch/amd64/include/vmparam.h Wed Aug 15 08:09:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.30 2012/05/07 16:16:44 joerg Exp $ */ +/* $NetBSD: vmparam.h,v 1.31 2012/08/15 08:09:57 sborrill Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -148,7 +148,7 @@ /* virtual sizes (bytes) for various kernel submaps */ #define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE) -#define VM_PHYSSEG_MAX 10 /* 1 hole + 9 free lists */ +#define VM_PHYSSEG_MAX 16 /* 1 hole + 15 free lists */ #define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST #define VM_NFREELIST 3
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: apb
Date: Wed Aug 15 12:48:20 UTC 2012
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Don't rely on stat(1) with format %SHr to print the correct names.
That uses devname(3) internally, which doesn't work at all in a cross
build environment, and doesn't do what I thought even in a native
environment.
Instead, parse the device major numbers for the pty master and slave
devices from the output of MAKEDEV -s pty0 and check those against the
actual device node that we are thinking of removing.
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.144 src/usr.sbin/postinstall/postinstall:1.145
--- src/usr.sbin/postinstall/postinstall:1.144 Tue Aug 14 13:11:24 2012
+++ src/usr.sbin/postinstall/postinstall Wed Aug 15 12:48:19 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.144 2012/08/14 13:11:24 apb Exp $
+# $NetBSD: postinstall,v 1.145 2012/08/15 12:48:19 apb Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -55,6 +55,7 @@
: ${AWK:=awk}
: ${DB:=db}
: ${GREP:=grep}
+: ${HOST_SH:=sh}
: ${MAKE:=make}
: ${PWD_MKDB:=/usr/sbin/pwd_mkdb}
: ${STAT:=stat}
@@ -1739,8 +1740,35 @@ do_ptyfsoldnodes()
return 0
fi
+ # Find the device major numbers for the pty master and slave
+ # devices, by parsing the output from MAKEDEV -s pty0.
+ #
+ # Output from MAKEDEV looks like this:
+ # ./ttyp0 type=char device=netbsd,5,0 mode=666 gid=0 uid=0
+ # ./ptyp0 type=char device=netbsd,6,0 mode=666 gid=0 uid=0
+ #
+ # Output from awk, used in the eval statement, looks like this:
+ # maj_ptym=6; maj_ptys=5;
+ #
+ eval $(
+ ${HOST_SH} ${DEST_DIR}/dev/MAKEDEV -s pty0 2/dev/null \
+ | ${AWK} '\
+ BEGIN { before_re = .*device=[a-zA-Z]*,; after_re = ,.*; }
+ /ptyp0/ { maj_ptym = gensub(before_re, , 1, $0);
+ maj_ptym = gensub(after_re, , 1, maj_ptym); }
+ /ttyp0/ { maj_ptys = gensub(before_re, , 1, $0);
+ maj_ptys = gensub(after_re, , 1, maj_ptys); }
+ END { print maj_ptym= maj_ptym ; maj_ptys= maj_ptys ;; }
+ '
+ )
+ #msg Major numbers are maj_ptym=${maj_ptym} maj_ptys=${maj_ptys}
+ if [ -z $maj_ptym ] || [ -z $maj_ptys ]; then
+ msg Cannot find device major numbers for pty master and slave
+ return 1
+ fi
+
# look for /dev/[pt]ty[p-zP-T][0-9a-zA-Z], and check that they
- # are tty or pty device nodes. ttyv* is typically not a
+ # have the expected device major numbers. ttyv* is typically not a
# pty device, but we check it anyway.
#
# The for d1 loop is intended to avoid overflowing ARG_MAX;
@@ -1753,9 +1781,13 @@ do_ptyfsoldnodes()
#
_ptyfs_tmp=$(mktemp /tmp/postinstall.ptyfs.)
for d1 in p q r s t u v w x y z P Q R S T; do
- ${STAT} -f %SHr %N ${DEST_DIR}/dev/[pt]ty${d1}? 21
+ ${STAT} -f %Hr %N ${DEST_DIR}/dev/[pt]ty${d1}? 21
done \
- | ${AWK} '/^[pt]ty/ {print $2}' ${_ptyfs_tmp}
+ | while read -r major node ; do
+ case $major in
+ ${maj_ptym}|${maj_ptys}) echo $node ;;
+ esac
+ done ${_ptyfs_tmp}
_desc=legacy device node
while read node; do
CVS commit: src
Module Name:src
Committed By: apb
Date: Wed Aug 15 12:50:12 UTC 2012
Modified Files:
src: Makefile
Log Message:
Add HOST_SH to _POSTINSTALL_ENV; needed for
usr.sbin/postinstall/postinstall revision 1.145.
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.297 src/Makefile:1.298
--- src/Makefile:1.297 Tue Aug 14 13:12:15 2012
+++ src/Makefile Wed Aug 15 12:50:12 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.297 2012/08/14 13:12:15 apb Exp $
+# $NetBSD: Makefile,v 1.298 2012/08/15 12:50:12 apb Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -191,6 +191,7 @@ _POSTINSTALL= ${.CURDIR}/usr.sbin/postin
_POSTINSTALL_ENV= \
AWK=${TOOL_AWK:Q} \
DB=${TOOL_DB:Q} \
+ HOST_SH=${HOST_SH:Q} \
MAKE=${MAKE:Q} \
PWD_MKDB=${TOOL_PWD_MKDB:Q} \
STAT=${TOOL_STAT:Q}
CVS commit: src/lib/libpthread
Module Name:src
Committed By: drochner
Date: Wed Aug 15 13:28:32 UTC 2012
Modified Files:
src/lib/libpthread: pthread.c
Log Message:
return errno if pthread_create hits the system limit, not just -1
(this is not entirely correct because it can return ENOMEM which is
not mentioned in the spec, but there are other places in pthread_create
whete ENOMEM is returned -- it at all, this should be fixed everywhere)
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/lib/libpthread/pthread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.136 src/lib/libpthread/pthread.c:1.137
--- src/lib/libpthread/pthread.c:1.136 Thu Aug 2 12:43:41 2012
+++ src/lib/libpthread/pthread.c Wed Aug 15 13:28:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.136 2012/08/02 12:43:41 joerg Exp $ */
+/* $NetBSD: pthread.c,v 1.137 2012/08/15 13:28:32 drochner Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread.c,v 1.136 2012/08/02 12:43:41 joerg Exp $);
+__RCSID($NetBSD: pthread.c,v 1.137 2012/08/15 13:28:32 drochner Exp $);
#define __EXPOSE_STACK 1
@@ -498,6 +498,7 @@ pthread_create(pthread_t *thread, const
flag |= LWP_SUSPENDED;
ret = _lwp_create(newthread-pt_uc, flag, newthread-pt_lid);
if (ret != 0) {
+ ret = errno;
pthread_mutex_lock(newthread-pt_lock);
/* Will unlock and free name. */
pthread__reap(newthread);
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: manu
Date: Wed Aug 15 14:51:30 UTC 2012
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: crypto_openssl.c
Log Message:
Fix make test on powermac G5. Patch from Nakano Takaharu
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.20 src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.21
--- src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.20 Wed Oct 20 13:40:02 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c Wed Aug 15 14:51:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto_openssl.c,v 1.20 2010/10/20 13:40:02 tteras Exp $ */
+/* $NetBSD: crypto_openssl.c,v 1.21 2012/08/15 14:51:30 manu Exp $ */
/* Id: crypto_openssl.c,v 1.47 2006/05/06 20:42:09 manubsd Exp */
@@ -2501,7 +2501,7 @@ eay_bn2v(var, bn)
vchar_t **var;
BIGNUM *bn;
{
- *var = vmalloc(bn-top * BN_BYTES);
+ *var = vmalloc(BN_num_bytes(bn));
if (*var == NULL)
return(-1);
CVS commit: [netbsd-6] src/sys/arch
Module Name:src Committed By: riz Date: Wed Aug 15 15:22:55 UTC 2012 Modified Files: src/sys/arch/amd64/include [netbsd-6]: vmparam.h src/sys/arch/i386/include [netbsd-6]: vmparam.h Log Message: Pull up following revision(s) (requested by sborrill in ticket #501): sys/arch/amd64/include/vmparam.h: revision 1.31 sys/arch/i386/include/vmparam.h: revision 1.75 Bump VM_PHYSSEG_MAX to 16 from 10. Modern IBM hardware requires VM_PHYSSEG_MAX to be turned up to 11 to avoid an early panic. Bump VM_PHYSSEG_MAX to 16 from 10. Modern IBM hardware requires VM_PHYSSEG_MAX to be turned up to 11 to avoid an early panic. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.29.2.1 src/sys/arch/amd64/include/vmparam.h cvs rdiff -u -r1.72 -r1.72.14.1 src/sys/arch/i386/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/include/vmparam.h diff -u src/sys/arch/amd64/include/vmparam.h:1.29 src/sys/arch/amd64/include/vmparam.h:1.29.2.1 --- src/sys/arch/amd64/include/vmparam.h:1.29 Tue Jan 10 16:03:17 2012 +++ src/sys/arch/amd64/include/vmparam.h Wed Aug 15 15:22:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.29 2012/01/10 16:03:17 chs Exp $ */ +/* $NetBSD: vmparam.h,v 1.29.2.1 2012/08/15 15:22:55 riz Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -148,7 +148,7 @@ /* virtual sizes (bytes) for various kernel submaps */ #define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE) -#define VM_PHYSSEG_MAX 10 /* 1 hole + 9 free lists */ +#define VM_PHYSSEG_MAX 16 /* 1 hole + 15 free lists */ #define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST #define VM_NFREELIST 3 Index: src/sys/arch/i386/include/vmparam.h diff -u src/sys/arch/i386/include/vmparam.h:1.72 src/sys/arch/i386/include/vmparam.h:1.72.14.1 --- src/sys/arch/i386/include/vmparam.h:1.72 Sun Nov 14 13:33:21 2010 +++ src/sys/arch/i386/include/vmparam.h Wed Aug 15 15:22:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.72 2010/11/14 13:33:21 uebayasi Exp $ */ +/* $NetBSD: vmparam.h,v 1.72.14.1 2012/08/15 15:22:55 riz Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -127,7 +127,7 @@ #define VM_PHYSSEG_MAX 1 #define VM_NFREELIST 1 #else -#define VM_PHYSSEG_MAX 10 /* 1 hole + 9 free lists */ +#define VM_PHYSSEG_MAX 16 /* 1 hole + 15 free lists */ #define VM_NFREELIST 2 #define VM_FREELIST_FIRST16 1 #endif /* XEN */
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed Aug 15 15:23:15 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket 501. To generate a diff of this commit: cvs rdiff -u -r1.1.2.186 -r1.1.2.187 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.186 src/doc/CHANGES-6.0:1.1.2.187 --- src/doc/CHANGES-6.0:1.1.2.186 Wed Aug 15 01:26:45 2012 +++ src/doc/CHANGES-6.0 Wed Aug 15 15:23:15 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.186 2012/08/15 01:26:45 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.187 2012/08/15 15:23:15 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -8237,3 +8237,9 @@ distrib/sandpoint/ramdisk/Makefile 1.10 Change all install media to use ipty instead of pty0. [martin, ticket #500] +sys/arch/amd64/include/vmparam.h 1.31 +sys/arch/i386/include/vmparam.h 1.75 + + Avoid early panic on modern IBM hardware. + [sborrill, ticket #501] +
CVS commit: [netbsd-6] src/sys/arch
Module Name:src Committed By: sborrill Date: Wed Aug 15 15:33:01 UTC 2012 Modified Files: src/sys/arch/amd64/conf [netbsd-6]: GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/cobalt/conf [netbsd-6]: GENERIC src/sys/arch/i386/conf [netbsd-6]: GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/mvmeppc/conf [netbsd-6]: GENERIC src/sys/arch/shark/conf [netbsd-6]: GENERIC src/sys/arch/sparc64/conf [netbsd-6]: GENERIC GENERIC.DEBUG src/sys/arch/zaurus/conf [netbsd-6]: GENERIC Log Message: Pull up the following revisions(s) (requested by martin in ticket #502): sys/arch/cobalt/conf/GENERIC: patch sys/arch/i386/conf/GENERIC: patch sys/arch/i386/conf/XEN3_DOM0: patch sys/arch/i386/conf/XEN3_DOMU: patch sys/arch/mvmeppc/conf/GENERIC: patch sys/arch/shark/conf/GENERIC:patch sys/arch/sparc64/conf/GENERIC: patch sys/arch/sparc64/conf/GENERIC.DEBUG:patch sys/arch/zaurus/conf/GENERIC: patch Switch off DIAGNOSTIC and/or DEBUG on release kernels. Enable DIAGNOSTIC in DEBUG kernels to allow for option being switched off in GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.348.2.5 -r1.348.2.6 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.77.2.5 -r1.77.2.6 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.36.2.1 -r1.36.2.2 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.133 -r1.133.2.1 src/sys/arch/cobalt/conf/GENERIC cvs rdiff -u -r1.1066.2.6 -r1.1066.2.7 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.60.2.4 -r1.60.2.5 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.41.2.1 -r1.41.2.2 src/sys/arch/i386/conf/XEN3_DOMU cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/mvmeppc/conf/GENERIC cvs rdiff -u -r1.98.2.1 -r1.98.2.2 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.148.2.1 -r1.148.2.2 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/arch/sparc64/conf/GENERIC.DEBUG cvs rdiff -u -r1.51.2.1 -r1.51.2.2 src/sys/arch/zaurus/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.348.2.5 src/sys/arch/amd64/conf/GENERIC:1.348.2.6 --- src/sys/arch/amd64/conf/GENERIC:1.348.2.5 Fri Jun 15 08:48:45 2012 +++ src/sys/arch/amd64/conf/GENERIC Wed Aug 15 15:32:59 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.348.2.5 2012/06/15 08:48:45 sborrill Exp $ +# $NetBSD: GENERIC,v 1.348.2.6 2012/08/15 15:32:59 sborrill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.348.2.5 $ +#ident GENERIC-$Revision: 1.348.2.6 $ maxusers 64 # estimated number of users @@ -86,7 +86,7 @@ powernow0 at cpu0 # AMD PowerNow! and C options BUFQ_PRIOCSCAN # Diagnostic/debugging support options -options DIAGNOSTIC # expensive kernel consistency checks +#options DIAGNOSTIC # expensive kernel consistency checks # XXX to be commented out on release branch #options DEBUG # expensive debugging checks/support #options LOCKDEBUG # expensive locking checks/support Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.5 src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.6 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.5 Tue Jul 3 21:22:07 2012 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Aug 15 15:32:59 2012 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.77.2.5 2012/07/03 21:22:07 jdc Exp $ +# $NetBSD: XEN3_DOM0,v 1.77.2.6 2012/08/15 15:32:59 sborrill Exp $ include arch/amd64/conf/std.xen @@ -50,7 +50,7 @@ options SYSCTL_INCLUDE_DESCR # Include options BUFQ_PRIOCSCAN # Diagnostic/debugging support options -options DIAGNOSTIC # expensive kernel consistency checks +#options DIAGNOSTIC # expensive kernel consistency checks #options DEBUG # expensive debugging checks/support options KMEMSTATS # kernel memory statistics (vmstat -m) options DDB # in-kernel debugger Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.36.2.1 src/sys/arch/amd64/conf/XEN3_DOMU:1.36.2.2 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.36.2.1 Sat Feb 25 21:18:02 2012 +++ src/sys/arch/amd64/conf/XEN3_DOMU Wed Aug 15 15:32:59 2012 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.36.2.1 2012/02/25 21:18:02 sborrill Exp $ +# $NetBSD: XEN3_DOMU,v 1.36.2.2 2012/08/15 15:32:59 sborrill Exp $ include arch/amd64/conf/std.xen @@ -44,7 +44,7 @@ options SYSCTL_INCLUDE_DESCR # Include options BUFQ_PRIOCSCAN # Diagnostic/debugging support options -options DIAGNOSTIC # expensive kernel consistency checks +#options DIAGNOSTIC # expensive kernel consistency checks #options DEBUG # expensive debugging checks/support options KMEMSTATS # kernel memory
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: sborrill Date: Wed Aug 15 15:34:04 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket #502 To generate a diff of this commit: cvs rdiff -u -r1.1.2.187 -r1.1.2.188 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.187 src/doc/CHANGES-6.0:1.1.2.188 --- src/doc/CHANGES-6.0:1.1.2.187 Wed Aug 15 15:23:15 2012 +++ src/doc/CHANGES-6.0 Wed Aug 15 15:34:04 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.187 2012/08/15 15:23:15 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.188 2012/08/15 15:34:04 sborrill Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -8243,3 +8243,21 @@ sys/arch/i386/include/vmparam.h 1.75 Avoid early panic on modern IBM hardware. [sborrill, ticket #501] +sys/arch/amd64/conf/GENERIC patch +sys/arch/amd64/conf/XEN3_DOM0 patch +sys/arch/amd64/conf/XEN3_DOMU patch +sys/arch/cobalt/conf/GENERIC patch +sys/arch/i386/conf/GENERIC patch +sys/arch/i386/conf/XEN3_DOM0 patch +sys/arch/i386/conf/XEN3_DOMU patch +sys/arch/mvmeppc/conf/GENERIC patch +sys/arch/shark/conf/GENERIC patch +sys/arch/sparc64/conf/GENERIC patch +sys/arch/sparc64/conf/GENERIC.DEBUG patch +sys/arch/zaurus/conf/GENERIC patch + + Switch off DIAGNOSTIC and/or DEBUG on release kernels. + Enable DIAGNOSTIC in DEBUG kernels to allow for option + being switched off in GENERIC. + [martin, ticket #502] +
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Wed Aug 15 15:39:23 UTC 2012 Modified Files: src/sys/dev/pci: machfbreg.h Log Message: add a few register definitions To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/machfbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/machfbreg.h diff -u src/sys/dev/pci/machfbreg.h:1.4 src/sys/dev/pci/machfbreg.h:1.5 --- src/sys/dev/pci/machfbreg.h:1.4 Tue May 4 05:08:01 2010 +++ src/sys/dev/pci/machfbreg.h Wed Aug 15 15:39:23 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machfbreg.h,v 1.4 2010/05/04 05:08:01 macallan Exp $ */ +/* $NetBSD: machfbreg.h,v 1.5 2012/08/15 15:39:23 macallan Exp $ */ /* * Copyright 1992,1993,1994,1995,1996,1997 by Kevin E. Martin, Chapel Hill, North Carolina. @@ -27,6 +27,11 @@ * Modified for the Mach64 by Kevin E. Martin (mar...@cs.unc.edu) */ +/* BARs */ +#define MACH64_BAR_APERTURE 0x10 /* all mach64 have this */ +#define MACH64_BAR_IO 0x14 /* most mach64 have this */ +#define MACH64_BAR_MMIO 0x18 /* Rage Pro and newer */ + /* NON-GUI MEMORY MAPPED Registers - expressed in BYTE offsets */ #define CRTC_H_TOTAL_DISP 0x /* Dword offset 00 */ @@ -254,9 +259,13 @@ #define AUTO_BLKWRT_DIS 0x02000 /* BUS_CNTL register constants */ +#define BUS_APER_REG_DIS0x0010 /* register block 0 */ +#define BUS_EXTRA_PIPE_DIS 0x0020 /* disable extra pipeline */ +#define BUS_DISABLE_MASTER 0x0040 /* disable busmaster */ +#define BUS_WRITE_ROM_EN 0x0080 /* write to flash ROM */ #define BUS_FIFO_ERR_ACK0x0020 #define BUS_HOST_ERR_ACK0x0080 -#define BUS_APER_REG_DIS0x0010 +#define BUS_EXT_REG_EN 0x0800 /* register block 1 */ /* GEN_TEST_CNTL register constants */ #define GEN_OVR_OUTPUT_EN 0x20
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: apb
Date: Wed Aug 15 16:21:41 UTC 2012
Modified Files:
src/usr.sbin/postinstall: postinstall postinstall.8
Log Message:
Remove the ability to specify multiple colon-separated fiel names with
a single -s option. Multiple -s options must now be used instead.
We have been printing a warning about this since 2008-09-14.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/usr.sbin/postinstall/postinstall
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/postinstall/postinstall.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.145 src/usr.sbin/postinstall/postinstall:1.146
--- src/usr.sbin/postinstall/postinstall:1.145 Wed Aug 15 12:48:19 2012
+++ src/usr.sbin/postinstall/postinstall Wed Aug 15 16:21:41 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.145 2012/08/15 12:48:19 apb Exp $
+# $NetBSD: postinstall,v 1.146 2012/08/15 16:21:41 apb Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1908,19 +1908,6 @@ main()
if [ -f ${OPTARG}/etc/Makefile ]; then
SOURCEMODE=true
fi
- elif [ -f ${OPTARG%%:*} -a -f ${OPTARG##*:} \
- -a ! -f ${OPTARG} ]
- then
-# Backward compatibility: allow arg to refer
-# to a colon-separated list of tgz files.
-# Remove this after NetBSD-5.0 is released.
-cat 2 EOF
-*** WARNING: The -s tgzfile1:tgzfile2 option is deprecated. Please use
- -s tgzfile1 -s tgzfile2 in future.
-EOF
-TGZMODE=true
-TGZLIST=${TGZLIST}${TGZLIST:+ }$( \
- IFS=: eval shell_quote \${OPTARG} )
else
err 2 Invalid argument for -s option
fi
Index: src/usr.sbin/postinstall/postinstall.8
diff -u src/usr.sbin/postinstall/postinstall.8:1.15 src/usr.sbin/postinstall/postinstall.8:1.16
--- src/usr.sbin/postinstall/postinstall.8:1.15 Sun Nov 22 18:45:27 2009
+++ src/usr.sbin/postinstall/postinstall.8 Wed Aug 15 16:21:41 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: postinstall.8,v 1.15 2009/11/22 18:45:27 mbalmer Exp $
+.\ $NetBSD: postinstall.8,v 1.16 2012/08/15 16:21:41 apb Exp $
.\
.\ Copyright (c) 2005-2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd October 4, 2008
+.Dd August 15, 2012
.Dt POSTINSTALL 8
.Os
.Sh NAME
@@ -181,3 +181,12 @@ In
the ability to specify multiple colon-separated files with a single
.Fl s
option was deprecated.
+.Pp
+In
+.Nx 7.0 ,
+the ability to specify multiple colon-separated files with a single
+.Fl s
+option was removed.
+Multiple
+.Fl s
+options must be used instead.
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src Committed By: riz Date: Wed Aug 15 16:48:41 UTC 2012 Modified Files: src/distrib/amd64/ramdisks/common: list.ramdisk Log Message: Add sbin/gpt to amd64 install ramdisk. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/amd64/ramdisks/common/list.ramdisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/ramdisks/common/list.ramdisk diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.17 src/distrib/amd64/ramdisks/common/list.ramdisk:1.18 --- src/distrib/amd64/ramdisks/common/list.ramdisk:1.17 Sun Jun 17 14:59:15 2012 +++ src/distrib/amd64/ramdisks/common/list.ramdisk Wed Aug 15 16:48:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.17 2012/06/17 14:59:15 martin Exp $ +# $NetBSD: list.ramdisk,v 1.18 2012/08/15 16:48:41 riz Exp $ SRCDIRS external/bsd/less/bin SRCDIRS bin sbin usr.bin usr.sbin libexec @@ -23,6 +23,7 @@ PROG sbin/disklabel PROG sbin/dmesg PROG sbin/fsck PROG sbin/fsck_ffs +PROG sbin/gpt PROG sbin/ifconfig PROG sbin/init PROG sbin/mknod
CVS commit: src/distrib/i386/ramdisks/common
Module Name:src Committed By: riz Date: Wed Aug 15 16:49:09 UTC 2012 Modified Files: src/distrib/i386/ramdisks/common: list.ramdisk Log Message: Add sbin/gpt to i386 install ramdisk. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/i386/ramdisks/common/list.ramdisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/i386/ramdisks/common/list.ramdisk diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.22 src/distrib/i386/ramdisks/common/list.ramdisk:1.23 --- src/distrib/i386/ramdisks/common/list.ramdisk:1.22 Sun Jun 17 14:59:15 2012 +++ src/distrib/i386/ramdisks/common/list.ramdisk Wed Aug 15 16:49:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.22 2012/06/17 14:59:15 martin Exp $ +# $NetBSD: list.ramdisk,v 1.23 2012/08/15 16:49:09 riz Exp $ SRCDIRS external/bsd/less/bin SRCDIRS bin sbin usr.bin usr.sbin libexec @@ -23,6 +23,7 @@ PROG sbin/disklabel PROG sbin/dmesg PROG sbin/fsck PROG sbin/fsck_ffs +PROG sbin/gpt PROG sbin/ifconfig PROG sbin/init PROG sbin/mknod
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Aug 15 17:02:41 UTC 2012
Modified Files:
src/sys/dev/pci: machfb.c
Log Message:
some cleanup:
- get rid of some redundant variables ( sc_*phys and sc_*base were essentially
the same )
- we don't access video memory directly anymore, so:
* no more need for byte order tests
* don't map video memory if we have a MMIO register aperture
* get rid of various bits of support code dealing with video memory
access
- use MMIO register aperture if available, turn off register blocks in the main
aperture if not in use, to avoid overlap with video memory on 8MB cards
- don't scissor off access to off-screen memory. How the hell did this work on
Rage II? Apparently Rage XL treats the scissor registers slightly different.
Now this works properly on 8MB and Rage XL boards like Sun's PGX64.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/machfb.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/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.80 src/sys/dev/pci/machfb.c:1.81
--- src/sys/dev/pci/machfb.c:1.80 Fri Aug 3 01:23:32 2012
+++ src/sys/dev/pci/machfb.c Wed Aug 15 17:02:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.80 2012/08/03 01:23:32 macallan Exp $ */
+/* $NetBSD: machfb.c,v 1.81 2012/08/15 17:02:41 macallan Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include sys/cdefs.h
__KERNEL_RCSID(0,
- $NetBSD: machfb.c,v 1.80 2012/08/03 01:23:32 macallan Exp $);
+ $NetBSD: machfb.c,v 1.81 2012/08/15 17:02:41 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -74,13 +74,12 @@ __KERNEL_RCSID(0,
#include opt_machfb.h
#define MACH64_REG_SIZE 1024
-#define MACH64_REG_OFF 0x7ffc00
+#define MACH64_REG_OFF 0x7ff800
#define NBARS 3 /* number of Mach64 PCI BARs */
struct vga_bar {
bus_addr_t vb_base;
- pcireg_t vb_busaddr;
bus_size_t vb_size;
pcireg_t vb_type;
int vb_flags;
@@ -99,23 +98,22 @@ struct mach64_softc {
#define sc_aperbase sc_bars[0].vb_base
#define sc_apersize sc_bars[0].vb_size
-#define sc_aperphys sc_bars[0].vb_busaddr
#define sc_iobase sc_bars[1].vb_base
#define sc_iosize sc_bars[1].vb_size
#define sc_regbase sc_bars[2].vb_base
#define sc_regsize sc_bars[2].vb_size
-#define sc_regphys sc_bars[2].vb_busaddr
bus_space_tag_t sc_regt;
bus_space_tag_t sc_memt;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_regh;
bus_space_handle_t sc_memh;
+#if 0
void *sc_aperture; /* mapped aperture vaddr */
void *sc_registers; /* mapped registers vaddr */
-
+#endif
uint32_t sc_nbus, sc_ndev, sc_nfunc;
size_t memsize;
int memtype;
@@ -295,7 +293,6 @@ static void mach64_feed_bytes(struct mac
static void mach64_showpal(struct mach64_softc *);
#endif
-static void set_address(struct rasops_info *, void *);
static void machfb_blank(struct mach64_softc *, int);
static int machfb_drm_print(void *, const char *);
@@ -412,19 +409,19 @@ static struct fbdriver machfb_fbdriver =
static inline uint32_t
regr(struct mach64_softc *sc, uint32_t index)
{
- return bus_space_read_4(sc-sc_regt, sc-sc_regh, index);
+ return bus_space_read_4(sc-sc_regt, sc-sc_regh, index + 0x400);
}
static inline uint8_t
regrb(struct mach64_softc *sc, uint32_t index)
{
- return bus_space_read_1(sc-sc_regt, sc-sc_regh, index);
+ return bus_space_read_1(sc-sc_regt, sc-sc_regh, index + 0x400);
}
static inline void
regw(struct mach64_softc *sc, uint32_t index, uint32_t data)
{
- bus_space_write_4(sc-sc_regt, sc-sc_regh, index, data);
+ bus_space_write_4(sc-sc_regt, sc-sc_regh, index + 0x400, data);
bus_space_barrier(sc-sc_regt, sc-sc_regh, index, 4,
BUS_SPACE_BARRIER_WRITE);
}
@@ -432,16 +429,16 @@ regw(struct mach64_softc *sc, uint32_t i
static inline void
regws(struct mach64_softc *sc, uint32_t index, uint32_t data)
{
- bus_space_write_stream_4(sc-sc_regt, sc-sc_regh, index, data);
- bus_space_barrier(sc-sc_regt, sc-sc_regh, index, 4,
+ bus_space_write_stream_4(sc-sc_regt, sc-sc_regh, index + 0x400, data);
+ bus_space_barrier(sc-sc_regt, sc-sc_regh, index + 0x400, 4,
BUS_SPACE_BARRIER_WRITE);
}
static inline void
regwb(struct mach64_softc *sc, uint32_t index, uint8_t data)
{
- bus_space_write_1(sc-sc_regt, sc-sc_regh, index, data);
- bus_space_barrier(sc-sc_regt, sc-sc_regh, index, 1,
+ bus_space_write_1(sc-sc_regt, sc-sc_regh, index + 0x400, data);
+ bus_space_barrier(sc-sc_regt, sc-sc_regh, index + 0x400, 1,
BUS_SPACE_BARRIER_WRITE);
}
@@ -524,6 +521,7 @@ mach64_attach(device_t parent, device_t
pcireg_t screg;
uint32_t reg;
const pcireg_t enables = PCI_COMMAND_MEM_ENABLE;
+ int use_mmio = FALSE;
sc-sc_dev = self;
sc-sc_pc = pa-pa_pc;
@@ -557,8 +555,6 @@ mach64_attach(device_t parent, device_t
(void)pci_mapreg_info(sc-sc_pc, sc-sc_pcitag, reg,
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Wed Aug 15 17:20:27 UTC 2012
Modified Files:
src/sys/arch/arm/include: armreg.h
Log Message:
Add SWP enable bit to system control register (Cortex-A9).
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arm/include/armreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.58 src/sys/arch/arm/include/armreg.h:1.59
--- src/sys/arch/arm/include/armreg.h:1.58 Tue Aug 14 21:12:59 2012
+++ src/sys/arch/arm/include/armreg.h Wed Aug 15 17:20:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.58 2012/08/14 21:12:59 matt Exp $ */
+/* $NetBSD: armreg.h,v 1.59 2012/08/15 17:20:27 matt Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -302,6 +302,7 @@
#define CPU_CONTROL_SYST_ENABLE 0x0100 /* S: System protection bit */
#define CPU_CONTROL_ROM_ENABLE 0x0200 /* R: ROM protection bit */
#define CPU_CONTROL_CPCLK 0x0400 /* F: Implementation defined */
+#define CPU_CONTROL_SWP_ENABLE 0x0400 /* SW: SWP{B} perform normally. */
#define CPU_CONTROL_BPRD_ENABLE 0x0800 /* Z: Branch prediction enable */
#define CPU_CONTROL_IC_ENABLE 0x1000 /* I: IC enable */
#define CPU_CONTROL_VECRELOC 0x2000 /* V: Vector relocation */
CVS commit: xsrc/external/mit/xf86-video-mach64/dist/src
Module Name:xsrc Committed By: macallan Date: Wed Aug 15 17:35:03 UTC 2012 Modified Files: xsrc/external/mit/xf86-video-mach64/dist/src: atipreinit.c Log Message: set the default reference clock for Rage XL on sparc to 29.498MHz now the PGX64 works out of the box with no config file To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.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-mach64/dist/src/atipreinit.c diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.2 xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.3 --- xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.2 Thu Aug 4 01:17:34 2011 +++ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c Wed Aug 15 17:35:03 2012 @@ -1012,8 +1012,13 @@ ATIPreInit } } -ati_bios_clock(pScreenInfo, pATI, BIOS, ClockTable, pGDev); +#if defined(__sparc__) + /* make PGX64 work by default */ + if (pATI-Chip == ATI_CHIP_264XL) + pATI-refclk = 29498000; +#endif +ati_bios_clock(pScreenInfo, pATI, BIOS, ClockTable, pGDev); ati_bios_mmedia(pScreenInfo, pATI, BIOS, VideoTable, HardwareTable); if (pATI-LCDPanelID = 0)
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: sborrill Date: Wed Aug 15 17:37:13 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket #503 To generate a diff of this commit: cvs rdiff -u -r1.1.2.188 -r1.1.2.189 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.188 src/doc/CHANGES-6.0:1.1.2.189 --- src/doc/CHANGES-6.0:1.1.2.188 Wed Aug 15 15:34:04 2012 +++ src/doc/CHANGES-6.0 Wed Aug 15 17:37:13 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.188 2012/08/15 15:34:04 sborrill Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.189 2012/08/15 17:37:13 sborrill Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -8261,3 +8261,9 @@ sys/arch/zaurus/conf/GENERIC patch being switched off in GENERIC. [martin, ticket #502] +usr.sbin/postinstall/postinstall 1.142-1.145 +Makefile 1.295-1.298 + + Make test for and removal of old pty device nodes more portable. + [martin, ticket #503] +
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Wed Aug 15 17:43:59 UTC 2012 Modified Files: src/sys/dev/pci: machfb.c Log Message: don't forget to clear the screen and wipe the glyph cache when re-entering terminal emulation mode To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/dev/pci/machfb.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/machfb.c diff -u src/sys/dev/pci/machfb.c:1.81 src/sys/dev/pci/machfb.c:1.82 --- src/sys/dev/pci/machfb.c:1.81 Wed Aug 15 17:02:41 2012 +++ src/sys/dev/pci/machfb.c Wed Aug 15 17:43:59 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machfb.c,v 1.81 2012/08/15 17:02:41 macallan Exp $ */ +/* $NetBSD: machfb.c,v 1.82 2012/08/15 17:43:59 macallan Exp $ */ /* * Copyright (c) 2002 Bang Jun-Young @@ -34,7 +34,7 @@ #include sys/cdefs.h __KERNEL_RCSID(0, - $NetBSD: machfb.c,v 1.81 2012/08/15 17:02:41 macallan Exp $); + $NetBSD: machfb.c,v 1.82 2012/08/15 17:43:59 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -1897,6 +1897,8 @@ mach64_ioctl(void *v, void *vs, u_long c mach64_init_engine(sc); mach64_init_lut(sc); mach64_modeswitch(sc, sc-sc_my_mode); +mach64_clearscreen(sc); +glyphcache_wipe(sc-sc_gc); vcons_redraw_screen(ms); } }
CVS commit: src/sys/rump/net
Module Name:src Committed By: rmind Date: Wed Aug 15 17:56:58 UTC 2012 Modified Files: src/sys/rump/net: Makefile.rumpnetcomp Log Message: Enable the build of librumpnet_npf. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/Makefile.rumpnetcomp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/net/Makefile.rumpnetcomp diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.4 src/sys/rump/net/Makefile.rumpnetcomp:1.5 --- src/sys/rump/net/Makefile.rumpnetcomp:1.4 Wed Dec 8 20:20:16 2010 +++ src/sys/rump/net/Makefile.rumpnetcomp Wed Aug 15 17:56:58 2012 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.rumpnetcomp,v 1.4 2010/12/08 20:20:16 pooka Exp $ +# $NetBSD: Makefile.rumpnetcomp,v 1.5 2012/08/15 17:56:58 rmind Exp $ # -RUMPNETCOMP= agr bridge net net80211 netbt netinet local shmif virtif +RUMPNETCOMP= agr bridge net net80211 netbt netinet npf local shmif virtif RUMPNETSOCKIN= sockin
CVS commit: src
Module Name:src
Committed By: rmind
Date: Wed Aug 15 18:44:57 UTC 2012
Modified Files:
src/lib/libnpf: npf.c
src/sys/net/npf: npf_ctl.c npf_nat.c
Log Message:
- {npf_mk_rproc,npf_nat_save}: fix the fetching of {rproc-ptr,id_ptr}.
- npf_rproc_setlog: initialise variables to 0, as keys may not exist.
Bugs found by mlelstv@ while testing on Amiga.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libnpf/npf.c
cvs rdiff -u -r1.16 -r1.17 src/sys/net/npf/npf_ctl.c \
src/sys/net/npf/npf_nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnpf/npf.c
diff -u src/lib/libnpf/npf.c:1.11 src/lib/libnpf/npf.c:1.12
--- src/lib/libnpf/npf.c:1.11 Sun Aug 12 03:35:14 2012
+++ src/lib/libnpf/npf.c Wed Aug 15 18:44:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.11 2012/08/12 03:35:14 rmind Exp $ */
+/* $NetBSD: npf.c,v 1.12 2012/08/15 18:44:56 rmind Exp $ */
/*-
* Copyright (c) 2010-2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.11 2012/08/12 03:35:14 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.12 2012/08/15 18:44:56 rmind Exp $);
#include sys/types.h
#include netinet/in_systm.h
@@ -456,7 +456,7 @@ _npf_rproc_setnorm(nl_rproc_t *rp, bool
u_int maxmss)
{
prop_dictionary_t rpdict = rp-nrp_dict;
- uint32_t fl;
+ uint32_t fl = 0;
prop_dictionary_set_bool(rpdict, randomize-id, rnd);
prop_dictionary_set_bool(rpdict, no-df, no_df);
@@ -472,7 +472,7 @@ int
_npf_rproc_setlog(nl_rproc_t *rp, u_int if_idx)
{
prop_dictionary_t rpdict = rp-nrp_dict;
- uint32_t fl;
+ uint32_t fl = 0;
prop_dictionary_set_uint32(rpdict, log-interface, if_idx);
Index: src/sys/net/npf/npf_ctl.c
diff -u src/sys/net/npf/npf_ctl.c:1.16 src/sys/net/npf/npf_ctl.c:1.17
--- src/sys/net/npf/npf_ctl.c:1.16 Sun Jul 15 00:23:00 2012
+++ src/sys/net/npf/npf_ctl.c Wed Aug 15 18:44:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ctl.c,v 1.16 2012/07/15 00:23:00 rmind Exp $ */
+/* $NetBSD: npf_ctl.c,v 1.17 2012/08/15 18:44:56 rmind Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_ctl.c,v 1.16 2012/07/15 00:23:00 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_ctl.c,v 1.17 2012/08/15 18:44:56 rmind Exp $);
#include sys/param.h
#include sys/conf.h
@@ -164,6 +164,7 @@ npf_mk_rproc(prop_array_t rprocs, const
prop_object_iterator_t it;
prop_dictionary_t rpdict;
npf_rproc_t *rp;
+ uint64_t rpval;
it = prop_array_iterator(rprocs);
while ((rpdict = prop_object_iterator_next(it)) != NULL) {
@@ -178,10 +179,12 @@ npf_mk_rproc(prop_array_t rprocs, const
return NULL;
}
CTASSERT(sizeof(uintptr_t) = sizeof(uint64_t));
- if (!prop_dictionary_get_uint64(rpdict, rproc-ptr, (uint64_t *)rp)) {
+ if (!prop_dictionary_get_uint64(rpdict, rproc-ptr, rpval)) {
rp = npf_rproc_create(rpdict);
- prop_dictionary_set_uint64(rpdict, rproc-ptr,
- (uint64_t)(uintptr_t)rp);
+ rpval = (uint64_t)(uintptr_t)rp;
+ prop_dictionary_set_uint64(rpdict, rproc-ptr, rpval);
+ } else {
+ rp = (npf_rproc_t *)(uintptr_t)rpval;
}
return rp;
}
Index: src/sys/net/npf/npf_nat.c
diff -u src/sys/net/npf/npf_nat.c:1.16 src/sys/net/npf/npf_nat.c:1.17
--- src/sys/net/npf/npf_nat.c:1.16 Sun Aug 12 03:35:14 2012
+++ src/sys/net/npf/npf_nat.c Wed Aug 15 18:44:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_nat.c,v 1.16 2012/08/12 03:35:14 rmind Exp $ */
+/* $NetBSD: npf_nat.c,v 1.17 2012/08/15 18:44:56 rmind Exp $ */
/*-
* Copyright (c) 2010-2012 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_nat.c,v 1.16 2012/08/12 03:35:14 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_nat.c,v 1.17 2012/08/15 18:44:56 rmind Exp $);
#include sys/param.h
#include sys/types.h
@@ -751,7 +751,7 @@ npf_nat_save(prop_dictionary_t sedict, p
prop_object_iterator_t it;
prop_dictionary_t npdict;
prop_data_t nd, npd;
- uintptr_t itnp;
+ uint64_t itnp;
/* Set NAT entry data. */
nd = prop_data_create_data(nt, sizeof(npf_nat_t));
@@ -762,8 +762,8 @@ npf_nat_save(prop_dictionary_t sedict, p
it = prop_array_iterator(natlist);
while ((npdict = prop_object_iterator_next(it)) != NULL) {
CTASSERT(sizeof(uintptr_t) = sizeof(uint64_t));
- prop_dictionary_get_uint64(npdict, id-ptr, (uint64_t *)itnp);
- if (itnp == (uintptr_t)np) {
+ prop_dictionary_get_uint64(npdict, id-ptr, itnp);
+ if ((uintptr_t)itnp == (uintptr_t)np) {
break;
}
}
CVS commit: src/sys/arch/x68k/dev
Module Name:src
Committed By: tsutsui
Date: Wed Aug 15 19:13:58 UTC 2012
Modified Files:
src/sys/arch/x68k/dev: event_var.h
Log Message:
Make sure to take proc_lock mutex on calling psignal(9) in EV_WAKEUP() macro
as sys/dev/sun/event_var.h does.
Fixes immediate KASSERT(mutex_owned(proc_lock)) panic during running Xserver
on DIAGNOSTIC kernel.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x68k/dev/event_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/dev/event_var.h
diff -u src/sys/arch/x68k/dev/event_var.h:1.8 src/sys/arch/x68k/dev/event_var.h:1.9
--- src/sys/arch/x68k/dev/event_var.h:1.8 Sat Mar 1 14:16:50 2008
+++ src/sys/arch/x68k/dev/event_var.h Wed Aug 15 19:13:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: event_var.h,v 1.8 2008/03/01 14:16:50 rmind Exp $ */
+/* $NetBSD: event_var.h,v 1.9 2012/08/15 19:13:58 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -67,8 +67,11 @@ struct evvar {
(ev)-ev_wanted = 0; \
wakeup((void *)(ev)); \
} \
- if ((ev)-ev_async) \
+ if ((ev)-ev_async) { \
+ mutex_enter(proc_lock); \
psignal((ev)-ev_io, SIGIO); \
+ mutex_exit(proc_lock); \
+ } \
}
void ev_init(struct evvar *);
CVS commit: src
Module Name:src
Committed By: rmind
Date: Wed Aug 15 19:47:39 UTC 2012
Modified Files:
src/sys/net/npf: npf_impl.h npf_state.c
src/usr.sbin/npf/npftest: npftest.c npftest.h
src/usr.sbin/npf/npftest/libnpftest: npf_test.h npf_test_subr.c
Log Message:
Add npf_state_setsampler() for _NPF_TESTING case. This also fixes the build.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.11 -r1.12 src/sys/net/npf/npf_state.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/npf/npftest/npftest.c \
src/usr.sbin/npf/npftest/npftest.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/npf/npftest/libnpftest/npf_test.h
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.21 src/sys/net/npf/npf_impl.h:1.22
--- src/sys/net/npf/npf_impl.h:1.21 Sun Aug 12 03:35:14 2012
+++ src/sys/net/npf/npf_impl.h Wed Aug 15 19:47:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.21 2012/08/12 03:35:14 rmind Exp $ */
+/* $NetBSD: npf_impl.h,v 1.22 2012/08/15 19:47:38 rmind Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -122,13 +122,6 @@ typedef struct {
npf_tcpstate_t nst_tcpst[2];
} npf_state_t;
-#if defined(_NPF_TESTING)
-void npf_state_sample(npf_state_t *, bool);
-#define NPF_STATE_SAMPLE(n, r) npf_state_sample(n, r)
-#else
-#define NPF_STATE_SAMPLE(n, r)
-#endif
-
/*
* INTERFACES.
*/
@@ -332,5 +325,6 @@ void npf_rulenc_dump(const npf_rule_t *
void npf_sessions_dump(void);
void npf_state_dump(const npf_state_t *);
void npf_nat_dump(const npf_nat_t *);
+void npf_state_setsampler(void (*)(npf_state_t *, bool));
#endif /* _NPF_IMPL_H_ */
Index: src/sys/net/npf/npf_state.c
diff -u src/sys/net/npf/npf_state.c:1.11 src/sys/net/npf/npf_state.c:1.12
--- src/sys/net/npf/npf_state.c:1.11 Sun Aug 12 03:35:14 2012
+++ src/sys/net/npf/npf_state.c Wed Aug 15 19:47:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_state.c,v 1.11 2012/08/12 03:35:14 rmind Exp $ */
+/* $NetBSD: npf_state.c,v 1.12 2012/08/15 19:47:38 rmind Exp $ */
/*-
* Copyright (c) 2010-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_state.c,v 1.11 2012/08/12 03:35:14 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_state.c,v 1.12 2012/08/15 19:47:38 rmind Exp $);
#include sys/param.h
#include sys/systm.h
@@ -75,6 +75,16 @@ static u_int npf_generic_timeout[] __rea
};
/*
+ * State sampler for debugging.
+ */
+#if defined(_NPF_TESTING)
+static void (*npf_state_sample)(npf_state_t *, bool) = NULL;
+#define NPF_STATE_SAMPLE(n, r) if (npf_state_sample) (*npf_state_sample)(n, r);
+#else
+#define NPF_STATE_SAMPLE(n, r)
+#endif
+
+/*
* npf_state_init: initialise the state structure.
*
* Should normally be called on a first packet, which also determines the
@@ -195,3 +205,11 @@ npf_state_dump(const npf_state_t *nst)
);
#endif
}
+
+#if defined(_NPF_TESTING)
+void
+npf_state_setsampler(void (*func)(npf_state_t *, bool))
+{
+ npf_state_sample = func;
+}
+#endif
Index: src/usr.sbin/npf/npftest/npftest.c
diff -u src/usr.sbin/npf/npftest/npftest.c:1.4 src/usr.sbin/npf/npftest/npftest.c:1.5
--- src/usr.sbin/npf/npftest/npftest.c:1.4 Sun Aug 12 03:35:14 2012
+++ src/usr.sbin/npf/npftest/npftest.c Wed Aug 15 19:47:38 2012
@@ -178,6 +178,8 @@ main(int argc, char **argv)
rump_init();
rump_schedule();
+ rumpns_npf_test_init();
+
if (config) {
load_npf_config(config);
}
Index: src/usr.sbin/npf/npftest/npftest.h
diff -u src/usr.sbin/npf/npftest/npftest.h:1.4 src/usr.sbin/npf/npftest/npftest.h:1.5
--- src/usr.sbin/npf/npftest/npftest.h:1.4 Sun Aug 12 03:35:14 2012
+++ src/usr.sbin/npf/npftest/npftest.h Wed Aug 15 19:47:38 2012
@@ -10,6 +10,7 @@
#include stdint.h
#include stdbool.h
+void rumpns_npf_test_init(void);
int rumpns_npf_test_load(const void *);
unsigned rumpns_npf_test_addif(const char *, unsigned, bool);
unsigned rumpns_npf_test_getif(const char *);
Index: src/usr.sbin/npf/npftest/libnpftest/npf_test.h
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.5 src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.6
--- src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.5 Sun Aug 12 03:35:14 2012
+++ src/usr.sbin/npf/npftest/libnpftest/npf_test.h Wed Aug 15 19:47:38 2012
@@ -24,6 +24,7 @@
#include net/if_ether.h
#include net/ethertypes.h
+void npf_test_init(void);
int npf_test_load(const void *);
unsigned npf_test_addif(const char *, unsigned, bool);
unsigned npf_test_getif(const char *);
Index: src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c:1.3 src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c:1.4
--- src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c:1.3 Sun Aug 12 03:35:14 2012
CVS commit: src
Module Name:src Committed By: matt Date: Wed Aug 15 20:38:50 UTC 2012 Modified Files: src/distrib/sets/lists/comp: ad.arm ad.armeb src/sys/arch/arm/include: Makefile Log Message: Export arm/vfpreg.h To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/comp/ad.armeb cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.40 src/distrib/sets/lists/comp/ad.arm:1.41 --- src/distrib/sets/lists/comp/ad.arm:1.40 Tue Aug 7 18:48:13 2012 +++ src/distrib/sets/lists/comp/ad.arm Wed Aug 15 20:38:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.40 2012/08/07 18:48:13 matt Exp $ +# $NetBSD: ad.arm,v 1.41 2012/08/15 20:38:50 matt Exp $ ./usr/include/gcc-4.5/arm_neon.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/mmintrin.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 @@ -71,6 +71,7 @@ ./usr/include/arm/sysarch.h comp-c-include ./usr/include/arm/trap.h comp-c-include ./usr/include/arm/types.h comp-c-include +./usr/include/arm/vfpreg.h comp-c-include ./usr/include/arm/varargs.h comp-obsolete obsolete ./usr/include/arm/wchar_limits.h comp-c-include ./usr/include/arm32/bootconfig.h comp-obsolete obsolete Index: src/distrib/sets/lists/comp/ad.armeb diff -u src/distrib/sets/lists/comp/ad.armeb:1.6 src/distrib/sets/lists/comp/ad.armeb:1.7 --- src/distrib/sets/lists/comp/ad.armeb:1.6 Tue Aug 7 18:48:13 2012 +++ src/distrib/sets/lists/comp/ad.armeb Wed Aug 15 20:38:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.armeb,v 1.6 2012/08/07 18:48:13 matt Exp $ +# $NetBSD: ad.armeb,v 1.7 2012/08/15 20:38:50 matt Exp $ # # The armeb MACHINE_ARCH never existed in NetBSD as a.out, so we # skip the old a.out compatibility tools. @@ -74,6 +74,7 @@ ./usr/include/arm/sysarch.h comp-c-include ./usr/include/arm/trap.h comp-c-include ./usr/include/arm/types.h comp-c-include +./usr/include/arm/vfpreg.h comp-c-include ./usr/include/arm/varargs.h comp-obsolete obsolete ./usr/include/arm/wchar_limits.h comp-c-include ./usr/include/arm32/bootconfig.h comp-obsolete obsolete Index: src/sys/arch/arm/include/Makefile diff -u src/sys/arch/arm/include/Makefile:1.42 src/sys/arch/arm/include/Makefile:1.43 --- src/sys/arch/arm/include/Makefile:1.42 Mon Aug 6 01:55:13 2012 +++ src/sys/arch/arm/include/Makefile Wed Aug 15 20:38:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2012/08/06 01:55:13 matt Exp $ +# $NetBSD: Makefile,v 1.43 2012/08/15 20:38:49 matt Exp $ INCSDIR= /usr/include/arm @@ -18,6 +18,7 @@ INCS= aeabi.h ansi.h aout_machdep.h armr reg.h rwlock.h \ setjmp.h signal.h swi.h sysarch.h \ trap.h types.h \ + vfpreg.h \ wchar_limits.h .include bsd.kinc.mk
CVS commit: src/sys/net
Module Name:src
Committed By: alnsn
Date: Wed Aug 15 20:59:51 UTC 2012
Modified Files:
src/sys/net: bpf.c
Log Message:
Fix two bugs introduced by recent commit.
- When handling contiguous buffer in _bpf_tap(), pass its real size
rather than 0 to avoid reading packet data as mbuf struct on
out-of-bounds loads.
- Correctly pass pktlen and buflen arguments from bpf_deliver() to
bpf_filter() to avoid reading mbuf struct as packet data.
JIT case is still broken.
Also, test pointers againts NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/net/bpf.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/bpf.c
diff -u src/sys/net/bpf.c:1.170 src/sys/net/bpf.c:1.171
--- src/sys/net/bpf.c:1.170 Thu Aug 2 00:40:51 2012
+++ src/sys/net/bpf.c Wed Aug 15 20:59:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.170 2012/08/02 00:40:51 rmind Exp $ */
+/* $NetBSD: bpf.c,v 1.171 2012/08/15 20:59:51 alnsn Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bpf.c,v 1.170 2012/08/02 00:40:51 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpf.c,v 1.171 2012/08/15 20:59:51 alnsn Exp $);
#if defined(_KERNEL_OPT)
#include opt_bpf.h
@@ -1379,9 +1379,14 @@ bpf_deliver(struct bpf_if *bp, void *(*c
bf = bpf_jit_enable ? d-bd_bfilter : NULL;
if (bf) {
+ /*
+ * XXX THIS is totally broken when pkt
+ * points to mbuf. FreeBSD does a runtime
+ * check, we don't.
+ */
slen = (*(bf-func))(pkt, pktlen, pktlen);
} else {
- slen = bpf_filter(d-bd_filter, pkt, pktlen, pktlen);
+ slen = bpf_filter(d-bd_filter, pkt, pktlen, buflen);
}
if (!slen) {
continue;
@@ -1404,7 +1409,7 @@ static void
_bpf_tap(struct bpf_if *bp, u_char *pkt, u_int pktlen)
{
- bpf_deliver(bp, memcpy, pkt, pktlen, 0, true);
+ bpf_deliver(bp, memcpy, pkt, pktlen, pktlen, true);
}
/*
@@ -1702,11 +1707,11 @@ bpf_freed(struct bpf_d *d)
* been detached from its interface and it yet hasn't been marked
* free.
*/
- if (d-bd_sbuf) {
+ if (d-bd_sbuf != NULL) {
free(d-bd_sbuf, M_DEVBUF);
- if (d-bd_hbuf)
+ if (d-bd_hbuf != NULL)
free(d-bd_hbuf, M_DEVBUF);
- if (d-bd_fbuf)
+ if (d-bd_fbuf != NULL)
free(d-bd_fbuf, M_DEVBUF);
}
if (d-bd_filter)
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: pgoyette Date: Wed Aug 15 21:03:11 UTC 2012 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add librumpnet_npf To generate a diff of this commit: cvs rdiff -u -r1.1776 -r1.1777 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1776 src/distrib/sets/lists/comp/mi:1.1777 --- src/distrib/sets/lists/comp/mi:1.1776 Fri Aug 10 16:22:33 2012 +++ src/distrib/sets/lists/comp/mi Wed Aug 15 21:03:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1776 2012/08/10 16:22:33 joerg Exp $ +# $NetBSD: mi,v 1.1777 2012/08/15 21:03:09 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3258,6 +3258,9 @@ ./usr/lib/librumpnet_netinet.a comp-c-lib rump ./usr/lib/librumpnet_netinet_g.a -unknown- debuglib,rump ./usr/lib/librumpnet_netinet_p.a comp-c-proflib profile,rump +./usr/lib/librumpnet_npf.a comp-c-lib rump +./usr/lib/librumpnet_npf_g.a -unknown- debuglib,rump +./usr/lib/librumpnet_npf_p.a comp-c-lib profile,rump ./usr/lib/librumpnet_p.a comp-c-proflib profile,rump ./usr/lib/librumpnet_shmif.a comp-c-lib rump ./usr/lib/librumpnet_shmif_g.a -unknown- debuglib,rump
CVS commit: src/sys/net
Module Name:src
Committed By: alnsn
Date: Wed Aug 15 21:31:39 UTC 2012
Modified Files:
src/sys/net: bpf_filter.c
Log Message:
MINDEX() macro has 'return 0;' statement. It doesn't set *err to
1 before return when invoked from m_xword() and m_xhalf() functions.
The caller doesn't set it to 1 either. So, set *err to 1 before
invoking MINDEX().
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/net/bpf_filter.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/bpf_filter.c
diff -u src/sys/net/bpf_filter.c:1.52 src/sys/net/bpf_filter.c:1.53
--- src/sys/net/bpf_filter.c:1.52 Thu Aug 2 20:13:24 2012
+++ src/sys/net/bpf_filter.c Wed Aug 15 21:31:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.52 2012/08/02 20:13:24 rmind Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.53 2012/08/15 21:31:39 alnsn Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bpf_filter.c,v 1.52 2012/08/02 20:13:24 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpf_filter.c,v 1.53 2012/08/15 21:31:39 alnsn Exp $);
#if 0
#if !(defined(lint) || defined(KERNEL))
@@ -78,6 +78,7 @@ m_xword(const struct mbuf *m, uint32_t k
u_char *cp, *np;
struct mbuf *m0;
+ *err = 1;
MINDEX(len, m, k);
cp = mtod(m, u_char *) + k;
if (len = k + 4) {
@@ -109,6 +110,7 @@ m_xhalf(const struct mbuf *m, uint32_t k
u_char *cp;
struct mbuf *m0;
+ *err = 1;
MINDEX(len, m, k);
cp = mtod(m, u_char *) + k;
if (len = k + 2) {
CVS commit: src/tests/net/bpfilter
Module Name:src
Committed By: alnsn
Date: Wed Aug 15 21:36:00 UTC 2012
Modified Files:
src/tests/net/bpfilter: t_bpfilter.c
Log Message:
Test contiguous buffer as well.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/bpfilter/t_bpfilter.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/bpfilter/t_bpfilter.c
diff -u src/tests/net/bpfilter/t_bpfilter.c:1.1 src/tests/net/bpfilter/t_bpfilter.c:1.2
--- src/tests/net/bpfilter/t_bpfilter.c:1.1 Tue Aug 14 19:09:15 2012
+++ src/tests/net/bpfilter/t_bpfilter.c Wed Aug 15 21:36:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bpfilter.c,v 1.1 2012/08/14 19:09:15 alnsn Exp $ */
+/* $NetBSD: t_bpfilter.c,v 1.2 2012/08/15 21:36:00 alnsn Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_bpfilter.c,v 1.1 2012/08/14 19:09:15 alnsn Exp $);
+__RCSID($NetBSD: t_bpfilter.c,v 1.2 2012/08/15 21:36:00 alnsn Exp $);
#include sys/param.h
#include sys/ioctl.h
@@ -185,21 +185,14 @@ pingtest(const char *dst, unsigned int w
return rv;
}
-ATF_TC(bpfiltermchain);
-ATF_TC_HEAD(bpfiltermchain, tc)
-{
-
- atf_tc_set_md_var(tc, descr, Checks that bpf program
- can read bytes from mbuf chain.);
-}
-
-ATF_TC_BODY(bpfiltermchain, tc)
+static void
+magic_ping_test(unsigned int wirelen)
{
struct bpf_program prog;
struct bpf_stat bstat;
struct ifreq ifr;
struct timeval tv;
- unsigned int bufsize, wirelen;
+ unsigned int bufsize;
bool pinged;
ssize_t n;
char *buf;
@@ -238,17 +231,17 @@ ATF_TC_BODY(bpfiltermchain, tc)
RL(rump_sys_ioctl(bpfd, BIOCSETF, prog));
RL(rump_sys_ioctl(bpfd, BIOCSETIF, ifr));
- wirelen = MINCLSIZE + 1;
pinged = pingtest(10.1.1.10, wirelen, magic_echo_reply_tail);
ATF_CHECK(pinged);
buf = malloc(bufsize);
hdr = (struct bpf_hdr *)buf;
ATF_REQUIRE(buf != NULL);
+ ATF_REQUIRE(bufsize sizeof(struct bpf_hdr));
n = rump_sys_read(bpfd, buf, bufsize);
- ATF_CHECK(n (int)sizeof(struct bpf_hdr *));
+ ATF_CHECK(n (int)sizeof(struct bpf_hdr));
ATF_CHECK(hdr-bh_caplen == MIN(SNAPLEN, wirelen));
RL(rump_sys_ioctl(bpfd, BIOCGSTATS, bstat));
@@ -259,10 +252,40 @@ ATF_TC_BODY(bpfiltermchain, tc)
kill(child, SIGKILL);
}
+ATF_TC(bpfiltercontig);
+ATF_TC_HEAD(bpfiltercontig, tc)
+{
+
+ atf_tc_set_md_var(tc, descr, Checks that bpf program
+ can read bytes from contiguous buffer.);
+}
+
+ATF_TC_BODY(bpfiltercontig, tc)
+{
+
+ magic_ping_test(128);
+}
+
+
+ATF_TC(bpfiltermchain);
+ATF_TC_HEAD(bpfiltermchain, tc)
+{
+
+ atf_tc_set_md_var(tc, descr, Checks that bpf program
+ can read bytes from mbuf chain.);
+}
+
+ATF_TC_BODY(bpfiltermchain, tc)
+{
+
+ magic_ping_test(MINCLSIZE + 1);
+}
+
ATF_TP_ADD_TCS(tp)
{
+ ATF_TP_ADD_TC(tp, bpfiltercontig);
ATF_TP_ADD_TC(tp, bpfiltermchain);
return atf_no_error();
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: pgoyette Date: Wed Aug 15 22:14:47 UTC 2012 Modified Files: src/distrib/sets/lists/comp: shl.mi Log Message: Part 2 of librumpnet_npf To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 src/distrib/sets/lists/comp/shl.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/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.232 src/distrib/sets/lists/comp/shl.mi:1.233 --- src/distrib/sets/lists/comp/shl.mi:1.232 Fri Aug 10 16:22:33 2012 +++ src/distrib/sets/lists/comp/shl.mi Wed Aug 15 22:14:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.232 2012/08/10 16:22:33 joerg Exp $ +# $NetBSD: shl.mi,v 1.233 2012/08/15 22:14:47 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -195,6 +195,10 @@ ./usr/lib/librumpnet_net_pic.a comp-c-piclib rump ./usr/lib/librumpnet_netbt_pic.a comp-c-piclib rump ./usr/lib/librumpnet_netinet_pic.a comp-c-piclib rump +./usr/lib/librumpnet_npf.so comp-c-piclib rump +./usr/lib/librumpnet_npf.so.0 comp-c-piclib rump +./usr/lib/librumpnet_npf.so.0.0 comp-c-piclib rump +./usr/lib/librumpnet_npf_pic.a comp-c-piclib rump ./usr/lib/librumpnet_pic.a comp-c-piclib rump ./usr/lib/librumpnet_shmif_pic.a comp-c-piclib rump ./usr/lib/librumpnet_sockin_pic.a comp-c-piclib rump
CVS commit: src/usr.sbin/traceroute
Module Name:src
Committed By: zafer
Date: Thu Aug 16 00:40:29 UTC 2012
Modified Files:
src/usr.sbin/traceroute: traceroute.c
Log Message:
Pretty print multipath routes. From FreeBSD.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/usr.sbin/traceroute/traceroute.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/traceroute/traceroute.c
diff -u src/usr.sbin/traceroute/traceroute.c:1.80 src/usr.sbin/traceroute/traceroute.c:1.81
--- src/usr.sbin/traceroute/traceroute.c:1.80 Wed Jan 4 16:09:44 2012
+++ src/usr.sbin/traceroute/traceroute.c Thu Aug 16 00:40:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: traceroute.c,v 1.80 2012/01/04 16:09:44 drochner Exp $ */
+/* $NetBSD: traceroute.c,v 1.81 2012/08/16 00:40:28 zafer Exp $ */
/*
* Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000
@@ -30,7 +30,7 @@ static const char rcsid[] =
__COPYRIGHT(@(#) Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997,\
1998, 1999, 2000\
The Regents of the University of California. All rights reserved.);
-__RCSID($NetBSD: traceroute.c,v 1.80 2012/01/04 16:09:44 drochner Exp $);
+__RCSID($NetBSD: traceroute.c,v 1.81 2012/08/16 00:40:28 zafer Exp $);
#endif
#endif
@@ -984,6 +984,7 @@ again:
continue;
if (!gotlastaddr ||
from-sin_addr.s_addr != lastaddr) {
+ if (gotlastaddr) printf(\n );
print(packet, cc, from);
lastaddr = from-sin_addr.s_addr;
++gotlastaddr;
CVS commit: [netbsd-6] src/sys/arch/x68k/dev
Module Name:src
Committed By: riz
Date: Thu Aug 16 02:37:56 UTC 2012
Modified Files:
src/sys/arch/x68k/dev [netbsd-6]: event_var.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #504):
sys/arch/x68k/dev/event_var.h: revision 1.9
Make sure to take proc_lock mutex on calling psignal(9) in EV_WAKEUP() macro
as sys/dev/sun/event_var.h does.
Fixes immediate KASSERT(mutex_owned(proc_lock)) panic during running Xserver
on DIAGNOSTIC kernel.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.44.1 src/sys/arch/x68k/dev/event_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/dev/event_var.h
diff -u src/sys/arch/x68k/dev/event_var.h:1.8 src/sys/arch/x68k/dev/event_var.h:1.8.44.1
--- src/sys/arch/x68k/dev/event_var.h:1.8 Sat Mar 1 14:16:50 2008
+++ src/sys/arch/x68k/dev/event_var.h Thu Aug 16 02:37:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: event_var.h,v 1.8 2008/03/01 14:16:50 rmind Exp $ */
+/* $NetBSD: event_var.h,v 1.8.44.1 2012/08/16 02:37:55 riz Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -67,8 +67,11 @@ struct evvar {
(ev)-ev_wanted = 0; \
wakeup((void *)(ev)); \
} \
- if ((ev)-ev_async) \
+ if ((ev)-ev_async) { \
+ mutex_enter(proc_lock); \
psignal((ev)-ev_io, SIGIO); \
+ mutex_exit(proc_lock); \
+ } \
}
void ev_init(struct evvar *);
CVS commit: [netbsd-6] src/external/bsd/openpam/dist/lib
Module Name:src Committed By: riz Date: Thu Aug 16 02:41:05 UTC 2012 Modified Files: src/external/bsd/openpam/dist/lib [netbsd-6]: openpam_dynamic.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #505): external/bsd/openpam/dist/lib/openpam_dynamic.c: revision 1.4 PR/46801: Izumi Tsutsui: - downgrade the error of not finding a file to load to a debug message. Statically linked OpenPAM (like on sun2) does not have shared objects. - make sure we preserve errno around dlclose() which will call munmap() XXX: Pullup to 6 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.2.1 \ src/external/bsd/openpam/dist/lib/openpam_dynamic.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/openpam/dist/lib/openpam_dynamic.c diff -u src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.3 src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.3.2.1 --- src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.3 Tue Jan 3 18:56:49 2012 +++ src/external/bsd/openpam/dist/lib/openpam_dynamic.c Thu Aug 16 02:41:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: openpam_dynamic.c,v 1.3 2012/01/03 18:56:49 christos Exp $ */ +/* $NetBSD: openpam_dynamic.c,v 1.3.2.1 2012/08/16 02:41:05 riz Exp $ */ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. @@ -123,11 +123,14 @@ openpam_dynamic(const char *path) } return (module); buf_err: + serrno = errno; if (dlh != NULL) dlclose(dlh); FREE(module); + errno = serrno; err: - openpam_log(PAM_LOG_ERROR, %s: %s, epath, strerror(errno)); + openpam_log(errno == ENOENT ? PAM_LOG_DEBUG : PAM_LOG_ERROR, %s: %s, + epath, strerror(errno)); return (NULL); }
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Aug 16 02:41:29 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 504, 505. To generate a diff of this commit: cvs rdiff -u -r1.1.2.189 -r1.1.2.190 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.189 src/doc/CHANGES-6.0:1.1.2.190 --- src/doc/CHANGES-6.0:1.1.2.189 Wed Aug 15 17:37:13 2012 +++ src/doc/CHANGES-6.0 Thu Aug 16 02:41:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.189 2012/08/15 17:37:13 sborrill Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.190 2012/08/16 02:41:29 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -8267,3 +8267,14 @@ Makefile 1.295-1.298 Make test for and removal of old pty device nodes more portable. [martin, ticket #503] +sys/arch/x68k/dev/event_var.h 1.9 + + Fix keyboard KASSERT on x68k DIAGNOSTIC kernel when running Xserver. + [tsutsui, ticket #504] + +external/bsd/openpam/dist/lib/openpam_dynamic.c 1.4 + + Suppress error messages from not finding a file to load that can + always happen on MKPIC=no environment. PR#46801. + [tsutsui, ticket #505] +
CVS commit: src/lib/libpthread
Module Name:src
Committed By: matt
Date: Thu Aug 16 04:49:48 UTC 2012
Modified Files:
src/lib/libpthread: pthread_int.h pthread_mutex.c pthread_spin.c
src/lib/libpthread/arch/arm: pthread_md.h
Log Message:
Add a pthread__smt_wake and add support for it on arm along with
pthread__smt_pause. These are implemented using the ARM instructions
SEV (wake) and WFE (pause). These are treated as NOPs on ARM CPUs that
don't support them.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.53 -r1.54 src/lib/libpthread/pthread_mutex.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libpthread/pthread_spin.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libpthread/arch/arm/pthread_md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.85 src/lib/libpthread/pthread_int.h:1.86
--- src/lib/libpthread/pthread_int.h:1.85 Fri May 4 12:26:33 2012
+++ src/lib/libpthread/pthread_int.h Thu Aug 16 04:49:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.85 2012/05/04 12:26:33 joerg Exp $ */
+/* $NetBSD: pthread_int.h,v 1.86 2012/08/16 04:49:47 matt Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -299,6 +299,9 @@ int pthread__checkpri(int) PTHREAD_HIDE;
#ifndef pthread__smt_pause
#define pthread__smt_pause() /* nothing */
#endif
+#ifndef pthread__smt_wake
+#define pthread__smt_wake() /* nothing */
+#endif
/*
* Bits in the owner field of the lock that indicate lock state. If the
Index: src/lib/libpthread/pthread_mutex.c
diff -u src/lib/libpthread/pthread_mutex.c:1.53 src/lib/libpthread/pthread_mutex.c:1.54
--- src/lib/libpthread/pthread_mutex.c:1.53 Tue Mar 13 01:05:55 2012
+++ src/lib/libpthread/pthread_mutex.c Thu Aug 16 04:49:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_mutex.c,v 1.53 2012/03/13 01:05:55 joerg Exp $ */
+/* $NetBSD: pthread_mutex.c,v 1.54 2012/08/16 04:49:47 matt Exp $ */
/*-
* Copyright (c) 2001, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_mutex.c,v 1.53 2012/03/13 01:05:55 joerg Exp $);
+__RCSID($NetBSD: pthread_mutex.c,v 1.54 2012/08/16 04:49:47 matt Exp $);
#include sys/types.h
#include sys/lwpctl.h
@@ -379,8 +379,10 @@ pthread_mutex_unlock(pthread_mutex_t *pt
#endif
self = pthread__self();
value = atomic_cas_ptr_ni(ptm-ptm_owner, self, NULL);
- if (__predict_true(value == self))
+ if (__predict_true(value == self)) {
+ pthread__smt_wake();
return 0;
+ }
return pthread__mutex_unlock_slow(ptm);
}
@@ -475,6 +477,7 @@ pthread__mutex_wakeup(pthread_t self, pt
* are dependent upon 'thread'.
*/
thread = atomic_swap_ptr(ptm-ptm_waiters, NULL);
+ pthread__smt_wake();
for (;;) {
/*
Index: src/lib/libpthread/pthread_spin.c
diff -u src/lib/libpthread/pthread_spin.c:1.5 src/lib/libpthread/pthread_spin.c:1.6
--- src/lib/libpthread/pthread_spin.c:1.5 Mon Apr 28 20:23:01 2008
+++ src/lib/libpthread/pthread_spin.c Thu Aug 16 04:49:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_spin.c,v 1.5 2008/04/28 20:23:01 martin Exp $ */
+/* $NetBSD: pthread_spin.c,v 1.6 2012/08/16 04:49:47 matt Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_spin.c,v 1.5 2008/04/28 20:23:01 martin Exp $);
+__RCSID($NetBSD: pthread_spin.c,v 1.6 2012/08/16 04:49:47 matt Exp $);
#include sys/types.h
#include sys/ras.h
@@ -133,6 +133,7 @@ pthread_spin_unlock(pthread_spinlock_t *
self = pthread__self();
pthread__spinunlock(self, lock-pts_spin);
+ pthread__smt_wake();
return 0;
}
Index: src/lib/libpthread/arch/arm/pthread_md.h
diff -u src/lib/libpthread/arch/arm/pthread_md.h:1.6 src/lib/libpthread/arch/arm/pthread_md.h:1.7
--- src/lib/libpthread/arch/arm/pthread_md.h:1.6 Tue Jan 25 19:12:04 2011
+++ src/lib/libpthread/arch/arm/pthread_md.h Thu Aug 16 04:49:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_md.h,v 1.6 2011/01/25 19:12:04 christos Exp $ */
+/* $NetBSD: pthread_md.h,v 1.7 2012/08/16 04:49:48 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -49,6 +49,9 @@ pthread__sp(void)
return (ret);
}
+#define pthread__smt_pause() __asm __volatile(wfe)
+#define pthread__smt_wake() __asm __volatile(sev)
+
#define pthread__uc_sp(ucp) ((ucp)-uc_mcontext.__gregs[_REG_SP])
/*
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Thu Aug 16 05:30:56 UTC 2012
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add ARM cpus to those MACHINE_ARCH which USE_COMPILERCRTSTUFF=no
To generate a diff of this commit:
cvs rdiff -u -r1.705 -r1.706 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.705 src/share/mk/bsd.own.mk:1.706
--- src/share/mk/bsd.own.mk:1.705 Fri Aug 10 16:12:20 2012
+++ src/share/mk/bsd.own.mk Thu Aug 16 05:30:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.705 2012/08/10 16:12:20 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.706 2012/08/16 05:30:55 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -59,6 +59,7 @@ HAVE_GCC?=45
.endif
.if \
+${MACHINE_CPU} == arm || \
${MACHINE_ARCH} == i386 || \
${MACHINE_ARCH} == powerpc || \
${MACHINE_CPU} == sh3 || \
