CVS commit: src/sys

2011-03-05 Thread Jukka Ruohonen 
Module Name:src
Committed By:   jruoho
Date:   Sat Mar  5 09:47:20 UTC 2011

Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_pstate.c

Log Message:
Add __cpu_simple_lock_t. Use it, x86_read_psl(), and x86_disable_intr() to
disable interrupts locally and protect the access to APERF and MPERF. Also
rationalize the MD initialization sequence.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/acpi_cpu.c \
src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/acpi/acpi_cpu_pstate.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/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.54 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.55
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.54	Sat Mar  5 06:39:55 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c	Sat Mar  5 09:47:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.54 2011/03/05 06:39:55 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.55 2011/03/05 09:47:19 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.54 2011/03/05 06:39:55 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.55 2011/03/05 09:47:19 jruoho Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -52,6 +52,12 @@
 #include machine/acpi_machdep.h
 
 /*
+ * Intel IA32_MISC_ENABLE.
+ */
+#define MSR_MISC_ENABLE_EST	__BIT(16)
+#define MSR_MISC_ENABLE_TURBO	__BIT(38)
+
+/*
  * AMD C1E.
  */
 #define MSR_CMPHALT		0xc0010055
@@ -99,8 +105,10 @@
 static char	  native_idle_text[16];
 void		(*native_idle)(void) = NULL;
 
+static u_long	 acpicpu_md_lock(struct acpicpu_softc *);
+static void	 acpicpu_md_unlock(struct acpicpu_softc *, u_long);
 static int	 acpicpu_md_quirk_piix4(struct pci_attach_args *);
-static void	 acpicpu_md_pstate_percent_reset(struct acpicpu_softc *);
+static void	 acpicpu_md_pstate_percent_reset(struct cpu_info *);
 static int	 acpicpu_md_pstate_fidvid_get(struct acpicpu_softc *,
   uint32_t *);
 static int	 acpicpu_md_pstate_fidvid_set(struct acpicpu_pstate *);
@@ -134,6 +142,24 @@
 	return cfaa-ci;
 }
 
+static u_long
+acpicpu_md_lock(struct acpicpu_softc *sc)
+{
+	const u_long flags = x86_read_psl();
+
+	x86_disable_intr();
+	__cpu_simple_lock(sc-sc_lock);
+
+	return flags;
+}
+
+static void
+acpicpu_md_unlock(struct acpicpu_softc *sc, u_long flags)
+{
+	__cpu_simple_unlock(sc-sc_lock);
+	x86_write_psl(flags);
+}
+
 uint32_t
 acpicpu_md_cap(void)
 {
@@ -469,47 +495,12 @@
 int
 acpicpu_md_pstate_start(struct acpicpu_softc *sc)
 {
-	const uint64_t est = __BIT(16);
-	uint64_t val;
-
-	if ((sc-sc_flags  ACPICPU_FLAG_P) == 0)
-		return ENODEV;
-
-	switch (cpu_vendor) {
-
-	case CPUVENDOR_IDT:
-	case CPUVENDOR_INTEL:
-
-		/*
-		 * Make sure EST is enabled.
-		 */
-		val = rdmsr(MSR_MISC_ENABLE);
-
-		if ((val  est) == 0) {
-
-			val |= est;
-
-			wrmsr(MSR_MISC_ENABLE, val);
-			val = rdmsr(MSR_MISC_ENABLE);
-
-			if ((val  est) == 0)
-return ENOTTY;
-		}
-	}
-
-	/*
-	 * Reset the APERF and MPERF counters.
-	 */
-	if ((sc-sc_flags  ACPICPU_FLAG_P_HWF) != 0)
-		acpicpu_md_pstate_percent_reset(sc);
-
 	return acpicpu_md_pstate_sysctl_init();
 }
 
 int
 acpicpu_md_pstate_stop(void)
 {
-
 	if (acpicpu_log != NULL)
 		sysctl_teardown(acpicpu_log);
 
@@ -517,11 +508,12 @@
 }
 
 int
-acpicpu_md_pstate_pss(struct acpicpu_softc *sc)
+acpicpu_md_pstate_init(struct acpicpu_softc *sc)
 {
 	struct acpicpu_pstate *ps, msr;
 	struct cpu_info *ci = curcpu();
 	uint32_t family, i = 0;
+	uint64_t val;
 
 	(void)memset(msr, 0, sizeof(struct acpicpu_pstate));
 
@@ -531,6 +523,24 @@
 	case CPUVENDOR_INTEL:
 
 		/*
+		 * Make sure EST is enabled.
+		 */
+		if ((sc-sc_flags  ACPICPU_FLAG_P_FFH) != 0) {
+
+			val = rdmsr(MSR_MISC_ENABLE);
+
+			if ((val  MSR_MISC_ENABLE_EST) == 0) {
+
+val |= MSR_MISC_ENABLE_EST;
+wrmsr(MSR_MISC_ENABLE, val);
+val = rdmsr(MSR_MISC_ENABLE);
+
+if ((val  MSR_MISC_ENABLE_EST) == 0)
+	return ENOTTY;
+			}
+		}
+
+		/*
 		 * If the so-called Turbo Boost is present,
 		 * the P0-state is always the turbo state.
 		 * It is shown as the P1 frequency + 1 MHz.
@@ -541,7 +551,7 @@
 		 *	in Intel Core(tm) Microarchitectures (Nehalem)
 		 *	Based Processors. White Paper, November 2008.
 		 */
-		if (sc-sc_pstate_count  2 
+		if (sc-sc_pstate_count = 2 
 		   (sc-sc_flags  ACPICPU_FLAG_P_TURBO) != 0) {
 
 			ps = sc-sc_pstate[0];
@@ -586,6 +596,9 @@
 
 		default:
 
+			/*
+			 * If we have an unknown AMD CPU, rely on XPSS.
+			 */
 			if ((sc-sc_flags  ACPICPU_FLAG_P_XPSS) == 0)
 return EOPNOTSUPP;
 		}
@@ -624,87 +637,94 @@
 		i++;
 	}
 
+	/*
+	 * Reset the APERF and MPERF

CVS commit: src/sys/arch/algor/conf

2011-03-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Mar  5 14:02:08 UTC 2011

Modified Files:
src/sys/arch/algor/conf: P6032

Log Message:
Increase SYMTAB_SPACE


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/algor/conf/P6032

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/algor/conf/P6032
diff -u src/sys/arch/algor/conf/P6032:1.54 src/sys/arch/algor/conf/P6032:1.55
--- src/sys/arch/algor/conf/P6032:1.54	Tue Nov 23 11:13:53 2010
+++ src/sys/arch/algor/conf/P6032	Sat Mar  5 14:02:08 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: P6032,v 1.54 2010/11/23 11:13:53 hannken Exp $
+#	$NetBSD: P6032,v 1.55 2011/03/05 14:02:08 matt Exp $
 #
 # Algorithmics P-6032 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		P6032-$Revision: 1.54 $
+#ident 		P6032-$Revision: 1.55 $
 
 maxusers 32
 
@@ -25,7 +25,7 @@
 options 	DDB			# kernel debugger
 makeoptions	DEBUG=-g
 #makeoptions	DEBUGLIST=pattern1 pattern2 ...
-options 	SYMTAB_SPACE=36
+options 	SYMTAB_SPACE=37
 
 # File systems
 file-system	FFS		# Fast file system

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

2011-03-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Mar  5 14:26:01 UTC 2011

Modified Files:
src/sys/arch/mips/include: mips_param.h

Log Message:
If _KERNEL is not defined, force MACHINE to be mips.  Userland should be
using uname/sysctl to get this value.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/mips/include/mips_param.h

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

Modified files:

Index: src/sys/arch/mips/include/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.28 src/sys/arch/mips/include/mips_param.h:1.29
--- src/sys/arch/mips/include/mips_param.h:1.28	Sun Feb 20 07:45:47 2011
+++ src/sys/arch/mips/include/mips_param.h	Sat Mar  5 14:26:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_param.h,v 1.28 2011/02/20 07:45:47 matt Exp $	*/
+/*	$NetBSD: mips_param.h,v 1.29 2011/03/05 14:26:01 matt Exp $	*/
 
 #ifdef _KERNEL
 #include machine/cpu.h
@@ -32,6 +32,15 @@
 #endif
 
 /*
+ * Userland code should be using uname/sysctl to get MACHINE so simply
+ * export a generic MACHINE of mips
+ */
+#ifndef _KERNEL
+#undef MACHINE
+#define MACHINE mips
+#endif
+
+/*
  * On mips, UPAGES is fixed by sys/arch/mips/mips/locore code
  * to be the number of per-process-wired kernel-stack pages/PTES.
  */

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

2011-03-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Mar  5 14:27:48 UTC 2011

Modified Files:
src/sys/arch/powerpc/include: param.h

Log Message:
If _KERNEL is not defined, force MACHINE to be powerpc.  Userland should be
using uname/sysctl to get this value.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/param.h

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

Modified files:

Index: src/sys/arch/powerpc/include/param.h
diff -u src/sys/arch/powerpc/include/param.h:1.22 src/sys/arch/powerpc/include/param.h:1.23
--- src/sys/arch/powerpc/include/param.h:1.22	Mon Mar 22 02:14:28 2010
+++ src/sys/arch/powerpc/include/param.h	Sat Mar  5 14:27:48 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.22 2010/03/22 02:14:28 mrg Exp $	*/
+/*	$NetBSD: param.h,v 1.23 2011/03/05 14:27:48 matt Exp $	*/
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -45,7 +45,11 @@
 
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
+ * For userland regardless of port, force MACHINE to be powerpc
  */
+#ifndef _KERNEL
+#undef MACHINE
+#endif
 #ifndef MACHINE
 #define	MACHINE		powerpc
 #endif

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

2011-03-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Mar  5 14:32:32 UTC 2011

Modified Files:
src/sys/arch/m68k/include: param.h

Log Message:
If _KERNEL is not defined, force MACHINE to be m68k.  Userland should be
using uname/sysctl to get this value.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/m68k/include/param.h

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

Modified files:

Index: src/sys/arch/m68k/include/param.h
diff -u src/sys/arch/m68k/include/param.h:1.18 src/sys/arch/m68k/include/param.h:1.19
--- src/sys/arch/m68k/include/param.h:1.18	Tue Feb  8 20:20:16 2011
+++ src/sys/arch/m68k/include/param.h	Sat Mar  5 14:32:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.18 2011/02/08 20:20:16 rmind Exp $	*/
+/*	$NetBSD: param.h,v 1.19 2011/03/05 14:32:32 matt Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -51,6 +51,10 @@
 #ifndef	MID_MACHINE
 #define	MID_MACHINE	MID_M68K
 #endif
+#ifndef _KERNEL
+#undef MACHINE
+#define MACHINE m68k
+#endif
 
 /*
  * Round p (pointer or byte index) up to a correctly-aligned value for all

CVS commit: src/sys/external/isc/atheros_hal/conf

2011-03-05 Thread Christoph Egger 
Module Name:src
Committed By:   cegger
Date:   Sat Mar  5 14:42:12 UTC 2011

Modified Files:
src/sys/external/isc/atheros_hal/conf: files.ath_hal

Log Message:
add defflag for AR9285.

Spotted by jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/isc/atheros_hal/conf/files.ath_hal

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

Modified files:

Index: src/sys/external/isc/atheros_hal/conf/files.ath_hal
diff -u src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.3 src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.4
--- src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.3	Mon Feb 21 11:06:37 2011
+++ src/sys/external/isc/atheros_hal/conf/files.ath_hal	Sat Mar  5 14:42:11 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.ath_hal,v 1.3 2011/02/21 11:06:37 cegger Exp $
+#	$NetBSD: files.ath_hal,v 1.4 2011/03/05 14:42:11 cegger Exp $
 
 defflag opt_athhal.h	ATHHAL_ASSERT ATHHAL_DEBUG ATHHAL_DEBUG_ALQ
 defflag opt_athhal.h	ATHHAL_WRITE_EEPROM ATHHAL_WRITE_REGDOMAIN
@@ -113,6 +113,7 @@
 #
 defflag opt_athhal.h	ATHHAL_AR5416: athhal_eeprom_v14, athhal_eeprom_v4k, athhal_ar5212_subr
 defflag opt_athhal.h	ATHHAL_AR9280: ATHHAL_AR5416
+defflag opt_athhal.h	ATHHAL_AR9285: ATHHAL_AR5416
 
 file	external/isc/atheros_hal/dist/ar5416/ar2133.c		ath  athhal_ar5416
 file	external/isc/atheros_hal/dist/ar5416/ar5416_ani.c	ath  athhal_ar5416

CVS commit: src/sys/arch

2011-03-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Mar  5 14:50:57 UTC 2011

Modified Files:
src/sys/arch/arm/marvell: files.marvell mvsoc.c
src/sys/arch/evbarm/conf: SHEEVAPLUG
Added Files:
src/sys/arch/arm/marvell: mvsocrtc.c mvsocrtcreg.h

Log Message:
Add contributed Marvell Kirkwood RTC driver from Brett Slager
Fixes PR 44004


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/marvell/files.marvell
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/marvell/mvsoc.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/marvell/mvsocrtc.c \
src/sys/arch/arm/marvell/mvsocrtcreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/SHEEVAPLUG

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/marvell/files.marvell
diff -u src/sys/arch/arm/marvell/files.marvell:1.2 src/sys/arch/arm/marvell/files.marvell:1.3
--- src/sys/arch/arm/marvell/files.marvell:1.2	Wed Oct  6 05:24:01 2010
+++ src/sys/arch/arm/marvell/files.marvell	Sat Mar  5 14:50:56 2011
@@ -1,4 +1,4 @@
-#   $NetBSD: files.marvell,v 1.2 2010/10/06 05:24:01 kiyohara Exp $
+#   $NetBSD: files.marvell,v 1.3 2011/03/05 14:50:56 matt Exp $
 #
 # Configuration info for Marvell System on Chip support
 #
@@ -29,6 +29,11 @@
 file	arch/arm/marvell/mvsoctmr.c		mvsoctmr
 
 
+# RTC
+device	mvsocrtc
+attach	mvsocrtc at mvsoc
+file	arch/arm/marvell/mvsocrtc.c		mvsocrtc
+
 # PCI Express Interface
 attach	mvpex at mvsoc with mvpex_mbus
 

Index: src/sys/arch/arm/marvell/mvsoc.c
diff -u src/sys/arch/arm/marvell/mvsoc.c:1.1 src/sys/arch/arm/marvell/mvsoc.c:1.2
--- src/sys/arch/arm/marvell/mvsoc.c:1.1	Sun Oct  3 05:49:24 2010
+++ src/sys/arch/arm/marvell/mvsoc.c	Sat Mar  5 14:50:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsoc.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $	*/
+/*	$NetBSD: mvsoc.c,v 1.2 2011/03/05 14:50:56 matt Exp $	*/
 /*
  * Copyright (c) 2007, 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.2 2011/03/05 14:50:56 matt Exp $);
 
 #include opt_cputypes.h
 #include opt_mvsoc.h
@@ -301,6 +301,7 @@
 #if defined(KIRKWOOD)
 { KIRKWOOD(88F6180),mvsoctmr,0, MVSOC_TMR_BASE,	IRQ_DEFAULT },
 { KIRKWOOD(88F6180),mvsocgpp,0, MVSOC_GPP_BASE,	KIRKWOOD_IRQ_GPIOLO7_0},
+{ KIRKWOOD(88F6180),mvsocrtc,0, KIRKWOOD_RTC_BASE,IRQ_DEFAULT },
 { KIRKWOOD(88F6180),com, 0, MVSOC_COM0_BASE,	KIRKWOOD_IRQ_UART0INT },
 { KIRKWOOD(88F6180),com, 1, MVSOC_COM1_BASE,	KIRKWOOD_IRQ_UART1INT },
 { KIRKWOOD(88F6180),ehci,0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },
@@ -313,6 +314,7 @@
 
 { KIRKWOOD(88F6192),mvsoctmr,0, MVSOC_TMR_BASE,	IRQ_DEFAULT },
 { KIRKWOOD(88F6192),mvsocgpp,0, MVSOC_GPP_BASE,	KIRKWOOD_IRQ_GPIOLO7_0},
+{ KIRKWOOD(88F6192),mvsocrtc,0, KIRKWOOD_RTC_BASE,IRQ_DEFAULT },
 { KIRKWOOD(88F6192),com, 0, MVSOC_COM0_BASE,	KIRKWOOD_IRQ_UART0INT },
 { KIRKWOOD(88F6192),com, 1, MVSOC_COM1_BASE,	KIRKWOOD_IRQ_UART1INT },
 { KIRKWOOD(88F6192),ehci,0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },
@@ -327,6 +329,7 @@
 
 { KIRKWOOD(88F6281),mvsoctmr,0, MVSOC_TMR_BASE,	IRQ_DEFAULT },
 { KIRKWOOD(88F6281),mvsocgpp,0, MVSOC_GPP_BASE,	KIRKWOOD_IRQ_GPIOLO7_0},
+{ KIRKWOOD(88F6281),mvsocrtc,0, KIRKWOOD_RTC_BASE,IRQ_DEFAULT },
 { KIRKWOOD(88F6281),com, 0, MVSOC_COM0_BASE,	KIRKWOOD_IRQ_UART0INT },
 { KIRKWOOD(88F6281),com, 1, MVSOC_COM1_BASE,	KIRKWOOD_IRQ_UART1INT },
 { KIRKWOOD(88F6281),ehci,0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },

Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.2 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.3
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.2	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG	Sat Mar  5 14:50:56 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: SHEEVAPLUG,v 1.2 2010/11/23 11:13:56 hannken Exp $
+#	$NetBSD: SHEEVAPLUG,v 1.3 2011/03/05 14:50:56 matt Exp $
 #
 #  This configuration supports for generically Marvell SheevaPlug
 #
@@ -162,7 +162,7 @@
 #options 	KGDB
 #options 	DEBUG_KGDB
 makeoptions	DEBUG=-g -O2	# compile full symbol table
-options 	SYMTAB_SPACE=50
+options 	SYMTAB_SPACE=68
 #options 	AUDIO_DEBUG=2
 
 config		netbsd		root on ? type ?
@@ -424,6 +424,9 @@
 btsco* at bthub?
 
 
+# On-chip RTC
+mvsocrtc* at mvsoc? offset ? irq ?
+
 # Audio support
 audio*	at audiobus?
 

Added files:

Index: src/sys/arch/arm/marvell/mvsocrtc.c
diff -u /dev/null src/sys/arch/arm/marvell/mvsocrtc.c:1.1
--- /dev/null	Sat Mar  5 14:50:57 2011
+++ src/sys/arch/arm/marvell/mvsocrtc.c	Sat Mar  5 14:50:56 2011
@@ -0,0 +1,177 @@
+/*	$NetBSD: mvsocrtc.c,v 1.1 2011/03/05 14:50:56 matt Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary

CVS commit: src/sys/arch/xen/xen

2011-03-05 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sat Mar  5 15:12:16 UTC 2011

Modified Files:
src/sys/arch/xen/xen: xbdback_xenbus.c

Log Message:
Test and set xbdi-xbdi_cont at splbio(). Otherwise we could overwrite
xbdi-xbdi_cont and process the same request twice.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.32 src/sys/arch/xen/xen/xbdback_xenbus.c:1.33
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.32	Thu Jun 24 13:03:06 2010
+++ src/sys/arch/xen/xen/xbdback_xenbus.c	Sat Mar  5 15:12:16 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: xbdback_xenbus.c,v 1.32 2010/06/24 13:03:06 hannken Exp $  */
+/*  $NetBSD: xbdback_xenbus.c,v 1.33 2011/03/05 15:12:16 bouyer Exp $  */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.32 2010/06/24 13:03:06 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.33 2011/03/05 15:12:16 bouyer Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -1370,6 +1370,7 @@
 	struct xbdback_io *xbd_io;
 	struct xbdback_instance *xbdi;
 	int errp;
+	int s;
 
 	xbd_io = bp-b_private;
 	xbdi = xbd_io-xio_xbdi;
@@ -1424,11 +1425,13 @@
 	atomic_dec_uint(xbdi-xbdi_pendingreqs);
 	buf_destroy(xbd_io-xio_buf);
 	xbdback_pool_put(xbdback_io_pool, xbd_io);
+	s = splbio();
 	if (xbdi-xbdi_cont == NULL) {
 		/* check if there is more work to do */
 		xbdi-xbdi_cont = xbdback_co_main;
 		xbdback_trampoline(xbdi, xbdi);
 	}
+	splx(s);
 }
 
 /*

CVS commit: src/sys/arch/mips/conf

2011-03-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Mar  5 15:19:44 UTC 2011

Modified Files:
src/sys/arch/mips/conf: kern.ldscript

Log Message:
Add missing .debug lines from usr/libdata/ldscripts
Add missing .mdebug lines from usr/libdata/ldscripts
Fixes PR/40522


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/conf/kern.ldscript

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/mips/conf/kern.ldscript
diff -u src/sys/arch/mips/conf/kern.ldscript:1.6 src/sys/arch/mips/conf/kern.ldscript:1.7
--- src/sys/arch/mips/conf/kern.ldscript:1.6	Sun Feb 20 07:45:46 2011
+++ src/sys/arch/mips/conf/kern.ldscript	Sat Mar  5 15:19:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.6 2011/02/20 07:45:46 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.7 2011/03/05 15:19:44 matt Exp $ */
 
 /*  ldscript for NetBSD/mips kernels and LKMs */
 OUTPUT_ARCH(mips)
@@ -61,12 +61,37 @@
  section so we begin .debug at 0.  It's not clear yet what needs to happen
  for the others.   */
   .debug  0 : { *(.debug) }
+  /* DWARF 1 */
   .debug_srcinfo  0 : { *(.debug_srcinfo) }
+  .debug_sfnames  0 : { *(.debug_sfnames) }
+  /* DWARF 1.1 and DWARF 2 */
   .debug_aranges  0 : { *(.debug_aranges) }
   .debug_pubnames 0 : { *(.debug_pubnames) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  .line   0 : { *(.line) }
+  /* DWARF 2 */
+  .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line 0 : { *(.debug_line) }
+  .debug_frame0 : { *(.debug_frame) }
+  .debug_str  0 : { *(.debug_str) }
+  .debug_loc  0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
+  /* SGI/MIPS DWARF 2 extensions */
+  .debug_weaknames 0 : { *(.debug_weaknames) }
+  .debug_funcnames 0 : { *(.debug_funcnames) }
+  .debug_typenames 0 : { *(.debug_typenames) }
+  .debug_varnames  0 : { *(.debug_varnames) }
+  /* DWARF3 */
+  .debug_pubtypes 0 : { *(.debug_pubtypes) }
+  .debug_ranges   0 : { *(.debug_ranges) }
+  /* for GDB */
+  .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
+  .mdebug.abiN32 : { KEEP(*(.mdebug.abiN32)) }
+  .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
+  .mdebug.abiO64 : { KEEP(*(.mdebug.abiO64)) }
+  .mdebug.eabi32 : { KEEP(*(.mdebug.eabi32)) }
+  .mdebug.eabi64 : { KEEP(*(.mdebug.eabi64)) }
   /* These must appear regardless of  .  */
   .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
   .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
+  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
 }

CVS commit: src/sys/arch/powerpc/powerpc

2011-03-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Mar  5 15:25:52 UTC 2011

Modified Files:
src/sys/arch/powerpc/powerpc: bus_space.c

Log Message:
Only call unmapiodev if va is non-zero.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/powerpc/bus_space.c

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

Modified files:

Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.25 src/sys/arch/powerpc/powerpc/bus_space.c:1.26
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.25	Tue Feb 15 19:39:12 2011
+++ src/sys/arch/powerpc/powerpc/bus_space.c	Sat Mar  5 15:25:52 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.25 2011/02/15 19:39:12 macallan Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.26 2011/03/05 15:25:52 matt Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.25 2011/02/15 19:39:12 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.26 2011/03/05 15:25:52 matt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -684,7 +684,8 @@
 		printf(memio_unmap: can't free region\n);
 	}
 
-	unmapiodev(va, size);
+	if (va)
+		unmapiodev(va, size);
 }
 
 int

