date:20130717

CVS commit: src/lib/libc/arch/m68k/gen

2013-07-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul 17 06:43:32 UTC 2013

Modified Files:
src/lib/libc/arch/m68k/gen: fabs.S negdf2.S negsf2.S

Log Message:
Use __HAVE_FPU__ instead __HAVE_68881__


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/m68k/gen/fabs.S
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/m68k/gen/negdf2.S \
src/lib/libc/arch/m68k/gen/negsf2.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/m68k/gen/fabs.S
diff -u src/lib/libc/arch/m68k/gen/fabs.S:1.10 src/lib/libc/arch/m68k/gen/fabs.S:1.11
--- src/lib/libc/arch/m68k/gen/fabs.S:1.10	Tue Jul 16 22:12:20 2013
+++ src/lib/libc/arch/m68k/gen/fabs.S	Wed Jul 17 06:43:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fabs.S,v 1.10 2013/07/16 22:12:20 matt Exp $	*/
+/*	$NetBSD: fabs.S,v 1.11 2013/07/17 06:43:32 matt Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,10 +31,10 @@
 
 #include machine/asm.h
 
-RCSID($NetBSD: fabs.S,v 1.10 2013/07/16 22:12:20 matt Exp $)
+RCSID($NetBSD: fabs.S,v 1.11 2013/07/17 06:43:32 matt Exp $)
 
 ENTRY(fabs)
-#if defined(__SVR4_ABI__)  defined(__HAVE_68881__)
+#if defined(__SVR4_ABI__)  defined(__HAVE_FPU__)
 	bclr	#31,4(%sp)
 	fmoved	4(%sp),%fp0
 #else

Index: src/lib/libc/arch/m68k/gen/negdf2.S
diff -u src/lib/libc/arch/m68k/gen/negdf2.S:1.9 src/lib/libc/arch/m68k/gen/negdf2.S:1.10
--- src/lib/libc/arch/m68k/gen/negdf2.S:1.9	Tue Jul 16 22:12:20 2013
+++ src/lib/libc/arch/m68k/gen/negdf2.S	Wed Jul 17 06:43:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: negdf2.S,v 1.9 2013/07/16 22:12:20 matt Exp $	*/
+/*	$NetBSD: negdf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,13 +39,13 @@
 #if 0
 	RCSID(from: @(#)negdf2.s	5.1 (Berkeley) 6/7/90)
 #else
-	RCSID($NetBSD: negdf2.S,v 1.9 2013/07/16 22:12:20 matt Exp $)
+	RCSID($NetBSD: negdf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $)
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 /* -double */
 ENTRY(__negdf2)
-#if defined(__SVR4_ABI__)  defined(__HAVE_68881__)
+#if defined(__SVR4_ABI__)  defined(__HAVE_FPU__)
 	fnegd	4(%sp),%fp0
 #else
 	movel	4(%sp),%d0
Index: src/lib/libc/arch/m68k/gen/negsf2.S
diff -u src/lib/libc/arch/m68k/gen/negsf2.S:1.9 src/lib/libc/arch/m68k/gen/negsf2.S:1.10
--- src/lib/libc/arch/m68k/gen/negsf2.S:1.9	Tue Jul 16 22:12:20 2013
+++ src/lib/libc/arch/m68k/gen/negsf2.S	Wed Jul 17 06:43:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: negsf2.S,v 1.9 2013/07/16 22:12:20 matt Exp $	*/
+/*	$NetBSD: negsf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,13 +39,13 @@
 #if 0
 	RCSIDfrom: @(#)negsf2.s	5.1 (Berkeley) 6/7/90)
 #else
-	RCSID($NetBSD: negsf2.S,v 1.9 2013/07/16 22:12:20 matt Exp $)
+	RCSID($NetBSD: negsf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $)
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 /* -single */
 ENTRY(__negsf2)
-#if defined(__SVR4_ABI__)  defined(__HAVE_68881__)
+#if defined(__SVR4_ABI__)  defined(__HAVE_FPU__)
 	fnegs	4(%sp),%fp0
 #else
 	movel	4(%sp),%d0

CVS commit: src/sys/net

2013-07-17 Thread Masaru OKI

Module Name:src
Committed By:   oki
Date:   Wed Jul 17 10:16:58 UTC 2013

Modified Files:
src/sys/net: if_pppoe.c

Log Message:
if received PADT, get correct sc related with session id.
RFC2516 5.5 says, no tags required in PADT packet.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/net/if_pppoe.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/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.99 src/sys/net/if_pppoe.c:1.100
--- src/sys/net/if_pppoe.c:1.99	Sat Jun 29 21:06:58 2013
+++ src/sys/net/if_pppoe.c	Wed Jul 17 10:16:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.99 2013/06/29 21:06:58 rmind Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.100 2013/07/17 10:16:58 oki Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_pppoe.c,v 1.99 2013/06/29 21:06:58 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_pppoe.c,v 1.100 2013/07/17 10:16:58 oki Exp $);
 
 #include pppoe.h
 #include opt_pppoe.h
@@ -717,6 +717,7 @@ breakbreak:;
 		sc-sc_sppp.pp_up(sc-sc_sppp);	/* notify upper layers */
 		break;
 	case PPPOE_CODE_PADT:
+		sc = pppoe_find_softc_by_session(session, m-m_pkthdr.rcvif);
 		if (sc == NULL)
 			goto done;
 		pppoe_clear_softc(sc, received PADT);

CVS commit: src/bin/dd

2013-07-17 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul 17 12:55:48 UTC 2013

Modified Files:
src/bin/dd: args.c

Log Message:
PR/48057: psi: skip and msgfmt cannot be used together. Looks like a pasto;
fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/bin/dd/args.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/dd/args.c
diff -u src/bin/dd/args.c:1.37 src/bin/dd/args.c:1.38
--- src/bin/dd/args.c:1.37	Mon Nov  7 17:24:23 2011
+++ src/bin/dd/args.c	Wed Jul 17 08:55:48 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: args.c,v 1.37 2011/11/07 22:24:23 jym Exp $	*/
+/*	$NetBSD: args.c,v 1.38 2013/07/17 12:55:48 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = @(#)args.c	8.3 (Berkeley) 4/2/94;
 #else
-__RCSID($NetBSD: args.c,v 1.37 2011/11/07 22:24:23 jym Exp $);
+__RCSID($NetBSD: args.c,v 1.38 2013/07/17 12:55:48 christos Exp $);
 #endif
 #endif /* not lint */
 
