CVS commit: src/sys/kern
Module Name:src Committed By: martin Date: Fri May 8 07:41:07 UTC 2015 Modified Files: src/sys/kern: kern_ksyms_buf.c Log Message: On mips64, the size calculation for the symbol table is off by a few bytes (probably a bfd bug or misconfiguration), so add a bit of slope here untill we fix it. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/kern/kern_ksyms_buf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_ksyms_buf.c diff -u src/sys/kern/kern_ksyms_buf.c:1.1 src/sys/kern/kern_ksyms_buf.c:1.2 --- src/sys/kern/kern_ksyms_buf.c:1.1 Sun Aug 17 21:17:44 2014 +++ src/sys/kern/kern_ksyms_buf.c Fri May 8 07:41:07 2015 @@ -4,7 +4,12 @@ #ifndef SYMTAB_SPACE char db_symtab[] = SYMTAB_FILLER; #else -char db_symtab[SYMTAB_SPACE] = SYMTAB_FILLER; +#ifdef __mips64 +#define MDADD 32 /* work around a bfd/dbsym/ld bug on mips64 */ +#else +#define MDADD 0 +#endif +char db_symtab[SYMTAB_SPACE+MDADD] = SYMTAB_FILLER; #endif int db_symtabsize = sizeof(db_symtab); #endif
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Fri May 8 07:45:53 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: ERLITE Log Message: Add COPY_SYMTAB To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/ERLITE 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/evbmips/conf/ERLITE diff -u src/sys/arch/evbmips/conf/ERLITE:1.3 src/sys/arch/evbmips/conf/ERLITE:1.4 --- src/sys/arch/evbmips/conf/ERLITE:1.3 Wed May 6 19:47:59 2015 +++ src/sys/arch/evbmips/conf/ERLITE Fri May 8 07:45:53 2015 @@ -1,11 +1,11 @@ -# $NetBSD: ERLITE,v 1.3 2015/05/06 19:47:59 martin Exp $ +# $NetBSD: ERLITE,v 1.4 2015/05/08 07:45:53 martin Exp $ include arch/mips/conf/std.octeon include arch/evbmips/conf/files.octeon #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ERLITE-$Revision: 1.3 $ +#ident ERLITE-$Revision: 1.4 $ maxusers 32 @@ -37,7 +37,7 @@ options DEBUG # extra kernel debugging options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=36 # size for embedded symbol table +makeoptions COPY_SYMTAB=1 # size for embedded symbol table # Compatibility options #options COMPAT_43 # compatibility with 4.3BSD binaries
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: msaitoh Date: Fri May 8 07:29:08 UTC 2015 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Update some Intel CPU models (Sky Lake, Broadwell and Atom X[357]). To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/cpuctl/arch/i386.c diff -u src/usr.sbin/cpuctl/arch/i386.c:1.65 src/usr.sbin/cpuctl/arch/i386.c:1.66 --- src/usr.sbin/cpuctl/arch/i386.c:1.65 Fri Mar 27 05:31:34 2015 +++ src/usr.sbin/cpuctl/arch/i386.c Fri May 8 07:29:08 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.65 2015/03/27 05:31:34 msaitoh Exp $ */ +/* $NetBSD: i386.c,v 1.66 2015/05/08 07:29:08 msaitoh Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: i386.c,v 1.65 2015/03/27 05:31:34 msaitoh Exp $); +__RCSID($NetBSD: i386.c,v 1.66 2015/05/08 07:29:08 msaitoh Exp $); #endif /* not lint */ #include sys/types.h @@ -363,15 +363,17 @@ const struct cpu_cpuid_nameclass i386_cp (Haswell), [0x46] = 4th gen Core, Xeon E3-12xx v3 (Haswell), +[0x47] = 5th gen Core (Broadwell), [0x4a] = Atom Z3400, -[0x4c] = Atom Z8000, +[0x4c] = Atom X[57]-Z8000 (Airmont), [0x4d] = Atom C2000, -[0x4e] = Future gen Core, +[0x4e] = Next gen Core (Sky Lake), [0x4f] = Future gen Xeon (Broadwell), [0x56] = Next gen Xeon D (Broadwell), [0x57] = Next gen Xeon Phi, [0x5a] = Atom E3500, -[0x5d] = Future Atom (Silvermont), +[0x5d] = Atom X3-C3000 (Silvermont), +[0x5e] = Next gen Core (Sky Lake), }, Pentium Pro, II or III, /* Default */ NULL,
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri May 8 07:23:56 UTC 2015 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: From Intel SDM: - Add the Silicon Debug bit in CPUID Fn0001 %ecx - Add CPUID Fn_0007 %ecx bits - Add comments. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.81 src/sys/arch/x86/include/specialreg.h:1.82 --- src/sys/arch/x86/include/specialreg.h:1.81 Fri Dec 12 02:25:55 2014 +++ src/sys/arch/x86/include/specialreg.h Fri May 8 07:23:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.81 2014/12/12 02:25:55 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.82 2015/05/08 07:23:56 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -189,7 +189,7 @@ #define CPUID2_TM2 0x0100 /* Thermal Monitor 2 */ #define CPUID2_SSSE3 0x0200 /* Supplemental SSE3 */ #define CPUID2_CID 0x0400 /* Context ID */ -/* bit 11 unused 0x0800 */ +#define CPUID2_SDBG 0x0800 /* Silicon Debug */ #define CPUID2_FMA 0x1000 /* has Fused Multiply Add */ #define CPUID2_CX16 0x2000 /* has CMPXCHG16B instruction */ #define CPUID2_xTPR 0x4000 /* Task Priority Messages disabled? */ @@ -214,7 +214,7 @@ #define CPUID2_FLAGS1 \20 \ \1 SSE3 \2 PCLMULQDQ \3 DTES64 \4 MONITOR \ \5 DS-CPL \6 VMX \7 SMX \10 EST \ - \11 TM2 \12 SSSE3 \13 CID \14 B11 \ + \11 TM2 \12 SSSE3 \13 CID \14 SDBG \ \15 FMA \16 CX16 \17 xTPR \20 PDCM \ \21 B16 \22 PCID \23 DCA \24 SSE41 \ \25 SSE42 \26 X2APIC \27 MOVBE \30 POPCNT \ @@ -300,9 +300,14 @@ #define CPUID_DSPM_FLAGS1 \20 \1 HWF \4 EPB /* - * Intel Structured Extended Feature leaf - * Fn_0007 main leaf - %ebx. + * Intel Structured Extended Feature leaf Fn_0007 + * %eax == 0: Subleaf 0 + * %eax: The Maximun input value for supported subleaf. + * %ebx: Feature bits. + * %ecx: Feature bits. */ + +/* %ebx */ #define CPUID_SEF_FSGSBASE __BIT(0) #define CPUID_SEF_TSC_ADJUST __BIT(1) #define CPUID_SEF_BMI1 __BIT(3) @@ -337,17 +342,29 @@ \32 PT \33 AVX512PF\34 AVX512ER\ \35 AVX512CD\36 SHA +/* %ecx */ +#define CPUID_SEF_PREFETCHWT1 __BIT(0) +#define CPUID_SEF_PKU __BIT(3) +#define CPUID_SEF_OSPKE __BIT(4) + +#define CPUID_SEF_FLAGS1 \20 \ + \1 PREFETCHWT1\4 PKU \ + \5 OSPKE + /* * CPUID Processor extended state Enumeration Fn000d * * %ecx == 0: supported features info: * %eax: Valid bits of lower 32bits of XCR0 - * %ebx Save area size for features enabled in XCR0 - * %ecx Maximim save area size for all cpu features + * %ebx: Maximum save area size for features enabled in XCR0 + * %ecx: Maximim save area size for all cpu features * %edx: Valid bits of upper 32bits of XCR0 * * %ecx == 1: * %eax: Bit 0 = xsaveopt instruction avalaible (sandy bridge onwards) + * %ebx: Save area size for features enabled by XCR0 | IA32_XSS + * %ecx: Valid bits of lower 32bits of IA32_XSS + * %edx: Valid bits of upper 32bits of IA32_XSS * * %ecx = 2: Save area details for XCR0 bit n * %eax: size of save area for this feature @@ -356,6 +373,7 @@ * All of %eax, %ebx, %ecx and %edx are zero for unsupported features. */ +/* %ecx=1 %eax */ #define CPUID_PES1_XSAVEOPT 0x0001 /* xsaveopt instruction */ #define CPUID_PES1_XSAVEC 0x0002 /* xsavec compacted XRSTOR */ #define CPUID_PES1_XGETBV 0x0004 /* xgetbv with ECX = 1 */
CVS commit: src/doc
Module Name:src Committed By: martin Date: Fri May 8 07:45:00 UTC 2015 Modified Files: src/doc: HACKS Log Message: Document mips64 kernel symbol table hack To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.157 src/doc/HACKS:1.158 --- src/doc/HACKS:1.157 Fri Apr 17 12:40:17 2015 +++ src/doc/HACKS Fri May 8 07:44:59 2015 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.157 2015/04/17 12:40:17 martin Exp $ +# $NetBSD: HACKS,v 1.158 2015/05/08 07:44:59 martin Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -802,6 +802,15 @@ port mips Warning: No .cprestore pseudo-op used in PIC code Add COPTS.count.c+=-Wa,--no-warn to avoid -Wa,--fatal-warnings kcah + hack mips-kern-ksyms-size + cdate Fri May 8 09:42:03 CEST 2015 + who martin + file /src/sys/kern/kern_ksyms_buf.c : 1.2 + descr + Woraround a bfd/ld/dbsym bug that miscalculates the neede + size of the symbol table, making COPY_SYMTAB fail due + to a slightly too small target buffer. + kcah port i386
CVS commit: src/sys/kern
Module Name:src Committed By: martin Date: Fri May 8 09:43:42 UTC 2015 Modified Files: src/sys/kern: kern_ksyms_buf.c Log Message: Backout previous, Nick has a fix for binutils. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/kern/kern_ksyms_buf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_ksyms_buf.c diff -u src/sys/kern/kern_ksyms_buf.c:1.2 src/sys/kern/kern_ksyms_buf.c:1.3 --- src/sys/kern/kern_ksyms_buf.c:1.2 Fri May 8 07:41:07 2015 +++ src/sys/kern/kern_ksyms_buf.c Fri May 8 09:43:41 2015 @@ -4,12 +4,7 @@ #ifndef SYMTAB_SPACE char db_symtab[] = SYMTAB_FILLER; #else -#ifdef __mips64 -#define MDADD 32 /* work around a bfd/dbsym/ld bug on mips64 */ -#else -#define MDADD 0 -#endif -char db_symtab[SYMTAB_SPACE+MDADD] = SYMTAB_FILLER; +char db_symtab[SYMTAB_SPACE] = SYMTAB_FILLER; #endif int db_symtabsize = sizeof(db_symtab); #endif
CVS commit: src/doc
Module Name:src Committed By: martin Date: Fri May 8 09:44:45 UTC 2015 Modified Files: src/doc: HACKS Log Message: Remove mips-kern-ksyms-size, now that it is already gone To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.158 src/doc/HACKS:1.159 --- src/doc/HACKS:1.158 Fri May 8 07:44:59 2015 +++ src/doc/HACKS Fri May 8 09:44:45 2015 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.158 2015/05/08 07:44:59 martin Exp $ +# $NetBSD: HACKS,v 1.159 2015/05/08 09:44:45 martin Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -802,15 +802,6 @@ port mips Warning: No .cprestore pseudo-op used in PIC code Add COPTS.count.c+=-Wa,--no-warn to avoid -Wa,--fatal-warnings kcah - hack mips-kern-ksyms-size - cdate Fri May 8 09:42:03 CEST 2015 - who martin - file /src/sys/kern/kern_ksyms_buf.c : 1.2 - descr - Woraround a bfd/ld/dbsym bug that miscalculates the neede - size of the symbol table, making COPY_SYMTAB fail due - to a slightly too small target buffer. - kcah port i386
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Fri May 8 13:58:53 UTC 2015 Modified Files: src/sys/sys: cdefs_elf.h Log Message: Undo the OBJC hack for __weak, it will be done in gnustep-base To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/sys/cdefs_elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/cdefs_elf.h diff -u src/sys/sys/cdefs_elf.h:1.48 src/sys/sys/cdefs_elf.h:1.49 --- src/sys/sys/cdefs_elf.h:1.48 Wed May 6 16:25:29 2015 +++ src/sys/sys/cdefs_elf.h Fri May 8 09:58:53 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs_elf.h,v 1.48 2015/05/06 20:25:29 christos Exp $ */ +/* $NetBSD: cdefs_elf.h,v 1.49 2015/05/08 13:58:53 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -64,14 +64,11 @@ #define __weak_extern(sym) \ __asm(.weak _C_LABEL_STRING(#sym)); -#ifndef __OBJC__ -/* Avoid overriding Apple's garbage collection keywords (__weak, __strong) */ #if __GNUC_PREREQ__(4, 0) #define __weak __attribute__((__weak__)) #else #define __weak #endif -#endif /* __OBJC__ */ #if __GNUC_PREREQ__(4, 0) #define __weak_reference(sym) __attribute__((__weakref__(#sym)))
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src Committed By: skrll Date: Fri May 8 15:13:53 UTC 2015 Modified Files: src/external/gpl3/binutils/dist/bfd: elf64-mips.c Log Message: Define bfd_elf64_bfd_is_local_label_name so that local symbols really get stripped, etc. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/bfd/elf64-mips.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/bfd/elf64-mips.c diff -u src/external/gpl3/binutils/dist/bfd/elf64-mips.c:1.4 src/external/gpl3/binutils/dist/bfd/elf64-mips.c:1.5 --- src/external/gpl3/binutils/dist/bfd/elf64-mips.c:1.4 Sun Sep 29 14:03:29 2013 +++ src/external/gpl3/binutils/dist/bfd/elf64-mips.c Fri May 8 15:13:53 2015 @@ -4154,9 +4154,8 @@ const struct elf_size_info mips_elf64_si #define elf_backend_write_section _bfd_mips_elf_write_section -/* We don't set bfd_elf64_bfd_is_local_label_name because the 32-bit - MIPS-specific function only applies to IRIX5, which had no 64-bit - ABI. */ +#define bfd_elf64_bfd_is_local_label_name \ + mips_elf64_is_local_label_name #define bfd_elf64_bfd_is_target_special_symbol \ _bfd_mips_elf_is_target_special_symbol #define bfd_elf64_find_nearest_line _bfd_mips_elf_find_nearest_line
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Fri May 8 17:00:51 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_mpio.c Log Message: update PM field in set_config To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_mpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/nvidia/tegra_mpio.c diff -u src/sys/arch/arm/nvidia/tegra_mpio.c:1.1 src/sys/arch/arm/nvidia/tegra_mpio.c:1.2 --- src/sys/arch/arm/nvidia/tegra_mpio.c:1.1 Thu May 7 23:55:11 2015 +++ src/sys/arch/arm/nvidia/tegra_mpio.c Fri May 8 17:00:51 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_mpio.c,v 1.1 2015/05/07 23:55:11 jmcneill Exp $ */ +/* $NetBSD: tegra_mpio.c,v 1.2 2015/05/08 17:00:51 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -30,7 +30,7 @@ #include opt_ddb.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tegra_mpio.c,v 1.1 2015/05/07 23:55:11 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: tegra_mpio.c,v 1.2 2015/05/08 17:00:51 jmcneill Exp $); #include sys/param.h #include sys/types.h @@ -439,7 +439,20 @@ void tegra_mpio_pinmux_set_config(u_int reg, int flags, const char *func) { struct tegra_mpio_softc * const sc = tegra_mpio_lookup_softc(); + const struct tegra_mpio_pinmux *pm; uint32_t val; + int funcno, n; + + pm = tegra_mpio_lookup_pinmux(reg); + KASSERT(pm != NULL); + + for (n = 0, funcno = -1; n __arraycount(pm-pm_func); n++) { + if (strcmp(pm-pm_func[n], func) == 0) { + funcno = n; + break; + } + } + KASSERT(funcno != -1); val = MPIO_READ(sc, reg); @@ -473,6 +486,9 @@ tegra_mpio_pinmux_set_config(u_int reg, val = ~PINMUX_AUX_OD; } + val = ~PINMUX_AUX_PM; + val |= __SHIFTIN(funcno, PINMUX_AUX_PM); + MPIO_WRITE(sc, reg, val); }
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: riastradh Date: Fri May 8 17:46:03 UTC 2015 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: Fix ytpo: INSTALLBOOTOPTIONS, not INSTALLBOOTOPTOINS. From qjsgkem on Freenode. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.bootimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/common/bootimage/Makefile.bootimage diff -u src/distrib/common/bootimage/Makefile.bootimage:1.10 src/distrib/common/bootimage/Makefile.bootimage:1.11 --- src/distrib/common/bootimage/Makefile.bootimage:1.10 Thu Mar 12 04:41:23 2015 +++ src/distrib/common/bootimage/Makefile.bootimage Fri May 8 17:46:03 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootimage,v 1.10 2015/03/12 04:41:23 snj Exp $ +# $NetBSD: Makefile.bootimage,v 1.11 2015/05/08 17:46:03 riastradh Exp $ # # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved. # @@ -381,7 +381,7 @@ ${IMGBASE}.img: ${TARGETFS} ${WORKLABEL} .endif ${TOOL_DISKLABEL} -R -F ${WORKIMG} ${WORKLABEL} .if !empty(PRIMARY_BOOT) ${INSTALLBOOT_AFTER_DISKLABEL} != no - ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${INSTALLBOOTOPTOINS} ${WORKIMG} \ + ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${INSTALLBOOTOPTIONS} ${WORKIMG} \ ${WORKDIR}/usr/mdec/${PRIMARY_BOOT} .endif mv ${WORKIMG} ${.TARGET}
CVS commit: src/distrib/evbmips/instkernel/instkernel
Module Name:src Committed By: matt Date: Sat May 9 02:12:29 UTC 2015 Modified Files: src/distrib/evbmips/instkernel/instkernel: Makefile Log Message: add INSTALL_ERLITE kernel To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/evbmips/instkernel/instkernel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/evbmips/instkernel/instkernel/Makefile diff -u src/distrib/evbmips/instkernel/instkernel/Makefile:1.5 src/distrib/evbmips/instkernel/instkernel/Makefile:1.6 --- src/distrib/evbmips/instkernel/instkernel/Makefile:1.5 Mon Apr 6 14:18:09 2015 +++ src/distrib/evbmips/instkernel/instkernel/Makefile Sat May 9 02:12:29 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2015/04/06 14:18:09 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2015/05/09 02:12:29 matt Exp $ .include bsd.own.mk .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib @@ -19,6 +19,8 @@ MDSETTARGETS+= INSTALL_XLSATX32 ${RAMDI MDSETTARGETS+= INSTALL_XLSATX64 ${RAMDISK} - .if ${MACHINE_ARCH} == mips64el MDSETTARGETS+= INSTALL_LOONGSON ${RAMDISK} - +.else +MDSETTARGETS+= INSTALL_ERLITE ${RAMDISK} - .endif .else
CVS commit: src/sys/kern
Module Name:src Committed By: pgoyette Date: Sat May 9 05:56:36 UTC 2015 Modified Files: src/sys/kern: kern_syscall.c Log Message: Use the generated list of auto-loadable syscalls rather than our own hard-coded list. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/kern/kern_syscall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_syscall.c diff -u src/sys/kern/kern_syscall.c:1.10 src/sys/kern/kern_syscall.c:1.11 --- src/sys/kern/kern_syscall.c:1.10 Sat Mar 7 16:38:07 2015 +++ src/sys/kern/kern_syscall.c Sat May 9 05:56:36 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_syscall.c,v 1.10 2015/03/07 16:38:07 christos Exp $ */ +/* $NetBSD: kern_syscall.c,v 1.11 2015/05/09 05:56:36 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_syscall.c,v 1.10 2015/03/07 16:38:07 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_syscall.c,v 1.11 2015/05/09 05:56:36 pgoyette Exp $); #ifdef _KERNEL_OPT #include opt_modular.h @@ -60,151 +60,8 @@ int sys_nomodule(struct lwp *l, const void *v, register_t *retval) { #ifdef MODULAR - static struct { - u_int al_code; - const char *al_module; - } const autoload[] = { - { SYS_aio_cancel, aio }, - { SYS_aio_error, aio }, - { SYS_aio_fsync, aio }, - { SYS_aio_read, aio }, - { SYS_aio_return, aio }, - { SYS___aio_suspend50, aio }, - { SYS_aio_write, aio }, - { SYS_lio_listio, aio }, - { SYS_mq_open, mqueue }, - { SYS_mq_close, mqueue }, - { SYS_mq_unlink, mqueue }, - { SYS_mq_getattr, mqueue }, - { SYS_mq_setattr, mqueue }, - { SYS_mq_notify, mqueue }, - { SYS_mq_send, mqueue }, - { SYS_mq_receive, mqueue }, - { SYS___mq_timedsend50, mqueue }, - { SYS___mq_timedreceive50, mqueue }, - { SYS_compat_43_fstat43, compat }, - { SYS_compat_43_lstat43, compat }, - { SYS_compat_43_oaccept, compat }, - { SYS_compat_43_ocreat, compat }, - { SYS_compat_43_oftruncate, compat }, - { SYS_compat_43_ogetdirentries, compat }, - { SYS_compat_43_ogetdtablesize, compat }, - { SYS_compat_43_ogethostid, compat }, - { SYS_compat_43_ogethostname, compat }, - { SYS_compat_43_ogetkerninfo, compat }, - { SYS_compat_43_ogetpagesize, compat }, - { SYS_compat_43_ogetpeername, compat }, - { SYS_compat_43_ogetrlimit, compat }, - { SYS_compat_43_ogetsockname, compat }, - { SYS_compat_43_okillpg, compat }, - { SYS_compat_43_olseek, compat }, - { SYS_compat_43_ommap, compat }, - { SYS_compat_43_oquota, compat }, - { SYS_compat_43_orecv, compat }, - { SYS_compat_43_orecvfrom, compat }, - { SYS_compat_43_orecvmsg, compat }, - { SYS_compat_43_osend, compat }, - { SYS_compat_43_osendmsg, compat }, - { SYS_compat_43_osethostid, compat }, - { SYS_compat_43_osethostname, compat }, - { SYS_compat_43_osetrlimit, compat }, - { SYS_compat_43_osigblock, compat }, - { SYS_compat_43_osigsetmask, compat }, - { SYS_compat_43_osigstack, compat }, - { SYS_compat_43_osigvec, compat }, - { SYS_compat_43_otruncate, compat }, - { SYS_compat_43_owait, compat }, - { SYS_compat_43_stat43, compat }, - { SYS_compat_09_ogetdomainname, compat }, - { SYS_compat_09_osetdomainname, compat }, - { SYS_compat_09_ouname, compat }, -#ifndef _LP64 - { SYS_compat_10_omsgsys, compat }, - { SYS_compat_10_osemsys, compat }, - { SYS_compat_10_oshmsys, compat }, -#endif - { SYS_compat_12_fstat12, compat }, - { SYS_compat_12_getdirentries, compat }, - { SYS_compat_12_lstat12, compat }, - { SYS_compat_12_msync, compat }, - { SYS_compat_12_oreboot, compat }, - { SYS_compat_12_oswapon, compat }, - { SYS_compat_12_stat12, compat }, - { SYS_compat_13_sigaction13, compat }, - { SYS_compat_13_sigaltstack13, compat }, - { SYS_compat_13_sigpending13, compat }, - { SYS_compat_13_sigprocmask13, compat }, - { SYS_compat_13_sigreturn13, compat }, - { SYS_compat_13_sigsuspend13, compat }, - { SYS_compat_14___semctl, compat }, - { SYS_compat_14_msgctl, compat }, - { SYS_compat_14_shmctl, compat }, - { SYS_compat_16___sigaction14, compat }, - { SYS_compat_16___sigreturn14, compat }, - { SYS_compat_20_fhstatfs, compat }, - { SYS_compat_20_fstatfs, compat }, - { SYS_compat_20_getfsstat, compat }, - { SYS_compat_20_statfs, compat }, - { SYS_compat_30___fhstat30, compat }, - { SYS_compat_30___fstat13, compat }, - { SYS_compat_30___lstat13, compat }, - { SYS_compat_30___stat13, compat }, - { SYS_compat_30_fhopen, compat }, - { SYS_compat_30_fhstat, compat }, - { SYS_compat_30_fhstatvfs1, compat }, - { SYS_compat_30_getdents, compat }, - { SYS_compat_30_getfh, compat }, - {
CVS commit: src/sys
Module Name:src Committed By: pgoyette Date: Sat May 9 05:55:43 UTC 2015 Modified Files: src/sys/kern: init_sysent.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Added Files: src/sys/kern: syscalls_autoload.c Log Message: Regen from syscalls.master To generate a diff of this commit: cvs rdiff -u -r1.293 -r1.294 src/sys/kern/init_sysent.c cvs rdiff -u -r0 -r1.1 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.2 -r1.3 src/sys/kern/systrace_args.c cvs rdiff -u -r1.83 -r1.84 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.108 -r1.109 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.277 -r1.278 src/sys/sys/syscall.h cvs rdiff -u -r1.261 -r1.262 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.293 src/sys/kern/init_sysent.c:1.294 --- src/sys/kern/init_sysent.c:1.293 Thu Mar 12 15:06:28 2015 +++ src/sys/kern/init_sysent.c Sat May 9 05:55:43 2015 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.293 2015/03/12 15:06:28 christos Exp $ */ +/* $NetBSD: init_sysent.c,v 1.294 2015/05/09 05:55:43 pgoyette Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.272 2015/02/22 00:50:30 christos Exp + * created from compat NetBSD: syscalls.master,v 1.274 2015/05/09 05:51:26 pgoyette Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.293 2015/03/12 15:06:28 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.294 2015/05/09 05:55:43 pgoyette Exp $); #include opt_modular.h #include opt_ntp.h Index: src/sys/kern/systrace_args.c diff -u src/sys/kern/systrace_args.c:1.2 src/sys/kern/systrace_args.c:1.3 --- src/sys/kern/systrace_args.c:1.2 Thu Mar 12 15:06:28 2015 +++ src/sys/kern/systrace_args.c Sat May 9 05:55:43 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.2 2015/03/12 15:06:28 christos Exp $ */ +/* $NetBSD: systrace_args.c,v 1.3 2015/05/09 05:55:43 pgoyette Exp $ */ /* * System call argument to DTrace register array converstion. Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.83 src/sys/rump/include/rump/rump_syscalls.h:1.84 --- src/sys/rump/include/rump/rump_syscalls.h:1.83 Wed Apr 8 13:31:42 2015 +++ src/sys/rump/include/rump/rump_syscalls.h Sat May 9 05:55:43 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.83 2015/04/08 13:31:42 justin Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.84 2015/05/09 05:55:43 pgoyette Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.272 2015/02/22 00:50:30 christos Exp + * created from compat NetBSD: syscalls.master,v 1.274 2015/05/09 05:51:26 pgoyette Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.108 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.109 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.108 Wed Apr 8 13:31:42 2015 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sat May 9 05:55:43 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.108 2015/04/08 13:31:42 justin Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.109 2015/05/09 05:55:43 pgoyette Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.272 2015/02/22 00:50:30 christos Exp + * created from compat NetBSD: syscalls.master,v 1.274 2015/05/09 05:51:26 pgoyette Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.108 2015/04/08 13:31:42 justin Exp $); +__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.109 2015/05/09 05:55:43 pgoyette Exp $); #include sys/fstypes.h #include sys/proc.h Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.277 src/sys/sys/syscall.h:1.278 --- src/sys/sys/syscall.h:1.277 Sat Mar 7 16:39:20 2015 +++ src/sys/sys/syscall.h Sat May 9 05:55:43 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.277 2015/03/07 16:39:20 christos Exp $ */ +/* $NetBSD: syscall.h,v 1.278 2015/05/09 05:55:43 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.272 2015/02/22 00:50:30 christos Exp + * created from compat NetBSD: syscalls.master,v 1.274 2015/05/09 05:51:26 pgoyette Exp */ #ifndef _SYS_SYSCALL_H_ Index: src/sys/sys/syscallargs.h diff -u src/sys/sys/syscallargs.h:1.261 src/sys/sys/syscallargs.h:1.262 ---
CVS commit: src/sys/kern
Module Name:src Committed By: pgoyette Date: Sat May 9 05:57:18 UTC 2015 Modified Files: src/sys/kern: syscalls.conf Log Message: Add new configuration variable to point at the list of auto-loadable syscalls To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/kern/syscalls.conf 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/syscalls.conf diff -u src/sys/kern/syscalls.conf:1.22 src/sys/kern/syscalls.conf:1.23 --- src/sys/kern/syscalls.conf:1.22 Sat Mar 7 16:38:07 2015 +++ src/sys/kern/syscalls.conf Sat May 9 05:57:18 2015 @@ -1,4 +1,4 @@ -# $NetBSD: syscalls.conf,v 1.22 2015/03/07 16:38:07 christos Exp $ +# $NetBSD: syscalls.conf,v 1.23 2015/05/09 05:57:18 pgoyette Exp $ sysnames=syscalls.c sysnumhdr=../sys/syscall.h @@ -6,6 +6,7 @@ syssw=init_sysent.c systrace=systrace_args.c sysarghdr=../sys/syscallargs.h sysarghdrextra='#include sys/mount.h\n#ifndef RUMP_CLIENT\n#include sys/sched.h\n#endif\n#include sys/socket.h\n\n' +sysautoload=syscalls_autoload.c sysalign=1 rumpcalls=../rump/librump/rumpkern/rump_syscalls.c rumpcallshdr=../rump/include/rump/rump_syscalls.h
CVS commit: src/sys/kern
Module Name:src Committed By: pgoyette Date: Sat May 9 05:51:27 UTC 2015 Modified Files: src/sys/kern: makesyscalls.sh syscalls.master Log Message: Teach makesyscalls.sh how to auto-generate the list of syscalls that can be resolved by module auto-load. Update syscalls.master to identify the specific module that contains the auto-loadable code for each syscall. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/kern/makesyscalls.sh cvs rdiff -u -r1.273 -r1.274 src/sys/kern/syscalls.master 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/makesyscalls.sh diff -u src/sys/kern/makesyscalls.sh:1.151 src/sys/kern/makesyscalls.sh:1.152 --- src/sys/kern/makesyscalls.sh:1.151 Sun Mar 8 20:31:53 2015 +++ src/sys/kern/makesyscalls.sh Sat May 9 05:51:26 2015 @@ -1,4 +1,4 @@ -# $NetBSD: makesyscalls.sh,v 1.151 2015/03/08 20:31:53 christos Exp $ +# $NetBSD: makesyscalls.sh,v 1.152 2015/05/09 05:51:26 pgoyette Exp $ # # Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou # All rights reserved. @@ -45,6 +45,7 @@ esac # sysnames the syscall names file # sysnumhdr the syscall numbers file # syssw the syscall switch file +# sysautoload the syscall autoload definitions file # sysarghdr the syscall argument struct definitions # compatopts those syscall types that are for 'compat' syscalls # switchname the name for the 'struct sysent' we define @@ -140,6 +141,7 @@ BEGIN { # to allow nested #if/#else/#endif sets savedepth = 0 + auto_skip = 0 # to track already processed syscalls sysnames = \$sysnames\ @@ -150,6 +152,7 @@ BEGIN { systrace = \$systrace\ systracetmp = \$systracetmp\ systraceret = \$systraceret\ + sysautoload = \$sysautoload\ rumpcalls = \$rumpcalls\ rumpcallshdr = \$rumpcallshdr\ rumpsysent = \$rumpsysent\ @@ -220,6 +223,10 @@ BEGIN { printf /*\n * System call argument lists.\n *\n sysarghdr printf * DO NOT EDIT-- this file is automatically generated.\n sysarghdr + printf /* %s */\n\n, tag sysautoload + printf /*\n * System call autoload table.\n *\n sysautoload + printf * DO NOT EDIT-- this file is automatically generated.\n sysautoload + printf /* %s */\n\n, tag rumpcalls printf /*\n * System call vector and marshalling for rump.\n *\n rumpcalls printf * DO NOT EDIT-- this file is automatically generated.\n rumpcalls @@ -240,6 +247,13 @@ NR == 1 { printf * created from%s\n */\n\n, $0 sysnames printf #include sys/cdefs.h\n__KERNEL_RCSID(0, \%s\);\n\n, tag sysnames + printf * created from%s\n */\n\n, $0 sysautoload + printf #include sys/cdefs.h\n__KERNEL_RCSID(0, \%s\);\n\n, tag sysautoload + printf(static struct {\n) sysautoload + printf(\tu_int\t\tal_code;\n) sysautoload + printf(\tconst char\t*al_module;\n) sysautoload + printf(} const syscalls_autoload[] = {\n) sysautoload + printf * created from%s\n */\n\n, $0 rumpcalls printf #ifdef RUMP_CLIENT\n rumpcalls printf #include rump/rumpuser_port.h\n rumpcalls @@ -385,6 +399,19 @@ $1 ~ /^#/ intable { if ($1 ~ /^#[ ]*if/) { savedepth++ savesyscall[savedepth] = syscall + skip_auto[savedepth] = auto_skip + auto_skip = 0 + + # Special handling for sysautoload conditionals + # + # We ignore all conditions other than those for + # !defined(_LP64) which are used for SYSV* syscalls + # only + + if ($0 ~ /!defined\(_LP64\)/) { + printf(#if !defined(_LP64)\n) sysautoload + auto_skip = savedepth + } } if ($1 ~ /^#[ ]*else/) { if (savedepth = 0) { @@ -392,6 +419,9 @@ $1 ~ /^#/ intable { infile, NR) exit 1 } + if (auto_skip == savedepth) { + print sysautoload + } syscall = savesyscall[savedepth] } if ($1 ~ /^#[ ]*endif/) { @@ -400,6 +430,10 @@ $1 ~ /^#/ intable { infile, NR) exit 1 } + if (auto_skip == savedepth) { + print sysautoload + } + auto_skip = skip_auto[savedepth]; savedepth-- } print sysent @@ -455,6 +489,8 @@ function parseline() { if ($f == MODULAR) { # registered at runtime modular = 1 f++ + modname = $f + f++ } else { modular = 0; } @@ -637,6 +673,13 @@ function printproto(wrap) { printf(#define\t%s%s%s\t%d\n\n, constprefix, wrap, funcalias, syscall) sysnumhdr + # output entry for syscall autoload table, if modular + if (modular ) { + printf(\t{ %s%s%s, \%s\ },\n, constprefix, wrap, + funcalias, modname) sysautoload + } + + # rumpalooza if (!rumpable) return @@ -1084,6 +1127,7 @@ END { cat $sysprotos $sysarghdr echo #endif /* _${constprefix}SYSCALL_H_ */ $sysnumhdr echo #endif /* _${constprefix}SYSCALLARGS_H_ */ $sysarghdr +echo }; $sysautoload printf \n#endif /* _RUMP_RUMP_SYSCALLS_H_ */\n $rumpprotos cat $sysdcl $sysent $syssw cat $sysnamesbottom $sysnames @@ -1100,4 +1144,4 @@ cat $systracetmp $systrace cat $systraceret $systrace echo Generated following
CVS commit: src/sys/kern
Module Name:src Committed By: pgoyette Date: Sat May 9 05:58:53 UTC 2015 Modified Files: src/sys/kern: syscalls.c Log Message: Another regenerated file To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/sys/kern/syscalls.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/syscalls.c diff -u src/sys/kern/syscalls.c:1.282 src/sys/kern/syscalls.c:1.283 --- src/sys/kern/syscalls.c:1.282 Thu Mar 12 15:06:28 2015 +++ src/sys/kern/syscalls.c Sat May 9 05:58:53 2015 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.282 2015/03/12 15:06:28 christos Exp $ */ +/* $NetBSD: syscalls.c,v 1.283 2015/05/09 05:58:53 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.272 2015/02/22 00:50:30 christos Exp + * created from compat NetBSD: syscalls.master,v 1.274 2015/05/09 05:51:26 pgoyette Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.282 2015/03/12 15:06:28 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.283 2015/05/09 05:58:53 pgoyette Exp $); #if defined(_KERNEL_OPT) #include opt_modular.h
CVS commit: src/sys/dev/bluetooth
Module Name:src Committed By: christos Date: Fri May 8 11:47:53 UTC 2015 Modified Files: src/sys/dev/bluetooth: bcsp.c Log Message: goto out for negative lengths too. Really this test should either be removed or turned into a KASSERT(). From max. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/bluetooth/bcsp.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/bluetooth/bcsp.c diff -u src/sys/dev/bluetooth/bcsp.c:1.27 src/sys/dev/bluetooth/bcsp.c:1.28 --- src/sys/dev/bluetooth/bcsp.c:1.27 Thu Apr 30 12:01:51 2015 +++ src/sys/dev/bluetooth/bcsp.c Fri May 8 07:47:53 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcsp.c,v 1.27 2015/04/30 16:01:51 christos Exp $ */ +/* $NetBSD: bcsp.c,v 1.28 2015/05/08 11:47:53 christos Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bcsp.c,v 1.27 2015/04/30 16:01:51 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: bcsp.c,v 1.28 2015/05/08 11:47:53 christos Exp $); #include sys/types.h #include sys/param.h @@ -1128,7 +1128,7 @@ bcsp_tx_reliable_pkt(struct bcsp_softc * for (pldlen = 0, _m = m; _m != NULL; _m = _m-m_next) { if (_m-m_len 0) - return false; + goto out; pldlen += _m-m_len; } if (pldlen 0xfff) @@ -1367,7 +1367,7 @@ bcsp_tx_unreliable_pkt(struct bcsp_softc for (pldlen = 0, _m = m; _m != NULL; _m = m-m_next) { if (_m-m_len 0) - return false; + goto out; pldlen += _m-m_len; } DPRINTFN(1, ( pldlen=%d\n, pldlen));
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Sat May 9 01:20:07 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: std.sparc64-32 Log Message: revert previous. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/conf/std.sparc64-32 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/conf/std.sparc64-32 diff -u src/sys/arch/sparc64/conf/std.sparc64-32:1.4 src/sys/arch/sparc64/conf/std.sparc64-32:1.5 --- src/sys/arch/sparc64/conf/std.sparc64-32:1.4 Thu May 7 19:14:56 2015 +++ src/sys/arch/sparc64/conf/std.sparc64-32 Sat May 9 01:20:07 2015 @@ -1,4 +1,4 @@ -# $NetBSD: std.sparc64-32,v 1.4 2015/05/07 19:14:56 mrg Exp $ +# $NetBSD: std.sparc64-32,v 1.5 2015/05/09 01:20:07 mrg Exp $ # # Unneeded NetBSD/sparc64 kernel options when building 32-bit kernels. @@ -10,6 +10,3 @@ no makeoptions LP64 makeoptions LP64=no no options EXEC_ELF64 - -options CHILD_MAX=1024 # 160 is too few -options OPEN_MAX=1024 # 128 is too few