CVS commit: src/sys/dev/pci

2011-03-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Sat Mar  5 15:36:27 UTC 2011

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add ATHEROS AR2427 and AR9287


To generate a diff of this commit:
cvs rdiff -u -r1.1066 -r1.1067 src/sys/dev/pci/pcidevs

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.1066 src/sys/dev/pci/pcidevs:1.1067
--- src/sys/dev/pci/pcidevs:1.1066	Fri Feb 25 01:36:18 2011
+++ src/sys/dev/pci/pcidevs	Sat Mar  5 15:36:27 2011
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1066 2011/02/25 01:36:18 jmcneill Exp $
+$NetBSD: pcidevs,v 1.1067 2011/03/05 15:36:27 matt Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1443,6 +1443,8 @@
 product ATHEROS AR5211		0x0012 AR5211 Wireless LAN
 product ATHEROS AR5212		0x0013 AR5212 Wireless LAN
 product ATHEROS AR9285		0x002b AR9285 Wireless LAN
+product ATHEROS AR2427		0x002c AR2427 Wireless LAN
+product ATHEROS AR9287		0x002e AR9287 Wireless LAN
 product ATHEROS AR5201_AP	0x0207 AR5201 Wireless LAN Reference Card (Early AP11)
 product ATHEROS AR5201_DEFAULT	0x1107 AR5201 Wireless LAN (no eeprom)
 product ATHEROS AR5212_DEFAULT	0x1113 AR5212 Wireless LAN (no eeprom)

CVS commit: src/usr.bin/m4

2011-03-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Mar  5 16:37:50 UTC 2011

Modified Files:
src/usr.bin/m4: mdef.h misc.c trace.c

Log Message:
use TOKEN_LINE from MirBSD


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/m4/mdef.h
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/m4/misc.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/m4/trace.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/m4/mdef.h
diff -u src/usr.bin/m4/mdef.h:1.13 src/usr.bin/m4/mdef.h:1.14
--- src/usr.bin/m4/mdef.h:1.13	Mon Oct 26 17:11:28 2009
+++ src/usr.bin/m4/mdef.h	Sat Mar  5 11:37:50 2011
@@ -1,5 +1,5 @@
 /*	$OpenBSD: mdef.h,v 1.29 2006/03/20 20:27:45 espie Exp $	*/
-/*	$NetBSD: mdef.h,v 1.13 2009/10/26 21:11:28 christos Exp $	*/
+/*	$NetBSD: mdef.h,v 1.14 2011/03/05 16:37:50 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -166,6 +166,8 @@
 
 #define CURRENT_NAME	(infile[ilevel].name)
 #define CURRENT_LINE	(infile[ilevel].lineno)
+#define	TOKEN_LINE(f)	(f-lineno - (f-c == '\n' ? 1 : 0))
+
 /*
  * macros for readibility and/or speed
  *

Index: src/usr.bin/m4/misc.c
diff -u src/usr.bin/m4/misc.c:1.20 src/usr.bin/m4/misc.c:1.21
--- src/usr.bin/m4/misc.c:1.20	Fri Nov  6 10:13:27 2009
+++ src/usr.bin/m4/misc.c	Sat Mar  5 11:37:50 2011
@@ -1,5 +1,5 @@
 /*	$OpenBSD: misc.c,v 1.41 2009/10/14 17:19:47 sthen Exp $	*/
-/*	$NetBSD: misc.c,v 1.20 2009/11/06 15:13:27 joerg Exp $	*/
+/*	$NetBSD: misc.c,v 1.21 2011/03/05 16:37:50 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
 #include nbtool_config.h
 #endif
 #include sys/cdefs.h
-__RCSID($NetBSD: misc.c,v 1.20 2009/11/06 15:13:27 joerg Exp $);
+__RCSID($NetBSD: misc.c,v 1.21 2011/03/05 16:37:50 christos Exp $);
 #include sys/types.h
 #include errno.h
 #include unistd.h
@@ -395,7 +395,7 @@
 void
 doprintlineno(struct input_file *f)
 {
-	pbunsigned(f-lineno);
+	pbunsigned(TOKEN_LINE(f));
 }
 
 void

Index: src/usr.bin/m4/trace.c
diff -u src/usr.bin/m4/trace.c:1.6 src/usr.bin/m4/trace.c:1.7
--- src/usr.bin/m4/trace.c:1.6	Mon Oct 26 17:11:28 2009
+++ src/usr.bin/m4/trace.c	Sat Mar  5 11:37:50 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: trace.c,v 1.6 2009/10/26 21:11:28 christos Exp $	*/
+/*	$NetBSD: trace.c,v 1.7 2011/03/05 16:37:50 christos Exp $	*/
 /* $OpenBSD: trace.c,v 1.15 2006/03/24 08:03:44 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
@@ -28,7 +28,7 @@
 #include nbtool_config.h
 #endif
 #include sys/cdefs.h
-__RCSID($NetBSD: trace.c,v 1.6 2009/10/26 21:11:28 christos Exp $);
+__RCSID($NetBSD: trace.c,v 1.7 2011/03/05 16:37:50 christos Exp $);
 
 #include sys/types.h
 #include err.h
@@ -143,7 +143,7 @@
 	if (trace_flags  TRACE_FILENAME)
 		fprintf(traceout, %s:, inp-name);
 	if (trace_flags  TRACE_LINENO)
-		fprintf(traceout, %lu:, inp-lineno);
+		fprintf(traceout, %lu:, TOKEN_LINE(inp));
 	fprintf(traceout,  -%d- , frame_level());
 	if (trace_flags  TRACE_ID)
 		fprintf(traceout, id %lu: , expansion_id);

CVS commit: src/usr.bin/m4

2011-03-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Mar  5 16:38:26 UTC 2011

Modified Files:
src/usr.bin/m4: eval.c

Log Message:
add mimic_gnu for eval print.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/m4/eval.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/m4/eval.c
diff -u src/usr.bin/m4/eval.c:1.20 src/usr.bin/m4/eval.c:1.21
--- src/usr.bin/m4/eval.c:1.20	Mon Oct 26 17:11:28 2009
+++ src/usr.bin/m4/eval.c	Sat Mar  5 11:38:25 2011
@@ -1,5 +1,5 @@
 /*	$OpenBSD: eval.c,v 1.66 2008/08/21 21:01:47 espie Exp $	*/
-/*	$NetBSD: eval.c,v 1.20 2009/10/26 21:11:28 christos Exp $	*/
+/*	$NetBSD: eval.c,v 1.21 2011/03/05 16:38:25 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
 #include nbtool_config.h
 #endif
 #include sys/cdefs.h
-__RCSID($NetBSD: eval.c,v 1.20 2009/10/26 21:11:28 christos Exp $);
+__RCSID($NetBSD: eval.c,v 1.21 2011/03/05 16:38:25 christos Exp $);
 
 #include sys/types.h
 #include err.h
@@ -429,8 +429,11 @@
 	 */
 		if (argc  2) {
 			for (n = 2; n  argc; n++)
-fprintf(stderr, %s , argv[n]);
-			fprintf(stderr, \n);
+fprintf(stderr, %s%s,
+mimic_gnu  n == 2 ?  :  ,
+argv[n]);
+			if (!mimic_gnu)
+fprintf(stderr, \n);
 		}
 		break;

CVS commit: src/usr.bin/m4

2011-03-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Mar  5 16:38:47 UTC 2011

Modified Files:
src/usr.bin/m4: pathnames.h

Log Message:
add other os support from MirBSD


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/m4/pathnames.h

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

Modified files:

Index: src/usr.bin/m4/pathnames.h
diff -u src/usr.bin/m4/pathnames.h:1.13 src/usr.bin/m4/pathnames.h:1.14
--- src/usr.bin/m4/pathnames.h:1.13	Sat Oct 31 19:25:04 2009
+++ src/usr.bin/m4/pathnames.h	Sat Mar  5 11:38:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pathnames.h,v 1.13 2009/10/31 23:25:04 joerg Exp $	*/
+/*	$NetBSD: pathnames.h,v 1.14 2011/03/05 16:38:46 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,6 +35,21 @@
  */
 
 /*
- * Definitions of diversion files.
+ * Definitions of diversion files.  If the name of the file is changed,
+ * adjust UNIQUE to point to the wildcard (*) character in the filename.
  */
+
+#ifdef msdos
+#define _PATH_DIVNAME	\\M4*XX		/* msdos diversion files */
+#define	UNIQUE		3			/* unique char location */
+#endif
+
+#if defined(unix) || defined(__NetBSD__) || defined(__OpenBSD__)
 #define _PATH_DIVNAME	/tmp/m4.0XX	/* unix diversion files */
+#define UNIQUE		8			/* unique char location */
+#endif
+
+#ifdef vms
+#define _PATH_DIVNAME	sys$login:m4*XX	/* vms diversion files */
+#define UNIQUE		12			/* unique char location */
+#endif

CVS commit: [bouyer-quota2] src

2011-03-05 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sat Mar  5 18:10:44 UTC 2011

Modified Files:
src/usr.bin/quota [bouyer-quota2]: quota.c
src/usr.sbin/edquota [bouyer-quota2]: edquota.c
src/usr.sbin/repquota [bouyer-quota2]: repquota.c

