CVS commit: src/distrib/sparc64/instfs
Module Name:src Committed By: nakayama Date: Sat Nov 30 08:19:30 UTC 2013 Modified Files: src/distrib/sparc64/instfs: list Log Message: pppd has moved. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/sparc64/instfs/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sparc64/instfs/list diff -u src/distrib/sparc64/instfs/list:1.25 src/distrib/sparc64/instfs/list:1.26 --- src/distrib/sparc64/instfs/list:1.25 Sun Jun 3 23:19:10 2012 +++ src/distrib/sparc64/instfs/list Sat Nov 30 08:19:30 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.25 2012/06/03 23:19:10 joerg Exp $ +# $NetBSD: list,v 1.26 2013/11/30 08:19:30 nakayama Exp $ SRCDIRS bin sbin libexec external/bsd/less/bin usr.bin usr.sbin @@ -69,11 +69,11 @@ PROG usr/sbin/pppd # init invokes the shell as -sh ARGVLN sh -sh -SPECIAL chat srcdir usr.sbin/pppd/chat +SPECIAL chat srcdir external/bsd/ppp/usr.sbin/chat SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL ping srcdir distrib/utils/x_ping -SPECIAL pppd srcdir usr.sbin/pppd/pppd +SPECIAL pppd srcdir external/bsd/ppp/usr.sbin/pppd SPECIAL route srcdir distrib/utils/x_route LIBS libhack.o
CVS commit: src/distrib
Module Name:src Committed By: nakayama Date: Sat Nov 30 08:27:18 UTC 2013 Modified Files: src/distrib/amiga/miniroot: list src/distrib/emips/miniroot: list src/distrib/hp300/miniroot: list src/distrib/hpcarm/miniroot: list src/distrib/hpcmips/miniroot: list src/distrib/hpcsh/miniroot: list src/distrib/mac68k/miniroot: list src/distrib/mvme68k/miniroot: list src/distrib/ofppc/ramdisks/ramdisk: list src/distrib/pmax/miniroot: list list64 src/distrib/sgimips/miniroot: list src/distrib/sparc/miniroot: list src/distrib/sun2/miniroot: list src/distrib/sun3/miniroot: list src/distrib/vax/miniroot: list Log Message: nvi has moved. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/amiga/miniroot/list cvs rdiff -u -r1.2 -r1.3 src/distrib/emips/miniroot/list cvs rdiff -u -r1.20 -r1.21 src/distrib/hp300/miniroot/list cvs rdiff -u -r1.9 -r1.10 src/distrib/hpcarm/miniroot/list cvs rdiff -u -r1.17 -r1.18 src/distrib/hpcmips/miniroot/list cvs rdiff -u -r1.9 -r1.10 src/distrib/hpcsh/miniroot/list cvs rdiff -u -r1.13 -r1.14 src/distrib/mac68k/miniroot/list cvs rdiff -u -r1.22 -r1.23 src/distrib/mvme68k/miniroot/list cvs rdiff -u -r1.8 -r1.9 src/distrib/ofppc/ramdisks/ramdisk/list cvs rdiff -u -r1.22 -r1.23 src/distrib/pmax/miniroot/list cvs rdiff -u -r1.4 -r1.5 src/distrib/pmax/miniroot/list64 cvs rdiff -u -r1.10 -r1.11 src/distrib/sgimips/miniroot/list cvs rdiff -u -r1.37 -r1.38 src/distrib/sparc/miniroot/list cvs rdiff -u -r1.19 -r1.20 src/distrib/sun2/miniroot/list cvs rdiff -u -r1.28 -r1.29 src/distrib/sun3/miniroot/list cvs rdiff -u -r1.15 -r1.16 src/distrib/vax/miniroot/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amiga/miniroot/list diff -u src/distrib/amiga/miniroot/list:1.24 src/distrib/amiga/miniroot/list:1.25 --- src/distrib/amiga/miniroot/list:1.24 Thu Feb 11 09:06:47 2010 +++ src/distrib/amiga/miniroot/list Sat Nov 30 08:27:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.24 2010/02/11 09:06:47 roy Exp $ +# $NetBSD: list,v 1.25 2013/11/30 08:27:17 nakayama Exp $ # Amiga extra's PROG sbin/disklabel @@ -11,7 +11,7 @@ PROG usr/sbin/loadkmap # crunchgen source directory specials SPECIAL loadkmap srcdir sys/arch/amiga/stand/loadkmap -SPECIAL vi srcdir usr.bin/nvi/build +SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi # Minimize use of MFS SYMLINK /tmp var/tmp Index: src/distrib/emips/miniroot/list diff -u src/distrib/emips/miniroot/list:1.2 src/distrib/emips/miniroot/list:1.3 --- src/distrib/emips/miniroot/list:1.2 Tue Jun 14 11:45:26 2011 +++ src/distrib/emips/miniroot/list Sat Nov 30 08:27:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.2 2011/06/14 11:45:26 tsutsui Exp $ +# $NetBSD: list,v 1.3 2013/11/30 08:27:18 nakayama Exp $ # extras in bin PROG bin/csh @@ -22,7 +22,7 @@ PROG usr/bin/vi PROG usr/sbin/installboot # crunchgen source directory specials: progs built in nonstandard places -SPECIAL vi srcdir usr.bin/nvi/build +SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi # Minimize use of MFS SYMLINK /tmp var/tmp Index: src/distrib/hp300/miniroot/list diff -u src/distrib/hp300/miniroot/list:1.20 src/distrib/hp300/miniroot/list:1.21 --- src/distrib/hp300/miniroot/list:1.20 Sun Jul 3 23:11:33 2011 +++ src/distrib/hp300/miniroot/list Sat Nov 30 08:27:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.20 2011/07/03 23:11:33 tron Exp $ +# $NetBSD: list,v 1.21 2013/11/30 08:27:17 nakayama Exp $ # hp300 extra's PROG sbin/disklabel @@ -17,7 +17,7 @@ PROG usr/bin/less usr/bin/more PROG usr/sbin/installboot # crunchgen source directory specials -SPECIAL vi srcdir usr.bin/nvi/build +SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi SPECIAL less srcdir external/bsd/less/bin/less # Minimize use of MFS Index: src/distrib/hpcarm/miniroot/list diff -u src/distrib/hpcarm/miniroot/list:1.9 src/distrib/hpcarm/miniroot/list:1.10 --- src/distrib/hpcarm/miniroot/list:1.9 Sat May 1 12:14:11 2010 +++ src/distrib/hpcarm/miniroot/list Sat Nov 30 08:27:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.9 2010/05/01 12:14:11 tsutsui Exp $ +# $NetBSD: list,v 1.10 2013/11/30 08:27:17 nakayama Exp $ # extras in bin PROG bin/csh @@ -21,7 +21,7 @@ PROG usr/bin/tset usr/bin/reset PROG usr/bin/vi # crunchgen source directory specials: progs built in nonstandard places -SPECIAL vi srcdir usr.bin/nvi/build +SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi # Minimize use of MFS SYMLINK /tmp var/tmp Index: src/distrib/hpcmips/miniroot/list diff -u src/distrib/hpcmips/miniroot/list:1.17 src/distrib/hpcmips/miniroot/list:1.18 --- src/distrib/hpcmips/miniroot/list:1.17 Sat May 1 12:14:12 2010 +++ src/distrib/hpcmips/miniroot/list Sat Nov 30 08:27:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.17 2010/05/01 12:14:12 tsutsui Exp $ +# $NetBSD: list,v 1.18
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sat Nov 30 12:16:14 UTC 2013 Modified Files: src/sys/dev/usb: usbdi.c Log Message: Simplify To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 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.159 src/sys/dev/usb/usbdi.c:1.160 --- src/sys/dev/usb/usbdi.c:1.159 Fri Oct 4 12:47:04 2013 +++ src/sys/dev/usb/usbdi.c Sat Nov 30 12:16:14 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.159 2013/10/04 12:47:04 skrll Exp $ */ +/* $NetBSD: usbdi.c,v 1.160 2013/11/30 12:16:14 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.159 2013/10/04 12:47:04 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.160 2013/11/30 12:16:14 skrll Exp $); #ifdef _KERNEL_OPT #include opt_compat_netbsd.h @@ -399,8 +399,7 @@ usbd_alloc_xfer(usbd_device_handle dev) if (xfer == NULL) return (NULL); xfer-device = dev; - callout_init(xfer-timeout_handle, - dev-bus-methods-get_lock ? CALLOUT_MPSAFE : 0); + callout_init(xfer-timeout_handle, CALLOUT_MPSAFE); cv_init(xfer-cv, usbxfer); cv_init(xfer-hccv, usbhcxfer); DPRINTFN(5,(usbd_alloc_xfer() = %p\n, xfer));
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: skrll Date: Sat Nov 30 13:23:57 UTC 2013 Modified Files: src/distrib/sets/lists/comp: ad.arm Log Message: unwind-arm-common.h is EABI specific. Mark it as such. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/ad.arm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.52 src/distrib/sets/lists/comp/ad.arm:1.53 --- src/distrib/sets/lists/comp/ad.arm:1.52 Fri Nov 1 07:48:31 2013 +++ src/distrib/sets/lists/comp/ad.arm Sat Nov 30 13:23:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.52 2013/11/01 07:48:31 mrg Exp $ +# $NetBSD: ad.arm,v 1.53 2013/11/30 13:23:57 skrll Exp $ ./usr/include/acorn26comp-c-include ./usr/include/acorn26/ansi.h comp-obsolete obsolete ./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete @@ -391,6 +391,7 @@ ./usr/include/gcc-4.8/arm_neon.h comp-c-include gcccmds,gcc=48 ./usr/include/gcc-4.8/mmintrin.h comp-c-include gcccmds,gcc=48 ./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/unwind-arm-common.h comp-c-include gcccmds,gcc=48,eabi ./usr/include/hpcarmcomp-c-include ./usr/include/hpcarm/ansi.h comp-obsolete obsolete ./usr/include/hpcarm/aout_machdep.h comp-obsolete obsolete
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src
Committed By: christos
Date: Sat Nov 30 14:52:40 UTC 2013
Modified Files:
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Don't rebuild the header files all the time if they did not change
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/usr.bin/nvi/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/bsd/nvi/usr.bin/nvi/Makefile
diff -u src/external/bsd/nvi/usr.bin/nvi/Makefile:1.3 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.4
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.3 Fri Nov 29 17:56:19 2013
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Sat Nov 30 09:52:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/11/29 22:56:19 christos Exp $
+# $NetBSD: Makefile,v 1.4 2013/11/30 14:52:40 christos Exp $
.include bsd.own.mk
@@ -82,7 +82,12 @@ CLEANFILES+=${i}_extern.h
_${i}_SRCS != echo ${DIST}/${i}/*.c ${DIST}/${i}/*.xs
${i}_extern.h: ${SRCS}
${_MKTARGET_CREATE}
- ${TOOL_SED} -n s/^ \* PUBLIC: \(.*\)/\1/p ${.ALLSRC:M*/$i/*} ${.TARGET}
+ @${TOOL_SED} -n s/^ \* PUBLIC: \(.*\)/\1/p ${.ALLSRC:M*/$i/*} ${.TARGET}.tmp
+ @if cmp -s ${.TARGET}.tmp ${.TARGET}; then \
+ rm -f ${.TARGET}.tmp; \
+ else \
+ mv -f ${.TARGET}.tmp ${.TARGET}; \
+ fi
.endfor
DPSRCS+=version.h
CVS commit: src/external/bsd/nvi/dist/common
Module Name:src
Committed By: christos
Date: Sat Nov 30 14:54:29 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/common: recover.c vi_db1.c
Log Message:
Fix recovery mode, there were multiple issues:
1. the btree filename was not set so that we always used a transient
in-memory db for the data
2. we did not call sync after creation with R_RECNOSYNC so that the header
of the btree was never written
3. we did not call the right flavor of sync before copying the tree to the
preserved files
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/common/recover.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/common/vi_db1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/common/recover.c
diff -u src/external/bsd/nvi/dist/common/recover.c:1.3 src/external/bsd/nvi/dist/common/recover.c:1.4
--- src/external/bsd/nvi/dist/common/recover.c:1.3 Wed Nov 27 16:17:36 2013
+++ src/external/bsd/nvi/dist/common/recover.c Sat Nov 30 09:54:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: recover.c,v 1.3 2013/11/27 21:17:36 christos Exp $ */
+/* $NetBSD: recover.c,v 1.4 2013/11/30 14:54:29 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -260,7 +260,15 @@ rcv_sync(SCR *sp, u_int flags)
/* Sync the file if it's been modified. */
if (F_ISSET(ep, F_MODIFIED)) {
- if (ep-db-sync(ep-db, 0)) {
+ /*
+ * If we are using a db1 version of the database,
+ * we want to sync the underlying btree not the
+ * recno tree which is transient anyway.
+ */
+#ifndef R_RECNOSYNC
+#define R_RECNOSYNC 0
+#endif
+ if (ep-db-sync(ep-db, R_RECNOSYNC)) {
F_CLR(ep, F_RCV_ON | F_RCV_NORM);
msgq_str(sp, M_SYSERR,
ep-rcv_path, 060|File backup failed: %s);
Index: src/external/bsd/nvi/dist/common/vi_db1.c
diff -u src/external/bsd/nvi/dist/common/vi_db1.c:1.4 src/external/bsd/nvi/dist/common/vi_db1.c:1.5
--- src/external/bsd/nvi/dist/common/vi_db1.c:1.4 Fri Nov 29 16:57:31 2013
+++ src/external/bsd/nvi/dist/common/vi_db1.c Sat Nov 30 09:54:29 2013
@@ -685,10 +685,19 @@ db_init(SCR *sp, EXF *ep, char *rcv_name
memset(oinfo, 0, sizeof(RECNOINFO));
oinfo.bval = '\n'; /* Always set. */
- oinfo.psize = psize;
- oinfo.flags = R_SNAPSHOT;
- if (rcv_name)
- oinfo.bfname = ep-rcv_path;
+ /*
+ * If we are not recovering, set the pagesize and arrange to
+ * first get a snapshot of the file.
+ */
+ if (rcv_name == NULL) {
+ oinfo.psize = psize;
+ oinfo.flags = R_SNAPSHOT;
+ }
+ /*
+ * Always set the btree name, otherwise we are going to be using
+ * an in-memory database for the btree.
+ */
+ oinfo.bfname = ep-rcv_path;
#define _DB_OPEN_MODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
@@ -709,6 +718,12 @@ db_init(SCR *sp, EXF *ep, char *rcv_name
*open_err = 1;
return 1;
+ } else {
+ /*
+ * We always sync the underlying btree so that the header
+ * is written first
+ */
+ ep-db-sync(ep-db, R_RECNOSYNC);
}
return 0;
CVS commit: src/external/lgpl3/gmp/dist/mpn/generic
Module Name:src Committed By: jnemeth Date: Sat Nov 30 19:05:25 UTC 2013 Modified Files: src/external/lgpl3/gmp/dist/mpn/generic: toom_interpolate_7pts.c Log Message: PR/48419 - Henning Petersen -- unbalanced parenthesis To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/lgpl3/gmp/dist/mpn/generic/toom_interpolate_7pts.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/lgpl3/gmp/dist/mpn/generic/toom_interpolate_7pts.c diff -u src/external/lgpl3/gmp/dist/mpn/generic/toom_interpolate_7pts.c:1.1.1.1 src/external/lgpl3/gmp/dist/mpn/generic/toom_interpolate_7pts.c:1.2 --- src/external/lgpl3/gmp/dist/mpn/generic/toom_interpolate_7pts.c:1.1.1.1 Mon Jun 20 05:54:41 2011 +++ src/external/lgpl3/gmp/dist/mpn/generic/toom_interpolate_7pts.c Sat Nov 30 19:05:25 2013 @@ -33,7 +33,7 @@ along with the GNU MP Library. If not, GMP_NUMB_MAX / 9) (6 - GMP_NUMB_BITS % 6)) * 8 GMP_NUMB_MAX) | 0x39) #define BINVERT_15 \ - GMP_NUMB_MAX (GMP_NUMB_BITS % 4)) / 15) * 14 * 16 GMP_NUMB_MAX) + 15)) + GMP_NUMB_MAX (GMP_NUMB_BITS % 4)) / 15) * 14 * 16 GMP_NUMB_MAX) + 15) /* For the various mpn_divexact_byN here, fall back to using either mpn_pi1_bdiv_q_1 or mpn_divexact_1. The former has less overhead and is
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Sat Nov 30 19:43:53 UTC 2013
Modified Files:
src/sbin/gpt: gpt.8 show.c
Log Message:
Add two new options:
-g which shows the GUID for a partition
-i which shows all the gory details for a particular option
XXX the output format of -i is subject to change
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.11 -r1.12 src/sbin/gpt/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.20 src/sbin/gpt/gpt.8:1.21
--- src/sbin/gpt/gpt.8:1.20 Fri Nov 22 03:51:06 2013
+++ src/sbin/gpt/gpt.8 Sat Nov 30 19:43:53 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpt.8,v 1.20 2013/11/22 03:51:06 jnemeth Exp $
+.\ $NetBSD: gpt.8,v 1.21 2013/11/30 19:43:53 jnemeth Exp $
.\
.\ Copyright (c) 2002 Marcel Moolenaar
.\ All rights reserved.
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
.\
-.Dd November 21, 2013
+.Dd November 30, 2013
.Dt GPT 8
.Os
.Sh NAME
@@ -333,25 +333,32 @@ If the
option is specified then the size will be adjusted to be a multiple of
alignment if possible.
.\ show
-.It Nm Ic show Oo Fl lu Oc Ar device ...
+.It Nm Ic show Oo Fl glu Oc Oo Fl i Ar index Oc Ar device ...
The
.Ic show
command displays the current partitioning on the listed devices and gives
an overall view of the disk contents.
With the
+.Fl g
+option the GPT partition GUID will be displayed instead of the GPT partition
+type.
+With the
.Fl l
option the GPT partition label will be displayed instead of the GPT partition
type.
-The option has no effect on non-GPT partitions.
With the
.Fl u
option the GPT partition type is displayed as an UUID instead of in a
user friendly form.
-The
-.Fl l
-option takes precedence over the
-.Fl u
-option.
+With the
+.Fl i
+option, all the details of a particular GPT partition will be displayed.
+None of the options have any effect on non-GPT partitions.
+The order of precedence for the options are:
+.Fl i ,
+.Fl l ,
+.Fl g ,
+.Fl u .
.El
.Sh EXAMPLES
.Bd -literal
Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.11 src/sbin/gpt/show.c:1.12
--- src/sbin/gpt/show.c:1.11 Sat Oct 19 02:07:08 2013
+++ src/sbin/gpt/show.c Sat Nov 30 19:43:53 2013
@@ -29,7 +29,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: show.c,v 1.11 2013/10/19 02:07:08 jnemeth Exp $);
+__RCSID($NetBSD: show.c,v 1.12 2013/11/30 19:43:53 jnemeth Exp $);
#endif
#include sys/types.h
@@ -46,8 +46,10 @@ __RCSID($NetBSD: show.c,v 1.11 2013/10/
static int show_label = 0;
static int show_uuid = 0;
+static int show_guid = 0;
+static unsigned int entry = 0;
-const char showmsg[] = show [-lu] device ...;
+const char showmsg[] = show [-glu] [-i index] device ...;
__dead static void
usage_show(void)
@@ -130,7 +132,7 @@ unfriendly:
}
static void
-show(int fd __unused)
+show(void)
{
uuid_t type;
off_t start;
@@ -138,6 +140,7 @@ show(int fd __unused)
struct mbr *mbr;
struct gpt_ent *ent;
unsigned int i;
+ char *s;
printf( %*s, lbawidth, start);
printf( %*s, lbawidth, size);
@@ -194,6 +197,11 @@ show(int fd __unused)
if (show_label) {
printf(- \%s\,
utf16_to_utf8(ent-ent_name));
+ } else if (show_guid) {
+uuid_to_string((uuid_t *)ent-ent_guid,
+s, NULL);
+printf(- %s, s);
+free(s);
} else {
le_uuid_dec(ent-ent_type, type);
printf(- %s, friendly(type));
@@ -208,13 +216,80 @@ show(int fd __unused)
}
}
+static void
+show_one(void)
+{
+ uuid_t type;
+ map_t *m;
+ struct gpt_ent *ent;
+ const char *s1;
+ char *s2;
+
+ for (m = map_first(); m != NULL; m = m-map_next)
+ if (entry == m-map_index)
+ break;
+ if (m == NULL) {
+ warnx(%s: error: could not find index %d,
+ device_name, entry);
+ return;
+ }
+ ent = m-map_data;
+
+ printf(Details for index %d:\n, entry);
+ printf(Start: %llu\n, (long long)m-map_start);
+ printf(Size: %llu\n, (long long)m-map_size);
+
+ le_uuid_dec(ent-ent_type, type);
+ s1 = friendly(type);
+ uuid_to_string(type, s2, NULL);
+ if (strcmp(s1, s2) == 0)
+ s1 = unknown;
+ printf(Type: %s (%s)\n, s1, s2);
+ free(s2);
+
+ uuid_to_string((uuid_t *)ent-ent_guid, s2, NULL);
+ printf(GUID: %s\n, s2);
+ free(s2);
+
+ printf(Label: %s\n, utf16_to_utf8(ent-ent_name));
+
+ printf(Attributes:\n);
+ if (ent-ent_attr == 0)
+ printf( None\n);
+ else {
+ if (ent-ent_attr GPT_ENT_ATTR_REQUIRED_PARTITION)
+ printf( required for platform to function\n);
+ if (ent-ent_attr GPT_ENT_ATTR_NO_BLOCK_IO_PROTOCOL)
+ printf( UEFI won't recognize file system\n);
+ if (ent-ent_attr GPT_ENT_ATTR_LEGACY_BIOS_BOOTABLE)
+ printf( legacy BIOS boot partition\n);
+ if (ent-ent_attr GPT_ENT_ATTR_BOOTME)
+ printf( indicates a bootable partition\n);
+
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Sat Nov 30 20:11:11 UTC 2013 Modified Files: src/sys/arch/arm/include: asm.h Log Message: arm doesn't need to use (PLT) anymore. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/include/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/sys/arch/arm/include/asm.h diff -u src/sys/arch/arm/include/asm.h:1.24 src/sys/arch/arm/include/asm.h:1.25 --- src/sys/arch/arm/include/asm.h:1.24 Thu Sep 12 15:36:17 2013 +++ src/sys/arch/arm/include/asm.h Sat Nov 30 20:11:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.24 2013/09/12 15:36:17 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.25 2013/11/30 20:11:11 matt Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -116,7 +116,7 @@ #ifdef __PIC__ #define REL_SYM(a, b) ((a) - (b)) -#define PLT_SYM(x) PIC_SYM(x, PLT) +#define PLT_SYM(x) x #define GOT_SYM(x) PIC_SYM(x, GOT) #define GOT_GET(x,got,sym) \ ldr x, sym; \
CVS commit: src
Module Name:src
Committed By: joerg
Date: Sat Nov 30 20:20:42 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: memmove.S
src/lib/libc/arch/arm/gen: _setjmp.S setjmp.S sigsetjmp.S swapcontext.S
src/lib/libc/arch/arm/sys: __clone.S cerror.S ptrace.S
Log Message:
Use PLT_SYM.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/string/memmove.S
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/arm/gen/_setjmp.S
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/arm/gen/setjmp.S
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/arm/gen/sigsetjmp.S
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/arm/gen/swapcontext.S
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/arm/sys/__clone.S
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/arm/sys/cerror.S
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/arm/sys/ptrace.S
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/string/memmove.S
diff -u src/common/lib/libc/arch/arm/string/memmove.S:1.6 src/common/lib/libc/arch/arm/string/memmove.S:1.7
--- src/common/lib/libc/arch/arm/string/memmove.S:1.6 Mon Aug 19 02:37:12 2013
+++ src/common/lib/libc/arch/arm/string/memmove.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: memmove.S,v 1.6 2013/08/19 02:37:12 matt Exp $ */
+/* $NetBSD: memmove.S,v 1.7 2013/11/30 20:20:42 joerg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@ ENTRY(bcopy)
subhs r3, r0, r1 /* if (dst src) r3 = dst - src */
sublo r3, r1, r0 /* if (src dst) r3 = src - dst */
cmp r3, r2 /* if (r3 = len) we have an overlap */
- bhs PIC_SYM(_C_LABEL(memcpy), PLT)
+ bhs PLT_SYM(_C_LABEL(memcpy))
/* Determine copy direction */
cmp r1, r0
Index: src/lib/libc/arch/arm/gen/_setjmp.S
diff -u src/lib/libc/arch/arm/gen/_setjmp.S:1.15 src/lib/libc/arch/arm/gen/_setjmp.S:1.16
--- src/lib/libc/arch/arm/gen/_setjmp.S:1.15 Mon Oct 21 08:28:14 2013
+++ src/lib/libc/arch/arm/gen/_setjmp.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.15 2013/10/21 08:28:14 skrll Exp $ */
+/* $NetBSD: _setjmp.S,v 1.16 2013/11/30 20:20:42 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -184,8 +184,8 @@ ENTRY(_longjmp)
/* validation failed, die die die. */
botch:
- bl PIC_SYM(_C_LABEL(longjmperror), PLT)
- bl PIC_SYM(_C_LABEL(abort), PLT)
+ bl PLT_SYM(_C_LABEL(longjmperror))
+ bl PLT_SYM(_C_LABEL(abort))
1: b 1b /* Cannot get here */
.align 0
Index: src/lib/libc/arch/arm/gen/setjmp.S
diff -u src/lib/libc/arch/arm/gen/setjmp.S:1.16 src/lib/libc/arch/arm/gen/setjmp.S:1.17
--- src/lib/libc/arch/arm/gen/setjmp.S:1.16 Thu Sep 12 15:36:15 2013
+++ src/lib/libc/arch/arm/gen/setjmp.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.S,v 1.16 2013/09/12 15:36:15 joerg Exp $ */
+/* $NetBSD: setjmp.S,v 1.17 2013/11/30 20:20:42 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -64,7 +64,7 @@ ENTRY(__setjmp14)
#endif
movs r1, #0
movs r0, #0
- bl PIC_SYM(_C_LABEL(__sigprocmask14), PLT)
+ bl PLT_SYM(_C_LABEL(__sigprocmask14))
#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
pop {r0-r2, lr}
#else
@@ -152,7 +152,7 @@ ENTRY(__longjmp14)
adds r1, r1, #(_JB_SIGMASK * 4)
#endif
movs r0, #3/* SIG_SETMASK */
- bl PIC_SYM(_C_LABEL(__sigprocmask14), PLT)
+ bl PLT_SYM(_C_LABEL(__sigprocmask14))
#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
pop {r0-r2, lr}
#else
@@ -218,8 +218,8 @@ ENTRY(__longjmp14)
/* validation failed, die die die. */
.Lbotch:
- bl PIC_SYM(_C_LABEL(longjmperror), PLT)
- bl PIC_SYM(_C_LABEL(abort), PLT)
+ bl PLT_SYM(_C_LABEL(longjmperror))
+ bl PLT_SYM(_C_LABEL(abort))
1: b 1b /* Cannot get here */
.align 0
Index: src/lib/libc/arch/arm/gen/sigsetjmp.S
diff -u src/lib/libc/arch/arm/gen/sigsetjmp.S:1.7 src/lib/libc/arch/arm/gen/sigsetjmp.S:1.8
--- src/lib/libc/arch/arm/gen/sigsetjmp.S:1.7 Tue Sep 3 00:30:19 2013
+++ src/lib/libc/arch/arm/gen/sigsetjmp.S Sat Nov 30 20:20:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sigsetjmp.S,v 1.7 2013/09/03 00:30:19 matt Exp $ */
+/* $NetBSD: sigsetjmp.S,v 1.8 2013/11/30 20:20:42 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -78,14 +78,14 @@ ENTRY(__siglongjmp14)
#ifdef __thumb__
it eq
#endif
- beq PIC_SYM(_C_LABEL(_longjmp), PLT)
- b PIC_SYM(_C_LABEL(__longjmp14), PLT)
+ beq PLT_SYM(_C_LABEL(_longjmp))
+ b PLT_SYM(_C_LABEL(__longjmp14))
#else
push {r3, lr}
beq 11f
- bl PIC_SYM(_C_LABEL(__longjmp14), PLT)
+ bl PLT_SYM(_C_LABEL(__longjmp14))
pop {r3, pc}
-11: bl PIC_SYM(_C_LABEL(_longjmp), PLT)
+11: bl PLT_SYM(_C_LABEL(_longjmp))
pop {r3, pc}
#endif
Index: src/lib/libc/arch/arm/gen/swapcontext.S
diff -u src/lib/libc/arch/arm/gen/swapcontext.S:1.13 src/lib/libc/arch/arm/gen/swapcontext.S:1.14
--- src/lib/libc/arch/arm/gen/swapcontext.S:1.13 Wed Sep 4 23:08:29 2013
+++ src/lib/libc/arch/arm/gen/swapcontext.S Sat Nov
CVS commit: src/external/lgpl3/gmp/dist/mpn/generic
Module Name:src
Committed By: martin
Date: Sat Nov 30 20:30:22 UTC 2013
Modified Files:
src/external/lgpl3/gmp/dist/mpn/generic: divrem_2.c
Log Message:
Avoid warning on sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/lgpl3/gmp/dist/mpn/generic/divrem_2.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/lgpl3/gmp/dist/mpn/generic/divrem_2.c
diff -u src/external/lgpl3/gmp/dist/mpn/generic/divrem_2.c:1.1.1.2 src/external/lgpl3/gmp/dist/mpn/generic/divrem_2.c:1.2
--- src/external/lgpl3/gmp/dist/mpn/generic/divrem_2.c:1.1.1.2 Fri Nov 29 07:49:49 2013
+++ src/external/lgpl3/gmp/dist/mpn/generic/divrem_2.c Sat Nov 30 20:30:22 2013
@@ -98,7 +98,7 @@ mpn_divrem_2 (mp_ptr qp, mp_size_t qxn,
for (i = qxn - 1; i = 0; i--)
{
mp_limb_t q;
- udiv_qr_3by2 (q, r1, r0, r1, r0, 0, d1, d0, di.inv32);
+ udiv_qr_3by2 (q, r1, r0, r1, r0, 0UL, d1, d0, di.inv32);
qp[i] = q;
}
}
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: joerg Date: Sat Nov 30 20:43:53 UTC 2013 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_add_64.S Log Message: Explicitly name the register pairs. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S 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_64.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.9 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.10 --- src/common/lib/libc/arch/arm/atomic/atomic_add_64.S:1.9 Fri Nov 8 22:42:52 2013 +++ src/common/lib/libc/arch/arm/atomic/atomic_add_64.S Sat Nov 30 20:43:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_64.S,v 1.9 2013/11/08 22:42:52 matt Exp $ */ +/* $NetBSD: atomic_add_64.S,v 1.10 2013/11/30 20:43:53 joerg Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -39,10 +39,10 @@ ENTRY_NP(_atomic_add_64_nv) mov r3, r2 mov r2, r1 #endif -1: ldrexd r0, [ip] /* load old value */ +1: ldrexd r0, r1, [ip] /* load old value */ adds LO, LO, NLO /* calculate new value lo */ adcs HI, HI, NHI /* calculate new value hi */ - strexd r4, r0, [ip] /* try to store */ + strexd r4, r0, r1, [ip] /* try to store */ cmp r4, #0 /* succeed? */ bne 1b /* no, try again? */ #ifdef _ARM_ARCH_7
CVS commit: src/lib/libc/compat/arch/arm/gen
Module Name:src
Committed By: joerg
Date: Sat Nov 30 20:54:14 UTC 2013
Modified Files:
src/lib/libc/compat/arch/arm/gen: compat_setjmp.S compat_sigsetjmp.S
Log Message:
Use PLT_SYM.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compat/arch/arm/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.3 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.4
--- src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.3 Mon Aug 19 22:11:50 2013
+++ src/lib/libc/compat/arch/arm/gen/compat_setjmp.S Sat Nov 30 20:54:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setjmp.S,v 1.3 2013/08/19 22:11:50 matt Exp $ */
+/* $NetBSD: compat_setjmp.S,v 1.4 2013/11/30 20:54:14 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -50,7 +50,7 @@ ENTRY(setjmp)
push {r0, lr}
movs r0, #0x
- bl PIC_SYM(_C_LABEL(sigblock), PLT)
+ bl PLT_SYM(_C_LABEL(sigblock))
mov r1, r0
/* Store signal mask */
@@ -99,7 +99,7 @@ ENTRY(longjmp)
push {r0, r1} /* don't care about lr */
mov r0, r2
- bl PIC_SYM(_C_LABEL(sigsetmask), PLT)
+ bl PLT_SYM(_C_LABEL(sigsetmask))
pop {r0, r1}
@@ -145,8 +145,8 @@ ENTRY(longjmp)
/* validation failed, die die die. */
botch:
- bl PIC_SYM(_C_LABEL(longjmperror), PLT)
- bl PIC_SYM(_C_LABEL(abort), PLT)
+ bl PLT_SYM(_C_LABEL(longjmperror))
+ bl PLT_SYM(_C_LABEL(abort))
2: b 2b /* Cannot get here */
.align 0
Index: src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S
diff -u src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.2 src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.3
--- src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.2 Mon Aug 19 22:11:50 2013
+++ src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S Sat Nov 30 20:54:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigsetjmp.S,v 1.2 2013/08/19 22:11:50 matt Exp $ */
+/* $NetBSD: compat_sigsetjmp.S,v 1.3 2013/11/30 20:54:14 joerg Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -72,8 +72,8 @@ ENTRY(siglongjmp)
#if defined(__thumb__)
it eq
#endif
- beq PIC_SYM(_C_LABEL(_longjmp), PLT)
- b PIC_SYM(_C_LABEL(longjmp), PLT)
+ beq PLT_SYM(_C_LABEL(_longjmp))
+ b PLT_SYM(_C_LABEL(longjmp))
#else
push {lr}
sub sp, sp, #4
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: joerg Date: Sat Nov 30 21:07:59 UTC 2013 Modified Files: src/sys/arch/arm/include: profile.h Log Message: Like asm.h r1.25, don't use (PLT) anymore. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/profile.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/profile.h diff -u src/sys/arch/arm/include/profile.h:1.12 src/sys/arch/arm/include/profile.h:1.13 --- src/sys/arch/arm/include/profile.h:1.12 Thu Sep 12 15:36:17 2013 +++ src/sys/arch/arm/include/profile.h Sat Nov 30 21:07:59 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: profile.h,v 1.12 2013/09/12 15:36:17 joerg Exp $ */ +/* $NetBSD: profile.h,v 1.13 2013/11/30 21:07:59 joerg Exp $ */ /* * Copyright (c) 2001 Ben Harris @@ -39,13 +39,7 @@ */ #define MCOUNT_ASM_NAME __mcount -#ifdef __PIC__ -#define PLTSYM (PLT) -#endif - -#ifndef PLTSYM #define PLTSYM -#endif #if !defined(__ARM_EABI__) #define MCOUNT\
CVS commit: src/common/lib/libc/arch/arm
Module Name:src Committed By: joerg Date: Sat Nov 30 21:09:11 UTC 2013 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_and_64.S atomic_cas_64.S atomic_dec_64.S atomic_inc_64.S atomic_nand_64.S atomic_or_64.S atomic_swap_64.S atomic_xor_64.S sync_bool_compare_and_swap_8.S sync_fetch_and_add_8.S sync_fetch_and_and_8.S sync_fetch_and_nand_8.S sync_fetch_and_or_8.S sync_fetch_and_sub_8.S sync_fetch_and_xor_8.S src/common/lib/libc/arch/arm/string: memset.S Log Message: Use explicit form of register pair operations by specifying both. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/atomic/atomic_and_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_64.S cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_dec_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/atomic/atomic_nand_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S \ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/arm/string/memset.S 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_and_64.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_and_64.S:1.8 src/common/lib/libc/arch/arm/atomic/atomic_and_64.S:1.9 --- src/common/lib/libc/arch/arm/atomic/atomic_and_64.S:1.8 Fri Nov 8 22:42:52 2013 +++ src/common/lib/libc/arch/arm/atomic/atomic_and_64.S Sat Nov 30 21:09:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_64.S,v 1.8 2013/11/08 22:42:52 matt Exp $ */ +/* $NetBSD: atomic_and_64.S,v 1.9 2013/11/30 21:09:11 joerg Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -39,10 +39,10 @@ ENTRY_NP(_atomic_and_64_nv) mov r2, r1 #endif mov ip, r0 /* need r0 for return value */ -1: ldrexd r0, [ip] /* load old value */ +1: ldrexd r0, r1, [ip] /* load old value */ ands r0, r0, r2 /* calculate new value */ ands r1, r1, r3 /* calculate new value */ - strexd r4, r0, [ip] /* try to store */ + strexd r4, r0, r1, [ip] /* try to store */ cmp r4, #0 /* succeed? */ bne 1b /* no, try again? */ #ifdef _ARM_ARCH_7 Index: src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S:1.8 src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S:1.9 --- src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S:1.8 Sun Aug 11 04:41:17 2013 +++ src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S Sat Nov 30 21:09:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_inc_64.S,v 1.8 2013/08/11 04:41:17 matt Exp $ */ +/* $NetBSD: atomic_inc_64.S,v 1.9 2013/11/30 21:09:11 joerg Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -34,10 +34,10 @@ ENTRY_NP(_atomic_inc_64_nv) mov ip, r0 /* need r0 for return value */ -1: ldrexd r0, [ip] /* load old value */ +1: ldrexd r0, r1, [ip] /* load old value */ adds LO, LO, #1 /* calculate new value (return value) */ adcs HI, HI, #0 /* fold carry into high */ - strexd r2, r0, [ip] /* try to store */ + strexd r2, r0, r1, [ip] /* try to store */ cmp r2, #0 /* succeed? */ bne 1b /* no, try again? */ #ifdef _ARM_ARCH_7 Index: src/common/lib/libc/arch/arm/atomic/atomic_or_64.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.8 src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.9 --- src/common/lib/libc/arch/arm/atomic/atomic_or_64.S:1.8 Fri Nov 8 22:42:52 2013 +++ src/common/lib/libc/arch/arm/atomic/atomic_or_64.S Sat Nov 30 21:09:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_or_64.S,v 1.8 2013/11/08 22:42:52 matt Exp $ */ +/* $NetBSD: atomic_or_64.S,v 1.9 2013/11/30 21:09:11 joerg Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -39,10 +39,10 @@ ENTRY_NP(_atomic_or_64_nv) mov r2, r1 #endif mov ip, r0 /* need r0 for return value */ -1: ldrexd r0, [ip] /* load old value */ +1: ldrexd r0, r1, [ip] /* load old value */ orrs r0, r0, r2 /* calculate new value (return value) */ orrs r1, r1, r3 /* calculate new value (return value) */ - strexd r4, r0, [ip] /* try to store */ + strexd r4, r0, r1, [ip] /* try to store */ cmp r4, #0 /* succeed? */ bne
CVS commit: src/lib/libc/arch/arm/hardfloat
Module Name:src Committed By: joerg Date: Sat Nov 30 22:39:04 UTC 2013 Modified Files: src/lib/libc/arch/arm/hardfloat: fabs.S Log Message: fabsl alias. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/arm/hardfloat/fabs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/arm/hardfloat/fabs.S diff -u src/lib/libc/arch/arm/hardfloat/fabs.S:1.1 src/lib/libc/arch/arm/hardfloat/fabs.S:1.2 --- src/lib/libc/arch/arm/hardfloat/fabs.S:1.1 Sun Feb 3 07:14:41 2013 +++ src/lib/libc/arch/arm/hardfloat/fabs.S Sat Nov 30 22:39:04 2013 @@ -29,10 +29,11 @@ #include arm/asm.h -RCSID($NetBSD: fabs.S,v 1.1 2013/02/03 07:14:41 matt Exp $) +RCSID($NetBSD: fabs.S,v 1.2 2013/11/30 22:39:04 joerg Exp $) .fpu vfp +ENTRY(fabsl) ENTRY(fabs) vabs.f64 d0, d0 RET
CVS commit: src/external/lgpl3/gmp/lib/libgmp
Module Name:src Committed By: wiz Date: Sat Nov 30 23:45:05 UTC 2013 Modified Files: src/external/lgpl3/gmp/lib/libgmp: Makefile Log Message: Disable parentheses checks since libgmp doesn't pass them. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/lgpl3/gmp/lib/libgmp/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/lgpl3/gmp/lib/libgmp/Makefile diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.19 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.20 --- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.19 Fri Nov 29 14:51:36 2013 +++ src/external/lgpl3/gmp/lib/libgmp/Makefile Sat Nov 30 23:45:05 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/11/29 14:51:36 martin Exp $ +# $NetBSD: Makefile,v 1.20 2013/11/30 23:45:05 wiz Exp $ .include bsd.init.mk @@ -244,4 +244,4 @@ COPTS += -marm NOGCCERROR=yes .endif -CWARNFLAGS.clang+= -Wno-unused-value -Wno-tautological-compare +CWARNFLAGS.clang+= -Wno-unused-value -Wno-tautological-compare -Wno-parentheses
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sun Dec 1 00:17:14 UTC 2013 Modified Files: src/share/man/man4: carp.4 ccd.4 cgd.4 md.4 ptm.4 pty.4 raid.4 Log Message: These don't need count anymore. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/carp.4 cvs rdiff -u -r1.29 -r1.30 src/share/man/man4/ccd.4 cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/cgd.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/md.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/ptm.4 cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/pty.4 cvs rdiff -u -r1.36 -r1.37 src/share/man/man4/raid.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/carp.4 diff -u src/share/man/man4/carp.4:1.4 src/share/man/man4/carp.4:1.5 --- src/share/man/man4/carp.4:1.4 Sat Dec 23 01:58:20 2006 +++ src/share/man/man4/carp.4 Sat Nov 30 19:17:14 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: carp.4,v 1.4 2006/12/23 06:58:20 wiz Exp $ +.\ $NetBSD: carp.4,v 1.5 2013/12/01 00:17:14 christos Exp $ .\ $OpenBSD: carp.4,v 1.19 2005/08/09 09:52:12 jmc Exp $ .\ .\ Copyright (c) 2003, Ryan McBride. All rights reserved. @@ -24,14 +24,14 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd October 16, 2003 +.Dd November 30, 2013 .Dt CARP 4 .Os .Sh NAME .Nm carp .Nd Common Address Redundancy Protocol .Sh SYNOPSIS -.Cd pseudo-device carp Op Ar count +.Cd pseudo-device carp .Sh DESCRIPTION The .Nm Index: src/share/man/man4/ccd.4 diff -u src/share/man/man4/ccd.4:1.29 src/share/man/man4/ccd.4:1.30 --- src/share/man/man4/ccd.4:1.29 Fri May 2 14:11:05 2008 +++ src/share/man/man4/ccd.4 Sat Nov 30 19:17:14 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: ccd.4,v 1.29 2008/05/02 18:11:05 martin Exp $ +.\ $NetBSD: ccd.4,v 1.30 2013/12/01 00:17:14 christos Exp $ .\ .\ Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -51,14 +51,14 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd March 5, 2004 +.Dd November 30, 2013 .Dt CCD 4 .Os .Sh NAME .Nm ccd .Nd Concatenated disk driver .Sh SYNOPSIS -.Cd pseudo-device ccd Op Ar count +.Cd pseudo-device ccd .Sh DESCRIPTION The .Nm @@ -93,15 +93,12 @@ In order to compile in support for the you must add a line similar to the following to your kernel configuration file: .Bd -unfilled -offset indent -pseudo-device ccd 4 # concatenated disk devices +pseudo-device ccd # concatenated disk devices .Ed .Pp -The count argument is how many +The .Nm Ns s -memory is allocated for at boot time. -In this example, no more than 4 -.Nm Ns s -may be configured. +are allocated dynamically as needed. .Pp A .Nm Index: src/share/man/man4/cgd.4 diff -u src/share/man/man4/cgd.4:1.17 src/share/man/man4/cgd.4:1.18 --- src/share/man/man4/cgd.4:1.17 Tue Dec 4 21:23:20 2012 +++ src/share/man/man4/cgd.4 Sat Nov 30 19:17:14 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: cgd.4,v 1.17 2012/12/05 02:23:20 christos Exp $ +.\ $NetBSD: cgd.4,v 1.18 2013/12/01 00:17:14 christos Exp $ .\ .\ Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,14 +27,14 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 3, 2012 +.Dd November 30, 2013 .Dt CGD 4 .Os .Sh NAME .Nm cgd .Nd cryptographic disk driver .Sh SYNOPSIS -.Cd pseudo-device cgd Op Ar count +.Cd pseudo-device cgd .Sh DESCRIPTION The .Nm @@ -47,12 +47,12 @@ into your kernel, you must add the drive file. To do this, add a line similar to: .Bd -unfilled -offset indent -pseudo-device cgd 4 # cryptographic disk driver +pseudo-device cgd # cryptographic disk driver .Ed .Pp -The count argument defines how many +The .Nm -devices may be configured at a time. +devices are allocated as needed. .Ss Encryption Algorithms Currently the following cryptographic algorithms are supported: .Bl -tag -width indentxxx Index: src/share/man/man4/md.4 diff -u src/share/man/man4/md.4:1.5 src/share/man/man4/md.4:1.6 --- src/share/man/man4/md.4:1.5 Sat Feb 24 23:22:01 2007 +++ src/share/man/man4/md.4 Sat Nov 30 19:17:14 2013 @@ -1,15 +1,15 @@ -.\ $NetBSD: md.4,v 1.5 2007/02/25 04:22:01 uwe Exp $ +.\ $NetBSD: md.4,v 1.6 2013/12/01 00:17:14 christos Exp $ .\ .\ This file is in the public domain. .\ -.Dd February 25, 2007 +.Dd November 30, 2013 .Dt MD 4 .Os .Sh NAME .Nm md .Nd memory disk driver .Sh SYNOPSIS -.Cd pseudo-device md Op Ar count +.Cd pseudo-device md .Sh DESCRIPTION The .Nm Index: src/share/man/man4/ptm.4 diff -u src/share/man/man4/ptm.4:1.7 src/share/man/man4/ptm.4:1.8 --- src/share/man/man4/ptm.4:1.7 Fri Oct 19 12:49:49 2012 +++ src/share/man/man4/ptm.4 Sat Nov 30 19:17:14 2013 @@ -1,4 +1,4 @@ -.\$NetBSD: ptm.4,v 1.7 2012/10/19 16:49:49 apb Exp $ +.\$NetBSD: ptm.4,v 1.8 2013/12/01
CVS commit: src/lib/libc/db
Module Name:src
Committed By: christos
Date: Sun Dec 1 00:22:48 UTC 2013
Modified Files:
src/lib/libc/db/btree: bt_open.c bt_overflow.c bt_utils.c
src/lib/libc/db/db: Makefile.inc
src/lib/libc/db/hash: hash.c hash_page.c
src/lib/libc/db/recno: rec_open.c rec_put.c rec_utils.c
Added Files:
src/lib/libc/db/db: dbfile.c
Log Message:
- centralize opening of regular and temp files to avoid code duplication
- don't cast malloc
- use malloc sizeof(*var) instead of sizeof(type)
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/db/btree/bt_open.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/db/btree/bt_overflow.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/db/btree/bt_utils.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/db/db/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/db/db/dbfile.c
cvs rdiff -u -r1.32 -r1.33 src/lib/libc/db/hash/hash.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/db/hash/hash_page.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/db/recno/rec_open.c \
src/lib/libc/db/recno/rec_put.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/db/recno/rec_utils.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/db/btree/bt_open.c
diff -u src/lib/libc/db/btree/bt_open.c:1.26 src/lib/libc/db/btree/bt_open.c:1.27
--- src/lib/libc/db/btree/bt_open.c:1.26 Tue Mar 13 17:13:32 2012
+++ src/lib/libc/db/btree/bt_open.c Sat Nov 30 19:22:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_open.c,v 1.26 2012/03/13 21:13:32 christos Exp $ */
+/* $NetBSD: bt_open.c,v 1.27 2013/12/01 00:22:48 christos Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -37,7 +37,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: bt_open.c,v 1.26 2012/03/13 21:13:32 christos Exp $);
+__RCSID($NetBSD: bt_open.c,v 1.27 2013/12/01 00:22:48 christos Exp $);
/*
* Implementation of btree access method for 4.4BSD.
@@ -71,7 +71,6 @@ __RCSID($NetBSD: bt_open.c,v 1.26 2012/
static int byteorder(void);
static int nroot(BTREE *);
-static int tmp(void);
/*
* __BT_OPEN -- Open a btree.
@@ -161,7 +160,7 @@ __bt_open(const char *fname, int flags,
goto einval;
/* Allocate and initialize DB and BTREE structures. */
- if ((t = (BTREE *)malloc(sizeof(BTREE))) == NULL)
+ if ((t = malloc(sizeof(*t))) == NULL)
goto err;
memset(t, 0, sizeof(BTREE));
t-bt_fd = -1; /* Don't close unopened fd on error. */
@@ -171,7 +170,7 @@ __bt_open(const char *fname, int flags,
t-bt_pfx = b.prefix;
t-bt_rfd = -1;
- if ((t-bt_dbp = dbp = (DB *)malloc(sizeof(DB))) == NULL)
+ if ((t-bt_dbp = dbp = malloc(sizeof(*dbp))) == NULL)
goto err;
memset(t-bt_dbp, 0, sizeof(DB));
if (t-bt_lorder != machine_lorder)
@@ -202,24 +201,17 @@ __bt_open(const char *fname, int flags,
default:
goto einval;
}
-
- if ((t-bt_fd = open(fname, flags, mode)) == -1)
- goto err;
- if (fcntl(t-bt_fd, F_SETFD, FD_CLOEXEC) == -1)
+ if ((t-bt_fd = __dbopen(fname, flags, mode, sb)) == -1)
goto err;
} else {
if ((flags O_ACCMODE) != O_RDWR)
goto einval;
- if ((t-bt_fd = tmp()) == -1)
+ if ((t-bt_fd = __dbtemp(bt., sb)) == -1)
goto err;
F_SET(t, B_INMEM);
}
- if (fcntl(t-bt_fd, F_SETFD, FD_CLOEXEC) == -1)
- goto err;
- if (fstat(t-bt_fd, sb))
- goto err;
if (sb.st_size) {
if ((nr = read(t-bt_fd, m, sizeof(BTMETA))) 0)
goto err;
@@ -390,37 +382,6 @@ nroot(BTREE *t)
}
static int
-tmp(void)
-{
- sigset_t set, oset;
- int len;
- int fd;
- char *envtmp;
- char path[PATH_MAX];
-
- if (issetugid())
- envtmp = NULL;
- else
- envtmp = getenv(TMPDIR);
-
- len = snprintf(path,
- sizeof(path), %s/bt.XX, envtmp ? envtmp : _PATH_TMP);
- if (len 0 || (size_t)len = sizeof(path)) {
- errno = ENAMETOOLONG;
- return -1;
- }
-
- (void)sigfillset(set);
- (void)sigprocmask(SIG_BLOCK, set, oset);
- if ((fd = mkstemp(path)) != -1) {
- (void)unlink(path);
- (void)fcntl(fd, F_SETFD, FD_CLOEXEC);
- }
- (void)sigprocmask(SIG_SETMASK, oset, NULL);
- return(fd);
-}
-
-static int
byteorder(void)
{
uint32_t x;
Index: src/lib/libc/db/btree/bt_overflow.c
diff -u src/lib/libc/db/btree/bt_overflow.c:1.18 src/lib/libc/db/btree/bt_overflow.c:1.19
--- src/lib/libc/db/btree/bt_overflow.c:1.18 Tue Mar 13 17:13:32 2012
+++ src/lib/libc/db/btree/bt_overflow.c Sat Nov 30 19:22:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_overflow.c,v 1.18 2012/03/13 21:13:32 christos Exp $ */
+/* $NetBSD: bt_overflow.c,v 1.19 2013/12/01 00:22:48 christos Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -37,7 +37,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: bt_overflow.c,v 1.18 2012/03/13 21:13:32 christos Exp $);
+__RCSID($NetBSD: bt_overflow.c,v 1.19 2013/12/01 00:22:48 christos Exp $);
#include namespace.h
#include sys/param.h
@@ -97,7 +97,7 @@ __ovfl_get(BTREE *t, void *p, size_t *ss
#endif
/* Make the buffer bigger as necessary. */
if (*bufsz sz) {
- *buf = (*buf == NULL ?
CVS commit: src/include
Module Name:src Committed By: christos Date: Sun Dec 1 00:23:11 UTC 2013 Modified Files: src/include: db.h Log Message: add new internal functions To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/include/db.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/db.h diff -u src/include/db.h:1.25 src/include/db.h:1.26 --- src/include/db.h:1.25 Tue Mar 13 17:14:55 2012 +++ src/include/db.h Sat Nov 30 19:23:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: db.h,v 1.25 2012/03/13 21:14:55 christos Exp $ */ +/* $NetBSD: db.h,v 1.26 2013/12/01 00:23:11 christos Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -220,6 +220,9 @@ DB *__bt_open(const char *, int, mode_t, DB *__hash_open(const char *, int, mode_t, const HASHINFO *, int); DB *__rec_open(const char *, int, mode_t, const RECNOINFO *, int); void __dbpanic(DB *); +struct stat; +int __dbopen(const char *, int, mode_t, struct stat *); +int __dbtemp(const char *, struct stat *); #endif __END_DECLS #endif /* !_DB_H_ */
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sun Dec 1 00:59:34 UTC 2013
Modified Files:
src/sys/kern: vfs_vnode.c
src/sys/sys: vnode.h
Log Message:
Revert recent vnode changes per PR/48411, I still have deadlocks with
build -j 20 on an 8 cpu machine.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.241 -r1.242 src/sys/sys/vnode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.27 src/sys/kern/vfs_vnode.c:1.28
--- src/sys/kern/vfs_vnode.c:1.27 Fri Nov 29 09:58:55 2013
+++ src/sys/kern/vfs_vnode.c Sat Nov 30 19:59:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.27 2013/11/29 14:58:55 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.28 2013/12/01 00:59:34 christos Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.27 2013/11/29 14:58:55 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.28 2013/12/01 00:59:34 christos Exp $);
#define _VFS_VNODE_PRIVATE
@@ -145,7 +145,6 @@ __KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,
/* Flags to vrelel. */
#define VRELEL_ASYNC_RELE 0x0001 /* Always defer to vrele thread. */
-#define VRELEL_CHANGING_SET 0x0002 /* VI_CHANGING set by caller. */
u_int numvnodes __cacheline_aligned;
@@ -324,10 +323,8 @@ try_nextlist:
* before doing this.
*/
vp-v_usecount = 1;
- KASSERT((vp-v_iflag VI_CHANGING) == 0);
- vp-v_iflag |= VI_CHANGING;
vclean(vp);
- vrelel(vp, VRELEL_CHANGING_SET);
+ vrelel(vp, 0);
fstrans_done(mp);
return 0;
@@ -479,10 +476,10 @@ vremfree(vnode_t *vp)
*
* = Should be called with v_interlock held.
*
- * If VI_CHANGING is set, the vnode may be eliminated in vgone()/vclean().
+ * If VI_XLOCK is set, the vnode is being eliminated in vgone()/vclean().
* In that case, we cannot grab the vnode, so the process is awakened when
* the transition is completed, and an error returned to indicate that the
- * vnode is no longer usable.
+ * vnode is no longer usable (e.g. changed to a new file system type).
*/
int
vget(vnode_t *vp, int flags)
@@ -505,16 +502,31 @@ vget(vnode_t *vp, int flags)
}
/*
- * If the vnode is in the process of changing state we wait
- * for the change to complete and take care not to return
- * a clean vnode.
+ * If the vnode is in the process of being cleaned out for
+ * another use, we wait for the cleaning to finish and then
+ * return failure. Cleaning is determined by checking if
+ * the VI_XLOCK flag is set.
*/
- if ((vp-v_iflag VI_CHANGING) != 0) {
+ if ((vp-v_iflag VI_XLOCK) != 0) {
if ((flags LK_NOWAIT) != 0) {
vrelel(vp, 0);
return EBUSY;
}
- vwait(vp, VI_CHANGING);
+ vwait(vp, VI_XLOCK);
+ vrelel(vp, 0);
+ return ENOENT;
+ }
+
+ if ((vp-v_iflag VI_INACTNOW) != 0) {
+ /*
+ * if it's being desactived, wait for it to complete.
+ * Make sure to not return a clean vnode.
+ */
+ if ((flags LK_NOWAIT) != 0) {
+ vrelel(vp, 0);
+ return EBUSY;
+ }
+ vwait(vp, VI_INACTNOW);
if ((vp-v_iflag VI_CLEAN) != 0) {
vrelel(vp, 0);
return ENOENT;
@@ -593,11 +605,7 @@ vrelel(vnode_t *vp, int flags)
* and unlock.
*/
if (vtryrele(vp)) {
- if ((flags VRELEL_CHANGING_SET) != 0) {
- KASSERT((vp-v_iflag VI_CHANGING) != 0);
- vp-v_iflag = ~VI_CHANGING;
- cv_broadcast(vp-v_cv);
- }
+ vp-v_iflag |= VI_INACTREDO;
mutex_exit(vp-v_interlock);
return;
}
@@ -618,8 +626,10 @@ vrelel(vnode_t *vp, int flags)
* If not clean, deactivate the vnode, but preserve
* our reference across the call to VOP_INACTIVE().
*/
+retry:
if ((vp-v_iflag VI_CLEAN) == 0) {
recycle = false;
+ vp-v_iflag |= VI_INACTNOW;
/*
* XXX This ugly block can be largely eliminated if
@@ -634,8 +644,11 @@ vrelel(vnode_t *vp, int flags)
defer = true;
} else if (curlwp == vrele_lwp) {
/*
- * We have to try harder.
+ * We have to try harder. But we can't sleep
+ * with VI_INACTNOW as vget() may be waiting on it.
*/
+ vp-v_iflag = ~(VI_INACTREDO|VI_INACTNOW);
+ cv_broadcast(vp-v_cv);
mutex_exit(vp-v_interlock);
error = vn_lock(vp, LK_EXCLUSIVE);
if (error != 0) {
@@ -650,14 +663,11 @@ vrelel(vnode_t *vp, int flags)
*/
if (__predict_false(vtryrele(vp))) {
VOP_UNLOCK(vp);
-if ((flags VRELEL_CHANGING_SET) != 0) {
- KASSERT((vp-v_iflag VI_CHANGING) != 0);
- vp-v_iflag = ~VI_CHANGING;
- cv_broadcast(vp-v_cv);
-}
mutex_exit(vp-v_interlock);
return;
}
+ vp-v_iflag |= VI_INACTNOW;
+ mutex_exit(vp-v_interlock);
defer = false;
} else if ((vp-v_iflag VI_LAYER) != 0) {
/*
@@ -668,14 +678,15 @@ vrelel(vnode_t *vp, int flags)
defer = true;
} else {
/* If we can't acquire the lock, then defer. */
+
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: joerg
Date: Sun Dec 1 01:05:17 UTC 2013
Modified Files:
src/external/gpl3/gdb/dist/gdb: arm-tdep.c
Log Message:
One const ought to be enough for every variable.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gdb/dist/gdb/arm-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/arm-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-tdep.c:1.1.1.2 src/external/gpl3/gdb/dist/gdb/arm-tdep.c:1.2
--- src/external/gpl3/gdb/dist/gdb/arm-tdep.c:1.1.1.2 Thu Oct 3 15:49:39 2013
+++ src/external/gpl3/gdb/dist/gdb/arm-tdep.c Sun Dec 1 01:05:16 2013
@@ -12443,7 +12443,7 @@ decode_insn (insn_decode_record *arm_rec
{
/* (Starting from numerical 0); bits 25, 26, 27 decodes type of arm instruction. */
- static const sti_arm_hdl_fp_t const arm_handle_insn[8] =
+ static const sti_arm_hdl_fp_t arm_handle_insn[8] =
{
arm_record_data_proc_misc_ld_str, /* 000. */
arm_record_data_proc_imm, /* 001. */
@@ -12456,7 +12456,7 @@ decode_insn (insn_decode_record *arm_rec
};
/* (Starting from numerical 0); bits 13,14,15 decodes type of thumb instruction. */
- static const sti_arm_hdl_fp_t const thumb_handle_insn[8] =
+ static const sti_arm_hdl_fp_t thumb_handle_insn[8] =
{ \
thumb_record_shift_add_sub,/* 000. */
thumb_record_add_sub_cmp_mov, /* 001. */
CVS commit: src/external/bsd/nvi/dist/common
Module Name:src
Committed By: christos
Date: Sun Dec 1 02:21:58 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/common: vi_db1.c
Log Message:
fix indentantion
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/common/vi_db1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/common/vi_db1.c
diff -u src/external/bsd/nvi/dist/common/vi_db1.c:1.5 src/external/bsd/nvi/dist/common/vi_db1.c:1.6
--- src/external/bsd/nvi/dist/common/vi_db1.c:1.5 Sat Nov 30 09:54:29 2013
+++ src/external/bsd/nvi/dist/common/vi_db1.c Sat Nov 30 21:21:58 2013
@@ -123,27 +123,27 @@ db_get(SCR *sp, db_recno_t lno, u_int32_
#if defined(DBDEBUG) defined(TRACE)
vtrace(
retrieve TEXT buffer line %lu\n, (u_long)lno);
-#endif
- for (tp = TAILQ_FIRST(sp-tiq);
-tp-lno != lno; tp = TAILQ_NEXT(tp, q));
- if (lenp != NULL)
-*lenp = tp-len;
- if (pp != NULL)
-*pp = tp-lb;
- return (0);
- }
- /*
- * Adjust the line number for the number of lines used
- * by the text input buffers.
- */
- if (lno l2)
- lno -= l2 - l1;
- }
+#endif
+ for (tp = TAILQ_FIRST(sp-tiq);
+ tp-lno != lno; tp = TAILQ_NEXT(tp, q));
+ if (lenp != NULL)
+*lenp = tp-len;
+ if (pp != NULL)
+*pp = tp-lb;
+ return (0);
+ }
+ /*
+ * Adjust the line number for the number of lines used
+ * by the text input buffers.
+ */
+ if (lno l2)
+ lno -= l2 - l1;
+ }
- /* Look-aside into the cache, and see if the line we want is there. */
- if (lno == sp-c_lno) {
-#if defined(DBDEBUG) defined(TRACE)
- vtrace(retrieve cached line %lu\n, (u_long)lno);
+ /* Look-aside into the cache, and see if the line we want is there. */
+ if (lno == sp-c_lno) {
+#if defined(DBDEBUG) defined(TRACE)
+ vtrace(retrieve cached line %lu\n, (u_long)lno);
#endif
if (lenp != NULL)
*lenp = sp-c_len;
CVS commit: src/external/bsd/nvi/dist
Module Name:src
Committed By: christos
Date: Sun Dec 1 02:34:54 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/common: exf.c gs.c main.c screen.c
src/external/bsd/nvi/dist/ex: ex_edit.c ex_tag.c
src/external/bsd/nvi/dist/vi: v_ex.c vi.c vs_msg.c vs_refresh.c
vs_split.c
Log Message:
Revert all previous TAILQ_NEXT() = NULL, changes, checks against
NULL vip's and removal of screens from queues. Instead introduce
a new screen_end1() function that can be used to clean screens that
are not associated with queues yet. Pointed out by chuq@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nvi/dist/common/exf.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/common/gs.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/common/main.c \
src/external/bsd/nvi/dist/common/screen.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/ex/ex_edit.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/nvi/dist/ex/ex_tag.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/vi/v_ex.c \
src/external/bsd/nvi/dist/vi/vi.c src/external/bsd/nvi/dist/vi/vs_msg.c \
src/external/bsd/nvi/dist/vi/vs_refresh.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/vi/vs_split.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/common/exf.c
diff -u src/external/bsd/nvi/dist/common/exf.c:1.6 src/external/bsd/nvi/dist/common/exf.c:1.7
--- src/external/bsd/nvi/dist/common/exf.c:1.6 Thu Nov 28 18:19:43 2013
+++ src/external/bsd/nvi/dist/common/exf.c Sat Nov 30 21:34:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exf.c,v 1.6 2013/11/28 23:19:43 christos Exp $ */
+/* $NetBSD: exf.c,v 1.7 2013/12/01 02:34:54 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -402,7 +402,6 @@ no_lock:
/* Switch... */
++ep-refcnt;
- TAILQ_NEXT(sp, q) = NULL;
TAILQ_INSERT_HEAD(ep-scrq, sp, eq);
sp-ep = ep;
sp-frp = frp;
@@ -692,7 +691,6 @@ file_end(SCR *sp, EXF *ep, int force)
if ((sp-db_error = db_close(ep-db)) != 0
!force) {
msgq_str(sp, M_DBERR, frp-name, 241|%s: close);
- TAILQ_NEXT(sp, q) = NULL;
TAILQ_INSERT_HEAD(ep-scrq, sp, eq);
++ep-refcnt;
return (1);
Index: src/external/bsd/nvi/dist/common/gs.c
diff -u src/external/bsd/nvi/dist/common/gs.c:1.3 src/external/bsd/nvi/dist/common/gs.c:1.4
--- src/external/bsd/nvi/dist/common/gs.c:1.3 Mon Nov 25 17:43:46 2013
+++ src/external/bsd/nvi/dist/common/gs.c Sat Nov 30 21:34:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gs.c,v 1.3 2013/11/25 22:43:46 christos Exp $ */
+/* $NetBSD: gs.c,v 1.4 2013/12/01 02:34:54 christos Exp $ */
/*-
* Copyright (c) 2000
* Sven Verdoolaege. All rights reserved.
@@ -112,10 +112,8 @@ win_end(WIN *wp)
(void)file_end(wp-ccl_sp, NULL, 1);
(void)screen_end(wp-ccl_sp);
}
- while ((sp = TAILQ_FIRST(wp-scrq)) != NULL) {
- TAILQ_REMOVE(wp-scrq, sp, q);
+ while ((sp = TAILQ_FIRST(wp-scrq)) != NULL)
(void)screen_end(sp);
- }
/* Free key input queue. */
if (wp-i_event != NULL)
@@ -150,14 +148,10 @@ gs_end(GS *gp)
WIN *wp;
/* If there are any remaining screens, kill them off. */
- while ((wp = TAILQ_FIRST(gp-dq)) != NULL) {
- TAILQ_REMOVE(gp-dq, wp, q);
+ while ((wp = TAILQ_FIRST(gp-dq)) != NULL)
(void)win_end(wp);
- }
- while ((sp = TAILQ_FIRST(gp-hq)) != NULL) {
- TAILQ_REMOVE(gp-hq, sp, q);
+ while ((sp = TAILQ_FIRST(gp-hq)) != NULL)
(void)screen_end(sp);
- }
#ifdef HAVE_PERL_INTERP
perl_end(gp);
Index: src/external/bsd/nvi/dist/common/main.c
diff -u src/external/bsd/nvi/dist/common/main.c:1.4 src/external/bsd/nvi/dist/common/main.c:1.5
--- src/external/bsd/nvi/dist/common/main.c:1.4 Thu Nov 28 18:19:43 2013
+++ src/external/bsd/nvi/dist/common/main.c Sat Nov 30 21:34:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.4 2013/11/28 23:19:43 christos Exp $ */
+/* $NetBSD: main.c,v 1.5 2013/12/01 02:34:54 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -233,14 +233,12 @@ editor(WIN *wp, int argc, char **argv)
*/
if (screen_init(gp, NULL, sp)) {
if (sp != NULL) {
- TAILQ_NEXT(sp, q) = NULL;
TAILQ_INSERT_HEAD(wp-scrq, sp, q);
sp-wp = wp;
}
goto err;
}
F_SET(sp, SC_EX);
- TAILQ_NEXT(sp, q) = NULL;
TAILQ_INSERT_HEAD(wp-scrq, sp, q);
sp-wp = wp;
Index: src/external/bsd/nvi/dist/common/screen.c
diff -u src/external/bsd/nvi/dist/common/screen.c:1.4 src/external/bsd/nvi/dist/common/screen.c:1.5
--- src/external/bsd/nvi/dist/common/screen.c:1.4 Thu Nov 28 18:19:43 2013
+++ src/external/bsd/nvi/dist/common/screen.c Sat Nov 30 21:34:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.c,v 1.4 2013/11/28 23:19:43 christos Exp $ */
+/* $NetBSD: screen.c,v 1.5 2013/12/01 02:34:54 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
* The Regents of the University
CVS commit: src/sys/arch/evbarm/stand/boot2440
Module Name:src Committed By: joerg Date: Sun Dec 1 02:52:53 UTC 2013 Modified Files: src/sys/arch/evbarm/stand/boot2440: main.c Log Message: Inform compiler that the volatile assignment will terminate the function. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/stand/boot2440/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/stand/boot2440/main.c diff -u src/sys/arch/evbarm/stand/boot2440/main.c:1.3 src/sys/arch/evbarm/stand/boot2440/main.c:1.4 --- src/sys/arch/evbarm/stand/boot2440/main.c:1.3 Mon Nov 4 21:54:59 2013 +++ src/sys/arch/evbarm/stand/boot2440/main.c Sun Dec 1 02:52:53 2013 @@ -498,6 +498,7 @@ _rtt() *(volatile uint32_t *)(S3C2440_WDT_BASE + WDT_WTCON) = (0 WTCON_PRESCALE_SHIFT) | WTCON_ENABLE | WTCON_CLKSEL_16 | WTCON_ENRST; + __builtin_unreachable(); } void
CVS commit: src/sys/arch/evbarm/stand/boot2440
Module Name:src
Committed By: joerg
Date: Sun Dec 1 02:53:07 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/boot2440: netif.c
Log Message:
Use format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/stand/boot2440/netif.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/stand/boot2440/netif.c
diff -u src/sys/arch/evbarm/stand/boot2440/netif.c:1.1 src/sys/arch/evbarm/stand/boot2440/netif.c:1.2
--- src/sys/arch/evbarm/stand/boot2440/netif.c:1.1 Mon Jan 30 03:28:34 2012
+++ src/sys/arch/evbarm/stand/boot2440/netif.c Sun Dec 1 02:53:07 2013
@@ -79,10 +79,10 @@ netif_match(unsigned int tag, uint8_t *m
dv = vnifdv[n];
if ((*dv-match)(tag, macaddr) 0) {
nifmatch[n] = 1;
- snprintf(bi_rdev.devname, sizeof(bi_rdev.devname), dv-name);
+ snprintf(bi_rdev.devname, sizeof(bi_rdev.devname), %s, dv-name);
bi_rdev.cookie = tag;
- snprintf(bi_net.devname, sizeof(bi_net.devname), dv-name);
+ snprintf(bi_net.devname, sizeof(bi_net.devname), %s, dv-name);
bi_net.cookie = tag;
memcpy(bi_net.mac_address, macaddr, sizeof(bi_net.mac_address));
break;
@@ -113,10 +113,10 @@ netif_init(unsigned int tag, uint8_t *ma
s-io_netif = dv;
memcpy(s-myea, enaddr, sizeof(s-myea));
- snprintf(bi_rdev.devname, sizeof(bi_rdev.devname), dv-name);
+ snprintf(bi_rdev.devname, sizeof(bi_rdev.devname), %s, dv-name);
bi_rdev.cookie = tag;
- snprintf(bi_net.devname, sizeof(bi_net.devname), dv-name);
+ snprintf(bi_net.devname, sizeof(bi_net.devname), %s, dv-name);
bi_net.cookie = tag;
memcpy(bi_net.mac_address, enaddr, sizeof(bi_net.mac_address));
return 1;
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: joerg
Date: Sun Dec 1 02:54:33 UTC 2013
Modified Files:
src/sys/arch/arm/arm: bcopyinout_xscale.S
src/sys/arch/arm/arm32: cpuswitch.S locore.S
Log Message:
For load/store double, name the second register explicitly.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm/bcopyinout_xscale.S
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/arm/arm32/cpuswitch.S
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/arm32/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/arm/arm/bcopyinout_xscale.S
diff -u src/sys/arch/arm/arm/bcopyinout_xscale.S:1.10 src/sys/arch/arm/arm/bcopyinout_xscale.S:1.11
--- src/sys/arch/arm/arm/bcopyinout_xscale.S:1.10 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/bcopyinout_xscale.S Sun Dec 1 02:54:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout_xscale.S,v 1.10 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: bcopyinout_xscale.S,v 1.11 2013/12/01 02:54:33 joerg Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-RCSID($NetBSD: bcopyinout_xscale.S,v 1.10 2013/08/18 06:28:18 matt Exp $)
+RCSID($NetBSD: bcopyinout_xscale.S,v 1.11 2013/12/01 02:54:33 joerg Exp $)
.text
.align 0
@@ -122,52 +122,52 @@ ENTRY(copyin)
ldrt r7, [r0], #0x04 /* LD:0c-0f */
ldrt r8, [r0], #0x04 /* LD:10-13 */
ldrt r9, [r0], #0x04 /* LD:14-17 */
- strd r4, [r1], #0x08 /* ST:00-07 */
+ strd r4, r5, [r1], #0x08 /* ST:00-07 */
ldrt r4, [r0], #0x04 /* LD:18-1b */
ldrt r5, [r0], #0x04 /* LD:1c-1f */
- strd r6, [r1], #0x08 /* ST:08-0f */
+ strd r6, r7, [r1], #0x08 /* ST:08-0f */
ldrt r6, [r0], #0x04 /* LD:20-23 */
ldrt r7, [r0], #0x04 /* LD:24-27 */
pld [r0, #0x18] /* Prefetch 0x40 */
- strd r8, [r1], #0x08 /* ST:10-17 */
+ strd r8, r9, [r1], #0x08 /* ST:10-17 */
ldrt r8, [r0], #0x04 /* LD:28-2b */
ldrt r9, [r0], #0x04 /* LD:2c-2f */
- strd r4, [r1], #0x08 /* ST:18-1f */
+ strd r4, r5, [r1], #0x08 /* ST:18-1f */
ldrt r4, [r0], #0x04 /* LD:30-33 */
ldrt r5, [r0], #0x04 /* LD:34-37 */
- strd r6, [r1], #0x08 /* ST:20-27 */
+ strd r6, r7, [r1], #0x08 /* ST:20-27 */
ldrt r6, [r0], #0x04 /* LD:38-3b */
ldrt r7, [r0], #0x04 /* LD:3c-3f */
- strd r8, [r1], #0x08 /* ST:28-2f */
+ strd r8, r9, [r1], #0x08 /* ST:28-2f */
ldrt r8, [r0], #0x04 /* LD:40-43 */
ldrt r9, [r0], #0x04 /* LD:44-47 */
pld [r0, #0x18] /* Prefetch 0x60 */
- strd r4, [r1], #0x08 /* ST:30-37 */
+ strd r4, r5, [r1], #0x08 /* ST:30-37 */
ldrt r4, [r0], #0x04 /* LD:48-4b */
ldrt r5, [r0], #0x04 /* LD:4c-4f */
- strd r6, [r1], #0x08 /* ST:38-3f */
+ strd r6, r7, [r1], #0x08 /* ST:38-3f */
ldrt r6, [r0], #0x04 /* LD:50-53 */
ldrt r7, [r0], #0x04 /* LD:54-57 */
- strd r8, [r1], #0x08 /* ST:40-47 */
+ strd r8, r9, [r1], #0x08 /* ST:40-47 */
ldrt r8, [r0], #0x04 /* LD:58-5b */
ldrt r9, [r0], #0x04 /* LD:5c-5f */
- strd r4, [r1], #0x08 /* ST:48-4f */
+ strd r4, r5, [r1], #0x08 /* ST:48-4f */
ldrt r4, [r0], #0x04 /* LD:60-63 */
ldrt r5, [r0], #0x04 /* LD:64-67 */
pld [r0, #0x18] /* Prefetch 0x80 */
- strd r6, [r1], #0x08 /* ST:50-57 */
+ strd r6, r7, [r1], #0x08 /* ST:50-57 */
ldrt r6, [r0], #0x04 /* LD:68-6b */
ldrt r7, [r0], #0x04 /* LD:6c-6f */
- strd r8, [r1], #0x08 /* ST:58-5f */
+ strd r8, r9, [r1], #0x08 /* ST:58-5f */
ldrt r8, [r0], #0x04 /* LD:70-73 */
ldrt r9, [r0], #0x04 /* LD:74-77 */
- strd r4, [r1], #0x08 /* ST:60-67 */
+ strd r4, r5, [r1], #0x08 /* ST:60-67 */
ldrt r4, [r0], #0x04 /* LD:78-7b */
ldrt r5, [r0], #0x04 /* LD:7c-7f */
- strd r6, [r1], #0x08 /* ST:68-6f */
- strd r8, [r1], #0x08 /* ST:70-77 */
+ strd r6, r7, [r1], #0x08 /* ST:68-6f */
+ strd r8, r9, [r1], #0x08 /* ST:70-77 */
subs r2, r2, #0x80
- strd r4, [r1], #0x08 /* ST:78-7f */
+ strd r4, r5, [r1], #0x08 /* ST:78-7f */
bge .Lcopyin_w_loop128
.Lcopyin_w_lessthan128:
@@ -186,13 +186,13 @@ ENTRY(copyin)
ldrt r7, [r0], #0x04
ldrt r8, [r0], #0x04
ldrt r9, [r0], #0x04
- strd r4, [r1], #0x08
+ strd r4, r5, [r1], #0x08
ldrt r4, [r0], #0x04
ldrt r5, [r0], #0x04
- strd r6, [r1], #0x08
- strd r8, [r1], #0x08
+ strd r6, r7, [r1], #0x08
+ strd r8, r9, [r1], #0x08
subs r2, r2, #0x20
- strd r4, [r1], #0x08
+ strd r4, r5, [r1], #0x08
bge .Lcopyin_w_loop32
.Lcopyin_w_lessthan32:
@@ -210,19 +210,19 @@ ENTRY(copyin)
ldrt r4, [r0], #0x04
ldrt r5, [r0], #0x04
nop
- strd r4, [r1], #0x08
+ strd r4, r5, [r1], #0x08
/* At least 16 bytes remaining */
ldrt r4, [r0], #0x04
ldrt r5, [r0], #0x04
nop
- strd r4, [r1], #0x08
+ strd r4, r5, [r1], #0x08
/* At least 8 bytes remaining */
ldrt r4, [r0], #0x04
ldrt r5, [r0], #0x04
nop
- strd r4, [r1], #0x08
+ strd r4, r5, [r1], #0x08
/* Less than 8 bytes remaining */
pop {r4-r9}
@@ -980,52 +980,52 @@ ENTRY(kcopy)
ldr r7, [r0], #0x04 /* LD:0c-0f */
ldr
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: joerg
Date: Sun Dec 1 02:53:46 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: arm11_pmc.c
src/sys/arch/arm/omap: omap2_mputmr.c
Log Message:
Mark unused inline functions as such.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm32/arm11_pmc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/omap2_mputmr.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/arm32/arm11_pmc.c
diff -u src/sys/arch/arm/arm32/arm11_pmc.c:1.3 src/sys/arch/arm/arm32/arm11_pmc.c:1.4
--- src/sys/arch/arm/arm32/arm11_pmc.c:1.3 Thu Jul 3 06:12:02 2008
+++ src/sys/arch/arm/arm32/arm11_pmc.c Sun Dec 1 02:53:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: arm11_pmc.c,v 1.3 2008/07/03 06:12:02 matt Exp $ */
+/* $NetBSD: arm11_pmc.c,v 1.4 2013/12/01 02:53:46 joerg Exp $ */
/* Copyright (c) 2007 Microsoft
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: arm11_pmc.c,v 1.3 2008/07/03 06:12:02 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: arm11_pmc.c,v 1.4 2013/12/01 02:53:46 joerg Exp $);
#include opt_perfctrs.h
#include sys/types.h
#include sys/param.h
@@ -82,7 +82,7 @@ arm11_pmc_ccnt_read(void)
return val;
}
-static inline void
+__unused static inline void
arm11_pmc_ccnt_write(uint32_t val)
{
__asm volatile (mcr p15, 0, %0, c15, c12, 1; :: r (val));
Index: src/sys/arch/arm/omap/omap2_mputmr.c
diff -u src/sys/arch/arm/omap/omap2_mputmr.c:1.7 src/sys/arch/arm/omap/omap2_mputmr.c:1.8
--- src/sys/arch/arm/omap/omap2_mputmr.c:1.7 Sun Jun 16 17:47:54 2013
+++ src/sys/arch/arm/omap/omap2_mputmr.c Sun Dec 1 02:53:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omap2_mputmr.c,v 1.7 2013/06/16 17:47:54 matt Exp $ */
+/* $NetBSD: omap2_mputmr.c,v 1.8 2013/12/01 02:53:46 joerg Exp $ */
/*
* OMAP 2430 GP timers
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: omap2_mputmr.c,v 1.7 2013/06/16 17:47:54 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: omap2_mputmr.c,v 1.8 2013/12/01 02:53:46 joerg Exp $);
#include opt_omap.h
#include opt_cpuoptions.h
@@ -129,7 +129,7 @@ _timer_intr_enb(struct mputmr_softc *sc)
bus_space_write_4(sc-sc_iot, sc-sc_ioh, TIER, TIER_OVF_IT_ENA);
}
-static inline uint32_t
+__unused static inline uint32_t
_timer_intr_sts(struct mputmr_softc *sc)
{
return bus_space_read_4(sc-sc_iot, sc-sc_ioh, TISR);
CVS commit: src/sys/arch/zaurus/stand/zboot
Module Name:src Committed By: joerg Date: Sun Dec 1 02:54:53 UTC 2013 Modified Files: src/sys/arch/zaurus/stand/zboot: unixcons.c Log Message: Use format string. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/stand/zboot/unixcons.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/zaurus/stand/zboot/unixcons.c diff -u src/sys/arch/zaurus/stand/zboot/unixcons.c:1.1 src/sys/arch/zaurus/stand/zboot/unixcons.c:1.2 --- src/sys/arch/zaurus/stand/zboot/unixcons.c:1.1 Mon Mar 2 09:33:02 2009 +++ src/sys/arch/zaurus/stand/zboot/unixcons.c Sun Dec 1 02:54:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: unixcons.c,v 1.1 2009/03/02 09:33:02 nonaka Exp $ */ +/* $NetBSD: unixcons.c,v 1.2 2013/12/01 02:54:53 joerg Exp $ */ /* * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org @@ -175,7 +175,7 @@ awaitkey(int timeout, int tell) for (j = 0; j len; j++) numbuf[len + j] = '\b'; numbuf[len + j] = '\0'; - printf(numbuf); + printf(%s, numbuf); } c = common_getc(infd, 1); if (c == 0)
CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src
Committed By: joerg
Date: Sun Dec 1 02:57:43 UTC 2013
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_core.c
Log Message:
remote_event_destroy is unused, mark it so.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c:1.6 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c:1.7
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c:1.6 Sun Oct 13 07:46:26 2013
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c Sun Dec 1 02:57:43 2013
@@ -387,7 +387,7 @@ remote_event_create(REMOTE_EVENT_T *even
_sema_init(event-event, 0);
}
-static inline void
+__unused static inline void
remote_event_destroy(REMOTE_EVENT_T *event)
{
(void)event;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Dec 1 07:28:48 UTC 2013
Modified Files:
src/sys/dev/usb: ehci.c ohci.c uhci.c
Log Message:
Adjust KASSERT in device_ctrl_done to polling case.
PR/48213: ehci assertion failure during boot
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.244 -r1.245 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.262 -r1.263 src/sys/dev/usb/uhci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.219 src/sys/dev/usb/ehci.c:1.220
--- src/sys/dev/usb/ehci.c:1.219 Tue Nov 26 05:54:43 2013
+++ src/sys/dev/usb/ehci.c Sun Dec 1 07:28:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.219 2013/11/26 05:54:43 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.220 2013/12/01 07:28:47 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.219 2013/11/26 05:54:43 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.220 2013/12/01 07:28:47 skrll Exp $);
#include ohci.h
#include uhci.h
@@ -3296,7 +3296,7 @@ ehci_device_ctrl_done(usbd_xfer_handle x
DPRINTFN(10,(ehci_ctrl_done: xfer=%p\n, xfer));
- KASSERT(mutex_owned(sc-sc_lock));
+ KASSERT(sc-sc_bus.use_polling || mutex_owned(sc-sc_lock));
#ifdef DIAGNOSTIC
if (!(xfer-rqflags URQ_REQUEST)) {
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.244 src/sys/dev/usb/ohci.c:1.245
--- src/sys/dev/usb/ohci.c:1.244 Mon Oct 28 17:40:43 2013
+++ src/sys/dev/usb/ohci.c Sun Dec 1 07:28:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.244 2013/10/28 17:40:43 matt Exp $ */
+/* $NetBSD: ohci.c,v 1.245 2013/12/01 07:28:47 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.244 2013/10/28 17:40:43 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.245 2013/12/01 07:28:47 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1469,7 +1469,7 @@ ohci_device_ctrl_done(usbd_xfer_handle x
DPRINTFN(10,(ohci_device_ctrl_done: xfer=%p\n, xfer));
- KASSERT(mutex_owned(sc-sc_lock));
+ KASSERT(sc-sc_bus.use_polling || mutex_owned(sc-sc_lock));
#ifdef DIAGNOSTIC
if (!(xfer-rqflags URQ_REQUEST)) {
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.262 src/sys/dev/usb/uhci.c:1.263
--- src/sys/dev/usb/uhci.c:1.262 Mon Oct 28 17:40:43 2013
+++ src/sys/dev/usb/uhci.c Sun Dec 1 07:28:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.262 2013/10/28 17:40:43 matt Exp $ */
+/* $NetBSD: uhci.c,v 1.263 2013/12/01 07:28:48 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.262 2013/10/28 17:40:43 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.263 2013/12/01 07:28:48 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -3120,7 +3120,7 @@ uhci_device_ctrl_done(usbd_xfer_handle x
int len = UGETW(xfer-request.wLength);
int isread = (xfer-request.bmRequestType UT_READ);
- KASSERT(mutex_owned(sc-sc_lock));
+ KASSERT(sc-sc_bus.use_polling || mutex_owned(sc-sc_lock));
#ifdef DIAGNOSTIC
if (!(xfer-rqflags URQ_REQUEST))
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Dec 1 07:34:16 UTC 2013
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
In ehci_check_qh_intr don't treat a short control transfer as done if the
status phase is still inflight. Let the hardware complete it.
PR/48358: Repeated low-speed USB control transfers returning short data
fail on EHCI
PR/46696: uhub disables port where USB keyboard attached
To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.220 src/sys/dev/usb/ehci.c:1.221
--- src/sys/dev/usb/ehci.c:1.220 Sun Dec 1 07:28:47 2013
+++ src/sys/dev/usb/ehci.c Sun Dec 1 07:34:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.220 2013/12/01 07:28:47 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.221 2013/12/01 07:34:16 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.220 2013/12/01 07:28:47 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.221 2013/12/01 07:34:16 skrll Exp $);
#include ohci.h
#include uhci.h
@@ -839,9 +839,26 @@ ehci_check_qh_intr(ehci_softc_t *sc, str
/* Any kind of error makes the xfer done. */
if (status EHCI_QTD_HALTED)
goto done;
- /* We want short packets, and it is short: it's done */
- if (EHCI_QTD_GET_BYTES(status) != 0)
+ /* Handle short packets */
+ if (EHCI_QTD_GET_BYTES(status) != 0) {
+usbd_pipe_handle pipe = ex-xfer.pipe;
+usb_endpoint_descriptor_t *ed =
+pipe-endpoint-edesc;
+uint8_t xt = UE_GET_XFERTYPE(ed-bmAttributes);
+
+/*
+ * If we get here for a control transfer then
+ * we need to let the hardware complete the
+ * status phase. That is, we're not done
+ * quite yet.
+ *
+ * Otherwise, we're done.
+ */
+if (xt == UE_CONTROL) {
+ break;
+}
goto done;
+ }
}
DPRINTFN(12, (ehci_check_intr: ex=%p std=%p still active\n,
ex, ex-sqtdstart));
CVS commit: src/distrib/sparc64/instfs
Module Name:src Committed By: nakayama Date: Sat Nov 30 08:19:30 UTC 2013 Modified Files: src/distrib/sparc64/instfs: list Log Message: pppd has moved. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/sparc64/instfs/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src Committed By: nakayama Date: Sat Nov 30 08:27:18 UTC 2013 Modified Files: src/distrib/amiga/miniroot: list src/distrib/emips/miniroot: list src/distrib/hp300/miniroot: list src/distrib/hpcarm/miniroot: list src/distrib/hpcmips/miniroot: list src/distrib/hpcsh/miniroot: list src/distrib/mac68k/miniroot: list src/distrib/mvme68k/miniroot: list src/distrib/ofppc/ramdisks/ramdisk: list src/distrib/pmax/miniroot: list list64 src/distrib/sgimips/miniroot: list src/distrib/sparc/miniroot: list src/distrib/sun2/miniroot: list src/distrib/sun3/miniroot: list src/distrib/vax/miniroot: list Log Message: nvi has moved. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/amiga/miniroot/list cvs rdiff -u -r1.2 -r1.3 src/distrib/emips/miniroot/list cvs rdiff -u -r1.20 -r1.21 src/distrib/hp300/miniroot/list cvs rdiff -u -r1.9 -r1.10 src/distrib/hpcarm/miniroot/list cvs rdiff -u -r1.17 -r1.18 src/distrib/hpcmips/miniroot/list cvs rdiff -u -r1.9 -r1.10 src/distrib/hpcsh/miniroot/list cvs rdiff -u -r1.13 -r1.14 src/distrib/mac68k/miniroot/list cvs rdiff -u -r1.22 -r1.23 src/distrib/mvme68k/miniroot/list cvs rdiff -u -r1.8 -r1.9 src/distrib/ofppc/ramdisks/ramdisk/list cvs rdiff -u -r1.22 -r1.23 src/distrib/pmax/miniroot/list cvs rdiff -u -r1.4 -r1.5 src/distrib/pmax/miniroot/list64 cvs rdiff -u -r1.10 -r1.11 src/distrib/sgimips/miniroot/list cvs rdiff -u -r1.37 -r1.38 src/distrib/sparc/miniroot/list cvs rdiff -u -r1.19 -r1.20 src/distrib/sun2/miniroot/list cvs rdiff -u -r1.28 -r1.29 src/distrib/sun3/miniroot/list cvs rdiff -u -r1.15 -r1.16 src/distrib/vax/miniroot/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sat Nov 30 12:16:14 UTC 2013 Modified Files: src/sys/dev/usb: usbdi.c Log Message: Simplify To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 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.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: skrll Date: Sat Nov 30 13:23:57 UTC 2013 Modified Files: src/distrib/sets/lists/comp: ad.arm Log Message: unwind-arm-common.h is EABI specific. Mark it as such. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/ad.arm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src Committed By: christos Date: Sat Nov 30 14:52:40 UTC 2013 Modified Files: src/external/bsd/nvi/usr.bin/nvi: Makefile Log Message: Don't rebuild the header files all the time if they did not change To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/usr.bin/nvi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nvi/dist/common
Module Name:src Committed By: christos Date: Sat Nov 30 14:54:29 UTC 2013 Modified Files: src/external/bsd/nvi/dist/common: recover.c vi_db1.c Log Message: Fix recovery mode, there were multiple issues: 1. the btree filename was not set so that we always used a transient in-memory db for the data 2. we did not call sync after creation with R_RECNOSYNC so that the header of the btree was never written 3. we did not call the right flavor of sync before copying the tree to the preserved files To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/common/recover.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/common/vi_db1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp/dist/mpn/generic
Module Name:src Committed By: jnemeth Date: Sat Nov 30 19:05:25 UTC 2013 Modified Files: src/external/lgpl3/gmp/dist/mpn/generic: toom_interpolate_7pts.c Log Message: PR/48419 - Henning Petersen -- unbalanced parenthesis To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/lgpl3/gmp/dist/mpn/generic/toom_interpolate_7pts.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Sat Nov 30 19:43:53 UTC 2013 Modified Files: src/sbin/gpt: gpt.8 show.c Log Message: Add two new options: -g which shows the GUID for a partition -i which shows all the gory details for a particular option XXX the output format of -i is subject to change To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sbin/gpt/gpt.8 cvs rdiff -u -r1.11 -r1.12 src/sbin/gpt/show.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Sat Nov 30 20:11:11 UTC 2013 Modified Files: src/sys/arch/arm/include: asm.h Log Message: arm doesn't need to use (PLT) anymore. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Sat Nov 30 20:20:42 UTC 2013 Modified Files: src/common/lib/libc/arch/arm/string: memmove.S src/lib/libc/arch/arm/gen: _setjmp.S setjmp.S sigsetjmp.S swapcontext.S src/lib/libc/arch/arm/sys: __clone.S cerror.S ptrace.S Log Message: Use PLT_SYM. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/string/memmove.S cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/arm/gen/_setjmp.S cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/arm/gen/setjmp.S cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/arm/gen/sigsetjmp.S cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/arm/gen/swapcontext.S cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/arm/sys/__clone.S cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/arm/sys/cerror.S cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/arm/sys/ptrace.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp/dist/mpn/generic
Module Name:src Committed By: martin Date: Sat Nov 30 20:30:22 UTC 2013 Modified Files: src/external/lgpl3/gmp/dist/mpn/generic: divrem_2.c Log Message: Avoid warning on sparc64 To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/lgpl3/gmp/dist/mpn/generic/divrem_2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: joerg Date: Sat Nov 30 20:43:53 UTC 2013 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_add_64.S Log Message: Explicitly name the register pairs. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/common/lib/libc/arch/arm/atomic/atomic_add_64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/compat/arch/arm/gen
Module Name:src Committed By: joerg Date: Sat Nov 30 20:54:14 UTC 2013 Modified Files: src/lib/libc/compat/arch/arm/gen: compat_setjmp.S compat_sigsetjmp.S Log Message: Use PLT_SYM. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: joerg Date: Sat Nov 30 21:07:59 UTC 2013 Modified Files: src/sys/arch/arm/include: profile.h Log Message: Like asm.h r1.25, don't use (PLT) anymore. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/profile.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/arm
Module Name:src Committed By: joerg Date: Sat Nov 30 21:09:11 UTC 2013 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_and_64.S atomic_cas_64.S atomic_dec_64.S atomic_inc_64.S atomic_nand_64.S atomic_or_64.S atomic_swap_64.S atomic_xor_64.S sync_bool_compare_and_swap_8.S sync_fetch_and_add_8.S sync_fetch_and_and_8.S sync_fetch_and_nand_8.S sync_fetch_and_or_8.S sync_fetch_and_sub_8.S sync_fetch_and_xor_8.S src/common/lib/libc/arch/arm/string: memset.S Log Message: Use explicit form of register pair operations by specifying both. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/atomic/atomic_and_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_64.S cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_dec_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/atomic/atomic_nand_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S \ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/arm/string/memset.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/arm/hardfloat
Module Name:src Committed By: joerg Date: Sat Nov 30 22:39:04 UTC 2013 Modified Files: src/lib/libc/arch/arm/hardfloat: fabs.S Log Message: fabsl alias. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/arm/hardfloat/fabs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp/lib/libgmp
Module Name:src Committed By: wiz Date: Sat Nov 30 23:45:05 UTC 2013 Modified Files: src/external/lgpl3/gmp/lib/libgmp: Makefile Log Message: Disable parentheses checks since libgmp doesn't pass them. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/lgpl3/gmp/lib/libgmp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sun Dec 1 00:17:14 UTC 2013 Modified Files: src/share/man/man4: carp.4 ccd.4 cgd.4 md.4 ptm.4 pty.4 raid.4 Log Message: These don't need count anymore. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/carp.4 cvs rdiff -u -r1.29 -r1.30 src/share/man/man4/ccd.4 cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/cgd.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/md.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/ptm.4 cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/pty.4 cvs rdiff -u -r1.36 -r1.37 src/share/man/man4/raid.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: christos Date: Sun Dec 1 00:23:11 UTC 2013 Modified Files: src/include: db.h Log Message: add new internal functions To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/include/db.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/db
Module Name:src Committed By: christos Date: Sun Dec 1 00:22:48 UTC 2013 Modified Files: src/lib/libc/db/btree: bt_open.c bt_overflow.c bt_utils.c src/lib/libc/db/db: Makefile.inc src/lib/libc/db/hash: hash.c hash_page.c src/lib/libc/db/recno: rec_open.c rec_put.c rec_utils.c Added Files: src/lib/libc/db/db: dbfile.c Log Message: - centralize opening of regular and temp files to avoid code duplication - don't cast malloc - use malloc sizeof(*var) instead of sizeof(type) To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/libc/db/btree/bt_open.c cvs rdiff -u -r1.18 -r1.19 src/lib/libc/db/btree/bt_overflow.c cvs rdiff -u -r1.14 -r1.15 src/lib/libc/db/btree/bt_utils.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/db/db/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/db/db/dbfile.c cvs rdiff -u -r1.32 -r1.33 src/lib/libc/db/hash/hash.c cvs rdiff -u -r1.25 -r1.26 src/lib/libc/db/hash/hash_page.c cvs rdiff -u -r1.19 -r1.20 src/lib/libc/db/recno/rec_open.c \ src/lib/libc/db/recno/rec_put.c cvs rdiff -u -r1.12 -r1.13 src/lib/libc/db/recno/rec_utils.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Sun Dec 1 00:59:34 UTC 2013 Modified Files: src/sys/kern: vfs_vnode.c src/sys/sys: vnode.h Log Message: Revert recent vnode changes per PR/48411, I still have deadlocks with build -j 20 on an 8 cpu machine. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/kern/vfs_vnode.c cvs rdiff -u -r1.241 -r1.242 src/sys/sys/vnode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: joerg Date: Sun Dec 1 01:05:17 UTC 2013 Modified Files: src/external/gpl3/gdb/dist/gdb: arm-tdep.c Log Message: One const ought to be enough for every variable. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gdb/dist/gdb/arm-tdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Sun Dec 1 01:05:16 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: fpu.c genassym.cf locore.S machdep.c netbsd32_machdep.c process_machdep.c src/sys/arch/amd64/include: fpu.h pcb.h proc.h types.h src/sys/arch/i386/i386: compat_16_machdep.c genassym.cf locore.S machdep.c process_machdep.c src/sys/arch/i386/include: pcb.h proc.h types.h src/sys/arch/i386/isa: npx.c src/sys/arch/x86/acpi: acpi_wakeup.c src/sys/arch/x86/include: cpu.h intrdefs.h src/sys/arch/x86/x86: cpu.c ipi.c vm_machdep.c src/sys/arch/xen/x86: cpu.c xen_ipi.c src/sys/compat/linux/arch/amd64: linux_machdep.c src/sys/compat/linux/arch/i386: linux_machdep.c src/sys/compat/linux32/arch/amd64: linux32_machdep.c Log Message: revert fpu/pcu changes until we figure out what's wrong; they cause random freezes To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amd64/amd64/fpu.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.74 -r1.75 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.199 -r1.200 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.84 -r1.85 src/sys/arch/amd64/amd64/netbsd32_machdep.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/amd64/process_machdep.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/include/fpu.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amd64/include/pcb.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amd64/include/proc.h cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amd64/include/types.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/i386/compat_16_machdep.c cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.107 -r1.108 src/sys/arch/i386/i386/locore.S cvs rdiff -u -r1.738 -r1.739 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.73 -r1.74 src/sys/arch/i386/i386/process_machdep.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/i386/include/pcb.h cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/include/proc.h cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/include/types.h cvs rdiff -u -r1.145 -r1.146 src/sys/arch/i386/isa/npx.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/acpi/acpi_wakeup.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/include/intrdefs.h cvs rdiff -u -r1.106 -r1.107 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/x86/ipi.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/x86/vm_machdep.c cvs rdiff -u -r1.94 -r1.95 src/sys/arch/xen/x86/cpu.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/x86/xen_ipi.c cvs rdiff -u -r1.42 -r1.43 src/sys/compat/linux/arch/amd64/linux_machdep.c cvs rdiff -u -r1.152 -r1.153 src/sys/compat/linux/arch/i386/linux_machdep.c cvs rdiff -u -r1.32 -r1.33 \ src/sys/compat/linux32/arch/amd64/linux32_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nvi/dist/common
Module Name:src Committed By: christos Date: Sun Dec 1 02:21:58 UTC 2013 Modified Files: src/external/bsd/nvi/dist/common: vi_db1.c Log Message: fix indentantion To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/common/vi_db1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nvi/dist
Module Name:src Committed By: christos Date: Sun Dec 1 02:34:54 UTC 2013 Modified Files: src/external/bsd/nvi/dist/common: exf.c gs.c main.c screen.c src/external/bsd/nvi/dist/ex: ex_edit.c ex_tag.c src/external/bsd/nvi/dist/vi: v_ex.c vi.c vs_msg.c vs_refresh.c vs_split.c Log Message: Revert all previous TAILQ_NEXT() = NULL, changes, checks against NULL vip's and removal of screens from queues. Instead introduce a new screen_end1() function that can be used to clean screens that are not associated with queues yet. Pointed out by chuq@ To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nvi/dist/common/exf.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/common/gs.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/common/main.c \ src/external/bsd/nvi/dist/common/screen.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/ex/ex_edit.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/nvi/dist/ex/ex_tag.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nvi/dist/vi/v_ex.c \ src/external/bsd/nvi/dist/vi/vi.c src/external/bsd/nvi/dist/vi/vs_msg.c \ src/external/bsd/nvi/dist/vi/vs_refresh.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/vi/vs_split.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/stand/boot2440
Module Name:src Committed By: joerg Date: Sun Dec 1 02:53:07 UTC 2013 Modified Files: src/sys/arch/evbarm/stand/boot2440: netif.c Log Message: Use format strings. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/stand/boot2440/netif.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm
Module Name:src Committed By: joerg Date: Sun Dec 1 02:54:33 UTC 2013 Modified Files: src/sys/arch/arm/arm: bcopyinout_xscale.S src/sys/arch/arm/arm32: cpuswitch.S locore.S Log Message: For load/store double, name the second register explicitly. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm/bcopyinout_xscale.S cvs rdiff -u -r1.79 -r1.80 src/sys/arch/arm/arm32/cpuswitch.S cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/arm32/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm
Module Name:src Committed By: joerg Date: Sun Dec 1 02:53:46 UTC 2013 Modified Files: src/sys/arch/arm/arm32: arm11_pmc.c src/sys/arch/arm/omap: omap2_mputmr.c Log Message: Mark unused inline functions as such. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm32/arm11_pmc.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/omap2_mputmr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/zaurus/stand/zboot
Module Name:src Committed By: joerg Date: Sun Dec 1 02:54:53 UTC 2013 Modified Files: src/sys/arch/zaurus/stand/zboot: unixcons.c Log Message: Use format string. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/stand/zboot/unixcons.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src Committed By: joerg Date: Sun Dec 1 02:57:43 UTC 2013 Modified Files: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_core.c Log Message: remote_event_destroy is unused, mark it so. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Dec 1 07:28:48 UTC 2013 Modified Files: src/sys/dev/usb: ehci.c ohci.c uhci.c Log Message: Adjust KASSERT in device_ctrl_done to polling case. PR/48213: ehci assertion failure during boot To generate a diff of this commit: cvs rdiff -u -r1.219 -r1.220 src/sys/dev/usb/ehci.c cvs rdiff -u -r1.244 -r1.245 src/sys/dev/usb/ohci.c cvs rdiff -u -r1.262 -r1.263 src/sys/dev/usb/uhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Dec 1 07:34:16 UTC 2013 Modified Files: src/sys/dev/usb: ehci.c Log Message: In ehci_check_qh_intr don't treat a short control transfer as done if the status phase is still inflight. Let the hardware complete it. PR/48358: Repeated low-speed USB control transfers returning short data fail on EHCI PR/46696: uhub disables port where USB keyboard attached To generate a diff of this commit: cvs rdiff -u -r1.220 -r1.221 src/sys/dev/usb/ehci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