@@ -97,7 +97,7 @@ static const struct arg {
 	{ ibs,	f_ibs,		C_IBS,	 C_BS|C_IBS },
 	{ if,		f_if,		C_IF,	 C_IF },
 	{ iseek,	f_skip,		C_SKIP,	 C_SKIP },
-	{ msgfmt,	f_msgfmt,	C_SKIP,	 C_SKIP },
+	{ msgfmt,	f_msgfmt,	0,	 0 },
 	{ obs,	f_obs,		C_OBS,	 C_BS|C_OBS },
 	{ of,		f_of,		C_OF,	 C_OF },
 	{ oseek,	f_seek,		C_SEEK,	 C_SEEK },

CVS commit: src/sys/conf

2013-07-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul 17 14:05:43 UTC 2013

Modified Files:
src/sys/conf: Makefile.kern.inc

Log Message:
Use += for SYSTEM_DEP not ?=


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/conf/Makefile.kern.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.159 src/sys/conf/Makefile.kern.inc:1.160
--- src/sys/conf/Makefile.kern.inc:1.159	Sun Nov  4 11:12:31 2012
+++ src/sys/conf/Makefile.kern.inc	Wed Jul 17 14:05:43 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.159 2012/11/04 11:12:31 apb Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.160 2013/07/17 14:05:43 matt Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -219,7 +219,7 @@ ${_cfile:T:R}.o: ${_cfile}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
 SYSTEM_OBJ?=	${MD_OBJS} ${MI_OBJS} ${OBJS:O} ${SYSLIBCOMPAT} ${LIBKERN}
-SYSTEM_DEP?=	Makefile ${SYSTEM_OBJ:O} .gdbinit
+SYSTEM_DEP+=	Makefile ${SYSTEM_OBJ:O} .gdbinit
 .if defined(KERNLDSCRIPT)
 SYSTEM_DEP+=	${KERNLDSCRIPT}
 .endif

CVS commit: src/sbin/ifconfig

2013-07-17 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul 17 15:40:42 UTC 2013

Modified Files:
src/sbin/ifconfig: ifconfig.c

Log Message:
Allow -v to be used with other commands (list scan for example) as documented.


To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sbin/ifconfig/ifconfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.229 src/sbin/ifconfig/ifconfig.c:1.230
--- src/sbin/ifconfig/ifconfig.c:1.229	Thu Feb  7 08:21:34 2013
+++ src/sbin/ifconfig/ifconfig.c	Wed Jul 17 11:40:42 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ifconfig.c,v 1.229 2013/02/07 13:21:34 apb Exp $	*/
+/*	$NetBSD: ifconfig.c,v 1.230 2013/07/17 15:40:42 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 #ifndef lint
 __COPYRIGHT(@(#) Copyright (c) 1983, 1993\
  The Regents of the University of California.  All rights reserved.);
-__RCSID($NetBSD: ifconfig.c,v 1.229 2013/02/07 13:21:34 apb Exp $);
+__RCSID($NetBSD: ifconfig.c,v 1.230 2013/07/17 15:40:42 christos Exp $);
 #endif /* not lint */
 
 #include sys/param.h
@@ -621,7 +621,6 @@ main(int argc, char **argv)
 
 		case 'L':
 		case 'm':
-		case 'v':
 		case 'z':
 			if (start != opt_family_only.pb_parser)
 start = iface_opt_family_only.pif_parser;

CVS commit: src/sys/arch/x86/include

2013-07-17 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Wed Jul 17 15:26:38 UTC 2013

Modified Files:
src/sys/arch/x86/include: cacheinfo.h

Log Message:
 Add some new TLB and cache entries from document (Table 3-22 Encoding of CPUID
Leaf 2 Descriptors, Intel 64 and IA-32 Architectures Software Developer's
Manual Vol. 2A.)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/include/cacheinfo.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/x86/include/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.14 src/sys/arch/x86/include/cacheinfo.h:1.15
--- src/sys/arch/x86/include/cacheinfo.h:1.14	Wed Jul 17 15:22:43 2013
+++ src/sys/arch/x86/include/cacheinfo.h	Wed Jul 17 15:26:38 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cacheinfo.h,v 1.14 2013/07/17 15:22:43 msaitoh Exp $	*/
+/*	$NetBSD: cacheinfo.h,v 1.15 2013/07/17 15:26:38 msaitoh Exp $	*/
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -222,6 +222,7 @@ __CI_TBL(CAI_ITLB, 0x52, 0xff, 64,  
 __CI_TBL(CAI_ITLB, 0x55, 0xff, 64,4 * 1024, 2M/4M: 7 entries), \
 __CI_TBL(CAI_DTLB2,0x56,4, 16, 4 * 1024 * 1024, NULL), \
 __CI_TBL(CAI_DTLB2,0x57,4, 16,4 * 1024, NULL), \
+__CI_TBL(CAI_DTLB2,0x59, 0xff, 16,4 * 1024, NULL), \
 __CI_TBL(CAI_DTLB, 0x5a, 0xff, 64,4 * 1024, 2M/4M: 32 entries (L0)), \
 __CI_TBL(CAI_DTLB, 0x5b, 0xff, 64,4 * 1024, 4K/4M: 64 entries), \
 __CI_TBL(CAI_DTLB, 0x5c, 0xff, 64,4 * 1024, 4K/4M: 128 entries),\
@@ -235,6 +236,7 @@ __CI_TBL(CAI_ICACHE,   0x30,8,  
 __CI_TBL(CAI_DCACHE,   0x0a,2,8 * 1024, 32, NULL), \
 __CI_TBL(CAI_DCACHE,   0x0c,4,   16 * 1024, 32, NULL), \
 __CI_TBL(CAI_DCACHE,   0x0d,4,   16 * 1024, 64, NULL), \
+__CI_TBL(CAI_DCACHE,   0x0e,6,   24 * 1024, 64, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x21,8,  256 * 1024, 64, NULL), /* L2 (MLC) */ \
 __CI_TBL(CAI_L2CACHE,  0x39,4,  128 * 1024, 64, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x3a,6,  192 * 1024, 64, NULL), \
@@ -269,6 +271,7 @@ __CI_TBL(CAI_L2CACHE,  0x7b,8,  
 __CI_TBL(CAI_L2CACHE,  0x7c,8, 1 * 1024 * 1024, 64, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x7d,8, 2 * 1024 * 1024, 64, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x7f,2,  512 * 1024, 64, NULL), \
+__CI_TBL(CAI_L2CACHE,  0x80,8,  512 * 1024, 64, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x82,8,  256 * 1024, 32, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x83,8,  512 * 1024, 32, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x84,8, 1 * 1024 * 1024, 32, NULL), \

CVS commit: src/sys/arch/x86/include

2013-07-17 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Wed Jul 17 15:22:43 UTC 2013

Modified Files:
src/sys/arch/x86/include: cacheinfo.h

Log Message:
 Fix 0x0d's DCACHE entry and 0xeb's L3CACHE entry from the document
(Table 3-22 Encoding of CPUID Leaf 2 Descriptors, Intel 64 and IA-32
Architectures Software Developer's Manual Vol. 2A.)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/include/cacheinfo.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/x86/include/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.13 src/sys/arch/x86/include/cacheinfo.h:1.14
--- src/sys/arch/x86/include/cacheinfo.h:1.13	Sun Dec  4 17:00:10 2011
+++ src/sys/arch/x86/include/cacheinfo.h	Wed Jul 17 15:22:43 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cacheinfo.h,v 1.13 2011/12/04 17:00:10 chs Exp $	*/
+/*	$NetBSD: cacheinfo.h,v 1.14 2013/07/17 15:22:43 msaitoh Exp $	*/
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -234,7 +234,7 @@ __CI_TBL(CAI_ICACHE,   0x09,4,  
 __CI_TBL(CAI_ICACHE,   0x30,8,   32 * 1024, 64, NULL), \
 __CI_TBL(CAI_DCACHE,   0x0a,2,8 * 1024, 32, NULL), \
 __CI_TBL(CAI_DCACHE,   0x0c,4,   16 * 1024, 32, NULL), \
-__CI_TBL(CAI_DCACHE,   0x0d,4,   16 * 1024, 32, NULL), \
+__CI_TBL(CAI_DCACHE,   0x0d,4,   16 * 1024, 64, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x21,8,  256 * 1024, 64, NULL), /* L2 (MLC) */ \
 __CI_TBL(CAI_L2CACHE,  0x39,4,  128 * 1024, 64, NULL), \
 __CI_TBL(CAI_L2CACHE,  0x3a,6,  192 * 1024, 64, NULL), \
@@ -299,7 +299,7 @@ __CI_TBL(CAI_L3CACHE,  0xe2,   16, 2 * 1
 __CI_TBL(CAI_L3CACHE,  0xe3,   16, 4 * 1024 * 1024, 64, NULL), \
 __CI_TBL(CAI_L3CACHE,  0xe4,   16, 8 * 1024 * 1024, 64, NULL), \
 __CI_TBL(CAI_L3CACHE,  0xea,   24,12 * 1024 * 1024, 64, NULL), \
-__CI_TBL(CAI_L3CACHE,  0xeb,   24,24 * 1024 * 1024, 64, NULL), \
+__CI_TBL(CAI_L3CACHE,  0xeb,   24,18 * 1024 * 1024, 64, NULL), \
 __CI_TBL(CAI_L3CACHE,  0xec,   24,24 * 1024 * 1024, 64, NULL), \
 __CI_TBL(0,   0,0,   0,  0, NULL)  \
 }

CVS commit: src/sys/sys

2013-07-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Jul 17 15:50:59 UTC 2013

Modified Files:
src/sys/sys: queue.h

Log Message:
Include sys/null.h only on NetBSD because sys/null.h is not available
elsewhere.  This conditional makes the header portable and it can simply
be dropped verbatim into any system.

Also, move the inclusion below the comment block describing the purpose
of queue.h so that people looking at the header first see information
about the functionality instead of about a portability detail.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/sys/queue.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/queue.h
diff -u src/sys/sys/queue.h:1.54 src/sys/sys/queue.h:1.55
--- src/sys/sys/queue.h:1.54	Wed Apr 10 22:22:16 2013
+++ src/sys/sys/queue.h	Wed Jul 17 15:50:59 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: queue.h,v 1.54 2013/04/10 22:22:16 christos Exp $	*/
+/*	$NetBSD: queue.h,v 1.55 2013/07/17 15:50:59 pooka Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -34,8 +34,6 @@
 #ifndef	_SYS_QUEUE_H_
 #define	_SYS_QUEUE_H_
 
-#include sys/null.h
-
 /*
  * This file defines five types of data structures: singly-linked lists,
  * lists, simple queues, tail queues, and circular queues.
@@ -83,6 +81,17 @@
  */
 
 /*
+ * Include the definition of NULL only on NetBSD because sys/null.h
+ * is not available elsewhere.  This conditional makes the header
+ * portable and it can simply be dropped verbatim into any system.
+ * The caveat is that on other systems some other header
+ * must provide NULL before the macros can be used.
+ */
+#ifdef __NetBSD__
+#include sys/null.h
+#endif
+
+/*
  * List definitions.
  */
 #define	LIST_HEAD(name, type)		\

CVS commit: src/share/mk

2013-07-17 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Jul 17 19:24:56 UTC 2013

Modified Files:
src/share/mk: bsd.sys.mk

Log Message:
Disable -Wconversion for gcc older than 4.5


To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/share/mk/bsd.sys.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.224 src/share/mk/bsd.sys.mk:1.225
--- src/share/mk/bsd.sys.mk:1.224	Tue Jul 16 17:48:52 2013
+++ src/share/mk/bsd.sys.mk	Wed Jul 17 19:24:56 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.224 2013/07/16 17:48:52 christos Exp $
+#	$NetBSD: bsd.sys.mk,v 1.225 2013/07/17 19:24:56 martin Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -64,7 +64,7 @@ CXXFLAGS+=	${${ACTIVE_CXX} == gcc:? -W
 .if ${WARNS}  4
 CFLAGS+=	-Wold-style-definition
 .endif
-.if ${WARNS}  5
+.if ${WARNS}  5  !(defined(HAVE_GCC)  ${HAVE_GCC} = 45)
 CFLAGS+=	-Wconversion
 .endif
 CFLAGS+=	-Wsign-compare -Wformat=2

CVS commit: src/sys/dev/pci

2013-07-17 Thread Soren S. Jorvang

Module Name:src
Committed By:   soren
Date:   Wed Jul 17 19:49:11 UTC 2013

Modified Files:
src/sys/dev/pci: pcidevs pucdata.c pucvar.h

Log Message:
Extend support for Nanjing QinHeng Electronics puc(4) devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1158 -r1.1159 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pci/pucdata.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/pucvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1158 src/sys/dev/pci/pcidevs:1.1159
--- src/sys/dev/pci/pcidevs:1.1158	Thu Jun 13 06:11:34 2013
+++ src/sys/dev/pci/pcidevs	Wed Jul 17 19:49:11 2013
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1158 2013/06/13 06:11:34 matt Exp $
+$NetBSD: pcidevs,v 1.1159 2013/07/17 19:49:11 soren Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -633,6 +633,7 @@ vendor EVE		0x1adb	EVE
 vendor QUMRANET		0x1af4	Qumranet
 vendor ASMEDIA		0x1b21  ASMedia
 vendor FRESCO		0x1b73	Fresco Logic
+vendor QINHENG2		0x1c00	Nanjing QinHeng Electronics (PCIe)
 vendor SYMPHONY2	0x1c1c	Symphony Labs (2nd PCI Vendor ID)
 vendor TEKRAM2		0x1de1	Tekram Technology (2nd PCI Vendor ID)
 vendor SUNIX2		0x1fd4	SUNIX Co
@@ -4500,8 +4501,27 @@ product PROMISE PDC20619	0x6629	PDC20619
 product PROMISE PDC20277	0x7275	PDC20277 Ultra/133 IDE Controller
 
 /* Nanjing QinHeng Electronics */
-product QINHENG CH352		0x3253	CH352
-product QINHENG CH353		0x7053	CH353
+product QINHENG CH352_2S	0x3253	CH352 2S
+product QINHENG CH353_4S	0x3453	CH353 4S
+product QINHENG CH356_8S	0x3853	CH356 8S
+product QINHENG CH356_6S	0x3873	CH356 6S
+product QINHENG CH353_2S1PAR	0x5046	CH353 2S, 1P (fixed address)
+product QINHENG CH352_1S1P	0x5053	CH352 1S, 1P
+product QINHENG CH357_4S	0x5334	CH357 4S
+product QINHENG CH358_4S1P	0x5334	CH358 4S, 1P
+product QINHENG CH358_8S	0x5338	CH358 8S
+product QINHENG CH359_16S	0x5838	CH359 16S
+product QINHENG CH353_2S1P	0x7053	CH353 2S, 1P
+product QINHENG CH356_4S1P	0x7073	CH356 4S, 1P
+product QINHENG CH355_4S	0x7173	CH355 4S
+
+/* Nanjing QinHeng Electronics (PCIe) */
+product QINHENG2 CH384_4S1P	0x3450	CH384 4S, 1P
+product QINHENG2 CH384_4S	0x3470	CH384 4S
+product QINHENG2 CH382_2S1P	0x3250	CH382 2S, 1P
+product QINHENG2 CH382_2S	0x3253	CH382 2S
+product QINHENG2 CH384_8S	0x3853	CH384 8S
+product QINHENG2 CH384_28S	0x4353	CH384 28S
 
 /* QLogic products */
 product QLOGIC QLA200	0x0119	QLA200

Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.84 src/sys/dev/pci/pucdata.c:1.85
--- src/sys/dev/pci/pucdata.c:1.84	Mon Jun  3 16:21:50 2013
+++ src/sys/dev/pci/pucdata.c	Wed Jul 17 19:49:11 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pucdata.c,v 1.84 2013/06/03 16:21:50 msaitoh Exp $	*/
+/*	$NetBSD: pucdata.c,v 1.85 2013/07/17 19:49:11 soren Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Christopher G. Demetriou.  All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.84 2013/06/03 16:21:50 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.85 2013/07/17 19:49:11 soren Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1229,10 +1229,6 @@ const struct puc_device_description puc_
 		{ PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x10, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x18, COM_FREQ * 8},
-/*
- * PUC_MAX_PORTS needs to be raised in order to reach these ports
- */
-#if PUC_MAX_PORTS = 16
 		{ PUC_PORT_TYPE_COM, 0x14, 0x20, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x28, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x30, COM_FREQ * 8},
@@ -1241,7 +1237,6 @@ const struct puc_device_description puc_
 		{ PUC_PORT_TYPE_COM, 0x14, 0x48, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x50, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x58, COM_FREQ * 8},
-#endif /* PUC_MAX_PORTS = 16 */
 	},
 	},
 
@@ -1375,19 +1370,52 @@ const struct puc_device_description puc_
 	 * 2 serial port converter. Product codes from
 	 * documentation (and physical 2 port serial card)
 	 */
-	{   Nanjing QinHeng Electronics 2S,
-	{	PCI_VENDOR_QINHENG, PCI_PRODUCT_QINHENG_CH352,
+	{   Nanjing QinHeng Electronics CH352,
+	{	PCI_VENDOR_QINHENG, PCI_PRODUCT_QINHENG_CH352_2S,
+		PCI_VENDOR_QINHENG, PCI_PRODUCT_QINHENG_CH352_2S },
+	{	0x, 0x, 0x, 0x	},
+	{
+		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
+	},
+	},
+
+	{   Nanjing QinHeng Electronics CH352,
+	{	PCI_VENDOR_QINHENG, PCI_PRODUCT_QINHENG_CH352_1S1P,
+		PCI_VENDOR_QINHENG, PCI_PRODUCT_QINHENG_CH352_1S1P },
+	{	0x, 0x, 0x, 0x	},
+	{
+		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+		{ PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
+	},
+	},
+
+	{   Nanjing QinHeng Electronics CH353,
+	{	PCI_VENDOR_QINHENG, PCI_PRODUCT_QINHENG_CH353_4S,
+		PCI_VENDOR_QINHENG,

CVS commit: src/sys/dev/pci/ixgbe

2013-07-17 Thread Soren S. Jorvang

Module Name:src
Committed By:   soren
Date:   Wed Jul 17 19:52:15 UTC 2013

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_osdep.h

Log Message:
Fix ixb(4) build.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/ixgbe_osdep.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/ixgbe/ixgbe_osdep.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.1 src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.2
--- src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.1	Fri Aug 12 21:55:29 2011
+++ src/sys/dev/pci/ixgbe/ixgbe_osdep.h	Wed Jul 17 19:52:15 2013
@@ -31,7 +31,7 @@
 
 **/
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_osdep.h,v 1.9 2010/11/26 22:46:32 jfv Exp $*/
-/*$NetBSD: ixgbe_osdep.h,v 1.1 2011/08/12 21:55:29 dyoung Exp $*/
+/*$NetBSD: ixgbe_osdep.h,v 1.2 2013/07/17 19:52:15 soren Exp $*/
 
 #ifndef _IXGBE_OS_H_
 #define _IXGBE_OS_H_
@@ -44,6 +44,7 @@
 #include sys/socket.h
 #include sys/malloc.h
 #include sys/kernel.h
+#include sys/cprng.h
 #include sys/bus.h
 #include dev/pci/pcivar.h
 #include dev/pci/pcireg.h

CVS commit: src/sys/dev/ic

2013-07-17 Thread Soren S. Jorvang

Module Name:src
Committed By:   soren
Date:   Wed Jul 17 19:51:56 UTC 2013

Modified Files:
src/sys/dev/ic: comvar.h

Log Message:
Fix COM_16750 build for non-COM_REGMAP platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/comvar.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/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.74 src/sys/dev/ic/comvar.h:1.75
--- src/sys/dev/ic/comvar.h:1.74	Sat Apr 20 11:52:41 2013
+++ src/sys/dev/ic/comvar.h	Wed Jul 17 19:51:56 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: comvar.h,v 1.74 2013/04/20 11:52:41 rkujawa Exp $	*/
+/*	$NetBSD: comvar.h,v 1.75 2013/07/17 19:51:56 soren Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -92,7 +92,7 @@ int com_is_console(bus_space_tag_t, bus_
 #define	COM_REG_LSR		10
 #define	COM_REG_MSR		11
 #ifdef	COM_16750
-#define COM_REG_USR		31
+#define	COM_REG_USR		31
 #endif
 
 struct com_regs {
@@ -138,6 +138,9 @@ extern const bus_size_t com_std_map[16];
 #define	COM_REG_TCR		com_msr
 #define	COM_REG_TLR		com_scratch
 #define	COM_REG_MDR1		8
+#ifdef	COM_16750
+#define COM_REG_USR		com_usr
+#endif
 
 struct com_regs {
 	bus_space_tag_t		cr_iot;

CVS commit: src/doc

2013-07-17 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul 17 20:15:49 UTC 2013

Modified Files:
src/doc: 3RDPARTY

Log Message:
sync with latest tzcode


To generate a diff of this commit:
cvs rdiff -u -r1.1042 -r1.1043 src/doc/3RDPARTY

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.1042 src/doc/3RDPARTY:1.1043
--- src/doc/3RDPARTY:1.1042	Fri Jul 12 12:52:56 2013
+++ src/doc/3RDPARTY	Wed Jul 17 16:15:49 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1042 2013/07/12 16:52:56 roy Exp $
+#	$NetBSD: 3RDPARTY,v 1.1043 2013/07/17 20:15:49 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1250,7 +1250,7 @@ Notes:
 Added changes from a5 - a12 manually.
 
 Package:	tz
-Version:	tzcode2013c / tzdata2013d
+Version:	tzcode2013d / tzdata2013d
 Current Vers:	tzcode2013d / tzdata2013d
 Maintainer:	Paul Eggert egg...@cs.ucla.edu
 Archive Site:	ftp://ftp.iana.org/tz/releases/

CVS commit: src/doc

2013-07-17 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul 17 20:16:50 UTC 2013

Modified Files:
src/doc: CHANGES

Log Message:
new tzcode


To generate a diff of this commit:
cvs rdiff -u -r1.1831 -r1.1832 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1831 src/doc/CHANGES:1.1832
--- src/doc/CHANGES:1.1831	Fri Jul 12 12:52:56 2013
+++ src/doc/CHANGES	Wed Jul 17 16:16:50 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1831 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1832 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -254,4 +254,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	dhcpcd(8): Import dhcpcd-6.0.0 [roy 20130621]
 	zoneinfo: Import tzdata2013d. [apb 20130707]
 	openresolv(8): Import openresolv-3.5.6 [roy 20130712]
+	libc: Update to tzcode2013d. [christo 20130717]

CVS commit: src/sys/kern

2013-07-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Jul 17 21:20:53 UTC 2013

Modified Files:
src/sys/kern: vnode_if.sh

Log Message:
Additionally translate daddr_t to int64_t in the rumpvnode interface.
The type daddr_t is not available for all systems (e.g. Linux systems with
musl libc), and exposing it will just cause an unnecessary compilation
failure even if the type is not used.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/kern/vnode_if.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/vnode_if.sh
diff -u src/sys/kern/vnode_if.sh:1.58 src/sys/kern/vnode_if.sh:1.59
--- src/sys/kern/vnode_if.sh:1.58	Mon Jul 11 08:23:00 2011
+++ src/sys/kern/vnode_if.sh	Wed Jul 17 21:20:53 2013
@@ -29,7 +29,7 @@ copyright=\
  * SUCH DAMAGE.
  */
 
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.58 2011/07/11 08:23:00 hannken Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.59 2013/07/17 21:20:53 pooka Exp $'
 
 # Script to produce VFS front-end sugar.
 #
@@ -150,6 +150,8 @@ awk_parser='
 			at = off_t;
 		if (at == kauth_cred_t)
 			at = struct kauth_cred *
+		if (at == daddr_t)
+			at = int64_t
 	}
 	argtype[argc] = at;
 	i++;

CVS commit: src/sys

2013-07-17 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Wed Jul 17 21:21:34 UTC 2013

Modified Files:
src/sys/kern: vnode_if.c
src/sys/rump/include/rump: rumpvnode_if.h
src/sys/rump/librump/rumpvfs: rumpvnode_if.c
src/sys/sys: vnode_if.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.83 -r1.84 src/sys/sys/vnode_if.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/kern/vnode_if.c
diff -u src/sys/kern/vnode_if.c:1.88 src/sys/kern/vnode_if.c:1.89
--- src/sys/kern/vnode_if.c:1.88	Mon Jul 11 08:27:38 2011
+++ src/sys/kern/vnode_if.c	Wed Jul 17 21:21:34 2013
@@ -1,13 +1,13 @@
-/*	$NetBSD: vnode_if.c,v 1.88 2011/07/11 08:27:38 hannken Exp $	*/
+/*	$NetBSD: vnode_if.c,v 1.89 2013/07/17 21:21:34 pooka Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	NetBSD: vnode_if.src,v 1.62 2011/07/11 08:23:00 hannken Exp
+ *	NetBSD: vnode_if.src,v 1.63 2011/10/14 09:23:31 hannken Exp
  * by the script:
- *	NetBSD: vnode_if.sh,v 1.58 2011/07/11 08:23:00 hannken Exp
+ *	NetBSD: vnode_if.sh,v 1.59 2013/07/17 21:20:53 pooka Exp
  */
 
 /*
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vnode_if.c,v 1.88 2011/07/11 08:27:38 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vnode_if.c,v 1.89 2013/07/17 21:21:34 pooka Exp $);
 
 #include sys/param.h
 #include sys/mount.h

Index: src/sys/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.12 src/sys/rump/include/rump/rumpvnode_if.h:1.13
--- src/sys/rump/include/rump/rumpvnode_if.h:1.12	Mon Aug  8 12:17:28 2011
+++ src/sys/rump/include/rump/rumpvnode_if.h	Wed Jul 17 21:21:34 2013
@@ -1,13 +1,13 @@
-/*	$NetBSD: rumpvnode_if.h,v 1.12 2011/08/08 12:17:28 manu Exp $	*/
+/*	$NetBSD: rumpvnode_if.h,v 1.13 2013/07/17 21:21:34 pooka Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	NetBSD: vnode_if.src,v 1.62 2011/07/11 08:23:00 hannken Exp
+ *	NetBSD: vnode_if.src,v 1.63 2011/10/14 09:23:31 hannken Exp
  * by the script:
- *	NetBSD: vnode_if.sh,v 1.58 2011/07/11 08:23:00 hannken Exp
+ *	NetBSD: vnode_if.sh,v 1.59 2013/07/17 21:20:53 pooka Exp
  */
 
 /*
@@ -89,7 +89,7 @@ int RUMP_VOP_INACTIVE(struct vnode *, bo
 int RUMP_VOP_RECLAIM(struct vnode *);
 int RUMP_VOP_LOCK(struct vnode *, int);
 int RUMP_VOP_UNLOCK(struct vnode *);
-int RUMP_VOP_BMAP(struct vnode *, daddr_t, struct vnode **, daddr_t *, int *);
+int RUMP_VOP_BMAP(struct vnode *, int64_t, struct vnode **, int64_t *, int *);
 int RUMP_VOP_STRATEGY(struct vnode *, struct buf *);
 int RUMP_VOP_PRINT(struct vnode *);
 int RUMP_VOP_ISLOCKED(struct vnode *);

Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.11 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.12
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.11	Mon Aug  8 12:17:28 2011
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c	Wed Jul 17 21:21:34 2013
@@ -1,13 +1,13 @@
-/*	$NetBSD: rumpvnode_if.c,v 1.11 2011/08/08 12:17:28 manu Exp $	*/
+/*	$NetBSD: rumpvnode_if.c,v 1.12 2013/07/17 21:21:34 pooka Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	NetBSD: vnode_if.src,v 1.62 2011/07/11 08:23:00 hannken Exp
+ *	NetBSD: vnode_if.src,v 1.63 2011/10/14 09:23:31 hannken Exp
  * by the script:
- *	NetBSD: vnode_if.sh,v 1.58 2011/07/11 08:23:00 hannken Exp
+ *	NetBSD: vnode_if.sh,v 1.59 2013/07/17 21:20:53 pooka Exp
  */
 
 /*
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpvnode_if.c,v 1.11 2011/08/08 12:17:28 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpvnode_if.c,v 1.12 2013/07/17 21:21:34 pooka Exp $);
 
 #include sys/param.h
 #include sys/mount.h
@@ -509,9 +509,9 @@ RUMP_VOP_UNLOCK(struct vnode *vp)
 
 int
 RUMP_VOP_BMAP(struct vnode *vp,
-daddr_t bn,
+int64_t bn,
 struct vnode **vpp,
-daddr_t *bnp,
+int64_t *bnp,
 int *runp)
 {
 	int error;

Index: src/sys/sys/vnode_if.h
diff -u src/sys/sys/vnode_if.h:1.83 src/sys/sys/vnode_if.h:1.84
--- src/sys/sys/vnode_if.h:1.83	Mon Aug  8 12:17:27 2011
+++ src/sys/sys/vnode_if.h	Wed Jul 17 21:21:34 2013
@@ -1,13 +1,13 @@
-/*	$NetBSD: vnode_if.h,v 1.83 2011/08/08 12:17:27 manu Exp $	*/
+/*	$NetBSD: vnode_if.h,v 1.84 2013/07/17 21:21:34 pooka Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	NetBSD:

CVS commit: src/sys

2013-07-17 Thread Soren S. Jorvang

Module Name:src
Committed By:   soren
Date:   Wed Jul 17 21:26:29 UTC 2013

Modified Files:
src/sys/arch/amd64/conf: files.amd64
src/sys/arch/i386/conf: files.i386
src/sys/arch/x86/conf: files.x86
src/sys/dev/pci: eso.c sv.c

Log Message:
A few isa files are so tightly integrated into the x86 platform code
as to not really be part of the optional isa bus autoconf machinery.

Allows configuring a kernel like so:

include arch/amd64/conf/GENERIC
no isa


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.370 -r1.371 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/sv.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/amd64/conf/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.79 src/sys/arch/amd64/conf/files.amd64:1.80
--- src/sys/arch/amd64/conf/files.amd64:1.79	Sat Oct 13 19:42:02 2012
+++ src/sys/arch/amd64/conf/files.amd64	Wed Jul 17 21:26:28 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amd64,v 1.79 2012/10/13 19:42:02 alnsn Exp $
+#	$NetBSD: files.amd64,v 1.80 2013/07/17 21:26:28 soren Exp $
 #
 # new style config file for amd64 architecture
 #
@@ -107,13 +107,6 @@ include arch/x86/pci/files.pci
 
 include	dev/isa/files.isa
 
-# PC clock
-file 	arch/x86/isa/clock.c 			isa
-file	arch/x86/isa/rtc.c			isa
-
-# TSC timecounter support
-file	arch/x86/x86/tsc.c
-
 # attribute used to represent the keyboard controller
 # XXX should be a real device
 define	pckbcport { [irq = -1], [port = -1] }

Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.370 src/sys/arch/i386/conf/files.i386:1.371
--- src/sys/arch/i386/conf/files.i386:1.370	Tue Dec 25 10:51:03 2012
+++ src/sys/arch/i386/conf/files.i386	Wed Jul 17 21:26:28 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i386,v 1.370 2012/12/25 10:51:03 mbalmer Exp $
+#	$NetBSD: files.i386,v 1.371 2013/07/17 21:26:28 soren Exp $
 #
 # new style config file for i386 architecture
 #
@@ -245,18 +245,11 @@ file	arch/i386/pci/p64h2apic.c	p64h2apic
 
 include	dev/isa/files.isa
 
-# PC clock
-file	arch/x86/isa/clock.c		isa
-file	arch/x86/isa/rtc.c		isa
-
 # Protech PS3100 cash drawer
 device	ptcd: gpiobus
 attach	ptcd at isa
 file	dev/isa/ptcd.c			ptcd
 
-# TSC support
-file	arch/x86/x86/tsc.c
-
 # Numeric Processing Extension; Math Co-processor
 device	npx
 file	arch/i386/isa/npx.c		npx needs-flag

Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.79 src/sys/arch/x86/conf/files.x86:1.80
--- src/sys/arch/x86/conf/files.x86:1.79	Wed Aug 29 17:13:21 2012
+++ src/sys/arch/x86/conf/files.x86	Wed Jul 17 21:26:29 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: files.x86,v 1.79 2012/08/29 17:13:21 drochner Exp $
+#	$NetBSD: files.x86,v 1.80 2013/07/17 21:26:29 soren Exp $
 
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -89,6 +89,7 @@ file 	arch/x86/x86/pmap_tlb.c
 file	arch/x86/x86/procfs_machdep.c	procfs
 file	arch/x86/x86/sys_machdep.c
 file	arch/x86/x86/syscall.c
+file	arch/x86/x86/tsc.c
 file	arch/x86/x86/vm_machdep.c
 file	arch/x86/x86/x86_autoconf.c
 file	arch/x86/x86/x86_userconf.c		userconf
@@ -118,7 +119,11 @@ file	arch/x86/acpi/acpi_pdc.c	acpi
 file	arch/x86/acpi/acpi_wakeup.c	acpi
 file	arch/x86/acpi/acpi_machdep.c	acpi
 
-file	arch/x86/isa/isa_machdep.c	isa
+file	arch/x86/isa/isa_machdep.c
+
+# PC clock
+file 	arch/x86/isa/clock.c
+file	arch/x86/isa/rtc.c
 
 # Stubs for x86 routines not included in the system
 file	arch/x86/x86/x86_stub.c

Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.62 src/sys/dev/pci/eso.c:1.63
--- src/sys/dev/pci/eso.c:1.62	Sat Oct 27 17:18:31 2012
+++ src/sys/dev/pci/eso.c	Wed Jul 17 21:26:29 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: eso.c,v 1.62 2012/10/27 17:18:31 chs Exp $	*/
+/*	$NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: eso.c,v 1.62 2012/10/27 17:18:31 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $);
 
 #include mpu.h
 
@@ -96,11 +96,8 @@ __KERNEL_RCSID(0, $NetBSD: eso.c,v 1.62
  * XXX engine by allocating through the ISA DMA tag.
  */
 #if defined(amd64) || defined(i386)
-#include isa.h
-#if NISA  0
 #include dev/isa/isavar.h
 #endif
-#endif
 
 #if defined(AUDIO_DEBUG) || defined(DEBUG)
 #define DPRINTF(x) printf x

Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.47 src/sys/dev/pci/sv.c:1.48
--- src/sys/dev/pci/sv.c:1.47	Sat Oct 27 17:18:35 2012
+++ src/sys/dev/pci/sv.c	Wed Jul 17 21:26:29 2013
@@ -1,4 +1,4 @@
-/*  $NetBSD: sv.c,v 1.47 2012/10/27 17:18:35 chs Exp $ */
+/*  $NetBSD:

CVS commit: src/lib/libc/compat/arch/m68k/gen

2013-07-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul 17 21:29:01 UTC 2013

Modified Files:
src/lib/libc/compat/arch/m68k/gen: compat_setjmp.S compat_sigsetjmp.S

Log Message:
Missed these.  Convert to motorola format.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S \
src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.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/compat/arch/m68k/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.1 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.2
--- src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.1	Thu Mar  9 16:20:55 2006
+++ src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S	Wed Jul 17 21:29:01 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_setjmp.S,v 1.1 2006/03/09 16:20:55 christos Exp $	*/
+/*	$NetBSD: compat_setjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
 #if 0
 	RCSID(from: @(#)setjmp.s	5.1 (Berkeley) 5/12/90)
 #else
-	RCSID($NetBSD: compat_setjmp.S,v 1.1 2006/03/09 16:20:55 christos Exp $)
+	RCSID($NetBSD: compat_setjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $)
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -55,41 +55,43 @@
  */
 
 ENTRY(setjmp)
-	lea	%sp@(-12),%sp	/* space for sigstack args/rvals */
-	clrl	%sp@		/* don't change it... */
-	movl	%sp,%sp@(4)	/* ...but return the current val */
+	lea	-12(%sp),%sp	/* space for sigstack args/rvals */
+	clrl	(%sp)		/* don't change it... */
+	movl	%sp,4(%sp)	/* ...but return the current val */
 	jbsr	PIC_PLT(_C_LABEL(__sigaltstack14))
 /* note: flags returned in sp@(8) */
-	clrl	%sp@		/* don't change mask, just return */
+	clrl	(%sp)		/* don't change mask, just return */
 	jbsr	PIC_PLT(_C_LABEL(sigblock)) /*  old value */
-	movl	%sp@(8),%d1	/* old flags value */
+	movl	8(%sp),%d1	/* old flags value */
 	andl	#1,%d1		/* extract onstack flag */
-	lea	%sp@(12),%sp
-	movl	%sp@(4),%a0	/* save area pointer */
-	movl	%d1,%a0@+	/* save old onstack value */
-	movl	%d0,%a0@+	/* save old signal mask */
-	lea	%sp@(4),%a1	/* adjust saved SP since we won't rts */
-	movl	%a1,%a0@+	/* save old SP */
-	movl	%a6,%a0@+	/* save old FP */
-	clrl	%a0@+		/* no AP */
-	movl	%sp@,%a0@+	/* save old PC */
-	clrl	%a0@+		/* clean PS */
-	moveml	#0x3CFC,%a0@	/* save remaining non-scratch regs */
+	lea	12(%sp),%sp
+	movl	4(%sp),%a0	/* save area pointer */
+	movl	%d1,(%a0)+	/* save old onstack value */
+	movl	%d0,(%a0)+	/* save old signal mask */
+	lea	4(%sp),%a1	/* adjust saved SP since we won't rts */
+	movl	%a1,(%a0)+	/* save old SP */
+	movl	%a6,(%a0)+	/* save old FP */
+	clrl	(%a0)+		/* no AP */
+	movl	(%sp),(%a0)+	/* save old PC */
+	clrl	(%a0)+		/* clean PS */
+	moveml	#0x3CFC,(%a0)	/* save remaining non-scratch regs */
 	clrl	%d0		/* return 0 */
 	rts
+END(setjmp)
 
 ENTRY(longjmp)
-	movl	%sp@(4),%a0	/* save area pointer */
-	tstl	%a0@(8)		/* ensure non-zero SP */
+	movl	4(%sp),%a0	/* save area pointer */
+	tstl	8(%a0)		/* ensure non-zero SP */
 	jeq	botch		/* oops! */
-	movl	%sp@(8),%d0	/* grab return value */
+	movl	8(%sp),%d0	/* grab return value */
 	jne	ok		/* non-zero ok */
 	moveq	#1,%d0		/* else make non-zero */
 ok:
-	moveml	%a0@(28),#0x3CFC /* restore non-scratch regs */
-	movl	%a0,%sp@-	 /* let sigreturn */
+	moveml	28(%a0),#0x3CFC /* restore non-scratch regs */
+	movl	%a0,-(%sp)	 /* let sigreturn */
 	jbsr	PIC_PLT(_C_LABEL(sigreturn)) /*  finish for us */
 
 botch:
 	jbsr	PIC_PLT(_C_LABEL(longjmperror))
 	stop	#0
+END(longjmp)
Index: src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S
diff -u src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S:1.1 src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S:1.2
--- src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S:1.1	Thu Mar  9 16:20:55 2006
+++ src/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S	Wed Jul 17 21:29:01 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.1 2006/03/09 16:20:55 christos Exp $	*/
+/*	$NetBSD: compat_sigsetjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
 #if 0
 	RCSID(from: @(#)_setjmp.s	5.1 (Berkeley) 5/12/90)
 #else
-	RCSID($NetBSD: compat_sigsetjmp.S,v 1.1 2006/03/09 16:20:55 christos Exp $)
+	RCSID($NetBSD: compat_sigsetjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $)
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -58,20 +58,22 @@
 #include m68k/setjmp.h
 
 ENTRY(sigsetjmp)
-	movl	%sp@(8),%d1	/* grab the mask */
-movl	%sp@(4),%a0	/* grab the area pointer */
-	movl	%d1,%a0@(_JBLEN * 4 )	/* save at end of area */
+	movl	8(%sp),%d1	/* grab the mask */
+	movl	4(%sp),%a0	/* grab the area pointer */
+	movl	%d1,(_JBLEN * 4)(%a0)	/* save at end of area */
 	tstl	%d1
 	bne	dosig
 	jra	PIC_PLT(_C_LABEL(_setjmp))
 dosig:
 	jra

CVS import: src/external/bsd/wpa/dist

2013-07-17 Thread Adam Ciarcinski

Module Name:src
Committed By:   adam
Date:   Wed Jul 17 21:35:52 UTC 2013

Update of /cvsroot/src/external/bsd/wpa/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24233

Log Message:
Import wpa_supplicant and hostapd

Status:

Vendor Tag: MALINEN
Release Tags:   v1_1

U src/external/bsd/wpa/dist/COPYING
U src/external/bsd/wpa/dist/README
U src/external/bsd/wpa/dist/hostapd/Android.mk
U src/external/bsd/wpa/dist/hostapd/ChangeLog
U src/external/bsd/wpa/dist/hostapd/config_file.c
U src/external/bsd/wpa/dist/hostapd/config_file.h
U src/external/bsd/wpa/dist/hostapd/ctrl_iface.c
U src/external/bsd/wpa/dist/hostapd/ctrl_iface.h
U src/external/bsd/wpa/dist/hostapd/defconfig
U src/external/bsd/wpa/dist/hostapd/dump_state.c
U src/external/bsd/wpa/dist/hostapd/dump_state.h
U src/external/bsd/wpa/dist/hostapd/eap_register.c
U src/external/bsd/wpa/dist/hostapd/eap_register.h
U src/external/bsd/wpa/dist/hostapd/eap_testing.txt
U src/external/bsd/wpa/dist/hostapd/hlr_auc_gw.c
U src/external/bsd/wpa/dist/hostapd/hlr_auc_gw.milenage_db
U src/external/bsd/wpa/dist/hostapd/hostapd.8
U src/external/bsd/wpa/dist/hostapd/hostapd.accept
U src/external/bsd/wpa/dist/hostapd/hostapd.conf
U src/external/bsd/wpa/dist/hostapd/hostapd.deny
U src/external/bsd/wpa/dist/hostapd/hostapd.eap_user
U src/external/bsd/wpa/dist/hostapd/hostapd.radius_clients
U src/external/bsd/wpa/dist/hostapd/hostapd.sim_db
U src/external/bsd/wpa/dist/hostapd/hostapd.vlan
U src/external/bsd/wpa/dist/hostapd/hostapd.wpa_psk
U src/external/bsd/wpa/dist/hostapd/hostapd_cli.1
U src/external/bsd/wpa/dist/hostapd/hostapd_cli.c
U src/external/bsd/wpa/dist/hostapd/main.c
U src/external/bsd/wpa/dist/hostapd/Makefile
U src/external/bsd/wpa/dist/hostapd/nt_password_hash.c
U src/external/bsd/wpa/dist/hostapd/README
U src/external/bsd/wpa/dist/hostapd/README-WPS
U src/external/bsd/wpa/dist/hostapd/wired.conf
U src/external/bsd/wpa/dist/hostapd/logwatch/hostapd
U src/external/bsd/wpa/dist/hostapd/logwatch/hostapd.conf
U src/external/bsd/wpa/dist/hostapd/logwatch/README
U src/external/bsd/wpa/dist/patches/openssl-0.9.8-tls-extensions.patch
U src/external/bsd/wpa/dist/patches/openssl-0.9.8d-tls-extensions.patch
U src/external/bsd/wpa/dist/patches/openssl-0.9.8e-tls-extensions.patch
U src/external/bsd/wpa/dist/patches/openssl-0.9.8g-tls-extensions.patch
U src/external/bsd/wpa/dist/patches/openssl-0.9.8h-tls-extensions.patch
U src/external/bsd/wpa/dist/patches/openssl-0.9.8i-tls-extensions.patch
U src/external/bsd/wpa/dist/patches/openssl-0.9.9-session-ticket.patch
U src/external/bsd/wpa/dist/src/lib.rules
U src/external/bsd/wpa/dist/src/Makefile
U src/external/bsd/wpa/dist/src/ap/accounting.c
U src/external/bsd/wpa/dist/src/ap/accounting.h
U src/external/bsd/wpa/dist/src/ap/ap_config.c
U src/external/bsd/wpa/dist/src/ap/ap_config.h
U src/external/bsd/wpa/dist/src/ap/ap_drv_ops.c
U src/external/bsd/wpa/dist/src/ap/ap_drv_ops.h
U src/external/bsd/wpa/dist/src/ap/ap_list.c
U src/external/bsd/wpa/dist/src/ap/ap_list.h
U src/external/bsd/wpa/dist/src/ap/ap_mlme.c
U src/external/bsd/wpa/dist/src/ap/ap_mlme.h
U src/external/bsd/wpa/dist/src/ap/authsrv.c
U src/external/bsd/wpa/dist/src/ap/authsrv.h
U src/external/bsd/wpa/dist/src/ap/beacon.c
U src/external/bsd/wpa/dist/src/ap/beacon.h
U src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.c
U src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.h
U src/external/bsd/wpa/dist/src/ap/drv_callbacks.c
U src/external/bsd/wpa/dist/src/ap/hostapd.c
U src/external/bsd/wpa/dist/src/ap/hostapd.h
U src/external/bsd/wpa/dist/src/ap/hw_features.c
U src/external/bsd/wpa/dist/src/ap/hw_features.h
U src/external/bsd/wpa/dist/src/ap/iapp.c
U src/external/bsd/wpa/dist/src/ap/iapp.h
U src/external/bsd/wpa/dist/src/ap/ieee802_11.c
U src/external/bsd/wpa/dist/src/ap/ieee802_11.h
U src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.c
U src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.h
U src/external/bsd/wpa/dist/src/ap/ieee802_11_ht.c
U src/external/bsd/wpa/dist/src/ap/ieee802_11_shared.c
U src/external/bsd/wpa/dist/src/ap/ieee802_1x.c
U src/external/bsd/wpa/dist/src/ap/ieee802_1x.h
U src/external/bsd/wpa/dist/src/ap/Makefile
U src/external/bsd/wpa/dist/src/ap/p2p_hostapd.c
U src/external/bsd/wpa/dist/src/ap/p2p_hostapd.h
U src/external/bsd/wpa/dist/src/ap/peerkey_auth.c
U src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.c
U src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.h
U src/external/bsd/wpa/dist/src/ap/preauth_auth.c
U src/external/bsd/wpa/dist/src/ap/preauth_auth.h
U src/external/bsd/wpa/dist/src/ap/sta_info.c
U src/external/bsd/wpa/dist/src/ap/sta_info.h
U src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.c
U src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.h
U src/external/bsd/wpa/dist/src/ap/utils.c
U src/external/bsd/wpa/dist/src/ap/vlan_init.c
U src/external/bsd/wpa/dist/src/ap/vlan_init.h
U src/external/bsd/wpa/dist/src/ap/wmm.c
U src/external/bsd/wpa/dist/src/ap/wmm.h
C

CVS commit: src/external/bsd/wpa/dist/src

2013-07-17 Thread Adam Ciarcinski

Module Name:src
Committed By:   adam
Date:   Wed Jul 17 21:47:50 UTC 2013

Modified Files:
src/external/bsd/wpa/dist/src/ap: wpa_auth.c
src/external/bsd/wpa/dist/src/eap_server: eap_server_tls_common.c

Log Message:
merge v1.1


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/ap/wpa_auth.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.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/wpa/dist/src/ap/wpa_auth.c
diff -u src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.4 src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.5
--- src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.4	Mon Oct  8 00:03:20 2012
+++ src/external/bsd/wpa/dist/src/ap/wpa_auth.c	Wed Jul 17 21:47:50 2013
@@ -2334,6 +2334,9 @@ static void wpa_group_gtk_init(struct wp
 
 static int wpa_group_update_sta(struct wpa_state_machine *sm, void *ctx)
 {
+	if (ctx != NULL  ctx != sm-group)
+		return 0;
+
 	if (sm-wpa_ptk_state != WPA_PTK_PTKINITDONE) {
 		wpa_auth_logger(sm-wpa_auth, sm-addr, LOGGER_DEBUG,
 Not in PTKINITDONE; skip Group Key update);
@@ -2388,7 +2391,7 @@ static void wpa_group_setkeys(struct wpa
 			   group-GKeyDoneStations);
 		group-GKeyDoneStations = 0;
 	}
-	wpa_auth_for_each_sta(wpa_auth, wpa_group_update_sta, NULL);
+	wpa_auth_for_each_sta(wpa_auth, wpa_group_update_sta, group);
 	wpa_printf(MSG_DEBUG, wpa_group_setkeys: GKeyDoneStations=%d,
 		   group-GKeyDoneStations);
 }

Index: src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c
diff -u src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c:1.2 src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c:1.3
--- src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c:1.2	Mon Oct  8 14:03:09 2012
+++ src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c	Wed Jul 17 21:47:50 2013
@@ -230,6 +230,14 @@ static int eap_server_tls_process_fragme
 			return -1;
 		}
 
+		if (len  message_length) {
+			wpa_printf(MSG_INFO, SSL: Too much data (%d bytes) in 
+   first fragment of frame (TLS Message 
+   Length %d bytes),
+   (int) len, (int) message_length);
+			return -1;
+		}
+
 		data-tls_in = wpabuf_alloc(message_length);
 		if (data-tls_in == NULL) {
 			wpa_printf(MSG_DEBUG, SSL: No memory for message);

CVS commit: src/doc

2013-07-17 Thread Adam Ciarcinski

Module Name:src
Committed By:   adam
Date:   Wed Jul 17 21:58:14 UTC 2013

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Import wpa_supplicant and hostapd 1.1


To generate a diff of this commit:
cvs rdiff -u -r1.1043 -r1.1044 src/doc/3RDPARTY
cvs rdiff -u -r1.1832 -r1.1833 src/doc/CHANGES

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.1043 src/doc/3RDPARTY:1.1044
--- src/doc/3RDPARTY:1.1043	Wed Jul 17 20:15:49 2013
+++ src/doc/3RDPARTY	Wed Jul 17 21:58:14 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1043 2013/07/17 20:15:49 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1044 2013/07/17 21:58:14 adam Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1269,8 +1269,8 @@ upstream but there is too much inertia t
 files.
 
 Package:	wpa_supplicant/hostapd
-Version:	1.0
-Current Vers:	1.0
+Version:	1.1
+Current Vers:	2.0
 Maintainer:	Jouni Malinen jkmal...@cc.hut.fi
 Archive Site:	http://hostap.epitest.fi/releases/
 Home Page:	http://hostap.epitest.fi/wpa_supplicant/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1832 src/doc/CHANGES:1.1833
--- src/doc/CHANGES:1.1832	Wed Jul 17 20:16:50 2013
+++ src/doc/CHANGES	Wed Jul 17 21:58:14 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1832 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1833 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -255,4 +255,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	zoneinfo: Import tzdata2013d. [apb 20130707]
 	openresolv(8): Import openresolv-3.5.6 [roy 20130712]
 	libc: Update to tzcode2013d. [christo 20130717]
+	wpa:	Import wpa_supplicant and hostapd 1.1 [adam 20130717]

CVS commit: src

2013-07-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul 17 22:36:26 UTC 2013

Modified Files:
src/share/man/man9: kcpuset.9
src/sys/kern: subr_kcpuset.c
src/sys/sys: kcpuset.h

Log Message:
Some constification.
Add kcpuset_clone, kcpuset_insersection, kcpuset_remove,
kcpuset_ffs, kcpuset_ffs_intersecting,
kcpuset_atomicly_merge, kcpuset_atomicly_intersect, kcpuset_atomicly_remove


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/kcpuset.9
cvs rdiff -u -r1.8 -r1.9 src/sys/kern/subr_kcpuset.c
cvs rdiff -u -r1.8 -r1.9 src/sys/sys/kcpuset.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/kcpuset.9
diff -u src/share/man/man9/kcpuset.9:1.5 src/share/man/man9/kcpuset.9:1.6
--- src/share/man/man9/kcpuset.9:1.5	Sun Jan 27 15:21:38 2013
+++ src/share/man/man9/kcpuset.9	Wed Jul 17 22:36:26 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: kcpuset.9,v 1.5 2013/01/27 15:21:38 pgoyette Exp $ */
+.\ $NetBSD: kcpuset.9,v 1.6 2013/07/17 22:36:26 matt Exp $ */
 .\
 .\ Copyright (c) 2011 Jukka Ruohonen jruohonen.iki.fi
 .\ All rights reserved.
@@ -32,6 +32,7 @@
 .Nm kcpuset ,
 .Nm kcpuset_create ,
 .Nm kcpuset_destroy ,
+.Nm kcpuset_clone ,
 .Nm kcpuset_copy ,
 .Nm kcpuset_use ,
 .Nm kcpuset_unuse ,
@@ -45,10 +46,17 @@
 .Nm kcpuset_isotherset ,
 .Nm kcpuset_iszero ,
 .Nm kcpuset_match ,
+.Nm kcpuset_intersect ,
 .Nm kcpuset_merge ,
+.Nm kcpuset_remove ,
+.Nm kcpuset_ffs ,
+.Nm kcpuset_ffs_intersecting ,
 .Nm kcpuset_countset ,
 .Nm kcpuset_atomic_set ,
-.Nm kcpuset_atomic_clear
+.Nm kcpuset_atomic_clear ,
+.Nm kcpuset_atomicly_intersect ,
+.Nm kcpuset_atomicly_merge ,
+.Nm kcpuset_atomicly_remove ,
 .Nm kcpuset_export_32
 .Nd dynamic kernel CPU sets
 .Sh SYNOPSIS
@@ -58,7 +66,9 @@
 .Ft void
 .Fn kcpuset_destroy kcpuset_t *kcp
 .Ft void
-.Fn kcpuset_copy kcpuset_t *dkcp kcpuset_t *skcp
+.Fn kcpuset_clone kcpuset_t **retkcp const kcpuset_t *skcp
+.Ft void
+.Fn kcpuset_copy kcpuset_t *dkcp const kcpuset_t *skcp
 .Ft void
 .Fn kcpuset_use kcpuset_t *kcp
 .Ft void
@@ -76,22 +86,38 @@
 .Ft void
 .Fn kcpuset_clear kcpuset_t *kcp cpuid_t cpu
 .Ft bool
-.Fn kcpuset_isset kcpuset_t * kcp cpuid_t cpu
+.Fn kcpuset_isset const kcpuset_t * kcp cpuid_t cpu
+.Ft bool
+.Fn kcpuset_isotherset const kcpuset_t * kcp cpuid_t cpu
 .Ft bool
-.Fn kcpuset_isotherset kcpuset_t * kcp cpuid_t cpu
+.Fn kcpuset_iszero const kcpuset_t *kcp
 .Ft bool
-.Fn kcpuset_iszero kcpuset_t *kcp
+.Fn kcpuset_intersecting_p const kcpuset_t *kcp1 const kcpuset_t *kcp2
 .Ft bool
 .Fn kcpuset_match const kcpuset_t *kcp1 const kcpuset_t *kcp2
 .Ft void
-.Fn kcpuset_merge kcpuset_t *kcp1 kcpuset_t *kcp2
+.Fn kcpuset_intersect kcpuset_t *kcp1 const kcpuset_t *kcp2
+.Ft void
+.Fn kcpuset_merge kcpuset_t *kcp1 const kcpuset_t *kcp2
+.Ft void
+.Fn kcpuset_remove kcpuset_t *kcp1 const kcpuset_t *kcp2
+.Ft cpuid_t
+.Fn kcpuset_ffs const kcpuset_t *kcp
+.Ft cpuid_t
+.Fn kcpuset_ffs_intersecting const kcpuset_t *kcp1 const kcpuset_t *kcp2
 .Ft int
-.Fn kcpuset_countset kcpuset_t *kcp1
+.Fn kcpuset_countset const kcpuset_t *kcp
 .Ft void
 .Fn kcpuset_atomic_set kcpuset_t *kcp cpuid_t cpu
 .Ft void
 .Fn kcpuset_atomic_clear kcpuset_t *kcp cpuid_t cpu
 .Ft void
+.Fn kcpuset_atomicly_intersect kcpuset_t *kcp1 const kcpuset_t *kcp2
+.Ft void
+.Fn kcpuset_atomicly_merge kcpuset_t *kcp1 const kcpuset_t *kcp2
+.Ft void
+.Fn kcpuset_atomicly_remove kcpuset_t *kcp1 const kcpuset_t *kcp2
+.Ft void
 .Fn kcpuset_export_u32 const kcpuset_t *kcp uint32_t *bitfield size_t len
 .Sh DESCRIPTION
 The machine-independent
@@ -127,6 +153,18 @@ set pointed by
 .Fa skcp
 to
 .Fa dkcp .
+.It Fn kcpuset_clone retkcp skcp
+Creates a dynamic
+.Tn CPU
+set and stores the result to
+.Fa retkcp
+and copies the
+.Tn CPU
+set pointed by
+.Fa skcp
+to the new
+.Tn CPU
+set.
 .It Fn kcpuset_use kcp
 Marks
 .Fa kcp
@@ -210,11 +248,42 @@ Compares the sets
 and
 .Fa kcp2 ,
 returning true if these are identical.
+.It Fn kcpuset_intersect kcp1 kcp2
+Removes any
+.Tn CPU
+not set in
+.Fa kcp2
+from the set
+.Fa kcp1 .
 .It Fn kcpuset_merge kcp1 kcp2
 Merges the set
 .Fa kcp2
 to the set
 .Fa kcp1 .
+.It Fn kcpuset_remove kcp1 kcp2
+Removes any
+.Tn CPU
+present in
+.Fa kcp2
+from the set
+.Fa kcp1 .
+.It Fn kcpuset_ffs kcp
+Returns the lowest numbered
+.Ft cpu
+present in
+.Fa kcp
+plus 1.  If 
+.Fa kcp
+is empty, a value of 0 is returned .
+.Fa kcp
+.It Fn kcpuset_ffs_intersecting kcp1 kcp2
+Returns the lowest numbered
+.Ft cpu
+present in the intersection of
+.Fa kcp1
+and
+.Fa kcp2
+plus 1.  If the intersection is empty, a value of 0 is returned .
 .It Fn kcpuset_countset kcp
 Counts how many CPUs are in the set
 .Fa kcp .
@@ -234,6 +303,30 @@ from the
 set
 .Fa kcp
 atomically.
+.It Fn kcpuset_atomicly_intersect kcp1 kcp2
+The
+.Fn kcpuset_atomicly_intersect
+function operates as
+.Fn kcpuset_intersect ,
+but the operation is performed using atomic operations;

CVS commit: src/lib/libc/time

2013-07-17 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul 17 23:09:26 UTC 2013

Modified Files:
src/lib/libc/time: localtime.c scheck.c strftime.c zdump.c

Log Message:
remove register in new code
fix backwards check for overflow


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/scheck.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/time/zdump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.74 src/lib/libc/time/localtime.c:1.75
--- src/lib/libc/time/localtime.c:1.74	Wed Jul 17 16:13:04 2013
+++ src/lib/libc/time/localtime.c	Wed Jul 17 19:09:26 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: localtime.c,v 1.74 2013/07/17 20:13:04 christos Exp $	*/
+/*	$NetBSD: localtime.c,v 1.75 2013/07/17 23:09:26 christos Exp $	*/
 
 /*
 ** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
 #if 0
 static char	elsieid[] = @(#)localtime.c	8.17;
 #else
-__RCSID($NetBSD: localtime.c,v 1.74 2013/07/17 20:13:04 christos Exp $);
+__RCSID($NetBSD: localtime.c,v 1.75 2013/07/17 23:09:26 christos Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -1538,7 +1538,7 @@ offtime(const time_t *const timep, long 
 	struct tm *tmp;
 
 	if ((offset  0  offset  INT_FAST32_MAX) ||
-	(offset  0  offset  INT_FAST32_MIN)) {
+	(offset  0  offset  INT_FAST32_MIN)) {
 		errno = EOVERFLOW;
 		return NULL;
 	}
@@ -1554,7 +1554,7 @@ struct tm *
 offtime_r(const time_t *timep, long offset, struct tm *tmp)
 {
 	if ((offset  0  offset  INT_FAST32_MAX) ||
-	(offset  0  offset  INT_FAST32_MIN)) {
+	(offset  0  offset  INT_FAST32_MIN)) {
 		errno = EOVERFLOW;
 		return NULL;
 	}
@@ -2189,7 +2189,7 @@ timeoff(struct tm *const tmp, long offse
 	time_t t;
 
 	if ((offset  0  offset  INT_FAST32_MAX) ||
-	(offset  0  offset  INT_FAST32_MIN)) {
+	(offset  0  offset  INT_FAST32_MIN)) {
 		errno = EOVERFLOW;
 		return -1;
 	}

Index: src/lib/libc/time/scheck.c
diff -u src/lib/libc/time/scheck.c:1.10 src/lib/libc/time/scheck.c:1.11
--- src/lib/libc/time/scheck.c:1.10	Wed Jul 17 16:13:04 2013
+++ src/lib/libc/time/scheck.c	Wed Jul 17 19:09:26 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: scheck.c,v 1.10 2013/07/17 20:13:04 christos Exp $	*/
+/*	$NetBSD: scheck.c,v 1.11 2013/07/17 23:09:26 christos Exp $	*/
 
 /*
 ** This file is in the public domain, so clarified as of
@@ -15,7 +15,7 @@
 #if 0
 static char	elsieid[] = @(#)scheck.c	8.19;
 #else
-__RCSID($NetBSD: scheck.c,v 1.10 2013/07/17 20:13:04 christos Exp $);
+__RCSID($NetBSD: scheck.c,v 1.11 2013/07/17 23:09:26 christos Exp $);
 #endif
 #endif /* !defined lint */
 
@@ -26,12 +26,12 @@ __RCSID($NetBSD: scheck.c,v 1.10 2013/0
 const char *
 scheck(const char *const string, const char *const format)
 {
-	register char *		fbuf;
-	register const char *	fp;
-	register char *		tp;
-	register int		c;
-	register const char *	result;
-	char			dummy;
+	char *		fbuf;
+	const char *	fp;
+	char *		tp;
+	int		c;
+	const char *	result;
+	char		dummy;
 
 	result = ;
 	if (string == NULL || format == NULL)

Index: src/lib/libc/time/strftime.c
diff -u src/lib/libc/time/strftime.c:1.27 src/lib/libc/time/strftime.c:1.28
--- src/lib/libc/time/strftime.c:1.27	Wed Jul 17 16:13:04 2013
+++ src/lib/libc/time/strftime.c	Wed Jul 17 19:09:26 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: strftime.c,v 1.27 2013/07/17 20:13:04 christos Exp $	*/
+/*	$NetBSD: strftime.c,v 1.28 2013/07/17 23:09:26 christos Exp $	*/
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
@@ -6,7 +6,7 @@
 static char	elsieid[] = @(#)strftime.c	7.64;
 static char	elsieid[] = @(#)strftime.c	8.3;
 #else
-__RCSID($NetBSD: strftime.c,v 1.27 2013/07/17 20:13:04 christos Exp $);
+__RCSID($NetBSD: strftime.c,v 1.28 2013/07/17 23:09:26 christos Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -645,8 +645,8 @@ static char *
 _yconv(const int a, const int b, const int convert_top, const int convert_yy,
 char *pt, const char *const ptlim)
 {
-	register int	lead;
-	register int	trail;
+	int	lead;
+	int	trail;
 
 #define DIVISOR	100
 	trail = a % DIVISOR + b % DIVISOR;

Index: src/lib/libc/time/zdump.c
diff -u src/lib/libc/time/zdump.c:1.29 src/lib/libc/time/zdump.c:1.30
--- src/lib/libc/time/zdump.c:1.29	Wed Jul 17 16:13:04 2013
+++ src/lib/libc/time/zdump.c	Wed Jul 17 19:09:26 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: zdump.c,v 1.29 2013/07/17 20:13:04 christos Exp $	*/
+/*	$NetBSD: zdump.c,v 1.30 2013/07/17 23:09:26 christos Exp $	*/
 /*
 ** This file is in the public domain, so clarified as of
 ** 2009-05-17 by Arthur David Olson.
@@ -6,7 +6,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: zdump.c,v 1.29 2013/07/17 20:13:04 christos Exp $);
+__RCSID($NetBSD: zdump.c,v 1.30 2013/07/17 23:09:26 christos Exp $);
 #endif /*

CVS commit: src/sys/uvm/pmap

2013-07-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul 17 23:15:20 UTC 2013

Modified Files:
src/sys/uvm/pmap: pmap.c pmap.h pmap_tlb.c pmap_tlb.h

Log Message:
Make this kcpuset_t instead of the private __cpuset_t
Add improvements for single TLB implementation (PPC, ARM).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/uvm/pmap/pmap.c src/sys/uvm/pmap/pmap_tlb.h
cvs rdiff -u -r1.2 -r1.3 src/sys/uvm/pmap/pmap.h src/sys/uvm/pmap/pmap_tlb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.1 src/sys/uvm/pmap/pmap.c:1.2
--- src/sys/uvm/pmap/pmap.c:1.1	Wed Oct  3 00:51:45 2012
+++ src/sys/uvm/pmap/pmap.c	Wed Jul 17 23:15:20 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.1 2012/10/03 00:51:45 christos Exp $	*/
+/*	$NetBSD: pmap.c,v 1.2 2013/07/17 23:15:20 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.1 2012/10/03 00:51:45 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.2 2013/07/17 23:15:20 matt Exp $);
 
 /*
  *	Manages physical address maps.
@@ -209,10 +209,6 @@ struct pmap_kernel kernel_pmap_store = {
 		.pm_segtab = PMAP_INVALID_SEGTAB_ADDRESS,
 		.pm_minaddr = VM_MIN_KERNEL_ADDRESS,
 		.pm_maxaddr = VM_MAX_KERNEL_ADDRESS,
-#ifdef MULTIPROCESSOR
-		.pm_active = 1,
-		.pm_onproc = 1,
-#endif
 	},
 };
 
@@ -309,18 +305,22 @@ pmap_page_syncicache(struct vm_page *pg)
 #endif
 	struct vm_page_md * const mdpg = VM_PAGE_TO_MD(pg);
 	pv_entry_t pv = mdpg-mdpg_first;
-	__cpuset_t onproc = CPUSET_NULLSET;
+	kcpuset_t *onproc;
+#ifdef MULTIPROCESSOR
+	kcpuset_create(onproc, true);
+#endif
 	(void)VM_PAGEMD_PVLIST_LOCK(mdpg, false);
+
 	if (pv-pv_pmap != NULL) {
 		for (; pv != NULL; pv = pv-pv_next) {
 #ifdef MULTIPROCESSOR
-			CPUSET_MERGE(onproc, pv-pv_pmap-pm_onproc);
-			if (CPUSET_EQUAL_P(onproc, cpuset_info.cpus_running)) {
+			kcpuset_merge(onproc, pv-pv_pmap-pm_onproc);
+			if (kcpuset_match(onproc, kcpuset_running)) {
 break;
 			}
 #else
 			if (pv-pv_pmap == curpmap) {
-onproc = CPUSET_SINGLE(0);
+onproc = curcpu()-ci_data.cpu_kcpuset;
 break;
 			}
 #endif
@@ -329,6 +329,9 @@ pmap_page_syncicache(struct vm_page *pg)
 	VM_PAGEMD_PVLIST_UNLOCK(mdpg);
 	kpreempt_disable();
 	pmap_md_page_syncicache(pg, onproc);
+#ifdef MULTIPROCESSOR
+	kcpuset_destroy(onproc);
+#endif
 	kpreempt_enable();
 }
 
Index: src/sys/uvm/pmap/pmap_tlb.h
diff -u src/sys/uvm/pmap/pmap_tlb.h:1.1 src/sys/uvm/pmap/pmap_tlb.h:1.2
--- src/sys/uvm/pmap/pmap_tlb.h:1.1	Tue Jul  2 09:35:48 2013
+++ src/sys/uvm/pmap/pmap_tlb.h	Wed Jul 17 23:15:20 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_tlb.h,v 1.1 2013/07/02 09:35:48 matt Exp $	*/
+/*	$NetBSD: pmap_tlb.h,v 1.2 2013/07/17 23:15:20 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -74,6 +74,12 @@
 #ifndef	_COMMON_PMAP_TLB_H_
 #define	_COMMON_PMAP_TLB_H_
 
+#include sys/kcpuset.h
+
+#if defined(MULTIPROCESSOR)  !defined(PMAP_TLB_MAX)
+#define PMAP_TLB_MAX		MAXCPUS
+#endif
+
 /*
  * Per TLB (normally same as CPU) asid info
  */
@@ -110,10 +116,14 @@ struct pmap_tlb_info {
 #ifdef MULTIPROCESSOR
 	pmap_t ti_victim;
 	uint32_t ti_synci_page_bitmap;	/* page indices needing a syncicache */
-	__cpuset_t ti_cpu_mask;		/* bitmask of CPUs sharing this TLB */
-	enum tlb_invalidate_op ti_tlbinvop;
+#if PMAP_TLB_MAX  1
+	kcpuset_t *ti_kcpuset;		/* bitmask of CPUs sharing this TLB */
 	u_int ti_index;
+	enum tlb_invalidate_op ti_tlbinvop;
 #define tlbinfo_index(ti)	((ti)-ti_index)
+#else
+#define tlbinfo_index(ti)	(0)
+#endif
 	struct evcnt ti_evcnt_synci_asts;
 	struct evcnt ti_evcnt_synci_all;
 	struct evcnt ti_evcnt_synci_pages;

Index: src/sys/uvm/pmap/pmap.h
diff -u src/sys/uvm/pmap/pmap.h:1.2 src/sys/uvm/pmap/pmap.h:1.3
--- src/sys/uvm/pmap/pmap.h:1.2	Tue Jul  2 09:35:48 2013
+++ src/sys/uvm/pmap/pmap.h	Wed Jul 17 23:15:20 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.2 2013/07/02 09:35:48 matt Exp $	*/
+/*	$NetBSD: pmap.h,v 1.3 2013/07/17 23:15:20 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -113,6 +113,9 @@ void pmap_segtab_destroy(struct pmap *, 
 extern kmutex_t pmap_segtab_lock;
 #endif /* _KERNEL */
 
+#ifdef MULTIPROCESSOR
+#include sys/kcpuset.h
+#endif
 #include uvm/pmap/pmap_tlb.h
 
 /*
@@ -120,8 +123,8 @@ extern kmutex_t pmap_segtab_lock;
  */
 struct pmap {
 #ifdef MULTIPROCESSOR
-	__cpuset_t		pm_active;	/* pmap was active on ... */
-	__cpuset_t		pm_onproc;	/* pmap is active on ... */
+	kcpuset_t		*pm_active;	/* pmap was active on ... */
+	kcpuset_t		*pm_onproc;	/* pmap is active on ... */
 	volatile u_int		pm_shootdown_pending;
 #endif
 	pmap_segtab_t *		pm_segtab;	/* pointers to pages of PTEs */
@@ -137,8 +140,8 @@ struct pmap {
 #ifdef	_KERNEL
 struct pmap_kernel {
 	struct pmap kernel_pmap;
-#ifdef MULTIPROCESSOR
-	struct pmap_asid_info kernel_pai[MAXCPUS-1];
+#if

CVS commit: src/sys/arch/evbppc/mpc85xx

2013-07-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul 17 23:25:25 UTC 2013

Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c

Log Message:
kcpuset_t changes


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/mpc85xx/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.29 src/sys/arch/evbppc/mpc85xx/machdep.c:1.30
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.29	Sun Jul 29 21:39:43 2012
+++ src/sys/arch/evbppc/mpc85xx/machdep.c	Wed Jul 17 23:25:25 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.29 2012/07/29 21:39:43 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.30 2013/07/17 23:25:25 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -75,7 +75,6 @@ __KERNEL_RCSID(0, $NetSBD$);
 #include net/if_media.h
 #include dev/mii/miivar.h
 
-#include powerpc/cpuset.h
 #include powerpc/pcb.h
 #include powerpc/spr.h
 #include powerpc/booke/spr.h
@@ -807,7 +806,7 @@ e500_cpu_spinup(device_t self, struct cp
 	struct uboot_spinup_entry * const e = (void *)spinup_table_addr;
 	volatile struct cpu_hatch_data * const h = cpu_hatch_data;
 	const size_t id = cpu_index(ci);
-	volatile __cpuset_t * const hatchlings = cpuset_info.cpus_hatched;
+	kcpuset_t * const hatchlings = cpuset_info.cpus_hatched;
 
 	if (h-hatch_sp == 0) {
 		int error = uvm_pglistalloc(PAGE_SIZE, PAGE_SIZE,
@@ -839,6 +838,9 @@ e500_cpu_spinup(device_t self, struct cp
 			h-hatch_running = -1;
 			h-hatch_pir = e[i].entry_pir;
 			h-hatch_hid0 = mfspr(SPR_HID0);
+			u_int tlbidx;
+		e500_tlb_lookup_xtlb(0, tlbidx);
+		h-hatch_tlbidx = tlbidx;
 			KASSERT(h-hatch_sp != 0);
 			/*
 			 * Get new timebase.  We don't want to deal with
@@ -859,7 +861,6 @@ e500_cpu_spinup(device_t self, struct cp
 			__asm(sync;isync);
 			dcache_wbinv((vaddr_t)h, sizeof(*h));
 
-#if 1
 			/*
 			 * And here we go...
 			 */
@@ -872,19 +873,23 @@ e500_cpu_spinup(device_t self, struct cp
 			for (u_int timo = 0; timo++  1; ) {
 dcache_inv((vaddr_t)e[i], sizeof(e[i]));
 if (e[i].entry_addr_lower == 3) {
+#if 0
 	printf(
 	%s: cpu%u started in %u spins\n,
 	__func__, cpu_index(ci), timo);
+#endif
 	break;
 }
 			}
 			for (u_int timo = 0; timo++  1; ) {
 dcache_inv((vaddr_t)h, sizeof(*h));
 if (h-hatch_running == 0) {
+#if 0
 	printf(
 	%s: cpu%u cracked in %u spins: (running=%d)\n,
 	__func__, cpu_index(ci),
 	timo, h-hatch_running);
+#endif
 	break;
 }
 			}
@@ -895,7 +900,6 @@ e500_cpu_spinup(device_t self, struct cp
 h-hatch_running, e[i].entry_addr_lower);
 goto out;
 			}
-#endif
 
 			/*
 			 * First then we do is to synchronize timebases.
@@ -908,6 +912,8 @@ e500_cpu_spinup(device_t self, struct cp
 			dcache_wbinv((vaddr_t)h, sizeof(*h));
 			__asm(sync;isync);
 			__insn_barrier();
+			printf(%s: cpu%u set to running\n,
+			__func__, cpu_index(ci));
 
 			for (u_int timo = 1; timo--  0; ) {
 dcache_inv((vaddr_t)h, sizeof(*h));
@@ -937,7 +943,7 @@ e500_cpu_spinup(device_t self, struct cp
 			 * should be long enough.
 			 */
 			for (u_int timo = 1; timo--  0; ) {
-if (CPUSET_HAS_P(*hatchlings, id)) {
+if (kcpuset_isset(hatchlings, id)) {
 	aprint_normal_dev(self,
 	hatch successful (%u spins, 
 	timebase adjusted by %PRId64)\n,

CVS commit: src/sys/arch/powerpc

2013-07-17 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul 17 23:27:02 UTC 2013

Modified Files:
src/sys/arch/powerpc/booke: booke_machdep.c booke_pmap.c
src/sys/arch/powerpc/include: cpu.h types.h
src/sys/arch/powerpc/include/booke: pmap.h
Removed Files:
src/sys/arch/powerpc/include: cpuset.h

Log Message:
kcpuset_t changes for the pmap and removal of __cpuset_t


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/booke/booke_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.1 -r0 src/sys/arch/powerpc/include/cpuset.h
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/include/booke/pmap.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/powerpc/booke/booke_machdep.c
diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.17 src/sys/arch/powerpc/booke/booke_machdep.c:1.18
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.17	Mon Oct 29 05:23:44 2012
+++ src/sys/arch/powerpc/booke/booke_machdep.c	Wed Jul 17 23:27:02 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: booke_machdep.c,v 1.17 2012/10/29 05:23:44 matt Exp $	*/
+/*	$NetBSD: booke_machdep.c,v 1.18 2013/07/17 23:27:02 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 #define	_POWERPC_BUS_DMA_PRIVATE
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: booke_machdep.c,v 1.17 2012/10/29 05:23:44 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: booke_machdep.c,v 1.18 2013/07/17 23:27:02 matt Exp $);
 
 #include opt_modular.h
 
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, $NetBSD: booke_machde
 
 #include uvm/uvm_extern.h
 
-#include powerpc/cpuset.h
 #include powerpc/pcb.h
 #include powerpc/spr.h
 #include powerpc/booke/spr.h
@@ -222,6 +221,12 @@ booke_cpu_startup(const char *model)
 		ci-ci_idepth = -1;
 		ci-ci_pmap_kern_segtab = curcpu()-ci_pmap_kern_segtab;
 	}
+
+	kcpuset_create(cpuset_info.cpus_running, true);
+	kcpuset_create(cpuset_info.cpus_hatched, true);
+	kcpuset_create(cpuset_info.cpus_paused, true);
+	kcpuset_create(cpuset_info.cpus_resumed, true);
+	kcpuset_create(cpuset_info.cpus_halted, true);
 #endif /* MULTIPROCESSOR */
 }
 
@@ -458,18 +463,18 @@ cpu_evcnt_attach(struct cpu_info *ci)
 register_t
 cpu_hatch(void)
 {
-	volatile struct cpuset_info * const csi = cpuset_info;
+	struct cpuset_info * const csi = cpuset_info;
 	const size_t id = cpu_number();
 
 	/*
 	 * We've hatched so tell the spinup code.
 	 */
-	CPUSET_ADD(csi-cpus_hatched, id);
+	kcpuset_set(csi-cpus_hatched, id);
 
 	/*
 	 * Loop until running bit for this cpu is set.
 	 */
-	while (!CPUSET_HAS_P(csi-cpus_running, id)) {
+	while (!kcpuset_isset(csi-cpus_running, id)) {
 		continue;
 	}
 
@@ -490,24 +495,27 @@ cpu_boot_secondary_processors(void)
 	volatile struct cpuset_info * const csi = cpuset_info;
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
-	__cpuset_t running = CPUSET_NULLSET;
+	kcpuset_t *running;
+
+	kcpuset_create(running, true);
 
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		/*
 		 * Skip this CPU if it didn't sucessfully hatch.
 		 */
-		if (! CPUSET_HAS_P(csi-cpus_hatched, cpu_index(ci)))
+		if (!kcpuset_isset(csi-cpus_hatched, cpu_index(ci)))
 			continue;
 
 		KASSERT(!CPU_IS_PRIMARY(ci));
 		KASSERT(ci-ci_data.cpu_idlelwp);
 
-		CPUSET_ADD(running, cpu_index(ci));
+		kcpuset_set(running, cpu_index(ci));
 	}
-	KASSERT(CPUSET_EQUAL_P(csi-cpus_hatched, running));
-	if (!CPUSET_EMPTY_P(running)) {
-		CPUSET_ADDSET(csi-cpus_running, running);
+	KASSERT(kcpuset_match(csi-cpus_hatched, running));
+	if (!kcpuset_iszero(running)) {
+		kcpuset_merge(csi-cpus_running, running);
 	}
+	kcpuset_destroy(running);
 }
 #endif
 

Index: src/sys/arch/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.16 src/sys/arch/powerpc/booke/booke_pmap.c:1.17
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.16	Fri Sep  7 18:05:11 2012
+++ src/sys/arch/powerpc/booke/booke_pmap.c	Wed Jul 17 23:27:02 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: booke_pmap.c,v 1.16 2012/09/07 18:05:11 matt Exp $	*/
+/*	$NetBSD: booke_pmap.c,v 1.17 2013/07/17 23:27:02 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: booke_pmap.c,v 1.16 2012/09/07 18:05:11 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: booke_pmap.c,v 1.17 2013/07/17 23:27:02 matt Exp $);
 
 #include sys/param.h
 #include sys/kcore.h
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, $NetBSD: booke_pmap.c
  * Initialize the kernel pmap.
  */
 #ifdef MULTIPROCESSOR
-#define	PMAP_SIZE	offsetof(struct pmap, pm_pai[MAXCPUS])
+#define	PMAP_SIZE	offsetof(struct pmap, pm_pai[PMAP_TLB_MAX])
 #else
 #define	PMAP_SIZE	sizeof(struct pmap)
 #endif
@@ -90,7 +90,7 @@

CVS commit: src/sys/dev/pci

2013-07-17 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Thu Jul 18 03:14:10 UTC 2013

Modified Files:
src/sys/dev/pci: ichsmb.c

Log Message:
Add Intel 8 Series SMBus.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/ichsmb.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.30 src/sys/dev/pci/ichsmb.c:1.31
--- src/sys/dev/pci/ichsmb.c:1.30	Sat Jan 12 20:33:02 2013
+++ src/sys/dev/pci/ichsmb.c	Thu Jul 18 03:14:09 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichsmb.c,v 1.30 2013/01/12 20:33:02 riastradh Exp $	*/
+/*	$NetBSD: ichsmb.c,v 1.31 2013/07/18 03:14:09 msaitoh Exp $	*/
 /*	$OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.30 2013/01/12 20:33:02 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.31 2013/07/18 03:14:09 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -109,6 +109,7 @@ ichsmb_match(device_t parent, cfdata_t m
 		case PCI_PRODUCT_INTEL_3400_SMB:
 		case PCI_PRODUCT_INTEL_6SERIES_SMB:
 		case PCI_PRODUCT_INTEL_7SERIES_SMB:
+		case PCI_PRODUCT_INTEL_8SERIES_SMB:
 		case PCI_PRODUCT_INTEL_C600_SMBUS:
 		case PCI_PRODUCT_INTEL_C600_SMB_0:
 		case PCI_PRODUCT_INTEL_C600_SMB_1:

CVS commit: src/usr.bin/man

2013-07-17 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Thu Jul 18 03:38:25 UTC 2013

Modified Files:
src/usr.bin/man: man.1

Log Message:
Remove unnecessary line wrap.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/man/man.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/man/man.1
diff -u src/usr.bin/man/man.1:1.24 src/usr.bin/man/man.1:1.25
--- src/usr.bin/man/man.1:1.24	Fri Oct  7 10:52:31 2011
+++ src/usr.bin/man/man.1	Thu Jul 18 03:38:25 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: man.1,v 1.24 2011/10/07 10:52:31 mbalmer Exp $
+.\	$NetBSD: man.1,v 1.25 2013/07/18 03:38:25 uwe Exp $
 .\
 .\ Copyright (c) 1989, 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -201,8 +201,7 @@ The standard search path used by
 .Nm
 may be overridden by specifying a path in the
 .Ev MANPATH
-environment
-variable.
+environment variable.
 The format of the path is a colon
 .Pq Dq \:
 separated list of directories.

CVS commit: src/usr.bin/man

2013-07-17 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Thu Jul 18 03:40:31 UTC 2013

Modified Files:
src/usr.bin/man: man.1

Log Message:
whatis.db is no more, so don't mention its location in FILES.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/man/man.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/man/man.1
diff -u src/usr.bin/man/man.1:1.25 src/usr.bin/man/man.1:1.26
--- src/usr.bin/man/man.1:1.25	Thu Jul 18 03:38:25 2013
+++ src/usr.bin/man/man.1	Thu Jul 18 03:40:31 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: man.1,v 1.25 2013/07/18 03:38:25 uwe Exp $
+.\	$NetBSD: man.1,v 1.26 2013/07/18 03:40:31 uwe Exp $
 .\
 .\ Copyright (c) 1989, 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -223,10 +223,6 @@ will be used.
 .Bl -hang -width /etc/man.conf -compact
 .It Pa /etc/man.conf
 default man configuration file.
-.It Pa /usr/{share,X11R7,pkg,local}/man/whatis.db
-standard whatis/apropos database search path,
-set in
-.Pa /etc/man.conf .
 .El
 .Sh SEE ALSO
 .Xr apropos 1 ,

CVS commit: src/usr.bin/man

2013-07-17 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Thu Jul 18 03:48:22 UTC 2013

Modified Files:
src/usr.bin/man: man.c

Log Message:
Move manstate::pagerlen so that its length of the above comment makes sense.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/man/man.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/man/man.c
diff -u src/usr.bin/man/man.c:1.44 src/usr.bin/man/man.c:1.45
--- src/usr.bin/man/man.c:1.44	Tue Jan  3 17:49:57 2012
+++ src/usr.bin/man/man.c	Thu Jul 18 03:48:22 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: man.c,v 1.44 2012/01/03 17:49:57 joerg Exp $	*/
+/*	$NetBSD: man.c,v 1.45 2013/07/18 03:48:22 uwe Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
 #if 0
 static char sccsid[] = @(#)man.c	8.17 (Berkeley) 1/31/95;
 #else
-__RCSID($NetBSD: man.c,v 1.44 2012/01/03 17:49:57 joerg Exp $);
+__RCSID($NetBSD: man.c,v 1.45 2013/07/18 03:48:22 uwe Exp $);
 #endif
 #endif /* not lint */
 
@@ -101,9 +101,9 @@ struct manstate {
 
 	/* other misc stuff */
 	const char *pager;	/* pager to use */
+	size_t pagerlen;	/* length of the above */
 	const char *machine;	/* machine */
 	const char *machclass;	/* machine class */
-	size_t pagerlen;	/* length of the above */
 };
 
 /*

CVS commit: src/usr.bin/man

2013-07-17 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Thu Jul 18 04:02:31 UTC 2013

Modified Files:
src/usr.bin/man: man.c

Log Message:
Constify jump() arguments appropriately.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/man/man.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/man/man.c
diff -u src/usr.bin/man/man.c:1.45 src/usr.bin/man/man.c:1.46
--- src/usr.bin/man/man.c:1.45	Thu Jul 18 03:48:22 2013
+++ src/usr.bin/man/man.c	Thu Jul 18 04:02:31 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: man.c,v 1.45 2013/07/18 03:48:22 uwe Exp $	*/
+/*	$NetBSD: man.c,v 1.46 2013/07/18 04:02:31 uwe Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
 #if 0
 static char sccsid[] = @(#)man.c	8.17 (Berkeley) 1/31/95;
 #else
-__RCSID($NetBSD: man.c,v 1.45 2013/07/18 03:48:22 uwe Exp $);
+__RCSID($NetBSD: man.c,v 1.46 2013/07/18 04:02:31 uwe Exp $);
 #endif
 #endif /* not lint */
 
@@ -114,7 +114,7 @@ static void	 cat(char *);
 static const char	*check_pager(const char *);
 static int	 cleanup(void);
 static void	 how(char *);
-static void	 jump(char **, char *, char *);
+static void	 jump(char **, const char *, const char *);
 static int	 manual(char *, struct manstate *, glob_t *);
 static void	 onsig(int);
 static void	 usage(void) __attribute__((__noreturn__));
@@ -898,7 +898,7 @@ check_pager(const char *name)
  *	strip out flag argument and jump
  */
 static void
-jump(char **argv, char *flag, char *name)
+jump(char **argv, const char *flag, const char *name)
 {
 	char **arg;

CVS commit: src/usr.bin/man

2013-07-17 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Thu Jul 18 04:05:32 UTC 2013

Modified Files:
src/usr.bin/man: man.c

Log Message:
Revert previous; other errors from WARNS=3 obscured the error in jump().


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/man/man.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/man/man.c
diff -u src/usr.bin/man/man.c:1.46 src/usr.bin/man/man.c:1.47
--- src/usr.bin/man/man.c:1.46	Thu Jul 18 04:02:31 2013
+++ src/usr.bin/man/man.c	Thu Jul 18 04:05:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: man.c,v 1.46 2013/07/18 04:02:31 uwe Exp $	*/
+/*	$NetBSD: man.c,v 1.47 2013/07/18 04:05:32 uwe Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
 #if 0
 static char sccsid[] = @(#)man.c	8.17 (Berkeley) 1/31/95;
 #else
-__RCSID($NetBSD: man.c,v 1.46 2013/07/18 04:02:31 uwe Exp $);
+__RCSID($NetBSD: man.c,v 1.47 2013/07/18 04:05:32 uwe Exp $);
 #endif
 #endif /* not lint */
 
@@ -114,7 +114,7 @@ static void	 cat(char *);
 static const char	*check_pager(const char *);
 static int	 cleanup(void);
 static void	 how(char *);
-static void	 jump(char **, const char *, const char *);
+static void	 jump(char **, char *, char *);
 static int	 manual(char *, struct manstate *, glob_t *);
 static void	 onsig(int);
 static void	 usage(void) __attribute__((__noreturn__));
@@ -898,7 +898,7 @@ check_pager(const char *name)
  *	strip out flag argument and jump
  */
 static void
-jump(char **argv, const char *flag, const char *name)
+jump(char **argv, char *flag, char *name)
 {
 	char **arg;

CVS commit: src/lib/libc/arch/m68k/gen

CVS commit: src/sys/net

CVS commit: src/bin/dd

CVS commit: src/sys/conf

CVS commit: src/sbin/ifconfig

CVS commit: src/sys/arch/x86/include

CVS commit: src/sys/arch/x86/include

CVS commit: src/sys/sys

CVS commit: src/share/mk

CVS commit: src/sys/dev/pci

CVS commit: src/sys/dev/pci/ixgbe

CVS commit: src/sys/dev/ic

CVS commit: src/doc

CVS commit: src/doc

CVS commit: src/sys/kern

CVS commit: src/sys

CVS commit: src/sys

CVS commit: src/lib/libc/compat/arch/m68k/gen

CVS import: src/external/bsd/wpa/dist

CVS commit: src/external/bsd/wpa/dist/src

CVS commit: src/doc

CVS commit: src

CVS commit: src/lib/libc/time

CVS commit: src/sys/uvm/pmap

CVS commit: src/sys/arch/evbppc/mpc85xx

CVS commit: src/sys/arch/powerpc

CVS commit: src/sys/dev/pci

CVS commit: src/usr.bin/man

CVS commit: src/usr.bin/man

CVS commit: src/usr.bin/man

CVS commit: src/usr.bin/man

CVS commit: src/usr.bin/man

32 matches

Site Navigation

Mail list logo

Footer information