Log Message:
The new quotactl interface should be filesystem-independant, so check only the
MNT_QUOTA flag.


To generate a diff of this commit:
cvs rdiff -u -r1.33.2.9 -r1.33.2.10 src/usr.bin/quota/quota.c
cvs rdiff -u -r1.29.16.11 -r1.29.16.12 src/usr.sbin/edquota/edquota.c
cvs rdiff -u -r1.25.2.8 -r1.25.2.9 src/usr.sbin/repquota/repquota.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/quota/quota.c
diff -u src/usr.bin/quota/quota.c:1.33.2.9 src/usr.bin/quota/quota.c:1.33.2.10
--- src/usr.bin/quota/quota.c:1.33.2.9	Mon Feb 14 20:38:56 2011
+++ src/usr.bin/quota/quota.c	Sat Mar  5 18:10:44 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: quota.c,v 1.33.2.9 2011/02/14 20:38:56 bouyer Exp $	*/
+/*	$NetBSD: quota.c,v 1.33.2.10 2011/03/05 18:10:44 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = @(#)quota.c	8.4 (Berkeley) 4/28/95;
 #else
-__RCSID($NetBSD: quota.c,v 1.33.2.9 2011/02/14 20:38:56 bouyer Exp $);
+__RCSID($NetBSD: quota.c,v 1.33.2.10 2011/03/05 18:10:44 bouyer Exp $);
 #endif
 #endif /* not lint */
 
@@ -507,9 +507,7 @@
 			version = 0;
 			if (getnfsquota(fst[i], NULL, qup, id, quotatype) == 0)
 continue;
