CVS commit: src/sys/arch/mvme68k/stand/sboot
Module Name:src Committed By: he Date: Thu Sep 29 09:18:17 UTC 2011 Modified Files: src/sys/arch/mvme68k/stand/sboot: etherfun.c Log Message: Drop the static from the HEXDIGITS declaration, now that there's an extern definition in sys/systm.h, to allow this to continue to build. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mvme68k/stand/sboot/etherfun.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/mvme68k/stand/sboot/etherfun.c diff -u src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.11 src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.12 --- src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.11 Fri Feb 25 00:17:35 2011 +++ src/sys/arch/mvme68k/stand/sboot/etherfun.c Thu Sep 29 09:18:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: etherfun.c,v 1.11 2011/02/25 00:17:35 joerg Exp $ */ +/* $NetBSD: etherfun.c,v 1.12 2011/09/29 09:18:17 he Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor and Seth Widoff @@ -90,7 +90,7 @@ rev_arp(void) /* Send a tftp read request or acknowledgement mesgtype 0 is a read request, 1 is an aknowledgement */ -static const char HEXDIGITS[16] = 0123456789ABCDEF; +const char HEXDIGITS[16] = 0123456789ABCDEF; void do_send_tftp(int mesgtype)
CVS commit: src/external/mit/xorg/share/cf
Module Name:src
Committed By: dholland
Date: Thu Sep 29 09:44:09 UTC 2011
Modified Files:
src/external/mit/xorg/share/cf: Makefile
Log Message:
Fix generation of site.def to substitute @FONTROOTDIR@ and @ENCODINGSDIR@
instead of emitting them unchanged into the imake templates. Should fix
build of x3270.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/share/cf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/share/cf/Makefile
diff -u src/external/mit/xorg/share/cf/Makefile:1.8 src/external/mit/xorg/share/cf/Makefile:1.9
--- src/external/mit/xorg/share/cf/Makefile:1.8 Sat Nov 27 22:21:27 2010
+++ src/external/mit/xorg/share/cf/Makefile Thu Sep 29 09:44:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/27 22:21:27 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2011/09/29 09:44:08 dholland Exp $
.include bsd.own.mk
@@ -38,7 +38,10 @@ CLEANFILES+= netbsd.site.def
netbsd.site.def: site.def.in
${_MKTARGET_CREATE}
- ${TOOL_SED} -e 's,@prefix@,${X11ROOTDIR},' ${.ALLSRC} ${.TARGET}
+ ${TOOL_SED} -e 's,@prefix@,${X11ROOTDIR},' ${.ALLSRC} |\
+ ${TOOL_SED} -e 's,@FONTROOTDIR@,${X11ROOTDIR}/share/fonts/X11,' |\
+ ${TOOL_SED} -e 's,@ENCODINGSDIR@,\$${FONTROOTDIR}/encodings,' \
+ ${.TARGET}
realall: netbsd.site.def
.include bsd.prog.mk
CVS commit: src/share/mk
Module Name:src
Committed By: dholland
Date: Thu Sep 29 10:59:26 UTC 2011
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
Fix the setting of xcbincludedir in .pc files (where the xcb XML
files live) so that anything that needs to find them can. Fixes build
of pkgsrc libxcb, not that that in particular is terribly important.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.103 src/share/mk/bsd.x11.mk:1.104
--- src/share/mk/bsd.x11.mk:1.103 Sat Sep 10 16:57:35 2011
+++ src/share/mk/bsd.x11.mk Thu Sep 29 10:59:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.103 2011/09/10 16:57:35 apb Exp $
+# $NetBSD: bsd.x11.mk,v 1.104 2011/09/29 10:59:26 dholland Exp $
.include bsd.init.mk
@@ -286,7 +286,7 @@ pkgconfig-install: ${_PKGDEST.${_pkg}}
s,@LIBZ@,-lz,; \
s,@LIBBZ2@,-lbz2,; \
s,@xkb_base@,\\$$\{libdir\}/X11/xkb,; \
- s,@xcbincludedir@,\\$$\{prefix\}/include/xcb,; \
+ s,@xcbincludedir@,\\$$\{prefix\}/share/xcb,; \
s,@fontrootdir@,\\$$\{libdir\}/X11/fonts,; \
s,@LIBXML2_LIBS@,,; \
s,@ICONV_LIBS@,,; \
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: is
Date: Thu Sep 29 12:51:28 UTC 2011
Modified Files:
src/sys/dev/pci: aac_pci.c
Log Message:
Use symbolic constants for SUNs version of ADP2_ASR2200S.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/aac_pci.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/pci/aac_pci.c
diff -u src/sys/dev/pci/aac_pci.c:1.32 src/sys/dev/pci/aac_pci.c:1.33
--- src/sys/dev/pci/aac_pci.c:1.32 Fri Feb 18 22:54:27 2011
+++ src/sys/dev/pci/aac_pci.c Thu Sep 29 12:51:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.32 2011/02/18 22:54:27 jmcneill Exp $ */
+/* $NetBSD: aac_pci.c,v 1.33 2011/09/29 12:51:28 is Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aac_pci.c,v 1.32 2011/02/18 22:54:27 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: aac_pci.c,v 1.33 2011/09/29 12:51:28 is Exp $);
#include sys/param.h
#include sys/systm.h
@@ -406,10 +406,11 @@ static struct aac_ident {
0,
HP NetRAID-4M
},
- { 0x9005,
- 0x0285,
- 0x108e,
- 0x286,
+ {
+ PCI_VENDOR_ADP2,
+ PCI_PRODUCT_ADP2_ASR2200S,
+ PCI_VENDOR_SUN,
+ PCI_PRODUCT_ADP2_ASR2120S,
AAC_HWIF_I960RX,
0,
SG-XPCIESAS-R-IN
CVS commit: src
Module Name:src Committed By: sjg Date: Thu Sep 29 17:40:19 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.evbppc mi src/sys/modules: Makefile Log Message: Add filemon to the modules we build. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/modules/md.evbppc cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.92 -r1.93 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.evbppc diff -u src/distrib/sets/lists/modules/md.evbppc:1.10 src/distrib/sets/lists/modules/md.evbppc:1.11 --- src/distrib/sets/lists/modules/md.evbppc:1.10 Wed Aug 31 13:25:49 2011 +++ src/distrib/sets/lists/modules/md.evbppc Thu Sep 29 17:40:19 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.10 2011/08/31 13:25:49 mbalmer Exp $ +# $NetBSD: md.evbppc,v 1.11 2011/09/29 17:40:19 sjg Exp $ ./stand/powerpc-4xx base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod @@ -50,6 +50,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/ffs/ffs.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/filecorebase-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/filecore/filecore.kmod base-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/filemonbase-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/filemon/filemon.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/flashbase-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/flash/flash.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/fssbase-kernel-modules kmod @@ -207,6 +209,8 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/ffs/ffs.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/filecorebase-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/filecore/filecore.kmod base-kernel-modules kmod +./stand/powerpc-booke/@OSRELEASE@/modules/filemonbase-kernel-modules kmod +./stand/powerpc-booke/@OSRELEASE@/modules/filemon/filemon.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/flashbase-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/flash/flash.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/fssbase-kernel-modules kmod Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.32 src/distrib/sets/lists/modules/mi:1.33 --- src/distrib/sets/lists/modules/mi:1.32 Wed Aug 31 13:25:49 2011 +++ src/distrib/sets/lists/modules/mi Thu Sep 29 17:40:19 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.32 2011/08/31 13:25:49 mbalmer Exp $ +# $NetBSD: mi,v 1.33 2011/09/29 17:40:19 sjg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -57,6 +57,8 @@ ./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules kmod ./@MODULEDIR@/filecorebase-kernel-modules kmod ./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules kmod +./@MODULEDIR@/filemonbase-kernel-modules kmod +./@MODULEDIR@/filemon/filemon.kmod base-kernel-modules kmod ./@MODULEDIR@/flashbase-kernel-modules kmod ./@MODULEDIR@/flash/flash.kmod base-kernel-modules kmod ./@MODULEDIR@/fssbase-kernel-modules kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.92 src/sys/modules/Makefile:1.93 --- src/sys/modules/Makefile:1.92 Wed Aug 31 13:25:50 2011 +++ src/sys/modules/Makefile Thu Sep 29 17:40:19 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2011/08/31 13:25:50 mbalmer Exp $ +# $NetBSD: Makefile,v 1.93 2011/09/29 17:40:19 sjg Exp $ .include bsd.own.mk @@ -21,6 +21,7 @@ SUBDIR+= exec_script SUBDIR+= fdesc SUBDIR+= ffs SUBDIR+= filecore +SUBDIR+= filemon SUBDIR+= flash SUBDIR+= fss SUBDIR+= gpio
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: christos
Date: Thu Sep 29 20:50:09 UTC 2011
Modified Files:
src/sys/lib/libkern: kern_assert.c libkern.h
Log Message:
Don't include sys/systm.h because it brings in too much stuff that
conflicts with standalone code. Instead modify kern_assert() to be like
panic() and call that.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libkern/kern_assert.c
cvs rdiff -u -r1.101 -r1.102 src/sys/lib/libkern/libkern.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/lib/libkern/kern_assert.c
diff -u src/sys/lib/libkern/kern_assert.c:1.1 src/sys/lib/libkern/kern_assert.c:1.2
--- src/sys/lib/libkern/kern_assert.c:1.1 Tue Jan 19 17:28:30 2010
+++ src/sys/lib/libkern/kern_assert.c Thu Sep 29 16:50:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_assert.c,v 1.1 2010/01/19 22:28:30 pooka Exp $ */
+/* $NetBSD: kern_assert.c,v 1.2 2011/09/29 20:50:09 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -39,14 +39,14 @@
#endif
void
-kern_assert(const char *t, const char *f, int l, const char *e)
+kern_assert(const char *fmt, ...)
{
-
+ va_list ap;
#ifdef _KERNEL
if (panicstr != NULL)
return;
#endif
-
- panic(kernel %sassertion \%s\ failed: file \%s\, line %d,
- t, e, f, l);
+ va_start(ap, fmt);
+ vpanic(fmt, ap);
+ va_end(ap);
}
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.101 src/sys/lib/libkern/libkern.h:1.102
--- src/sys/lib/libkern/libkern.h:1.101 Mon Sep 26 21:02:39 2011
+++ src/sys/lib/libkern/libkern.h Thu Sep 29 16:50:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.101 2011/09/27 01:02:39 jym Exp $ */
+/* $NetBSD: libkern.h,v 1.102 2011/09/29 20:50:09 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,6 @@
#include sys/types.h
#include sys/inttypes.h
#include sys/null.h
-#include sys/systm.h
#ifndef LIBKERN_INLINE
#define LIBKERN_INLINE static __inline
@@ -181,7 +180,7 @@ tolower(int ch)
#define assert(e) ((void)0)
#else
#define assert(e) (__predict_true((e)) ? (void)0 : \
- panic(__KASSERTSTR, , #e, __FILE__, __LINE__))
+ kern_assert(__KASSERTSTR, , #e, __FILE__, __LINE__))
#endif
#ifdef __COVERITY__
@@ -205,11 +204,11 @@ tolower(int ch)
#define _DIAGASSERT(a) assert(a)
#define KASSERTMSG(e, msg, ...) \
(__predict_true((e)) ? (void)0 : \
- panic(__KASSERTSTR msg, diagnostic , #e, \
+ kern_assert(__KASSERTSTR msg, diagnostic , #e, \
__FILE__, __LINE__, ## __VA_ARGS__))
#define KASSERT(e) (__predict_true((e)) ? (void)0 : \
- panic(__KASSERTSTR, diagnostic , #e, \
+ kern_assert(__KASSERTSTR, diagnostic , #e, \
__FILE__, __LINE__))
#endif
@@ -224,11 +223,11 @@ tolower(int ch)
#else
#define KDASSERTMSG(e, msg, ...) \
(__predict_true((e)) ? (void)0 : \
- panic(__KASSERTSTR msg, debugging , #e, \
+ kern_assert(__KASSERTSTR msg, debugging , #e, \
__FILE__, __LINE__, ## __VA_ARGS__))
#define KDASSERT(e) (__predict_true((e)) ? (void)0 : \
- panic(__KASSERTSTR, debugging , #e, \
+ kern_assert(__KASSERTSTR, debugging , #e, \
__FILE__, __LINE__))
#endif
@@ -300,7 +299,8 @@ int ffs(int);
#define ffs(x) __builtin_ffs(x)
#endif
-void kern_assert(const char *, const char *, int, const char *);
+void kern_assert(const char *, ...)
+__attribute__((__format__(__printf__, 1, 2)));
unsigned int
bcdtobin(unsigned int);
unsigned int
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Sep 29 20:51:39 UTC 2011
Modified Files:
src/sys/kern: vfs_vnode.c
Log Message:
rename vpanic() to vnpanic() and make it varyadic. While there, fix the
broken formats, always call panic() from vnpanic() and make all the calls
use vnpanic(). We only call vprint() on DIAGNOSTIC now.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/vfs_vnode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.10 src/sys/kern/vfs_vnode.c:1.11
--- src/sys/kern/vfs_vnode.c:1.10 Thu Sep 1 05:04:08 2011
+++ src/sys/kern/vfs_vnode.c Thu Sep 29 16:51:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.10 2011/09/01 09:04:08 christos Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.11 2011/09/29 20:51:38 christos Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -121,7 +121,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.10 2011/09/01 09:04:08 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.11 2011/09/29 20:51:38 christos Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -162,7 +162,8 @@ static int vrele_gen __cacheline_align
static vnode_t * getcleanvnode(void);
static void vrele_thread(void *);
-static void vpanic(vnode_t *, const char *);
+static void vnpanic(vnode_t *, const char *, ...)
+__attribute__((__format__(__printf__, 2, 3)));
/* Routines having to do with the management of the vnode table. */
extern int (**dead_vnodeop_p)(void *);
@@ -657,7 +658,7 @@ vrelel(vnode_t *vp, int flags)
if (__predict_false(vp-v_op == dead_vnodeop_p
(vp-v_iflag (VI_CLEAN|VI_XLOCK)) == 0)) {
- vpanic(vp, dead but not clean);
+ vnpanic(vp, dead but not clean);
}
/*
@@ -670,7 +671,7 @@ vrelel(vnode_t *vp, int flags)
return;
}
if (vp-v_usecount = 0 || vp-v_writecount != 0) {
- vpanic(vp, vrelel: bad ref count);
+ vnpanic(vp, %s: bad ref count, __func__);
}
KASSERT((vp-v_iflag VI_XLOCK) == 0);
@@ -702,7 +703,8 @@ retry:
error = vn_lock(vp, LK_EXCLUSIVE);
if (error != 0) {
/* XXX */
-vpanic(vp, vrele: unable to lock %p);
+vnpanic(vp, %s: unable to lock %p,
+__func__, vp);
}
defer = false;
} else if ((vp-v_iflag VI_LAYER) != 0) {
@@ -953,7 +955,7 @@ holdrelel(vnode_t *vp)
KASSERT((vp-v_iflag VI_MARKER) == 0);
if (vp-v_holdcnt = 0) {
- vpanic(vp, holdrelel: holdcnt vp %p);
+ vnpanic(vp, %s: holdcnt vp %p, __func__, vp);
}
vp-v_holdcnt--;
@@ -1043,7 +1045,7 @@ vclean(vnode_t *vp, int flags)
/* Disassociate the underlying file system from the vnode. */
if (VOP_RECLAIM(vp)) {
- vpanic(vp, vclean: cannot reclaim);
+ vnpanic(vp, %s: cannot reclaim, __func__);
}
KASSERT(vp-v_data == NULL);
@@ -1179,7 +1181,7 @@ vwakeup(struct buf *bp)
KASSERT(mutex_owned(bp-b_objlock));
if (--vp-v_numoutput 0)
- panic(vwakeup: neg numoutput, vp %p, vp);
+ vnpanic(vp, %s: neg numoutput, vp %p, __func__, vp);
if (vp-v_numoutput == 0)
cv_broadcast(vp-v_cv);
}
@@ -1217,11 +1219,14 @@ vfs_drainvnodes(long target)
}
void
-vpanic(vnode_t *vp, const char *msg)
+vnpanic(vnode_t *vp, const char *fmt, ...)
{
-#ifdef DIAGNOSTIC
+ va_list ap;
+#ifdef DIAGNOSTIC
vprint(NULL, vp);
- panic(%s\n, msg);
#endif
+ va_start(ap, fmt);
+ vpanic(fmt, ap);
+ va_end(ap);
}
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Thu Sep 29 20:52:12 UTC 2011 Modified Files: src/sys/sys: systm.h Log Message: - add missing attributes to varyadic print functions - add vpanic() To generate a diff of this commit: cvs rdiff -u -r1.248 -r1.249 src/sys/sys/systm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/systm.h diff -u src/sys/sys/systm.h:1.248 src/sys/sys/systm.h:1.249 --- src/sys/sys/systm.h:1.248 Sun Jul 17 16:54:54 2011 +++ src/sys/sys/systm.h Thu Sep 29 16:52:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: systm.h,v 1.248 2011/07/17 20:54:54 joerg Exp $ */ +/* $NetBSD: systm.h,v 1.249 2011/09/29 20:52:12 christos Exp $ */ /*- * Copyright (c) 1982, 1988, 1991, 1993 @@ -226,13 +226,22 @@ void printf_nolog(const char *, ...) void printf(const char *, ...) __attribute__((__format__(__printf__,1,2))); + int sprintf(char *, const char *, ...) __attribute__((__format__(__printf__,2,3))); + int snprintf(char *, size_t, const char *, ...) __attribute__((__format__(__printf__,3,4))); -void vprintf(const char *, va_list); -int vsprintf(char *, const char *, va_list); -int vsnprintf(char *, size_t, const char *, va_list); + +void vprintf(const char *, va_list) +__attribute__((__format__(__printf__,1,0))); + +int vsprintf(char *, const char *, va_list) +__attribute__((__format__(__printf__,2,0))); + +int vsnprintf(char *, size_t, const char *, va_list) +__attribute__((__format__(__printf__,3,0))); + int humanize_number(char *, size_t, uint64_t, const char *, int); void twiddle(void); @@ -241,6 +250,8 @@ void banner(void); void panic(const char *, ...) __dead __attribute__((__format__(__printf__,1,2))); +void vpanic(const char *, va_list) +__dead __attribute__((__format__(__printf__,1,0))); void uprintf(const char *, ...) __attribute__((__format__(__printf__,1,2))); void uprintf_locked(const char *, ...)
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Sep 29 20:52:39 UTC 2011
Modified Files:
src/sys/kern: subr_prf.c
Log Message:
Add vpanic()
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/kern/subr_prf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.142 src/sys/kern/subr_prf.c:1.143
--- src/sys/kern/subr_prf.c:1.142 Thu Sep 8 14:15:56 2011
+++ src/sys/kern/subr_prf.c Thu Sep 29 16:52:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.142 2011/09/08 18:15:56 jym Exp $ */
+/* $NetBSD: subr_prf.c,v 1.143 2011/09/29 20:52:39 christos Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_prf.c,v 1.142 2011/09/08 18:15:56 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_prf.c,v 1.143 2011/09/29 20:52:39 christos Exp $);
#include opt_ddb.h
#include opt_ipkdb.h
@@ -199,10 +199,19 @@ twiddle(void)
void
panic(const char *fmt, ...)
{
+ va_list ap;
+
+ va_start(ap, fmt);
+ vpanic(fmt, ap);
+ va_end(ap);
+}
+
+void
+vpanic(const char *fmt, va_list ap)
+{
CPU_INFO_ITERATOR cii;
struct cpu_info *ci, *oci;
int bootopt;
- va_list ap;
static char scratchstr[256]; /* stores panic message */
spldebug_stop();
@@ -253,15 +262,12 @@ panic(const char *fmt, ...)
/* first time in panic - store fmt first for precaution */
panicstr = fmt;
- va_start(ap, fmt);
vsnprintf(scratchstr, sizeof(scratchstr), fmt, ap);
printf(%s, scratchstr);
panicstr = scratchstr;
} else {
- va_start(ap, fmt);
vprintf(fmt, ap);
}
- va_end(ap);
printf(\n);
if (msgbufenabled msgbufp-msg_magic == MSG_MAGIC)
CVS commit: src/common/lib/libppath
Module Name:src Committed By: christos Date: Thu Sep 29 20:53:30 UTC 2011 Modified Files: src/common/lib/libppath: ppath.c Log Message: Include sys/systm.h for panic() To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libppath/ppath.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libppath/ppath.c diff -u src/common/lib/libppath/ppath.c:1.1 src/common/lib/libppath/ppath.c:1.2 --- src/common/lib/libppath/ppath.c:1.1 Thu Aug 25 10:55:36 2011 +++ src/common/lib/libppath/ppath.c Thu Sep 29 16:53:30 2011 @@ -1,5 +1,5 @@ -/* $NetBSD: ppath.c,v 1.1 2011/08/25 14:55:36 dyoung Exp $ */ -/* $Id: ppath.c,v 1.1 2011/08/25 14:55:36 dyoung Exp $ */ +/* $NetBSD: ppath.c,v 1.2 2011/09/29 20:53:30 christos Exp $ */ +/* $Id: ppath.c,v 1.2 2011/09/29 20:53:30 christos Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -30,8 +30,9 @@ */ #include sys/cdefs.h -__RCSID($Id: ppath.c,v 1.1 2011/08/25 14:55:36 dyoung Exp $); +__RCSID($Id: ppath.c,v 1.2 2011/09/29 20:53:30 christos Exp $); +#include sys/systm.h #include ppath/ppath.h #include ppath/ppath_impl.h
CVS commit: src/share/man/man9
Module Name:src Committed By: christos Date: Thu Sep 29 20:55:49 UTC 2011 Modified Files: src/share/man/man9: Makefile panic.9 Log Message: add vpanic To generate a diff of this commit: cvs rdiff -u -r1.351 -r1.352 src/share/man/man9/Makefile cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/panic.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.351 src/share/man/man9/Makefile:1.352 --- src/share/man/man9/Makefile:1.351 Wed Sep 28 06:55:48 2011 +++ src/share/man/man9/Makefile Thu Sep 29 16:55:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.351 2011/09/28 10:55:48 jruoho Exp $ +# $NetBSD: Makefile,v 1.352 2011/09/29 20:55:49 christos Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -53,7 +53,7 @@ MAN= accept_filter.9 accf_data.9 accf_ht uiomove.9 ucom.9 userret.9 \ vattr.9 veriexec.9 vcons.9 vfs.9 vfs_hooks.9 vfsops.9 vfssubr.9 \ video.9 vme.9 \ - vnfileops.9 vnode.9 vnodeops.9 vnsubr.9 \ + vnfileops.9 vnode.9 vnodeops.9 vnsubr.9 vpanic.9 \ ubc.9 usbdi.9 uvm.9 uvm_km.9 uvm_map.9 vmem.9 \ wdc.9 workqueue.9 \ wscons.9 wsdisplay.9 wsfont.9 wskbd.9 wsmouse.9 \ @@ -941,6 +941,7 @@ MLINKS+=wsmouse.9 wsmouse_input.9 \ MLINKS+=xcall.9 xc_broadcast.9 \ xcall.9 xc_unicast.9 \ xcall.9 xc_wait.9 +MLINKS+=panic.9 vpanic.9 SUBDIR= man9.i386 man9.sun3 man9.x86 Index: src/share/man/man9/panic.9 diff -u src/share/man/man9/panic.9:1.19 src/share/man/man9/panic.9:1.20 --- src/share/man/man9/panic.9:1.19 Mon Nov 30 20:33:25 2009 +++ src/share/man/man9/panic.9 Thu Sep 29 16:55:49 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: panic.9,v 1.19 2009/12/01 01:33:25 explorer Exp $ +.\ $NetBSD: panic.9,v 1.20 2011/09/29 20:55:49 christos Exp $ .\ .\ Copyright (c) 1996 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 12, 2009 +.Dd September 29, 2011 .Dt PANIC 9 .Os .Sh NAME @@ -37,11 +37,15 @@ .In sys/types.h .In sys/systm.h .Ft void +.Fn vpanic const char *fmt va_list ap +.Ft void .Fn panic const char *fmt ... .Sh DESCRIPTION The .Fn panic -function terminates the +and +.Fn vpanic +functions terminate the .Nx system. The message
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Thu Sep 29 20:59:28 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: add vpanic(9) To generate a diff of this commit: cvs rdiff -u -r1.1681 -r1.1682 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1681 src/distrib/sets/lists/comp/mi:1.1682 --- src/distrib/sets/lists/comp/mi:1.1681 Wed Sep 28 06:55:46 2011 +++ src/distrib/sets/lists/comp/mi Thu Sep 29 16:59:27 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1681 2011/09/28 10:55:46 jruoho Exp $ +# $NetBSD: mi,v 1.1682 2011/09/29 20:59:27 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -10770,6 +10770,7 @@ ./usr/share/man/cat9/vnodeops.0 comp-sys-catman .cat ./usr/share/man/cat9/vnsubr.0 comp-sys-catman .cat ./usr/share/man/cat9/voidop.0 comp-sys-catman .cat +./usr/share/man/cat9/vpanic.0 comp-sys-catman .cat ./usr/share/man/cat9/vprint.0 comp-sys-catman .cat ./usr/share/man/cat9/vprintf.0 comp-sys-catman .cat ./usr/share/man/cat9/vput.0 comp-sys-catman .cat @@ -16791,6 +16792,7 @@ ./usr/share/man/html9/vnodeops.html comp-sys-htmlman html ./usr/share/man/html9/vnsubr.html comp-sys-htmlman html ./usr/share/man/html9/voidop.html comp-sys-htmlman html +./usr/share/man/html9/vpanic.html comp-sys-htmlman html ./usr/share/man/html9/vprint.html comp-sys-htmlman html ./usr/share/man/html9/vprintf.html comp-sys-htmlman html ./usr/share/man/html9/vput.html comp-sys-htmlman html @@ -23065,6 +23067,7 @@ ./usr/share/man/man9/vnodeops.9 comp-sys-man .man ./usr/share/man/man9/vnsubr.9 comp-sys-man .man ./usr/share/man/man9/voidop.9 comp-sys-man .man +./usr/share/man/man9/vpanic.9 comp-sys-man .man ./usr/share/man/man9/vprint.9 comp-sys-man .man ./usr/share/man/man9/vprintf.9 comp-sys-man .man ./usr/share/man/man9/vput.9 comp-sys-man .man
CVS commit: src/lib/libc/arch/x86_64/gen
Module Name:src Committed By: christos Date: Thu Sep 29 22:45:21 UTC 2011 Modified Files: src/lib/libc/arch/x86_64/gen: flt_rounds.S Log Message: add a simpler version. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/x86_64/gen/flt_rounds.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/x86_64/gen/flt_rounds.S diff -u src/lib/libc/arch/x86_64/gen/flt_rounds.S:1.3 src/lib/libc/arch/x86_64/gen/flt_rounds.S:1.4 --- src/lib/libc/arch/x86_64/gen/flt_rounds.S:1.3 Wed Sep 28 11:11:42 2011 +++ src/lib/libc/arch/x86_64/gen/flt_rounds.S Thu Sep 29 18:45:20 2011 @@ -1,29 +1,20 @@ -/* $NetBSD: flt_rounds.S,v 1.3 2011/09/28 15:11:42 christos Exp $ */ - -/* - * Written by J.T. Conklin, Apr 4, 1995 - * Public domain. - */ +/* $NetBSD: flt_rounds.S,v 1.4 2011/09/29 22:45:20 christos Exp $ */ #include machine/asm.h +/* + * 00 0 round to zero + * 01 1 round to nearest + * 10 2 round to positive infinity + * 11 3 round to negative infinity + */ .text _ALIGN_TEXT -_map: - .byte 1 /* round to nearest */ - .byte 3 /* round to negative infinity */ - .byte 2 /* round to positive infinity */ - .byte 0 /* round to zero */ - ENTRY(__flt_rounds) - fnstcw -4(%rsp) - movl -4(%rsp),%eax - shrl $10,%eax - andl $3,%eax -#ifdef PIC - leaq _map(%rip),%rcx - movb (%rcx,%rax,1),%al -#else - movb _map(,%rax,1),%al -#endif + fnstcw -4(%rsp) + movl -4(%rsp), %ecx + shrl $9, %ecx + andl $6, %ecx + xorl $1, %eax /* map 0,1,2,3 - 1,0,3,2 */ + andl $3, %eax ret
CVS commit: src/lib/libc/arch/i386/gen
Module Name:src Committed By: christos Date: Thu Sep 29 22:46:00 UTC 2011 Modified Files: src/lib/libc/arch/i386/gen: flt_rounds.S Log Message: add a simpler version To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/i386/gen/flt_rounds.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/i386/gen/flt_rounds.S diff -u src/lib/libc/arch/i386/gen/flt_rounds.S:1.6 src/lib/libc/arch/i386/gen/flt_rounds.S:1.7 --- src/lib/libc/arch/i386/gen/flt_rounds.S:1.6 Mon Aug 23 04:45:09 1999 +++ src/lib/libc/arch/i386/gen/flt_rounds.S Thu Sep 29 18:46:00 2011 @@ -1,33 +1,20 @@ -/* $NetBSD: flt_rounds.S,v 1.6 1999/08/23 08:45:09 kleink Exp $ */ - -/* - * Written by J.T. Conklin, Apr 4, 1995 - * Public domain. - */ +/* $NetBSD: flt_rounds.S,v 1.7 2011/09/29 22:46:00 christos Exp $ */ #include machine/asm.h +/* + * 00 0 round to zero + * 01 1 round to nearest + * 10 2 round to positive infinity + * 11 3 round to negative infinity + */ .text _ALIGN_TEXT -_map: - .byte 1 /* round to nearest */ - .byte 3 /* round to negative infinity */ - .byte 2 /* round to positive infinity */ - .byte 0 /* round to zero */ - ENTRY(__flt_rounds) - subl $4,%esp - fnstcw (%esp) - movl (%esp),%eax - shrl $10,%eax - andl $3,%eax -#ifdef PIC - PIC_PROLOGUE - leal PIC_GOTOFF(_map),%ecx - PIC_EPILOGUE - movb (%ecx,%eax,1),%al -#else - movb _map(,%eax,1),%al -#endif - addl $4,%esp + fnstcw -4(%esp) + movl -4(%esp), %ecx + shrl $9, %ecx + andl $6, %ecx + xorl $1, %eax /* map 0,1,2,3 - 1,0,3,2 */ + andl $3, %eax ret
CVS commit: src/lib/libc/arch/i386/gen
Module Name:src Committed By: christos Date: Thu Sep 29 22:53:13 UTC 2011 Modified Files: src/lib/libc/arch/i386/gen: flt_rounds.S Log Message: even shorter To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/i386/gen/flt_rounds.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/i386/gen/flt_rounds.S diff -u src/lib/libc/arch/i386/gen/flt_rounds.S:1.7 src/lib/libc/arch/i386/gen/flt_rounds.S:1.8 --- src/lib/libc/arch/i386/gen/flt_rounds.S:1.7 Thu Sep 29 18:46:00 2011 +++ src/lib/libc/arch/i386/gen/flt_rounds.S Thu Sep 29 18:53:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: flt_rounds.S,v 1.7 2011/09/29 22:46:00 christos Exp $ */ +/* $NetBSD: flt_rounds.S,v 1.8 2011/09/29 22:53:13 christos Exp $ */ #include machine/asm.h @@ -12,9 +12,8 @@ _ALIGN_TEXT ENTRY(__flt_rounds) fnstcw -4(%esp) - movl -4(%esp), %ecx - shrl $9, %ecx - andl $6, %ecx - xorl $1, %eax /* map 0,1,2,3 - 1,0,3,2 */ + movl -4(%esp), %eax + shrl $10, %eax andl $3, %eax + xorl $1, %eax /* map 0,1,2,3 - 1,0,3,2 */ ret
CVS commit: src/lib/libc/arch/x86_64/gen
Module Name:src Committed By: christos Date: Thu Sep 29 22:55:45 UTC 2011 Modified Files: src/lib/libc/arch/x86_64/gen: flt_rounds.S Log Message: even simpler. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/x86_64/gen/flt_rounds.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/x86_64/gen/flt_rounds.S diff -u src/lib/libc/arch/x86_64/gen/flt_rounds.S:1.4 src/lib/libc/arch/x86_64/gen/flt_rounds.S:1.5 --- src/lib/libc/arch/x86_64/gen/flt_rounds.S:1.4 Thu Sep 29 18:45:20 2011 +++ src/lib/libc/arch/x86_64/gen/flt_rounds.S Thu Sep 29 18:55:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: flt_rounds.S,v 1.4 2011/09/29 22:45:20 christos Exp $ */ +/* $NetBSD: flt_rounds.S,v 1.5 2011/09/29 22:55:45 christos Exp $ */ #include machine/asm.h @@ -12,9 +12,8 @@ _ALIGN_TEXT ENTRY(__flt_rounds) fnstcw -4(%rsp) - movl -4(%rsp), %ecx - shrl $9, %ecx - andl $6, %ecx - xorl $1, %eax /* map 0,1,2,3 - 1,0,3,2 */ + movl -4(%rsp), %eax + shrl $10, %eax andl $3, %eax + xorl $1, %eax /* map 0,1,2,3 - 1,0,3,2 */ ret
CVS commit: src
Module Name:src Committed By: sjg Date: Thu Sep 29 23:35:48 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Log Message: Install the man page for filemon(4). To generate a diff of this commit: cvs rdiff -u -r1.1343 -r1.1344 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.569 -r1.570 src/share/man/man4/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1343 src/distrib/sets/lists/man/mi:1.1344 --- src/distrib/sets/lists/man/mi:1.1343 Sat Sep 24 17:09:29 2011 +++ src/distrib/sets/lists/man/mi Thu Sep 29 23:35:48 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1343 2011/09/24 17:09:29 christos Exp $ +# $NetBSD: mi,v 1.1344 2011/09/29 23:35:48 sjg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -983,6 +983,7 @@ ./usr/share/man/cat4/fast_ipsec.0 man-sys-catman .cat ./usr/share/man/cat4/fd.0 man-sys-catman .cat ./usr/share/man/cat4/fea.0 man-sys-catman .cat +./usr/share/man/cat4/filemon.0 man-sys-catman .cat ./usr/share/man/cat4/finsio.0 man-sys-catman .cat ./usr/share/man/cat4/flash.0 man-sys-catman .cat ./usr/share/man/cat4/fms.0 man-sys-catman .cat @@ -3814,6 +3815,7 @@ ./usr/share/man/html4/fast_ipsec.html man-sys-htmlman html ./usr/share/man/html4/fd.html man-sys-htmlman html ./usr/share/man/html4/fea.html man-sys-htmlman html +./usr/share/man/html4/filemon.html man-sys-htmlman html ./usr/share/man/html4/finsio.html man-sys-htmlman html ./usr/share/man/html4/flash.html man-sys-htmlman html ./usr/share/man/html4/fms.html man-sys-htmlman html @@ -6420,6 +6422,7 @@ ./usr/share/man/man4/fast_ipsec.4 man-sys-man .man ./usr/share/man/man4/fd.4 man-sys-man .man ./usr/share/man/man4/fea.4 man-sys-man .man +./usr/share/man/man4/filemon.4 man-sys-man .man ./usr/share/man/man4/finsio.4 man-sys-man .man ./usr/share/man/man4/flash.4 man-sys-man .man ./usr/share/man/man4/fms.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.569 src/share/man/man4/Makefile:1.570 --- src/share/man/man4/Makefile:1.569 Tue Aug 30 07:07:04 2011 +++ src/share/man/man4/Makefile Thu Sep 29 23:35:48 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.569 2011/08/30 07:07:04 jruoho Exp $ +# $NetBSD: Makefile,v 1.570 2011/09/29 23:35:48 sjg Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -24,7 +24,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a dmphy.4 dpt.4 dpti.4 drm.4 drum.4 dtv.4 dtviic.4 \ eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \ esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \ - fast_ipsec.4 fd.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 fujbp.4 fxp.4 \ + fast_ipsec.4 fd.4 filemon.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 fujbp.4 fxp.4 \ gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \ glxtphy.4 gpib.4 gpio.4 gpiolock.4 gpiosim.4 gre.4 gphyter.4 gsip.4 \ hdaudio.4 hifn.4 hme.4 hpacel.4 hpqlb.4 hptide.4 \
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Thu Sep 29 23:38:04 UTC 2011
Modified Files:
src/usr.bin/make: suff.c
src/usr.bin/make/unit-tests: Makefile test.exp
Added Files:
src/usr.bin/make/unit-tests: phony-end
Log Message:
Make sure .PHONY targets get .TARGET set.
This wasn't happening when a dependency of .END.
Set .PREFIX too and add a unit-test.
PR: 43534
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/usr.bin/make/suff.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/phony-end
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/make/unit-tests/test.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.68 src/usr.bin/make/suff.c:1.69
--- src/usr.bin/make/suff.c:1.68 Thu Jun 30 20:09:42 2011
+++ src/usr.bin/make/suff.c Thu Sep 29 23:38:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.68 2011/06/30 20:09:42 wiz Exp $ */
+/* $NetBSD: suff.c,v 1.69 2011/09/29 23:38:04 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: suff.c,v 1.68 2011/06/30 20:09:42 wiz Exp $;
+static char rcsid[] = $NetBSD: suff.c,v 1.69 2011/09/29 23:38:04 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)suff.c 8.4 (Berkeley) 3/21/94;
#else
-__RCSID($NetBSD: suff.c,v 1.68 2011/06/30 20:09:42 wiz Exp $);
+__RCSID($NetBSD: suff.c,v 1.69 2011/09/29 23:38:04 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -2406,16 +2406,25 @@ Suff_FindDeps(GNode *gn)
static void
SuffFindDeps(GNode *gn, Lst slst)
{
-if (gn-type (OP_DEPS_FOUND|OP_PHONY)) {
+if (gn-type OP_DEPS_FOUND) {
/*
* If dependencies already found, no need to do it again...
- * If this is a .PHONY target, we do not apply suffix rules.
*/
return;
} else {
gn-type |= OP_DEPS_FOUND;
}
-
+/*
+ * Make sure we have these set, may get revised below.
+ */
+Var_Set(TARGET, gn-path ? gn-path : gn-name, gn, 0);
+Var_Set(PREFIX, gn-name, gn, 0);
+if (gn-type OP_PHONY) {
+ /*
+ * If this is a .PHONY target, we do not apply suffix rules.
+ */
+ return;
+}
if (DEBUG(SUFF)) {
fprintf(debug_file, SuffFindDeps (%s)\n, gn-name);
}
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.32 src/usr.bin/make/unit-tests/Makefile:1.33
--- src/usr.bin/make/unit-tests/Makefile:1.32 Thu Apr 7 01:40:02 2011
+++ src/usr.bin/make/unit-tests/Makefile Thu Sep 29 23:38:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2011/04/07 01:40:02 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2011/09/29 23:38:04 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -35,6 +35,7 @@ SUBFILES= \
modorder \
modts \
modword \
+ phony-end \
posix \
qequals \
sysv \
Index: src/usr.bin/make/unit-tests/test.exp
diff -u src/usr.bin/make/unit-tests/test.exp:1.38 src/usr.bin/make/unit-tests/test.exp:1.39
--- src/usr.bin/make/unit-tests/test.exp:1.38 Fri Jun 3 21:10:42 2011
+++ src/usr.bin/make/unit-tests/test.exp Thu Sep 29 23:38:04 2011
@@ -292,6 +292,11 @@ LIST:tw:C/ /,/g=one two three four five
LIST:tw:C/ /,/1g=one two three four five six
LIST:tw:tW:C/ /,/=one,two three four five six
LIST:tW:tw:C/ /,/=one two three four five six
+.TARGET=phony .PREFIX=phony .IMPSRC=
+.TARGET=all .PREFIX=all .IMPSRC=
+.TARGET=ok .PREFIX=ok .IMPSRC=
+.TARGET=also.ok .PREFIX=also.ok .IMPSRC=
+.TARGET=bug .PREFIX=bug .IMPSRC=
Posix says we should execute the command as if run by system(3)
Expect 'Hello,' and 'World!'
Hello,
Added files:
Index: src/usr.bin/make/unit-tests/phony-end
diff -u /dev/null src/usr.bin/make/unit-tests/phony-end:1.1
--- /dev/null Thu Sep 29 23:38:05 2011
+++ src/usr.bin/make/unit-tests/phony-end Thu Sep 29 23:38:04 2011
@@ -0,0 +1,9 @@
+# $Id: phony-end,v 1.1 2011/09/29 23:38:04 sjg Exp $
+
+all ok also.ok bug phony:
+ @echo '${.TARGET .PREFIX .IMPSRC:L:@v@$v=${$v}@}'
+
+.END: ok also.ok bug
+
+phony bug: .PHONY
+all: phony
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: macallan
Date: Fri Sep 30 01:23:00 UTC 2011
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-mips.c
Log Message:
put -mfixloongson2f-btb back in the command line options list
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/binutils/dist/gas/config/tc-mips.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-mips.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.9 src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.10
--- src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.9 Sun Sep 25 09:44:54 2011
+++ src/external/gpl3/binutils/dist/gas/config/tc-mips.c Fri Sep 30 01:23:00 2011
@@ -11417,6 +11417,8 @@ struct option md_longopts[] =
{mno-fix-loongson2f-jump, no_argument, NULL, OPTION_NO_FIX_LOONGSON2F_JUMP},
{mfix-loongson2f-nop, no_argument, NULL, OPTION_FIX_LOONGSON2F_NOP},
{mno-fix-loongson2f-nop, no_argument, NULL, OPTION_NO_FIX_LOONGSON2F_NOP},
+ {mfix-loongson2f-btb, no_argument, NULL, OPTION_FIX_LOONGSON2F_BTB},
+ {mno-fix-loongson2f-btb, no_argument, NULL, OPTION_NO_FIX_LOONGSON2F_BTB},
{mfix-vr4120,no_argument, NULL, OPTION_FIX_VR4120},
{mno-fix-vr4120, no_argument, NULL, OPTION_NO_FIX_VR4120},
{mfix-vr4130,no_argument, NULL, OPTION_FIX_VR4130},
CVS commit: src/usr.bin/gzip
Module Name:src Committed By: christos Date: Fri Sep 30 01:32:21 UTC 2011 Modified Files: src/usr.bin/gzip: unxz.c Log Message: add copyright To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/gzip/unxz.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/gzip/unxz.c diff -u src/usr.bin/gzip/unxz.c:1.4 src/usr.bin/gzip/unxz.c:1.5 --- src/usr.bin/gzip/unxz.c:1.4 Wed Aug 17 10:07:45 2011 +++ src/usr.bin/gzip/unxz.c Thu Sep 29 21:32:21 2011 @@ -1,3 +1,42 @@ +/* $NetBSD: unxz.c,v 1.5 2011/09/30 01:32:21 christos Exp $ */ + +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + *This product includes software developed by the NetBSD + *Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + *contributors may be used to endorse or promote products derived + *from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#include sys/cdefs.h +__RCSID($NetBSD: unxz.c,v 1.5 2011/09/30 01:32:21 christos Exp $); #include stdarg.h #include errno.h
CVS commit: src/libexec/ld.elf_so/arch/hppa
Module Name:src Committed By: mrg Date: Fri Sep 30 03:05:43 UTC 2011 Modified Files: src/libexec/ld.elf_so/arch/hppa: rtld_start.S Log Message: match EXIT() with LEAF_ENTRY() so that sizes are actually constants. fixes binutils 2.21 build issues reported by he and chuq. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/libexec/ld.elf_so/arch/hppa/rtld_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/hppa/rtld_start.S diff -u src/libexec/ld.elf_so/arch/hppa/rtld_start.S:1.10 src/libexec/ld.elf_so/arch/hppa/rtld_start.S:1.11 --- src/libexec/ld.elf_so/arch/hppa/rtld_start.S:1.10 Thu Mar 10 12:53:42 2011 +++ src/libexec/ld.elf_so/arch/hppa/rtld_start.S Fri Sep 30 03:05:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld_start.S,v 1.10 2011/03/10 12:53:42 skrll Exp $ */ +/* $NetBSD: rtld_start.S,v 1.11 2011/09/30 03:05:43 mrg Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -139,7 +139,7 @@ L$lpc2: addil L'_rtld_bind_start - ($PIC stw %arg0, -8(%arg1) bv %r0(%rp) stw %r19, -4(%arg1) -EXIT(__rtld_hppa_setup_pltgot) +EXIT(__rtld_setup_hppa_pltgot) /* * In order to support lazy binding, this implementation of _rtld_bind_start is
CVS commit: src/sys
Module Name:src
Committed By: jruoho
Date: Fri Sep 30 04:01:21 UTC 2011
Modified Files:
src/sys/kern: subr_cpufreq.c
src/sys/sys: cpufreq.h
Log Message:
Fix bugs noted by alnsn@. Namely, preallocate the global structure in
order to avoid locking issues during deregistration.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_cpufreq.c
cvs rdiff -u -r1.2 -r1.3 src/sys/sys/cpufreq.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/subr_cpufreq.c
diff -u src/sys/kern/subr_cpufreq.c:1.2 src/sys/kern/subr_cpufreq.c:1.3
--- src/sys/kern/subr_cpufreq.c:1.2 Wed Sep 28 15:52:48 2011
+++ src/sys/kern/subr_cpufreq.c Fri Sep 30 04:01:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cpufreq.c,v 1.2 2011/09/28 15:52:48 jruoho Exp $ */
+/* $NetBSD: subr_cpufreq.c,v 1.3 2011/09/30 04:01:21 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_cpufreq.c,v 1.2 2011/09/28 15:52:48 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_cpufreq.c,v 1.3 2011/09/30 04:01:21 jruoho Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -48,23 +48,25 @@ static void cpufreq_get_state_raw(uint3
static void cpufreq_set_raw(struct cpu_info *, uint32_t);
static void cpufreq_set_all_raw(uint32_t);
-static kmutex_t cpufreq_lock __cacheline_aligned;
-static struct cpufreq *cf_backend __read_mostly = NULL;
+static kmutex_t cpufreq_lock __cacheline_aligned;
+static struct cpufreq *cf_backend __read_mostly = NULL;
void
cpufreq_init(void)
{
mutex_init(cpufreq_lock, MUTEX_DEFAULT, IPL_NONE);
+ cf_backend = kmem_zalloc(sizeof(*cf_backend), KM_SLEEP);
}
int
cpufreq_register(struct cpufreq *cf)
{
- uint32_t count, i, j, k, m;
+ uint32_t c, i, j, k, m;
int rv;
KASSERT(cf != NULL);
+ KASSERT(cf_backend != NULL);
KASSERT(cf-cf_get_freq != NULL);
KASSERT(cf-cf_set_freq != NULL);
KASSERT(cf-cf_state_count 0);
@@ -72,19 +74,12 @@ cpufreq_register(struct cpufreq *cf)
mutex_enter(cpufreq_lock);
- if (cf_backend != NULL) {
+ if (cf_backend-cf_init != false) {
mutex_exit(cpufreq_lock);
return EALREADY;
}
- mutex_exit(cpufreq_lock);
- cf_backend = kmem_zalloc(sizeof(*cf), KM_SLEEP);
-
- if (cf_backend == NULL)
- return ENOMEM;
-
- mutex_enter(cpufreq_lock);
-
+ cf_backend-cf_init = true;
cf_backend-cf_mp = cf-cf_mp;
cf_backend-cf_cookie = cf-cf_cookie;
cf_backend-cf_get_freq = cf-cf_get_freq;
@@ -95,7 +90,7 @@ cpufreq_register(struct cpufreq *cf)
/*
* Sanity check the values and verify descending order.
*/
- for (count = i = 0; i cf-cf_state_count; i++) {
+ for (c = i = 0; i cf-cf_state_count; i++) {
CTASSERT(CPUFREQ_STATE_ENABLED != 0);
CTASSERT(CPUFREQ_STATE_DISABLED != 0);
@@ -103,6 +98,11 @@ cpufreq_register(struct cpufreq *cf)
if (cf-cf_state[i].cfs_freq == 0)
continue;
+ if (cf-cf_state[i].cfs_freq
+ cf-cf_state[i].cfs_freq != CPUFREQ_STATE_ENABLED
+ cf-cf_state[i].cfs_freq != CPUFREQ_STATE_DISABLED)
+ continue;
+
for (j = k = 0; j i; j++) {
if (cf-cf_state[i].cfs_freq =
@@ -115,14 +115,14 @@ cpufreq_register(struct cpufreq *cf)
if (k != 0)
continue;
- cf_backend-cf_state[i].cfs_index = count;
- cf_backend-cf_state[i].cfs_freq = cf-cf_state[i].cfs_freq;
- cf_backend-cf_state[i].cfs_power = cf-cf_state[i].cfs_power;
+ cf_backend-cf_state[c].cfs_index = c;
+ cf_backend-cf_state[c].cfs_freq = cf-cf_state[i].cfs_freq;
+ cf_backend-cf_state[c].cfs_power = cf-cf_state[i].cfs_power;
- count++;
+ c++;
}
- cf_backend-cf_state_count = count;
+ cf_backend-cf_state_count = c;
if (cf_backend-cf_state_count == 0) {
mutex_exit(cpufreq_lock);
@@ -150,15 +150,8 @@ cpufreq_deregister(void)
{
mutex_enter(cpufreq_lock);
-
- if (cf_backend == NULL) {
- mutex_exit(cpufreq_lock);
- return;
- }
-
+ memset(cf_backend, 0, sizeof(*cf_backend));
mutex_exit(cpufreq_lock);
- kmem_free(cf_backend, sizeof(*cf_backend));
- cf_backend = NULL;
}
static int
@@ -225,13 +218,12 @@ cpufreq_latency(void)
void
cpufreq_suspend(struct cpu_info *ci)
{
- struct cpufreq *cf;
+ struct cpufreq *cf = cf_backend;
uint32_t l, s;
mutex_enter(cpufreq_lock);
- cf = cf_backend;
- if (cf == NULL) {
+ if (cf-cf_init != true) {
mutex_exit(cpufreq_lock);
return;
}
@@ -248,12 +240,11 @@ cpufreq_suspend(struct cpu_info *ci)
void
cpufreq_resume(struct cpu_info *ci)
{
- struct cpufreq *cf;
+ struct cpufreq *cf = cf_backend;
mutex_enter(cpufreq_lock);
- cf = cf_backend;
- if (cf == NULL || cf-cf_state_saved == 0) {
+ if (cf-cf_init != true || cf-cf_state_saved == 0) {
mutex_exit(cpufreq_lock);
return;
}
@@ -265,13 +256,12 @@ cpufreq_resume(struct cpu_info *ci)
uint32_t
cpufreq_get(struct cpu_info *ci)
{
- struct cpufreq *cf;
+ struct cpufreq
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: he Date: Fri Sep 30 04:05:07 UTC 2011 Modified Files: src/sys/arch/evbarm/conf: GUMSTIX TWINTAIL Log Message: Bump SYMTAB_SPACE so that the symbol table fits again. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/conf/GUMSTIX cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/TWINTAIL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GUMSTIX diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.59 src/sys/arch/evbarm/conf/GUMSTIX:1.60 --- src/sys/arch/evbarm/conf/GUMSTIX:1.59 Fri Sep 2 11:50:29 2011 +++ src/sys/arch/evbarm/conf/GUMSTIX Fri Sep 30 04:05:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GUMSTIX,v 1.59 2011/09/02 11:50:29 he Exp $ +# $NetBSD: GUMSTIX,v 1.60 2011/09/30 04:05:07 he Exp $ # # GUMSTIX -- Gumstix. Inc. gumstix platforms kernel # @@ -165,7 +165,7 @@ options DDB # in-kernel debugger #options KGDB #options DEBUG_KGDB makeoptions DEBUG=-g -O2 # compile full symbol table -options SYMTAB_SPACE=75 +options SYMTAB_SPACE=77 #options AUDIO_DEBUG=2 config netbsd root on ? type ? Index: src/sys/arch/evbarm/conf/TWINTAIL diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.44 src/sys/arch/evbarm/conf/TWINTAIL:1.45 --- src/sys/arch/evbarm/conf/TWINTAIL:1.44 Thu Jun 30 20:09:23 2011 +++ src/sys/arch/evbarm/conf/TWINTAIL Fri Sep 30 04:05:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: TWINTAIL,v 1.44 2011/06/30 20:09:23 wiz Exp $ +# $NetBSD: TWINTAIL,v 1.45 2011/09/30 04:05:07 he Exp $ # # TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel # @@ -141,7 +141,7 @@ options DIAGNOSTIC # internally consist #options KGDB #options DEBUG_KGDB makeoptions DEBUG=-g -O2 # compile full symbol table -options SYMTAB_SPACE=60 +options SYMTAB_SPACE=61 #options AUDIO_DEBUG=2 config netbsd root on ? type ?
CVS commit: src/sys/arch/iyonix/conf
Module Name:src Committed By: he Date: Fri Sep 30 04:06:09 UTC 2011 Modified Files: src/sys/arch/iyonix/conf: GENERIC Log Message: Bump SYMTAB_SPACE so that the symbol table fits again. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/iyonix/conf/GENERIC 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/iyonix/conf/GENERIC diff -u src/sys/arch/iyonix/conf/GENERIC:1.65 src/sys/arch/iyonix/conf/GENERIC:1.66 --- src/sys/arch/iyonix/conf/GENERIC:1.65 Tue Aug 30 06:49:00 2011 +++ src/sys/arch/iyonix/conf/GENERIC Fri Sep 30 04:06:09 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.65 2011/08/30 06:49:00 he Exp $ +# $NetBSD: GENERIC,v 1.66 2011/09/30 04:06:09 he Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/iyonix/conf/std.iyonix options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.65 $ +#ident GENERIC-$Revision: 1.66 $ maxusers 32 # estimated number of users @@ -87,7 +87,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options KGDB # remote debugger #options KGDB_DEVNAME=\com\,KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=59 +options SYMTAB_SPACE=60 options PERFCTRS # performance counters #options PMAP_DEBUG # Enable pmap_debug_level code #options VERBOSE_INIT_ARM # verbose bootstraping messages
CVS commit: src/sys/kern
Module Name:src
Committed By: jruoho
Date: Fri Sep 30 04:10:55 UTC 2011
Modified Files:
src/sys/kern: subr_cpufreq.c
Log Message:
Remove redundant assignment.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/subr_cpufreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_cpufreq.c
diff -u src/sys/kern/subr_cpufreq.c:1.3 src/sys/kern/subr_cpufreq.c:1.4
--- src/sys/kern/subr_cpufreq.c:1.3 Fri Sep 30 04:01:21 2011
+++ src/sys/kern/subr_cpufreq.c Fri Sep 30 04:10:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cpufreq.c,v 1.3 2011/09/30 04:01:21 jruoho Exp $ */
+/* $NetBSD: subr_cpufreq.c,v 1.4 2011/09/30 04:10:54 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_cpufreq.c,v 1.3 2011/09/30 04:01:21 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_cpufreq.c,v 1.4 2011/09/30 04:10:54 jruoho Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -477,7 +477,6 @@ cpufreq_set_step(struct cpu_info *ci, in
int32_t index;
mutex_enter(cpufreq_lock);
- cf = cf_backend;
if (__predict_false(cf-cf_init != true)) {
mutex_exit(cpufreq_lock);
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Fri Sep 30 04:21:17 UTC 2011 Modified Files: src/share/man/man9: cpufreq.9 Log Message: Note the order of the dummy boolean states. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/cpufreq.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/cpufreq.9 diff -u src/share/man/man9/cpufreq.9:1.3 src/share/man/man9/cpufreq.9:1.4 --- src/share/man/man9/cpufreq.9:1.3 Wed Sep 28 11:50:42 2011 +++ src/share/man/man9/cpufreq.9 Fri Sep 30 04:21:17 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: cpufreq.9,v 1.3 2011/09/28 11:50:42 wiz Exp $ */ +.\ $NetBSD: cpufreq.9,v 1.4 2011/09/30 04:21:17 jruoho Exp $ */ .\ .\ Copyright (c) 2011 Jukka Ruohonen jruohonen.iki.fi .\ All rights reserved. @@ -25,7 +25,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 28, 2011 +.Dd September 30, 2011 .Dt CPUFREQ 9 .Os .Sh NAME @@ -161,6 +161,8 @@ field should be set to .Dv CPUFREQ_STATE_ENABLED or .Dv CPUFREQ_STATE_DISABLED . +The first constant should precede the latter one in +.Vt cf_state . .It The .Vt cf_state_count
CVS commit: src/share/man/man4
Module Name:src
Committed By: sjg
Date: Fri Sep 30 05:07:39 UTC 2011
Modified Files:
src/share/man/man4: filemon.4
Log Message:
Elaborate a little
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/filemon.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/filemon.4
diff -u src/share/man/man4/filemon.4:1.5 src/share/man/man4/filemon.4:1.6
--- src/share/man/man4/filemon.4:1.5 Mon Sep 26 19:02:39 2011
+++ src/share/man/man4/filemon.4 Fri Sep 30 05:07:39 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: filemon.4,v 1.5 2011/09/26 19:02:39 sjg Exp $
+.\ $NetBSD: filemon.4,v 1.6 2011/09/30 05:07:39 sjg Exp $
.\
.\ Copyright (c) 2011, Juniper Networks, Inc.
.\
@@ -23,7 +23,7 @@
.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
.\ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd April 1, 2011
+.Dd September 29, 2011
.Dt FILEMON 4
.Os
.Sh NAME
@@ -41,20 +41,47 @@ learning dependencies.
.Pp
The data captured by
.Nm
-for the command
+for the script
.Bd -literal -offset indent
-cat /etc/motd
+n=`wc -l /etc/motd`; echo int motd_lines = $n; foo.h.new
+cmp -s foo.h foo.h.new 2 /dev/null || mv foo.h.new foo.h
.Ed
.Pp
looks like:
.Bd -literal -offset indent
-# filemon version 2
-# Target pid 7437
+# filemon version 4
+# Target pid 24291
V 4
-E 21848 /bin/cat
-R 21848 /lib/libc.so.12
-R 21848 /etc/motd
-X 21848 0
+E 29676 /bin/sh
+R 29676 /etc/ld.so.conf
+R 29676 /lib/libedit.so.2
+R 29676 /lib/libtermcap.so.0
+R 29676 /lib/libc.so.12
+F 29676 4899
+E 4899 /usr/bin/wc
+R 4899 /etc/ld.so.conf
+R 4899 /usr/lib/libc.so.12
+R 4899 /etc/motd
+X 4899 0
+W 29676 foo.h.new
+X 29676 0
+# Bye bye
+E 3250 /bin/sh
+R 3250 /etc/ld.so.conf
+R 3250 /lib/libedit.so.2
+R 3250 /lib/libtermcap.so.0
+R 3250 /lib/libc.so.12
+W 26673 /dev/null
+E 26673 /usr/bin/cmp
+R 26673 /etc/ld.so.conf
+R 26673 /usr/lib/libc.so.12
+X 26673 2
+E 576 /bin/mv
+R 576 /etc/ld.so.conf
+R 576 /lib/libc.so.12
+M 576 'foo.h.new' 'foo.h'
+X 576 0
+X 3250 0
# Bye bye
.Ed
.Pp
@@ -148,9 +175,16 @@ switch(pid) {
}
.Ed
.Pp
+The outut of
+.Nm
+is intended to be simple to parse.
It is possible to achieve almost equivalent results with
.Xr dtrace 1
though on many systems this requires elevated privileges.
+Also,
+.Xr ktrace 1
+can capture similar data, but records failed system calls as well as
+successful, and is thus more complex to post-process.
.Sh HISTORY
.Nm
was contributed by Juniper Networks.
CVS commit: src/sys/uvm
Module Name:src
Committed By: mrg
Date: Fri Sep 30 05:29:12 UTC 2011
Modified Files:
src/sys/uvm: uvm_page.c
Log Message:
re-arrange the end of uvm_page_recolor() to avoid the multiple exit
points. move the call to uvm_pager_realloc_emerg() to after we
drop the uvm_fpageqlock, since it may be taken again in uvm_km_alloc().
fixes LOCKDEBUG crashes with the previous change.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/uvm/uvm_page.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.176 src/sys/uvm/uvm_page.c:1.177
--- src/sys/uvm/uvm_page.c:1.176 Wed Sep 28 22:52:15 2011
+++ src/sys/uvm/uvm_page.c Fri Sep 30 05:29:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.176 2011/09/28 22:52:15 matt Exp $ */
+/* $NetBSD: uvm_page.c,v 1.177 2011/09/30 05:29:12 mrg Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.176 2011/09/28 22:52:15 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.177 2011/09/30 05:29:12 mrg Exp $);
#include opt_ddb.h
#include opt_uvmhist.h
@@ -1045,16 +1045,20 @@ uvm_page_recolor(int newncolors)
ucpu-page_free[lcv].pgfl_buckets = pgfl.pgfl_buckets;
}
- uvm_pager_realloc_emerg();
-
- if (have_recolored_pages) {
- mutex_spin_exit(uvm_fpageqlock);
- free(oldbucketarray, M_VMPAGE);
- return;
- }
+ if (!have_recolored_pages)
+ oldbucketarray = NULL;
have_recolored_pages = true;
mutex_spin_exit(uvm_fpageqlock);
+
+ if (oldbucketarray)
+ free(oldbucketarray, M_VMPAGE);
+
+ /*
+ * this calls uvm_km_alloc() which may want to hold
+ * uvm_fpageqlock.
+ */
+ uvm_pager_realloc_emerg();
}
/*
