CVS commit: src/sys/kern
Module Name:src Committed By: mlelstv Date: Sun Feb 23 07:54:43 UTC 2014 Modified Files: src/sys/kern: tty.c Log Message: ttioctl always gets a valid lwp reference. Replace attempt to handle a NULL reference in only one place with a regular assertion. To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 src/sys/kern/tty.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/tty.c diff -u src/sys/kern/tty.c:1.257 src/sys/kern/tty.c:1.258 --- src/sys/kern/tty.c:1.257 Sat Feb 9 00:31:21 2013 +++ src/sys/kern/tty.c Sun Feb 23 07:54:43 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: tty.c,v 1.257 2013/02/09 00:31:21 christos Exp $ */ +/* $NetBSD: tty.c,v 1.258 2014/02/23 07:54:43 mlelstv Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.257 2013/02/09 00:31:21 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.258 2014/02/23 07:54:43 mlelstv Exp $"); #include "opt_compat_netbsd.h" @@ -927,13 +927,16 @@ int ttioctl(struct tty *tp, u_long cmd, void *data, int flag, struct lwp *l) { extern struct tty *constty; /* Temporary virtual console. */ - struct proc *p = l ? l->l_proc : NULL; + struct proc *p; struct linesw *lp; int s, error; struct pathbuf *pb; struct nameidata nd; char infobuf[200]; + KASSERT(l != NULL); + p = l->l_proc; + /* If the ioctl involves modification, hang if in the background. */ switch (cmd) { case TIOCFLUSH:
CVS commit: src/sys/arch/emips/stand/common
Module Name:src Committed By: martin Date: Sun Feb 23 07:49:04 UTC 2014 Modified Files: src/sys/arch/emips/stand/common: printf.c Log Message: Provide a prototype for xputchar To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/emips/stand/common/printf.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/emips/stand/common/printf.c diff -u src/sys/arch/emips/stand/common/printf.c:1.3 src/sys/arch/emips/stand/common/printf.c:1.4 --- src/sys/arch/emips/stand/common/printf.c:1.3 Thu Jul 21 11:04:24 2011 +++ src/sys/arch/emips/stand/common/printf.c Sun Feb 23 07:49:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: printf.c,v 1.3 2011/07/21 11:04:24 joerg Exp $ */ +/* $NetBSD: printf.c,v 1.4 2014/02/23 07:49:04 martin Exp $ */ /*- * Copyright (c) 1998 Robert Nordier * All rights reserved. @@ -20,6 +20,8 @@ #include +void xputchar(int); + void xputchar(int ch) {
CVS commit: src/usr.bin/btkey
Module Name:src Committed By: mlelstv Date: Sun Feb 23 07:50:01 UTC 2014 Modified Files: src/usr.bin/btkey: file.c Log Message: skip unparseable addresses. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/btkey/file.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/btkey/file.c diff -u src/usr.bin/btkey/file.c:1.1 src/usr.bin/btkey/file.c:1.2 --- src/usr.bin/btkey/file.c:1.1 Fri Nov 9 21:18:25 2007 +++ src/usr.bin/btkey/file.c Sun Feb 23 07:50:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.1 2007/11/09 21:18:25 plunky Exp $ */ +/* $NetBSD: file.c,v 1.2 2014/02/23 07:50:01 mlelstv Exp $ */ /*- * Copyright (c) 2007 Iain Hibbert @@ -28,7 +28,7 @@ */ #include -__RCSID("$NetBSD: file.c,v 1.1 2007/11/09 21:18:25 plunky Exp $"); +__RCSID("$NetBSD: file.c,v 1.2 2014/02/23 07:50:01 mlelstv Exp $"); #include #include @@ -67,8 +67,8 @@ list_file(void) goto done; while ((sym = prop_object_iterator_next(iter)) != NULL) { - memset(&bdaddr, 0, sizeof(bdaddr)); - bt_aton(prop_dictionary_keysym_cstring_nocopy(sym), &bdaddr); + if (bt_aton(prop_dictionary_keysym_cstring_nocopy(sym), &bdaddr) == 0) + continue; if (bdaddr_any(&bdaddr)) continue;
CVS commit: src/common/lib/libc/arch/m68k/atomic
Module Name:src Committed By: martin Date: Sun Feb 23 07:43:38 UTC 2014 Modified Files: src/common/lib/libc/arch/m68k/atomic: atomic_op_asm.h Log Message: Remove misplaced #endif To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/m68k/atomic/atomic_op_asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/m68k/atomic/atomic_op_asm.h diff -u src/common/lib/libc/arch/m68k/atomic/atomic_op_asm.h:1.4 src/common/lib/libc/arch/m68k/atomic/atomic_op_asm.h:1.5 --- src/common/lib/libc/arch/m68k/atomic/atomic_op_asm.h:1.4 Sat Feb 22 17:08:30 2014 +++ src/common/lib/libc/arch/m68k/atomic/atomic_op_asm.h Sun Feb 23 07:43:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_op_asm.h,v 1.4 2014/02/22 17:08:30 martin Exp $ */ +/* $NetBSD: atomic_op_asm.h,v 1.5 2014/02/23 07:43:38 martin Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -47,7 +47,6 @@ #ifdef _LIBC #define CRT_ALIAS(a,s) STRONG_ALIAS(a,s) #endif -#endif #endif /* _KERNEL */
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Sun Feb 23 05:46:28 UTC 2014 Modified Files: src/external/gpl3/gcc: gcc2netbsd Log Message: add */po and itm/testsuite. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/gcc2netbsd 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/gcc/gcc2netbsd diff -u src/external/gpl3/gcc/gcc2netbsd:1.4 src/external/gpl3/gcc/gcc2netbsd:1.5 --- src/external/gpl3/gcc/gcc2netbsd:1.4 Sun Jan 19 00:37:30 2014 +++ src/external/gpl3/gcc/gcc2netbsd Sun Feb 23 05:46:28 2014 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: gcc2netbsd,v 1.4 2014/01/19 00:37:30 mrg Exp $ +# $NetBSD: gcc2netbsd,v 1.5 2014/02/23 05:46:28 mrg Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -50,17 +50,21 @@ gcc/ada gcc/fortran gcc/go gcc/java +gcc/po gcc/testsuite libada libatomic +libcpp/po libffi libgfortran libgo libgomp/testsuite libiberty/testsuite +libitm/testsuite libjava libmudflap/testsuite libquadmath +libstdc++-v3/po libstdc++-v3/testsuite zlib "
CVS commit: src/external/gpl3/gcc/dist/gcc/po
Module Name:src Committed By: mrg Date: Sun Feb 23 02:09:29 UTC 2014 Removed Files: src/external/gpl3/gcc/dist/gcc/po: ChangeLog EXCLUDES be.gmo be.po da.gmo da.po de.gmo de.po el.gmo el.po es.gmo es.po exgettext fi.gmo fi.po fr.gmo fr.po gcc.pot id.gmo id.po ja.gmo ja.po nl.gmo nl.po ru.gmo ru.po sr.gmo sr.po sv.gmo sv.po tr.gmo tr.po vi.gmo vi.po zh_CN.gmo zh_CN.po zh_TW.gmo zh_TW.po Log Message: remove the testsuite and po subdirectories. 27292 files are removed in this series of commits. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 src/external/gpl3/gcc/dist/gcc/po/ChangeLog cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gcc/dist/gcc/po/EXCLUDES \ src/external/gpl3/gcc/dist/gcc/po/be.gmo \ src/external/gpl3/gcc/dist/gcc/po/be.po \ src/external/gpl3/gcc/dist/gcc/po/da.gmo \ src/external/gpl3/gcc/dist/gcc/po/da.po \ src/external/gpl3/gcc/dist/gcc/po/de.gmo \ src/external/gpl3/gcc/dist/gcc/po/de.po \ src/external/gpl3/gcc/dist/gcc/po/el.gmo \ src/external/gpl3/gcc/dist/gcc/po/el.po \ src/external/gpl3/gcc/dist/gcc/po/es.gmo \ src/external/gpl3/gcc/dist/gcc/po/es.po \ src/external/gpl3/gcc/dist/gcc/po/exgettext \ src/external/gpl3/gcc/dist/gcc/po/fi.gmo \ src/external/gpl3/gcc/dist/gcc/po/fi.po \ src/external/gpl3/gcc/dist/gcc/po/fr.gmo \ src/external/gpl3/gcc/dist/gcc/po/fr.po \ src/external/gpl3/gcc/dist/gcc/po/gcc.pot \ src/external/gpl3/gcc/dist/gcc/po/id.gmo \ src/external/gpl3/gcc/dist/gcc/po/id.po \ src/external/gpl3/gcc/dist/gcc/po/ja.gmo \ src/external/gpl3/gcc/dist/gcc/po/ja.po \ src/external/gpl3/gcc/dist/gcc/po/nl.gmo \ src/external/gpl3/gcc/dist/gcc/po/nl.po \ src/external/gpl3/gcc/dist/gcc/po/ru.gmo \ src/external/gpl3/gcc/dist/gcc/po/ru.po \ src/external/gpl3/gcc/dist/gcc/po/sr.gmo \ src/external/gpl3/gcc/dist/gcc/po/sr.po \ src/external/gpl3/gcc/dist/gcc/po/sv.gmo \ src/external/gpl3/gcc/dist/gcc/po/sv.po \ src/external/gpl3/gcc/dist/gcc/po/tr.gmo \ src/external/gpl3/gcc/dist/gcc/po/tr.po \ src/external/gpl3/gcc/dist/gcc/po/vi.gmo \ src/external/gpl3/gcc/dist/gcc/po/vi.po \ src/external/gpl3/gcc/dist/gcc/po/zh_CN.gmo \ src/external/gpl3/gcc/dist/gcc/po/zh_CN.po \ src/external/gpl3/gcc/dist/gcc/po/zh_TW.gmo \ src/external/gpl3/gcc/dist/gcc/po/zh_TW.po Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/libiberty
Module Name:src Committed By: mrg Date: Sun Feb 23 01:59:40 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/libiberty: Makefile.in configure configure.ac Log Message: don't look in libiberty/testsuite for anything, it's going away. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/libiberty/Makefile.in \ src/external/gpl3/gcc/dist/libiberty/configure \ src/external/gpl3/gcc/dist/libiberty/configure.ac 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/gcc/dist/libiberty/Makefile.in diff -u src/external/gpl3/gcc/dist/libiberty/Makefile.in:1.1.1.1 src/external/gpl3/gcc/dist/libiberty/Makefile.in:1.2 --- src/external/gpl3/gcc/dist/libiberty/Makefile.in:1.1.1.1 Tue Jun 21 01:23:30 2011 +++ src/external/gpl3/gcc/dist/libiberty/Makefile.in Sun Feb 23 01:59:40 2014 @@ -98,6 +98,8 @@ FLAGS_TO_PASS = \ # Subdirectories to recurse into. We need to override this during cleaning SUBDIRS = testsuite +# NetBSD override -- we delete the testsuite +SUBDIRS = # FIXME: add @BUILD_INFO@ once we're sure it works for everyone. all: stamp-picdir $(TARGETLIB) required-list all-subdir Index: src/external/gpl3/gcc/dist/libiberty/configure diff -u src/external/gpl3/gcc/dist/libiberty/configure:1.1.1.1 src/external/gpl3/gcc/dist/libiberty/configure:1.2 --- src/external/gpl3/gcc/dist/libiberty/configure:1.1.1.1 Tue Jun 21 01:23:29 2011 +++ src/external/gpl3/gcc/dist/libiberty/configure Sun Feb 23 01:59:40 2014 @@ -6847,7 +6847,7 @@ LIBOBJS="$L" # We need multilib support, but only if configuring for the target. -ac_config_files="$ac_config_files Makefile testsuite/Makefile" +ac_config_files="$ac_config_files Makefile" ac_config_commands="$ac_config_commands default" @@ -7551,7 +7551,6 @@ do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -"testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; Index: src/external/gpl3/gcc/dist/libiberty/configure.ac diff -u src/external/gpl3/gcc/dist/libiberty/configure.ac:1.1.1.1 src/external/gpl3/gcc/dist/libiberty/configure.ac:1.2 --- src/external/gpl3/gcc/dist/libiberty/configure.ac:1.1.1.1 Tue Jun 21 01:23:29 2011 +++ src/external/gpl3/gcc/dist/libiberty/configure.ac Sun Feb 23 01:59:40 2014 @@ -705,7 +705,7 @@ AC_SUBST(docdir) AC_SUBST(htmldir) # We need multilib support, but only if configuring for the target. -AC_CONFIG_FILES([Makefile testsuite/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_CONFIG_COMMANDS([default], [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h if test -n "$CONFIG_FILES"; then
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sat Feb 22 23:32:26 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: tmux-1.9a out. To generate a diff of this commit: cvs rdiff -u -r1.1095 -r1.1096 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.1095 src/doc/3RDPARTY:1.1096 --- src/doc/3RDPARTY:1.1095 Thu Feb 20 22:01:24 2014 +++ src/doc/3RDPARTY Sat Feb 22 23:32:26 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1095 2014/02/20 22:01:24 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1096 2014/02/22 23:32:26 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1220,7 +1220,7 @@ for the import. Package: tmux Version: 1.5 -Current Vers: 1.9 +Current Vers: 1.9a Maintainer: Nicholas Marriott Archive site: http://downloads.sourceforge.net/tmux/ Home page: http://tmux.sourceforge.net/
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Sat Feb 22 20:50:46 UTC 2014 Modified Files: src/sys/arch/arm/include: cpufunc.h Log Message: Add way_size to arm_cache_info Fix arm67_tlb_purge prototype To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/arm/include/cpufunc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/cpufunc.h diff -u src/sys/arch/arm/include/cpufunc.h:1.67 src/sys/arch/arm/include/cpufunc.h:1.68 --- src/sys/arch/arm/include/cpufunc.h:1.67 Thu Feb 20 23:24:54 2014 +++ src/sys/arch/arm/include/cpufunc.h Sat Feb 22 20:50:46 2014 @@ -240,7 +240,7 @@ u_int arm3_control (u_int, u_int); #if defined(CPU_ARM6) || defined(CPU_ARM7) void arm67_setttb (u_int, bool); void arm67_tlb_flush (void); -void arm67_tlb_purge (u_int); +void arm67_tlb_purge (vaddr_t); void arm67_cache_flush (void); void arm67_context_switch (u_int); #endif /* CPU_ARM6 || CPU_ARM7 */ @@ -755,11 +755,13 @@ struct arm_cache_info { u_int icache_size; u_int icache_line_size; u_int icache_ways; + u_int icache_way_size; u_int icache_sets; u_int dcache_size; u_int dcache_line_size; u_int dcache_ways; + u_int dcache_way_size; u_int dcache_sets; u_int cache_type;
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: matt Date: Sat Feb 22 20:46:35 UTC 2014 Modified Files: src/sys/arch/arm/include/arm32: pte.h Log Message: Add L1_TABLE_SIZE_REAL To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/include/arm32/pte.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/arm32/pte.h diff -u src/sys/arch/arm/include/arm32/pte.h:1.13 src/sys/arch/arm/include/arm32/pte.h:1.14 --- src/sys/arch/arm/include/arm32/pte.h:1.13 Tue Sep 11 15:28:14 2012 +++ src/sys/arch/arm/include/arm32/pte.h Sat Feb 22 20:46:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.13 2012/09/11 15:28:14 matt Exp $ */ +/* $NetBSD: pte.h,v 1.14 2014/02/22 20:46:35 matt Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -137,6 +137,7 @@ typedef uint32_t pt_entry_t; /* L2 table * keep the old L2_TABLE_SIZE define lying around. Converted ports * should use L2_TABLE_SIZE_REAL until then. */ +#define L1_TABLE_SIZE_REAL 0x4000 /* 16K */ #define L2_TABLE_SIZE_REAL 0x400 /* 1K */ /*
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Sat Feb 22 20:33:00 UTC 2014 Modified Files: src/sys/arch/arm/footbridge: footbridge_io.c src/sys/arch/arm/gemini: gemini_space.c src/sys/arch/arm/ixp12x0: ixp12x0_io.c src/sys/arch/arm/mainbus: mainbus_io.c src/sys/arch/arm/marvell: mvsoc_space.c src/sys/arch/arm/mpcore: mpcore_space.c src/sys/arch/arm/sa11x0: sa11x0_io.c src/sys/arch/arm/xscale: ixp425_pci_space.c pxa2x0_space.c src/sys/arch/evbarm/adi_brh: obio_space.c src/sys/arch/evbarm/hdl_g: obio_space.c src/sys/arch/evbarm/iq80310: obio_space.c src/sys/arch/evbarm/iq80321: obio_space.c src/sys/arch/iyonix/iyonix: obio_space.c Log Message: Don't manipulate the pte to get uncached memory, use PMAP_NOCACHE instead. Convert footbring to kenter_pa/kremove To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/footbridge/footbridge_io.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_space.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/ixp12x0/ixp12x0_io.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/mainbus/mainbus_io.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/mvsoc_space.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/mpcore/mpcore_space.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/sa11x0/sa11x0_io.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/xscale/ixp425_pci_space.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/pxa2x0_space.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/adi_brh/obio_space.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/hdl_g/obio_space.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/iq80310/obio_space.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/iq80321/obio_space.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/iyonix/iyonix/obio_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/arm/footbridge/footbridge_io.c diff -u src/sys/arch/arm/footbridge/footbridge_io.c:1.21 src/sys/arch/arm/footbridge/footbridge_io.c:1.22 --- src/sys/arch/arm/footbridge/footbridge_io.c:1.21 Sun Feb 12 16:34:07 2012 +++ src/sys/arch/arm/footbridge/footbridge_io.c Sat Feb 22 20:33:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: footbridge_io.c,v 1.21 2012/02/12 16:34:07 matt Exp $ */ +/* $NetBSD: footbridge_io.c,v 1.22 2014/02/22 20:33:00 matt Exp $ */ /* * Copyright (c) 1997 Causality Limited @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.21 2012/02/12 16:34:07 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.22 2014/02/22 20:33:00 matt Exp $"); #include #include @@ -179,7 +179,8 @@ footbridge_bs_map(void *t, bus_addr_t bp } int -footbridge_mem_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *bshp) +footbridge_mem_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, +bus_space_handle_t *bshp) { bus_addr_t startpa, endpa, pa; vaddr_t va; @@ -214,15 +215,14 @@ footbridge_mem_bs_map(void *t, bus_addr_ /* Now map the pages */ /* The cookie is the physical base address for the I/O area */ - for (pa = startpa; pa < endpa; pa+=PAGE_SIZE, va += PAGE_SIZE) { - pmap_enter(pmap_kernel(), va, (bus_addr_t)t + pa, VM_PROT_READ | VM_PROT_WRITE, - VM_PROT_READ | VM_PROT_WRITE| PMAP_WIRED); - if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) { - pt_entry_t *pte; - pte = vtopte(va); - *pte &= ~L2_S_CACHE_MASK; - PTE_SYNC(pte); - } + const int pmapflags = + (flags & (BUS_SPACE_MAP_CACHEABLE|BUS_SPACE_MAP_PREFETCHABLE)) + ? 0 + : PMAP_NOCACHE; + + for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) { + pmap_kenter_pa(va, (bus_addr_t)t + pa, + VM_PROT_READ | VM_PROT_WRITE, pmapflags); } pmap_update(pmap_kernel()); @@ -274,7 +274,7 @@ footbridge_mem_bs_unmap(void *t, bus_spa startva = trunc_page(bsh); endva = round_page(bsh + size); - pmap_remove(pmap_kernel(), startva, endva); + pmap_kremove(startva, endva); pmap_update(pmap_kernel()); uvm_km_free(kernel_map, startva, endva - startva, UVM_KMF_VAONLY); } Index: src/sys/arch/arm/gemini/gemini_space.c diff -u src/sys/arch/arm/gemini/gemini_space.c:1.3 src/sys/arch/arm/gemini/gemini_space.c:1.4 --- src/sys/arch/arm/gemini/gemini_space.c:1.3 Fri Jul 1 19:32:28 2011 +++ src/sys/arch/arm/gemini/gemini_space.c Sat Feb 22 20:33:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: gemini_space.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $ */ +/* $NetBSD: gemini_space.c,v 1.4 2014/02/22 20:33:00 matt Exp $ */ /* adapted from: * NetBSD: pxa2x0_space.c,v 1.8 2005/11/24 13:08:32 yamt Exp @@ -79,7 +79,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gemini_space.c,v 1.3 2011/07/01 19:32:28 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gemini_space.c,v 1.4 2014/02/22 20:33:00 matt Exp $"); #include #include @@ -175,10 +175,7 @@ int gemini_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
CVS commit: src/sys/arch/hpcarm/hpcarm
Module Name:src Committed By: matt Date: Sat Feb 22 19:16:06 UTC 2014 Modified Files: src/sys/arch/hpcarm/hpcarm: locore.S Log Message: Trim include files To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcarm/hpcarm/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcarm/hpcarm/locore.S diff -u src/sys/arch/hpcarm/hpcarm/locore.S:1.15 src/sys/arch/hpcarm/hpcarm/locore.S:1.16 --- src/sys/arch/hpcarm/hpcarm/locore.S:1.15 Mon Dec 2 18:36:11 2013 +++ src/sys/arch/hpcarm/hpcarm/locore.S Sat Feb 22 19:16:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.15 2013/12/02 18:36:11 joerg Exp $ */ +/* $NetBSD: locore.S,v 1.16 2014/02/22 19:16:06 matt Exp $ */ /* * Copyright (C) 1994-1997 Mark Brinicombe @@ -36,9 +36,7 @@ #include #include #include -#include #include -#include #if defined(CPU_XSCALE_PXA250) || defined(CPU_XSCALE_PXA270) #include #endif
CVS commit: src/sys/uvm
Module Name:src Committed By: mlelstv Date: Sat Feb 22 19:05:32 UTC 2014 Modified Files: src/sys/uvm: uvm_swap.c Log Message: Drop empty priority lists, not the full ones. Fixes kern/48611. To generate a diff of this commit: cvs rdiff -u -r1.166 -r1.167 src/sys/uvm/uvm_swap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/uvm/uvm_swap.c diff -u src/sys/uvm/uvm_swap.c:1.166 src/sys/uvm/uvm_swap.c:1.167 --- src/sys/uvm/uvm_swap.c:1.166 Mon Feb 3 13:20:21 2014 +++ src/sys/uvm/uvm_swap.c Sat Feb 22 19:05:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_swap.c,v 1.166 2014/02/03 13:20:21 manu Exp $ */ +/* $NetBSD: uvm_swap.c,v 1.167 2014/02/22 19:05:31 mlelstv Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.166 2014/02/03 13:20:21 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.167 2014/02/22 19:05:31 mlelstv Exp $"); #include "opt_uvmhist.h" #include "opt_compat_netbsd.h" @@ -397,7 +397,7 @@ swaplist_trim(void) struct swappri *spp, *nextspp; LIST_FOREACH_SAFE(spp, &swap_priority, spi_swappri, nextspp) { - if (TAILQ_EMPTY(&spp->spi_swapdev)) + if (!TAILQ_EMPTY(&spp->spi_swapdev)) continue; LIST_REMOVE(spp, spi_swappri); kmem_free(spp, sizeof(*spp));
CVS commit: src/sys/arch/evbarm/ixm1200
Module Name:src Committed By: matt Date: Sat Feb 22 19:03:57 UTC 2014 Modified Files: src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c Log Message: Deal with non-4KB page sizes To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/ixm1200/ixm1200_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/evbarm/ixm1200/ixm1200_machdep.c diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.54 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.55 --- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.54 Sun Aug 18 15:58:20 2013 +++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Sat Feb 22 19:03:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ixm1200_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $ */ +/* $NetBSD: ixm1200_machdep.c,v 1.55 2014/02/22 19:03:57 matt Exp $ */ /* * Copyright (c) 2002, 2003 @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.55 2014/02/22 19:03:57 matt Exp $"); #include "opt_ddb.h" #include "opt_modular.h" @@ -761,14 +761,14 @@ ixdp_ixp12x0_cc_setup(void) { int loop; paddr_t kaddr; - pt_entry_t *pte; (void) pmap_extract(pmap_kernel(), KERNEL_TEXT_BASE, &kaddr); for (loop = 0; loop < CPU_IXP12X0_CACHE_CLEAN_SIZE; loop += PAGE_SIZE) { -pte = vtopte(ixp12x0_cc_base + loop); -*pte = L2_S_PROTO | kaddr | + pt_entry_t * const ptep = vtopte(ixp12x0_cc_base + loop); + const pt_entry_t npte = L2_S_PROTO | kaddr | L2_S_PROT(PTE_KERNEL, VM_PROT_READ) | pte_l2_s_cache_mode; - PTE_SYNC(pte); + l2pte_set(ptep, npte, 0); + PTE_SYNC(ptep); } ixp12x0_cache_clean_addr = ixp12x0_cc_base; ixp12x0_cache_clean_size = CPU_IXP12X0_CACHE_CLEAN_SIZE / 2;
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Sat Feb 22 19:03:06 UTC 2014 Modified Files: src/sys/arch/acorn32/acorn32: rpc_machdep.c src/sys/arch/acorn32/podulebus: esc.c sfas.c src/sys/arch/arm/xscale: pxa2x0_lcd.c Log Message: Deal with non-4KB page sizes To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/arch/acorn32/acorn32/rpc_machdep.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn32/podulebus/esc.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/acorn32/podulebus/sfas.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/xscale/pxa2x0_lcd.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/acorn32/acorn32/rpc_machdep.c diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.87 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.88 --- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.87 Sun Aug 18 21:42:16 2013 +++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Sat Feb 22 19:03:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rpc_machdep.c,v 1.87 2013/08/18 21:42:16 matt Exp $ */ +/* $NetBSD: rpc_machdep.c,v 1.88 2014/02/22 19:03:06 matt Exp $ */ /* * Copyright (c) 2000-2002 Reinoud Zandijk. @@ -55,7 +55,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.87 2013/08/18 21:42:16 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.88 2014/02/22 19:03:06 matt Exp $"); #include #include @@ -1096,14 +1096,14 @@ rpc_sa110_cc_setup(void) { int loop; paddr_t kaddr; - pt_entry_t *pte; (void) pmap_extract(pmap_kernel(), KERNEL_TEXT_BASE, &kaddr); + const pt_entry_t npte = L2_S_PROTO | kaddr | + L2_S_PROT(PTE_KERNEL, VM_PROT_READ) | pte_l2_s_cache_mode; for (loop = 0; loop < CPU_SA110_CACHE_CLEAN_SIZE; loop += PAGE_SIZE) { - pte = vtopte(sa110_cc_base + loop); - *pte = L2_S_PROTO | kaddr | - L2_S_PROT(PTE_KERNEL, VM_PROT_READ) | pte_l2_s_cache_mode; - PTE_SYNC(pte); + pt_entry_t * const ptep = vtopte(sa110_cc_base + loop); + l2pte_set(ptep, npte, 0); + PTE_SYNC(ptep); } sa1_cache_clean_addr = sa110_cc_base; sa1_cache_clean_size = CPU_SA110_CACHE_CLEAN_SIZE / 2; Index: src/sys/arch/acorn32/podulebus/esc.c diff -u src/sys/arch/acorn32/podulebus/esc.c:1.26 src/sys/arch/acorn32/podulebus/esc.c:1.27 --- src/sys/arch/acorn32/podulebus/esc.c:1.26 Tue Jan 21 19:50:40 2014 +++ src/sys/arch/acorn32/podulebus/esc.c Sat Feb 22 19:03:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: esc.c,v 1.26 2014/01/21 19:50:40 christos Exp $ */ +/* $NetBSD: esc.c,v 1.27 2014/02/22 19:03:06 matt Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -86,7 +86,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.26 2014/01/21 19:50:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.27 2014/02/22 19:03:06 matt Exp $"); #include #include @@ -185,7 +185,6 @@ esc_init_nexus(struct esc_softc *dev, st void escinitialize(struct esc_softc *dev) { - u_int *pte; int i; dev->sc_led_status = 0; @@ -249,9 +248,11 @@ escinitialize(struct esc_softc *dev) * Setup pages to noncachable, that way we don't have to flush the cache * every time we need "bumped" transfer. */ - pte = vtopte((vaddr_t) dev->sc_bump_va); - *pte &= ~L2_C; - PTE_SYNC(pte); + pt_entry_t * const ptep = vtopte((vaddr_t) dev->sc_bump_va); + const pt_entry_t opte = *ptep; + const pt_entry_t npte = opte & ~L2_C; + l2pte_set(ptep, npte, opte); + PTE_SYNC(ptep); cpu_tlb_flushD(); cpu_dcache_wbinv_range((vm_offset_t)dev->sc_bump_va, PAGE_SIZE); Index: src/sys/arch/acorn32/podulebus/sfas.c diff -u src/sys/arch/acorn32/podulebus/sfas.c:1.23 src/sys/arch/acorn32/podulebus/sfas.c:1.24 --- src/sys/arch/acorn32/podulebus/sfas.c:1.23 Tue Jan 21 19:50:40 2014 +++ src/sys/arch/acorn32/podulebus/sfas.c Sat Feb 22 19:03:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sfas.c,v 1.23 2014/01/21 19:50:40 christos Exp $ */ +/* $NetBSD: sfas.c,v 1.24 2014/02/22 19:03:06 matt Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.23 2014/01/21 19:50:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.24 2014/02/22 19:03:06 matt Exp $"); #include #include @@ -178,7 +178,6 @@ sfas_init_nexus(struct sfas_softc *dev, void sfasinitialize(struct sfas_softc *dev) { - u_int *pte; int i; dev->sc_led_status = 0; @@ -245,9 +244,11 @@ sfasinitialize(struct sfas_softc *dev) * Setup pages to noncachable, that way we don't have to flush the cache * every time we need "bumped" transfer. */ - pte = vtopte((vaddr_t) dev->sc_bump_va); - *pte &= ~(L2_C | L2_B); - PTE_SYNC(pte); + pt_entry_t * const ptep = vtopte((vaddr_t) dev->sc_bump_va); + const pt_entry_t opte = *ptep; + const pt_entry_t npte = opte & ~(L2_C | L2_B); + l2pte_set(ptep, npte, opte); + PTE_SYNC(ptep); cpu_tlb_flushD(); cpu_dcache_wbinv_range((vm_offset_t)dev->sc_bump_va, PAGE_SIZE); Inde
CVS commit: src/sys/arch/shark/isa
Module Name:src Committed By: matt Date: Sat Feb 22 18:56:25 UTC 2014 Modified Files: src/sys/arch/shark/isa: isa_irqhandler.c Log Message: include To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/shark/isa/isa_irqhandler.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/shark/isa/isa_irqhandler.c diff -u src/sys/arch/shark/isa/isa_irqhandler.c:1.25 src/sys/arch/shark/isa/isa_irqhandler.c:1.26 --- src/sys/arch/shark/isa/isa_irqhandler.c:1.25 Mon Dec 20 00:25:43 2010 +++ src/sys/arch/shark/isa/isa_irqhandler.c Sat Feb 22 18:56:25 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_irqhandler.c,v 1.25 2010/12/20 00:25:43 matt Exp $ */ +/* $NetBSD: isa_irqhandler.c,v 1.26 2014/02/22 18:56:25 matt Exp $ */ /* * Copyright 1997 @@ -75,16 +75,17 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: isa_irqhandler.c,v 1.25 2010/12/20 00:25:43 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa_irqhandler.c,v 1.26 2014/02/22 18:56:25 matt Exp $"); #include #include #include #include +#include + +#include -#include #include -#include irqhandler_t *irqhandlers[NIRQS];
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: matt Date: Sat Feb 22 18:55:53 UTC 2014 Modified Files: src/sys/arch/shark/ofw: ofw.c Log Message: Deal with non-4K page sizes. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/shark/ofw/ofw.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/shark/ofw/ofw.c diff -u src/sys/arch/shark/ofw/ofw.c:1.62 src/sys/arch/shark/ofw/ofw.c:1.63 --- src/sys/arch/shark/ofw/ofw.c:1.62 Wed Nov 6 02:41:12 2013 +++ src/sys/arch/shark/ofw/ofw.c Sat Feb 22 18:55:53 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw.c,v 1.62 2013/11/06 02:41:12 christos Exp $ */ +/* $NetBSD: ofw.c,v 1.63 2014/02/22 18:55:53 matt Exp $ */ /* * Copyright 1997 @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.62 2013/11/06 02:41:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.63 2014/02/22 18:55:53 matt Exp $"); #include #include @@ -1047,14 +1047,18 @@ ofw_callbackhandler(void *v) /* Install new mappings. */ { - pt_entry_t *pte = vtopte(va); - int npages = size >> PGSHIFT; - + pt_entry_t *ptep = vtopte(va); + KASSERT(ptep + size / L2_S_SIZE == vtopte(va + size)); + pt_entry_t npte = pa | L2_TYPE_S | L2_AP(ap_bits) + | cb_bits; + ap_bits >>= 10; - for (; npages > 0; pte++, pa += PAGE_SIZE, npages--) -*pte = (pa | L2_AP(ap_bits) | L2_TYPE_S | -cb_bits); - PTE_SYNC_RANGE(vtopte(va), size >> PGSHIFT); + for (size_t npages = size >> PGSHIFT; + npages-- > 0; + ptep += PAGE_SIZE / L2_S_SIZE, npte += PAGE_SIZE) { +l2pte_set(ptep, npte, 0); + } + PTE_SYNC_RANGE(vtopte(va), size >> L2_S_SHIFT); } /* Clean out tlb. */ @@ -1091,12 +1095,14 @@ ofw_callbackhandler(void *v) /* Zero the mappings. */ { - pt_entry_t *pte = vtopte(va); - int npages = size >> PGSHIFT; - - for (; npages > 0; pte++, npages--) -*pte = 0; - PTE_SYNC_RANGE(vtopte(va), size >> PGSHIFT); + pt_entry_t *ptep = vtopte(va); + + for (size_t npages = size >> PGSHIFT; + npages-- > 0; + ptep += PAGE_SIZE / L2_S_SIZE) { +l2pte_reset(ptep); + } + PTE_SYNC_RANGE(vtopte(va), size >> L2_S_SHIFT); } /* Clean out tlb. */
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: matt Date: Sat Feb 22 18:55:18 UTC 2014 Modified Files: src/sys/arch/shark/ofw: ofrom.c Log Message: use kenter_pa/kremove To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/shark/ofw/ofrom.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/shark/ofw/ofrom.c diff -u src/sys/arch/shark/ofw/ofrom.c:1.23 src/sys/arch/shark/ofw/ofrom.c:1.24 --- src/sys/arch/shark/ofw/ofrom.c:1.23 Tue Jul 26 08:56:26 2011 +++ src/sys/arch/shark/ofw/ofrom.c Sat Feb 22 18:55:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ofrom.c,v 1.23 2011/07/26 08:56:26 mrg Exp $ */ +/* $NetBSD: ofrom.c,v 1.24 2014/02/22 18:55:18 matt Exp $ */ /* * Copyright 1998 @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ofrom.c,v 1.23 2011/07/26 08:56:26 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofrom.c,v 1.24 2014/02/22 18:55:18 matt Exp $"); #include #include @@ -125,6 +125,7 @@ ofromopen(dev_t dev, int oflags, int dev int ofromrw(dev_t dev, struct uio *uio, int flags) { + pmap_t kpm = pmap_kernel(); struct ofrom_softc *sc; int c, error = 0; struct iovec *iov; @@ -158,16 +159,15 @@ ofromrw(dev_t dev, struct uio *uio, int /* XXX: Use unamanged mapping. */ v = sc->base + uio->uio_offset; - pmap_enter(pmap_kernel(), (vaddr_t)memhook, - trunc_page(v), uio->uio_rw == UIO_READ ? - VM_PROT_READ : VM_PROT_WRITE, PMAP_WIRED); - pmap_update(pmap_kernel()); + pmap_kenter_pa((vaddr_t)memhook, trunc_page(v), + uio->uio_rw == UIO_READ ? VM_PROT_READ : VM_PROT_WRITE, + 0); + pmap_update(kpm); o = uio->uio_offset & PGOFSET; c = min(uio->uio_resid, (int)(PAGE_SIZE - o)); error = uiomove((char *)memhook + o, c, uio); - pmap_remove(pmap_kernel(), (vaddr_t)memhook, - (vaddr_t)memhook + PAGE_SIZE); - pmap_update(pmap_kernel()); + pmap_kremove((vaddr_t)memhook, (vaddr_t)memhook + PAGE_SIZE); + pmap_update(kpm); } mutex_exit(&memlock);
CVS commit: src/sys/arch/alpha
Module Name:src Committed By: martin Date: Sat Feb 22 18:42:47 UTC 2014 Modified Files: src/sys/arch/alpha/conf: files.alpha src/sys/arch/alpha/pci: tsc.c Log Message: Allow kernels without tsciic to build. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/arch/alpha/conf/files.alpha cvs rdiff -u -r1.23 -r1.24 src/sys/arch/alpha/pci/tsc.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/alpha/conf/files.alpha diff -u src/sys/arch/alpha/conf/files.alpha:1.186 src/sys/arch/alpha/conf/files.alpha:1.187 --- src/sys/arch/alpha/conf/files.alpha:1.186 Fri Feb 21 12:23:30 2014 +++ src/sys/arch/alpha/conf/files.alpha Sat Feb 22 18:42:47 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.alpha,v 1.186 2014/02/21 12:23:30 jdc Exp $ +# $NetBSD: files.alpha,v 1.187 2014/02/22 18:42:47 martin Exp $ # # alpha-specific configuration info @@ -277,7 +277,7 @@ file arch/alpha/pci/tsp_bus_mem.c tsp device tsciic: i2cbus, i2c_bitbang attach tsciic at tsc -file arch/alpha/pci/tsciic.c tsciic +file arch/alpha/pci/tsciic.c tsciic needs-flag device ttwoga { hose = -1 } attach ttwoga at mainbus Index: src/sys/arch/alpha/pci/tsc.c diff -u src/sys/arch/alpha/pci/tsc.c:1.23 src/sys/arch/alpha/pci/tsc.c:1.24 --- src/sys/arch/alpha/pci/tsc.c:1.23 Fri Feb 21 12:23:30 2014 +++ src/sys/arch/alpha/pci/tsc.c Sat Feb 22 18:42:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: tsc.c,v 1.23 2014/02/21 12:23:30 jdc Exp $ */ +/* $NetBSD: tsc.c,v 1.24 2014/02/22 18:42:47 martin Exp $ */ /*- * Copyright (c) 1999 by Ross Harvey. All rights reserved. @@ -35,7 +35,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.23 2014/02/21 12:23:30 jdc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.24 2014/02/22 18:42:47 martin Exp $"); #include #include @@ -53,6 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.23 #include #include +#include "tsciic.h" + #ifdef DEC_6600 #include #endif @@ -88,7 +90,9 @@ static void tsciicattach(device_t, devic CFATTACH_DECL_NEW(tsciic, sizeof(struct tsciic_softc), tsciicmatch, tsciicattach, NULL, NULL); +#if NTSCIIC extern struct cfdriver tsciic_cd; +#endif /* There can be only one */ static int tscfound; @@ -310,12 +314,16 @@ tsp_bus_get_window(int type, int window, static int tsciicmatch(device_t parent, cfdata_t match, void *aux) { +#if NTSCIIC struct tsciic_attach_args *t = aux; +#endif switch (cputype) { case ST_DEC_6600: case ST_DEC_TITAN: +#if NTSCIIC return strcmp(t->tsciic_name, tsciic_cd.cd_name) == 0; +#endif default: return 0; } @@ -324,7 +332,9 @@ tsciicmatch(device_t parent, cfdata_t ma static void tsciicattach(device_t parent, device_t self, void *aux) { +#if NTSCIIC tsciic_init(self); +#endif } void
CVS commit: src/sys/arch/x86
Module Name:src Committed By: dsl Date: Sat Feb 22 17:48:08 UTC 2014 Modified Files: src/sys/arch/x86/include: cpu.h src/sys/arch/x86/x86: cpu_topology.c identcpu.c Log Message: Re-use the unused ci_cpu_serial[3] to save the highest cpuid values for the normal and extended leafs. (The 'normal' one might be luring in the global cpulevel.) Read the 'extended feature' from cpuid.8001.%ecx/edx into ci_feat_val[3/2] just after saving cpuid.1.%ecx/dx in ci_feat_val[1/0] instead of doing it separately for amd k678 and via c3 processors in their probe functions and repeating it for all cpus a few instructions later when x86_cpu_topology() is called. x86_cpu_topology() is only called from cpu_probe() and really doesn't deserve its own source file. Chasing the setup code is bad enough anyway. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/x86/cpu_topology.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/x86/identcpu.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/include/cpu.h diff -u src/sys/arch/x86/include/cpu.h:1.63 src/sys/arch/x86/include/cpu.h:1.64 --- src/sys/arch/x86/include/cpu.h:1.63 Thu Feb 20 18:14:11 2014 +++ src/sys/arch/x86/include/cpu.h Sat Feb 22 17:48:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.63 2014/02/20 18:14:11 dsl Exp $ */ +/* $NetBSD: cpu.h,v 1.64 2014/02/22 17:48:08 dsl Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -150,18 +150,20 @@ struct cpu_info { uint32_t ci_ipis; /* interprocessor interrupts pending */ uint32_t sc_apic_version; /* local APIC version */ - uint32_t ci_signature; /* X86 cpuid type */ + uint32_t ci_signature; /* X86 cpuid type (cpuid.1.%eax) */ uint32_t ci_vendor[4]; /* vendor string */ - uint32_t ci_cpu_serial[3]; /* PIII serial number */ + uint32_t _unused2; + uint32_t ci_max_cpuid; /* cpuid.0:%eax */ + uint32_t ci_max_ext_cpuid; /* cpuid.8000:%eax */ volatile uint32_t ci_lapic_counter; - uint32_t ci_feat_val[5]; /* X86 CPUID feature bits - * [0] basic features %edx - * [1] basic features %ecx - * [2] extended features %edx - * [3] extended features %ecx - * [4] VIA padlock features - */ + uint32_t ci_feat_val[5]; /* X86 CPUID feature bits */ + /* [0] basic features cpuid.1:%edx + * [1] basic features cpuid.1:%ecx (CPUID2_xxx bits) + * [2] extended features cpuid:8001:%edx + * [3] extended features cpuid:8001:%ecx + * [4] VIA padlock features + */ const struct cpu_functions *ci_func; /* start/stop functions */ struct trapframe *ci_ddb_regs; Index: src/sys/arch/x86/x86/cpu_topology.c diff -u src/sys/arch/x86/x86/cpu_topology.c:1.8 src/sys/arch/x86/x86/cpu_topology.c:1.9 --- src/sys/arch/x86/x86/cpu_topology.c:1.8 Fri Nov 15 08:47:55 2013 +++ src/sys/arch/x86/x86/cpu_topology.c Sat Feb 22 17:48:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_topology.c,v 1.8 2013/11/15 08:47:55 msaitoh Exp $ */ +/* $NetBSD: cpu_topology.c,v 1.9 2014/02/22 17:48:08 dsl Exp $ */ /*- * Copyright (c) 2009 Mindaugas Rasiukevicius , @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.8 2013/11/15 08:47:55 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.9 2014/02/22 17:48:08 dsl Exp $"); #include #include @@ -54,7 +54,7 @@ x86_cpu_topology(struct cpu_info *ci) u_int lp_max; /* Logical processors per package (node) */ u_int core_max; /* Core per package */ int n, cpu_family, apic_id, smt_bits, core_bits = 0; - uint32_t descs[4], lextmode; + uint32_t descs[4]; apic_id = ci->ci_initapicid; cpu_family = CPUID_TO_FAMILY(ci->ci_signature); @@ -77,15 +77,6 @@ x86_cpu_topology(struct cpu_info *ci) return; } - /* Determine the extended feature flags. */ - x86_cpuid(0x8000, descs); - lextmode = descs[0]; - if (lextmode >= 0x8001) { - x86_cpuid(0x8001, descs); - ci->ci_feat_val[2] = descs[3]; /* edx */ - ci->ci_feat_val[3] = descs[2]; /* ecx */ - } - /* Check for HTT support. See notes below regarding AMD. */ if ((ci->ci_feat_val[0] & CPUID_HTT) != 0) { /* Maximum number of LPs sharing a cache (ebx[23:16]). */ @@ -98,8 +89,7 @@ x86_cpu_topology(struct cpu_info *ci) switch (cpu_vendor) { case CPUVENDOR_INTEL: /* Check for leaf 4 support. */ - x86_cpuid(0, descs); - if (descs[0] >= 4) { + if (ci->ci_max_cpuid >= 4) { /* Maximum number of Cores per package (eax[31:26]). */ x86_cpuid2(4, 0, descs); core_max = (descs[0] >> 26) + 1; @@ -114,7 +104,7 @@ x86_cpu_topology(struct cpu_info *ci) break; } /* Legacy Method, LPs represent Cores. */ - if (cpu_family < 0x10 || lextmode < 0x8008) { + if (cpu_family < 0x10 || ci->ci_max_ext_cpuid < 0x8008) { core_max = lp_max; break; } Index: src/sys/
CVS commit: src/share/man/man4
Module Name:src Committed By: dholland Date: Sat Feb 22 17:29:13 UTC 2014 Modified Files: src/share/man/man4: multicast.4 Log Message: Fix examples, from Henning Petersen in PR misc/48612. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/multicast.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/multicast.4 diff -u src/share/man/man4/multicast.4:1.6 src/share/man/man4/multicast.4:1.7 --- src/share/man/man4/multicast.4:1.6 Tue Mar 13 19:25:40 2012 +++ src/share/man/man4/multicast.4 Sat Feb 22 17:29:13 2014 @@ -24,7 +24,7 @@ .\" DEALINGS IN THE SOFTWARE. .\" .\" $FreeBSD: src/share/man/man4/multicast.4,v 1.4 2004/07/09 09:22:36 ru Exp $ -.\" $NetBSD: multicast.4,v 1.6 2012/03/13 19:25:40 njoly Exp $ +.\" $NetBSD: multicast.4,v 1.7 2014/02/22 17:29:13 dholland Exp $ .\" .Dd September 4, 2003 .Dt MULTICAST 4 @@ -312,7 +312,7 @@ mc.mf6cc_parent = iif_index; for (i = 0; i \*[Lt] maxvifs; i++) if (oifs_ttl[i] \*[Gt] 0) IF_SET(i, \*[Am]mc.mf6cc_ifset); -setsockopt(mrouter_s4, IPPROTO_IPV6, MRT6_ADD_MFC, +setsockopt(mrouter_s6, IPPROTO_IPV6, MRT6_ADD_MFC, (void *)\*[Am]mc, sizeof(mc)); .Ed .Pp @@ -351,7 +351,7 @@ struct mf6cctl mc; memset(\*[Am]mc, 0, sizeof(mc)); memcpy(\*[Am]mc.mf6cc_origin, \*[Am]source_addr, sizeof(mc.mf6cc_origin)); memcpy(\*[Am]mc.mf6cc_mcastgrp, \*[Am]group_addr, sizeof(mf6cc_mcastgrp)); -setsockopt(mrouter_s4, IPPROTO_IPV6, MRT6_DEL_MFC, +setsockopt(mrouter_s6, IPPROTO_IPV6, MRT6_DEL_MFC, (void *)\*[Am]mc, sizeof(mc)); .Ed .Pp
CVS commit: src/lib/libc/sys
Module Name:src Committed By: dholland Date: Sat Feb 22 17:26:41 UTC 2014 Modified Files: src/lib/libc/sys: pipe.2 Log Message: pipe2 requires fcntl.h for its flags; PR 48614 from Steffen Daode Nurpmeso. Also fix the wording for EINVAL as suggested by Robert Elz. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/lib/libc/sys/pipe.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/pipe.2 diff -u src/lib/libc/sys/pipe.2:1.29 src/lib/libc/sys/pipe.2:1.30 --- src/lib/libc/sys/pipe.2:1.29 Tue Apr 23 23:39:13 2013 +++ src/lib/libc/sys/pipe.2 Sat Feb 22 17:26:41 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: pipe.2,v 1.29 2013/04/23 23:39:13 elric Exp $ +.\" $NetBSD: pipe.2,v 1.30 2014/02/22 17:26:41 dholland Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -41,6 +41,8 @@ .In unistd.h .Ft int .Fn pipe "int fildes[2]" +.In unistd.h +.In fcntl.h .Ft int .Fn pipe2 "int fildes[2]" "int flags" .Sh DESCRIPTION @@ -134,11 +136,7 @@ will also fail if: .Bl -tag -width Er .It Bq Er EINVAL .Fa flags -is other than -.Dv O_NONBLOCK , -.Dv O_NOSIGPIPE -or -.Dv O_CLOEXEC . +contains an invalid value. .El .Sh SEE ALSO .Xr sh 1 ,
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Sat Feb 22 17:21:19 UTC 2014 Modified Files: src/games/fortune/datfiles: fortunes2 Log Message: fix typo, from Henning Petersen in PR misc/48613 To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.52 src/games/fortune/datfiles/fortunes2:1.53 --- src/games/fortune/datfiles/fortunes2:1.52 Wed Dec 11 14:59:47 2013 +++ src/games/fortune/datfiles/fortunes2 Sat Feb 22 17:21:19 2014 @@ -38774,7 +38774,7 @@ Sex is an emotion in motion. % "Sex is as honest a product benefit for fragrance [perfume] as taste is for diet Coke." - -- Malcolm DacDougall + -- Malcolm MacDougall % Sex is good, but not as good as fresh sweet corn. -- Garrison Keillor
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: martin Date: Sat Feb 22 17:16:12 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: Makefile.inc Log Message: Missed one __sync_* op (or gcc4.8 does inline it, while 4.5 does not?) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/common/lib/libc/arch/arm/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/atomic/Makefile.inc diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.17 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.18 --- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.17 Sat Feb 22 08:08:56 2014 +++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Sat Feb 22 17:16:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.17 2014/02/22 08:08:56 martin Exp $ +# $NetBSD: Makefile.inc,v 1.18 2014/02/22 17:16:12 martin Exp $ ARMV6= ${CPUFLAGS:M-march=armv6*} ${CPUFLAGS:M-mcpu=arm11*} ARMV6+= ${CFLAGS:M-march=armv6*:} ${CFLAGS:M-mcpu=arm11*} @@ -31,7 +31,8 @@ SRCS.atomic+= atomic_xor_32_cas.c atomic atomic_or_16_cas.c atomic_or_8_cas.c \ atomic_and_16_cas.c atomic_and_8_cas.c \ atomic_add_16_cas.c atomic_add_8_cas.c \ - atomic_swap_16_cas.c atomic_swap_8_cas.c + atomic_swap_16_cas.c atomic_swap_8_cas.c \ + atomic_cas_32_cas.c atomic_cas_16_cas.c atomic_cas_8_cas.c .endif .else
CVS commit: src/common/lib/libc
Module Name:src Committed By: martin Date: Sat Feb 22 17:08:30 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_add_32.S atomic_and_32.S atomic_op_asm.h atomic_or_32.S src/common/lib/libc/arch/m68k/atomic: atomic_add.S atomic_and.S atomic_cas.S atomic_nand.S atomic_op_asm.h atomic_or.S atomic_sub.S atomic_swap.S atomic_xor.S src/common/lib/libc/atomic: atomic_add_32_cas.c atomic_add_32_nv_cas.c atomic_add_64_nv_cas.c atomic_and_32_cas.c atomic_and_32_nv_cas.c atomic_and_64_nv_cas.c atomic_init_testset.c atomic_op_namespace.h atomic_or_32_cas.c atomic_or_32_nv_cas.c atomic_or_64_nv_cas.c atomic_swap_32_cas.c atomic_swap_64_cas.c membar_ops_nop.c Log Message: Try to hide the C runtime implementation specific __sync_* ops from librump, to avoid duplicates. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_add_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_and_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_32.S cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/arm/atomic/atomic_op_asm.h cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/m68k/atomic/atomic_add.S cvs rdiff -u -r1.9 -r1.10 src/common/lib/libc/arch/m68k/atomic/atomic_and.S \ src/common/lib/libc/arch/m68k/atomic/atomic_cas.S \ src/common/lib/libc/arch/m68k/atomic/atomic_or.S cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/m68k/atomic/atomic_nand.S \ src/common/lib/libc/arch/m68k/atomic/atomic_sub.S \ src/common/lib/libc/arch/m68k/atomic/atomic_xor.S cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/m68k/atomic/atomic_op_asm.h cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/m68k/atomic/atomic_swap.S cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/atomic/atomic_add_32_cas.c \ src/common/lib/libc/atomic/atomic_swap_64_cas.c cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/atomic/atomic_add_32_nv_cas.c \ src/common/lib/libc/atomic/atomic_op_namespace.h \ src/common/lib/libc/atomic/atomic_or_32_nv_cas.c \ src/common/lib/libc/atomic/atomic_swap_32_cas.c cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/atomic/atomic_add_64_nv_cas.c \ src/common/lib/libc/atomic/atomic_and_32_nv_cas.c \ src/common/lib/libc/atomic/atomic_and_64_nv_cas.c \ src/common/lib/libc/atomic/atomic_or_64_nv_cas.c \ src/common/lib/libc/atomic/membar_ops_nop.c cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/atomic/atomic_and_32_cas.c \ src/common/lib/libc/atomic/atomic_or_32_cas.c cvs rdiff -u -r1.12 -r1.13 src/common/lib/libc/atomic/atomic_init_testset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/atomic/atomic_add_32.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_add_32.S:1.6 src/common/lib/libc/arch/arm/atomic/atomic_add_32.S:1.7 --- src/common/lib/libc/arch/arm/atomic/atomic_add_32.S:1.6 Fri Nov 8 22:42:52 2013 +++ src/common/lib/libc/arch/arm/atomic/atomic_add_32.S Sat Feb 22 17:08:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_32.S,v 1.6 2013/11/08 22:42:52 matt Exp $ */ +/* $NetBSD: atomic_add_32.S,v 1.7 2014/02/22 17:08:30 martin Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ ATOMIC_OP_ALIAS(atomic_add_32,_atomic_ad ATOMIC_OP_ALIAS(atomic_add_int,_atomic_add_32) ATOMIC_OP_ALIAS(atomic_add_long,_atomic_add_32) ATOMIC_OP_ALIAS(atomic_add_ptr,_atomic_add_32) -STRONG_ALIAS(__sync_fetch_and_add_4,_atomic_add_32) +CRT_ALIAS(__sync_fetch_and_add_4,_atomic_add_32) STRONG_ALIAS(_atomic_add_int,_atomic_add_32) STRONG_ALIAS(_atomic_add_long,_atomic_add_32) STRONG_ALIAS(_atomic_add_ptr,_atomic_add_32) @@ -65,7 +65,7 @@ ATOMIC_OP_ALIAS(atomic_sub_32,_atomic_su ATOMIC_OP_ALIAS(atomic_sub_int,_atomic_sub_32) ATOMIC_OP_ALIAS(atomic_sub_long,_atomic_sub_32) ATOMIC_OP_ALIAS(atomic_sub_ptr,_atomic_sub_32) -STRONG_ALIAS(__sync_fetch_and_sub_4,_atomic_sub_32) +CRT_ALIAS(__sync_fetch_and_sub_4,_atomic_sub_32) STRONG_ALIAS(_atomic_sub_int,_atomic_sub_32) STRONG_ALIAS(_atomic_sub_long,_atomic_sub_32) STRONG_ALIAS(_atomic_sub_ptr,_atomic_sub_32) @@ -92,7 +92,7 @@ ATOMIC_OP_ALIAS(atomic_add_32_nv,_atomic ATOMIC_OP_ALIAS(atomic_add_int_nv,_atomic_add_32_nv) ATOMIC_OP_ALIAS(atomic_add_long_nv,_atomic_add_32_nv) ATOMIC_OP_ALIAS(atomic_add_ptr_nv,_atomic_add_32_nv) -STRONG_ALIAS(__sync_add_and_fetch_4,_atomic_add_32_nv) +CRT_ALIAS(__sync_add_and_fetch_4,_atomic_add_32_nv) STRONG_ALIAS(_atomic_add_int_nv,_atomic_add_32_nv) STRONG_ALIAS(_atomic_add_long_nv,_atomic_add_32_nv) STRONG_ALIAS(_atomic_add_ptr_nv,_atomic_add_32_nv) @@ -101,7 +101,7 @@ ATOMIC_OP_ALIAS(atomic_sub_32_nv,_atomic ATOMIC_OP_ALIAS(atomic_sub_int_nv,_atomic_sub_32_nv) ATOMIC_OP_ALIAS(atomic_sub_long_nv,_atomic_sub_32_nv) ATOMIC_OP_ALIAS(atomic_sub_ptr_nv,_atomic_sub_32_nv) -STRONG_ALIAS(__sync_sub_and_
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: martin Date: Sat Feb 22 16:14:39 UTC 2014 Modified Files: src/sys/arch/arm/marvell: mvsoc_intr.c Log Message: Explicitly include armreg.h (for the interrupt enable bit) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/marvell/mvsoc_intr.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/marvell/mvsoc_intr.c diff -u src/sys/arch/arm/marvell/mvsoc_intr.c:1.8 src/sys/arch/arm/marvell/mvsoc_intr.c:1.9 --- src/sys/arch/arm/marvell/mvsoc_intr.c:1.8 Wed Nov 20 12:16:47 2013 +++ src/sys/arch/arm/marvell/mvsoc_intr.c Sat Feb 22 16:14:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoc_intr.c,v 1.8 2013/11/20 12:16:47 kiyohara Exp $ */ +/* $NetBSD: mvsoc_intr.c,v 1.9 2014/02/22 16:14:38 martin Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mvsoc_intr.c,v 1.8 2013/11/20 12:16:47 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mvsoc_intr.c,v 1.9 2014/02/22 16:14:38 martin Exp $"); #include "opt_mvsoc.h" @@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: mvsoc_intr.c #include +#include #include #include #include
CVS commit: src/common/lib/libc/arch/m68k/atomic
Module Name:src Committed By: martin Date: Sat Feb 22 14:51:34 UTC 2014 Modified Files: src/common/lib/libc/arch/m68k/atomic: Makefile.inc Log Message: Add missing __sunc_* ops for sun2 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/common/lib/libc/arch/m68k/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/m68k/atomic/Makefile.inc diff -u src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.12 src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.13 --- src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.12 Thu Feb 20 20:39:01 2014 +++ src/common/lib/libc/arch/m68k/atomic/Makefile.inc Sat Feb 22 14:51:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.12 2014/02/20 20:39:01 martin Exp $ +# $NetBSD: Makefile.inc,v 1.13 2014/02/22 14:51:34 martin Exp $ # # Note: The atomic operations here in these assembly files are atomic @@ -24,6 +24,17 @@ SRCS+= atomic_add_32_cas.c atomic_add_3 atomic_inc_32_cas.c atomic_inc_32_nv_cas.c atomic_or_32_cas.c \ atomic_or_32_nv_cas.c atomic_swap_32_cas.c membar_ops_nop.c +.if ${LIB} == "c" +SRCS+= atomic_add_16_cas.c atomic_add_8_cas.c \ + atomic_sub_32_cas.c atomic_sub_16_cas.c atomic_sub_8_cas.c \ + atomic_nand_32_cas.c atomic_nand_16_cas.c atomic_nand_8_cas.c \ + atomic_xor_32_cas.c atomic_xor_16_cas.c atomic_xor_8_cas.c \ + atomic_and_32_cas.c atomic_and_16_cas.c atomic_and_8_cas.c \ + atomic_or_32_cas.c atomic_or_16_cas.c atomic_or_8_cas.c \ + atomic_cas_32_cas.c atomic_cas_16_cas.c atomic_cas_8_cas.c \ + atomic_swap_32_cas.c atomic_swap_16_cas.c atomic_swap_8_cas.c +.endif + .endif .endif
CVS commit: src/bin/ls
Module Name:src Committed By: mlelstv Date: Sat Feb 22 13:11:42 UTC 2014 Modified Files: src/bin/ls: print.c Log Message: fix -w output To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/bin/ls/print.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/ls/print.c diff -u src/bin/ls/print.c:1.53 src/bin/ls/print.c:1.54 --- src/bin/ls/print.c:1.53 Thu Feb 20 18:56:36 2014 +++ src/bin/ls/print.c Sat Feb 22 13:11:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.53 2014/02/20 18:56:36 christos Exp $ */ +/* $NetBSD: print.c,v 1.54 2014/02/22 13:11:42 mlelstv Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94"; #else -__RCSID("$NetBSD: print.c,v 1.53 2014/02/20 18:56:36 christos Exp $"); +__RCSID("$NetBSD: print.c,v 1.54 2014/02/22 13:11:42 mlelstv Exp $"); #endif #endif /* not lint */ @@ -102,7 +102,7 @@ printpath(const FTSENT *p) { if (f_fullpath) return printf("%s/%s", p->fts_path, p->fts_name); else - return printf("%s", p->fts_path); + return printf("%s", p->fts_name); } void
CVS commit: src/bin/ls
Module Name:src Committed By: mlelstv Date: Sat Feb 22 13:08:13 UTC 2014 Modified Files: src/bin/ls: ls.c Log Message: add u option to getopt again. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/bin/ls/ls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/ls/ls.c diff -u src/bin/ls/ls.c:1.72 src/bin/ls/ls.c:1.73 --- src/bin/ls/ls.c:1.72 Fri Feb 21 02:42:41 2014 +++ src/bin/ls/ls.c Sat Feb 22 13:08:13 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ls.c,v 1.72 2014/02/21 02:42:41 christos Exp $ */ +/* $NetBSD: ls.c,v 1.73 2014/02/22 13:08:13 mlelstv Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19 #if 0 static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94"; #else -__RCSID("$NetBSD: ls.c,v 1.72 2014/02/21 02:42:41 christos Exp $"); +__RCSID("$NetBSD: ls.c,v 1.73 2014/02/22 13:08:13 mlelstv Exp $"); #endif #endif /* not lint */ @@ -151,7 +151,7 @@ ls_main(int argc, char *argv[]) f_listdot = 1; fts_options = FTS_PHYSICAL; - while ((ch = getopt(argc, argv, "1AaBbCcdFfghikLlMmnOoPpqRrSsTtWwXx")) + while ((ch = getopt(argc, argv, "1AaBbCcdFfghikLlMmnOoPpqRrSsTtuWwXx")) != -1) { switch (ch) { /*
CVS commit: src/common/lib/libc/arch/sh3/atomic
Module Name:src Committed By: martin Date: Sat Feb 22 12:12:30 UTC 2014 Modified Files: src/common/lib/libc/arch/sh3/atomic: Makefile.inc Log Message: Add missing __sync_* ops to libc To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/sh3/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/sh3/atomic/Makefile.inc diff -u src/common/lib/libc/arch/sh3/atomic/Makefile.inc:1.5 src/common/lib/libc/arch/sh3/atomic/Makefile.inc:1.6 --- src/common/lib/libc/arch/sh3/atomic/Makefile.inc:1.5 Sun Jan 4 17:54:29 2009 +++ src/common/lib/libc/arch/sh3/atomic/Makefile.inc Sat Feb 22 12:12:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2009/01/04 17:54:29 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.6 2014/02/22 12:12:30 martin Exp $ .if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \ || ${LIB} == "rump") @@ -8,6 +8,17 @@ SRCS+= atomic_add_32_cas.c atomic_add_32 atomic_inc_32_cas.c atomic_inc_32_nv_cas.c atomic_or_32_cas.c \ atomic_or_32_nv_cas.c atomic_swap_32_cas.c membar_ops_nop.c +.if ${LIB} == "c" +SRCS+= atomic_add_16_cas.c atomic_add_8_cas.c \ + atomic_sub_32_cas.c atomic_sub_16_cas.c atomic_sub_8_cas.c \ + atomic_and_16_cas.c atomic_and_8_cas.c \ + atomic_nand_32_cas.c atomic_nand_16_cas.c atomic_nand_8_cas.c \ + atomic_or_16_cas.c atomic_or_8_cas.c \ + atomic_xor_32_cas.c atomic_xor_16_cas.c atomic_xor_8_cas.c \ + atomic_swap_16_cas.c atomic_swap_8_cas.c \ + atomic_cas_32_cas.c atomic_cas_16_cas.c atomic_cas_8_cas.c +.endif + .endif .if defined(LIB) && (${LIB} == "c" || ${LIB} == "pthread")
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Feb 22 11:28:18 UTC 2014 Modified Files: src/share/man/man9: vnode.9 Log Message: Use more markup. Add "flag" in a sentence. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/share/man/man9/vnode.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/vnode.9 diff -u src/share/man/man9/vnode.9:1.58 src/share/man/man9/vnode.9:1.59 --- src/share/man/man9/vnode.9:1.58 Sat Feb 22 10:08:12 2014 +++ src/share/man/man9/vnode.9 Sat Feb 22 11:28:18 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: vnode.9,v 1.58 2014/02/22 10:08:12 hannken Exp $ +.\" $NetBSD: vnode.9,v 1.59 2014/02/22 11:28:18 wiz Exp $ .\" .\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -189,48 +189,51 @@ and .Em v_uflag . Valid flags are: .Pp -.Bl -tag -offset indent -width VONWORKLST -compact -.It VV_ROOT +.Bl -tag -offset indent -width ".Dv VI_WRMAPDIRTY" -compact +.It Dv VV_ROOT This vnode is the root of its file system. -.It VV_SYSTEM +.It Dv VV_SYSTEM This vnode is being used by the kernel; only used to skip quota files in .Fn vflush . -.It VV_ISTTY +.It Dv VV_ISTTY This vnode represents a tty; used when reading dead vnodes. -.It VV_MAPPED +.It Dv VV_MAPPED This vnode might have user mappings. -.It VV_MPSAFE +.It Dv VV_MPSAFE This file system is MP safe. -.It VV_LOCKSWORK +.It Dv VV_LOCKSWORK This vnode's file system supports locking. -.It VI_TEXT +.It Dv VI_TEXT This vnode is a pure text prototype. -.It VI_EXECMAP +.It Dv VI_EXECMAP This vnode has executable mappings. -.It VI_WRMAP +.It Dv VI_WRMAP This vnode might have PROT_WRITE user mappings. -.It VI_WRMAPDIRTY -This vnode might have dirty pages due to VWRITEMAP -.It VI_XLOCK +.It Dv VI_WRMAPDIRTY +This vnode might have dirty pages due to +.Dv VWRITEMAP . +.It Dv VI_XLOCK This vnode is currently locked to change underlying type. -.It VI_ONWORKLST +.It Dv VI_ONWORKLST This vnode is on syncer work-list. -.It VI_MARKER +.It Dv VI_MARKER A dummy marker vnode. -.It VI_LAYER +.It Dv VI_LAYER This vnode is on a layered file system. -.It VI_LOCKSHARE +.It Dv VI_LOCKSHARE This vnode shares its .Em v_interlock with other vnodes. -.It VI_CLEAN +.It Dv VI_CLEAN This vnode has been reclaimed and is no longer attached to a file system. -.It VU_DIROP +.It Dv VU_DIROP This vnode is involved in a directory operation. This flag is used exclusively by LFS. .El .Pp -The VI_XLOCK flag is used to prevent multiple processes from entering +The +.Dv VI_XLOCK +flag is used to prevent multiple processes from entering the vnode reclamation code. It is also used as a flag to indicate that reclamation is in progress. Before @@ -345,23 +348,23 @@ performed on valid file system objects. Valid types are: .Pp .Bl -tag -offset indent -width VFIFO -compact -.It VNON +.It Dv VNON The vnode has no type. -.It VREG +.It Dv VREG The vnode represents a regular file. -.It VDIR +.It Dv VDIR The vnode represents a directory. -.It VBLK +.It Dv VBLK The vnode represents a block special device. -.It VCHR +.It Dv VCHR The vnode represents a character special device. -.It VLNK +.It Dv VLNK The vnode represents a symbolic link. -.It VSOCK +.It Dv VSOCK The vnode represents a socket. -.It VFIFO +.It Dv VFIFO The vnode represents a pipe. -.It VBAD +.It Dv VBAD The vnode represents a bad file (not currently used). .El .Pp @@ -378,59 +381,59 @@ member is read-only. Valid tag types are: .Pp .Bl -tag -offset indent -width "VT_FILECORE " -compact -.It VT_NON +.It Dv VT_NON non file system -.It VT_UFS +.It Dv VT_UFS universal file system -.It VT_NFS +.It Dv VT_NFS network file system -.It VT_MFS +.It Dv VT_MFS memory file system -.It VT_MSDOSFS +.It Dv VT_MSDOSFS FAT file system -.It VT_LFS +.It Dv VT_LFS log-structured file system -.It VT_LOFS +.It Dv VT_LOFS loopback file system -.It VT_FDESC +.It Dv VT_FDESC file descriptor file system -.It VT_NULL +.It Dv VT_NULL null file system layer -.It VT_UMAP +.It Dv VT_UMAP uid/gid remapping file system layer -.It VT_KERNFS +.It Dv VT_KERNFS kernel interface file system -.It VT_PROCFS +.It Dv VT_PROCFS process interface file system -.It VT_AFS +.It Dv VT_AFS AFS file system -.It VT_ISOFS +.It Dv VT_ISOFS ISO 9660 file system(s) -.It VT_UNION +.It Dv VT_UNION union file system -.It VT_ADOSFS +.It Dv VT_ADOSFS Amiga file system -.It VT_EXT2FS +.It Dv VT_EXT2FS Linux's ext2 file system -.It VT_CODA +.It Dv VT_CODA Coda file system -.It VT_FILECORE +.It Dv VT_FILECORE filecore file system -.It VT_NTFS +.It Dv VT_NTFS Microsoft NT's file system -.It VT_VFS +.It Dv VT_VFS virtual file system -.It VT_OVERLAY +.It Dv VT_OVERLAY overlay file system -.It VT_SMBFS +.It Dv VT_SMBFS SMB file system -.It VT_PTYFS +.It Dv VT_PTYFS pseudo-terminal device file system -.It VT_TMPFS +.It Dv VT_TMPFS efficient memory file syste
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Feb 22 11:08:05 UTC 2014 Modified Files: src/share/man/man9: vfssubr.9 Log Message: Mark up NULL with Dv. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man9/vfssubr.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/vfssubr.9 diff -u src/share/man/man9/vfssubr.9:1.21 src/share/man/man9/vfssubr.9:1.22 --- src/share/man/man9/vfssubr.9:1.21 Sat Feb 22 10:05:54 2014 +++ src/share/man/man9/vfssubr.9 Sat Feb 22 11:08:05 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: vfssubr.9,v 1.21 2014/02/22 10:05:54 hannken Exp $ +.\" $NetBSD: vfssubr.9,v 1.22 2014/02/22 11:08:05 wiz Exp $ .\" .\" Copyright (c) 2003, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -138,7 +138,9 @@ This function is used to synchronize acc The caller must hold a pre-existing reference to the mount. If .Fa nextp -is not NULL, the caller must hold the +is not +.Dv NULL , +the caller must hold the .Em mountlist_lock and .Fa nextp @@ -157,7 +159,9 @@ is true, preserve the reference added by .Fn vfs_busy . If .Fa nextp -is not NULL, the +is not +.Dv NULL , +the .Em mountlist_lock will be aquired and .Fa nextp
CVS commit: src/common/lib/libc/arch/hppa/atomic
Module Name:src Committed By: skrll Date: Sat Feb 22 10:23:25 UTC 2014 Modified Files: src/common/lib/libc/arch/hppa/atomic: Makefile.inc Log Message: Add the missing __sync_* ops to libc To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/common/lib/libc/arch/hppa/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/hppa/atomic/Makefile.inc diff -u src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.11 src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.12 --- src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.11 Sat Feb 22 08:24:27 2014 +++ src/common/lib/libc/arch/hppa/atomic/Makefile.inc Sat Feb 22 10:23:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.11 2014/02/22 08:24:27 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.12 2014/02/22 10:23:24 skrll Exp $ .if defined(LIB) @@ -24,4 +24,14 @@ CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_16_UP CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_8_UP . endif +.if defined(LIB) && ${LIB} == "c" +SRCS+= atomic_xor_32_cas.c atomic_xor_16_cas.c atomic_xor_8_cas.c \ + atomic_sub_32_cas.c atomic_sub_16_cas.c atomic_sub_8_cas.c \ + atomic_nand_32_cas.c atomic_nand_16_cas.c atomic_nand_8_cas.c \ + atomic_or_16_cas.c atomic_or_8_cas.c\ + atomic_and_16_cas.c atomic_and_8_cas.c\ + atomic_add_16_cas.c atomic_add_8_cas.c\ + atomic_swap_16_cas.c atomic_swap_8_cas.c \ + atomic_cas_32_cas.c atomic_cas_16_cas.c atomic_cas_8_cas.c +.endif .endif
CVS commit: src/share/man/man9
Module Name:src Committed By: hannken Date: Sat Feb 22 10:08:12 UTC 2014 Modified Files: src/share/man/man9: vnode.9 Log Message: Update arguments of vrecycle(), description of getnewvnode() and the vnode flags. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/share/man/man9/vnode.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/vnode.9 diff -u src/share/man/man9/vnode.9:1.57 src/share/man/man9/vnode.9:1.58 --- src/share/man/man9/vnode.9:1.57 Tue Oct 29 09:53:51 2013 +++ src/share/man/man9/vnode.9 Sat Feb 22 10:08:12 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: vnode.9,v 1.57 2013/10/29 09:53:51 hannken Exp $ +.\" $NetBSD: vnode.9,v 1.58 2014/02/22 10:08:12 hannken Exp $ .\" .\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 29, 2013 +.Dd February 22, 2014 .Dt VNODE 9 .Os .Sh NAME @@ -79,7 +79,7 @@ .Ft void .Fn ungetnewvnode "struct vnode *vp" .Ft int -.Fn vrecycle "struct vnode *vp" "struct simplelock *inter_lkp" +.Fn vrecycle "struct vnode *vp" "struct kmutex_t *inter_lkp" .Ft void .Fn vgone "struct vnode *vp" .Ft void @@ -183,58 +183,61 @@ C-preprocessor directives are used to al .Em v_uobj . .Pp Vnode flags are recorded by -.Em v_flag . +.Em v_iflag , +.Em v_vflag +and +.Em v_uflag . Valid flags are: .Pp .Bl -tag -offset indent -width VONWORKLST -compact -.It VROOT +.It VV_ROOT This vnode is the root of its file system. -.It VTEXT -This vnode is a pure text prototype. -.It VSYSTEM +.It VV_SYSTEM This vnode is being used by the kernel; only used to skip quota files in .Fn vflush . -.It VISTTY +.It VV_ISTTY This vnode represents a tty; used when reading dead vnodes. -.It VEXECMAP +.It VV_MAPPED +This vnode might have user mappings. +.It VV_MPSAFE +This file system is MP safe. +.It VV_LOCKSWORK +This vnode's file system supports locking. +.It VI_TEXT +This vnode is a pure text prototype. +.It VI_EXECMAP This vnode has executable mappings. -.It VWRITEMAP +.It VI_WRMAP This vnode might have PROT_WRITE user mappings. -.It VWRITEMAPDIRTY +.It VI_WRMAPDIRTY This vnode might have dirty pages due to VWRITEMAP -.It VLOCKSWORK -This vnode's file system supports locking. -.It VXLOCK +.It VI_XLOCK This vnode is currently locked to change underlying type. -.It VXWANT -A process is waiting for this vnode. -.It VBWAIT -Waiting for output associated with this vnode to complete. -.It VALIASED -This vnode has an alias. -.It VDIROP +.It VI_ONWORKLST +This vnode is on syncer work-list. +.It VI_MARKER +A dummy marker vnode. +.It VI_LAYER +This vnode is on a layered file system. +.It VI_LOCKSHARE +This vnode shares its +.Em v_interlock +with other vnodes. +.It VI_CLEAN +This vnode has been reclaimed and is no longer attached to a file system. +.It VU_DIROP This vnode is involved in a directory operation. This flag is used exclusively by LFS. -.It VLAYER -This vnode is on a layered file system. -.It VONWORKLST -This vnode is on syncer work-list. -.It VFREEING -This vnode is being freed. -.It VMAPPED -This vnode might have user mappings. .El .Pp -The VXLOCK flag is used to prevent multiple processes from entering +The VI_XLOCK flag is used to prevent multiple processes from entering the vnode reclamation code. It is also used as a flag to indicate that reclamation is in progress. -The VXWANT flag is set by threads that wish to be awakened when -reclamation is finished. Before -.Em v_flag +.Em v_iflag can be modified, the .Em v_interlock -simplelock must be acquired. +mutex must be acquired. See .Xr lock 9 for details on the kernel locking API. @@ -272,8 +275,7 @@ and reach zero, the vnode is recycled to the freelist and may be reused for another file. The transition to and from the freelist is handled by -.Fn getnewvnode , -.Fn ungetnewvnode +a kernel thread and .Fn vrecycle . Access to @@ -283,7 +285,7 @@ and .Em v_holdcnt is also protected by the .Em v_interlock -simplelock. +mutex. .Pp The number of pending synchronous and asynchronous writes on the vnode are recorded in @@ -334,8 +336,7 @@ must call to increment the reference count and retrieve it from the freelist. When a user wants a new vnode for another file, .Fn getnewvnode -is invoked to remove a vnode from the freelist and initialize it for -the new file. +is invoked to allocate a vnode and initialize it for the new file. .Pp The type of object the vnode represents is recorded by .Em v_type . @@ -529,7 +530,9 @@ The argument specifies the .Xr rwlock 9 flags used to lock the vnode. -If the VXLOCK is set in +If the +.Em VI_XLOCK +is set in .Fa vp Ns 's .Em v_flag , vnode @@ -538,7 +541,7 @@ is being recycled in .Fn vgone and the calling thread sleeps until the transition is
CVS commit: src/share/man/man9
Module Name:src Committed By: hannken Date: Sat Feb 22 10:05:54 UTC 2014 Modified Files: src/share/man/man9: vfssubr.9 Log Message: Update the description of vfs_busy() and vfs_unbusy(). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man9/vfssubr.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/vfssubr.9 diff -u src/share/man/man9/vfssubr.9:1.20 src/share/man/man9/vfssubr.9:1.21 --- src/share/man/man9/vfssubr.9:1.20 Thu Dec 2 12:54:13 2010 +++ src/share/man/man9/vfssubr.9 Sat Feb 22 10:05:54 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: vfssubr.9,v 1.20 2010/12/02 12:54:13 wiz Exp $ +.\" $NetBSD: vfssubr.9,v 1.21 2014/02/22 10:05:54 hannken Exp $ .\" .\" Copyright (c) 2003, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 9, 2009 +.Dd February 22, 2014 .Dt VFSSUBR 9 .Os .Sh NAME @@ -74,9 +74,9 @@ .Ft void .Fn vfs_unmountall "struct lwp *l" .Ft int -.Fn vfs_busy "struct mount *mp" "int flags" "struct simplelock *interlkp" +.Fn vfs_busy "struct mount *mp" "struct mount **nextp" .Ft void -.Fn vfs_unbusy "struct mount *mp" +.Fn vfs_unbusy "struct mount *mp" "bool keepref" "struct mount **nextp" .Ft struct mount * .Fn vfs_mountalloc "struct vfsops *vfs" "struct vnode *vp" .Ft int @@ -130,17 +130,38 @@ by the vnode Mount the root file system. .It Fn vfs_unmountall "l" Unmount all file systems. -.It Fn vfs_busy "mp" "flags" "interlkp" +.It Fn vfs_busy "mp" "nextp" Mark the mount point specified by .Fa mp -as busy. +as busy and get a reference to it. This function is used to synchronize access and to delay unmounting. -The interlock specified by argument -.Fa interlkp -is not released on failure. -.It Fn vfs_unbusy "mp" -Free the busy file system specified by the mount structure +The caller must hold a pre-existing reference to the mount. +If +.Fa nextp +is not NULL, the caller must hold the +.Em mountlist_lock +and +.Fa nextp +will receive the next mount from mount list on error. +The +.Em mountlist_lock +is released on return. +.It Fn vfs_unbusy "mp" "keepref" "nextp" +Undo a +.Fn vfs_busy +on the mount point specified by .Fa mp . +If +.Fa keepref +is true, preserve the reference added by +.Fn vfs_busy . +If +.Fa nextp +is not NULL, the +.Em mountlist_lock +will be aquired and +.Fa nextp +will receive the next mount from mount list. .It Fn vfs_mountalloc "vfsops" "vp" Allocate and initialise a mount structure, setting .Em mnt_vnodecovered
CVS commit: src/common/lib/libc/arch/vax/atomic
Module Name:src Committed By: martin Date: Sat Feb 22 08:53:33 UTC 2014 Modified Files: src/common/lib/libc/arch/vax/atomic: Makefile.inc Log Message: Add the missing __sync_* ops to libc To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/vax/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/vax/atomic/Makefile.inc diff -u src/common/lib/libc/arch/vax/atomic/Makefile.inc:1.5 src/common/lib/libc/arch/vax/atomic/Makefile.inc:1.6 --- src/common/lib/libc/arch/vax/atomic/Makefile.inc:1.5 Sun Jan 4 17:54:29 2009 +++ src/common/lib/libc/arch/vax/atomic/Makefile.inc Sat Feb 22 08:53:33 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2009/01/04 17:54:29 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.6 2014/02/22 08:53:33 martin Exp $ .if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \ || ${LIB} == "rump") @@ -8,6 +8,17 @@ SRCS+= atomic_add_32_cas.c atomic_add_32 atomic_inc_32_cas.c atomic_inc_32_nv_cas.c atomic_or_32_cas.c \ atomic_or_32_nv_cas.c atomic_swap_32_cas.c membar_ops_nop.c +.if ${LIB} == "c" +SRCS+= atomic_add_16_cas.c atomic_add_8_cas.c \ + atomic_sub_32_cas.c atomic_sub_16_cas.c atomic_sub_8_cas.c \ + atomic_or_16_cas.c atomic_or_8_cas.c \ + atomic_xor_32_cas.c atomic_xor_16_cas.c atomic_xor_8_cas.c \ + atomic_and_16_cas.c atomic_and_8_cas.c \ + atomic_nand_32_cas.c atomic_nand_16_cas.c atomic_nand_8_cas.c \ + atomic_cas_32_cas.c atomic_cas_16_cas.c atomic_cas_8_cas.c \ + atomic_swap_16_cas.c atomic_swap_8_cas.c +.endif + .endif .if defined(LIB) && (${LIB} == "c" || ${LIB} == "pthread")
CVS commit: src/common/lib/libc/arch/hppa/atomic
Module Name:src Committed By: skrll Date: Sat Feb 22 08:24:27 UTC 2014 Modified Files: src/common/lib/libc/arch/hppa/atomic: Makefile.inc Log Message: Another layout change To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/arch/hppa/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/hppa/atomic/Makefile.inc diff -u src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.10 src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.11 --- src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.10 Sat Feb 22 08:21:03 2014 +++ src/common/lib/libc/arch/hppa/atomic/Makefile.inc Sat Feb 22 08:24:27 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2014/02/22 08:21:03 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.11 2014/02/22 08:24:27 skrll Exp $ .if defined(LIB) @@ -9,8 +9,8 @@ SRCS+= atomic_add_32_cas.c atomic_add_32 atomic_and_32_cas.c atomic_and_32_nv_cas.c \ atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \ atomic_inc_32_cas.c atomic_inc_32_nv_cas.c \ - atomic_or_32_cas.c \ - atomic_or_32_nv_cas.c atomic_swap_32_cas.c \ + atomic_or_32_cas.c atomic_or_32_nv_cas.c \ + atomic_swap_32_cas.c \ membar_ops_nop.c . endif
CVS commit: src/common/lib/libc/arch/hppa/atomic
Module Name:src Committed By: skrll Date: Sat Feb 22 08:21:04 UTC 2014 Modified Files: src/common/lib/libc/arch/hppa/atomic: Makefile.inc Log Message: Layout changes - no functional change. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/common/lib/libc/arch/hppa/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/hppa/atomic/Makefile.inc diff -u src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.9 src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.10 --- src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.9 Wed Jan 29 11:03:04 2014 +++ src/common/lib/libc/arch/hppa/atomic/Makefile.inc Sat Feb 22 08:21:03 2014 @@ -1,14 +1,17 @@ -# $NetBSD: Makefile.inc,v 1.9 2014/01/29 11:03:04 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.10 2014/02/22 08:21:03 skrll Exp $ .if defined(LIB) . if (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" || \ ${LIB} == "rump") -SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c atomic_and_32_cas.c \ - atomic_and_32_nv_cas.c atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \ - atomic_inc_32_cas.c atomic_inc_32_nv_cas.c atomic_or_32_cas.c \ - atomic_or_32_nv_cas.c atomic_swap_32_cas.c membar_ops_nop.c +SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c \ + atomic_and_32_cas.c atomic_and_32_nv_cas.c \ + atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \ + atomic_inc_32_cas.c atomic_inc_32_nv_cas.c \ + atomic_or_32_cas.c \ + atomic_or_32_nv_cas.c atomic_swap_32_cas.c \ + membar_ops_nop.c . endif
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: martin Date: Sat Feb 22 08:08:56 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/atomic: Makefile.inc Log Message: Move the __sync_* ops added in the previous change to a libc-only section To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/common/lib/libc/arch/arm/atomic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/atomic/Makefile.inc diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.16 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.17 --- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.16 Fri Feb 21 21:54:38 2014 +++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Sat Feb 22 08:08:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.16 2014/02/21 21:54:38 martin Exp $ +# $NetBSD: Makefile.inc,v 1.17 2014/02/22 08:08:56 martin Exp $ ARMV6= ${CPUFLAGS:M-march=armv6*} ${CPUFLAGS:M-mcpu=arm11*} ARMV6+= ${CFLAGS:M-march=armv6*:} ${CFLAGS:M-mcpu=arm11*} @@ -22,14 +22,18 @@ SRCS.atomic+= atomic_add_32_cas.c atomic atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \ atomic_inc_32_cas.c atomic_inc_32_nv_cas.c \ atomic_or_32_cas.c atomic_or_32_nv_cas.c \ - atomic_swap_32_cas.c membar_ops_nop.c \ - atomic_xor_32_cas.c atomic_xor_16_cas.c atomic_xor_8_cas.c \ + atomic_swap_32_cas.c membar_ops_nop.c + +.if ${LIB} == "c" +SRCS.atomic+= atomic_xor_32_cas.c atomic_xor_16_cas.c atomic_xor_8_cas.c \ atomic_sub_32_cas.c atomic_sub_16_cas.c atomic_sub_8_cas.c \ atomic_nand_32_cas.c atomic_nand_16_cas.c atomic_nand_8_cas.c \ atomic_or_16_cas.c atomic_or_8_cas.c \ atomic_and_16_cas.c atomic_and_8_cas.c \ atomic_add_16_cas.c atomic_add_8_cas.c \ atomic_swap_16_cas.c atomic_swap_8_cas.c +.endif + .else .for op in add and cas nand or xor .for sz in 8 16 32 64
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Sat Feb 22 08:02:28 UTC 2014 Modified Files: src/sys/arch/arm/include: types.h Log Message: Define __HAVE_ATOMIC64_OPS if EABI && ARMv6 or later. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/types.h diff -u src/sys/arch/arm/include/types.h:1.25 src/sys/arch/arm/include/types.h:1.26 --- src/sys/arch/arm/include/types.h:1.25 Tue Jul 2 05:57:00 2013 +++ src/sys/arch/arm/include/types.h Sat Feb 22 08:02:28 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.25 2013/07/02 05:57:00 matt Exp $ */ +/* $NetBSD: types.h,v 1.26 2014/02/22 08:02:28 matt Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -90,6 +90,9 @@ typedef volatile int __cpu_simple_lock_ #define __HAVE_COMMON___TLS_GET_ADDR #define __HAVE_TLS_VARIANT_I #define __HAVE_OLD_DISKLABEL +#if defined(__ARM_EABI__) && defined(_ARM_ARCH_6) +#define __HAVE_ATOMIC64_OPS +#endif #if defined(_KERNEL) || defined(_KMEMUSER) #define PCU_FPU 0