Re: CVS commit: src/distrib/sets/lists
On May,Monday 30 2011, at 4:10 AM, Christos Zoulas wrote: Module Name: src Committed By: christos Date: Mon May 30 02:10:26 UTC 2011 Modified Files: src/distrib/sets/lists/base: ad.mips64eb src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/tests: shl.mi Log Message: fix a lot of different issues (doesn't anyone build anymore) - libdns had the wrong version libdns was minor bumped after last bind update you should mark old entries obsolete and add new ones. Same should be done for all 64 archs. - zfs attributes missing - missing debug libs - typos in library names - typos in library versions - _g libraries missing for new .so files (since we don't install .a files we should not be installing _g.a files either, why are we?) Hopefully this will fix the sparc64 build. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1625 -r1.1626 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/tests/shl.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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.50 src/distrib/sets/lists/base/ad.mips64eb:1.51 --- src/distrib/sets/lists/base/ad.mips64eb:1.50 Sun May 29 11:17:08 2011 +++ src/distrib/sets/lists/base/ad.mips64eb Sun May 29 22:10:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.50 2011/05/29 15:17:08 spz Exp $ +# $NetBSD: ad.mips64eb,v 1.51 2011/05/30 02:10:25 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -359,7 +359,7 @@ ./usr/lib/o32/libdm.so.0 base-compat-shlib compat,pic ./usr/lib/o32/libdm.so.0.0base-compat-shlib compat,pic ./usr/lib/o32/libdns.so.5 base-compat-shlib compat,pic -./usr/lib/o32/libdns.so.5.3 base-compat-shlib compat,pic +./usr/lib/o32/libdns.so.5.4 base-compat-shlib compat,pic ./usr/lib/o32/libdns_sd.so.0 base-compat-shlib compat,pic,mdns ./usr/lib/o32/libdns_sd.so.0.0base-compat-shlib compat,pic,mdns ./usr/lib/o32/libdwarf.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/comp/ad.mips64eb diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.32 src/distrib/sets/lists/comp/ad.mips64eb:1.33 --- src/distrib/sets/lists/comp/ad.mips64eb:1.32 Thu May 12 21:56:27 2011 +++ src/distrib/sets/lists/comp/ad.mips64eb Sun May 29 22:10:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.32 2011/05/13 01:56:27 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.33 2011/05/30 02:10:25 christos Exp $ ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoff comp-sysutil-bin ./usr/include/mipscomp-c-include @@ -1212,7 +1212,7 @@ ./usr/libdata/debug/usr/lib/64/libdes.so.8.1.debug comp-crypto-debug crypto,debug,compat ./usr/libdata/debug/usr/lib/64/libdevmapper.so.1.0.debug comp-lvm-debug lvm,debug,compat ./usr/libdata/debug/usr/lib/64/libdm.so.0.0.debug comp-sys-debug debug,compat -./usr/libdata/debug/usr/lib/64/libdns.so.5.3.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/64/libdns.so.5.4.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/64/libdns_sd.so.0.0.debug comp-mdns-debug mdns,debug,compat ./usr/libdata/debug/usr/lib/64/libdtrace.so.2.0.debug comp-sys-debug dtrace,debug,compat ./usr/libdata/debug/usr/lib/64/libdwarf.so.0.0.debug comp-sys-debug debug,compat @@ -1234,7 +1234,7 @@ ./usr/libdata/debug/usr/lib/64/libhx509.so.5.0.debug comp-krb5-debug kerberos,debug,compat ./usr/libdata/debug/usr/lib/64/libintl.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libipsec.so.3.0.debug comp-net-debug debug,compat -./usr/libdata/debug/usr/lib/64/libisc.so.5.3.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/64/libisc.so.5.4.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/64/libisccc.so.5.3.debug comp-bind-debug debug,compat
Re: CVS commit: src
In article iru1h7$g33$1...@dough.gmane.org, Christos Zoulas chris...@astron.com wrote: In article 20110529165252.ga17...@colwyn.zhadum.org.uk, Matthias Scheler t...@netbsd.org wrote: On Sun, May 29, 2011 at 01:07:34PM +, Christos Zoulas wrote: I've fixed it as suggested by you. Thank you! Now if I could only figure out why the pselect tests work on virtual pc and not a real machine. They also fail on virtual machines: http://www.gson.org/netbsd/bugs/build/build/2011.05.29.12.57.14/test.html#syscall_t_pselect_pselect_signal_mask_with_signal Yes, now it fails on mine too; I just rebuilt the test binary. Going back to the old source (1.2) does not fix it either. Should all be fixed now. christos
Re: CVS commit: src/distrib/sets/lists
In article 9fd1caa9-1c17-4198-a9cc-57f4de798...@gmail.com, Adam Hamsik haa...@gmail.com wrote: libdns was minor bumped after last bind update you should mark old entries obsolete and add new ones. Same should be done for all 64 archs. I think that this is not true for shared libraries; this happens automatically now. Perhaps not for .debug libraries? If that's the case it should be fixed. christos
Re: CVS commit: src/distrib/sets/lists
On Mon, May 30, 2011 at 09:17:52AM +, Christos Zoulas wrote: In article 9fd1caa9-1c17-4198-a9cc-57f4de798...@gmail.com, Adam Hamsik haa...@gmail.com wrote: libdns was minor bumped after last bind update you should mark old entries obsolete and add new ones. Same should be done for all 64 archs. I think that this is not true for shared libraries; this happens automatically now. Perhaps not for .debug libraries? If that's the case it should be fixed. I tweaked postinstall, quite some time ago, to handle debug libraries too. AFAIK, it works. -- Nicolas Joly Projects and Developments in Bioinformatics Institut Pasteur, Paris.
Re: CVS commit: src/distrib/sets/lists
On May,Monday 30 2011, at 11:23 AM, Nicolas Joly wrote: On Mon, May 30, 2011 at 09:17:52AM +, Christos Zoulas wrote: In article 9fd1caa9-1c17-4198-a9cc-57f4de798...@gmail.com, Adam Hamsik haa...@gmail.com wrote: libdns was minor bumped after last bind update you should mark old entries obsolete and add new ones. Same should be done for all 64 archs. I think that this is not true for shared libraries; this happens automatically now. Perhaps not for .debug libraries? If that's the case it should be fixed. I tweaked postinstall, quite some time ago, to handle debug libraries too. AFAIK, it works. I was not aware of that, it might be a good idea to document this difference in set lists file which is different. e.g. in shl.mi now. Regards Adam.
Re: CVS commit: src/distrib/sets/lists
On May 30, 12:52pm, haa...@gmail.com (Adam Hamsik) wrote: -- Subject: Re: CVS commit: src/distrib/sets/lists | | On May,Monday 30 2011, at 11:23 AM, Nicolas Joly wrote: | | On Mon, May 30, 2011 at 09:17:52AM +, Christos Zoulas wrote: | In article 9fd1caa9-1c17-4198-a9cc-57f4de798...@gmail.com, | Adam Hamsik haa...@gmail.com wrote: | | libdns was minor bumped after last bind update you should mark old | entries obsolete | and add new ones. Same should be done for all 64 archs. | | I think that this is not true for shared libraries; this happens | automatically now. Perhaps not for .debug libraries? If that's the | case it should be fixed. | | I tweaked postinstall, quite some time ago, to handle debug libraries | too. AFAIK, it works. | | I was not aware of that, it might be a good idea to document this difference | in set lists file which is different. e.g. in shl.mi now. I killed all the bogus entries there, to avoid cut-n-paste proliferation. christos
Re: CVS commit: src/distrib/sets/lists
On May,Monday 30 2011, at 1:02 PM, Christos Zoulas wrote: On May 30, 12:52pm, haa...@gmail.com (Adam Hamsik) wrote: -- Subject: Re: CVS commit: src/distrib/sets/lists | | On May,Monday 30 2011, at 11:23 AM, Nicolas Joly wrote: | | On Mon, May 30, 2011 at 09:17:52AM +, Christos Zoulas wrote: | In article 9fd1caa9-1c17-4198-a9cc-57f4de798...@gmail.com, | Adam Hamsik haa...@gmail.com wrote: | | libdns was minor bumped after last bind update you should mark old | entries obsolete | and add new ones. Same should be done for all 64 archs. | | I think that this is not true for shared libraries; this happens | automatically now. Perhaps not for .debug libraries? If that's the | case it should be fixed. | | I tweaked postinstall, quite some time ago, to handle debug libraries | too. AFAIK, it works. | | I was not aware of that, it might be a good idea to document this difference | in set lists file which is different. e.g. in shl.mi now. I killed all the bogus entries there, to avoid cut-n-paste proliferation. Thanks. Regards Adam.
Re: CVS commit: src/distrib/sets/lists
On Mon, May 30, 2011 at 12:52:57PM +0200, Adam Hamsik wrote: On May,Monday 30 2011, at 11:23 AM, Nicolas Joly wrote: On Mon, May 30, 2011 at 09:17:52AM +, Christos Zoulas wrote: In article 9fd1caa9-1c17-4198-a9cc-57f4de798...@gmail.com, Adam Hamsik haa...@gmail.com wrote: libdns was minor bumped after last bind update you should mark old entries obsolete and add new ones. Same should be done for all 64 archs. I think that this is not true for shared libraries; this happens automatically now. Perhaps not for .debug libraries? If that's the case it should be fixed. I tweaked postinstall, quite some time ago, to handle debug libraries too. AFAIK, it works. I was not aware of that, it might be a good idea to document this difference in set lists file which is different. e.g. in shl.mi now. Actually, only minor number changes are handled automatically for both shared/debug libraries. I do have, on my TODO list, to add a postinstall majorlib target (which will default to off) to ease builds when major is incremented. This is a real pain for MKDEBUG builds ... Just like kernel version bump versus module tree. -- Nicolas Joly Projects and Developments in Bioinformatics Institut Pasteur, Paris.
Re: CVS commit: src/distrib/sets/lists
On Mon, May 30, 2011 at 03:37:13PM +0200, Nicolas Joly wrote: On Mon, May 30, 2011 at 12:52:57PM +0200, Adam Hamsik wrote: On May,Monday 30 2011, at 11:23 AM, Nicolas Joly wrote: On Mon, May 30, 2011 at 09:17:52AM +, Christos Zoulas wrote: In article 9fd1caa9-1c17-4198-a9cc-57f4de798...@gmail.com, Adam Hamsik haa...@gmail.com wrote: libdns was minor bumped after last bind update you should mark old entries obsolete and add new ones. Same should be done for all 64 archs. I think that this is not true for shared libraries; this happens automatically now. Perhaps not for .debug libraries? If that's the case it should be fixed. I tweaked postinstall, quite some time ago, to handle debug libraries too. AFAIK, it works. I was not aware of that, it might be a good idea to document this difference in set lists file which is different. e.g. in shl.mi now. Actually, only minor number changes are handled automatically for both shared/debug libraries. I do have, on my TODO list, to add a postinstall majorlib target (which will default to off) to ease builds when major is incremented. This is a real pain for MKDEBUG builds ... Just like kernel version bump versus module tree. Well, not MKDEBUG, but MKUPDATE builds. -- Nicolas Joly Projects and Developments in Bioinformatics Institut Pasteur, Paris.
Re: CVS commit: src/external/bsd/tmux/dist/compat
In article 20110530162059.1a6d217...@cvs.netbsd.org,
Joerg Sonnenberger source-changes-d@NetBSD.org wrote:
-=-=-=-=-=-
+#ifdef __clang__
+ charbuf[128];
+#else
charbuf[CMSG_SPACE(sizeof(int))];
+#endif
} cmsgbuf;
Wouldn't it be better insted to re-define CMSG_SPACE for clang like:
#ifdef __clang__
#define CMSG_SPACE(x) ((x) + 128)
#else
...
#endif
This is bad too, what if sizeof(buf) CMSG_SPACE(sizeof(int)):
if (buf != NULL buf-fd != -1) {
msg.msg_control = (caddr_t)cmsgbuf.buf;
- msg.msg_controllen = sizeof(cmsgbuf.buf);
+ msg.msg_controllen = CMSG_SPACE(sizeof(int));
cmsg = CMSG_FIRSTHDR(msg);
cmsg-cmsg_len = CMSG_LEN(sizeof(int));
cmsg-cmsg_level = SOL_SOCKET;
Re: CVS commit: src/external/bsd/tmux/dist/compat
On Mon, May 30, 2011 at 06:10:36PM +, Christos Zoulas wrote: In article 20110530162059.1a6d217...@cvs.netbsd.org, Joerg Sonnenberger source-changes-d@NetBSD.org wrote: -=-=-=-=-=- +#ifdef __clang__ +charbuf[128]; +#else charbuf[CMSG_SPACE(sizeof(int))]; +#endif } cmsgbuf; Wouldn't it be better insted to re-define CMSG_SPACE for clang like: #ifdef __clang__ #define CMSG_SPACE(x) ((x) + 128) #else ... #endif No. The real fix would be to teach the kernel compat32 handling for cmsg and make it a proper constant again. 128 is simply large enough for all platforms we have. Joerg
Re: CVS commit: src/external/bsd/tmux/dist/compat
In article 20110530184621.ga14...@britannica.bec.de, Joerg Sonnenberger jo...@britannica.bec.de wrote: On Mon, May 30, 2011 at 06:10:36PM +, Christos Zoulas wrote: In article 20110530162059.1a6d217...@cvs.netbsd.org, Joerg Sonnenberger source-changes-d@NetBSD.org wrote: -=-=-=-=-=- +#ifdef __clang__ + charbuf[128]; +#else charbuf[CMSG_SPACE(sizeof(int))]; +#endif } cmsgbuf; Wouldn't it be better insted to re-define CMSG_SPACE for clang like: #ifdef __clang__ #define CMSG_SPACE(x) ((x) + 128) #else ... #endif No. The real fix would be to teach the kernel compat32 handling for cmsg and make it a proper constant again. 128 is simply large enough for all platforms we have. Yes, but now you are polluting the code with ifdefs everywhere that will need to be undone. christos
CVS commit: src/distrib/notes
Module Name:src Committed By: wiz Date: Mon May 30 06:19:54 UTC 2011 Modified Files: src/distrib/notes/macppc: install src/distrib/notes/mvme68k: install src/distrib/notes/sandpoint: install Log Message: Fix some typos, from OKANO Takayoshi in PR 45001. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/distrib/notes/macppc/install cvs rdiff -u -r1.22 -r1.23 src/distrib/notes/mvme68k/install cvs rdiff -u -r1.9 -r1.10 src/distrib/notes/sandpoint/install Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/macppc/install diff -u src/distrib/notes/macppc/install:1.37 src/distrib/notes/macppc/install:1.38 --- src/distrib/notes/macppc/install:1.37 Sat Sep 6 21:05:15 2008 +++ src/distrib/notes/macppc/install Mon May 30 06:19:53 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: install,v 1.37 2008/09/06 21:05:15 tsutsui Exp $ +.\ $NetBSD: install,v 1.38 2011/05/30 06:19:53 wiz Exp $ . .Ss2 Open Firmware boot syntax . @@ -559,7 +559,7 @@ .Pp You do not specify a file to load, since the .Sq partition zero -booloader knows what to do. +bootloader knows what to do. You would boot such a system if you have dumped the CD-R image to your drive, or if you have an already-installed .Nx*M Index: src/distrib/notes/mvme68k/install diff -u src/distrib/notes/mvme68k/install:1.22 src/distrib/notes/mvme68k/install:1.23 --- src/distrib/notes/mvme68k/install:1.22 Wed Mar 10 23:13:09 2010 +++ src/distrib/notes/mvme68k/install Mon May 30 06:19:53 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: install,v 1.22 2010/03/10 23:13:09 abs Exp $ +.\ $NetBSD: install,v 1.23 2011/05/30 06:19:53 wiz Exp $ .\ .\ Copyright (c) 1999-2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -89,7 +89,7 @@ Volume: NBSD IPL loaded at: $003F -\*[Gt]\*[Gt] BSD MVME147 tapeboot [$Revision: 1.22 $] +\*[Gt]\*[Gt] BSD MVME147 tapeboot [$Revision: 1.23 $] 578616+422344+55540+[46032+51284]=0x11a6e4 Start @ 0x8000 ... Copyright (c) 1996, 1997, 1998, 1999, 2000 @@ -275,7 +275,7 @@ partition and is of size 16MB. The length of the swap partition should be at least as large as the amount of RAM in your system and ideally 64MB or over. -The remainder of the disk can be alloacted to the +The remainder of the disk can be allocated to the .Sq Li d partition for the .Pa /usr @@ -435,7 +435,7 @@ .Pp .(disp Start @ 0x8000 ... -\*[Gt]\*[Gt] BSD MVME147 netboot (via sboot) [$Revision: 1.22 $] +\*[Gt]\*[Gt] BSD MVME147 netboot (via sboot) [$Revision: 1.23 $] device: le0 attached to 08:00:3e:20:cb:87 boot: client IP address: 192.168.1.4 boot: client name: soapy Index: src/distrib/notes/sandpoint/install diff -u src/distrib/notes/sandpoint/install:1.9 src/distrib/notes/sandpoint/install:1.10 --- src/distrib/notes/sandpoint/install:1.9 Sat Feb 26 20:38:49 2011 +++ src/distrib/notes/sandpoint/install Mon May 30 06:19:54 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: install,v 1.9 2011/02/26 20:38:49 phx Exp $ +.\ $NetBSD: install,v 1.10 2011/05/30 06:19:54 wiz Exp $ . .Ss2 Prepare the NFS or TFTP server . @@ -77,7 +77,7 @@ .Pa nfs: in the .Pa bootargs -enviroment variable. +environment variable. .Pp The installation kernel will run .Pa sysinst
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga
Module Name:xsrc
Committed By: christos
Date: Mon May 30 06:42:41 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaCursor.c
amigaFbs.c amigaKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h
amigaCVCursor.c amigaCVblt.c amigaCVbstor.c amigaCVfrect.c
amigaCVim.c amigaCVscrin.c
Log Message:
Ok, s3 is fixed. Now retina and cirrus
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.2 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h Mon May 30 02:42:40 2011
@@ -465,7 +465,7 @@
extern void amigaBlockHandler(
int,
pointer,
-struct timeval **,
+pointer,
pointer
);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.2 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c Mon May 30 02:42:40 2011
@@ -41,7 +41,22 @@
#define NEED_EVENTS
#include amiga.h
#ifdef CV64_SUPPORT
-#include s3/amigaCV.h
+#include Xmd.h
+#include gcstruct.h
+#include scrnintstr.h
+#include pixmapstr.h
+#include regionstr.h
+#include mistruct.h
+#include mifillarc.h
+#include fontstruct.h
+#include dixfontstr.h
+#include cfb.h
+#include cfbmskbits.h
+#include cfb8bit.h
+#include fastblt.h
+#include mergerop.h
+#include s3/amigaCV.h
+#include migc.h
#endif
#define GetCursorPrivate(s) ((GetScreenPrivate(s)-hardwareCursor))
@@ -86,7 +101,6 @@
PixmapPtr src, dst;
BoxRec box;
RegionRec rgnDst;
-extern int mfbDoBitblt();
if (!(src = GetScratchPixmapHeader(pScreen, bits-width, bits-height,
/*bpp*/ 1, /*depth*/ 1,
@@ -103,7 +117,7 @@
box.x2 = w;
box.y2 = h;
REGION_INIT(pScreen, rgnDst, box, 1);
-mfbDoBitblt(src, dst, GXcopy, rgnDst, ptSrc);
+mfbDoBitblt(src-drawable, dst-drawable, GXcopy, rgnDst, ptSrc);
REGION_UNINIT(pScreen, rgnDst);
FreeScratchPixmapHeader(src);
FreeScratchPixmapHeader(dst);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.3 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c Mon May 30 02:42:40 2011
@@ -162,8 +162,6 @@
ScreenPtr pScreen)
{
SetupScreen(pScreen);
-extern void amigaBlockHandler();
-extern void amigaWakeupHandler();
static ScreenPtr autoRepeatScreen;
extern miPointerScreenFuncRec amigaPointerScreenFuncs;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.3 Sat Jan 17 17:23:28 2009
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c Mon May 30 02:42:40 2011
@@ -795,14 +795,15 @@
}
/*ARGSUSED*/
-void amigaBlockHandler(nscreen, pbdata, pptv, pReadmask)
-int nscreen;
-pointer pbdata;
-struct timeval **pptv;
-pointer pReadmask;
+void amigaBlockHandler(
+int nscreen,
+pointer pbdata,
+pointer pv,
+pointer pReadmask)
{
KeybdCtrl* ctrl = ((DeviceIntPtr)LookupKeyboardDevice())-kbdfeed-ctrl;
static struct timeval artv = { 0, 0 }; /* autorepeat timeval */
+struct timeval **pptv = pv;
if (!autoRepeatKeyDown)
return;
Index:
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Mon May 30 09:53:40 UTC 2011 Modified Files: src/distrib/sets/lists/comp: md.sparc64 Log Message: fix my own typo To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/comp/md.sparc64 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/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.100 src/distrib/sets/lists/comp/md.sparc64:1.101 --- src/distrib/sets/lists/comp/md.sparc64:1.100 Sun May 29 22:10:25 2011 +++ src/distrib/sets/lists/comp/md.sparc64 Mon May 30 05:53:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.100 2011/05/30 02:10:25 christos Exp $ +# $NetBSD: md.sparc64,v 1.101 2011/05/30 09:53:40 christos Exp $ ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete @@ -771,7 +771,7 @@ ./usr/lib/sparc/libstdc++_pic.a comp-c-piclib compat,pic,cxx ./usr/lib/sparc/libsupc++.a comp-c-lib compat,cxx ./usr/lib/sparc/libsupc++.so base-obsolete obsolete -./usr/lib/sparc/libsupc_g.a -unknown- compat,debuglib +./usr/lib/sparc/libsupc++_g.a -unknown- compat,debuglib ./usr/lib/sparc/libsupc++_pic.a comp-obsolete obsolete ./usr/lib/sparc/libtermcap.a comp-c-lib compat ./usr/lib/sparc/libtermcap.so base-sys-shlib compat,pic
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Mon May 30 09:54:30 UTC 2011 Modified Files: src/distrib/sets/lists/comp: shl.mi Log Message: remove obsolete entries for .so.*.debug. njoly verified they are not needed (postinstall takes care of them automatically). To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/comp/shl.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/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.173 src/distrib/sets/lists/comp/shl.mi:1.174 --- src/distrib/sets/lists/comp/shl.mi:1.173 Sun May 29 22:10:26 2011 +++ src/distrib/sets/lists/comp/shl.mi Mon May 30 05:54:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.173 2011/05/30 02:10:26 christos Exp $ +# $NetBSD: shl.mi,v 1.174 2011/05/30 09:54:30 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -223,7 +223,6 @@ ./usr/libdata/debug/usr/lib/i18n/libmapper_zone.so.5.0.debug comp-i18n-debug debug ./usr/libdata/debug/usr/lib/libamu.so.4.0.debug comp-amd-debug debug ./usr/libdata/debug/usr/lib/libarchive.so.3.1.debug comp-sys-debug debug -./usr/libdata/debug/usr/lib/libasn1.so.8.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libasn1.so.9.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug zfs,dynamicroot,debug ./usr/libdata/debug/usr/lib/libbfd.so.11.0.debug comp-sys-debug binutils,debug @@ -232,7 +231,6 @@ ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libc.so.12.177.debug comp-sys-debug debug -./usr/libdata/debug/usr/lib/libcom_err.so.6.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libcom_err.so.7.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libcrypto.so.6.1.debug comp-crypto-debug crypto,debug @@ -253,30 +251,22 @@ ./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug ./usr/libdata/debug/usr/lib/libgcc_s.so.1.0.debug comp-sys-debug gcc,debug ./usr/libdata/debug/usr/lib/libgnumalloc.so.1.0.debug comp-sys-debug debug -./usr/libdata/debug/usr/lib/libgssapi.so.9.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libgssapi.so.10.0.debug comp-krb5-debug kerberos,debug -./usr/libdata/debug/usr/lib/libhdb.so.13.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libhdb.so.14.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libheimbase.so.1.0.debug comp-krb5-debug kerberos,debug -./usr/libdata/debug/usr/lib/libheimntlm.so.3.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libheimntlm.so.4.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libhx509.so.5.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libintl.so.1.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libipsec.so.3.0.debug comp-net-debug debug -./usr/libdata/debug/usr/lib/libisc.so.5.4.debug comp-bind-debug debug,obsolete ./usr/libdata/debug/usr/lib/libisc.so.5.4.debug comp-bind-debug debug ./usr/libdata/debug/usr/lib/libisccc.so.5.3.debug comp-bind-debug debug ./usr/libdata/debug/usr/lib/libisccfg.so.5.3.debug comp-bind-debug debug ./usr/libdata/debug/usr/lib/libiscsi.so.2.0.debug comp-iscsi-debug iscsi,debug ./usr/libdata/debug/usr/lib/libisns.so.0.0.debug comp-isns-debug debug -./usr/libdata/debug/usr/lib/libkadm5clnt.so.12.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libkadm5clnt.so.13.0.debug comp-krb5-debug kerberos,debug -./usr/libdata/debug/usr/lib/libkadm5srv.so.13.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libkadm5srv.so.14.0.debug comp-krb5-debug kerberos,debug -./usr/libdata/debug/usr/lib/libkafs.so.11.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libkafs.so.12.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libkdc.so.2.0.debug comp-krb5-debug kerberos,debug -./usr/libdata/debug/usr/lib/libkrb5.so.24.0.debug comp-krb5-debug kerberos,debug,obsolete ./usr/libdata/debug/usr/lib/libkrb5.so.26.0.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/lib/libkvm.so.6.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/liblber.so.3.2.debug comp-ldap-debug ldap,debug @@ -311,12 +301,10 @@ ./usr/libdata/debug/usr/lib/libradius.so.4.0.debug comp-net-debug debug ./usr/libdata/debug/usr/lib/librefuse.so.2.0.debug comp-refuse-debug debug ./usr/libdata/debug/usr/lib/libresolv.so.2.0.debug comp-net-debug debug -./usr/libdata/debug/usr/lib/libroken.so.14.0.debug comp-krb5-debug kerberos,debug,obsolete
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga
Module Name:xsrc Committed By: christos Date: Mon May 30 11:00:18 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaInit.c amigaIo.c amigaKbd.c amigaMouse.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus: amigaCL.h clbitblt.c clblt.c clfillrct.c clgc.c clsolid.c clstuff.h clwindow.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina: amigaGX.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h s3bcach.c s3fcach.c s3ss.c s3text.c Log Message: finish making this compile, with a few warnings. Mainly fix prototypes, remove duplicate struct decls, add includes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c cvs rdiff -u -r1.4 -r1.5 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h cvs rdiff -u -r1.3 -r1.4 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.4 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3 Mon May 30 02:42:40 2011 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h Mon May 30 07:00:17 2011 @@ -26,12 +26,12 @@ #include sys/fcntl.h #include sys/ioctl.h #include sys/device.h -#include dev/kbdreg.h -#include dev/vuid_event.h -#include dev/grfabs_reg.h -#include dev/viewioctl.h -#include dev/grfioctl.h -#include dev/grfvar.h +#include dev/kbdreg.h +#include dev/vuid_event.h +#include dev/grfabs_reg.h +#include dev/viewioctl.h +#include dev/grfioctl.h +#include dev/grfvar.h /* X headers */ #include Xos.h Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.4 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.3 Sat Jan 17 17:23:28 2009 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c Mon May 30 07:00:17 2011 @@ -55,6 +55,7 @@ #define NEED_EVENTS #includeamiga.h +#includemi.h Bool amigaActiveZaphod = TRUE; Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.3 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.2 Wed Mar 30 04:50:44 2005 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c Mon May 30 07:00:17 2011 @@ -52,6 +52,10 @@ #includesys/resource.h #includeunistd.h #includemipointer.h +#includemfb.h +#includecfb.h +#includecfb16.h +#includecfb32.h /* maximum pixmap depth */ #ifndef AMIGAMAXDEPTH Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.2 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.1 Thu Jan 15 07:07:41 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c Mon May 30 07:00:17 2011 @@ -47,6 +47,7 @@ #define NEED_EVENTS #includeamiga.h +#includemi.h BoolamigaEmulateMiddleButton = FALSE; BoolamigaEmulateRightButton = FALSE; Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.4
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: joerg
Date: Mon May 30 13:03:56 UTC 2011
Modified Files:
src/sys/arch/xen/xen: if_xennet_xenbus.c
Log Message:
Use proper format string
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/xen/xen/if_xennet_xenbus.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/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.50 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.51
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.50 Mon Apr 25 17:01:54 2011
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon May 30 13:03:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.50 2011/04/25 17:01:54 jym Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.51 2011/05/30 13:03:56 joerg Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_xennet_xenbus.c,v 1.50 2011/04/25 17:01:54 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_xennet_xenbus.c,v 1.51 2011/05/30 13:03:56 joerg Exp $);
#include opt_xen.h
#include opt_nfs_boot.h
@@ -502,7 +502,7 @@
if (xbt == NULL)
return ENOMEM;
error = xenbus_printf(xbt, sc-sc_xbusd-xbusd_path,
- vifname, device_xname(sc-sc_dev));
+ vifname, %s, device_xname(sc-sc_dev));
if (error) {
errmsg = vifname;
goto abort_transaction;
CVS commit: src/tests/fs/vfs
Module Name:src
Committed By: martin
Date: Mon May 30 13:10:38 UTC 2011
Modified Files:
src/tests/fs/vfs: t_vnops.c
Log Message:
Remove expected failure for tmpfs PRs that are now fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tests/fs/vfs/t_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.23 src/tests/fs/vfs/t_vnops.c:1.24
--- src/tests/fs/vfs/t_vnops.c:1.23 Fri Apr 1 17:40:54 2011
+++ src/tests/fs/vfs/t_vnops.c Mon May 30 13:10:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.23 2011/04/01 17:40:54 hannken Exp $ */
+/* $NetBSD: t_vnops.c,v 1.24 2011/05/30 13:10:38 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -175,8 +175,10 @@
xerrno = ESTALE;
else
xerrno = ENOENT;
+ /*
if (FSTYPE_TMPFS(tc))
atf_tc_expect_signal(-1, PR kern/44657);
+ */
ATF_REQUIRE_ERRNO(xerrno, rump_sys_chdir(..) == -1);
FSTEST_EXIT();
}
@@ -293,8 +295,10 @@
if (! FSTYPE_MSDOS(tc))
ATF_CHECK_EQ(sb.st_nlink, 3);
RL(rump_sys_rmdir(pb3));
+ /*
if (FSTYPE_TMPFS(tc))
atf_tc_expect_signal(-1, PR kern/44288);
+ */
RL(rump_sys_rmdir(pb1));
}
@@ -322,9 +326,11 @@
atf_tc_fail_errno(self-dotdot from);
atf_tc_expect_pass();
+ /*
if (FSTYPE_TMPFS(tc)) {
atf_tc_expect_fail(PR kern/43617);
}
+ */
if (rump_sys_rename(dir1, dir2/..) != -1 || errno != EINVAL)
atf_tc_fail(other-dotdot);
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon May 30 13:47:02 UTC 2011
Modified Files:
src/share/mk: bsd.README bsd.sys.mk
Log Message:
Add an alternative to NOGCCERROR for clang.
To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/share/mk/bsd.README
cvs rdiff -u -r1.201 -r1.202 src/share/mk/bsd.sys.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.README
diff -u src/share/mk/bsd.README:1.282 src/share/mk/bsd.README:1.283
--- src/share/mk/bsd.README:1.282 Fri May 20 16:02:23 2011
+++ src/share/mk/bsd.README Mon May 30 13:47:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.282 2011/05/20 16:02:23 plunky Exp $
+# $NetBSD: bsd.README,v 1.283 2011/05/30 13:47:01 joerg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -1623,6 +1623,9 @@
-Werror -Wa,--fatal-warnings
(The latter being for as(1).)
+NOCLANGERROR If defined and clang is used as C compiler, -Werror is not
+ passed to it.
+
WARNS Crank up GCC warning options; the distinct levels are:
WARNS=1
WARNS=2
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.201 src/share/mk/bsd.sys.mk:1.202
--- src/share/mk/bsd.sys.mk:1.201 Thu May 26 12:56:30 2011
+++ src/share/mk/bsd.sys.mk Mon May 30 13:47:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.201 2011/05/26 12:56:30 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.202 2011/05/30 13:47:01 joerg Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -65,7 +65,8 @@
CWARNFLAGS+= ${CWARNFLAGS.${ACTIVE_CC}}
CPPFLAGS+= ${AUDIT:D-D__AUDIT__}
-CFLAGS+= ${CWARNFLAGS} ${NOGCCERROR:D:U-Werror}
+_NOWERROR= ${defined(NOGCCERROR) || (${ACTIVE_CC} == clang defined(NOCLANGERROR)):?yes:no}
+CFLAGS+= ${CWARNFLAGS} ${${_NOWERROR} == no :?-Werror:}
LINTFLAGS+= ${DESTDIR:D-d ${DESTDIR}/usr/include}
.if (${MACHINE_ARCH} == alpha) || \
CVS commit: src/sys/external/bsd/drm/dist/shared-core
Module Name:src
Committed By: joerg
Date: Mon May 30 13:50:36 UTC 2011
Modified Files:
src/sys/external/bsd/drm/dist/shared-core: radeon_cp.c
Log Message:
Remove invalid const, the content is later passed to free.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm/dist/shared-core/radeon_cp.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/drm/dist/shared-core/radeon_cp.c
diff -u src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c:1.12 src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c:1.13
--- src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c:1.12 Wed Mar 30 19:59:04 2011
+++ src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c Mon May 30 13:50:36 2011
@@ -378,7 +378,7 @@
static void radeon_cp_load_microcode(drm_radeon_private_t * dev_priv)
{
const char *chip_name;
- const u32 (*cp)[2];
+ u32 (*cp)[2];
int i, error;
size_t cp_size;
DRM_DEBUG(\n);
CVS commit: src/sys/external/bsd/drm/dist/shared-core
Module Name:src
Committed By: joerg
Date: Mon May 30 13:52:26 UTC 2011
Modified Files:
src/sys/external/bsd/drm/dist/shared-core: radeon_state.c
Log Message:
Fix format strings to match arguments
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm/dist/shared-core/radeon_state.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/drm/dist/shared-core/radeon_state.c
diff -u src/sys/external/bsd/drm/dist/shared-core/radeon_state.c:1.6 src/sys/external/bsd/drm/dist/shared-core/radeon_state.c:1.7
--- src/sys/external/bsd/drm/dist/shared-core/radeon_state.c:1.6 Sat Nov 6 22:06:10 2010
+++ src/sys/external/bsd/drm/dist/shared-core/radeon_state.c Mon May 30 13:52:26 2011
@@ -1748,7 +1748,7 @@
DRM_DEBUG(tex=%dx%d blit=%d\n, tex_width, tex-height, blit_width);
do {
- DRM_DEBUG(tex: ofs=0x%x p=%d f=%d x=%hd y=%hd w=%hd h=%hd\n,
+ DRM_DEBUG(tex: ofs=0x%x p=%d f=%d x=%u y=%u w=%u h=%u\n,
tex-offset 10, tex-pitch, tex-format,
image-x, image-y, image-width, image-height);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: joerg Date: Mon May 30 13:55:27 UTC 2011 Modified Files: src/sys/dev/usb: umidi.c Log Message: Don't play format string tricks, use two calls with the correct number of arguments for each. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/umidi.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/umidi.c diff -u src/sys/dev/usb/umidi.c:1.42 src/sys/dev/usb/umidi.c:1.43 --- src/sys/dev/usb/umidi.c:1.42 Wed Nov 3 22:34:24 2010 +++ src/sys/dev/usb/umidi.c Mon May 30 13:55:27 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: umidi.c,v 1.42 2010/11/03 22:34:24 dyoung Exp $ */ +/* $NetBSD: umidi.c,v 1.43 2011/05/30 13:55:27 joerg Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: umidi.c,v 1.42 2010/11/03 22:34:24 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: umidi.c,v 1.43 2011/05/30 13:55:27 joerg Exp $); #include sys/types.h #include sys/param.h @@ -1291,21 +1291,23 @@ show_ep_in = sc- sc_in_num_endpoints 1 !sc-cblnums_global; show_ep_out = sc-sc_out_num_endpoints 1 !sc-cblnums_global; - if ( NULL != md-in_jack ) - snprintf(in_label, sizeof in_label, - show_ep_in ? %d(%x) : %d , - md-in_jack-cable_number, - md-in_jack-endpoint-addr); - else + if ( NULL == md-in_jack ) in_label[0] = '\0'; - - if ( NULL != md-out_jack ) - snprintf(out_label, sizeof out_label, - show_ep_out ? %d(%x) : %d , - md-out_jack-cable_number, - md-out_jack-endpoint-addr); + else if ( show_ep_in ) + snprintf(in_label, sizeof in_label, %d(%x) , + md-in_jack-cable_number, md-in_jack-endpoint-addr); else + snprintf(in_label, sizeof in_label, %d , + md-in_jack-cable_number); + + if ( NULL == md-out_jack ) out_label[0] = '\0'; + else if ( show_ep_out ) + snprintf(out_label, sizeof out_label, %d(%x) , + md-out_jack-cable_number, md-out_jack-endpoint-addr); + else + snprintf(out_label, sizeof out_label, %d , + md-out_jack-cable_number); unit_label = device_xname(sc-sc_dev);
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon May 30 13:56:34 UTC 2011
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Reorder CWARNFLAGS and -Werror in CFLAGS to allow CWARNFLAGS and by
extension CWARNFLAGS.${SOURCE} to override it selectively.
To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/share/mk/bsd.sys.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.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.202 src/share/mk/bsd.sys.mk:1.203
--- src/share/mk/bsd.sys.mk:1.202 Mon May 30 13:47:01 2011
+++ src/share/mk/bsd.sys.mk Mon May 30 13:56:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.202 2011/05/30 13:47:01 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.203 2011/05/30 13:56:34 joerg Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -66,7 +66,7 @@
CPPFLAGS+= ${AUDIT:D-D__AUDIT__}
_NOWERROR= ${defined(NOGCCERROR) || (${ACTIVE_CC} == clang defined(NOCLANGERROR)):?yes:no}
-CFLAGS+= ${CWARNFLAGS} ${${_NOWERROR} == no :?-Werror:}
+CFLAGS+= ${${_NOWERROR} == no :?-Werror:} ${CWARNFLAGS}
LINTFLAGS+= ${DESTDIR:D-d ${DESTDIR}/usr/include}
.if (${MACHINE_ARCH} == alpha) || \
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: joerg
Date: Mon May 30 13:57:21 UTC 2011
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_eeprom.c
Log Message:
Silence warnings about unused return value for a dead hardware read.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.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/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c:1.2
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c:1.1.1.1 Thu Dec 11 04:46:48 2008
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c Mon May 30 13:57:21 2011
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5416_eeprom.c,v 1.1.1.1 2008/12/11 04:46:48 alc Exp $
+ * $Id: ar5416_eeprom.c,v 1.2 2011/05/30 13:57:21 joerg Exp $
*/
#include opt_ah.h
@@ -34,7 +34,7 @@
HAL_BOOL
ar5416EepromRead(struct ath_hal *ah, u_int off, uint16_t *data)
{
-OS_REG_READ(ah, AR5416_EEPROM_OFFSET + (off AR5416_EEPROM_S));
+(void)OS_REG_READ(ah, AR5416_EEPROM_OFFSET + (off AR5416_EEPROM_S));
if (!ath_hal_wait(ah, AR_EEPROM_STATUS_DATA,
AR_EEPROM_STATUS_DATA_BUSY | AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0))
return AH_FALSE;
CVS commit: src/sys/external/isc/atheros_hal/dist
Module Name:src Committed By: joerg Date: Mon May 30 13:58:24 UTC 2011 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5210: ar5210reg.h src/sys/external/isc/atheros_hal/dist/ar5211: ar5211reg.h Log Message: Define a few macros as unsigned to avoid UB when later shifting them in ways that involve integer overflow. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5210/ar5210reg.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5211/ar5211reg.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/external/isc/atheros_hal/dist/ar5210/ar5210reg.h diff -u src/sys/external/isc/atheros_hal/dist/ar5210/ar5210reg.h:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5210/ar5210reg.h:1.2 --- src/sys/external/isc/atheros_hal/dist/ar5210/ar5210reg.h:1.1.1.1 Thu Dec 11 04:46:30 2008 +++ src/sys/external/isc/atheros_hal/dist/ar5210/ar5210reg.h Mon May 30 13:58:23 2011 @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5210reg.h,v 1.1.1.1 2008/12/11 04:46:30 alc Exp $ + * $Id: ar5210reg.h,v 1.2 2011/05/30 13:58:23 joerg Exp $ */ #ifndef _DEV_ATH_AR5210REG_H #define _DEV_ATH_AR5210REG_H @@ -246,8 +246,8 @@ #define AR_SCR_SLE 0x0003 /* sleep enable */ #define AR_SCR_SLE_S 16 #define AR_SCR_SLE_WAKE 0x /* force wake */ -#define AR_SCR_SLE_SLP 0x0001 /* force sleep */ -#define AR_SCR_SLE_ALLOW 0x0002 /* allow to control sleep */ +#define AR_SCR_SLE_SLP 0x0001U /* force sleep */ +#define AR_SCR_SLE_ALLOW 0x0002U /* allow to control sleep */ #define AR_SCR_BITS \20\20SLE_SLP\21SLE_ALLOW #define AR_INTPEND_IP 0x0001 /* interrupt pending */ Index: src/sys/external/isc/atheros_hal/dist/ar5211/ar5211reg.h diff -u src/sys/external/isc/atheros_hal/dist/ar5211/ar5211reg.h:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5211/ar5211reg.h:1.2 --- src/sys/external/isc/atheros_hal/dist/ar5211/ar5211reg.h:1.1.1.1 Thu Dec 11 04:46:34 2008 +++ src/sys/external/isc/atheros_hal/dist/ar5211/ar5211reg.h Mon May 30 13:58:24 2011 @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211reg.h,v 1.1.1.1 2008/12/11 04:46:34 alc Exp $ + * $Id: ar5211reg.h,v 1.2 2011/05/30 13:58:24 joerg Exp $ */ #ifndef _DEV_ATH_AR5211REG_H #define _DEV_ATH_AR5211REG_H @@ -619,8 +619,8 @@ #define AR_SCR_SLE 0x0003 /* sleep enable mask */ #define AR_SCR_SLE_S 16 /* sleep enable bits shift */ #define AR_SCR_SLE_WAKE 0x /* force wake */ -#define AR_SCR_SLE_SLP 0x0001 /* force sleep */ -#define AR_SCR_SLE_NORM 0x0002 /* sleep logic normal operation */ +#define AR_SCR_SLE_SLP 0x0001U /* force sleep */ +#define AR_SCR_SLE_NORM 0x0002U /* sleep logic normal operation */ #define AR_SCR_SLE_UNITS 0x0008 /* SCR units/TU */ #define AR_SCR_BITS \20\20SLE_SLP\21SLE
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: joerg
Date: Mon May 30 14:20:20 UTC 2011
Modified Files:
src/distrib/utils/sysinst: run.c
Log Message:
Declare mmsg as string constant, not as a pointer to a string constant.
This avoids format strings warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/distrib/utils/sysinst/run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/run.c
diff -u src/distrib/utils/sysinst/run.c:1.66 src/distrib/utils/sysinst/run.c:1.67
--- src/distrib/utils/sysinst/run.c:1.66 Mon Apr 4 08:30:13 2011
+++ src/distrib/utils/sysinst/run.c Mon May 30 14:20:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.66 2011/04/04 08:30:13 mbalmer Exp $ */
+/* $NetBSD: run.c,v 1.67 2011/05/30 14:20:19 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -482,7 +482,7 @@
for (selectfailed = 0;;) {
if (selectfailed) {
- const char *mmsg = select(2) failed but no child died?;
+ const char mmsg[] = select(2) failed but no child died?;
if (logging)
(void)fprintf(logfp, mmsg);
errx(1, mmsg);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: joerg
Date: Mon May 30 14:20:48 UTC 2011
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c label.c main.c mbr.c
Log Message:
Use proper format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/distrib/utils/sysinst/bsddisklabel.c \
src/distrib/utils/sysinst/label.c
cvs rdiff -u -r1.59 -r1.60 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.86 -r1.87 src/distrib/utils/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.55 src/distrib/utils/sysinst/bsddisklabel.c:1.56
--- src/distrib/utils/sysinst/bsddisklabel.c:1.55 Mon Apr 4 08:30:12 2011
+++ src/distrib/utils/sysinst/bsddisklabel.c Mon May 30 14:20:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.55 2011/04/04 08:30:12 mbalmer Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.56 2011/05/30 14:20:48 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@
p = pi-ptn_sizes[opt];
if (p-mount[0] == 0) {
- wprintw(m-mw, msg_string(MSG_add_another_ptn));
+ wprintw(m-mw, %s, msg_string(MSG_add_another_ptn));
return;
}
size = p-size;
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.55 src/distrib/utils/sysinst/label.c:1.56
--- src/distrib/utils/sysinst/label.c:1.55 Mon May 3 23:04:12 2010
+++ src/distrib/utils/sysinst/label.c Mon May 30 14:20:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.55 2010/05/03 23:04:12 martin Exp $ */
+/* $NetBSD: label.c,v 1.56 2011/05/30 14:20:48 joerg Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: label.c,v 1.55 2010/05/03 23:04:12 martin Exp $);
+__RCSID($NetBSD: label.c,v 1.56 2011/05/30 14:20:48 joerg Exp $);
#endif
#include sys/types.h
@@ -519,7 +519,7 @@
msg_string(p-pi_flags PIF_MOUNT ? MSG_Yes : MSG_No));
break;
case PTN_MENU_MOUNTOPT:
- wprintw(m-mw, msg_string(MSG_mount_options_fmt));
+ wprintw(m-mw, %s, msg_string(MSG_mount_options_fmt));
if (p-pi_flags PIF_ASYNC)
wprintw(m-mw, async );
if (p-pi_flags PIF_NOATIME)
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.59 src/distrib/utils/sysinst/main.c:1.60
--- src/distrib/utils/sysinst/main.c:1.59 Fri Apr 8 15:53:44 2011
+++ src/distrib/utils/sysinst/main.c Mon May 30 14:20:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.59 2011/04/08 15:53:44 martin Exp $ */
+/* $NetBSD: main.c,v 1.60 2011/05/30 14:20:48 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -345,7 +345,7 @@
usage(void)
{
- (void)fprintf(stderr, msg_string(MSG_usage));
+ (void)fprintf(stderr, %s, msg_string(MSG_usage));
exit(1);
}
Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.86 src/distrib/utils/sysinst/mbr.c:1.87
--- src/distrib/utils/sysinst/mbr.c:1.86 Mon Apr 4 08:30:12 2011
+++ src/distrib/utils/sysinst/mbr.c Mon May 30 14:20:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.86 2011/04/04 08:30:12 mbalmer Exp $ */
+/* $NetBSD: mbr.c,v 1.87 2011/05/30 14:20:48 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -475,18 +475,18 @@
{
if (opt == 0) {
- wprintw(m-mw, msg_string(MSG_Dont_change));
+ wprintw(m-mw, %s, msg_string(MSG_Dont_change));
return;
}
if (opt == 1) {
- wprintw(m-mw, msg_string(MSG_Delete_partition));
+ wprintw(m-mw, %s, msg_string(MSG_Delete_partition));
return;
}
if (part_ids[opt - 1].id == -1) {
- wprintw(m-mw, msg_string(MSG_Other_kind));
+ wprintw(m-mw, %s, msg_string(MSG_Other_kind));
return;
}
- wprintw(m-mw, part_ids[opt - 1].name);
+ wprintw(m-mw, %s, part_ids[opt - 1].name);
}
static int
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: joerg
Date: Mon May 30 14:34:59 UTC 2011
Modified Files:
src/sys/arch/xen/xen: xennetback_xenbus.c
Log Message:
Use format string for the device name
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/xen/xen/xennetback_xenbus.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/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.45 src/sys/arch/xen/xen/xennetback_xenbus.c:1.46
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.45 Fri Apr 29 22:58:46 2011
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Mon May 30 14:34:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.45 2011/04/29 22:58:46 jym Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.46 2011/05/30 14:34:58 joerg Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xennetback_xenbus.c,v 1.45 2011/04/29 22:58:46 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: xennetback_xenbus.c,v 1.46 2011/05/30 14:34:58 joerg Exp $);
#include opt_xen.h
@@ -328,7 +328,7 @@
goto fail;
}
err = xenbus_printf(xbt, xbusd-xbusd_path,
- vifname, ifp-if_xname);
+ vifname, %s, ifp-if_xname);
if (err) {
aprint_error_ifnet(ifp,
failed to write %s/vifname: %d\n,
CVS commit: src
Module Name:src
Committed By: joerg
Date: Mon May 30 14:41:27 UTC 2011
Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/binutils/lib/libiberty: Makefile
src/external/gpl3/binutils/lib/libopcodes: Makefile
src/external/gpl3/binutils/usr.bin: Makefile.inc
src/gnu/lib/libgcc4: Makefile.inc
src/gnu/usr.bin/gcc4: Makefile.inc
src/lib/i18n_module: Makefile.inc
src/tests/fs/nfs: Makefile
src/usr.sbin/racoon: Makefile
src/usr.sbin/racoonctl: Makefile
Log Message:
Ignore warnings when building with clang for now.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/lib/libiberty/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/lib/libopcodes/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/Makefile.inc
cvs rdiff -u -r1.21 -r1.22 src/gnu/lib/libgcc4/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/gcc4/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/lib/i18n_module/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/nfs/Makefile
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/racoon/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/racoonctl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.4 src/external/gpl3/binutils/lib/libbfd/Makefile:1.5
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.4 Sun Mar 14 00:26:09 2010
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Mon May 30 14:41:26 2011
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2010/03/14 00:26:09 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/05/30 14:41:26 joerg Exp $
NOLINKLIB= # defined
NOLINT= # defined
NOMAN= # defined
NOPROFILE= # defined
+NOCLANGERROR= # defined
.include bsd.own.mk
Index: src/external/gpl3/binutils/lib/libiberty/Makefile
diff -u src/external/gpl3/binutils/lib/libiberty/Makefile:1.1 src/external/gpl3/binutils/lib/libiberty/Makefile:1.2
--- src/external/gpl3/binutils/lib/libiberty/Makefile:1.1 Tue Aug 18 20:22:02 2009
+++ src/external/gpl3/binutils/lib/libiberty/Makefile Mon May 30 14:41:26 2011
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:02 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/30 14:41:26 joerg Exp $
NOLINT= # defined
NOPROFILE= # defined
NOPIC= # defined
NOLINKLIB= # defined
+NOCLANGERROR= # defined
.include bsd.own.mk
Index: src/external/gpl3/binutils/lib/libopcodes/Makefile
diff -u src/external/gpl3/binutils/lib/libopcodes/Makefile:1.2 src/external/gpl3/binutils/lib/libopcodes/Makefile:1.3
--- src/external/gpl3/binutils/lib/libopcodes/Makefile:1.2 Thu Sep 3 08:24:06 2009
+++ src/external/gpl3/binutils/lib/libopcodes/Makefile Mon May 30 14:41:26 2011
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2009/09/03 08:24:06 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2011/05/30 14:41:26 joerg Exp $
NOLINKLIB= # defined
NOLINT= # defined
NOMAN= # defined
NOPROFILE= # defined
+NOCLANGERROR= # defined
.include bsd.own.mk
Index: src/external/gpl3/binutils/usr.bin/Makefile.inc
diff -u src/external/gpl3/binutils/usr.bin/Makefile.inc:1.2 src/external/gpl3/binutils/usr.bin/Makefile.inc:1.3
--- src/external/gpl3/binutils/usr.bin/Makefile.inc:1.2 Mon Oct 19 02:31:26 2009
+++ src/external/gpl3/binutils/usr.bin/Makefile.inc Mon May 30 14:41:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/10/19 02:31:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2011/05/30 14:41:26 joerg Exp $
BINDIR?= /usr/bin
@@ -16,4 +16,6 @@
LDADD+=-lz
DPADD+=${LIBZ}
+NOGCCERROR= # defined
+
.endif # __MAKEFILE_INC_INCLUDED__
Index: src/gnu/lib/libgcc4/Makefile.inc
diff -u src/gnu/lib/libgcc4/Makefile.inc:1.21 src/gnu/lib/libgcc4/Makefile.inc:1.22
--- src/gnu/lib/libgcc4/Makefile.inc:1.21 Fri May 20 21:45:35 2011
+++ src/gnu/lib/libgcc4/Makefile.inc Mon May 30 14:41:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21 2011/05/20 21:45:35 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.22 2011/05/30 14:41:26 joerg Exp $
.if ${MKGCC} != no
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -152,3 +152,4 @@
CLEANFILES+= ${FAKEHEADERS}
COPTS+= ${${ACTIVE_CC} == clang:?-fheinous-gnu-extensions:}
+NOCLANGERROR= # defined
Index: src/gnu/usr.bin/gcc4/Makefile.inc
diff -u src/gnu/usr.bin/gcc4/Makefile.inc:1.4 src/gnu/usr.bin/gcc4/Makefile.inc:1.5
--- src/gnu/usr.bin/gcc4/Makefile.inc:1.4 Fri May 20 22:13:22 2011
+++ src/gnu/usr.bin/gcc4/Makefile.inc Mon May 30 14:41:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2011/05/20 22:13:22 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2011/05/30 14:41:26 joerg Exp $
.include bsd.own.mk
@@ -62,3 +62,5 @@
# This depends on the extern inline mess, so downgrade to something safe.
# CPPFLAGS is
CVS commit: src
Module Name:src
Committed By: manu
Date: Mon May 30 14:50:08 UTC 2011
Modified Files:
src/lib/libperfuse: ops.c perfuse.c perfuse_if.h perfuse_priv.h
src/usr.sbin/perfused: msg.c perfused.c perfused.h
Log Message:
Use SOCK_SEQPACKET in perfuse if available. This fix file operations hangs
where the FUSE filesyste replied to an operation and got an ENOBUFS it did
not handle.
We now are also able to cleanly unmount
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libperfuse/perfuse.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libperfuse/perfuse_if.h
cvs rdiff -u -r1.17 -r1.18 src/lib/libperfuse/perfuse_priv.h
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/perfused/msg.c \
src/usr.sbin/perfused/perfused.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/perfused/perfused.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.27 src/lib/libperfuse/ops.c:1.28
--- src/lib/libperfuse/ops.c:1.27 Wed May 18 15:28:12 2011
+++ src/lib/libperfuse/ops.c Mon May 30 14:50:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.27 2011/05/18 15:28:12 manu Exp $ */
+/* $NetBSD: ops.c,v 1.28 2011/05/30 14:50:08 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -844,9 +844,12 @@
goto out;
}
- DPRINTF(%s unmounted, exit\n, ps-ps_target);
+ ps-ps_umount(pu);
- exit(0);
+ if (perfuse_diagflags PDF_MISC)
+ DPRINTF(%s unmounted, exit\n, ps-ps_target);
+
+ return 0;
out:
ps-ps_destroy_msg(pm);
Index: src/lib/libperfuse/perfuse.c
diff -u src/lib/libperfuse/perfuse.c:1.14 src/lib/libperfuse/perfuse.c:1.15
--- src/lib/libperfuse/perfuse.c:1.14 Wed May 18 15:25:19 2011
+++ src/lib/libperfuse/perfuse.c Mon May 30 14:50:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse.c,v 1.14 2011/05/18 15:25:19 manu Exp $ */
+/* $NetBSD: perfuse.c,v 1.15 2011/05/30 14:50:08 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -148,15 +148,25 @@
char *const argv[] = { progname, minus_i, fdstr, NULL};
uint32_t opt;
uint32_t optlen;
+ int sock_type = SOCK_SEQPACKET;
if (strcmp(path, _PATH_FUSE) != 0)
return open(path, flags, mode);
- if ((sv[0] = socket(PF_LOCAL, SOCK_DGRAM, 0)) == -1) {
+ /*
+ * Try SOCK_SEQPACKET then SOCK_DGRAM if unavailable
+ */
+ if ((sv[0] = socket(PF_LOCAL, SOCK_SEQPACKET, 0)) == -1) {
+ sock_type = SOCK_DGRAM;
+DWARNX(SEQPACKET local sockets unavailable, using less
+ reliable DGRAM sockets. Expect file operation hangs.);
+
+ if ((sv[0] = socket(PF_LOCAL, SOCK_DGRAM, 0)) == -1) {
#ifdef PERFUSE_DEBUG
- DWARN(%s:%d socket failed: %s, __func__, __LINE__);
+ DWARN(%s:%d socket failed: %s, __func__, __LINE__);
#endif
- return -1;
+ return -1;
+ }
}
/*
@@ -178,17 +188,16 @@
sun.sun_family = AF_LOCAL;
(void)strcpy(sun.sun_path, path);
- if (connect(sv[0], sa, (socklen_t)sun.sun_len) == 0)
+ if (connect(sv[0], sa, (socklen_t)sun.sun_len) == 0)
return sv[0];
-
/*
* Attempt to run perfused on our own
* if it does not run yet; In that case
* we will talk using a socketpair
* instead of /dev/fuse.
*/
- if (socketpair(PF_LOCAL, SOCK_DGRAM, 0, sv) != 0) {
+ if (socketpair(PF_LOCAL, sock_type, 0, sv) != 0) {
DWARN(%s:%d: socketpair failed, __func__, __LINE__);
return -1;
}
@@ -510,6 +519,7 @@
ps-ps_get_inpayload = pc-pc_get_inpayload;
ps-ps_get_outhdr = pc-pc_get_outhdr;
ps-ps_get_outpayload = pc-pc_get_outpayload;
+ ps-ps_umount = pc-pc_umount;
return pu;
}
@@ -558,12 +568,15 @@
ps = puffs_getspecific(pu);
ps-ps_flags |= PS_INLOOP;
- if (puffs_mainloop(ps-ps_pu) != 0)
+ if (puffs_mainloop(ps-ps_pu) != 0) {
DERR(EX_OSERR, puffs_mainloop failed);
- DERR(EX_OSERR, puffs_mainloop exit);
+ return -1;
+ }
- /* NOTREACHED */
- return -1;
+ /*
+ * Normal exit after unmount
+ */
+ return 0;
}
/* ARGSUSED0 */
Index: src/lib/libperfuse/perfuse_if.h
diff -u src/lib/libperfuse/perfuse_if.h:1.12 src/lib/libperfuse/perfuse_if.h:1.13
--- src/lib/libperfuse/perfuse_if.h:1.12 Wed May 18 15:22:54 2011
+++ src/lib/libperfuse/perfuse_if.h Mon May 30 14:50:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse_if.h,v 1.12 2011/05/18 15:22:54 manu Exp $ */
+/* $NetBSD: perfuse_if.h,v 1.13 2011/05/30 14:50:08 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -134,6 +134,7 @@
typedef struct fuse_in_header *(*perfuse_get_inhdr_fn)(perfuse_msg_t *);
typedef char *(*perfuse_get_inpayload_fn)(perfuse_msg_t *);
typedef char *(*perfuse_get_outpayload_fn)(perfuse_msg_t *);
+typedef void (*perfuse_umount_fn)(struct puffs_usermount *);
struct perfuse_callbacks {
perfuse_new_msg_fn pc_new_msg;
@@ -143,6 +144,7 @@
perfuse_get_inpayload_fn pc_get_inpayload;
perfuse_get_outhdr_fn
CVS commit: [rmind-uvmplock] src/sys
Module Name:src
Committed By: rmind
Date: Mon May 30 14:57:49 UTC 2011
Modified Files:
src/sys/fs/tmpfs [rmind-uvmplock]: tmpfs_subr.c
src/sys/fs/union [rmind-uvmplock]: union_subr.c
src/sys/fs/unionfs [rmind-uvmplock]: unionfs_subr.c
src/sys/kern [rmind-uvmplock]: vfs_vnode.c
src/sys/miscfs/genfs [rmind-uvmplock]: layer_subr.c
src/sys/sys [rmind-uvmplock]: vnode.h
Log Message:
- Amend getnewvnode(9) to take the lock for sharing, not a vnode.
- Update tmpfs to perform vnode and UVM object lock sharing correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.56.4.6 -r1.56.4.7 src/sys/fs/tmpfs/tmpfs_subr.c
cvs rdiff -u -r1.35.4.4 -r1.35.4.5 src/sys/fs/union/union_subr.c
cvs rdiff -u -r1.5.4.5 -r1.5.4.6 src/sys/fs/unionfs/unionfs_subr.c
cvs rdiff -u -r1.5.2.4 -r1.5.2.5 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.28.4.4 -r1.28.4.5 src/sys/miscfs/genfs/layer_subr.c
cvs rdiff -u -r1.214.2.6 -r1.214.2.7 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/fs/tmpfs/tmpfs_subr.c
diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.6 src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.7
--- src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.6 Sun May 22 04:29:04 2011
+++ src/sys/fs/tmpfs/tmpfs_subr.c Mon May 30 14:57:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_subr.c,v 1.56.4.6 2011/05/22 04:29:04 rmind Exp $ */
+/* $NetBSD: tmpfs_subr.c,v 1.56.4.7 2011/05/30 14:57:48 rmind Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.56.4.6 2011/05/22 04:29:04 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.56.4.7 2011/05/30 14:57:48 rmind Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -344,6 +344,7 @@
int
tmpfs_alloc_vp(struct mount *mp, struct tmpfs_node *node, struct vnode **vpp)
{
+ struct uvm_object *uobj;
int error;
struct vnode *vp;
@@ -364,16 +365,18 @@
break;
}
- /* Get a new vnode and associate it with our node. */
- error = getnewvnode(VT_TMPFS, mp, tmpfs_vnodeop_p, NULL, vp);
+ /*
+ * Get a new vnode and associate it with our inode. Share the
+ * lock with underlying UVM object.
+ */
+ uobj = node-tn_spec.tn_reg.tn_aobj;
+ error = getnewvnode(VT_TMPFS, mp, tmpfs_vnodeop_p,
+ uobj-vmobjlock, vp);
if (error != 0) {
mutex_exit(node-tn_vlock);
return error;
}
-
- /* Set UVM object to use vnode_t::v_interlock (share it). */
- uvm_obj_setlock(node-tn_spec.tn_reg.tn_aobj, vp-v_interlock);
- mutex_obj_hold(vp-v_interlock);
+ KASSERT(uobj-vmobjlock == vp-v_interlock);
error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
if (error != 0) {
Index: src/sys/fs/union/union_subr.c
diff -u src/sys/fs/union/union_subr.c:1.35.4.4 src/sys/fs/union/union_subr.c:1.35.4.5
--- src/sys/fs/union/union_subr.c:1.35.4.4 Sat May 21 03:38:24 2011
+++ src/sys/fs/union/union_subr.c Mon May 30 14:57:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: union_subr.c,v 1.35.4.4 2011/05/21 03:38:24 rmind Exp $ */
+/* $NetBSD: union_subr.c,v 1.35.4.5 2011/05/30 14:57:48 rmind Exp $ */
/*
* Copyright (c) 1994
@@ -72,7 +72,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.35.4.4 2011/05/21 03:38:24 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.35.4.5 2011/05/30 14:57:48 rmind Exp $);
#include sys/param.h
#include sys/systm.h
@@ -511,8 +511,9 @@
* Get a new vnode and share the lock with upper layer vnode,
* unless layers are inverted.
*/
+ vnode_t *svp = (uppervp != NULLVP) ? uppervp : lowervp;
error = getnewvnode(VT_UNION, mp, union_vnodeop_p,
- (uppervp != NULLVP ? uppervp : lowervp), vpp);
+ svp-v_interlock, vpp);
if (error) {
if (uppervp) {
if (dvp == uppervp)
Index: src/sys/fs/unionfs/unionfs_subr.c
diff -u src/sys/fs/unionfs/unionfs_subr.c:1.5.4.5 src/sys/fs/unionfs/unionfs_subr.c:1.5.4.6
--- src/sys/fs/unionfs/unionfs_subr.c:1.5.4.5 Sat May 21 03:38:25 2011
+++ src/sys/fs/unionfs/unionfs_subr.c Mon May 30 14:57:48 2011
@@ -95,8 +95,9 @@
* Get a new vnode and share the lock with upper layer vnode,
* unless layers are inverted.
*/
+ vnode_t *svp = (uppervp != NULLVP) ? uppervp : lowervp;
error = getnewvnode(VT_UNION, mp, unionfs_vnodeop_p,
- (uppervp != NULLVP ? uppervp : lowervp), vp);
+ svp-v_interlock, vp);
if (error != 0) {
return (error);
}
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.5.2.4 src/sys/kern/vfs_vnode.c:1.5.2.5
--- src/sys/kern/vfs_vnode.c:1.5.2.4 Sun May 22 04:29:04 2011
+++ src/sys/kern/vfs_vnode.c Mon May 30 14:57:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.5.2.4 2011/05/22 04:29:04 rmind Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.5.2.5 2011/05/30 14:57:48 rmind Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0,
CVS commit: src/sys/arch
Module Name:src
Committed By: joerg
Date: Mon May 30 15:06:33 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/i386/conf: Makefile.i386
src/sys/arch/xen/conf: Makefile.xen
Log Message:
Disable -Werror for ah_regdomain.c if building with clang as workaround
for http://llvm.org/bugs/show_bug.cgi?id=10030.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.170 -r1.171 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/xen/conf/Makefile.xen
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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.34 src/sys/arch/amd64/conf/Makefile.amd64:1.35
--- src/sys/arch/amd64/conf/Makefile.amd64:1.34 Fri May 20 13:21:54 2011
+++ src/sys/arch/amd64/conf/Makefile.amd64 Mon May 30 15:06:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.34 2011/05/20 13:21:54 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.35 2011/05/30 15:06:32 joerg Exp $
# Makefile for NetBSD
#
@@ -67,6 +67,7 @@
AFLAGS.mptramp.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
AFLAGS.linux32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
AFLAGS.netbsd32_sigcode.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == clang:?-Wno-error:}
##
## (5) link settings
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.170 src/sys/arch/i386/conf/Makefile.i386:1.171
--- src/sys/arch/i386/conf/Makefile.i386:1.170 Fri May 20 13:22:53 2011
+++ src/sys/arch/i386/conf/Makefile.i386 Mon May 30 15:06:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.170 2011/05/20 13:22:53 joerg Exp $
+# $NetBSD: Makefile.i386,v 1.171 2011/05/30 15:06:32 joerg Exp $
# Makefile for NetBSD
#
@@ -36,6 +36,7 @@
CPPFLAGS+= -Di386
AFLAGS.mptramp.S= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == clang:?-Wno-error:}
##
## (3) libkern and compat
Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.32 src/sys/arch/xen/conf/Makefile.xen:1.33
--- src/sys/arch/xen/conf/Makefile.xen:1.32 Fri May 20 13:12:59 2011
+++ src/sys/arch/xen/conf/Makefile.xen Mon May 30 15:06:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xen,v 1.32 2011/05/20 13:12:59 joerg Exp $
+# $NetBSD: Makefile.xen,v 1.33 2011/05/30 15:06:32 joerg Exp $
# NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp
# Makefile for NetBSD
@@ -57,6 +57,7 @@
AFLAGS.linux32_sigcode.S+= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
AFLAGS.netbsd32_sigcode.S+= ${${ACTIVE_CC} == clang:?-no-integrated-as:}
+CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == clang:?-Wno-error:}
##
## (4) local objects, compile rules, and dependencies
CVS commit: xsrc/external/mit/xf86-video-igs/dist/src
Module Name:xsrc
Committed By: christos
Date: Mon May 30 15:11:33 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-igs/dist/src: igs_driver.c
Log Message:
return FALSE;
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.7 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.8
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.7 Sun May 29 08:42:59 2011
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Mon May 30 11:11:33 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
-/* $NetBSD: igs_driver.c,v 1.7 2011/05/29 12:42:59 christos Exp $ */
+/* $NetBSD: igs_driver.c,v 1.8 2011/05/30 15:11:33 christos Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -407,7 +407,7 @@
pScrn-LeaveVT = IgsLeaveVT;
pScrn-ValidMode = IgsValidMode;
if (!IgsGetRec(pScrn)) {
- return;
+ return FALSE;
}
cPtr = IGSPTR(pScrn);
cPtr-Chipset = chipset;
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc
Module Name:xsrc Committed By: christos Date: Mon May 30 15:31:56 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c wscons.c wscons.h Log Message: make this compile. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.10 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.11 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.10 Sat May 28 09:24:04 2011 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c Mon May 30 11:31:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vidc.c,v 1.10 2011/05/28 13:24:04 christos Exp $ */ +/* $NetBSD: vidc.c,v 1.11 2011/05/30 15:31:56 christos Exp $ */ /* * Copyright (c) 1999 Neil A. Carson Mark Brinicombe @@ -50,24 +50,38 @@ #include unistd.h #include errno.h + /* X11 headers */ #include Xos.h #include X.h #include Xproto.h -#include mi.h +#include Xmd.h +#ifndef PSZ +#define PSZ 8 +#endif #include cfb.h -#include screenint.h +#undef PSZ +#include cfb16.h +#include cfb32.h +#include colormap.h +#include colormapst.h +#include cursor.h +#include dixfontstr.h +#include fontstruct.h +#include gcstruct.h #include input.h #include inputstr.h -#include cursor.h +#include mi.h +#include mifillarc.h +#include mipointer.h #include misc.h +#include mistruct.h +#include pixmapstr.h +#include regionstr.h +#include resource.h #include scrnintstr.h #include servermd.h -#include mipointer.h -#include colormap.h -#include colormapst.h -#include resource.h #include wscons.h /* #define DEBUG */ @@ -482,7 +496,7 @@ RegisterPointerDevice(mouse); RegisterKeyboardDevice(keyboard); miRegisterPointerDevice(screenInfo.screens[0], mouse); - if (!mieqInit(keyboard, mouse)) + if (!mieqInit((DevicePtr)keyboard, (DevicePtr)mouse)) FatalError(mieqInit failed!!\n); /* Start taking some SIGIOs on input device file descriptors. */ Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.5 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.6 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.5 Thu May 19 21:22:37 2011 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c Mon May 30 11:31:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wscons.c,v 1.5 2011/05/20 01:22:37 christos Exp $ */ +/* $NetBSD: wscons.c,v 1.6 2011/05/30 15:31:56 christos Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -47,6 +47,7 @@ #include input.h #include cursor.h #include misc.h +#include mi.h #include scrnintstr.h #include servermd.h #include mipointer.h Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.3 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.2 Mon May 23 15:58:56 2011 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h Mon May 30 11:31:56 2011 @@ -12,3 +12,5 @@ void wsdisplay_closedown(void); void wskbd_closedown(void); + +int mouse_accel(DeviceIntPtr, int);
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Mon May 30 15:38:07 UTC 2011 Modified Files: src/distrib/sets/lists/comp: ad.m68k Log Message: add missing debuglib To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/comp/ad.m68k 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.m68k diff -u src/distrib/sets/lists/comp/ad.m68k:1.41 src/distrib/sets/lists/comp/ad.m68k:1.42 --- src/distrib/sets/lists/comp/ad.m68k:1.41 Sun Mar 14 05:52:00 2010 +++ src/distrib/sets/lists/comp/ad.m68k Mon May 30 11:38:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.m68k,v 1.41 2010/03/14 09:52:00 mrg Exp $ +# $NetBSD: ad.m68k,v 1.42 2011/05/30 15:38:07 christos Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/include/m68kcomp-c-include ./usr/include/m68k/ansi.h comp-c-include @@ -59,5 +59,6 @@ ./usr/include/m68k/wchar_limits.h comp-c-include ./usr/lib/libm68k.acomp-c-lib ./usr/lib/libm68k_p.acomp-c-lib profile +./usr/lib/libm68k_g.a-unknown- debuglib ./usr/libdata/debug/usr/bin/elf2aout.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
CVS commit: src/external/gpl2/lvm2/dist/lib/report
Module Name:src
Committed By: joerg
Date: Mon May 30 16:03:02 UTC 2011
Modified Files:
src/external/gpl2/lvm2/dist/lib/report: report.c
Log Message:
Pull in report.c, 1.107 from upstream:
Use offsetof() macro and avoid defining dummy static union for FIELD()
macro. Makes it compilable by clang compiler.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/gpl2/lvm2/dist/lib/report/report.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/gpl2/lvm2/dist/lib/report/report.c
diff -u src/external/gpl2/lvm2/dist/lib/report/report.c:1.1.1.3 src/external/gpl2/lvm2/dist/lib/report/report.c:1.2
--- src/external/gpl2/lvm2/dist/lib/report/report.c:1.1.1.3 Wed Dec 2 00:26:46 2009
+++ src/external/gpl2/lvm2/dist/lib/report/report.c Mon May 30 16:03:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: report.c,v 1.1.1.3 2009/12/02 00:26:46 haad Exp $ */
+/* $NetBSD: report.c,v 1.2 2011/05/30 16:03:02 joerg Exp $ */
/*
* Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
@@ -26,6 +26,8 @@
#include str_list.h
#include lvmcache.h
+#include stddef.h /* offsetof() */
+
struct lvm_report_object {
struct volume_group *vg;
struct logical_volume *lv;
@@ -34,17 +36,6 @@
struct pv_segment *pvseg;
};
-/*
- * For macro use
- */
-static union {
- struct physical_volume _pv;
- struct logical_volume _lv;
- struct volume_group _vg;
- struct lv_segment _seg;
- struct pv_segment _pvseg;
-} _dummy;
-
static char _alloc_policy_char(alloc_policy_t alloc)
{
switch (alloc) {
@@ -1158,9 +1149,17 @@
#define STR DM_REPORT_FIELD_TYPE_STRING
#define NUM DM_REPORT_FIELD_TYPE_NUMBER
-#define FIELD(type, strct, sorttype, head, field, width, func, id, desc) {type, sorttype, (off_t)((uintptr_t)_dummy._ ## strct.field - (uintptr_t)_dummy._ ## strct), width, id, head, _ ## func ## _disp, desc},
+#define FIELD(type, strct, sorttype, head, field, width, func, id, desc) \
+ {type, sorttype, offsetof(type_ ## strct, field), width, \
+ id, head, _ ## func ## _disp, desc},
+
+typedef struct physical_volume type_pv;
+typedef struct logical_volume type_lv;
+typedef struct volume_group type_vg;
+typedef struct lv_segment type_seg;
+typedef struct pv_segment type_pvseg;
-static struct dm_report_field_type _fields[] = {
+static const struct dm_report_field_type _fields[] = {
#include columns.h
{0, 0, 0, 0, , , NULL, NULL},
};
CVS commit: src/external/bsd/tmux/dist/compat
Module Name:src
Committed By: joerg
Date: Mon May 30 16:20:58 UTC 2011
Modified Files:
src/external/bsd/tmux/dist/compat: imsg-buffer.c imsg.c
Log Message:
Hacks for CMSG_SPACE() not being an ICE
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tmux/dist/compat/imsg-buffer.c \
src/external/bsd/tmux/dist/compat/imsg.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/tmux/dist/compat/imsg-buffer.c
diff -u src/external/bsd/tmux/dist/compat/imsg-buffer.c:1.1.1.1 src/external/bsd/tmux/dist/compat/imsg-buffer.c:1.2
--- src/external/bsd/tmux/dist/compat/imsg-buffer.c:1.1.1.1 Thu Mar 10 09:15:41 2011
+++ src/external/bsd/tmux/dist/compat/imsg-buffer.c Mon May 30 16:20:58 2011
@@ -1,4 +1,4 @@
-/* $Id: imsg-buffer.c,v 1.1.1.1 2011/03/10 09:15:41 jmmv Exp $ */
+/* $Id: imsg-buffer.c,v 1.2 2011/05/30 16:20:58 joerg Exp $ */
/* $OpenBSD: imsg-buffer.c,v 1.3 2010/05/26 13:56:07 nicm Exp $ */
/*
@@ -228,7 +228,11 @@
struct cmsghdr *cmsg;
union {
struct cmsghdr hdr;
+#ifdef __clang__
+ char buf[128];
+#else
char buf[CMSG_SPACE(sizeof(int))];
+#endif
} cmsgbuf;
bzero(iov, sizeof(iov));
@@ -248,7 +252,7 @@
if (buf != NULL buf-fd != -1) {
msg.msg_control = (caddr_t)cmsgbuf.buf;
- msg.msg_controllen = sizeof(cmsgbuf.buf);
+ msg.msg_controllen = CMSG_SPACE(sizeof(int));
cmsg = CMSG_FIRSTHDR(msg);
cmsg-cmsg_len = CMSG_LEN(sizeof(int));
cmsg-cmsg_level = SOL_SOCKET;
Index: src/external/bsd/tmux/dist/compat/imsg.c
diff -u src/external/bsd/tmux/dist/compat/imsg.c:1.1.1.1 src/external/bsd/tmux/dist/compat/imsg.c:1.2
--- src/external/bsd/tmux/dist/compat/imsg.c:1.1.1.1 Thu Mar 10 09:15:41 2011
+++ src/external/bsd/tmux/dist/compat/imsg.c Mon May 30 16:20:58 2011
@@ -1,4 +1,4 @@
-/* $Id: imsg.c,v 1.1.1.1 2011/03/10 09:15:41 jmmv Exp $ */
+/* $Id: imsg.c,v 1.2 2011/05/30 16:20:58 joerg Exp $ */
/* $OpenBSD: imsg.c,v 1.3 2010/05/26 13:56:07 nicm Exp $ */
/*
@@ -48,7 +48,11 @@
struct cmsghdr *cmsg;
union {
struct cmsghdr hdr;
+#ifdef __clang__
+ char buf[128];
+#else
char buf[CMSG_SPACE(sizeof(int) * 16)];
+#endif
} cmsgbuf;
struct iovec iov;
ssize_t n;
@@ -62,7 +66,7 @@
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_control = cmsgbuf.buf;
- msg.msg_controllen = sizeof(cmsgbuf.buf);
+ msg.msg_controllen = CMSG_SPACE(sizeof(int) * 16);
if ((n = recvmsg(ibuf-fd, msg, 0)) == -1) {
if (errno != EINTR errno != EAGAIN) {
CVS commit: src/external/ibm-public/postfix/dist/src/util
Module Name:src
Committed By: joerg
Date: Mon May 30 16:24:13 UTC 2011
Modified Files:
src/external/ibm-public/postfix/dist/src/util: unix_recv_fd.c
unix_send_fd.c
Log Message:
Hack for clang to workaround non-ICE CMSG_SPACE used in union.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c \
src/external/ibm-public/postfix/dist/src/util/unix_send_fd.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/ibm-public/postfix/dist/src/util/unix_recv_fd.c
diff -u src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c:1.4 src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c:1.5
--- src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c:1.4 Wed Mar 2 19:56:39 2011
+++ src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c Mon May 30 16:24:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: unix_recv_fd.c,v 1.4 2011/03/02 19:56:39 tron Exp $ */
+/* $NetBSD: unix_recv_fd.c,v 1.5 2011/05/30 16:24:13 joerg Exp $ */
/*++
/* NAME
@@ -70,7 +70,11 @@
#if defined(CMSG_SPACE) !defined(NO_MSGHDR_MSG_CONTROL)
union {
struct cmsghdr just_for_alignment;
- charcontrol[CMSG_SPACE(sizeof(newfd))];
+# ifdef __clang__
+ charcontrol[128];
+# else
+ charcontrol[CMSG_SPACE(sizeof(newfd))]
+# endif
} control_un;
struct cmsghdr *cmptr;
@@ -79,7 +83,7 @@
if (unix_pass_fd_fix UNIX_PASS_FD_FIX_CMSG_LEN) {
msg.msg_controllen = CMSG_LEN(sizeof(newfd)); /* Fix 200506 */
} else {
- msg.msg_controllen = sizeof(control_un.control); /* normal */
+ msg.msg_controllen = CMSG_SPACE(sizeof(newfd)); /* normal */
}
#else
msg.msg_accrights = (char *) newfd;
Index: src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c
diff -u src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c:1.4 src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c:1.5
--- src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c:1.4 Wed Mar 2 19:56:39 2011
+++ src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c Mon May 30 16:24:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: unix_send_fd.c,v 1.4 2011/03/02 19:56:39 tron Exp $ */
+/* $NetBSD: unix_send_fd.c,v 1.5 2011/05/30 16:24:13 joerg Exp $ */
/*++
/* NAME
@@ -72,7 +72,11 @@
#if defined(CMSG_SPACE) !defined(NO_MSGHDR_MSG_CONTROL)
union {
struct cmsghdr just_for_alignment;
+# ifdef __clang__
+ charcontrol[128];
+# else
charcontrol[CMSG_SPACE(sizeof(sendfd))];
+# endif
} control_un;
struct cmsghdr *cmptr;
@@ -81,7 +85,7 @@
if (unix_pass_fd_fix UNIX_PASS_FD_FIX_CMSG_LEN) {
msg.msg_controllen = CMSG_LEN(sizeof(sendfd)); /* Fix 200506 */
} else {
- msg.msg_controllen = sizeof(control_un.control); /* normal */
+ msg.msg_controllen = CMSG_SPACE(sizeof(sendfd)); /* normal */
}
cmptr = CMSG_FIRSTHDR(msg);
cmptr-cmsg_len = CMSG_LEN(sizeof(sendfd));
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Mon May 30 16:25:31 UTC 2011 Added Files: src/doc: TODO.clang Log Message: Document poinst where the LLVM/clang integration is unclean To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/doc/TODO.clang Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/doc/TODO.clang diff -u /dev/null src/doc/TODO.clang:1.1 --- /dev/null Mon May 30 16:25:31 2011 +++ src/doc/TODO.clang Mon May 30 16:25:31 2011 @@ -0,0 +1,20 @@ +$NetBSD: TODO.clang,v 1.1 2011/05/30 16:25:31 joerg Exp $ + +Hacks for the clang integration +--- + +-no-integrated-as is src/sys/modules, src/sys/arch/amd64, +src/sys/arch/i386 and src/sys/arch/xen to compensate for the missing +.code16 and .code32 support in LLVM MC. + +ah_regdomain.c in the kernel currently requires -Wno-error due to +http://llvm.org/bugs/show_bug.cgi?id=10030. + +Various places use NOCLANGERROR or CWARNFLAGS.clang to disable errors or +warnings. + +Issues with CMSG_SPACE() used inside a union: +src/external/tmux/dist/compat/imsg-buffer.c +src/external/tmux/dist/compat/imsg.c +src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c +src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Mon May 30 16:30:01 UTC 2011
Modified Files:
src/libexec/ld.elf_so: Makefile
Log Message:
Use -Wl,-Bsymbolic directly for clang
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/libexec/ld.elf_so/Makefile
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/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.105 src/libexec/ld.elf_so/Makefile:1.106
--- src/libexec/ld.elf_so/Makefile:1.105 Fri May 20 22:22:44 2011
+++ src/libexec/ld.elf_so/Makefile Mon May 30 16:30:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2011/05/20 22:22:44 joerg Exp $
+# $NetBSD: Makefile,v 1.106 2011/05/30 16:30:01 joerg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -38,7 +38,8 @@
(${MACHINE_ARCH} == vax)) \
${MKPIC} != no
-LDFLAGS+= -shared -symbolic -nostartfiles -nodefaultlibs
+LDFLAGS+= ${${ACTIVE_CC} == clang:? -Wl,-Bsymbolic : -symbolic} \
+ -shared -nostartfiles -nodefaultlibs
LDFLAGS+= -Wl,-static
LDFLAGS+= -Wl,--warn-shared-textrel
CVS commit: [rmind-uvmplock] src/sys/arch/xen/xen
Module Name:src
Committed By: rmind
Date: Mon May 30 17:16:47 UTC 2011
Modified Files:
src/sys/arch/xen/xen [rmind-uvmplock]: privcmd.c
Log Message:
privpgop_fault: simplify and sync with changes in the branch.
To generate a diff of this commit:
cvs rdiff -u -r1.41.4.2 -r1.41.4.3 src/sys/arch/xen/xen/privcmd.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/xen/xen/privcmd.c
diff -u src/sys/arch/xen/xen/privcmd.c:1.41.4.2 src/sys/arch/xen/xen/privcmd.c:1.41.4.3
--- src/sys/arch/xen/xen/privcmd.c:1.41.4.2 Thu May 19 03:43:00 2011
+++ src/sys/arch/xen/xen/privcmd.c Mon May 30 17:16:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: privcmd.c,v 1.41.4.2 2011/05/19 03:43:00 rmind Exp $ */
+/* $NetBSD: privcmd.c,v 1.41.4.3 2011/05/30 17:16:47 rmind Exp $ */
/*-
* Copyright (c) 2004 Christian Limpach.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: privcmd.c,v 1.41.4.2 2011/05/19 03:43:00 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: privcmd.c,v 1.41.4.3 2011/05/30 17:16:47 rmind Exp $);
#include sys/param.h
#include sys/systm.h
@@ -466,6 +466,7 @@
privpgop_detach(struct uvm_object *uobj)
{
struct privcmd_object *pobj = (struct privcmd_object *)uobj;
+
mutex_enter(uobj-vmobjlock);
if (uobj-uo_refs 1) {
uobj-uo_refs--;
@@ -486,35 +487,30 @@
struct vm_map_entry *entry = ufi-entry;
struct uvm_object *uobj = entry-object.uvm_obj;
struct privcmd_object *pobj = (struct privcmd_object*)uobj;
- int maddr_i;
- int i, error = 0;
+ int maddr_i, i, error = 0;
/* compute offset from start of map */
maddr_i = (entry-offset + (vaddr - entry-start)) PAGE_SHIFT;
- if (maddr_i + npages pobj-npages)
+ if (maddr_i + npages pobj-npages) {
return EINVAL;
+ }
for (i = 0; i npages; i++, maddr_i++, vaddr+= PAGE_SIZE) {
if ((flags PGO_ALLPAGES) == 0 i != centeridx)
continue;
if (pps[i] == PGO_DONTCARE)
continue;
if (pobj-maddr[maddr_i] == INVALID_PAGE) {
- /* this has already been flagged as error */
- uvmfault_unlockall(ufi, ufi-entry-aref.ar_amap,
- uobj, NULL);
- pmap_update(ufi-orig_map-pmap);
- return EFAULT;
+ /* This has already been flagged as error. */
+ error = EFAULT;
+ break;
}
error = pmap_enter_ma(ufi-orig_map-pmap, vaddr,
pobj-maddr[maddr_i], 0, ufi-entry-protection,
PMAP_CANFAIL | ufi-entry-protection,
pobj-domid);
if (error == ENOMEM) {
- uvmfault_unlockall(ufi, ufi-entry-aref.ar_amap,
- uobj, NULL);
- pmap_update(ufi-orig_map-pmap);
- uvm_wait(privpgop_fault);
- return (ERESTART);
+ error = ERESTART;
+ break;
}
if (error) {
/* XXX for proper ptp accountings */
@@ -522,9 +518,12 @@
vaddr + PAGE_SIZE);
}
}
- uvmfault_unlockall(ufi, ufi-entry-aref.ar_amap, uobj, NULL);
+ uvmfault_unlockall(ufi, ufi-entry-aref.ar_amap, uobj);
pmap_update(ufi-orig_map-pmap);
- return (error);
+ if (error == ERESTART) {
+ uvm_wait(privpgop_fault);
+ }
+ return error;
}
static int
CVS commit: src
Module Name:src
Committed By: njoly
Date: Mon May 30 18:14:11 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
Added Files:
src/tests/usr.bin/mkdep: Makefile t_mkdep.sh
Log Message:
Add testcase for PR bin/45004, to exercize suffixes lists for
mkdep(1).
To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.48 -r1.49 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/mkdep/Makefile \
src/tests/usr.bin/mkdep/t_mkdep.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.340 src/distrib/sets/lists/tests/mi:1.341
--- src/distrib/sets/lists/tests/mi:1.340 Sat May 28 16:12:56 2011
+++ src/distrib/sets/lists/tests/mi Mon May 30 18:14:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.340 2011/05/28 16:12:56 tron Exp $
+# $NetBSD: mi,v 1.341 2011/05/30 18:14:11 njoly Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -2344,6 +2344,9 @@
./usr/tests/usr.bin/diff/d_mallocv1.in tests-util-tests atf
./usr/tests/usr.bin/diff/d_mallocv2.in tests-util-tests atf
./usr/tests/usr.bin/diff/t_diff tests-util-tests atf
+./usr/tests/usr.bin/mkdep tests-util-tests
+./usr/tests/usr.bin/mkdep/Atffile tests-util-tests atf
+./usr/tests/usr.bin/mkdep/t_mkdep tests-util-tests atf
./usr/tests/usr.bin/prtests-util-tests
./usr/tests/usr.bin/pr/Atffile tests-util-tests atf
./usr/tests/usr.bin/pr/d_basic.in tests-util-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.48 src/etc/mtree/NetBSD.dist.tests:1.49
--- src/etc/mtree/NetBSD.dist.tests:1.48 Mon May 9 17:53:54 2011
+++ src/etc/mtree/NetBSD.dist.tests Mon May 30 18:14:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.48 2011/05/09 17:53:54 jruoho Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.49 2011/05/30 18:14:11 njoly Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -242,6 +242,7 @@
./usr/tests/toolchain/cc
./usr/tests/usr.bin
./usr/tests/usr.bin/diff
+./usr/tests/usr.bin/mkdep
./usr/tests/usr.bin/pr
./usr/tests/usr.bin/rump_server
./usr/tests/usr.bin/shmif_dumpbus
Added files:
Index: src/tests/usr.bin/mkdep/Makefile
diff -u /dev/null src/tests/usr.bin/mkdep/Makefile:1.1
--- /dev/null Mon May 30 18:14:11 2011
+++ src/tests/usr.bin/mkdep/Makefile Mon May 30 18:14:11 2011
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2011/05/30 18:14:11 njoly Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/usr.bin/mkdep
+
+TESTS_SH= t_mkdep
+
+.include bsd.test.mk
Index: src/tests/usr.bin/mkdep/t_mkdep.sh
diff -u /dev/null src/tests/usr.bin/mkdep/t_mkdep.sh:1.1
--- /dev/null Mon May 30 18:14:11 2011
+++ src/tests/usr.bin/mkdep/t_mkdep.sh Mon May 30 18:14:11 2011
@@ -0,0 +1,57 @@
+# $NetBSD: t_mkdep.sh,v 1.1 2011/05/30 18:14:11 njoly Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Nicolas Joly.
+#
+# 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.
+#
+# 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.
+#
+
+atf_test_case suffixes
+suffixes_head() {
+ atf_set descr Test suffixes list
+}
+
+suffixes_body() {
+
+ atf_check touch sample.c
+
+ # No list
+ atf_check mkdep -f sample.d sample.c
+ atf_check -o ignore grep '^sample.o:' sample.d
+
+ # Suffix list
+ atf_check mkdep -f sample.d -s '.a .b' sample.c
+ atf_check -o ignore grep '^sample.a sample.b:' sample.d
+
+ # Empty list
+ atf_expect_fail PR bin/45004
+ atf_check mkdep -f sample.d -s '' sample.c
+
CVS commit: src/external/ibm-public/postfix/dist/src/util
Module Name:src Committed By: pgoyette Date: Mon May 30 18:47:27 UTC 2011 Modified Files: src/external/ibm-public/postfix/dist/src/util: unix_recv_fd.c Log Message: Add missing semicolon so it compiles To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.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/ibm-public/postfix/dist/src/util/unix_recv_fd.c diff -u src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c:1.5 src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c:1.6 --- src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c:1.5 Mon May 30 16:24:13 2011 +++ src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c Mon May 30 18:47:27 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: unix_recv_fd.c,v 1.5 2011/05/30 16:24:13 joerg Exp $ */ +/* $NetBSD: unix_recv_fd.c,v 1.6 2011/05/30 18:47:27 pgoyette Exp $ */ /*++ /* NAME @@ -73,7 +73,7 @@ # ifdef __clang__ charcontrol[128]; # else - charcontrol[CMSG_SPACE(sizeof(newfd))] + charcontrol[CMSG_SPACE(sizeof(newfd))]; # endif } control_un; struct cmsghdr *cmptr;
CVS commit: src/gnu/lib/libgcc4
Module Name:src
Committed By: joerg
Date: Mon May 30 19:03:09 UTC 2011
Modified Files:
src/gnu/lib/libgcc4: Makefile.inc
Log Message:
Disable build with clang since it ends up calling __floatuntixf, which
this version of libgcc doesn't have.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/gnu/lib/libgcc4/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/lib/libgcc4/Makefile.inc
diff -u src/gnu/lib/libgcc4/Makefile.inc:1.22 src/gnu/lib/libgcc4/Makefile.inc:1.23
--- src/gnu/lib/libgcc4/Makefile.inc:1.22 Mon May 30 14:41:26 2011
+++ src/gnu/lib/libgcc4/Makefile.inc Mon May 30 19:03:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2011/05/30 14:41:26 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.23 2011/05/30 19:03:09 joerg Exp $
.if ${MKGCC} != no
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -6,6 +6,8 @@
.endif
.endif
+UNSUPPORTED_COMPILER.clang= # defined
+
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
GNUHOSTDIST= ${DIST}
GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
@@ -150,6 +152,3 @@
touch ${.TARGET}
DPSRCS+= ${FAKEHEADERS}
CLEANFILES+= ${FAKEHEADERS}
-
-COPTS+= ${${ACTIVE_CC} == clang:?-fheinous-gnu-extensions:}
-NOCLANGERROR= # defined
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: rmind Date: Mon May 30 19:22:44 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs_vnops.c Log Message: - tmpfs_getattr: perform tmpfs_update() before fetching the timestamps. - tmpfs_rmdir: detach after tn_links decrement, so that correct event i.e. NOTE_DELETE would be trigerred. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/fs/tmpfs/tmpfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/tmpfs/tmpfs_vnops.c diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.85 src/sys/fs/tmpfs/tmpfs_vnops.c:1.86 --- src/sys/fs/tmpfs/tmpfs_vnops.c:1.85 Sun May 29 22:29:07 2011 +++ src/sys/fs/tmpfs/tmpfs_vnops.c Mon May 30 19:22:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_vnops.c,v 1.85 2011/05/29 22:29:07 rmind Exp $ */ +/* $NetBSD: tmpfs_vnops.c,v 1.86 2011/05/30 19:22:44 rmind Exp $ */ /* * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.85 2011/05/29 22:29:07 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.86 2011/05/30 19:22:44 rmind Exp $); #include sys/param.h #include sys/dirent.h @@ -456,6 +456,8 @@ vattr_null(vap); + tmpfs_update(vp, NULL, NULL, NULL, 0); + vap-va_type = vp-v_type; vap-va_mode = node-tn_mode; vap-va_nlink = node-tn_links; @@ -478,7 +480,6 @@ vap-va_vaflags = 0; vap-va_spare = VNOVAL; /* XXX */ - tmpfs_update(vp, NULL, NULL, NULL, 0); return 0; } @@ -1094,13 +1095,13 @@ goto out; } - /* Detach the directory entry from the directory. */ - tmpfs_dir_detach(dvp, de); - /* Decrement the link count for the virtual '.' entry. */ node-tn_links--; node-tn_status |= TMPFS_NODE_STATUSALL; + /* Detach the directory entry from the directory. */ + tmpfs_dir_detach(dvp, de); + /* Purge the cache for parent. */ cache_purge(dvp);
CVS commit: src/tests/usr.bin
Module Name:src
Committed By: pgoyette
Date: Mon May 30 19:31:20 UTC 2011
Modified Files:
src/tests/usr.bin: Makefile
Log Message:
Descend into mkdep to catch its test
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.5 src/tests/usr.bin/Makefile:1.6
--- src/tests/usr.bin/Makefile:1.5 Tue May 3 15:13:50 2011
+++ src/tests/usr.bin/Makefile Mon May 30 19:31:19 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2011/05/03 15:13:50 jruoho Exp $
+# $NetBSD: Makefile,v 1.6 2011/05/30 19:31:19 pgoyette Exp $
#
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/usr.bin
-TESTS_SUBDIRS+= diff pr rump_server shmif_dumpbus unifdef
+TESTS_SUBDIRS+= diff mkdep pr rump_server shmif_dumpbus unifdef
.include bsd.test.mk
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: phx
Date: Mon May 30 19:48:12 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: siisata.c
Log Message:
When a drive is present, retry ATA-reset for a maximum of 10 seconds, until
successful.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/stand/altboot/siisata.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/sandpoint/stand/altboot/siisata.c
diff -u src/sys/arch/sandpoint/stand/altboot/siisata.c:1.3 src/sys/arch/sandpoint/stand/altboot/siisata.c:1.4
--- src/sys/arch/sandpoint/stand/altboot/siisata.c:1.3 Sun Mar 6 13:55:12 2011
+++ src/sys/arch/sandpoint/stand/altboot/siisata.c Mon May 30 19:48:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.3 2011/03/06 13:55:12 phx Exp $ */
+/* $NetBSD: siisata.c,v 1.4 2011/05/30 19:48:12 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
siisata_init(unsigned tag, void *data)
{
unsigned idreg;
- int nchan, n;
+ int n, nchan, retries;
struct dkdev_ata *l;
l = alloc(sizeof(struct dkdev_ata));
@@ -99,15 +99,22 @@
pcicfgwrite(tag, 0x80, 0x00);
pcicfgwrite(tag, 0x84, 0x00);
- for (n = 0; n nchan; n++) {
+ for (n = 0, retries = 0; n nchan; n++) {
+ l-presense[n] = 0;
+
if (satapresense(l, n)) {
/* drive present, now check whether soft reset works */
- if (perform_atareset(l, n)) {
-DPRINTF((port %d device present\n, n));
-l-presense[n] = 1;
+ while (retries++ 10) {
+if (perform_atareset(l, n)) {
+ DPRINTF((port %d device present\n, n));
+ l-presense[n] = 1;
+ break;
+}
+/* give the drive another second to spin up */
+if (retries 10)
+ delay(1000 * 1000);
}
- } else
- l-presense[n] = 0;
+ }
}
return l;
}
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: oster Date: Mon May 30 20:34:05 UTC 2011 Modified Files: src/sys/arch/evbmips/conf: MALTA64 Log Message: Bump SYMTAB_SPACE from 46 to 47 to let evbmips64-el and evbmips64-eb build again. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/MALTA64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/MALTA64 diff -u src/sys/arch/evbmips/conf/MALTA64:1.3 src/sys/arch/evbmips/conf/MALTA64:1.4 --- src/sys/arch/evbmips/conf/MALTA64:1.3 Sun Feb 20 07:48:33 2011 +++ src/sys/arch/evbmips/conf/MALTA64 Mon May 30 20:34:04 2011 @@ -1,4 +1,4 @@ -# $NetBSD: MALTA64,v 1.3 2011/02/20 07:48:33 matt Exp $ +# $NetBSD: MALTA64,v 1.4 2011/05/30 20:34:04 oster Exp $ # include arch/evbmips/conf/MALTA @@ -8,7 +8,7 @@ options EXEC_ELF64 options COMPAT_NETBSD32 no options SYMTAB_SPACE -options SYMTAB_SPACE=46 # size for embedded symbol table +options SYMTAB_SPACE=47 # size for embedded symbol table #options UVMHIST, UVMHIST_PRINT
CVS commit: src/sys/compat
Module Name:src Committed By: alnsn Date: Mon May 30 21:37:40 UTC 2011 Modified Files: src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/m68k: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux32/arch/amd64: linux32_syscall.h linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c Log Message: Regenerate files to pick up correct RCS Ids. Suggested by Chris Badura. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.79 -r1.80 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/arch/alpha/linux_syscalls.c cvs rdiff -u -r1.40 -r1.41 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.49 -r1.50 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.90 -r1.91 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.91 -r1.92 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.77 -r1.78 src/sys/compat/linux/arch/m68k/linux_syscall.h \ src/sys/compat/linux/arch/m68k/linux_syscalls.c \ src/sys/compat/linux/arch/m68k/linux_sysent.c cvs rdiff -u -r1.76 -r1.77 src/sys/compat/linux/arch/m68k/linux_syscallargs.h cvs rdiff -u -r1.46 -r1.47 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.45 -r1.46 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.53 -r1.54 src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.52 -r1.53 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.c cvs rdiff -u -r1.62 -r1.63 \ src/sys/compat/linux32/arch/amd64/linux32_syscall.h \ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \ src/sys/compat/linux32/arch/amd64/linux32_sysent.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/compat/linux/arch/alpha/linux_syscall.h diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.80 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.81 --- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.80 Mon May 30 17:50:31 2011 +++ src/sys/compat/linux/arch/alpha/linux_syscall.h Mon May 30 21:37:37 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.80 2011/05/30 17:50:31 alnsn Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.81 2011/05/30 21:37:37 alnsn Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.73 2011/04/15 13:04:52 he Exp + * created from NetBSD: syscalls.master,v 1.74 2011/05/30 17:50:31 alnsn Exp */ #ifndef _LINUX_SYS_SYSCALL_H_ Index: src/sys/compat/linux/arch/alpha/linux_sysent.c diff -u src/sys/compat/linux/arch/alpha/linux_sysent.c:1.80 src/sys/compat/linux/arch/alpha/linux_sysent.c:1.81 --- src/sys/compat/linux/arch/alpha/linux_sysent.c:1.80 Mon May 30 17:50:31 2011 +++ src/sys/compat/linux/arch/alpha/linux_sysent.c Mon May 30 21:37:37 2011 @@ -1,14 +1,14 @@ -/* $NetBSD: linux_sysent.c,v 1.80 2011/05/30 17:50:31 alnsn Exp $ */ +/* $NetBSD: linux_sysent.c,v 1.81 2011/05/30 21:37:37 alnsn Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.73 2011/04/15 13:04:52 he Exp + * created from NetBSD: syscalls.master,v 1.74 2011/05/30 17:50:31 alnsn Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_sysent.c,v 1.80 2011/05/30
CVS commit: src/usr.bin/mkdep
Module Name:src
Committed By: christos
Date: Mon May 30 22:52:13 UTC 2011
Modified Files:
src/usr.bin/mkdep: mkdep.c
Log Message:
Handle the empty suffix properly. Convert suffix list to a list from an
array and don't have limits in the suffix length. Also don't require that
suffixes have a single dot.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/mkdep/mkdep.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/mkdep/mkdep.c
diff -u src/usr.bin/mkdep/mkdep.c:1.36 src/usr.bin/mkdep/mkdep.c:1.37
--- src/usr.bin/mkdep/mkdep.c:1.36 Sun Apr 17 18:35:22 2011
+++ src/usr.bin/mkdep/mkdep.c Mon May 30 18:52:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdep.c,v 1.36 2011/04/17 22:35:22 christos Exp $ */
+/* $NetBSD: mkdep.c,v 1.37 2011/05/30 22:52:12 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#if !defined(lint)
__COPYRIGHT(@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\
All rights reserved.);
-__RCSID($NetBSD: mkdep.c,v 1.36 2011/04/17 22:35:22 christos Exp $);
+__RCSID($NetBSD: mkdep.c,v 1.37 2011/05/30 22:52:12 christos Exp $);
#endif /* not lint */
#include sys/mman.h
@@ -65,9 +65,10 @@
char name[4];
};
-typedef struct {
+typedef struct suff_list {
size_t len;
- char suff[12];
+ char *suff;
+ struct suff_list *next;
} suff_list_t;
/* tree of includes for -o processing */
@@ -125,10 +126,9 @@
tmpdir = _PATH_TMP;
(void)snprintf(tmpfilename, sizeof (tmpfilename), %s/%s, tmpdir,
mkdepXX);
- if ((tmpfd = mkstemp(tmpfilename)) 0) {
- warn(unable to create temporary file %s, tmpfilename);
- exit(EXIT_FAILURE);
- }
+ if ((tmpfd = mkstemp(tmpfilename)) 0)
+ err(EXIT_FAILURE, Unable to create temporary file %s,
+ tmpfilename);
(void)unlink(tmpfilename);
*fname = tmpfilename;
@@ -189,6 +189,22 @@
{ NULL, 0, NULL, '\0' },
};
+static void
+addsuff(suff_list_t **l, const char *s, size_t len)
+{
+ suff_list_t *p = calloc(1, sizeof(*p));
+ if (p == NULL)
+ err(1, calloc);
+ p-suff = malloc(len + 1);
+ if (p-suff == NULL)
+ err(1, malloc);
+ memcpy(p-suff, s, len);
+ p-suff[len] = '\0';
+ p-len = len;
+ p-next = *l;
+ *l = p;
+}
+
int
main(int argc, char **argv)
{
@@ -269,22 +285,15 @@
usage();
if (suffixes != NULL) {
- /* parse list once and save names and lengths */
- /* allocate an extra entry to mark end of list */
- for (sz = 1, s = suffixes; *s != 0; s++)
- if (*s == '.')
- sz++;
- suff_list = calloc(sz, sizeof *suff_list);
- if (suff_list == NULL)
- err(2, malloc);
- sl = suff_list;
- for (s = suffixes; (s = strchr(s, '.')); s += sz, sl++) {
- sz = strcspn(s, , );
- if (sz sizeof sl-suff)
-errx(2, suffix too long);
- sl-len = sz;
- memcpy(sl-suff, s, sz);
- }
+ if (*suffixes) {
+ for (s = suffixes; (sz = strcspn(s, , )) != 0;) {
+addsuff(suff_list, s, sz);
+s += sz;
+while (*s strchr(, , *s))
+ s++;
+ }
+ } else
+ addsuff(suff_list, , 0);
}
dependfile = open(filename, aflag, 0666);
@@ -368,8 +377,10 @@
errx(EXIT_FAILURE,
Corrupted file `%s', fname);
/* Then look for any valid suffix */
-for (sl = suff_list; sl-len != 0; sl++) {
- if (!memcmp(suf - sl-len, sl-suff,
+for (sl = suff_list; sl != NULL;
+sl = sl-next) {
+ if (sl-len
+ !memcmp(suf - sl-len, sl-suff,
sl-len))
break;
}
@@ -377,7 +388,7 @@
* Not found, check for .o, since the
* original file will have it.
*/
-if (sl-len == 0 suff_list-len != 0) {
+if (sl == NULL) {
if (memcmp(suf - 2, .o, 2) == 0)
slen = 2;
else
@@ -387,7 +398,8 @@
}
if (suff_list != NULL slen != 0) {
suf -= slen;
-for (sl = suff_list; sl-len != 0; sl++) {
+for (sl = suff_list; sl != NULL; sl = sl-next)
+{
if (sl != suff_list)
write(dependfile, , 1);
write(dependfile, line, suf - line);
CVS commit: src/sys/kern
Module Name:src
Committed By: rmind
Date: Tue May 31 00:15:28 UTC 2011
Modified Files:
src/sys/kern: kern_resource.c
Log Message:
sysctl_proc_corename: perform KAUTH_PROCESS_CORENAME check (for set case)
after the new name is copied into cnbuf. Spotted by enami@.
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/kern/kern_resource.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_resource.c
diff -u src/sys/kern/kern_resource.c:1.165 src/sys/kern/kern_resource.c:1.166
--- src/sys/kern/kern_resource.c:1.165 Tue May 24 01:19:48 2011
+++ src/sys/kern/kern_resource.c Tue May 31 00:15:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_resource.c,v 1.165 2011/05/24 01:19:48 mrg Exp $ */
+/* $NetBSD: kern_resource.c,v 1.166 2011/05/31 00:15:28 rmind Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_resource.c,v 1.165 2011/05/24 01:19:48 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_resource.c,v 1.166 2011/05/31 00:15:28 rmind Exp $);
#include sys/param.h
#include sys/systm.h
@@ -838,15 +838,6 @@
strlcpy(cnbuf, lim-pl_corename, MAXPATHLEN);
mutex_exit(lim-pl_lock);
}
- if (newp) {
- /* Set case: just use the temporary buffer. */
- error = kauth_authorize_process(l-l_cred,
- KAUTH_PROCESS_CORENAME, p,
- KAUTH_ARG(KAUTH_REQ_PROCESS_CORENAME_SET), cnbuf, NULL);
- if (error) {
- goto done;
- }
- }
node = *rnode;
node.sysctl_data = cnbuf;
@@ -858,9 +849,14 @@
}
/*
- * Validate new core name. It must be either core, /core,
- * or end in .core.
+ * Set case. Check permission and then validate new core name.
+ * It must be either core, /core, or end in .core.
*/
+ error = kauth_authorize_process(l-l_cred, KAUTH_PROCESS_CORENAME,
+ p, KAUTH_ARG(KAUTH_REQ_PROCESS_CORENAME_SET), cnbuf, NULL);
+ if (error) {
+ goto done;
+ }
len = strlen(cnbuf);
if ((len 4 || strcmp(cnbuf + len - 4, core) != 0) ||
(len 4 cnbuf[len - 5] != '/' cnbuf[len - 5] != '.')) {
CVS commit: [rmind-uvmplock] src/sys/fs/tmpfs
Module Name:src
Committed By: rmind
Date: Tue May 31 01:51:58 UTC 2011
Modified Files:
src/sys/fs/tmpfs [rmind-uvmplock]: tmpfs_subr.c
Log Message:
tmpfs_alloc_vp: perform lock sharing only for VREG.
To generate a diff of this commit:
cvs rdiff -u -r1.56.4.7 -r1.56.4.8 src/sys/fs/tmpfs/tmpfs_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/tmpfs/tmpfs_subr.c
diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.7 src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.8
--- src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.7 Mon May 30 14:57:48 2011
+++ src/sys/fs/tmpfs/tmpfs_subr.c Tue May 31 01:51:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_subr.c,v 1.56.4.7 2011/05/30 14:57:48 rmind Exp $ */
+/* $NetBSD: tmpfs_subr.c,v 1.56.4.8 2011/05/31 01:51:58 rmind Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.56.4.7 2011/05/30 14:57:48 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.56.4.8 2011/05/31 01:51:58 rmind Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -344,7 +344,7 @@
int
tmpfs_alloc_vp(struct mount *mp, struct tmpfs_node *node, struct vnode **vpp)
{
- struct uvm_object *uobj;
+ kmutex_t *slock;
int error;
struct vnode *vp;
@@ -367,16 +367,19 @@
/*
* Get a new vnode and associate it with our inode. Share the
- * lock with underlying UVM object.
+ * lock with underlying UVM object, if there is one (VREG case).
*/
- uobj = node-tn_spec.tn_reg.tn_aobj;
- error = getnewvnode(VT_TMPFS, mp, tmpfs_vnodeop_p,
- uobj-vmobjlock, vp);
+ if (node-tn_type == VREG) {
+ struct uvm_object *uobj = node-tn_spec.tn_reg.tn_aobj;
+ slock = uobj-vmobjlock;
+ } else {
+ slock = NULL;
+ }
+ error = getnewvnode(VT_TMPFS, mp, tmpfs_vnodeop_p, slock, vp);
if (error != 0) {
mutex_exit(node-tn_vlock);
return error;
}
- KASSERT(uobj-vmobjlock == vp-v_interlock);
error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
if (error != 0) {
CVS commit: src/usr.bin/mkdep
Module Name:src
Committed By: enami
Date: Tue May 31 02:34:32 UTC 2011
Modified Files:
src/usr.bin/mkdep: mkdep.c
Log Message:
Don't touch before the mmap'ed region.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/mkdep/mkdep.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/mkdep/mkdep.c
diff -u src/usr.bin/mkdep/mkdep.c:1.37 src/usr.bin/mkdep/mkdep.c:1.38
--- src/usr.bin/mkdep/mkdep.c:1.37 Mon May 30 22:52:12 2011
+++ src/usr.bin/mkdep/mkdep.c Tue May 31 02:34:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdep.c,v 1.37 2011/05/30 22:52:12 christos Exp $ */
+/* $NetBSD: mkdep.c,v 1.38 2011/05/31 02:34:32 enami Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#if !defined(lint)
__COPYRIGHT(@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\
All rights reserved.);
-__RCSID($NetBSD: mkdep.c,v 1.37 2011/05/30 22:52:12 christos Exp $);
+__RCSID($NetBSD: mkdep.c,v 1.38 2011/05/31 02:34:32 enami Exp $);
#endif /* not lint */
#include sys/mman.h
@@ -379,7 +379,7 @@
/* Then look for any valid suffix */
for (sl = suff_list; sl != NULL;
sl = sl-next) {
- if (sl-len
+ if (sl-len buf = suf - sl-len
!memcmp(suf - sl-len, sl-suff,
sl-len))
break;
CVS commit: src/usr.sbin/wsmoused
Module Name:src
Committed By: christos
Date: Tue May 31 03:37:02 UTC 2011
Modified Files:
src/usr.sbin/wsmoused: wsmoused.c
Log Message:
a little undocumented debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/wsmoused/wsmoused.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/wsmoused/wsmoused.c
diff -u src/usr.sbin/wsmoused/wsmoused.c:1.25 src/usr.sbin/wsmoused/wsmoused.c:1.26
--- src/usr.sbin/wsmoused/wsmoused.c:1.25 Sun Jan 18 19:53:15 2009
+++ src/usr.sbin/wsmoused/wsmoused.c Mon May 30 23:37:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmoused.c,v 1.25 2009/01/19 00:53:15 christos Exp $ */
+/* $NetBSD: wsmoused.c,v 1.26 2011/05/31 03:37:02 christos Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: wsmoused.c,v 1.25 2009/01/19 00:53:15 christos Exp $);
+__RCSID($NetBSD: wsmoused.c,v 1.26 2011/05/31 03:37:02 christos Exp $);
#endif /* not lint */
#include sys/ioctl.h
@@ -95,7 +95,7 @@
* Prototypes for functions private to this module.
*/
-static void usage(void);
+static void usage(void) __attribute__((__noreturn__));
static void open_device(unsigned int);
static void init_mouse(void);
static void event_loop(void);
@@ -105,7 +105,8 @@
static void detach_mode(const char *);
static void detach_modes(void);
static void signal_terminate(int);
-int main(int, char **);
+
+static int debug;
/* - */
@@ -295,6 +296,11 @@
if (fds[0].revents POLLIN) {
res = read(Mouse.m_statfd, event, sizeof(event));
+ if (debug)
+(void)fprintf(stderr, event [type=%u,value=%d,
+time=[%lld,%ld]\n, event.type,
+event.value, (long long)event.time.tv_sec,
+(long)event.time.tv_nsec);
if (res != sizeof(event))
log_warn(failed to read from mouse stat);
@@ -313,6 +319,11 @@
if (res != sizeof(event))
log_warn(failed to read from mouse);
+ if (debug)
+(void)fprintf(stderr, event [type=%u,value=%d,
+time=[%lld,%ld]\n, event.type,
+event.value, (long long)event.time.tv_sec,
+(long)event.time.tv_nsec);
if (Mouse.m_fifofd = 0) {
res = write(Mouse.m_fifofd, event,
sizeof(event));
@@ -500,8 +511,11 @@
nodaemon = -1;
/* Parse command line options */
- while ((opt = getopt(argc, argv, d:f:m:n)) != -1) {
+ while ((opt = getopt(argc, argv, Dd:f:m:n)) != -1) {
switch (opt) {
+ case 'D':
+ debug++;
+ break;
case 'd': /* Mouse device name */
Mouse.m_devname = optarg;
break;
CVS commit: src/sys/ddb
Module Name:src
Committed By: christos
Date: Tue May 31 03:40:22 UTC 2011
Modified Files:
src/sys/ddb: db_xxx.c
Log Message:
re-instate db_kill_proc
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/ddb/db_xxx.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/ddb/db_xxx.c
diff -u src/sys/ddb/db_xxx.c:1.62 src/sys/ddb/db_xxx.c:1.63
--- src/sys/ddb/db_xxx.c:1.62 Sat Jul 18 22:37:33 2009
+++ src/sys/ddb/db_xxx.c Mon May 30 23:40:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_xxx.c,v 1.62 2009/07/19 02:37:33 rmind Exp $ */
+/* $NetBSD: db_xxx.c,v 1.63 2011/05/31 03:40:22 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_xxx.c,v 1.62 2009/07/19 02:37:33 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_xxx.c,v 1.63 2011/05/31 03:40:22 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_kgdb.h
@@ -80,8 +80,47 @@
db_kill_proc(db_expr_t addr, bool haddr,
db_expr_t count, const char *modif)
{
+#ifdef _KERNEL /* XXX CRASH(8) */
+ struct proc *p;
+ ksiginfo_t ksi;
+ db_expr_t pid, sig;
+ int t;
+
+ /* What pid? */
+ if (!db_expression(pid)) {
+ db_error(pid?\n);
+ /*NOTREACHED*/
+ }
+ /* What sig? */
+ t = db_read_token();
+ if (t == tCOMMA) {
+ if (!db_expression(sig)) {
+ db_error(sig?\n);
+ /*NOTREACHED*/
+ }
+ } else {
+ db_unread_token(t);
+ sig = 15;
+ }
+ if (db_read_token() != tEOL) {
+ db_error(?\n);
+ /*NOTREACHED*/
+ }
+ p = proc_find((pid_t)pid);
+ if (p == NULL) {
+ db_error(no such proc\n);
+ /*NOTREACHED*/
+ }
+ KSI_INIT(ksi);
+ ksi.ksi_signo = sig;
+ ksi.ksi_code = SI_USER;
+ ksi.ksi_pid = 0;
+ ksi.ksi_uid = 0;
+ kpsignal2(p, ksi);
+#else
db_printf(This command is not currently supported.\n);
+#endif
}
#ifdef KGDB
CVS commit: src/share/man/man8/man8.i386
Module Name:src Committed By: uebayasi Date: Tue May 31 03:43:47 UTC 2011 Modified Files: src/share/man/man8/man8.i386: boot.8 Log Message: Sort list items. Remove a trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/share/man/man8/man8.i386/boot.8 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/man8/man8.i386/boot.8 diff -u src/share/man/man8/man8.i386/boot.8:1.57 src/share/man/man8/man8.i386/boot.8:1.58 --- src/share/man/man8/man8.i386/boot.8:1.57 Thu May 26 04:25:26 2011 +++ src/share/man/man8/man8.i386/boot.8 Tue May 31 03:43:47 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: boot.8,v 1.57 2011/05/26 04:25:26 uebayasi Exp $ +.\ $NetBSD: boot.8,v 1.58 2011/05/31 03:43:47 uebayasi Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -346,20 +346,6 @@ .Sx Console Selection Policy in .Xr boot_console 8 . -.It Ic vesa Bro Va modenum | Ar on | off | enabled | disabled | list Brc -Initialise the video card to the specified resolution and bit depth. -The -.Va modenum -should be in the form of -.Ar 0x100 , 800x600 , 800x600x32 . -The values -.Ar enabled , on -put the display into the default mode, and -.Ar disabled , off -returns the display into standard vga mode. -The value -.Ar list -lists all supported modes. .It Ic dev Op Va device Set the default drive and partition for subsequent filesystem operations. @@ -423,7 +409,7 @@ .Xr pxeboot 8 ) . .It Ic console Ns = Ns Ar dev Console used by DOM0 kernel during boot. -.Ar dev +.Ar dev accepts the same values as the ones given for the .Cm consdev command. @@ -567,6 +553,20 @@ These commands are processed before the interactive .Xr userconf 4 shell is executed, if requested . +.It Ic vesa Bro Va modenum | Ar on | off | enabled | disabled | list Brc +Initialise the video card to the specified resolution and bit depth. +The +.Va modenum +should be in the form of +.Ar 0x100 , 800x600 , 800x600x32 . +The values +.Ar enabled , on +put the display into the default mode, and +.Ar disabled , off +returns the display into standard vga mode. +The value +.Ar list +lists all supported modes. .El .Pp In an emergency, the bootstrap methods described in the
CVS commit: src/distrib/notes
Module Name:src Committed By: wiz Date: Mon May 30 06:19:54 UTC 2011 Modified Files: src/distrib/notes/macppc: install src/distrib/notes/mvme68k: install src/distrib/notes/sandpoint: install Log Message: Fix some typos, from OKANO Takayoshi in PR 45001. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/distrib/notes/macppc/install cvs rdiff -u -r1.22 -r1.23 src/distrib/notes/mvme68k/install cvs rdiff -u -r1.9 -r1.10 src/distrib/notes/sandpoint/install Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga
Module Name:xsrc Committed By: christos Date: Mon May 30 06:42:41 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaCursor.c amigaFbs.c amigaKbd.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h amigaCVCursor.c amigaCVblt.c amigaCVbstor.c amigaCVfrect.c amigaCVim.c amigaCVscrin.c Log Message: Ok, s3 is fixed. Now retina and cirrus To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c cvs rdiff -u -r1.4 -r1.5 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.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: christos Date: Mon May 30 09:53:40 UTC 2011 Modified Files: src/distrib/sets/lists/comp: md.sparc64 Log Message: fix my own typo To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/comp/md.sparc64 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: christos Date: Mon May 30 09:54:30 UTC 2011 Modified Files: src/distrib/sets/lists/comp: shl.mi Log Message: remove obsolete entries for .so.*.debug. njoly verified they are not needed (postinstall takes care of them automatically). To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga
Module Name:xsrc Committed By: christos Date: Mon May 30 11:00:18 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaInit.c amigaIo.c amigaKbd.c amigaMouse.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus: amigaCL.h clbitblt.c clblt.c clfillrct.c clgc.c clsolid.c clstuff.h clwindow.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina: amigaGX.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h s3bcach.c s3fcach.c s3ss.c s3text.c Log Message: finish making this compile, with a few warnings. Mainly fix prototypes, remove duplicate struct decls, add includes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c cvs rdiff -u -r1.4 -r1.5 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h cvs rdiff -u -r1.3 -r1.4 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.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/xen/xen
Module Name:src Committed By: joerg Date: Mon May 30 13:03:56 UTC 2011 Modified Files: src/sys/arch/xen/xen: if_xennet_xenbus.c Log Message: Use proper format string To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/xen/xen/if_xennet_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/vfs
Module Name:src Committed By: martin Date: Mon May 30 13:10:38 UTC 2011 Modified Files: src/tests/fs/vfs: t_vnops.c Log Message: Remove expected failure for tmpfs PRs that are now fixed. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/tests/fs/vfs/t_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: joerg Date: Mon May 30 13:47:02 UTC 2011 Modified Files: src/share/mk: bsd.README bsd.sys.mk Log Message: Add an alternative to NOGCCERROR for clang. To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/share/mk/bsd.README cvs rdiff -u -r1.201 -r1.202 src/share/mk/bsd.sys.mk 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/drm/dist/shared-core
Module Name:src Committed By: joerg Date: Mon May 30 13:50:36 UTC 2011 Modified Files: src/sys/external/bsd/drm/dist/shared-core: radeon_cp.c Log Message: Remove invalid const, the content is later passed to free. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/drm/dist/shared-core/radeon_cp.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/drm/dist/shared-core
Module Name:src Committed By: joerg Date: Mon May 30 13:52:26 UTC 2011 Modified Files: src/sys/external/bsd/drm/dist/shared-core: radeon_state.c Log Message: Fix format strings to match arguments To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm/dist/shared-core/radeon_state.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon May 30 13:56:34 UTC 2011
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Reorder CWARNFLAGS and -Werror in CFLAGS to allow CWARNFLAGS and by
extension CWARNFLAGS.${SOURCE} to override it selectively.
To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src Committed By: joerg Date: Mon May 30 13:57:21 UTC 2011 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_eeprom.c Log Message: Silence warnings about unused return value for a dead hardware read. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.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/isc/atheros_hal/dist
Module Name:src Committed By: joerg Date: Mon May 30 13:58:24 UTC 2011 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5210: ar5210reg.h src/sys/external/isc/atheros_hal/dist/ar5211: ar5211reg.h Log Message: Define a few macros as unsigned to avoid UB when later shifting them in ways that involve integer overflow. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5210/ar5210reg.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5211/ar5211reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: joerg Date: Mon May 30 14:20:48 UTC 2011 Modified Files: src/distrib/utils/sysinst: bsddisklabel.c label.c main.c mbr.c Log Message: Use proper format strings. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/distrib/utils/sysinst/bsddisklabel.c \ src/distrib/utils/sysinst/label.c cvs rdiff -u -r1.59 -r1.60 src/distrib/utils/sysinst/main.c cvs rdiff -u -r1.86 -r1.87 src/distrib/utils/sysinst/mbr.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/xen/xen
Module Name:src Committed By: joerg Date: Mon May 30 14:34:59 UTC 2011 Modified Files: src/sys/arch/xen/xen: xennetback_xenbus.c Log Message: Use format string for the device name To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/xen/xen/xennetback_xenbus.c 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: Mon May 30 14:41:27 UTC 2011 Modified Files: src/external/gpl3/binutils/lib/libbfd: Makefile src/external/gpl3/binutils/lib/libiberty: Makefile src/external/gpl3/binutils/lib/libopcodes: Makefile src/external/gpl3/binutils/usr.bin: Makefile.inc src/gnu/lib/libgcc4: Makefile.inc src/gnu/usr.bin/gcc4: Makefile.inc src/lib/i18n_module: Makefile.inc src/tests/fs/nfs: Makefile src/usr.sbin/racoon: Makefile src/usr.sbin/racoonctl: Makefile Log Message: Ignore warnings when building with clang for now. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/lib/libbfd/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/lib/libiberty/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/lib/libopcodes/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/Makefile.inc cvs rdiff -u -r1.21 -r1.22 src/gnu/lib/libgcc4/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/gcc4/Makefile.inc cvs rdiff -u -r1.11 -r1.12 src/lib/i18n_module/Makefile.inc cvs rdiff -u -r1.5 -r1.6 src/tests/fs/nfs/Makefile cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/racoon/Makefile cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/racoonctl/Makefile 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: manu Date: Mon May 30 14:50:08 UTC 2011 Modified Files: src/lib/libperfuse: ops.c perfuse.c perfuse_if.h perfuse_priv.h src/usr.sbin/perfused: msg.c perfused.c perfused.h Log Message: Use SOCK_SEQPACKET in perfuse if available. This fix file operations hangs where the FUSE filesyste replied to an operation and got an ENOBUFS it did not handle. We now are also able to cleanly unmount To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libperfuse/ops.c cvs rdiff -u -r1.14 -r1.15 src/lib/libperfuse/perfuse.c cvs rdiff -u -r1.12 -r1.13 src/lib/libperfuse/perfuse_if.h cvs rdiff -u -r1.17 -r1.18 src/lib/libperfuse/perfuse_priv.h cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/perfused/msg.c \ src/usr.sbin/perfused/perfused.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/perfused/perfused.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [rmind-uvmplock] src/sys
Module Name:src Committed By: rmind Date: Mon May 30 14:57:49 UTC 2011 Modified Files: src/sys/fs/tmpfs [rmind-uvmplock]: tmpfs_subr.c src/sys/fs/union [rmind-uvmplock]: union_subr.c src/sys/fs/unionfs [rmind-uvmplock]: unionfs_subr.c src/sys/kern [rmind-uvmplock]: vfs_vnode.c src/sys/miscfs/genfs [rmind-uvmplock]: layer_subr.c src/sys/sys [rmind-uvmplock]: vnode.h Log Message: - Amend getnewvnode(9) to take the lock for sharing, not a vnode. - Update tmpfs to perform vnode and UVM object lock sharing correctly. To generate a diff of this commit: cvs rdiff -u -r1.56.4.6 -r1.56.4.7 src/sys/fs/tmpfs/tmpfs_subr.c cvs rdiff -u -r1.35.4.4 -r1.35.4.5 src/sys/fs/union/union_subr.c cvs rdiff -u -r1.5.4.5 -r1.5.4.6 src/sys/fs/unionfs/unionfs_subr.c cvs rdiff -u -r1.5.2.4 -r1.5.2.5 src/sys/kern/vfs_vnode.c cvs rdiff -u -r1.28.4.4 -r1.28.4.5 src/sys/miscfs/genfs/layer_subr.c cvs rdiff -u -r1.214.2.6 -r1.214.2.7 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/sys/arch
Module Name:src Committed By: joerg Date: Mon May 30 15:06:33 UTC 2011 Modified Files: src/sys/arch/amd64/conf: Makefile.amd64 src/sys/arch/i386/conf: Makefile.i386 src/sys/arch/xen/conf: Makefile.xen Log Message: Disable -Werror for ah_regdomain.c if building with clang as workaround for http://llvm.org/bugs/show_bug.cgi?id=10030. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/conf/Makefile.amd64 cvs rdiff -u -r1.170 -r1.171 src/sys/arch/i386/conf/Makefile.i386 cvs rdiff -u -r1.32 -r1.33 src/sys/arch/xen/conf/Makefile.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-igs/dist/src
Module Name:xsrc Committed By: christos Date: Mon May 30 15:11:33 UTC 2011 Modified Files: xsrc/external/mit/xf86-video-igs/dist/src: igs_driver.c Log Message: return FALSE; To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc
Module Name:xsrc Committed By: christos Date: Mon May 30 15:31:56 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c wscons.c wscons.h Log Message: make this compile. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h 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: christos Date: Mon May 30 15:38:07 UTC 2011 Modified Files: src/distrib/sets/lists/comp: ad.m68k Log Message: add missing debuglib To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/comp/ad.m68k Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl2/lvm2/dist/lib/report
Module Name:src Committed By: joerg Date: Mon May 30 16:03:02 UTC 2011 Modified Files: src/external/gpl2/lvm2/dist/lib/report: report.c Log Message: Pull in report.c, 1.107 from upstream: Use offsetof() macro and avoid defining dummy static union for FIELD() macro. Makes it compilable by clang compiler. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/gpl2/lvm2/dist/lib/report/report.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/tmux/dist/compat
Module Name:src Committed By: joerg Date: Mon May 30 16:20:58 UTC 2011 Modified Files: src/external/bsd/tmux/dist/compat: imsg-buffer.c imsg.c Log Message: Hacks for CMSG_SPACE() not being an ICE To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tmux/dist/compat/imsg-buffer.c \ src/external/bsd/tmux/dist/compat/imsg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/ibm-public/postfix/dist/src/util
Module Name:src Committed By: joerg Date: Mon May 30 16:24:13 UTC 2011 Modified Files: src/external/ibm-public/postfix/dist/src/util: unix_recv_fd.c unix_send_fd.c Log Message: Hack for clang to workaround non-ICE CMSG_SPACE used in union. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c \ src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Mon May 30 16:25:31 UTC 2011 Added Files: src/doc: TODO.clang Log Message: Document poinst where the LLVM/clang integration is unclean To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/doc/TODO.clang Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Mon May 30 16:30:01 UTC 2011 Modified Files: src/libexec/ld.elf_so: Makefile Log Message: Use -Wl,-Bsymbolic directly for clang To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/libexec/ld.elf_so/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [rmind-uvmplock] src/sys/arch/xen/xen
Module Name:src Committed By: rmind Date: Mon May 30 17:16:47 UTC 2011 Modified Files: src/sys/arch/xen/xen [rmind-uvmplock]: privcmd.c Log Message: privpgop_fault: simplify and sync with changes in the branch. To generate a diff of this commit: cvs rdiff -u -r1.41.4.2 -r1.41.4.3 src/sys/arch/xen/xen/privcmd.c 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: njoly Date: Mon May 30 18:14:11 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Added Files: src/tests/usr.bin/mkdep: Makefile t_mkdep.sh Log Message: Add testcase for PR bin/45004, to exercize suffixes lists for mkdep(1). To generate a diff of this commit: cvs rdiff -u -r1.340 -r1.341 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.48 -r1.49 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/mkdep/Makefile \ src/tests/usr.bin/mkdep/t_mkdep.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/ibm-public/postfix/dist/src/util
Module Name:src Committed By: pgoyette Date: Mon May 30 18:47:27 UTC 2011 Modified Files: src/external/ibm-public/postfix/dist/src/util: unix_recv_fd.c Log Message: Add missing semicolon so it compiles To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/gnu/lib/libgcc4
Module Name:src Committed By: joerg Date: Mon May 30 19:03:09 UTC 2011 Modified Files: src/gnu/lib/libgcc4: Makefile.inc Log Message: Disable build with clang since it ends up calling __floatuntixf, which this version of libgcc doesn't have. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/gnu/lib/libgcc4/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: rmind Date: Mon May 30 19:22:44 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs_vnops.c Log Message: - tmpfs_getattr: perform tmpfs_update() before fetching the timestamps. - tmpfs_rmdir: detach after tn_links decrement, so that correct event i.e. NOTE_DELETE would be trigerred. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/fs/tmpfs/tmpfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin
Module Name:src Committed By: pgoyette Date: Mon May 30 19:31:20 UTC 2011 Modified Files: src/tests/usr.bin: Makefile Log Message: Descend into mkdep to catch its test To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: phx Date: Mon May 30 19:48:12 UTC 2011 Modified Files: src/sys/arch/sandpoint/stand/altboot: siisata.c Log Message: When a drive is present, retry ATA-reset for a maximum of 10 seconds, until successful. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/stand/altboot/siisata.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/evbmips/conf
Module Name:src Committed By: oster Date: Mon May 30 20:34:05 UTC 2011 Modified Files: src/sys/arch/evbmips/conf: MALTA64 Log Message: Bump SYMTAB_SPACE from 46 to 47 to let evbmips64-el and evbmips64-eb build again. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/MALTA64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src Committed By: alnsn Date: Mon May 30 21:37:40 UTC 2011 Modified Files: src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/m68k: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux32/arch/amd64: linux32_syscall.h linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c Log Message: Regenerate files to pick up correct RCS Ids. Suggested by Chris Badura. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.79 -r1.80 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/arch/alpha/linux_syscalls.c cvs rdiff -u -r1.40 -r1.41 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.49 -r1.50 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.90 -r1.91 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.91 -r1.92 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.77 -r1.78 src/sys/compat/linux/arch/m68k/linux_syscall.h \ src/sys/compat/linux/arch/m68k/linux_syscalls.c \ src/sys/compat/linux/arch/m68k/linux_sysent.c cvs rdiff -u -r1.76 -r1.77 src/sys/compat/linux/arch/m68k/linux_syscallargs.h cvs rdiff -u -r1.46 -r1.47 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.45 -r1.46 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.53 -r1.54 src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.52 -r1.53 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.c cvs rdiff -u -r1.62 -r1.63 \ src/sys/compat/linux32/arch/amd64/linux32_syscall.h \ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \ src/sys/compat/linux32/arch/amd64/linux32_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/mkdep
Module Name:src Committed By: christos Date: Mon May 30 22:52:13 UTC 2011 Modified Files: src/usr.bin/mkdep: mkdep.c Log Message: Handle the empty suffix properly. Convert suffix list to a list from an array and don't have limits in the suffix length. Also don't require that suffixes have a single dot. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.bin/mkdep/mkdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: rmind Date: Tue May 31 00:15:28 UTC 2011 Modified Files: src/sys/kern: kern_resource.c Log Message: sysctl_proc_corename: perform KAUTH_PROCESS_CORENAME check (for set case) after the new name is copied into cnbuf. Spotted by enami@. To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 src/sys/kern/kern_resource.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [rmind-uvmplock] src/sys/fs/tmpfs
Module Name:src Committed By: rmind Date: Tue May 31 01:51:58 UTC 2011 Modified Files: src/sys/fs/tmpfs [rmind-uvmplock]: tmpfs_subr.c Log Message: tmpfs_alloc_vp: perform lock sharing only for VREG. To generate a diff of this commit: cvs rdiff -u -r1.56.4.7 -r1.56.4.8 src/sys/fs/tmpfs/tmpfs_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/mkdep
Module Name:src Committed By: enami Date: Tue May 31 02:34:32 UTC 2011 Modified Files: src/usr.bin/mkdep: mkdep.c Log Message: Don't touch before the mmap'ed region. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.bin/mkdep/mkdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/wsmoused
Module Name:src Committed By: christos Date: Tue May 31 03:37:02 UTC 2011 Modified Files: src/usr.sbin/wsmoused: wsmoused.c Log Message: a little undocumented debugging. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/wsmoused/wsmoused.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
