CVS commit: src/libexec/tftpd
Module Name:src
Committed By: jnemeth
Date: Fri Oct 4 07:51:48 UTC 2013
Modified Files:
src/libexec/tftpd: tftpd.c
Log Message:
- complete renaming of -w to -c from 1.38
- update usage string to match
- this fixes PR/48234 by Jeff Woodall
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/libexec/tftpd/tftpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/tftpd/tftpd.c
diff -u src/libexec/tftpd/tftpd.c:1.42 src/libexec/tftpd/tftpd.c:1.43
--- src/libexec/tftpd/tftpd.c:1.42 Thu Jul 4 02:58:20 2013
+++ src/libexec/tftpd/tftpd.c Fri Oct 4 07:51:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tftpd.c,v 1.42 2013/07/04 02:58:20 christos Exp $ */
+/* $NetBSD: tftpd.c,v 1.43 2013/10/04 07:51:48 jnemeth Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)tftpd.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: tftpd.c,v 1.42 2013/07/04 02:58:20 christos Exp $);
+__RCSID($NetBSD: tftpd.c,v 1.43 2013/10/04 07:51:48 jnemeth Exp $);
#endif
#endif /* not lint */
@@ -142,7 +142,7 @@ usage(void)
{
syslog(LOG_ERR,
-Usage: %s [-dln] [-g group] [-p pathsep] [-s directory] [-u user] [directory ...],
+Usage: %s [-cdln] [-g group] [-p pathsep] [-s directory] [-u user] [directory ...],
getprogname());
exit(1);
}
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
while ((ch = getopt(argc, argv, cdg:lnp:s:u:)) != -1)
switch (ch) {
- case 'w':
+ case 'c':
unrestricted_writes = 1;
break;
CVS commit: src/sys/fs/udf
Module Name:src Committed By: hannken Date: Fri Oct 4 08:35:08 UTC 2013 Modified Files: src/sys/fs/udf: udf_vnops.c Log Message: Remove a bogus vrecycle() from udf_inactive(). Vrecycle() works on inactive vnodes while VOP_INACTIVE() should never be called on an inactive vnode. Ok: Reinoud Zandijk rein...@netbsd.org To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/fs/udf/udf_vnops.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/fs/udf/udf_vnops.c diff -u src/sys/fs/udf/udf_vnops.c:1.85 src/sys/fs/udf/udf_vnops.c:1.86 --- src/sys/fs/udf/udf_vnops.c:1.85 Wed Jul 10 15:10:56 2013 +++ src/sys/fs/udf/udf_vnops.c Fri Oct 4 08:35:08 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: udf_vnops.c,v 1.85 2013/07/10 15:10:56 reinoud Exp $ */ +/* $NetBSD: udf_vnops.c,v 1.86 2013/10/04 08:35:08 hannken Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -32,7 +32,7 @@ #include sys/cdefs.h #ifndef lint -__KERNEL_RCSID(0, $NetBSD: udf_vnops.c,v 1.85 2013/07/10 15:10:56 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: udf_vnops.c,v 1.86 2013/10/04 08:35:08 hannken Exp $); #endif /* not lint */ @@ -118,7 +118,6 @@ udf_inactive(void *v) *ap-a_recycle = true; udf_delete_node(udf_node); VOP_UNLOCK(vp); - vrecycle(vp, NULL, curlwp); return 0; }
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Fri Oct 4 12:47:04 UTC 2013 Modified Files: src/sys/dev/usb: usbdi.c Log Message: Small KNF To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/sys/dev/usb/usbdi.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/usb/usbdi.c diff -u src/sys/dev/usb/usbdi.c:1.158 src/sys/dev/usb/usbdi.c:1.159 --- src/sys/dev/usb/usbdi.c:1.158 Thu Oct 3 07:35:37 2013 +++ src/sys/dev/usb/usbdi.c Fri Oct 4 12:47:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.158 2013/10/03 07:35:37 skrll Exp $ */ +/* $NetBSD: usbdi.c,v 1.159 2013/10/04 12:47:04 skrll Exp $ */ /* * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.158 2013/10/03 07:35:37 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.159 2013/10/04 12:47:04 skrll Exp $); #ifdef _KERNEL_OPT #include opt_compat_netbsd.h @@ -65,8 +65,8 @@ extern int usbdebug; #define DPRINTFN(n,x) #endif -Static usbd_status usbd_ar_pipe(usbd_pipe_handle pipe); -Static void usbd_start_next(usbd_pipe_handle pipe); +Static usbd_status usbd_ar_pipe(usbd_pipe_handle); +Static void usbd_start_next(usbd_pipe_handle); Static usbd_status usbd_open_pipe_ival (usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *, int);
CVS commit: src/external/gpl3/gdb/lib/libgdb
Module Name:src
Committed By: christos
Date: Fri Oct 4 13:04:00 UTC 2013
Modified Files:
src/external/gpl3/gdb/lib/libgdb: Makefile
Log Message:
new need to run yacc/lex now, since the generated files have been removed
and account for the ada dependencies.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/lib/libgdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.4 src/external/gpl3/gdb/lib/libgdb/Makefile:1.5
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.4 Sun Aug 4 19:41:43 2013
+++ src/external/gpl3/gdb/lib/libgdb/Makefile Fri Oct 4 09:04:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/08/04 23:41:43 matt Exp $
+# $NetBSD: Makefile,v 1.5 2013/10/04 13:04:00 christos Exp $
.include bsd.own.mk
@@ -47,8 +47,7 @@ CWARNFLAGS.clang+= -Wno-switch
#
COPTS+= -Wno-stack-protector
-# Don't run yacc/bison or lex
-.y.c .y.h .l.c:
+ada-exp.c: ada-lex.c
.if ${MACHINE} == amiga
COPTS.dwarf2-frame.c+=-O1
CVS commit: src/sys/netinet6
Module Name:src
Committed By: christos
Date: Fri Oct 4 14:23:14 UTC 2013
Modified Files:
src/sys/netinet6: ip6_input.c
Log Message:
check result of setscope, from logan.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/netinet6/ip6_input.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/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.143 src/sys/netinet6/ip6_input.c:1.144
--- src/sys/netinet6/ip6_input.c:1.143 Sat Jun 29 17:06:58 2013
+++ src/sys/netinet6/ip6_input.c Fri Oct 4 10:23:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.143 2013/06/29 21:06:58 rmind Exp $ */
+/* $NetBSD: ip6_input.c,v 1.144 2013/10/04 14:23:14 christos Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip6_input.c,v 1.143 2013/06/29 21:06:58 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip6_input.c,v 1.144 2013/10/04 14:23:14 christos Exp $);
#include opt_gateway.h
#include opt_inet.h
@@ -806,17 +806,21 @@ static struct m_tag *
ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia)
{
struct m_tag *mtag;
+ struct ip6aux *ip6a;
mtag = ip6_addaux(m);
- if (mtag != NULL) {
- struct ip6aux *ip6a;
+ if (mtag == NULL)
+ return NULL;
- ip6a = (struct ip6aux *)(mtag + 1);
- in6_setscope(ip6a-ip6a_src, ia-ia_ifp, ip6a-ip6a_scope_id);
- ip6a-ip6a_src = ia-ia_addr.sin6_addr;
- ip6a-ip6a_flags = ia-ia6_flags;
+ ip6a = (struct ip6aux *)(mtag + 1);
+ if (in6_setscope(ip6a-ip6a_src, ia-ia_ifp, ip6a-ip6a_scope_id)) {
+ IP6_STATINC(IP6_STAT_BADSCOPE);
+ return NULL;
}
- return mtag; /* NULL if failed to set */
+
+ ip6a-ip6a_src = ia-ia_addr.sin6_addr;
+ ip6a-ip6a_flags = ia-ia6_flags;
+ return mtag;
}
const struct ip6aux *
CVS commit: src/sys/arch/emips/stand
Module Name:src
Committed By: christos
Date: Fri Oct 4 15:01:52 UTC 2013
Modified Files:
src/sys/arch/emips/stand: Makefile.booters
Log Message:
remove -g
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/stand/Makefile.booters
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/Makefile.booters
diff -u src/sys/arch/emips/stand/Makefile.booters:1.2 src/sys/arch/emips/stand/Makefile.booters:1.3
--- src/sys/arch/emips/stand/Makefile.booters:1.2 Wed Aug 21 03:22:26 2013
+++ src/sys/arch/emips/stand/Makefile.booters Fri Oct 4 11:01:52 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.2 2013/08/21 07:22:26 matt Exp $
+# $NetBSD: Makefile.booters,v 1.3 2013/10/04 15:01:52 christos Exp $
.include bsd.sys.mk # for HOST_SH
@@ -19,7 +19,7 @@ AFLAGS+= -D_LOCORE -D_KERNEL -mno-abical
CPPFLAGS+= -nostdinc -D_STANDALONE -DNO_ABICALLS -D_NO_PROM_DEFINES \
-I${.OBJDIR} -I${S}
# compiler flags for smallest code size
-CFLAGS= -ffreestanding -Os -g -mmemcpy -mno-abicalls -G 128
+CFLAGS= -ffreestanding -Os -mmemcpy -mno-abicalls -G 128
LDBUG= -T $S/arch/mips/conf/stand.ldscript
NETBSD_VERS!= ${HOST_SH} ${.CURDIR}/../../../../conf/osrelease.sh
CVS commit: src/sys/arch/mips/conf
Module Name:src
Committed By: christos
Date: Fri Oct 4 15:02:43 UTC 2013
Modified Files:
src/sys/arch/mips/conf: stand.ldscript
Log Message:
discard eh sections
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/conf/stand.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/conf/stand.ldscript
diff -u src/sys/arch/mips/conf/stand.ldscript:1.4 src/sys/arch/mips/conf/stand.ldscript:1.5
--- src/sys/arch/mips/conf/stand.ldscript:1.4 Tue May 4 11:00:39 2010
+++ src/sys/arch/mips/conf/stand.ldscript Fri Oct 4 11:02:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.4 2010/05/04 15:00:39 tsutsui Exp $ */
+/* $NetBSD: stand.ldscript,v 1.5 2013/10/04 15:02:43 christos Exp $ */
/* ldscript for NetBSD/mips stand-alone programs */
OUTPUT_ARCH(mips)
@@ -38,4 +38,10 @@ SECTIONS
}
_end = . ;
PROVIDE (end = .);
+ /DISCARD/ : {
+*(.eh_frame_hdr)
+*(.eh_frame)
+*(.rel.eh_frame)
+*(.rela.eh_frame)
+ }
}
CVS commit: src/sys/arch/emips/stand/bootxx_cd9660
Module Name:src Committed By: christos Date: Fri Oct 4 15:02:15 UTC 2013 Modified Files: src/sys/arch/emips/stand/bootxx_cd9660: Makefile Log Message: kill useless expr To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/stand/bootxx_cd9660/Makefile 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/bootxx_cd9660/Makefile diff -u src/sys/arch/emips/stand/bootxx_cd9660/Makefile:1.1 src/sys/arch/emips/stand/bootxx_cd9660/Makefile:1.2 --- src/sys/arch/emips/stand/bootxx_cd9660/Makefile:1.1 Tue Jan 25 20:18:53 2011 +++ src/sys/arch/emips/stand/bootxx_cd9660/Makefile Fri Oct 4 11:02:14 2013 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2011/01/26 01:18:53 pooka Exp $ +# $NetBSD: Makefile,v 1.2 2013/10/04 15:02:14 christos Exp $ PRIMARY_PROG= bootxx_cd9660 CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=cd9660 \ -DBOOTXX_FS_NAME='ISO 9660' # XXX the following could probably be increased -PRIMARY_MAX_LOAD!= expr 8192 +PRIMARY_MAX_LOAD= 8192 .include ../Makefile.booters
CVS commit: src/sys/arch/amiga/conf
Module Name:src Committed By: rkujawa Date: Fri Oct 4 15:13:51 UTC 2013 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL MDINSTALL Log Message: Nuke long dead NKPTADD and NKPTADDSHIFT options from config files. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.304 -r1.305 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.119 -r1.120 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.122 -r1.123 src/sys/arch/amiga/conf/INSTALL cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/conf/MDINSTALL 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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.172 src/sys/arch/amiga/conf/DRACO:1.173 --- src/sys/arch/amiga/conf/DRACO:1.172 Mon Sep 2 07:24:17 2013 +++ src/sys/arch/amiga/conf/DRACO Fri Oct 4 15:13:51 2013 @@ -1,4 +1,4 @@ -# $NetBSD: DRACO,v 1.172 2013/09/02 07:24:17 skrll Exp $ +# $NetBSD: DRACO,v 1.173 2013/10/04 15:13:51 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.172 $ +#ident GENERIC-$Revision: 1.173 $ maxusers 8 @@ -186,12 +186,6 @@ options DDB # Kernel debugger # #options LIMITMEM=24 # Do not use more than LIMITMEM MB of the # first bank of RAM. (default: unlimited) -#options NKPTADD=4 # set this for 4 additional KPT pages -#options NKPTADDSHIFT=24 # set this for 1 additional KPT page -# per 16 MB (124 bytes) of RAM -# uncomment and decrease this, or uncomment and -# increase NKPTADD if you get out of PT pages -# panics. # ATTENTION: There is NO WARRANTY AT ALL that the sync will be complete # before the 10 secondinterval ends, or that KBDRESET does work at all. Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.304 src/sys/arch/amiga/conf/GENERIC:1.305 --- src/sys/arch/amiga/conf/GENERIC:1.304 Mon Sep 2 07:24:17 2013 +++ src/sys/arch/amiga/conf/GENERIC Fri Oct 4 15:13:51 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.304 2013/09/02 07:24:17 skrll Exp $ +# $NetBSD: GENERIC,v 1.305 2013/10/04 15:13:51 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.304 $ +#ident GENERIC-$Revision: 1.305 $ maxusers 8 @@ -198,12 +198,6 @@ options DDB # Kernel debugger # #options LIMITMEM=24 # Do not use more than LIMITMEM MB of the # first bank of RAM. (default: unlimited) -#options NKPTADD=4 # set this for 4 additional KPT pages -#options NKPTADDSHIFT=24 # set this for 1 additional KPT page -# per 16 MB (124 bytes) of RAM -# uncomment and decrease this, or uncomment and -# increase NKPTADD if you get out of PT pages -# panics. # ATTENTION: There is NO WARRANTY AT ALL that the sync will be complete # before the 10 secondinterval ends, or that KBDRESET does work at all. Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.119 src/sys/arch/amiga/conf/GENERIC.in:1.120 --- src/sys/arch/amiga/conf/GENERIC.in:1.119 Sun Aug 11 16:15:52 2013 +++ src/sys/arch/amiga/conf/GENERIC.in Fri Oct 4 15:13:51 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.119 2013/08/11 16:15:52 rkujawa Exp $ +# $NetBSD: GENERIC.in,v 1.120 2013/10/04 15:13:51 rkujawa Exp $ # ## # GENERIC machine description file @@ -52,7 +52,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.119 $ +#ident GENERIC-$Revision: 1.120 $ m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS=-Os @@ -249,12 +249,6 @@ options DDB # Kernel debugger # #options LIMITMEM=24 # Do not use more than LIMITMEM MB of the # first bank of RAM. (default: unlimited) -#options NKPTADD=4 # set this for 4 additional KPT pages -#options NKPTADDSHIFT=24 # set this for 1 additional KPT page -# per 16 MB (124 bytes) of RAM -# uncomment and decrease this, or uncomment and -# increase NKPTADD if you get out of PT pages -# panics. # ATTENTION: There is NO WARRANTY AT ALL that the sync will be complete # before the 10 secondinterval ends, or that KBDRESET does work at all. Index: src/sys/arch/amiga/conf/INSTALL diff -u src/sys/arch/amiga/conf/INSTALL:1.122 src/sys/arch/amiga/conf/INSTALL:1.123 --- src/sys/arch/amiga/conf/INSTALL:1.122 Mon Sep 2 07:24:17 2013 +++ src/sys/arch/amiga/conf/INSTALL Fri Oct 4 15:13:51 2013 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.122 2013/09/02 07:24:17 skrll Exp $ +# $NetBSD: INSTALL,v 1.123
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: rmind
Date: Fri Oct 4 15:14:11 UTC 2013
Modified Files:
src/sys/fs/tmpfs: tmpfs_subr.c tmpfs_vnops.c
Log Message:
- tmpfs_remove: check 'appendable' flag for the parent directory as well.
Patch from Pedro Martelletto.
- tmpfs_dir_detach: remove missleading check.
- tmpfs_link: remove unused variable.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/fs/tmpfs/tmpfs_subr.c
cvs rdiff -u -r1.102 -r1.103 src/sys/fs/tmpfs/tmpfs_vnops.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/fs/tmpfs/tmpfs_subr.c
diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.79 src/sys/fs/tmpfs/tmpfs_subr.c:1.80
--- src/sys/fs/tmpfs/tmpfs_subr.c:1.79 Tue Mar 13 18:40:50 2012
+++ src/sys/fs/tmpfs/tmpfs_subr.c Fri Oct 4 15:14:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_subr.c,v 1.79 2012/03/13 18:40:50 elad Exp $ */
+/* $NetBSD: tmpfs_subr.c,v 1.80 2013/10/04 15:14:11 rmind Exp $ */
/*
* Copyright (c) 2005-2011 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.79 2012/03/13 18:40:50 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.80 2013/10/04 15:14:11 rmind Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -514,10 +514,7 @@ tmpfs_dir_detach(vnode_t *dvp, tmpfs_dir
KASSERT(node-tn_links 0);
node-tn_links--;
- if (vp) {
- VN_KNOTE(vp, node-tn_links ?
- NOTE_LINK : NOTE_DELETE);
- }
+ VN_KNOTE(vp, node-tn_links ? NOTE_LINK : NOTE_DELETE);
/* If directory - decrease the link count of parent. */
if (node-tn_type == VDIR) {
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.102 src/sys/fs/tmpfs/tmpfs_vnops.c:1.103
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.102 Tue Oct 1 23:10:25 2013
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Fri Oct 4 15:14:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.102 2013/10/01 23:10:25 rmind Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.103 2013/10/04 15:14:11 rmind Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.102 2013/10/01 23:10:25 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.103 2013/10/04 15:14:11 rmind Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -668,7 +668,7 @@ tmpfs_remove(void *v)
struct componentname *a_cnp;
} */ *ap = v;
vnode_t *dvp = ap-a_dvp, *vp = ap-a_vp;
- tmpfs_node_t *node;
+ tmpfs_node_t *dnode, *node;
tmpfs_dirent_t *de;
int error;
@@ -679,18 +679,26 @@ tmpfs_remove(void *v)
error = EPERM;
goto out;
}
+ dnode = VP_TO_TMPFS_DIR(dvp);
node = VP_TO_TMPFS_NODE(vp);
- /* Files marked as immutable or append-only cannot be deleted. */
+ /*
+ * Files marked as immutable or append-only cannot be deleted.
+ * Likewise, files residing on directories marked as append-only
+ * cannot be deleted.
+ */
if (node-tn_flags (IMMUTABLE | APPEND)) {
error = EPERM;
goto out;
}
+ if (dnode-tn_flags APPEND) {
+ error = EPERM;
+ goto out;
+ }
/* Lookup the directory entry (check the cached hint first). */
de = tmpfs_dir_cached(node);
if (de == NULL) {
- tmpfs_node_t *dnode = VP_TO_TMPFS_DIR(dvp);
struct componentname *cnp = ap-a_cnp;
de = tmpfs_dir_lookup(dnode, cnp);
}
@@ -707,6 +715,7 @@ tmpfs_remove(void *v)
tmpfs_dir_attach(dvp, de, TMPFS_NODE_WHITEOUT);
else
tmpfs_free_dirent(VFS_TO_TMPFS(vp-v_mount), de);
+
if (node-tn_links 0) {
/* We removed a hard link. */
node-tn_status |= TMPFS_NODE_CHANGED;
@@ -738,7 +747,7 @@ tmpfs_link(void *v)
vnode_t *dvp = ap-a_dvp;
vnode_t *vp = ap-a_vp;
struct componentname *cnp = ap-a_cnp;
- tmpfs_node_t *dnode, *node;
+ tmpfs_node_t *node;
tmpfs_dirent_t *de;
int error;
@@ -747,7 +756,6 @@ tmpfs_link(void *v)
KASSERT(vp-v_type != VDIR);
KASSERT(dvp-v_mount == vp-v_mount);
- dnode = VP_TO_TMPFS_DIR(dvp);
node = VP_TO_TMPFS_NODE(vp);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
CVS commit: src/share/man/man4
Module Name:src Committed By: rkujawa Date: Fri Oct 4 15:15:39 UTC 2013 Modified Files: src/share/man/man4: options.4 Log Message: Remove long dead options NKPTADD, NKPTADDSHIT. To generate a diff of this commit: cvs rdiff -u -r1.427 -r1.428 src/share/man/man4/options.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/options.4 diff -u src/share/man/man4/options.4:1.427 src/share/man/man4/options.4:1.428 --- src/share/man/man4/options.4:1.427 Thu Aug 22 07:17:11 2013 +++ src/share/man/man4/options.4 Fri Oct 4 15:15:39 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.427 2013/08/22 07:17:11 wiz Exp $ +.\ $NetBSD: options.4,v 1.428 2013/10/04 15:15:39 rkujawa Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -2345,36 +2345,6 @@ If there, limit the part of the first me .Nx to value megabytes. Default is unlimited. -.It Cd options NKPTADD=addvalue -.It Cd options NKPTADDSHIFT=shiftvalue -The -.Tn CPU -specific -.Tn MMU -table for the kernel is pre-allocated at kernel startup time. -Part of it is scaled with -.Va maxproc , -to have enough room to hold the user program -.Tn MMU -tables; the second part is a fixed amount for the kernel itself. -.Pp -The third part accounts for the size of the file buffer cache. -Its size is either -.Dv NKPTADD -pages (if defined) or memory size in bytes divided by two to -the power of -.Dv NKPTADDSHIFT . -The default is undefined -.Dv NKPTADD -and -.Dv NKPTADDSHIFT=24 , -allowing for 16 buffers per megabyte of main memory (while -a GENERIC kernel allocates about half of that). -When you get can't get KPT page panics, you should increase -.Dv NKPTADD -(if defined), or decrease -.Dv NKPTADDSHIFT -by one. .It Cd options P5PPC68KBOARD Add special support for Phase5 mixed 68k+PPC boards. Currently, this only affects rebooting from
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Fri Oct 4 15:24:44 UTC 2013
Modified Files:
src/external/gpl3/gdb/dist/gdb: i386bsd-nat.h i386nbsd-tdep.c
Log Message:
fix i386 build.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/i386bsd-nat.h
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.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/gdb/dist/gdb/i386bsd-nat.h
diff -u src/external/gpl3/gdb/dist/gdb/i386bsd-nat.h:1.3 src/external/gpl3/gdb/dist/gdb/i386bsd-nat.h:1.4
--- src/external/gpl3/gdb/dist/gdb/i386bsd-nat.h:1.3 Thu Oct 3 14:30:44 2013
+++ src/external/gpl3/gdb/dist/gdb/i386bsd-nat.h Fri Oct 4 11:24:44 2013
@@ -37,4 +37,8 @@ extern unsigned long i386bsd_dr_get_stat
extern unsigned long i386bsd_dr_get_control (void);
+extern void i386bsd_supply_gregset (struct regcache *, const void *);
+
+extern void i386bsd_collect_gregset (const struct regcache *, void *, int);
+
#endif /* i386bsd-nat.h */
Index: src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c:1.6 src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c:1.7
--- src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c:1.6 Thu Oct 3 14:30:44 2013
+++ src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c Fri Oct 4 11:24:44 2013
@@ -301,9 +301,10 @@ i386nbsd_trapframe_cache(struct frame_in
struct trad_frame_cache *cache;
CORE_ADDR func, sp, addr, tmp;
ULONGEST cs;
- char *name;
+ const char *name;
int i;
- enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
+ struct gdbarch *gdbarch = get_frame_arch (this_frame);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
if (*this_cache)
return *this_cache;
@@ -383,7 +384,7 @@ i386nbsd_trapframe_sniffer (const struct
void **this_prologue_cache)
{
ULONGEST cs;
- char *name;
+ const char *name;
/* Check Current Privilege Level and bail out if we're not executing
in kernel space. */
CVS commit: src/sys/netinet
Module Name:src
Committed By: christos
Date: Fri Oct 4 16:20:35 UTC 2013
Modified Files:
src/sys/netinet: tcp_usrreq.c
Log Message:
PR/48098: Brian Marcotte: Avoid kernel assertion for embryonic sockets that
don't have credentials yet.
XXX: pullup-6
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.167 src/sys/netinet/tcp_usrreq.c:1.168
--- src/sys/netinet/tcp_usrreq.c:1.167 Sun Sep 15 10:45:50 2013
+++ src/sys/netinet/tcp_usrreq.c Fri Oct 4 12:20:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.167 2013/09/15 14:45:50 martin Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.168 2013/10/04 16:20:35 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.167 2013/09/15 14:45:50 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.168 2013/10/04 16:20:35 christos Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -1164,18 +1164,20 @@ sysctl_net_inet_ip_ports(SYSCTLFN_ARGS)
static inline int
copyout_uid(struct socket *sockp, void *oldp, size_t *oldlenp)
{
- size_t sz;
- int error;
- uid_t uid;
-
- uid = kauth_cred_geteuid(sockp-so_cred);
if (oldp) {
+ size_t sz;
+ uid_t uid;
+ int error;
+
+ if (sockp-so_cred == NULL)
+ return EPERM;
+
+ uid = kauth_cred_geteuid(sockp-so_cred);
sz = MIN(sizeof(uid), *oldlenp);
- error = copyout(uid, oldp, sz);
- if (error)
+ if ((error = copyout(uid, oldp, sz)) != 0)
return error;
}
- *oldlenp = sizeof(uid);
+ *oldlenp = sizeof(uid_t);
return 0;
}
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Oct 4 16:50:18 UTC 2013 Modified Files: src/share/man/man4: options.4 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.428 -r1.429 src/share/man/man4/options.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/options.4 diff -u src/share/man/man4/options.4:1.428 src/share/man/man4/options.4:1.429 --- src/share/man/man4/options.4:1.428 Fri Oct 4 15:15:39 2013 +++ src/share/man/man4/options.4 Fri Oct 4 16:50:18 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.428 2013/10/04 15:15:39 rkujawa Exp $ +.\ $NetBSD: options.4,v 1.429 2013/10/04 16:50:18 wiz Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd August 22, 2013 +.Dd October 4, 2013 .Dt OPTIONS 4 .Os .Sh NAME
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: msaitoh Date: Fri Oct 4 17:12:48 UTC 2013 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Fix typo in comment (s/XRC0/XCR0/). To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 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.42 src/usr.sbin/cpuctl/arch/i386.c:1.43 --- src/usr.sbin/cpuctl/arch/i386.c:1.42 Sat Sep 14 17:23:18 2013 +++ src/usr.sbin/cpuctl/arch/i386.c Fri Oct 4 17:12:48 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.42 2013/09/14 17:23:18 msaitoh Exp $ */ +/* $NetBSD: i386.c,v 1.43 2013/10/04 17:12:48 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.42 2013/09/14 17:23:18 msaitoh Exp $); +__RCSID($NetBSD: i386.c,v 1.43 2013/10/04 17:12:48 msaitoh Exp $); #endif /* not lint */ #include sys/types.h @@ -1038,7 +1038,7 @@ cpu_probe_base_features(struct cpu_info if (ci-ci_cpuid_level 0xd) return; - /* Get support XRC0 bits */ + /* Get support XCR0 bits */ x86_cpuid2(0xd, 0, descs); ci-ci_feat_val[5] = descs[0]; /* Actually 64 bits */ ci-ci_cur_xsave = descs[1];
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Oct 4 17:21:43 UTC 2013 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add comment about CPUID Processor extended state Enumeration Fn000d %eax. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 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.68 src/sys/arch/x86/include/specialreg.h:1.69 --- src/sys/arch/x86/include/specialreg.h:1.68 Sat Sep 14 17:18:18 2013 +++ src/sys/arch/x86/include/specialreg.h Fri Oct 4 17:21:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.68 2013/09/14 17:18:18 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.69 2013/10/04 17:21:43 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -395,6 +395,8 @@ #endif /* XEN */ /* + * CPUID Processor extended state Enumeration Fn000d %eax + * * Extended Control Register XCR0 */ #define XCR0_X87 0x0001 /* x87 FPU/MMX state */
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Oct 4 17:53:19 UTC 2013 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Sort definitions. No functional change. - CPUID_FEAT_BLACKLIST is for Fn0001 %edx, so move it. - Sort CPUID definitions with initial EAX value. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 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.69 src/sys/arch/x86/include/specialreg.h:1.70 --- src/sys/arch/x86/include/specialreg.h:1.69 Fri Oct 4 17:21:43 2013 +++ src/sys/arch/x86/include/specialreg.h Fri Oct 4 17:53:19 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.69 2013/10/04 17:21:43 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.70 2013/10/04 17:53:19 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -137,6 +137,75 @@ \31 FXSR \32 SSE \33 SSE2 \34 SS \ \35 HTT \36 TM \37 IA64 \40 SBF +/* Blacklists of CPUID flags - used to mask certain features */ +#ifdef XEN +/* Not on Xen */ +#define CPUID_FEAT_BLACKLIST (CPUID_PGE|CPUID_PSE|CPUID_MTRR) +#else +#define CPUID_FEAT_BLACKLIST 0 +#endif /* XEN */ + +/* + * CPUID features bits in Fn0001 %ecx + */ + +#define CPUID2_SSE3 0x0001 /* Streaming SIMD Extensions 3 */ +#define CPUID2_PCLMUL 0x0002 /* PCLMULQDQ instructions */ +#define CPUID2_DTES64 0x0004 /* 64-bit Debug Trace */ +#define CPUID2_MONITOR 0x0008 /* MONITOR/MWAIT instructions */ +#define CPUID2_DS_CPL 0x0010 /* CPL Qualified Debug Store */ +#define CPUID2_VMX 0x0020 /* Virtual Machine Extensions */ +#define CPUID2_SMX 0x0040 /* Safer Mode Extensions */ +#define CPUID2_EST 0x0080 /* Enhanced SpeedStep Technology */ +#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_FMA 0x1000 /* has Fused Multiply Add */ +#define CPUID2_CX16 0x2000 /* has CMPXCHG16B instruction */ +#define CPUID2_xTPR 0x4000 /* Task Priority Messages disabled? */ +#define CPUID2_PDCM 0x8000 /* Perf/Debug Capability MSR */ +/* bit 16 unused 0x0001 */ +#define CPUID2_PCID 0x0002 /* Process Context ID */ +#define CPUID2_DCA 0x0004 /* Direct Cache Access */ +#define CPUID2_SSE41 0x0008 /* Streaming SIMD Extensions 4.1 */ +#define CPUID2_SSE42 0x0010 /* Streaming SIMD Extensions 4.2 */ +#define CPUID2_X2APIC 0x0020 /* xAPIC Extensions */ +#define CPUID2_MOVBE 0x0040 /* MOVBE (move after byteswap) */ +#define CPUID2_POPCNT 0x0080 /* popcount instruction available */ +#define CPUID2_DEADLINE 0x0100 /* APIC Timer supports TSC Deadline */ +#define CPUID2_AES 0x0200 /* AES instructions */ +#define CPUID2_XSAVE 0x0400 /* XSAVE instructions */ +#define CPUID2_OSXSAVE 0x0800 /* XGETBV/XSETBV instructions */ +#define CPUID2_AVX 0x1000 /* AVX instructions */ +#define CPUID2_F16C 0x2000 /* half precision conversion */ +#define CPUID2_RDRAND 0x4000 /* RDRAND (hardware random number) */ +#define CPUID2_RAZ 0x8000 /* RAZ. Indicates guest state. */ + +#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 \ + \15 FMA \16 CX16 \17 xTPR \20 PDCM \ + \21 B16 \22 PCID \23 DCA \24 SSE41 \ + \25 SSE42 \26 X2APIC \27 MOVBE \30 POPCNT \ + \31 DEADLINE \32 AES \33 XSAVE \34 OSXSAVE \ + \35 AVX \36 F16C \37 RDRAND \40 RAZ + +#define CPUID2FAMILY(cpuid) (((cpuid) 8) 0xf) +#define CPUID2MODEL(cpuid) (((cpuid) 4) 0xf) +#define CPUID2STEPPING(cpuid) ((cpuid) 0xf) + +/* + * The Extended family bits should only be inspected when CPUID2FAMILY() + * returns 15. They are use to encode family value 16 to 270 (add 15). + * The Extended model hits are the high 4 bits of the model. + * They are only valid for family = 15 or family 6 (intel, but all amd + * family 6 are documented to return zero bits for them). + */ +#define CPUID2EXTFAMILY(cpuid) (((cpuid) 20) 0xff) +#define CPUID2EXTMODEL(cpuid) (((cpuid) 16) 0xf) + /* * Intel Digital Thermal Sensor and * Power Management, Fn_0006 - %eax. @@ -197,6 +266,40 @@ \32 PT \33 AVX512PF\34 AVX512ER\ \35 AVX512CD\36 SHA +/* + * CPUID Processor extended state Enumeration Fn000d %eax + * + * Extended Control Register XCR0 + */ +#define XCR0_X87 0x0001 /* x87 FPU/MMX state */ +#define XCR0_SSE 0x0002 /* SSE state */ +#define XCR0_AVX 0x0004 /* AVX state (ymmn registers) */ + +#define XCR0_FLAGS1 \20 \ + \1 x87 \2 SSE \3 AVX \4 B03 + +/* + * CPUID Processor extended state Enumeration Fn000d + * + * %ecx == 0: supported features info: + * %edx:%eax bits valid for XCR0 + * %ebx Save area
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src Committed By: christos Date: Fri Oct 4 18:08:02 UTC 2013 Modified Files: src/external/gpl3/binutils/dist/bfd: aoutx.h Log Message: Allow bfd_mach_arm4 machines to produce a.out binaries. Perhaps we should just let every arm machine produce them? Or we should use M_ARM6_NETBSD midmag for those? To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/bfd/aoutx.h 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/aoutx.h diff -u src/external/gpl3/binutils/dist/bfd/aoutx.h:1.4 src/external/gpl3/binutils/dist/bfd/aoutx.h:1.5 --- src/external/gpl3/binutils/dist/bfd/aoutx.h:1.4 Sun Sep 29 10:03:29 2013 +++ src/external/gpl3/binutils/dist/bfd/aoutx.h Fri Oct 4 14:08:02 2013 @@ -762,7 +762,7 @@ NAME (aout, machine_type) (enum bfd_arch break; case bfd_arch_arm: - if (machine == 0) + if (machine == 0 || machine == 5) arch_flags = M_ARM; break;
CVS commit: src
Module Name:src Committed By: christos Date: Fri Oct 4 20:49:16 UTC 2013 Modified Files: src/lib/libc/compat/gen: compat___fts13.c compat___fts30.c compat___fts31.c compat___fts32.c compat_fts.c compat_getmntinfo.c compat_glob.c compat_time.c compat_times.c src/lib/libc/compat/sys: compat___fhstat30.c compat___stat13.c compat___stat30.c compat_getrusage.c compat_gettimeofday.c compat_mknod.c compat_stat.c compat_statfs.c src/lib/libc/ssp: gets_chk.c src/lib/libc/stdio: gets.c local.h src/sys/compat/sys: mount.h resource.h stat.h time.h Log Message: avoid linker warning for compat symbols that are used internally in libc, by introducing a hidden compat_foo() function, using that internally in libc, and exposing foo as a strong alias to compat_foo(). I am open for better ideas. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/compat/gen/compat___fts13.c cvs rdiff -u -r1.6 -r1.7 src/lib/libc/compat/gen/compat___fts30.c \ src/lib/libc/compat/gen/compat_fts.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/gen/compat___fts31.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/gen/compat___fts32.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/gen/compat_getmntinfo.c \ src/lib/libc/compat/gen/compat_glob.c \ src/lib/libc/compat/gen/compat_time.c \ src/lib/libc/compat/gen/compat_times.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/sys/compat___fhstat30.c \ src/lib/libc/compat/sys/compat___stat13.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/sys/compat___stat30.c \ src/lib/libc/compat/sys/compat_getrusage.c \ src/lib/libc/compat/sys/compat_gettimeofday.c \ src/lib/libc/compat/sys/compat_mknod.c \ src/lib/libc/compat/sys/compat_stat.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compat/sys/compat_statfs.c cvs rdiff -u -r1.6 -r1.7 src/lib/libc/ssp/gets_chk.c cvs rdiff -u -r1.17 -r1.18 src/lib/libc/stdio/gets.c cvs rdiff -u -r1.36 -r1.37 src/lib/libc/stdio/local.h cvs rdiff -u -r1.8 -r1.9 src/sys/compat/sys/mount.h cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/resource.h \ src/sys/compat/sys/time.h cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/stat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/compat/gen/compat___fts13.c diff -u src/lib/libc/compat/gen/compat___fts13.c:1.9 src/lib/libc/compat/gen/compat___fts13.c:1.10 --- src/lib/libc/compat/gen/compat___fts13.c:1.9 Tue Mar 13 20:25:19 2012 +++ src/lib/libc/compat/gen/compat___fts13.c Fri Oct 4 16:49:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat___fts13.c,v 1.9 2012/03/14 00:25:19 christos Exp $ */ +/* $NetBSD: compat___fts13.c,v 1.10 2013/10/04 20:49:16 christos Exp $ */ #include namespace.h #include sys/cdefs.h @@ -42,9 +42,9 @@ __warn_references(__fts_set13, ((a) USHRT_MAX ? USHRT_MAX : (unsigned short)(a)) #endif -#define stat __stat13 -#define lstat __lstat13 -#define fstat __fstat13 +#define stat compat___stat13 +#define lstat compat___lstat13 +#define fstat compat___fstat13 #undef fts_children #define fts_children __fts_children13 Index: src/lib/libc/compat/gen/compat___fts30.c diff -u src/lib/libc/compat/gen/compat___fts30.c:1.6 src/lib/libc/compat/gen/compat___fts30.c:1.7 --- src/lib/libc/compat/gen/compat___fts30.c:1.6 Tue Mar 13 20:25:19 2012 +++ src/lib/libc/compat/gen/compat___fts30.c Fri Oct 4 16:49:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat___fts30.c,v 1.6 2012/03/14 00:25:19 christos Exp $ */ +/* $NetBSD: compat___fts30.c,v 1.7 2013/10/04 20:49:16 christos Exp $ */ #include namespace.h #include sys/cdefs.h @@ -32,9 +32,9 @@ __warn_references(__fts_set30, #define __fts_dev_t uint32_t #define __fts_level_t short -#define stat __stat30 -#define lstat __lstat30 -#define fstat __fstat30 +#define stat compat___stat30 +#define lstat compat___lstat30 +#define fstat compat___fstat30 #ifndef ftsent_namelen_truncate #define ftsent_namelen_truncate(a) \ Index: src/lib/libc/compat/gen/compat_fts.c diff -u src/lib/libc/compat/gen/compat_fts.c:1.6 src/lib/libc/compat/gen/compat_fts.c:1.7 --- src/lib/libc/compat/gen/compat_fts.c:1.6 Thu Mar 15 12:47:38 2012 +++ src/lib/libc/compat/gen/compat_fts.c Fri Oct 4 16:49:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_fts.c,v 1.6 2012/03/15 16:47:38 christos Exp $ */ +/* $NetBSD: compat_fts.c,v 1.7 2013/10/04 20:49:16 christos Exp $ */ /* * Written by Jason R. Thorpe thor...@netbsd.org, October 21, 1997. @@ -62,4 +62,8 @@ __warn_references(fts_set, #define __FTS_COMPAT_LENGTH #define __FTS_COMPAT_LEVEL +#define stat compat_stat +#define lstat compat_lstat +#define fstat compat_fstat + #include gen/fts.c Index: src/lib/libc/compat/gen/compat___fts31.c diff -u src/lib/libc/compat/gen/compat___fts31.c:1.4 src/lib/libc/compat/gen/compat___fts31.c:1.5 --- src/lib/libc/compat/gen/compat___fts31.c:1.4 Tue Mar 13 20:25:19 2012
CVS commit: src
Module Name:src Committed By: christos Date: Fri Oct 4 21:07:37 UTC 2013 Modified Files: src/lib/libc/compat/gen: compat___fts13.c compat___fts30.c compat___fts31.c compat___fts32.c compat_fts.c compat_getmntinfo.c compat_glob.c compat_time.c compat_times.c src/lib/libc/compat/sys: compat___fhstat30.c compat___stat13.c compat___stat30.c compat_getrusage.c compat_gettimeofday.c compat_mknod.c compat_stat.c compat_statfs.c src/sys/compat/sys: mount.h resource.h stat.h time.h Log Message: prefix compat with __ in case __dso_hidden is not available To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/compat/gen/compat___fts13.c cvs rdiff -u -r1.7 -r1.8 src/lib/libc/compat/gen/compat___fts30.c \ src/lib/libc/compat/gen/compat_fts.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compat/gen/compat___fts31.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/gen/compat___fts32.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/gen/compat_getmntinfo.c \ src/lib/libc/compat/gen/compat_glob.c \ src/lib/libc/compat/gen/compat_time.c \ src/lib/libc/compat/gen/compat_times.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compat/sys/compat___fhstat30.c \ src/lib/libc/compat/sys/compat___stat13.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/sys/compat___stat30.c \ src/lib/libc/compat/sys/compat_getrusage.c \ src/lib/libc/compat/sys/compat_gettimeofday.c \ src/lib/libc/compat/sys/compat_mknod.c \ src/lib/libc/compat/sys/compat_stat.c cvs rdiff -u -r1.6 -r1.7 src/lib/libc/compat/sys/compat_statfs.c cvs rdiff -u -r1.9 -r1.10 src/sys/compat/sys/mount.h cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/resource.h \ src/sys/compat/sys/time.h cvs rdiff -u -r1.5 -r1.6 src/sys/compat/sys/stat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/compat/gen/compat___fts13.c diff -u src/lib/libc/compat/gen/compat___fts13.c:1.10 src/lib/libc/compat/gen/compat___fts13.c:1.11 --- src/lib/libc/compat/gen/compat___fts13.c:1.10 Fri Oct 4 16:49:16 2013 +++ src/lib/libc/compat/gen/compat___fts13.c Fri Oct 4 17:07:37 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat___fts13.c,v 1.10 2013/10/04 20:49:16 christos Exp $ */ +/* $NetBSD: compat___fts13.c,v 1.11 2013/10/04 21:07:37 christos Exp $ */ #include namespace.h #include sys/cdefs.h @@ -42,9 +42,9 @@ __warn_references(__fts_set13, ((a) USHRT_MAX ? USHRT_MAX : (unsigned short)(a)) #endif -#define stat compat___stat13 -#define lstat compat___lstat13 -#define fstat compat___fstat13 +#define stat __compat___stat13 +#define lstat __compat___lstat13 +#define fstat __compat___fstat13 #undef fts_children #define fts_children __fts_children13 Index: src/lib/libc/compat/gen/compat___fts30.c diff -u src/lib/libc/compat/gen/compat___fts30.c:1.7 src/lib/libc/compat/gen/compat___fts30.c:1.8 --- src/lib/libc/compat/gen/compat___fts30.c:1.7 Fri Oct 4 16:49:16 2013 +++ src/lib/libc/compat/gen/compat___fts30.c Fri Oct 4 17:07:37 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat___fts30.c,v 1.7 2013/10/04 20:49:16 christos Exp $ */ +/* $NetBSD: compat___fts30.c,v 1.8 2013/10/04 21:07:37 christos Exp $ */ #include namespace.h #include sys/cdefs.h @@ -32,9 +32,9 @@ __warn_references(__fts_set30, #define __fts_dev_t uint32_t #define __fts_level_t short -#define stat compat___stat30 -#define lstat compat___lstat30 -#define fstat compat___fstat30 +#define stat __compat___stat30 +#define lstat __compat___lstat30 +#define fstat __compat___fstat30 #ifndef ftsent_namelen_truncate #define ftsent_namelen_truncate(a) \ Index: src/lib/libc/compat/gen/compat_fts.c diff -u src/lib/libc/compat/gen/compat_fts.c:1.7 src/lib/libc/compat/gen/compat_fts.c:1.8 --- src/lib/libc/compat/gen/compat_fts.c:1.7 Fri Oct 4 16:49:16 2013 +++ src/lib/libc/compat/gen/compat_fts.c Fri Oct 4 17:07:37 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_fts.c,v 1.7 2013/10/04 20:49:16 christos Exp $ */ +/* $NetBSD: compat_fts.c,v 1.8 2013/10/04 21:07:37 christos Exp $ */ /* * Written by Jason R. Thorpe thor...@netbsd.org, October 21, 1997. @@ -62,8 +62,8 @@ __warn_references(fts_set, #define __FTS_COMPAT_LENGTH #define __FTS_COMPAT_LEVEL -#define stat compat_stat -#define lstat compat_lstat -#define fstat compat_fstat +#define stat __compat_stat +#define lstat __compat_lstat +#define fstat __compat_fstat #include gen/fts.c Index: src/lib/libc/compat/gen/compat___fts31.c diff -u src/lib/libc/compat/gen/compat___fts31.c:1.5 src/lib/libc/compat/gen/compat___fts31.c:1.6 --- src/lib/libc/compat/gen/compat___fts31.c:1.5 Fri Oct 4 16:49:16 2013 +++ src/lib/libc/compat/gen/compat___fts31.c Fri Oct 4 17:07:37 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat___fts31.c,v 1.5 2013/10/04 20:49:16 christos Exp $ */ +/* $NetBSD: compat___fts31.c,v 1.6 2013/10/04 21:07:37 christos Exp $ */ #include namespace.h
CVS commit: src/sys/dev/ic
Module Name:src Committed By: joerg Date: Fri Oct 4 21:10:18 UTC 2013 Modified Files: src/sys/dev/ic: sl811hs.c Log Message: Move an assert to the point where the referenced variable is initialized. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ic/sl811hs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/sl811hs.c diff -u src/sys/dev/ic/sl811hs.c:1.45 src/sys/dev/ic/sl811hs.c:1.46 --- src/sys/dev/ic/sl811hs.c:1.45 Thu Oct 3 13:19:24 2013 +++ src/sys/dev/ic/sl811hs.c Fri Oct 4 21:10:18 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: sl811hs.c,v 1.45 2013/10/03 13:19:24 skrll Exp $ */ +/* $NetBSD: sl811hs.c,v 1.46 2013/10/04 21:10:18 joerg Exp $ */ /* * Not (c) 2007 Matthew Orgass @@ -68,7 +68,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sl811hs.c,v 1.45 2013/10/03 13:19:24 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: sl811hs.c,v 1.46 2013/10/04 21:10:18 joerg Exp $); #include opt_slhci.h @@ -1340,8 +1340,6 @@ slhci_abort(struct usbd_xfer *xfer) struct slhci_softc *sc; struct slhci_pipe *spipe; - KASSERT(mutex_owned(sc-sc_lock)); - spipe = (struct slhci_pipe *)xfer-pipe; if (spipe == NULL) @@ -1349,6 +1347,8 @@ slhci_abort(struct usbd_xfer *xfer) sc = spipe-pipe.device-bus-hci_private; + KASSERT(mutex_owned(sc-sc_lock)); + DLOG(D_TRACE, %s abort xfer %p spipe %p spipe-xfer %p, pnames(spipe-ptype), xfer, spipe, spipe-xfer);
CVS commit: src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib
Module Name:src Committed By: mrg Date: Fri Oct 4 22:31:12 UTC 2013 Added Files: src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib: config.h Log Message: regenerate for gdb 7.6. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib/config.h diff -u /dev/null src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib/config.h:1.1 --- /dev/null Fri Oct 4 22:31:12 2013 +++ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib/config.h Fri Oct 4 22:31:12 2013 @@ -0,0 +1,643 @@ +/* This file is automatically generated. DO NOT EDIT! */ +/* Generated from: NetBSD: mknative-gdb,v 1.6 2013/10/03 18:58:37 christos Exp */ +/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ + +/* config.h. Generated from config.in by configure. */ +/* config.in. Generated from configure.ac by autoheader. */ + +/* Define to the number of bits in type 'ptrdiff_t'. */ +/* #undef BITSIZEOF_PTRDIFF_T */ + +/* Define to the number of bits in type 'sig_atomic_t'. */ +/* #undef BITSIZEOF_SIG_ATOMIC_T */ + +/* Define to the number of bits in type 'size_t'. */ +/* #undef BITSIZEOF_SIZE_T */ + +/* Define to the number of bits in type 'wchar_t'. */ +/* #undef BITSIZEOF_WCHAR_T */ + +/* Define to the number of bits in type 'wint_t'. */ +/* #undef BITSIZEOF_WINT_T */ + +/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP + systems. This function is required for 'alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using 'alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define to 1 when the gnulib module mbrtowc should be tested. */ +#define GNULIB_TEST_MBRTOWC 1 + +/* Define to 1 when the gnulib module mbsinit should be tested. */ +#define GNULIB_TEST_MBSINIT 1 + +/* Define to 1 when the gnulib module mbsrtowcs should be tested. */ +#define GNULIB_TEST_MBSRTOWCS 1 + +/* Define to 1 when the gnulib module memchr should be tested. */ +#define GNULIB_TEST_MEMCHR 1 + +/* Define to 1 when the gnulib module memmem should be tested. */ +#define GNULIB_TEST_MEMMEM 1 + +/* Define to 1 if you have 'alloca' after including alloca.h, a header that + may be supplied by this distribution. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have alloca.h and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if you have the bp-sym.h header file. */ +/* #undef HAVE_BP_SYM_H */ + +/* Define to 1 if you have the 'btowc' function. */ +#define HAVE_BTOWC 1 + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_GETC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `isblank', and to 0 if you + don't. */ +#define HAVE_DECL_ISBLANK 1 + +/* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you + don't. */ +/* #undef HAVE_DECL_MBRTOWC */ + +/* Define to 1 if you have the declaration of `mbsinit', and to 0 if you + don't. */ +/* #undef HAVE_DECL_MBSINIT */ + +/* Define to 1 if you have the declaration of `mbsrtowcs', and to 0 if you + don't. */ +/* #undef HAVE_DECL_MBSRTOWCS */ + +/* Define to 1 if you have the declaration of `memmem', and to 0 if you don't. + */ +#define HAVE_DECL_MEMMEM 1 + +/* Define to 1 if you have the declaration of `towlower', and to 0 if you + don't. */ +/* #undef HAVE_DECL_TOWLOWER */ + +/* Define to 1 if you have the features.h header file. */ +/* #undef HAVE_FEATURES_H */ + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the 'isblank' function. */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the 'iswcntrl' function. */ +#define HAVE_ISWCNTRL 1 + +/* Define to 1 if you have the 'iswctype' function. */ +#define HAVE_ISWCTYPE 1 + +/* Define if you have langinfo.h and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + +/* Define to 1 if the system has the type 'long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including + config.h and sys/mman.h. */ +#define HAVE_MAP_ANONYMOUS 1 + +/* Define to 1 if you have the 'mbrtowc' function. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 if you have the 'mbsinit' function. */ +#define HAVE_MBSINIT 1 + +/* Define to 1 if you have the 'mbsrtowcs' function. */ +#define HAVE_MBSRTOWCS 1 + +/* Define to 1 if wchar.h declares mbstate_t. */ +#define HAVE_MBSTATE_T 1 + +/* Define to 1 if you have the `memmem' function. */ +#define HAVE_MEMMEM 1 + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the 'mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Fri Oct 4 23:40:17 UTC 2013
Modified Files:
src/external/gpl3/gdb/dist/gdb: alphanbsd-tdep.c
Log Message:
merge alpha changes
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.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/gdb/dist/gdb/alphanbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c:1.4 src/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c:1.5
--- src/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c:1.4 Thu Oct 3 14:30:44 2013
+++ src/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c Fri Oct 4 19:40:17 2013
@@ -268,10 +268,36 @@ alphanbsd_sigtramp_cache_init (const str
}
trad_frame_set_reg_addr (this_cache, ALPHA_PC_REGNUM, addr);
-#if 0
/* Construct the frame ID using the function start. */
trad_frame_set_id (this_cache, frame_id_build (sp, func));
-#endif
+}
+
+#ifdef notyet
+#define RETCODE_NWORDS 4
+#define RETCODE_SIZE(RETCODE_NWORDS * 4)
+
+static LONGEST
+alphanbsd_sigtramp_offset (struct gdbarch *gdbarch, CORE_ADDR pc)
+{
+ unsigned char ret[RETCODE_SIZE], w[4];
+ LONGEST off;
+ int i;
+
+ if (target_read_memory (pc, (char *) w, 4) != 0)
+return -1;
+
+ for (i = 0; i RETCODE_NWORDS; i++)
+{
+/*###287 [cc] error: 'sigtramp_retcode' undeclared (first use in this function)%%%*/
+ if (memcmp (w, sigtramp_retcode + (i * 4), 4) == 0)
+ break;
+}
+ if (i == RETCODE_NWORDS)
+return (-1);
+
+ off = i * 4;
+ pc -= off;
+
if (target_read_memory (pc, (char *) ret, sizeof (ret)) != 0)
return -1;
@@ -299,6 +325,7 @@ alphanbsd_sigcontext_addr (struct frame_
return 0;
return get_frame_base (get_next_frame (frame));
}
+#endif
static void
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 02:39:06 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: SHEEVAPLUG Log Message: Remove options LKM. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/SHEEVAPLUG Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/SHEEVAPLUG diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.34 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.35 --- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.34 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbarm/conf/SHEEVAPLUG Sat Oct 5 02:39:06 2013 @@ -1,4 +1,4 @@ -# $NetBSD: SHEEVAPLUG,v 1.34 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: SHEEVAPLUG,v 1.35 2013/10/05 02:39:06 kiyohara Exp $ # # This configuration supports for generically Marvell SheevaPlug # @@ -140,7 +140,6 @@ options DKWEDGE_METHOD_GPT options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options MIIVERBOSE # Verbose MII autoconfuration messages #options PCIVERBOSE # Verbose PCI descriptions
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 02:43:16 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: files.marvell Log Message: Add defparam MVSOC_FIXUP_DEVID to opt_mvsoc.h. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/files.marvell Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/files.marvell diff -u src/sys/arch/evbarm/conf/files.marvell:1.2 src/sys/arch/evbarm/conf/files.marvell:1.3 --- src/sys/arch/evbarm/conf/files.marvell:1.2 Sat Sep 1 00:20:49 2012 +++ src/sys/arch/evbarm/conf/files.marvell Sat Oct 5 02:43:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.marvell,v 1.2 2012/09/01 00:20:49 matt Exp $ +# $NetBSD: files.marvell,v 1.3 2013/10/05 02:43:16 kiyohara Exp $ # # Marvell Orion, Discovery Innovation and Kirkwood NASs configuration info # @@ -11,3 +11,6 @@ file arch/evbarm/marvell/marvell_machdep # CPU support and integrated peripherals include arch/arm/marvell/files.marvell + +# Some SoC(ARMADAXP) reports false DeviceID. +defparam opt_mvsoc.hMVSOC_FIXUP_DEVID
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 02:47:44 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 Log Message: Add options COM_16750. It is requiring now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.1 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.2 --- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.1 Mon Sep 30 13:36:54 2013 +++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sat Oct 5 02:47:44 2013 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS_AX3,v 1.1 2013/09/30 13:36:54 kiyohara Exp $ +# $NetBSD: OPENBLOCKS_AX3,v 1.2 2013/10/05 02:47:44 kiyohara Exp $ # # OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel # @@ -199,6 +199,7 @@ sdmmc* at mvsdio? # On-chip UART Interface com* at mvsoc? +options COM_16750 # : required #options COM_DEBUG # On-chip Two-Wire Serial Interface (TWSI)
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 03:59:49 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: MARVELL_NAS Log Message: Change some comments and coment-outed options. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/MARVELL_NAS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/MARVELL_NAS diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.17 src/sys/arch/evbarm/conf/MARVELL_NAS:1.18 --- src/sys/arch/evbarm/conf/MARVELL_NAS:1.17 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbarm/conf/MARVELL_NAS Sat Oct 5 03:59:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: MARVELL_NAS,v 1.17 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: MARVELL_NAS,v 1.18 2013/10/05 03:59:49 kiyohara Exp $ # # This configuration supports for generically Marvell NAS. @@ -12,14 +12,14 @@ maxusers 32 # CPU options options CPU_ARM9E -#makeoptions CPUFLAGS=-mcpu=xscale # Xscale instruction set support +#makeoptions CPUFLAGS=-mcpu=xscale # Orion supports XScale instruction set options CPU_SHEEVA -#makeoptions CPUFLAGS=-mcpu=arm9e +#makeoptions CPUFLAGS=-march=armv5te # Marvell SoC options options ORION options KIRKWOOD -#options MV78XX0 +#options MV78XX0 # Discovery Innovation # Standard system options