-		} else if (strncmp(fst[i].f_fstypename, ffs,
-		sizeof(fst[i].f_fstypename)) == 0 
-		(fst[i].f_flag  ST_QUOTA) != 0) {
+		} else if ((fst[i].f_flag  ST_QUOTA) != 0) {
 			if (getvfsquota(fst[i].f_mntonname, qup-q2e, version,
 			id, quotatype, dflag, Dflag) == 0)
 continue;

Index: src/usr.sbin/edquota/edquota.c
diff -u src/usr.sbin/edquota/edquota.c:1.29.16.11 src/usr.sbin/edquota/edquota.c:1.29.16.12
--- src/usr.sbin/edquota/edquota.c:1.29.16.11	Wed Feb  9 17:48:45 2011
+++ src/usr.sbin/edquota/edquota.c	Sat Mar  5 18:10:44 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: edquota.c,v 1.29.16.11 2011/02/09 17:48:45 bouyer Exp $ */
+/*  $NetBSD: edquota.c,v 1.29.16.12 2011/03/05 18:10:44 bouyer Exp $ */
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = from: @(#)edquota.c	8.3 (Berkeley) 4/27/95;
 #else
-__RCSID($NetBSD: edquota.c,v 1.29.16.11 2011/02/09 17:48:45 bouyer Exp $);
+__RCSID($NetBSD: edquota.c,v 1.29.16.12 2011/03/05 18:10:44 bouyer Exp $);
 #endif
 #endif /* not lint */
 
@@ -386,8 +386,7 @@
 		errx(2, no filesystems mounted!);
 
 	for (i = 0; i  nfst; i++) {
-		if (strcmp(fst[i].f_fstypename, ffs) != 0 ||
-		(fst[i].f_flag  ST_QUOTA) == 0)
+		if ((fst[i].f_flag  ST_QUOTA) == 0)
 			continue;
 		if (filesys  strcmp(fst[i].f_mntonname, filesys) != 0 
 		strcmp(fst[i].f_mntfromname, filesys) != 0)
@@ -1123,8 +1122,7 @@
 		errx(2, no filesystems mounted!);
 
 	for (i = 0; i  nfst; i++) {
-		if (strcmp(fst[i].f_fstypename, ffs) != 0 ||
-		(fst[i].f_flag  ST_QUOTA) == 0)
+		if ((fst[i].f_flag  ST_QUOTA) == 0)
 			continue;
 		if (filesys  strcmp(fst[i].f_mntonname, filesys) != 0 
 		strcmp(fst[i].f_mntfromname, filesys) != 0)

Index: src/usr.sbin/repquota/repquota.c
diff -u src/usr.sbin/repquota/repquota.c:1.25.2.8 src/usr.sbin/repquota/repquota.c:1.25.2.9
--- src/usr.sbin/repquota/repquota.c:1.25.2.8	Mon Feb 14 20:55:36 2011
+++ src/usr.sbin/repquota/repquota.c	Sat Mar  5 18:10:44 2011
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = @(#)repquota.c	8.2 (Berkeley) 11/22/94;
 #else
-__RCSID($NetBSD: repquota.c,v 1.25.2.8 2011/02/14 20:55:36 bouyer Exp $);
+__RCSID($NetBSD: repquota.c,v 1.25.2.9 2011/03/05 18:10:44 bouyer Exp $);
 #endif
 #endif /* not lint */
 
@@ -173,9 +173,7 @@
 	if (nfst == 0)
 		errx(2, no filesystems mounted!);
 	for (i = 0; i  nfst; i++) {
-		if (strncmp(fst[i].f_fstypename, ffs,
-		sizeof(fst[i].f_fstypename)) != 0 ||
-		(fst[i].f_flag  ST_QUOTA) == 0)
+		if ((fst[i].f_flag  ST_QUOTA) == 0)
 			continue;
 		if (aflag) {
 			if (gflag)

CVS commit: src/tests/kernel

2011-03-05 Thread Paul Goyette 
Module Name:src
Committed By:   pgoyette
Date:   Sat Mar  5 18:14:33 UTC 2011

Modified Files:
src/tests/kernel: Makefile
Added Files:
src/tests/kernel: h_ps_strings1.c h_ps_strings2.c t_ps_strings.sh

Log Message:
Add tests for verifying the recent changes to ps_strings

From joerg@ with atf-ification from myself.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/kernel/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/kernel/h_ps_strings1.c \
src/tests/kernel/h_ps_strings2.c src/tests/kernel/t_ps_strings.sh

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

Modified files:

Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.9 src/tests/kernel/Makefile:1.10
--- src/tests/kernel/Makefile:1.9	Thu Nov 11 17:36:57 2010
+++ src/tests/kernel/Makefile	Sat Mar  5 18:14:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/11/11 17:36:57 pooka Exp $
+# $NetBSD: Makefile,v 1.10 2011/03/05 18:14:33 pgoyette Exp $
 
 NOMAN=		# defined
 
@@ -23,6 +23,11 @@
 TESTS_C+=	t_filedesc
 
 TESTS_SH=	t_umount
+TESTS_SH+=	t_ps_strings
+
+BINDIR=		${TESTSDIR}
+PROGS=		h_ps_strings1
+PROGS+=		h_ps_strings2
 
 LDADD.t_rnd+=  -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
 LDADD.t_filedesc+=  -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread

Added files:

Index: src/tests/kernel/h_ps_strings1.c
diff -u /dev/null src/tests/kernel/h_ps_strings1.c:1.1
--- /dev/null	Sat Mar  5 18:14:33 2011
+++ src/tests/kernel/h_ps_strings1.c	Sat Mar  5 18:14:33 2011
@@ -0,0 +1,74 @@
+/*	$NetBSD: h_ps_strings1.c,v 1.1 2011/03/05 18:14:33 pgoyette Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in
+ *the documentation and/or other materials provided with the
+ *distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/types.h
+#include sys/exec.h
+#include stdlib.h
+#include unistd.h
+
+extern struct ps_strings *__ps_strings;
+
+int
+main(int argc, char **argv, char **environ)
+{
+	int ret = 0;
+	int nenv;
+
+	if (__ps_strings-ps_nargvstr != argc) {
+		static const char nargv_err[] = Wrong argc in ps_strings;
+		write(STDOUT_FILENO, nargv_err, sizeof(nargv_err));
+		ret = 1;
+	}
+
+	if (__ps_strings-ps_argvstr != argv) {
+		static const char argv_err[] = Wrong argv in ps_strings;
+		write(STDOUT_FILENO, argv_err, sizeof(argv_err));
+		ret = 1;
+	}
+
+	if (__ps_strings-ps_envstr != environ) {
+		static const char env_err[] = Wrong env in ps_strings;
+		write(STDOUT_FILENO, env_err, sizeof(env_err));
+		ret = 1;
+	}
+	nenv = 0;
+	while (environ[nenv])
+		++nenv;
+	if (__ps_strings-ps_nenvstr != nenv) {
+		static const char nenv_err[] = Wrong nenv in ps_strings;
+		write(STDOUT_FILENO, nenv_err, sizeof(nenv_err));
+		ret = 1;
+	}
+
+	return ret;
+}
Index: src/tests/kernel/h_ps_strings2.c
diff -u /dev/null src/tests/kernel/h_ps_strings2.c:1.1
--- /dev/null	Sat Mar  5 18:14:33 2011
+++ src/tests/kernel/h_ps_strings2.c	Sat Mar  5 18:14:33 2011
@@ -0,0 +1,69 @@
+/*	$NetBSD: h_ps_strings2.c,v 1.1 2011/03/05 18:14:33 pgoyette Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in

CVS commit: src/distrib/sets/lists/tests

2011-03-05 Thread Paul Goyette 
Module Name:src
Committed By:   pgoyette
Date:   Sat Mar  5 18:14:55 UTC 2011

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
sets-list dance for new ps_strings tests


To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/distrib/sets/lists/tests/mi

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.257 src/distrib/sets/lists/tests/mi:1.258
--- src/distrib/sets/lists/tests/mi:1.257	Thu Mar  3 11:54:57 2011
+++ src/distrib/sets/lists/tests/mi	Sat Mar  5 18:14:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.257 2011/03/03 11:54:57 pooka Exp $
+# $NetBSD: mi,v 1.258 2011/03/05 18:14:55 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -284,6 +284,8 @@
 ./usr/libdata/debug/usr/tests/include/t_stdint.debug			tests-ipf-tests		debug,atf
 ./usr/libdata/debug/usr/tests/ipf	tests-ipf-tests
 ./usr/libdata/debug/usr/tests/kernel	tests-kernel-tests
+./usr/libdata/debug/usr/tests/kernel/h_ps_strings1.debug		tests-kernel-tests	debug,atf
+./usr/libdata/debug/usr/tests/kernel/h_ps_strings2.debug		tests-kernel-tests	debug,atf
 ./usr/libdata/debug/usr/tests/kernel/kqueuetests-kernel-tests
 ./usr/libdata/debug/usr/tests/kernel/kqueue/read			tests-kernel-tests
 ./usr/libdata/debug/usr/tests/kernel/kqueue/read/t_fifo.debug		tests-kernel-tests	debug,atf
@@ -1605,6 +1607,8 @@
 ./usr/tests/ipf/t_poolstests-ipf-tests			atf
 ./usr/tests/kerneltests-kernel-tests
 ./usr/tests/kernel/Atffile			tests-kernel-tests		atf
+./usr/tests/kernel/h_ps_strings1		tests-kernel-tests		atf
+./usr/tests/kernel/h_ps_strings2		tests-kernel-tests		atf
 ./usr/tests/kernel/kqueue			tests-kernel-tests
 ./usr/tests/kernel/kqueue/Atffile		tests-kernel-tests		atf
 ./usr/tests/kernel/kqueue/read			tests-kernel-tests
@@ -1632,6 +1636,7 @@
 ./usr/tests/kernel/t_pipe			tests-kernel-tests		atf
 ./usr/tests/kernel/t_poll3w			tests-kernel-tests		atf
 ./usr/tests/kernel/t_posix_fadvise		tests-kernel-tests		atf
+./usr/tests/kernel/t_ps_strings			tests-kernel-tests		atf
 ./usr/tests/kernel/t_rnd			tests-kernel-tests		atf
 ./usr/tests/kernel/t_sigaction			tests-kernel-tests		atf
 ./usr/tests/kernel/t_time			tests-kernel-tests		atf

CVS commit: src/sys/dev/marvell

2011-03-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Mar  5 18:28:13 UTC 2011

Modified Files:
src/sys/dev/marvell: if_mvgbe.c

Log Message:
From Dave Mills: It would appear that the two PHYs can only be
accessed from the registers of controller0 (mvgbec0) hence why both
PHYs are being detected on controller0. I have made the assumption
that PHY0 = controller0 (mvgbec0), PHY1 = controller1(mvgbec1)
and developed a patch accordingly. Also the irq is 15 for controller1
not 14.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/marvell/if_mvgbe.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/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.5 src/sys/dev/marvell/if_mvgbe.c:1.6
--- src/sys/dev/marvell/if_mvgbe.c:1.5	Tue Feb  1 18:40:12 2011
+++ src/sys/dev/marvell/if_mvgbe.c	Sat Mar  5 13:28:13 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mvgbe.c,v 1.5 2011/02/01 23:40:12 jakllsch Exp $	*/
+/*	$NetBSD: if_mvgbe.c,v 1.6 2011/03/05 18:28:13 christos Exp $	*/
 /*
  * Copyright (c) 2007, 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v 1.5 2011/02/01 23:40:12 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v 1.6 2011/03/05 18:28:13 christos Exp $);
 
 #include rnd.h
 
@@ -184,6 +184,7 @@
 
 struct mvgbec_softc {
 	device_t sc_dev;
+	int sc_unit;
 
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
@@ -277,6 +278,7 @@
 CFATTACH_DECL_NEW(mvgbe, sizeof(struct mvgbe_softc),
 mvgbe_match, mvgbe_attach, NULL, NULL);
 
+device_t mvgbec0 = NULL;
 
 struct mvgbe_port {
 	int model;
@@ -305,7 +307,7 @@
 	{ MARVELL_KIRKWOOD_88F6192,	0, 1, { 11 }, FLAGS_FIX_TQTB },
 	{ MARVELL_KIRKWOOD_88F6192,	1, 1, { 14 }, FLAGS_FIX_TQTB },
 	{ MARVELL_KIRKWOOD_88F6281,	0, 1, { 11 }, FLAGS_FIX_TQTB },
-	{ MARVELL_KIRKWOOD_88F6281,	1, 1, { 14 }, FLAGS_FIX_TQTB },
+	{ MARVELL_KIRKWOOD_88F6281,	1, 1, { 15 }, FLAGS_FIX_TQTB },
 
 	{ MARVELL_MV78XX0_MV78100,	0, 1, { 40 }, FLAGS_FIX_TQTB },
 	{ MARVELL_MV78XX0_MV78100,	1, 1, { 44 }, FLAGS_FIX_TQTB },
@@ -353,11 +355,17 @@
 
 	sc-sc_dev = self;
 	sc-sc_iot = mva-mva_iot;
+	sc-sc_unit = mva-mva_unit;
 	if (bus_space_subregion(mva-mva_iot, mva-mva_ioh, mva-mva_offset,
 	mva-mva_size, sc-sc_ioh)) {
 		aprint_error_dev(self, Cannot map registers\n);
 		return;
 	}
+
+	if (sc-sc_unit == 0) {
+		mvgbec0 = self;
+	}
+		
 	phyaddr = 0;
 	MVGBE_WRITE(sc, MVGBE_PHYADDR, phyaddr);
 
@@ -432,11 +440,17 @@
 mvgbec_miibus_readreg(device_t dev, int phy, int reg)
 {
 	struct mvgbe_softc *sc = device_private(dev);
-	struct mvgbec_softc *csc = device_private(device_parent(dev));
+	struct mvgbec_softc *csc;
 	struct ifnet *ifp = sc-sc_ethercom.ec_if;
 	uint32_t smi, val;
 	int i;
 
+	if (mvgbec0 == NULL) {
+		aprint_error_ifnet(ifp, SMI mvgbec0 not found\n);
+		return -1;
+	}
+	csc = device_private(mvgbec0);
+
 	mutex_enter(csc-sc_mtx);
 
 	for (i = 0; i  MVGBE_PHY_TIMEOUT; i++) {
@@ -478,11 +492,17 @@
 mvgbec_miibus_writereg(device_t dev, int phy, int reg, int val)
 {
 	struct mvgbe_softc *sc = device_private(dev);
-	struct mvgbec_softc *csc = device_private(device_parent(dev));
+	struct mvgbec_softc *csc;
 	struct ifnet *ifp = sc-sc_ethercom.ec_if;
 	uint32_t smi;
 	int i;
 
+	if (mvgbec0 == NULL) {
+		aprint_error_ifnet(ifp, SMI mvgbec0 not found\n);
+		return;
+	}
+	csc = device_private(mvgbec0);
+
 	DPRINTFN(9, (mvgbec_miibus_writereg phy=%d reg=%#x val=%#x\n,
 	 phy, reg, val));
 
@@ -602,6 +622,7 @@
 mvgbe_attach(device_t parent, device_t self, void *aux)
 {
 	struct mvgbe_softc *sc = device_private(self);
+	struct mvgbec_softc *csc = device_private(parent);
 	struct marvell_attach_args *mva = aux;
 	struct mvgbe_txmap_entry *entry;
 	struct ifnet *ifp;
@@ -749,7 +770,7 @@
 	ifmedia_init(sc-sc_mii.mii_media, 0,
 	mvgbe_mediachange, mvgbe_mediastatus);
 	mii_attach(self, sc-sc_mii, 0x,
-	MII_PHY_ANY, MII_OFFSET_ANY, 0);
+	csc-sc_unit, MII_OFFSET_ANY, 0);
 	if (LIST_FIRST(sc-sc_mii.mii_phys) == NULL) {
 		aprint_error_dev(self, no PHY found!\n);
 		ifmedia_add(sc-sc_mii.mii_media,

CVS commit: [bouyer-quota2] src/usr.sbin/repquota

2011-03-05 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sat Mar  5 18:53:01 UTC 2011

Modified Files:
src/usr.sbin/repquota [bouyer-quota2]: repquota.c

Log Message:
Make sure users which don't have quota entries are reported with the default
quotas (instead of wrong all-0 quota entry, which cause it to be reported
as overquota now)


To generate a diff of this commit:
cvs rdiff -u -r1.25.2.9 -r1.25.2.10 src/usr.sbin/repquota/repquota.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/repquota/repquota.c
diff -u src/usr.sbin/repquota/repquota.c:1.25.2.9 src/usr.sbin/repquota/repquota.c:1.25.2.10
--- src/usr.sbin/repquota/repquota.c:1.25.2.9	Sat Mar  5 18:10:44 2011
+++ src/usr.sbin/repquota/repquota.c	Sat Mar  5 18:53:00 2011
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = @(#)repquota.c	8.2 (Berkeley) 11/22/94;
 #else
-__RCSID($NetBSD: repquota.c,v 1.25.2.9 2011/03/05 18:10:44 bouyer Exp $);
+__RCSID($NetBSD: repquota.c,v 1.25.2.10 2011/03/05 18:53:00 bouyer Exp $);
 #endif
 #endif /* not lint */
 
@@ -95,6 +95,7 @@
 struct fileusage *addid(u_long, int, const char *);
 int	hasquota(struct fstab *, int, char **);
 struct fileusage *lookup(u_long, int);
+struct fileusage *qremove(u_long, int);
 int	main(int, char **);
 int	oneof(const char *, char **, int);
 int	repquota(const struct statvfs *, int);
@@ -110,8 +111,6 @@
 	int argc;
 	char **argv;
 {
-	struct passwd *pw;
-	struct group *gr;
 	int gflag = 0, uflag = 0, errs = 0;
 	long i, argnum, done = 0;
 	int ch;
@@ -147,7 +146,7 @@
 	}
 	argc -= optind;
 	argv += optind;
-	if (xflag  argc != 1)
+	if (xflag  (argc != 1 || aflag))
 		usage();
 	if (argc == 0  !aflag)
 		usage();
@@ -156,18 +155,6 @@
 			gflag++;
 		uflag++;
 	}
-	if (gflag) {
-		setgrent();
-		while ((gr = getgrent()) != 0)
-			(void) addid((u_long)gr-gr_gid, GRPQUOTA, gr-gr_name);
-		endgrent();
-	}
-	if (uflag) {
-		setpwent();
-		while ((pw = getpwent()) != 0)
-			(void) addid((u_long)pw-pw_uid, USRQUOTA, pw-pw_name);
-		endpwent();
-	}
 
 	nfst = getmntinfo(fst, MNT_WAIT);
 	if (nfst == 0)
@@ -410,6 +397,22 @@
 	char overchar[N_QL];
 	static time_t now;
 
+	if (type == GRPQUOTA) {
+		struct group *gr;
+		setgrent();
+		while ((gr = getgrent()) != 0)
+			(void) addid((u_long)gr-gr_gid, GRPQUOTA, gr-gr_name);
+		endgrent();
+	} else if (type == USRQUOTA) {
+		struct passwd *pw;
+		setpwent();
+		while ((pw = getpwent()) != 0)
+			(void) addid((u_long)pw-pw_uid, USRQUOTA, pw-pw_name);
+		endpwent();
+	} else {
+		errx(1, unknown quota type %d\n, type);
+	}
+
 	if (now == 0)
 		time(now);
 
@@ -424,7 +427,7 @@
 	printf(type == USRQUOTA ? User  : Group);
 	printf(used soft hard  grace  usedsofthard  grace\n);
 	for (id = 0; id = highid[type]; id++) {
-		fup = lookup(id, type);
+		fup = qremove(id, type);
 		if (fup == 0)
 			continue;
 		for (i = 0; i  N_QL; i++) {
@@ -472,7 +475,7 @@
 			intprt(fup-fu_q2e.q2e_val[QL_FILE].q2v_hardlimit,
 0, hflag, 8),
 			timemsg[QL_FILE]);
-		memset(fup-fu_q2e, 0, sizeof(fup-fu_q2e));
+		free(fup);
 	}
 }
 
@@ -506,7 +509,7 @@
 			err(1, prop_array_add(data));
 
 		for (id = 0; id = highid[type]; id++) {
-			fup = lookup(id, type);
+			fup = qremove(id, type);
 			if (fup == 0)
 continue;
 			fup-fu_q2e.q2e_uid = id;
@@ -515,6 +518,7 @@
 err(1, q2etoprop(default));
 			if (!prop_array_add_and_rel(datas, data))
 err(1, prop_array_add(data));
+			free(fup);
 		}
 
 		if (!quota2_prop_add_command(cmds, set,
@@ -602,6 +606,26 @@
 			return (fup);
 	return ((struct fileusage *)0);
 }
+/*
+ * Lookup and remove an id of a specific type.
+ */
+struct fileusage *
+qremove(id, type)
+	u_long id;
+	int type;
+{
+	struct fileusage *fup, **fupp;
+
+	for (fupp = fuhead[type][id  (FUHASH-1)]; *fupp != 0;) {
+		fup = *fupp;
+		if (fup-fu_id == id) {
+			*fupp = fup-fu_next;
+			return (fup);
+		}
+		fupp = fup-fu_next;
+	}
+	return ((struct fileusage *)0);
+}
 
 /*
  * Add a new file usage id if it does not already exist.
@@ -636,5 +660,6 @@
 	} else {
 		sprintf(fup-fu_name, %lu, (u_long)id);
 	}
+	fup-fu_q2e = defaultq2e[type];
 	return (fup);
 }

CVS commit: [bouyer-quota2] src/tests/fs/ffs

2011-03-05 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sat Mar  5 18:54:48 UTC 2011

Modified Files:
src/tests/fs/ffs [bouyer-quota2]: t_getquota.sh

Log Message:
Also check that repquota doesn't report any overquota user


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/tests/fs/ffs/t_getquota.sh

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

Modified files:

Index: src/tests/fs/ffs/t_getquota.sh
diff -u src/tests/fs/ffs/t_getquota.sh:1.1.2.8 src/tests/fs/ffs/t_getquota.sh:1.1.2.9
--- src/tests/fs/ffs/t_getquota.sh:1.1.2.8	Fri Feb 11 16:54:03 2011
+++ src/tests/fs/ffs/t_getquota.sh	Sat Mar  5 18:54:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_getquota.sh,v 1.1.2.8 2011/02/11 16:54:03 bouyer Exp $ 
+# $NetBSD: t_getquota.sh,v 1.1.2.9 2011/03/05 18:54:47 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -69,6 +69,7 @@
 		$(atf_get_srcdir)/rump_quota -${q} -v
 		atf_check -s exit:0 \
 -o match:--0--1   -   - \
+-o not-match:\+\+			  \
 		$(atf_get_srcdir)/rump_repquota -${q} /mnt
 	done

CVS commit: src/sys/arch/next68k/next68k

2011-03-05 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sat Mar  5 19:04:58 UTC 2011

Modified Files:
src/sys/arch/next68k/next68k: machdep.c

Log Message:
p_psstr - p_psstrp


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/next68k/next68k/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/next68k/next68k/machdep.c
diff -u src/sys/arch/next68k/next68k/machdep.c:1.101 src/sys/arch/next68k/next68k/machdep.c:1.102
--- src/sys/arch/next68k/next68k/machdep.c:1.101	Tue Feb  8 20:20:21 2011
+++ src/sys/arch/next68k/next68k/machdep.c	Sat Mar  5 19:04:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.101 2011/02/08 20:20:21 rmind Exp $	*/
+/*	$NetBSD: machdep.c,v 1.102 2011/03/05 19:04:58 joerg Exp $	*/
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.101 2011/02/08 20:20:21 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.102 2011/03/05 19:04:58 joerg Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -339,7 +339,7 @@
 	frame-f_regs[D7] = 0;
 	frame-f_regs[A0] = 0;
 	frame-f_regs[A1] = 0;
-	frame-f_regs[A2] = (int)l-l_proc-p_psstr;
+	frame-f_regs[A2] = l-l_proc-p_psstrp;
 	frame-f_regs[A3] = 0;
 	frame-f_regs[A4] = 0;
 	frame-f_regs[A5] = 0;

CVS commit: [bouyer-quota2] src/usr.sbin/repquota

2011-03-05 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sat Mar  5 19:05:29 UTC 2011

Modified Files:
src/usr.sbin/repquota [bouyer-quota2]: repquota.c

Log Message:
Report user or group name again instead of uid/gid.


To generate a diff of this commit:
cvs rdiff -u -r1.25.2.10 -r1.25.2.11 src/usr.sbin/repquota/repquota.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/repquota/repquota.c
diff -u src/usr.sbin/repquota/repquota.c:1.25.2.10 src/usr.sbin/repquota/repquota.c:1.25.2.11
--- src/usr.sbin/repquota/repquota.c:1.25.2.10	Sat Mar  5 18:53:00 2011
+++ src/usr.sbin/repquota/repquota.c	Sat Mar  5 19:05:29 2011
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = @(#)repquota.c	8.2 (Berkeley) 11/22/94;
 #else
-__RCSID($NetBSD: repquota.c,v 1.25.2.10 2011/03/05 18:53:00 bouyer Exp $);
+__RCSID($NetBSD: repquota.c,v 1.25.2.11 2011/03/05 19:05:29 bouyer Exp $);
 #endif
 #endif /* not lint */
 
@@ -397,19 +397,26 @@
 	char overchar[N_QL];
 	static time_t now;
 
-	if (type == GRPQUOTA) {
+	switch(type) {
+	case  GRPQUOTA:
+		{
 		struct group *gr;
 		setgrent();
 		while ((gr = getgrent()) != 0)
 			(void) addid((u_long)gr-gr_gid, GRPQUOTA, gr-gr_name);
 		endgrent();
-	} else if (type == USRQUOTA) {
+		break;
+		}
+	case USRQUOTA:
+		{
 		struct passwd *pw;
 		setpwent();
 		while ((pw = getpwent()) != 0)
 			(void) addid((u_long)pw-pw_uid, USRQUOTA, pw-pw_name);
 		endpwent();
-	} else {
+		break;
+		}
+	default:
 		errx(1, unknown quota type %d\n, type);
 	}
 
@@ -637,10 +644,31 @@
 	const char *name;
 {
 	struct fileusage *fup, **fhp;
+	struct group *gr = NULL;
+	struct passwd *pw = NULL;
 	int len;
 
-	if ((fup = lookup(id, type)) != NULL)
+	if ((fup = lookup(id, type)) != NULL) {
 		return (fup);
+	}
+	if (name == NULL) {
+		switch(type) {
+		case  GRPQUOTA:
+			gr = getgrgid(id);
+			
+			if (gr != NULL)
+name = gr-gr_name;
+			break;
+		case USRQUOTA:
+			pw = getpwuid(id);
+			if (pw)
+name = pw-pw_name;
+			break;
+		default:
+			errx(1, unknown quota type %d\n, type);
+		}
+	}
+
 	if (name)
 		len = strlen(name);
 	else

CVS commit: src/sys/compat/osf1

2011-03-05 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sat Mar  5 19:08:41 UTC 2011

Modified Files:
src/sys/compat/osf1: osf1_exec.h

Log Message:
Forward define of ps_strings.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/compat/osf1/osf1_exec.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/compat/osf1/osf1_exec.h
diff -u src/sys/compat/osf1/osf1_exec.h:1.12 src/sys/compat/osf1/osf1_exec.h:1.13
--- src/sys/compat/osf1/osf1_exec.h:1.12	Wed Nov 19 18:36:05 2008
+++ src/sys/compat/osf1/osf1_exec.h	Sat Mar  5 19:08:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_exec.h,v 1.12 2008/11/19 18:36:05 ad Exp $ */
+/* $NetBSD: osf1_exec.h,v 1.13 2011/03/05 19:08:40 joerg Exp $ */
 
 /*
  * Copyright (c) 2000 The NetBSD foundation, Inc.
@@ -38,6 +38,7 @@
 extern struct emul emul_osf1;
 
 int osf1_exec_ecoff_probe(struct lwp *, struct exec_package *);
+struct ps_strings;
 int osf1_copyargs(struct lwp *, struct exec_package *, struct ps_strings *, char **,
 void *);

CVS commit: src/doc

2011-03-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Mar  5 19:56:05 UTC 2011

Modified Files:
src/doc: 3RDPARTY

Log Message:
protocol processing stuff moved.


To generate a diff of this commit:
cvs rdiff -u -r1.817 -r1.818 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.817 src/doc/3RDPARTY:1.818
--- src/doc/3RDPARTY:1.817	Wed Mar  2 17:42:01 2011
+++ src/doc/3RDPARTY	Sat Mar  5 14:56:05 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.817 2011/03/02 22:42:01 tron Exp $
+#	$NetBSD: 3RDPARTY,v 1.818 2011/03/05 19:56:05 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1130,7 +1130,7 @@
 License:	None
 Notes:
 1. Download the latest converter from:
-	http://www.sethwklein.net/projects/iana-etc/
+	http://www.sethwklein.net/iana-etc.html
 2. Unpack it and edit the Makefile to reflect the latest location of the files
 3. Run
 	gmake get

CVS commit: src/tests/fs/common

2011-03-05 Thread Antti Kantee 
Module Name:src
Committed By:   pooka
Date:   Sat Mar  5 20:56:28 UTC 2011

Modified Files:
src/tests/fs/common: h_fsmacros.h

Log Message:
Put p2k_ffs back there -- i can't repeat any problems in my qemu/anita
runs.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/tests/fs/common/h_fsmacros.h

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

Modified files:

Index: src/tests/fs/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.32 src/tests/fs/common/h_fsmacros.h:1.33
--- src/tests/fs/common/h_fsmacros.h:1.32	Fri Jan  7 19:54:48 2011
+++ src/tests/fs/common/h_fsmacros.h	Sat Mar  5 20:56:28 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: h_fsmacros.h,v 1.32 2011/01/07 19:54:48 pooka Exp $	*/
+/*	$NetBSD: h_fsmacros.h,v 1.33 2011/03/05 20:56:28 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -177,6 +177,7 @@
   ATF_TC_FSADD(msdosfs,MOUNT_MSDOS,func,desc)\
   ATF_TC_FSADD(nfs,MOUNT_NFS,func,desc)	\
   ATF_TC_FSADD(puffs,MOUNT_PUFFS,func,desc)\
+  ATF_TC_FSADD(p2k_ffs,MOUNT_PUFFS,func,desc)\
   ATF_TC_FSADD(rumpfs,MOUNT_RUMPFS,func,desc)\
   ATF_TC_FSADD(sysvbfs,MOUNT_SYSVBFS,func,desc)\
   ATF_TC_FSADD(tmpfs,MOUNT_TMPFS,func,desc)
@@ -189,6 +190,7 @@
   ATF_TP_FSADD(msdosfs,func);		\
   ATF_TP_FSADD(nfs,func);		\
   ATF_TP_FSADD(puffs,func);		\
+  ATF_TP_FSADD(p2k_ffs,func);		\
   ATF_TP_FSADD(rumpfs,func);		\
   ATF_TP_FSADD(sysvbfs,func);		\
   ATF_TP_FSADD(tmpfs,func);

CVS commit: src/distrib/sets/lists/base

2011-03-05 Thread Havard Eidnes 
Module Name:src
Committed By:   he
Date:   Sat Mar  5 21:19:46 UTC 2011

Modified Files:
src/distrib/sets/lists/base: md.mmeye

Log Message:
This port now installs an /usr/mdec/boot file, so note that here.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base/md.mmeye

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/base/md.mmeye
diff -u src/distrib/sets/lists/base/md.mmeye:1.7 src/distrib/sets/lists/base/md.mmeye:1.8
--- src/distrib/sets/lists/base/md.mmeye:1.7	Sat Nov 29 17:57:34 2008
+++ src/distrib/sets/lists/base/md.mmeye	Sat Mar  5 21:19:46 2011
@@ -1,3 +1,4 @@
-# $NetBSD: md.mmeye,v 1.7 2008/11/29 17:57:34 tsutsui Exp $
+# $NetBSD: md.mmeye,v 1.8 2011/03/05 21:19:46 he Exp $
 ./usr/mdec/bootelfbase-sysutil-bin
 ./usr/mdec/osloaderbase-sysutil-bin
+./usr/mdec/boot	base-sysutil-bin

CVS commit: src/sys/external/bsd/acpica/dist/include/platform

2011-03-05 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Sat Mar  5 21:38:34 UTC 2011

Modified Files:
src/sys/external/bsd/acpica/dist/include/platform: acnetbsd.h

Log Message:
Correct #endif comment.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.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/external/bsd/acpica/dist/include/platform/acnetbsd.h
diff -u src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.5 src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.6
--- src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.5	Fri Feb 18 17:31:14 2011
+++ src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h	Sat Mar  5 21:38:34 2011
@@ -1,7 +1,7 @@
 /**
  *
  * Name: acnetbsd.h - OS specific defines, etc.
- *   $Revision: 1.5 $
+ *   $Revision: 1.6 $
  *
  */
 
@@ -65,7 +65,7 @@
 #if defined(_KERNEL) || defined(_STANDALONE)
 #ifdef _KERNEL_OPT
 #include opt_acpi.h   /* collect build-time options here */
-#endif /* _KERNEL */
+#endif /* _KERNEL_OPT */
 
 #include sys/param.h
 #include sys/systm.h

CVS commit: src/sys/external/bsd/drm/dist/bsd-core

2011-03-05 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Sat Mar  5 21:43:39 UTC 2011

Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_irq.c

Log Message:
Make interrupt establishment failure be noted like most other PCI drivers do.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c

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

Modified files:

Index: src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.13 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.14
--- src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.13	Thu Feb 24 07:59:44 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c	Sat Mar  5 21:43:38 2011
@@ -228,6 +228,8 @@
 	dev-irqh = pci_intr_establish(dev-pa.pa_pc, ih, IPL_TTY,
 	drm_irq_handler_wrap, dev);
 	if (!dev-irqh) {
+		aprint_error_dev(dev-device,
+		couldn't establish interrupt at %s\n, istr);
 		retcode = ENOENT;
 		goto err;
 	}

CVS commit: src/sys/dist/ipf/netinet

2011-03-05 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Sat Mar  5 21:51:18 UTC 2011

Modified Files:
src/sys/dist/ipf/netinet: ip_rcmd_pxy.c

Log Message:
Use %zu for size_t in debugging printf.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dist/ipf/netinet/ip_rcmd_pxy.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/dist/ipf/netinet/ip_rcmd_pxy.c
diff -u src/sys/dist/ipf/netinet/ip_rcmd_pxy.c:1.11 src/sys/dist/ipf/netinet/ip_rcmd_pxy.c:1.12
--- src/sys/dist/ipf/netinet/ip_rcmd_pxy.c:1.11	Wed Aug 19 08:36:12 2009
+++ src/sys/dist/ipf/netinet/ip_rcmd_pxy.c	Sat Mar  5 21:51:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_rcmd_pxy.c,v 1.11 2009/08/19 08:36:12 darrenr Exp $	*/
+/*	$NetBSD: ip_rcmd_pxy.c,v 1.12 2011/03/05 21:51:17 jakllsch Exp $	*/
 
 /*
  * Copyright (C) 1998-2003 by Darren Reed
@@ -12,7 +12,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: ip_rcmd_pxy.c,v 1.11 2009/08/19 08:36:12 darrenr Exp $);
+__KERNEL_RCSID(1, $NetBSD: ip_rcmd_pxy.c,v 1.12 2011/03/05 21:51:17 jakllsch Exp $);
 
 #define	IPF_RCMD_PROXY
 
@@ -71,7 +71,7 @@
 	KMALLOCS(aps-aps_data, u_32_t *, sizeof(u_32_t));
 	if (aps-aps_data == NULL) {
 #ifdef IP_RCMD_PROXY_DEBUG
-		printf(ippr_rcmd_new:KMALLOCS(%d) failed\n, sizeof(u_32_t));
+		printf(ippr_rcmd_new:KMALLOCS(%zu) failed\n, sizeof(u_32_t));
 #endif
 		return -1;
 	}

CVS commit: src/sys/dev/ic

2011-03-05 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Sat Mar  5 22:27:22 UTC 2011

Modified Files:
src/sys/dev/ic: nslm7x.c

Log Message:
Set the ENVSYS_FCHANGERFACT flag soon enough for it to make a difference.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/ic/nslm7x.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/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.56 src/sys/dev/ic/nslm7x.c:1.57
--- src/sys/dev/ic/nslm7x.c:1.56	Wed Oct  6 18:13:33 2010
+++ src/sys/dev/ic/nslm7x.c	Sat Mar  5 22:27:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: nslm7x.c,v 1.56 2010/10/06 18:13:33 jakllsch Exp $ */
+/*	$NetBSD: nslm7x.c,v 1.57 2011/03/05 22:27:21 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nslm7x.c,v 1.56 2010/10/06 18:13:33 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: nslm7x.c,v 1.57 2011/03/05 22:27:21 jakllsch Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1940,6 +1940,8 @@
 
 	for (i = 0; sensors[i].desc; i++) {
 		sc-sensors[i].units = sensors[i].type;
+		if (sc-sensors[i].units == ENVSYS_SVOLTS_DC)
+			sc-sensors[i].flags = ENVSYS_FCHANGERFACT;
 		strlcpy(sc-sensors[i].desc, sensors[i].desc,
 		sizeof(sc-sensors[i].desc));
 		sc-numsensors++;
@@ -1965,7 +1967,6 @@
 	if (data == 0xff) {
 		sc-sensors[n].state = ENVSYS_SINVALID;
 	} else {
-		sc-sensors[n].flags = ENVSYS_FCHANGERFACT;
 		sc-sensors[n].value_cur = (data  4);
 		if (sc-sensors[n].rfact) {
 			sc-sensors[n].value_cur *= sc-sensors[n].rfact;
@@ -2082,7 +2083,6 @@
 	int data;
 
 	data = (*sc-lm_readreg)(sc, sc-lm_sensors[n].reg);
-	sc-sensors[n].flags = ENVSYS_FCHANGERFACT;
 	sc-sensors[n].value_cur = ((data  4) - WB_VREF);
 	if (sc-sensors[n].rfact)
 		sc-sensors[n].value_cur *= sc-sensors[n].rfact;
@@ -2103,7 +2103,6 @@
 
 	data = (*sc-lm_readreg)(sc, sc-lm_sensors[n].reg);
 	sc-sensors[n].value_cur = ((data  3) - WB_W83627EHF_VREF);
-	sc-sensors[n].flags = ENVSYS_FCHANGERFACT;
 	if (sc-sensors[n].rfact)
 		sc-sensors[n].value_cur *= sc-sensors[n].rfact;
 	else

CVS commit: src/sys/arch/sgimips/conf

2011-03-05 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sat Mar  5 23:38:40 UTC 2011

Modified Files:
src/sys/arch/sgimips/conf: GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x

Log Message:
Disable COMPAT_IRIX and related code. The usefulness is under discussion
and code that dereferences pointer into userland without proper checking
needs a full audit.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/conf/GENERIC32_IP12
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/sgimips/conf/GENERIC32_IP3x

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/sgimips/conf/GENERIC32_IP12
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP12:1.8 src/sys/arch/sgimips/conf/GENERIC32_IP12:1.9
--- src/sys/arch/sgimips/conf/GENERIC32_IP12:1.8	Tue Nov 23 11:14:05 2010
+++ src/sys/arch/sgimips/conf/GENERIC32_IP12	Sat Mar  5 23:38:40 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP12,v 1.8 2010/11/23 11:14:05 hannken Exp $
+#	$NetBSD: GENERIC32_IP12,v 1.9 2011/03/05 23:38:40 joerg Exp $
 #
 # GENERIC32_IP12 machine description file
 # 
@@ -32,7 +32,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		GENERIC32-IP2x-$Revision: 1.8 $
+#ident		GENERIC32-IP2x-$Revision: 1.9 $
 
 maxusers	32
 
@@ -86,7 +86,7 @@
 options 	COMPAT_50	# NetBSD 5.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
-options 	COMPAT_IRIX	# binary compatibility with IRIX
+#options 	COMPAT_IRIX	# binary compatibility with IRIX
 #options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_ULTRIX	# binary compatibility with Ultrix 
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
@@ -283,8 +283,8 @@
 #pseudo-device	vcoda		4	# coda minicache - venus comm.
 
 # pseudo devices used for IRIX binary compatibility
-pseudo-device	irix_kmem		# IRIX /dev/kmem
-pseudo-device	irix_usema		# IRIX /dev/usema
+#pseudo-device	irix_kmem		# IRIX /dev/kmem
+#pseudo-device	irix_usema		# IRIX /dev/usema
 
 # Veriexec
 #

Index: src/sys/arch/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.84 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.85
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.84	Tue Nov 23 11:14:05 2010
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x	Sat Mar  5 23:38:40 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP2x,v 1.84 2010/11/23 11:14:05 hannken Exp $
+#	$NetBSD: GENERIC32_IP2x,v 1.85 2011/03/05 23:38:40 joerg Exp $
 #
 # GENERIC32_IP2x machine description file
 # 
@@ -29,7 +29,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		GENERIC32-IP2x-$Revision: 1.84 $
+#ident		GENERIC32-IP2x-$Revision: 1.85 $
 
 maxusers	32
 
@@ -86,7 +86,7 @@
 options 	COMPAT_50	# NetBSD 5.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
-options 	COMPAT_IRIX	# binary compatibility with IRIX
+#options 	COMPAT_IRIX	# binary compatibility with IRIX
 options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_ULTRIX	# binary compatibility with Ultrix 
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
@@ -329,8 +329,8 @@
 pseudo-device	vcoda		4	# coda minicache - venus comm.
 
 # pseudo devices used for IRIX binary compatibility
-pseudo-device	irix_kmem		# IRIX /dev/kmem
-pseudo-device	irix_usema		# IRIX /dev/usema
+#pseudo-device	irix_kmem		# IRIX /dev/kmem
+#pseudo-device	irix_usema		# IRIX /dev/usema
 
 # Veriexec
 #

Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.86 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.87
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.86	Tue Nov 23 11:14:05 2010
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x	Sat Mar  5 23:38:40 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP3x,v 1.86 2010/11/23 11:14:05 hannken Exp $
+#	$NetBSD: GENERIC32_IP3x,v 1.87 2011/03/05 23:38:40 joerg Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -28,7 +28,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		GENERIC32_IP3x-$Revision: 1.86 $
+#ident		GENERIC32_IP3x-$Revision: 1.87 $
 
 maxusers	32
 
@@ -79,7 +79,7 @@
 options 	COMPAT_50	# NetBSD 5.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
-options 	COMPAT_IRIX	# binary compatibility with IRIX
+#options 	COMPAT_IRIX	# binary compatibility with IRIX
 options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_ULTRIX	# binary compatibility with Ultrix 
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
@@ -475,8 +475,8 @@
 pseudo-device	vcoda		4	# coda minicache - venus comm.
 
 # pseudo devices used for IRIX binary compatibility
-pseudo-device	irix_kmem		# IRIX /dev/kmem
-pseudo-device	irix_usema		# IRIX /dev/usema
+#pseudo-device	irix_kmem		# IRIX /dev/kmem
+#pseudo-device	irix_usema		# IRIX /dev/usema
 
 # Veriexec
 #

CVS commit: src/sys/compat

2011-03-05 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sat Mar  5 23:51:47 UTC 2011

Modified Files:
src/sys/compat/darwin: darwin_exec.h darwin_sysctl.c
src/sys/compat/mach: mach_exec.h

Log Message:
Fix compilation


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/darwin/darwin_exec.h
cvs rdiff -u -r1.64 -r1.65 src/sys/compat/darwin/darwin_sysctl.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/mach/mach_exec.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/compat/darwin/darwin_exec.h
diff -u src/sys/compat/darwin/darwin_exec.h:1.16 src/sys/compat/darwin/darwin_exec.h:1.17
--- src/sys/compat/darwin/darwin_exec.h:1.16	Wed Nov 19 18:36:02 2008
+++ src/sys/compat/darwin/darwin_exec.h	Sat Mar  5 23:51:47 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: darwin_exec.h,v 1.16 2008/11/19 18:36:02 ad Exp $ */
+/*	$NetBSD: darwin_exec.h,v 1.17 2011/03/05 23:51:47 joerg Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -49,6 +49,7 @@
 
 #define DARWIN_DED_SIGEXC	1	/* Mach exceptions instead of signals */
 
+struct ps_strings;
 int exec_darwin_copyargs(struct lwp *, struct exec_package *,
 struct ps_strings *, char **, void *);
 int exec_darwin_probe(const char **);

Index: src/sys/compat/darwin/darwin_sysctl.c
diff -u src/sys/compat/darwin/darwin_sysctl.c:1.64 src/sys/compat/darwin/darwin_sysctl.c:1.65
--- src/sys/compat/darwin/darwin_sysctl.c:1.64	Fri Mar  4 22:25:30 2011
+++ src/sys/compat/darwin/darwin_sysctl.c	Sat Mar  5 23:51:47 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: darwin_sysctl.c,v 1.64 2011/03/04 22:25:30 joerg Exp $ */
+/*	$NetBSD: darwin_sysctl.c,v 1.65 2011/03/05 23:51:47 joerg Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: darwin_sysctl.c,v 1.64 2011/03/04 22:25:30 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: darwin_sysctl.c,v 1.65 2011/03/05 23:51:47 joerg Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -977,8 +977,8 @@
 	 * copy argv and env at the same time, we add their lengths.
 	 */
 	nargv = pss.ps_nargvstr;
-	nenv = pss.ps_nenvvstr;
-	tmp = pss.ps_argvstr;
+	nenv = pss.ps_nenvstr;
+	tmp = (char *)pss.ps_argvstr;
 	nstr = nargv + nenv;
 
 	auio.uio_offset = (off_t)(long)tmp;

Index: src/sys/compat/mach/mach_exec.h
diff -u src/sys/compat/mach/mach_exec.h:1.34 src/sys/compat/mach/mach_exec.h:1.35
--- src/sys/compat/mach/mach_exec.h:1.34	Wed Jul  7 01:30:36 2010
+++ src/sys/compat/mach/mach_exec.h	Sat Mar  5 23:51:47 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach_exec.h,v 1.34 2010/07/07 01:30:36 chs Exp $	 */
+/*	$NetBSD: mach_exec.h,v 1.35 2011/03/05 23:51:47 joerg Exp $	 */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -61,6 +61,7 @@
 	struct mach_port *mle_kernel;	/* Thread's kernel port */
 };
 
+struct ps_strings;
 int exec_mach_copyargs(struct lwp *, struct exec_package *,
 struct ps_strings *, char **, void *);
 int exec_mach_probe(const char **);

CVS commit: src/usr.bin/make

2011-03-05 Thread Simon J. Gerraty 
Module Name:src
Committed By:   sjg
Date:   Sat Mar  5 23:57:05 UTC 2011

Modified Files:
src/usr.bin/make: dir.c

Log Message:
Treat some/dir/ the same as some/dir/.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/make/dir.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/make/dir.c
diff -u src/usr.bin/make/dir.c:1.62 src/usr.bin/make/dir.c:1.63
--- src/usr.bin/make/dir.c:1.62	Sat Nov 27 05:02:35 2010
+++ src/usr.bin/make/dir.c	Sat Mar  5 23:57:05 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: dir.c,v 1.62 2010/11/27 05:02:35 sjg Exp $	*/
+/*	$NetBSD: dir.c,v 1.63 2011/03/05 23:57:05 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: dir.c,v 1.62 2010/11/27 05:02:35 sjg Exp $;
+static char rcsid[] = $NetBSD: dir.c,v 1.63 2011/03/05 23:57:05 sjg Exp $;
 #else
 #include sys/cdefs.h
 #ifndef lint
 #if 0
 static char sccsid[] = @(#)dir.c	8.2 (Berkeley) 1/2/94;
 #else
-__RCSID($NetBSD: dir.c,v 1.62 2010/11/27 05:02:35 sjg Exp $);
+__RCSID($NetBSD: dir.c,v 1.63 2011/03/05 23:57:05 sjg Exp $);
 #endif
 #endif /* not lint */
 #endif
@@ -1061,6 +1061,7 @@
 Boolean	  hasSlash;		/* true if 'name' contains a / */
 struct stat	  stb;			/* Buffer for stat, if necessary */
 Hash_Entry	  *entry;		/* Entry for mtimes table */
+const char   *trailing_dot = .;
 
 /*
  * Find the final component of the name and note whether it has a
@@ -1165,6 +1166,11 @@
 	return NULL;
 }
 
+if (*cp == '\0') {
+	/* we were given a trailing / */
+	cp = trailing_dot;
+}
+
 if (name[0] != '/') {
 	Boolean	checkedDot = FALSE;
 
@@ -1272,6 +1278,10 @@
  * b/c we added it here. This is not good...
  */
 #ifdef notdef
+if (cp == traling_dot) {
+	cp = strrchr(name, '/');
+	cp += 1;
+}
 cp[-1] = '\0';
 (void)Dir_AddDir(path, name);
 cp[-1] = '/';

CVS commit: src/usr.bin/make

2011-03-05 Thread Simon J. Gerraty 
Module Name:src
Committed By:   sjg
Date:   Sun Mar  6 00:02:15 UTC 2011

Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: Makefile cond1 test.exp
Added Files:
src/usr.bin/make/unit-tests: misc sysv

Log Message:
Add unit tests to check that exists(some/dir/) works

Also fix handling of sysV substitutions when lhs and variable are empty.

Also that modifiers do not cause errors during conditional tests
when undefined variables should otherwise be ok.
Ie. .if defined(nosuch)  ${nosuch:Mx} != 


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/usr.bin/make/var.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cond1
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/misc \
src/usr.bin/make/unit-tests/sysv
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/make/unit-tests/test.exp

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/make/var.c
diff -u src/usr.bin/make/var.c:1.161 src/usr.bin/make/var.c:1.162
--- src/usr.bin/make/var.c:1.161	Thu Dec  2 16:46:22 2010
+++ src/usr.bin/make/var.c	Sun Mar  6 00:02:15 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $	*/
+/*	$NetBSD: var.c,v 1.162 2011/03/06 00:02:15 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.162 2011/03/06 00:02:15 sjg Exp $;
 #else
 #include sys/cdefs.h
 #ifndef lint
 #if 0
 static char sccsid[] = @(#)var.c	8.3 (Berkeley) 3/19/94;
 #else
-__RCSID($NetBSD: var.c,v 1.161 2010/12/02 16:46:22 christos Exp $);
+__RCSID($NetBSD: var.c,v 1.162 2011/03/06 00:02:15 sjg Exp $);
 #endif
 #endif /* not lint */
 #endif
@@ -3346,9 +3346,13 @@
 		 */
 		termc = *--cp;
 		delim = '\0';
-		newStr = VarModify(ctxt, parsestate, nstr,
-   VarSYSVMatch,
-   pattern);
+		if (pattern.leftLen == 0  *nstr == '\0') {
+		newStr = nstr;	/* special case */
+		} else {
+		newStr = VarModify(ctxt, parsestate, nstr,
+   VarSYSVMatch,
+   pattern);
+		}
 		free(UNCONST(pattern.lhs));
 		free(UNCONST(pattern.rhs));
 	} else
@@ -3746,7 +3750,7 @@
 		nstr = bmake_strndup(start, *lengthPtr);
 		*freePtr = nstr;
 	} else {
-		nstr = var_Error;
+		nstr = errnum ? var_Error : varNoError;
 	}
 	}
 	if (nstr != Buf_GetAll(v-val, NULL))

Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.30 src/usr.bin/make/unit-tests/Makefile:1.31
--- src/usr.bin/make/unit-tests/Makefile:1.30	Fri Dec 10 00:37:23 2010
+++ src/usr.bin/make/unit-tests/Makefile	Sun Mar  6 00:02:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/12/10 00:37:23 sjg Exp $
+# $NetBSD: Makefile,v 1.31 2011/03/06 00:02:14 sjg Exp $
 #
 # Unit tests for make(1)
 # The main targets are:
@@ -27,6 +27,7 @@
 	doterror \
 	dotwait \
 	forsubst \
+	misc \
 	moderrs \
 	modmatch \
 	modmisc \
@@ -35,6 +36,7 @@
 	modword \
 	posix \
 	qequals \
+	sysv \
 	ternary \
 	unexport \
 	unexport-env \

Index: src/usr.bin/make/unit-tests/cond1
diff -u src/usr.bin/make/unit-tests/cond1:1.4 src/usr.bin/make/unit-tests/cond1:1.5
--- src/usr.bin/make/unit-tests/cond1:1.4	Wed Oct 29 15:37:08 2008
+++ src/usr.bin/make/unit-tests/cond1	Sun Mar  6 00:02:14 2011
@@ -1,4 +1,4 @@
-# $Id: cond1,v 1.4 2008/10/29 15:37:08 sjg Exp $
+# $Id: cond1,v 1.5 2011/03/06 00:02:14 sjg Exp $
 
 # hard code these!
 TEST_UNAME_S= NetBSD
@@ -95,6 +95,11 @@
 C=dim
 .endif
 
+.if defined(nosuch)  ${nosuch:Mx} != 
+# this should not happen
+.info nosuch is x
+.endif
+
 all:
 	@echo $n is $X prime
 	@echo A='$A' B='$B' C='$C' o='$o,${o2}'

Index: src/usr.bin/make/unit-tests/test.exp
diff -u src/usr.bin/make/unit-tests/test.exp:1.34 src/usr.bin/make/unit-tests/test.exp:1.35
--- src/usr.bin/make/unit-tests/test.exp:1.34	Fri Apr 23 15:43:28 2010
+++ src/usr.bin/make/unit-tests/test.exp	Sun Mar  6 00:02:14 2011
@@ -306,6 +306,8 @@
 *** Error code 1 (continuing)
 `all' not remade because of errors.
 V.i386 ?= OK
+FOOBAR =
+FOOBAR = foobar fubar
 The answer is unknown
 The answer is unknown
 The answer is empty

Added files:

Index: src/usr.bin/make/unit-tests/misc
diff -u /dev/null src/usr.bin/make/unit-tests/misc:1.1
--- /dev/null	Sun Mar  6 00:02:15 2011
+++ src/usr.bin/make/unit-tests/misc	Sun Mar  6 00:02:14 2011
@@ -0,0 +1,16 @@
+# $Id: misc,v 1.1 2011/03/06 00:02:14 sjg Exp $
+
+.if !exists(${.CURDIR}/)
+.warning ${.CURDIR}/ doesn't exist ?
+.endif
+
+.if !exists(${.CURDIR}/.)
+.warning ${.CURDIR}/. doesn't exist ?
+.endif
+
+.if !exists(${.CURDIR}/..)
+.warning ${.CURDIR}/.. doesn't exist ?
+.endif
+
+all:
+	@: all is well
Index: src/usr.bin/make/unit-tests/sysv
diff -u /dev/null src/usr.bin/make/unit-tests/sysv:1.1
--- /dev/null	Sun Mar  6

CVS commit: src/share/man/man4

2011-03-05 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  6 00:39:11 UTC 2011

Modified Files:
src/share/man/man4: video.4

Log Message:
xref auvitek(4)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/video.4

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

Modified files:

Index: src/share/man/man4/video.4
diff -u src/share/man/man4/video.4:1.6 src/share/man/man4/video.4:1.7
--- src/share/man/man4/video.4:1.6	Sat Jun 13 10:07:55 2009
+++ src/share/man/man4/video.4	Sun Mar  6 00:39:11 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: video.4,v 1.6 2009/06/13 10:07:55 njoly Exp $
+.\	$NetBSD: video.4,v 1.7 2011/03/06 00:39:11 jmcneill Exp $
 .\
 .\ Copyright (c) 2008 Patrick Mahoney
 .\ All rights reserved.
@@ -24,7 +24,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd August 11, 2008
+.Dd March 5, 2011
 .Dt VIDEO 4
 .Os
 .Sh NAME
@@ -252,6 +252,7 @@
 .It Pa /dev/video
 .El
 .Sh SEE ALSO
+.Xr auvitek 4 ,
 .Xr pseye 4 ,
 .Xr uvideo 4 ,
 .Xr video 9

CVS commit: src/external/mit/xorg/lib/freetype/freetype

2011-03-05 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Mar  6 00:59:19 UTC 2011

Modified Files:
src/external/mit/xorg/lib/freetype/freetype: Makefile

Log Message:
set build_libtool_libs to yes so that enable_shared=yes gets into
freetype-config.  part 1 of 2 to fix freetype --config not emitting
any rpath directives.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/freetype/freetype/Makefile

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

Modified files:

Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.6 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.7
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.6	Mon Apr 13 18:58:08 2009
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile	Sun Mar  6 00:59:18 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2009/04/13 18:58:08 snj Exp $
+#	$NetBSD: Makefile,v 1.7 2011/03/06 00:59:18 mrg Exp $
 
 .include bsd.own.mk
 
@@ -27,6 +27,7 @@
 		-e 's%@includedir@%${X11INCDIR}%' \
 		-e 's%@ft_version@%9.17.3%' \
 		-e 's%@FT2_EXTRA_LIBS@%%' \
+		-e 's%@build_libtool_libs@%yes%' \
 		-e 's%@hardcode_libdir_flag_spec@%-Wl,-rpath,${X11USRLIBDIR}%' \
 		-e 's%@LIBZ@%-lz%'

CVS commit: xsrc/external/mit/freetype/dist/builds/unix

2011-03-05 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar  6 01:00:33 UTC 2011

Modified Files:
xsrc/external/mit/freetype/dist/builds/unix: freetype-config.in

Log Message:
actually add the calculated rpath to the list of emitted --libs output.
part 2 of 2 to fix freetype --config not emitting any rpath directives.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in

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/freetype/dist/builds/unix/freetype-config.in
diff -u xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.1.1.3 xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.2
--- xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.1.1.3	Mon Nov 22 08:33:25 2010
+++ xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in	Sun Mar  6 01:00:32 2011
@@ -146,9 +146,9 @@
   fi
   libs=-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@
   if test ${SYSROOT}$libdir != /usr/lib  test ${SYSROOT}$libdir != /usr/lib64; then
-echo -L${SYSROOT}$libdir $libs
+echo -L${SYSROOT}$libdir $libs $rpath
   else
-echo $libs
+echo $libs $rpath
   fi
 fi

CVS commit: xsrc/external/mit/xinit/dist

2011-03-05 Thread David A. Holland 
Module Name:xsrc
Committed By:   dholland
Date:   Sun Mar  6 01:05:51 UTC 2011

Modified Files:
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Use xinitrc.d/?*.sh as the matching pattern instead of needing a
fragile sed substitution XSLASHGLOB to produce xinitrc.d/*.sh. (If
that were used literally the slash-star would confuse cpp.)

Fixes PR 44619. Patch has been sent upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xinit/dist/xinitrc.cpp

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/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.1.1.3 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.2
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.1.1.3	Sun Nov 21 03:47:48 2010
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp	Sun Mar  6 01:05:51 2011
@@ -84,8 +84,9 @@
 XCOMM This is the fallback case if nothing else is executed above
 #endif /* !defined(__SCO__)   !defined(__UNIXWARE__) */
 
+XCOMM do not use slash-star in the glob; slash-questionmark-star is equivalent
 if [ -d XINITDIR/xinitrc.d ] ; then
-	for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
+	for f in XINITDIR/xinitrc.d/?*.sh ; do
 		[ -x $f ]  . $f
 	done
 	unset f

CVS commit: [rmind-uvmplock] src/sys

2011-03-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Mar  6 01:38:46 UTC 2011

Modified Files:
src/sys/dev [rmind-uvmplock]: mm.c
src/sys/kern [rmind-uvmplock]: init_main.c

Log Message:
- mm_init: disable pmap_protect() call on zero-page for now (x86 pmap issue).
- Run evcnt_init() a little bit earlier, before uvm_init().


To generate a diff of this commit:
cvs rdiff -u -r1.13.16.4 -r1.13.16.5 src/sys/dev/mm.c
cvs rdiff -u -r1.418.4.4 -r1.418.4.5 src/sys/kern/init_main.c

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

Modified files:

Index: src/sys/dev/mm.c
diff -u src/sys/dev/mm.c:1.13.16.4 src/sys/dev/mm.c:1.13.16.5
--- src/sys/dev/mm.c:1.13.16.4	Wed Jun  2 03:12:43 2010
+++ src/sys/dev/mm.c	Sun Mar  6 01:38:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mm.c,v 1.13.16.4 2010/06/02 03:12:43 rmind Exp $	*/
+/*	$NetBSD: mm.c,v 1.13.16.5 2011/03/06 01:38:45 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2008, 2010 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mm.c,v 1.13.16.4 2010/06/02 03:12:43 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: mm.c,v 1.13.16.5 2011/03/06 01:38:45 rmind Exp $);
 
 #include opt_compat_netbsd.h
 
@@ -89,7 +89,9 @@
 	/* Read-only zero-page. */
 	pg = uvm_km_alloc(kernel_map, PAGE_SIZE, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
 	KASSERT(pg != 0);
+#if 0
 	pmap_protect(pmap_kernel(), pg, pg + PAGE_SIZE, VM_PROT_READ);
+#endif
 	pmap_update(pmap_kernel());
 	dev_zero_page = (void *)pg;
 

Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.418.4.4 src/sys/kern/init_main.c:1.418.4.5
--- src/sys/kern/init_main.c:1.418.4.4	Sat Mar  5 20:55:12 2011
+++ src/sys/kern/init_main.c	Sun Mar  6 01:38:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.418.4.4 2011/03/05 20:55:12 rmind Exp $	*/
+/*	$NetBSD: init_main.c,v 1.418.4.5 2011/03/06 01:38:45 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.418.4.4 2011/03/05 20:55:12 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.418.4.5 2011/03/06 01:38:45 rmind Exp $);
 
 #include opt_ddb.h
 #include opt_ipsec.h
@@ -308,6 +308,9 @@
 	/* Initialize the device switch tables. */
 	devsw_init();
 
+	/* Initialize event counters. */
+	evcnt_init();
+
 	uvm_init();
 
 	prop_kern_init();
@@ -326,9 +329,6 @@
 	/* Initialize the extent manager. */
 	extent_init();
 
-	/* Initialize event counters */
-	evcnt_init();
-
 	/* Do machine-dependent initialization. */
 	cpu_startup();

CVS commit: src/sys/arch/evbarm/conf

2011-03-05 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Sun Mar  6 02:18:36 UTC 2011

Modified Files:
src/sys/arch/evbarm/conf: HDL_G INTEGRATOR IQ80310 IQ80321 IXM1200
TISDP2420

Log Message:
Bump SYMTAB_SPACE.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/HDL_G
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/conf/INTEGRATOR
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/conf/IQ80310
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/IQ80321
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/IXM1200
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/TISDP2420

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/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.20 src/sys/arch/evbarm/conf/HDL_G:1.21
--- src/sys/arch/evbarm/conf/HDL_G:1.20	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/HDL_G	Sun Mar  6 02:18:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.20 2010/11/23 11:13:56 hannken Exp $
+# $NetBSD: HDL_G,v 1.21 2011/03/06 02:18:36 jakllsch Exp $
 #
 #   HDL_G -- I-O DATA HDL-G Kernel
 #
@@ -143,7 +143,7 @@
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=512000
+options 	SYMTAB_SPACE=59
 
 #config		netbsd		root on ? type ?
 config		netbsd		root on wd0a type ?

Index: src/sys/arch/evbarm/conf/INTEGRATOR
diff -u src/sys/arch/evbarm/conf/INTEGRATOR:1.59 src/sys/arch/evbarm/conf/INTEGRATOR:1.60
--- src/sys/arch/evbarm/conf/INTEGRATOR:1.59	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/INTEGRATOR	Sun Mar  6 02:18:36 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: INTEGRATOR,v 1.59 2010/11/23 11:13:56 hannken Exp $
+#	$NetBSD: INTEGRATOR,v 1.60 2011/03/06 02:18:36 jakllsch Exp $
 #
 #	GENERIC -- ARM Integrator board Generic kernel
 #
@@ -135,7 +135,7 @@
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	UVMHIST
 #makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=35
+options 	SYMTAB_SPACE=36
 options 	PLCONSOLE,PLCOMCNUNIT=0,PLCONSPEED=38400,PLCONMODE=0xB00
 
 config		netbsd		root on ? type ?

Index: src/sys/arch/evbarm/conf/IQ80310
diff -u src/sys/arch/evbarm/conf/IQ80310:1.69 src/sys/arch/evbarm/conf/IQ80310:1.70
--- src/sys/arch/evbarm/conf/IQ80310:1.69	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/IQ80310	Sun Mar  6 02:18:36 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80310,v 1.69 2010/11/23 11:13:56 hannken Exp $
+#	$NetBSD: IQ80310,v 1.70 2011/03/06 02:18:36 jakllsch Exp $
 #
 #	IQ80310 -- Intel IQ80310 Evaluation Board Kernel
 #
@@ -136,7 +136,7 @@
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=335000
+options 	SYMTAB_SPACE=39
 
 config		netbsd		root on ? type ?
 config		netbsd-fxp0	root on fxp0 type nfs

Index: src/sys/arch/evbarm/conf/IQ80321
diff -u src/sys/arch/evbarm/conf/IQ80321:1.64 src/sys/arch/evbarm/conf/IQ80321:1.65
--- src/sys/arch/evbarm/conf/IQ80321:1.64	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/IQ80321	Sun Mar  6 02:18:36 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80321,v 1.64 2010/11/23 11:13:56 hannken Exp $
+#	$NetBSD: IQ80321,v 1.65 2011/03/06 02:18:36 jakllsch Exp $
 #
 #	IQ80321 -- Intel IQ80321 Evaluation Board Kernel
 #
@@ -135,7 +135,7 @@
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=34
+options 	SYMTAB_SPACE=35
 
 config		netbsd		root on ? type ?
 config		netbsd-wm0	root on wm0 type nfs

Index: src/sys/arch/evbarm/conf/IXM1200
diff -u src/sys/arch/evbarm/conf/IXM1200:1.41 src/sys/arch/evbarm/conf/IXM1200:1.42
--- src/sys/arch/evbarm/conf/IXM1200:1.41	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/IXM1200	Sun Mar  6 02:18:36 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: IXM1200,v 1.41 2010/11/23 11:13:56 hannken Exp $
+#	$NetBSD: IXM1200,v 1.42 2011/03/06 02:18:36 jakllsch Exp $
 #
 #	IXM1200 -- Intel IXM1200 Evaluation Board Kernel
 #
@@ -133,7 +133,7 @@
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=31
+options 	SYMTAB_SPACE=33
 
 config		netbsd		root on ? type ?
 

Index: src/sys/arch/evbarm/conf/TISDP2420
diff -u src/sys/arch/evbarm/conf/TISDP2420:1.13 src/sys/arch/evbarm/conf/TISDP2420:1.14
--- src/sys/arch/evbarm/conf/TISDP2420:1.13	Sat Jun 19 19:44:58 2010
+++ src/sys/arch/evbarm/conf/TISDP2420	Sun Mar  6 02:18:36 2011
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: TISDP2420,v 1.13 2010/06/19 19:44:58 matt Exp $
+#	$NetBSD: TISDP2420,v 1.14 2011/03/06 02:18:36 jakllsch Exp $
 #
 #	TISDP2420 -- TI OMAP 2420 Eval Board Kernel
 #
@@ -141,7 +141,7 @@

CVS commit: src/sys/arch/evbarm/conf

2011-03-05 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Sun Mar  6 02:22:27 UTC 2011

Modified Files:
src/sys/arch/evbarm/conf: BEAGLEBOARD GEMINI GEMINI_MASTER GEMINI_SLAVE
IGEPV2 IQ31244 IXM1200 LUBBOCK Makefile.evbarm.inc NAPPI SHEEVAPLUG
TEAMASA_NPWR TISDP2420 TISDP2430 TOASTER TS7200_LCD TWINTAIL
files.overo ldscript.evbarm mk.beagle std.imx31

Log Message:
Remove trailing spaces.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/GEMINI \
src/sys/arch/evbarm/conf/GEMINI_MASTER \
src/sys/arch/evbarm/conf/GEMINI_SLAVE src/sys/arch/evbarm/conf/TISDP2420
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/IGEPV2 \
src/sys/arch/evbarm/conf/TOASTER src/sys/arch/evbarm/conf/TS7200_LCD
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/IQ31244
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/IXM1200
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/NAPPI
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/SHEEVAPLUG \
src/sys/arch/evbarm/conf/files.overo src/sys/arch/evbarm/conf/std.imx31
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/TEAMASA_NPWR
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/TISDP2430
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/ldscript.evbarm
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.beagle

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/evbarm/conf/BEAGLEBOARD
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.15 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.16
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.15	Sat Feb 26 18:07:18 2011
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD	Sun Mar  6 02:22:27 2011
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BEAGLEBOARD,v 1.15 2011/02/26 18:07:18 ahoka Exp $
+#	$NetBSD: BEAGLEBOARD,v 1.16 2011/03/06 02:22:27 jakllsch Exp $
 #
 #	BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
 #
@@ -146,8 +146,8 @@
 ## USB Debugging options
 options USB_DEBUG
 options EHCI_DEBUG
-options OHCI_DEBUG 
-options UHUB_DEBUG 
+options OHCI_DEBUG
+options UHUB_DEBUG
 
 
 # Valid options for BOOT_ARGS:
@@ -175,10 +175,10 @@
 L3i0		at mainbus?
 
 # OBIO
-obio0		at mainbus? base 0x4800 size 0x100	# L4 CORE 
-obio1		at mainbus? base 0x4830 size 0x004	# L4 WAKEUP 
-obio2		at mainbus? base 0x4900 size 0x010	# L4 PERIPHERAL 
-#obio3		at mainbus? base 0x5400 size 0x080	# L4 EMUL 
+obio0		at mainbus? base 0x4800 size 0x100	# L4 CORE
+obio1		at mainbus? base 0x4830 size 0x004	# L4 WAKEUP
+obio2		at mainbus? base 0x4900 size 0x010	# L4 PERIPHERAL
+#obio3		at mainbus? base 0x5400 size 0x080	# L4 EMUL
 
 # General Purpose Memory Controller
 gpmc0		at mainbus? base 0x6e00

Index: src/sys/arch/evbarm/conf/GEMINI
diff -u src/sys/arch/evbarm/conf/GEMINI:1.14 src/sys/arch/evbarm/conf/GEMINI:1.15
--- src/sys/arch/evbarm/conf/GEMINI:1.14	Fri Apr 16 13:48:30 2010
+++ src/sys/arch/evbarm/conf/GEMINI	Sun Mar  6 02:22:27 2011
@@ -1,5 +1,5 @@
 #
-#	GEMINI -- 
+#	GEMINI --
 #
 
 include	arch/evbarm/conf/std.gemini
@@ -202,7 +202,7 @@
 
 # USB
 ehci0	at obio? addr 0x6800 size 0x400 intr 10 # 30?
-ehci1	at obio? addr 0x6900 size 0x400 intr 11 # 31? 
+ehci1	at obio? addr 0x6900 size 0x400 intr 11 # 31?
 
 usb* at ehci?
 uhub* at usb?
@@ -213,7 +213,7 @@
 
 # PCI
 pci0	at obio? bus ?
-options PCI_NETBSD_CONFIGURE		# set up the PCI bus 
+options PCI_NETBSD_CONFIGURE		# set up the PCI bus
 options	PCIVERBOSE
 options PCI_CONFIG_DUMP
 
Index: src/sys/arch/evbarm/conf/GEMINI_MASTER
diff -u src/sys/arch/evbarm/conf/GEMINI_MASTER:1.14 src/sys/arch/evbarm/conf/GEMINI_MASTER:1.15
--- src/sys/arch/evbarm/conf/GEMINI_MASTER:1.14	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/GEMINI_MASTER	Sun Mar  6 02:22:27 2011
@@ -1,5 +1,5 @@
 #
-#	GEMINI -- 
+#	GEMINI --
 #
 
 include	arch/evbarm/conf/std.gemini
@@ -220,7 +220,7 @@
 
 # USB
 ##ehci0	at obio? addr 0x6800 size 0x400 intr 10 # 30?
-##ehci1	at obio? addr 0x6900 size 0x400 intr 11 # 31? 
+##ehci1	at obio? addr 0x6900 size 0x400 intr 11 # 31?
 
 ##usb* at ehci?
 ##uhub* at usb?
@@ -229,7 +229,7 @@
 
 # PCI
 ##pci0	at obio? bus ?
-##options PCI_NETBSD_CONFIGURE		# set up the PCI bus 
+##options PCI_NETBSD_CONFIGURE		# set up the PCI bus
 ##options	PCIVERBOSE
 ##options PCI_CONFIG_DUMP
 
Index: src/sys/arch/evbarm/conf/GEMINI_SLAVE
diff -u src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.14 src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.15
--- src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.14	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/GEMINI_SLAVE	Sun Mar  6 02:22:27 2011
@@ -1,5 +1,5 @@
 #
-#	GEMINI_SLAVE -- 
+#	GEMINI_SLAVE --
 #

CVS commit: othersrc/zfs

2011-03-05 Thread Alistair G. Crooks 
Module Name:othersrc
Committed By:   agc
Date:   Sun Mar  6 04:04:42 UTC 2011

Removed Files:
othersrc/zfs/external/cddl/osnet: Makefile Makefile.zfs
OPENSOLARIS.LICENSE
othersrc/zfs/external/cddl/osnet/dist/cmd/zdb: zdb.c zdb_il.c
othersrc/zfs/external/cddl/osnet/dist/cmd/zfs: zfs_iter.c zfs_iter.h
zfs_main.c zfs_util.h
othersrc/zfs/external/cddl/osnet/dist/cmd/zpool: zpool_iter.c
zpool_main.c zpool_util.c zpool_util.h zpool_vdev.c
othersrc/zfs/external/cddl/osnet/dist/cmd/ztest: ztest.c
othersrc/zfs/external/cddl/osnet/dist/common/acl: acl_common.c
acl_common.h
othersrc/zfs/external/cddl/osnet/dist/common/avl: avl.c
othersrc/zfs/external/cddl/osnet/dist/common/nvpair: nvpair.c
nvpair_alloc_fixed.c
othersrc/zfs/external/cddl/osnet/dist/common/unicode: u8_textprep.c
othersrc/zfs/external/cddl/osnet/dist/common/zfs: zfs_comutil.c
zfs_comutil.h zfs_deleg.c zfs_deleg.h zfs_namecheck.c
zfs_namecheck.h zfs_prop.c zfs_prop.h zpool_prop.c zprop_common.c
othersrc/zfs/external/cddl/osnet/dist/head: ucred.h
othersrc/zfs/external/cddl/osnet/dist/lib/libefi/common: crc32_efi.c
othersrc/zfs/external/cddl/osnet/dist/lib/libnvpair: libnvpair.c
libnvpair.h nvpair_alloc_system.c
othersrc/zfs/external/cddl/osnet/dist/lib/libshare/common: libshare.h
othersrc/zfs/external/cddl/osnet/dist/lib/libuutil/common: libuutil.h
libuutil_common.h libuutil_impl.h uu_alloc.c uu_avl.c uu_dprintf.c
uu_ident.c uu_list.c uu_misc.c uu_open.c uu_pname.c uu_strtoint.c
othersrc/zfs/external/cddl/osnet/dist/lib/libzfs/common: libzfs.h
libzfs_changelist.c libzfs_config.c libzfs_dataset.c libzfs_graph.c
libzfs_impl.h libzfs_import.c libzfs_mount.c libzfs_pool.c
libzfs_sendrecv.c libzfs_status.c libzfs_util.c
othersrc/zfs/external/cddl/osnet/dist/lib/libzpool/common: taskq.c
util.c
othersrc/zfs/external/cddl/osnet/dist/uts/common: Makefile.files
othersrc/zfs/external/cddl/osnet/dist/uts/common/fs: gfs.c
othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs: arc.c bplist.c
dbuf.c dmu.c dmu_object.c dmu_objset.c dmu_send.c dmu_traverse.c
dmu_tx.c dmu_zfetch.c dnode.c dnode_sync.c dsl_dataset.c
dsl_deleg.c dsl_dir.c dsl_pool.c dsl_prop.c dsl_scrub.c
dsl_synctask.c fletcher.c gzip.c lzjb.c metaslab.c refcount.c
rrwlock.c sha256.c spa.c spa_config.c spa_errlog.c spa_history.c
spa_misc.c space_map.c txg.c uberblock.c unique.c vdev.c
vdev_cache.c vdev_disk.c vdev_file.c vdev_label.c vdev_mirror.c
vdev_missing.c vdev_queue.c vdev_raidz.c vdev_root.c zap.c
zap_leaf.c zap_micro.c zfs.conf zfs_acl.c zfs_byteswap.c
zfs_ctldir.c zfs_dir.c zfs_fm.c zfs_fuid.c zfs_ioctl.c zfs_log.c
zfs_replay.c zfs_rlock.c zfs_vfsops.c zfs_vnops.c zfs_znode.c zil.c
zio.c zio_checksum.c zio_compress.c zio_inject.c zvol.c
othersrc/zfs/external/cddl/osnet/dist/uts/common/fs/zfs/sys: arc.h
bplist.h dbuf.h dmu.h dmu_impl.h dmu_objset.h dmu_traverse.h
dmu_tx.h dmu_zfetch.h dnode.h dsl_dataset.h dsl_deleg.h dsl_dir.h
dsl_pool.h dsl_prop.h dsl_synctask.h metaslab.h metaslab_impl.h
refcount.h rrwlock.h spa.h spa_boot.h spa_impl.h space_map.h txg.h
txg_impl.h uberblock.h uberblock_impl.h unique.h vdev.h vdev_disk.h
vdev_file.h vdev_impl.h zap.h zap_impl.h zap_leaf.h zfs_acl.h
zfs_context.h zfs_ctldir.h zfs_debug.h zfs_dir.h zfs_fuid.h
zfs_ioctl.h zfs_rlock.h zfs_vfsops.h zfs_znode.h zil.h zil_impl.h
zio.h zio_checksum.h zio_compress.h zio_impl.h zvol.h
othersrc/zfs/external/cddl/osnet/dist/uts/common/os: list.c
nvpair_alloc_system.c
othersrc/zfs/external/cddl/osnet/dist/uts/common/rpc: types.h xdr.c
xdr.h xdr_array.c xdr_mem.c
othersrc/zfs/external/cddl/osnet/dist/uts/common/sys: acl.h acl_impl.h
attr.h avl.h avl_impl.h bitmap.h byteorder.h callb.h ccompile.h
compress.h crc32.h cred.h debug.h dklabel.h efi_partition.h
errorq.h feature_tests.h gfs.h list.h list_impl.h mntent.h mnttab.h
note.h nvpair.h nvpair_impl.h priv.h priv_names.h sdt.h stropts.h
synch.h sysevent.h systeminfo.h taskq.h taskq_impl.h u8_textprep.h
u8_textprep_data.h vtoc.h zmod.h
othersrc/zfs/external/cddl/osnet/dist/uts/common/sys/fm: protocol.h
util.h
othersrc/zfs/external/cddl/osnet/dist/uts/common/sys/fm/fs: zfs.h
othersrc/zfs/external/cddl/osnet/dist/uts/common/sys/fs: zfs.h
othersrc/zfs/external/cddl/osnet/dist/uts/common/sys/sysevent:
eventdefs.h

CVS commit: src/external/mit/xorg/lib/libXi

2011-03-05 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  6 04:10:55 UTC 2011

Modified Files:
src/external/mit/xorg/lib/libXi: Makefile

Log Message:
match up libXi sources with those from libXi Makefile.am -- lots were
missing, including all of XI2 sources!


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXi/Makefile

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

Modified files:

Index: src/external/mit/xorg/lib/libXi/Makefile
diff -u src/external/mit/xorg/lib/libXi/Makefile:1.5 src/external/mit/xorg/lib/libXi/Makefile:1.6
--- src/external/mit/xorg/lib/libXi/Makefile:1.5	Sat May 22 02:41:33 2010
+++ src/external/mit/xorg/lib/libXi/Makefile	Sun Mar  6 04:10:55 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2010/05/22 02:41:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2011/03/06 04:10:55 jmcneill Exp $
 
 .include bsd.own.mk
 
@@ -6,15 +6,62 @@
 .PATH:	${X11SRCDIR.${LIB}}/src
 .PATH:	${X11SRCDIR.${LIB}}/include/X11/extensions
 
-SRCS=	XAllowDv.c XChgDCtl.c XChgFCtl.c XChgKMap.c XChgKbd.c \
-	XChgPnt.c XChgProp.c XCloseDev.c XDevBell.c XExtInt.c \
-	XExtToWire.c XGMotion.c XGetBMap.c XGetDCtl.c XGetFCtl.c \
-	XGetKMap.c XGetMMap.c XGetProp.c XGetVers.c XGrDvBut.c \
-	XGrDvKey.c XGrabDev.c XGtFocus.c XGtSelect.c XListDev.c \
-	XOpenDev.c XQueryDv.c XSelect.c XSetBMap.c XSetDVal.c \
-	XSetMMap.c XSetMode.c XSndExEv.c XStFocus.c XUngrDev.c \
-	XUngrDvB.c XUngrDvK.c XChDProp.c XGetDProp.c XDelDProp.c \
-	XListDProp.c
+SRCS=	XIAllowEvents.c \
+	XIGrabDevice.c \
+	XIQueryVersion.c \
+	XIQueryDevice.c \
+	XISetDevFocus.c \
+	XIGetDevFocus.c \
+	XIPassiveGrab.c \
+	XIProperties.c \
+	XISelEv.c \
+	XIWarpPointer.c \
+	XIHierarchy.c \
+	XIDefineCursor.c \
+	XIQueryPointer.c
+SRCS+=	XAllowDv.c \
+	XChDProp.c \
+	XChgDCtl.c \
+	XChgFCtl.c \
+	XChgKbd.c \
+	XChgKMap.c \
+	XChgPnt.c \
+	XChgProp.c \
+	XCloseDev.c \
+	XDelDProp.c \
+	XDevBell.c \
+	XExtToWire.c \
+	XGetBMap.c \
+	XGetCPtr.c \
+	XGetDCtl.c \
+	XGetDProp.c \
+	XGetFCtl.c \
+	XGetKMap.c \
+	XGetMMap.c \
+	XGetProp.c \
+	XGetVers.c \
+	XGMotion.c \
+	XGrabDev.c \
+	XGrDvBut.c \
+	XGrDvKey.c \
+	XGtFocus.c \
+	XGtSelect.c \
+	XListDev.c \
+	XListDProp.c \
+	XOpenDev.c \
+	XQueryDv.c \
+	XSelect.c \
+	XSetBMap.c \
+	XSetCPtr.c \
+	XSetDVal.c \
+	XSetMMap.c \
+	XSetMode.c \
+	XSndExEv.c \
+	XStFocus.c \
+	XUngrDev.c \
+	XUngrDvB.c \
+	XUngrDvK.c \
+	XExtInt.c
 
 CPPFLAGS+=	${X11FLAGS.THREADLIB}

CVS commit: src/usr.bin/make

2011-03-05 Thread Simon J. Gerraty 
Module Name:src
Committed By:   sjg
Date:   Sun Mar  6 04:34:25 UTC 2011

Modified Files:
src/usr.bin/make: meta.c

Log Message:
CWD should be compared against cwd


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/meta.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/make/meta.c
diff -u src/usr.bin/make/meta.c:1.9 src/usr.bin/make/meta.c:1.10
--- src/usr.bin/make/meta.c:1.9	Fri Mar  4 04:55:51 2011
+++ src/usr.bin/make/meta.c	Sun Mar  6 04:34:25 2011
@@ -1091,7 +1091,7 @@
 		ln = Lst_Succ(ln);
 		}
 	} else if (strcmp(buf, CWD) == 0) {
-		if (strcmp(p, curdir) != 0) {
+		if (strcmp(p, cwd) != 0) {
 		if (DEBUG(META))
 			fprintf(debug_file, %s: %d: the current working directory has changed from '%s' to '%s'\n, fname, lineno, p, curdir);
 		oodate = TRUE;

CVS commit: src/sys/kern

2011-03-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Mar  6 04:41:58 UTC 2011

Modified Files:
src/sys/kern: sys_select.c

Log Message:
In a case of direct select, set only masked events, do not wakeup LWP
if no polled/selected events were set; also, count the correct return
value for the select.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/sys_select.c

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

Modified files:

Index: src/sys/kern/sys_select.c
diff -u src/sys/kern/sys_select.c:1.29 src/sys/kern/sys_select.c:1.30
--- src/sys/kern/sys_select.c:1.29	Sat Dec 18 01:36:19 2010
+++ src/sys/kern/sys_select.c	Sun Mar  6 04:41:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_select.c,v 1.29 2010/12/18 01:36:19 rmind Exp $	*/
+/*	$NetBSD: sys_select.c,v 1.30 2011/03/06 04:41:58 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_select.c,v 1.29 2010/12/18 01:36:19 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_select.c,v 1.30 2011/03/06 04:41:58 rmind Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -249,7 +249,7 @@
 
 	l-l_selret = 0;
 	if (op == SELOP_SELECT) {
-		l-l_selbits = (char *)fds + ni * 3;
+		l-l_selbits = fds;
 		l-l_selni = ni;
 	} else {
 		l-l_selbits = NULL;
@@ -612,10 +612,11 @@
  * sel_setevents: a helper function for selnotify(), to set the events
  * for LWP sleeping in selcommon() or pollcommon().
  */
-static inline void
+static inline bool
 sel_setevents(lwp_t *l, struct selinfo *sip, const int events)
 {
 	const int oflag = l-l_selflag;
+	int ret = 0;
 
 	/*
 	 * If we require re-scan or it was required by somebody else,
@@ -623,32 +624,45 @@
 	 */
 	if (__predict_false(events == 0 || oflag == SEL_RESET)) {
 		l-l_selflag = SEL_RESET;
-		return;
+		return true;
 	}
 	/*
 	 * Direct set.  Note: select state of LWP is locked.  First,
 	 * determine whether it is selcommon() or pollcommon().
 	 */
 	if (l-l_selbits != NULL) {
-		fd_mask *fds = (fd_mask *)l-l_selbits;
 		const size_t ni = l-l_selni;
-		const int fd = sip-sel_fdinfo;
+		fd_mask *fds = (fd_mask *)l-l_selbits;
+		fd_mask *ofds = (fd_mask *)((char *)fds + ni * 3);
+		const int fd = sip-sel_fdinfo, fbit = 1  (fd  __NFDMASK);
 		const int idx = fd  __NFDSHIFT;
 		int n;
 
 		for (n = 0; n  3; n++) {
-			if (sel_flag[n]  events) {
-fds[idx] |= 1  (fd  __NFDMASK);
+			if ((fds[idx]  fbit) != 0  (sel_flag[n]  events)) {
+ofds[idx] |= fbit;
+ret++;
 			}
 			fds = (fd_mask *)((char *)fds + ni);
+			ofds = (fd_mask *)((char *)ofds + ni);
 		}
 	} else {
 		struct pollfd *pfd = (void *)sip-sel_fdinfo;
-		pfd-revents |= events;
+		int revents = events  (pfd-events | POLLERR | POLLHUP);
+
+		if (revents) {
+			pfd-revents |= revents;
+			ret = 1;
+		}
+	}
+	/* Check whether there are any events to return. */
+	if (!ret) {
+		return false;
 	}
 	/* Indicate direct set and note the event (cluster lock is held). */
 	l-l_selflag = SEL_EVENT;
-	l-l_selret++;
+	l-l_selret += ret;
+	return true;
 }
 
 /*
@@ -688,7 +702,11 @@
 			l = sip-sel_lwp;
 			oflag = l-l_selflag;
 #ifndef NO_DIRECT_SELECT
-			sel_setevents(l, sip, events);
+			if (!sel_setevents(l, sip, events)) {
+/* No events to return. */
+mutex_spin_exit(lock);
+return;
+			}
 #else
 			l-l_selflag = SEL_RESET;
 #endif

CVS commit: src/sys/ufs

2011-03-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Sun Mar  6 04:46:27 UTC 2011

Modified Files:
src/sys/ufs/ext2fs: ext2fs_alloc.c
src/sys/ufs/ffs: ffs_alloc.c

Log Message:
{ffs_nodealloccg,ext2fs_nodealloccg,ext2fs_mapsearch}: use XOR and ffs()
to find free bits in the inode and block bitmaps, instead of the loop.

Obtained from FreeBSD (changes by jhb).


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.125 -r1.126 src/sys/ufs/ffs/ffs_alloc.c

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

Modified files:

Index: src/sys/ufs/ext2fs/ext2fs_alloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.41 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.42
--- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.41	Mon Oct 19 18:41:17 2009
+++ src/sys/ufs/ext2fs/ext2fs_alloc.c	Sun Mar  6 04:46:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_alloc.c,v 1.41 2009/10/19 18:41:17 bouyer Exp $	*/
+/*	$NetBSD: ext2fs_alloc.c,v 1.42 2011/03/06 04:46:26 rmind Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_alloc.c,v 1.41 2009/10/19 18:41:17 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_alloc.c,v 1.42 2011/03/06 04:46:26 rmind Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -470,16 +470,12 @@
 		}
 	}
 	i = start + len - loc;
-	map = ibp[i];
-	ipref = i * NBBY;
-	for (i = 1; i  (1  NBBY); i = 1, ipref++) {
-		if ((map  i) == 0) {
-			goto gotit;
-		}
+	map = ibp[i] ^ 0xff;
+	if (map == 0) {
+		printf(fs = %s\n, fs-e2fs_fsmnt);
+		panic(ext2fs_nodealloccg: block not in map);
 	}
-	printf(fs = %s\n, fs-e2fs_fsmnt);
-	panic(ext2fs_nodealloccg: block not in map);
-	/* NOTREACHED */
+	ipref = i * NBBY + ffs(map) - 1;
 gotit:
 	setbit(ibp, ipref);
 	fs-e2fs.e2fs_ficount--;
@@ -595,7 +591,6 @@
 static daddr_t
 ext2fs_mapsearch(struct m_ext2fs *fs, char *bbp, daddr_t bpref)
 {
-	daddr_t bno;
 	int start, len, loc, i, map;
 
 	/*
@@ -620,15 +615,12 @@
 		}
 	}
 	i = start + len - loc;
-	map = bbp[i];
-	bno = i * NBBY;
-	for (i = 1; i  (1  NBBY); i = 1, bno++) {
-		if ((map  i) == 0)
-			return (bno);
-	}
-	printf(fs = %s\n, fs-e2fs_fsmnt);
-	panic(ext2fs_mapsearch: block not in map);
-	/* NOTREACHED */
+	map = bbp[i] ^ 0xff;
+	if (map == 0) {
+		printf(fs = %s\n, fs-e2fs_fsmnt);
+		panic(ext2fs_mapsearch: block not in map);
+	}
+	return i * NBBY + ffs(map) - 1;
 }
 
 /*

Index: src/sys/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.125 src/sys/ufs/ffs/ffs_alloc.c:1.126
--- src/sys/ufs/ffs/ffs_alloc.c:1.125	Sun Feb 21 13:55:58 2010
+++ src/sys/ufs/ffs/ffs_alloc.c	Sun Mar  6 04:46:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_alloc.c,v 1.125 2010/02/21 13:55:58 mlelstv Exp $	*/
+/*	$NetBSD: ffs_alloc.c,v 1.126 2011/03/06 04:46:26 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_alloc.c,v 1.125 2010/02/21 13:55:58 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_alloc.c,v 1.126 2011/03/06 04:46:26 rmind Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_ffs.h
@@ -1330,17 +1330,13 @@
 		}
 	}
 	i = start + len - loc;
-	map = inosused[i];
-	ipref = i * NBBY;
-	for (i = 1; i  (1  NBBY); i = 1, ipref++) {
-		if ((map  i) == 0) {
-			cgp-cg_irotor = ufs_rw32(ipref, needswap);
-			goto gotit;
-		}
+	map = inosused[i] ^ 0xff;
+	if (map == 0) {
+		printf(fs = %s\n, fs-fs_fsmnt);
+		panic(ffs_nodealloccg: block not in map);
 	}
-	printf(fs = %s\n, fs-fs_fsmnt);
-	panic(ffs_nodealloccg: block not in map);
-	/* NOTREACHED */
+	ipref = i * NBBY + ffs(map) - 1;
+	cgp-cg_irotor = ufs_rw32(ipref, needswap);
 gotit:
 	UFS_WAPBL_REGISTER_INODE(ip-i_ump-um_mountp, cg * fs-fs_ipg + ipref,
 	mode);

CVS commit: src/sys/arch/evbarm/conf

2011-03-05 Thread Jonathan A. Kollasch 
Module Name:src
Committed By:   jakllsch
Date:   Sun Mar  6 05:08:03 UTC 2011

Modified Files:
src/sys/arch/evbarm/conf: ADI_BRH BEAGLEBOARD CP3100 DNS323 GUMSTIX
IGEPV2 IMX31LITE IQ31244 IQ80321 IXDP425 KUROBOX_PRO NAPPI
TEAMASA_NPWR TEAMASA_NPWR_FC TISDP2430 TWINTAIL ZAO425

Log Message:
Bump SYMTAB_SPACE for the many other evbarm kernels that also need it increased.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/ADI_BRH
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/CP3100
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/DNS323
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/IGEPV2
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/IMX31LITE
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/IQ31244
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/IQ80321
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/IXDP425 \
src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/KUROBOX_PRO
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/NAPPI \
src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbarm/conf/TEAMASA_NPWR
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/TISDP2430
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/TWINTAIL

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/evbarm/conf/ADI_BRH
diff -u src/sys/arch/evbarm/conf/ADI_BRH:1.51 src/sys/arch/evbarm/conf/ADI_BRH:1.52
--- src/sys/arch/evbarm/conf/ADI_BRH:1.51	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/ADI_BRH	Sun Mar  6 05:08:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: ADI_BRH,v 1.51 2010/11/23 11:13:56 hannken Exp $
+#	$NetBSD: ADI_BRH,v 1.52 2011/03/06 05:08:03 jakllsch Exp $
 #
 #	ADI_BRH -- ADI Engineering Big Red Head i80200 Evaluation Board
 #
@@ -136,7 +136,7 @@
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=335000
+options 	SYMTAB_SPACE=40
 
 config		netbsd		root on ? type ?
 config		netbsd-fxp0	root on fxp0 type nfs

Index: src/sys/arch/evbarm/conf/BEAGLEBOARD
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.16 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.17
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.16	Sun Mar  6 02:22:27 2011
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD	Sun Mar  6 05:08:03 2011
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BEAGLEBOARD,v 1.16 2011/03/06 02:22:27 jakllsch Exp $
+#	$NetBSD: BEAGLEBOARD,v 1.17 2011/03/06 05:08:03 jakllsch Exp $
 #
 #	BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
 #
@@ -141,7 +141,7 @@
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=30
+options 	SYMTAB_SPACE=53
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/CP3100
diff -u src/sys/arch/evbarm/conf/CP3100:1.19 src/sys/arch/evbarm/conf/CP3100:1.20
--- src/sys/arch/evbarm/conf/CP3100:1.19	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/CP3100	Sun Mar  6 05:08:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: CP3100,v 1.19 2010/11/23 11:13:56 hannken Exp $
+#	$NetBSD: CP3100,v 1.20 2011/03/06 05:08:03 jakllsch Exp $
 #
 #	CP3100 -- Certance CP3100 Kernel
 #
@@ -141,7 +141,7 @@
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=37
+options 	SYMTAB_SPACE=43
 
 config		netbsd		root on ? type ?
 config		netbsd-wm0	root on wm0 type nfs

Index: src/sys/arch/evbarm/conf/DNS323
diff -u src/sys/arch/evbarm/conf/DNS323:1.2 src/sys/arch/evbarm/conf/DNS323:1.3
--- src/sys/arch/evbarm/conf/DNS323:1.2	Sun Oct 10 05:19:35 2010
+++ src/sys/arch/evbarm/conf/DNS323	Sun Mar  6 05:08:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: DNS323,v 1.2 2010/10/10 05:19:35 kiyohara Exp $
+#	$NetBSD: DNS323,v 1.3 2011/03/06 05:08:03 jakllsch Exp $
 #
 #  DNS323 -- D-Link. DNS-323 platform kernel
 #
@@ -24,7 +24,7 @@
 #options 	KGDB
 #options 	DEBUG_KGDB
 makeoptions	DEBUG=-g -O2	# compile full symbol table
-options 	SYMTAB_SPACE=50
+options 	SYMTAB_SPACE=71
 #options 	AUDIO_DEBUG=2
 
 

Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.54 src/sys/arch/evbarm/conf/GUMSTIX:1.55
--- src/sys/arch/evbarm/conf/GUMSTIX:1.54	Tue Nov 23 11:13:56 2010
+++ src/sys/arch/evbarm/conf/GUMSTIX	Sun Mar  6 05:08:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.54 2010/11/23 11:13:56 hannken Exp $
+#	$NetBSD: GUMSTIX,v 1.55 2011/03/06 05:08:03 jakllsch Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -164,7 +164,7 @@
 #options 	KGDB
 #options 	DEBUG_KGDB
 makeoptions	DEBUG=-g -O2	# compile