CVS commit: [netbsd-5] src/distrib/notes/macppc
Module Name:src
Committed By: snj
Date: Fri Nov 5 07:29:48 UTC 2010
Modified Files:
src/distrib/notes/macppc [netbsd-5]: prep.OPENFIRMWARE
Log Message:
Pull up following revision(s) (requested by martin in ticket #1465):
distrib/notes/macppc/prep.OPENFIRMWARE: revision 1.14
Update rawrite32 url
To generate a diff of this commit:
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 src/distrib/notes/macppc/prep.OPENFIRMWARE
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/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.1 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.1 Sat Apr 25 23:16:35 2009
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Fri Nov 5 07:29:48 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: prep.OPENFIRMWARE,v 1.11.2.1 2009/04/25 23:16:35 snj Exp $
+.\ $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2 2010/11/05 07:29:48 snj Exp $
.if \*[OF_VERSION_3] \{\
.
.Ss2 Updating your BootROM
@@ -1268,7 +1268,7 @@
distribution or
.Ic rawrite32.exe
from
-.Lk http://www.duskware.com/rawrite32/
+.Lk http://www.NetBSD.org/~martin/rawrite32/
.Pp
.It
.Em From a MacOS 9 (or earlier) machine
@@ -1572,7 +1572,7 @@
Get
.Ic rawrite32.exe
from
-.Lk http://www.duskware.com/rawrite32/
+.Lk http://www.NetBSD.org/~martin/rawrite32/
.Pp
Be certain you have selected the correct disk, as it will erase the
contents.
CVS commit: [netbsd-5] src/distrib/notes/common
Module Name:src Committed By: snj Date: Fri Nov 5 07:30:25 UTC 2010 Modified Files: src/distrib/notes/common [netbsd-5]: main Log Message: Pull up following revision(s) (requested by martin in ticket #1465): distrib/notes/common/main: revision 1.467 Adapt to newer Rawrite32 version To generate a diff of this commit: cvs rdiff -u -r1.425.2.10 -r1.425.2.11 src/distrib/notes/common/main 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/common/main diff -u src/distrib/notes/common/main:1.425.2.10 src/distrib/notes/common/main:1.425.2.11 --- src/distrib/notes/common/main:1.425.2.10 Thu Nov 4 20:02:45 2010 +++ src/distrib/notes/common/main Fri Nov 5 07:30:24 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.425.2.10 2010/11/04 20:02:45 sborrill Exp $ +.\ $NetBSD: main,v 1.425.2.11 2010/11/05 07:30:24 snj Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -236,9 +236,9 @@ .Ic rawrite.exe MS-DOS program or the -.Ic Rawrite32.exe -Windows32 program (inside -.Pa rawrite32.zip ) +.Ic Rawrite32 +Windows32 program (installed by +.Pa rawr32.exe ) in the .Pa i386/installation/misc/ directory may be of help.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Fri Nov 5 07:39:22 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: 1465 To generate a diff of this commit: cvs rdiff -u -r1.1.2.247 -r1.1.2.248 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.247 src/doc/CHANGES-5.1:1.1.2.248 --- src/doc/CHANGES-5.1:1.1.2.247 Fri Oct 15 23:50:31 2010 +++ src/doc/CHANGES-5.1 Fri Nov 5 07:39:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.247 2010/10/15 23:50:31 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.248 2010/11/05 07:39:22 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -17521,3 +17521,13 @@ hdaudio appeared in 5.1. Add xref to hdaudioctl(8). [wiz, ticket #1457] +distrib/notes/common/main 1.467 +distrib/notes/macppc/prep.OPENFIRMWARE 1.14 +sys/arch/i386/stand/misc/Makefile 1.7 +sys/arch/i386/stand/misc/rawr32.exe.uue 1.1 +sys/arch/i386/stand/misc/rawr32.zip.uue delete +sys/arch/i386/stand/misc/rawr32src.zip.uue delete + + Update Rawrite32 to the latest version + [martin, ticket #1465] +
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgp
Module Name:src Committed By: agc Date: Fri Nov 5 07:39:59 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.am Log Message: Explicitly link netpgp with libmj, rather than letting libnetpgp bring it in. Fixes a build issue on RHEL 6. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.2 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.1 Tue Jun 9 00:51:03 2009 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am Fri Nov 5 07:39:59 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.1 2009/06/09 00:51:03 agc Exp $ +## $NetBSD: Makefile.am,v 1.2 2010/11/05 07:39:59 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -8,7 +8,7 @@ netpgp_CPPFLAGS = -I$(top_srcdir)/include -netpgp_LDADD = ../lib/libnetpgp.la +netpgp_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la man1_MANS = netpgp.1
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys
Module Name:src Committed By: agc Date: Fri Nov 5 07:40:41 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: Makefile.am Log Message: Explicitly link netpgp with libmj, rather than letting libnetpgp bring it in. Fixes a build issue on RHEL 6. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.3 --- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.2 Fri Nov 5 03:37:19 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am Fri Nov 5 07:40:41 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.2 2010/11/05 03:37:19 agc Exp $ +## $NetBSD: Makefile.am,v 1.3 2010/11/05 07:40:41 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -8,7 +8,7 @@ netpgpkeys_CPPFLAGS = -I$(top_srcdir)/include -I../libmj -netpgpkeys_LDADD = ../lib/libnetpgp.la +netpgpkeys_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la man1_MANS = netpgpkeys.1
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src Committed By: agc Date: Fri Nov 5 07:41:20 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.am Log Message: Explicitly link netpgpverify with libmj, rather than letting libnetpgp bring it in. Fixes a build issue on RHEL 6. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.3 --- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.2 Thu May 20 00:33:01 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am Fri Nov 5 07:41:20 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.2 2010/05/20 00:33:01 agc Exp $ +## $NetBSD: Makefile.am,v 1.3 2010/11/05 07:41:20 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -8,7 +8,7 @@ netpgpverify_CPPFLAGS = -I$(top_srcdir)/include -netpgpverify_LDADD = ../lib/libnetpgp.la +netpgpverify_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la man1_MANS = netpgpverify.1
CVS commit: [netbsd-5] src/distrib/notes/common
Module Name:src
Committed By: sborrill
Date: Fri Nov 5 07:55:58 UTC 2010
Modified Files:
src/distrib/notes/common [netbsd-5]: main
Log Message:
Only include link to binary compatibility packages on relevant ports
To generate a diff of this commit:
cvs rdiff -u -r1.425.2.11 -r1.425.2.12 src/distrib/notes/common/main
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/common/main
diff -u src/distrib/notes/common/main:1.425.2.11 src/distrib/notes/common/main:1.425.2.12
--- src/distrib/notes/common/main:1.425.2.11 Fri Nov 5 07:30:24 2010
+++ src/distrib/notes/common/main Fri Nov 5 07:55:58 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.425.2.11 2010/11/05 07:30:24 snj Exp $
+.\ $NetBSD: main,v 1.425.2.12 2010/11/05 07:55:58 sborrill Exp $
.\
.\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -1834,9 +1834,9 @@
before extracting the xbase set.
In the version of X.Org shipped with 5.0, this was a directory, but in more
recent X.Org versions it is a file.
+.if \n[i386]:\n[macppc]:\n[sparc]:\n[sparc64]:\n[amd64]:\n[sgimips] \{\
.Pp
-On ports using X.Org (amd64, i386, macppc, sgimips, shark and sparc64),
-libpixman and libXfont had their major versions bumped.
+On ports using X.Org, libpixman and libXfont had their major versions bumped.
This can be a source of trouble if using binary packages built on 5.0.x with
a clean install of \*V (upgrades from 5.0.x will include both old and new
versions of libpixman and libXfont).
@@ -1846,6 +1846,7 @@
This URL can be passed directly to the
.Xr pkg_add 1
command.
+.\}
.Pp
pkg_install now depends on the pkgdb cache for automatic conflict detection.
It is recommended to rebuild the cache with
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: phx
Date: Fri Nov 5 08:34:36 UTC 2010
Modified Files:
src/sys/arch/powerpc/oea: cpu_subr.c
Log Message:
Only read from HID1 when a G3 CPU was detected in cpu_get_dfs(), otherwise
the access might cause a PGM trap.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/powerpc/oea/cpu_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/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.57 src/sys/arch/powerpc/oea/cpu_subr.c:1.58
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.57 Thu Oct 28 13:58:03 2010
+++ src/sys/arch/powerpc/oea/cpu_subr.c Fri Nov 5 08:34:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.57 2010/10/28 13:58:03 macallan Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.58 2010/11/05 08:34:35 phx Exp $ */
/*-
* Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.57 2010/10/28 13:58:03 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.58 2010/11/05 08:34:35 phx Exp $);
#include opt_ppcparam.h
#include opt_multiprocessor.h
@@ -1002,18 +1002,17 @@
int
cpu_get_dfs(void)
{
- u_int hid1, pvr, vers;
+ u_int pvr, vers;
pvr = mfpvr();
vers = pvr 16;
- hid1 = mfspr(SPR_HID1);
switch (vers) {
case MPC7448:
- if (hid1 HID1_DFS4)
+ if (mfspr(SPR_HID1) HID1_DFS4)
return 4;
case MPC7447A:
- if (hid1 HID1_DFS2)
+ if (mfspr(SPR_HID1) HID1_DFS2)
return 2;
}
return 1;
CVS commit: [uebayasi-xip] src/share/man/man4
Module Name:src Committed By: uebayasi Date: Fri Nov 5 08:54:57 UTC 2010 Modified Files: src/share/man/man4 [uebayasi-xip]: xmd.4 Log Message: Document HOWTO. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/share/man/man4/xmd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/xmd.4 diff -u src/share/man/man4/xmd.4:1.1.2.2 src/share/man/man4/xmd.4:1.1.2.3 --- src/share/man/man4/xmd.4:1.1.2.2 Thu Oct 28 03:27:55 2010 +++ src/share/man/man4/xmd.4 Fri Nov 5 08:54:57 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: xmd.4,v 1.1.2.2 2010/10/28 03:27:55 uebayasi Exp $ +.\ $NetBSD: xmd.4,v 1.1.2.3 2010/11/05 08:54:57 uebayasi Exp $ .\ .\ This file is in the public domain. .\ @@ -24,11 +24,77 @@ device may be used as a disk. .Nm disks should be mounted as read-only to enable XIP. +.Sh EXAMPLES +.Bl -enum +.It +Prepare a kernel compiled with the +.Xr xip 4 +option: +.Bd -literal -offset indent +options XIP +pseudo-device xmd 1 +options XMD_ROOT_SIZE XXX +.Ed +.It +Prepare an +.Xr ffs 4 +image, typically created by +.Xr makefs 8 : +.Bd -literal -offset indent +% cd / +% makefs /tmp/xmd.fs bin +.Ed +.It +Embed the +.Xr ffs 4 +image into the kernel image: +.Bd -literal -offset indent +% mdsetimage -I _xmd_root_image -S _xmd_root_size /tmp/netbsd.xmd /tmp/xmd.fs +.Ed +.It +Run the kernel, prepare device file entry: +.Bd -literal -offset indent +% mknod /dev/xmd0a b XXX XXX +.Ed +.It +Mount the +.Xr xmd +disk partition as XIP: +.Bd -literal -offset indent +% mount -o ro,xip /dev/xmd0a /xmd +.Ed +.It +Execute a program and see if it works as expected: +.Bd -literal -offset indent +% time -l /xmd/date +Fri Oct 15 09:08:57 GMT 2010 +0.02 real 0.00 user 0.00 sys + 0 maximum resident set size + 0 average shared memory size + 0 average unshared data size + 0 average unshared stack size +72 page reclaims + 0 page faults + 0 swaps + 0 block input operations + 0 block output operations + 2 messages sent + 2 messages received + 0 signals received + 2 voluntary context switches + 1 involuntary context switches +% +.Ed +.Pp +Note the page faults counter shows that no I/O paging activity +was executed during the process's lifetime. +.El .Sh SEE ALSO .Xr md 4 , .Xr options 4 , .Xr mdsetimage 8 .Sh BUGS +.Pp Due to the design of XIP, device pages in a physical segment must be contiguous. This leads to a restriction that the page array in the @@ -37,3 +103,7 @@ It is highly expectable that the .Nm kernel module will not work. +.Pp +Only one instace can be compiled in one kernel. +You can add more by modifying the source code (src/sys/dev/xmd.c) +directly, but there's no good user interface to configure it.
CVS commit: [uebayasi-xip] src/share/man/man4
Module Name:src Committed By: uebayasi Date: Fri Nov 5 08:55:26 UTC 2010 Added Files: src/share/man/man4 [uebayasi-xip]: xip.4 Log Message: Brief introduction of xip(4). To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/share/man/man4/xip.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/share/man/man4/xip.4 diff -u /dev/null src/share/man/man4/xip.4:1.1.2.1 --- /dev/null Fri Nov 5 08:55:26 2010 +++ src/share/man/man4/xip.4 Fri Nov 5 08:55:26 2010 @@ -0,0 +1,94 @@ +.\ $NetBSD: xip.4,v 1.1.2.1 2010/11/05 08:55:26 uebayasi Exp $ +.\ +.\ Copyright (c) 2010 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ 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. +.\ +.Dd November 4, 2010 +.Dt XIP 4 +.Os +. +.Sh NAME +.Nm XIP +.Nd eXecute-In-Place +. +.Sh SYNOPSIS +.Cd options XIP +. +.Sh DESCRIPTION +The +.Nm +option enables a functionality for the kernel to execute programs +directly from memory-addressable device pages. +Normally the kernel allocates memory pages (page cache) and copies +file contents onto them, because most filesystem storage devices +are accessed by I/O. +There are devices whole data can be memory-mapped. +.Pp +By using +.Nm , +the kernel maps those file contents directly into user process's +address space. +This brings us to save memory used for page caches, and shorten +program load time compared to slow I/O storage devices. +.Pp +Needless to say, not all block devices can be capable of XIP. +Only memory-mappable block devices, i.e., NOR FlashROM, and RAM +based memory disk. +To support XIP, block device drivers need to allocate a VM device +physical segment beforehand, and return it at the request of +DIOCGPHYSSEG ioctl, called from VFS. +VM device physical segment is allocated by calling the +.Xr bus_space_physload_device +function in +.Xr bus_space 9 +API. +. +.Sh SEE ALSO +.Xr flash 4 , +.Xr xmd 4 , +.Xr mount 8 , +.Xr bus_space 9 , +.Xr disk 9 , +.Xr uvm 9 +. +.Sh CAVEATS +.Pp +Don't confuse memory-mappable NOR FlashROM and FlashROM based +storage device. To access the latter, CPU uses I/O instead of +MMIO. +. +.Sh HISTORY +.Pp +.Nm +first appeared in +.Nx 6.0 . +. +.Sh AUTHORS +The +.Nm +support was added by Masao Uebayashi. +. +.Sh BUGS +.Pp +Write operation is not supported.
CVS commit: [uebayasi-xip] src/share/man/man9
Module Name:src Committed By: uebayasi Date: Fri Nov 5 08:55:57 UTC 2010 Modified Files: src/share/man/man9 [uebayasi-xip]: disk.9 Log Message: Document DIOCGPHYSSEG. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.35.2.1 src/share/man/man9/disk.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/disk.9 diff -u src/share/man/man9/disk.9:1.35 src/share/man/man9/disk.9:1.35.2.1 --- src/share/man/man9/disk.9:1.35 Wed Dec 30 14:53:02 2009 +++ src/share/man/man9/disk.9 Fri Nov 5 08:55:57 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: disk.9,v 1.35 2009/12/30 14:53:02 wiz Exp $ +.\ $NetBSD: disk.9,v 1.35.2.1 2010/11/05 08:55:57 uebayasi Exp $ .\ .\ Copyright (c) 1995, 1996 Jason R. Thorpe. .\ All rights reserved. @@ -30,7 +30,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd December 30, 2009 +.Dd November 5, 2010 .Dt DISK 9 .Os .Sh NAME @@ -299,6 +299,11 @@ Set disk buffer queue strategy. .It Dv DIOCGDISKINFO struct plistref Get disk-info dictionary. +.It Dv DIOCGPHYSSEG void *phys +Return a VM physical segment cookie allocated for the device to +VFS, to support +.Xr xip 4 +functionality. .El .Sh USING THE FRAMEWORK This section includes a description on basic use of the framework
CVS commit: src/external/bsd/pkg_install/sbin
Module Name:src
Committed By: he
Date: Fri Nov 5 09:09:01 UTC 2010
Modified Files:
src/external/bsd/pkg_install/sbin: Makefile.inc
Log Message:
New pkg_install requires -llzma, so to support static linking, be
explicit about what libraries are required, and not only depend on
shared library inter-dependencies to pull that in.
Fixes the build for sun2.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/sbin/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/external/bsd/pkg_install/sbin/Makefile.inc
diff -u src/external/bsd/pkg_install/sbin/Makefile.inc:1.2 src/external/bsd/pkg_install/sbin/Makefile.inc:1.3
--- src/external/bsd/pkg_install/sbin/Makefile.inc:1.2 Mon Feb 2 20:47:21 2009
+++ src/external/bsd/pkg_install/sbin/Makefile.inc Fri Nov 5 09:09:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/02/02 20:47:21 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2010/11/05 09:09:01 he Exp $
.include bsd.own.mk
@@ -20,3 +20,6 @@
DPADD+= ${LIBZ} ${LIBBZ2}
LDADD+= -lz -lbz2
+
+DPADD+= ${LIBLZMA}
+LDADD+= -llzma
CVS commit: src
Module Name:src Committed By: hannken Date: Fri Nov 5 10:02:53 UTC 2010 Modified Files: src/sbin/dump: dump.8 src/share/man/man4: fss.4 Log Message: File system snapshots are no longer experimental. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sbin/dump/dump.8 cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/fss.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/dump/dump.8 diff -u src/sbin/dump/dump.8:1.61 src/sbin/dump/dump.8:1.62 --- src/sbin/dump/dump.8:1.61 Fri May 14 05:04:58 2010 +++ src/sbin/dump/dump.8 Fri Nov 5 10:02:53 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: dump.8,v 1.61 2010/05/14 05:04:58 jruoho Exp $ +.\ $NetBSD: dump.8,v 1.62 2010/11/05 10:02:53 hannken Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ Regents of the University of California. @@ -30,7 +30,7 @@ .\ .\ @(#)dump.8 8.3 (Berkeley) 5/1/95 .\ -.Dd May 14, 2010 +.Dd November 5, 2010 .Dt DUMP 8 .Os .Sh NAME @@ -307,9 +307,6 @@ See .Xr fss 4 for more details. -Snapshot support is -.Em experimental . -Be sure you have a backup before you use it. .It Fl X Similar to .Fl x Index: src/share/man/man4/fss.4 diff -u src/share/man/man4/fss.4:1.13 src/share/man/man4/fss.4:1.14 --- src/share/man/man4/fss.4:1.13 Mon Mar 22 18:58:31 2010 +++ src/share/man/man4/fss.4 Fri Nov 5 10:02:53 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: fss.4,v 1.13 2010/03/22 18:58:31 joerg Exp $ */ +.\ $NetBSD: fss.4,v 1.14 2010/11/05 10:02:53 hannken Exp $ */ .\ .\ .\ Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 21, 2008 +.Dd November 5, 2010 .Dt FSS 4 .Os .Sh NAME @@ -148,7 +148,3 @@ .Nm device appeared in .Nx 2.0 . -.Sh BUGS -This driver is -.Em experimental . -Be sure you have a backup before you use it.
CVS commit: src/share/man/man4
Module Name:src Committed By: hannken Date: Fri Nov 5 10:04:25 UTC 2010 Modified Files: src/share/man/man4: wapbl.4 Log Message: File system snapshots work with wapbl. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/wapbl.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/wapbl.4 diff -u src/share/man/man4/wapbl.4:1.12 src/share/man/man4/wapbl.4:1.13 --- src/share/man/man4/wapbl.4:1.12 Mon Nov 23 16:41:26 2009 +++ src/share/man/man4/wapbl.4 Fri Nov 5 10:04:25 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: wapbl.4,v 1.12 2009/11/23 16:41:26 pooka Exp $ +.\ $NetBSD: wapbl.4,v 1.13 2010/11/05 10:04:25 hannken Exp $ .\ .\ Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 23, 2009 +.Dd November 5, 2010 .Dt WAPBL 4 .Os .Sh NAME @@ -193,9 +193,7 @@ .Xr fsync 2 often. .Pp -File system snapshots -.Pq Xr fss 4 -and quotas do not yet work with +Quotas do not yet work with .Nm . .Pp In-file system log allocation should be done on a relatively quiet
CVS commit: src
Module Name:src Committed By: gsutre Date: Fri Nov 5 10:28:22 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: ALL GENERIC src/sys/dev/acpi: files.acpi Added Files: src/share/man/man4: fujitsu.4 src/sys/dev/acpi: fujitsu_acpi.c Log Message: Merge ACPI Fujitsu Driver. Provides support for hotkeys and other built-in components through vendor-specific ACPI devices. ok jruoho@ To generate a diff of this commit: cvs rdiff -u -r1.1246 -r1.1247 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.530 -r1.531 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/fujitsu.4 cvs rdiff -u -r1.288 -r1.289 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.273 -r1.274 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.996 -r1.997 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.81 -r1.82 src/sys/dev/acpi/files.acpi cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/fujitsu_acpi.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/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1246 src/distrib/sets/lists/man/mi:1.1247 --- src/distrib/sets/lists/man/mi:1.1246 Wed Nov 3 18:57:33 2010 +++ src/distrib/sets/lists/man/mi Fri Nov 5 10:28:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1246 2010/11/03 18:57:33 christos Exp $ +# $NetBSD: mi,v 1.1247 2010/11/05 10:28:22 gsutre Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -950,6 +950,9 @@ ./usr/share/man/cat4/fss.0 man-sys-catman .cat ./usr/share/man/cat4/fssbs.0 man-obsolete obsolete ./usr/share/man/cat4/fta.0 man-sys-catman .cat +./usr/share/man/cat4/fujbp.0 man-sys-catman .cat +./usr/share/man/cat4/fujhk.0 man-sys-catman .cat +./usr/share/man/cat4/fujitsu.0 man-sys-catman .cat ./usr/share/man/cat4/fwhrng.0 man-obsolete obsolete ./usr/share/man/cat4/fwip.0 man-sys-catman .cat ./usr/share/man/cat4/fwiso.0 man-obsolete obsolete @@ -3642,6 +3645,9 @@ ./usr/share/man/html4/fss.html man-sys-htmlman html ./usr/share/man/html4/fssbs.html man-obsolete obsolete ./usr/share/man/html4/fta.html man-sys-htmlman html +./usr/share/man/html4/fujbp.html man-sys-htmlman html +./usr/share/man/html4/fujhk.html man-sys-htmlman html +./usr/share/man/html4/fujitsu.html man-sys-htmlman html ./usr/share/man/html4/fwhrng.html man-obsolete obsolete ./usr/share/man/html4/fwip.html man-sys-htmlman html ./usr/share/man/html4/fwohci.html man-sys-htmlman html @@ -6112,6 +6118,9 @@ ./usr/share/man/man4/fss.4 man-sys-man .man ./usr/share/man/man4/fssbs.4 man-obsolete obsolete ./usr/share/man/man4/fta.4 man-sys-man .man +./usr/share/man/man4/fujbp.4 man-sys-man .man +./usr/share/man/man4/fujhk.4 man-sys-man .man +./usr/share/man/man4/fujitsu.4 man-sys-man .man ./usr/share/man/man4/fwhrng.4 man-obsolete obsolete ./usr/share/man/man4/fwip.4 man-sys-man .man ./usr/share/man/man4/fwiso.4 man-obsolete obsolete Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.530 src/share/man/man4/Makefile:1.531 --- src/share/man/man4/Makefile:1.530 Wed Nov 3 18:57:57 2010 +++ src/share/man/man4/Makefile Fri Nov 5 10:28:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.530 2010/11/03 18:57:57 christos Exp $ +# $NetBSD: Makefile,v 1.531 2010/11/05 10:28:22 gsutre Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -24,7 +24,7 @@ dmphy.4 dpt.4 dpti.4 drm.4 drum.4 \ eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \ esa.4 esiop.4 esm.4 eso.4 etherip.4 exphy.4 \ - fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fxp.4 \ + fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fujitsu.4 fxp.4 \ gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \ glxtphy.4 gpib.4 gpio.4 gpiolock.4 gpiosim.4 gre.4 gphyter.4 gsip.4 \ hdaudio.4 hifn.4 hme.4 hpqlb.4 hptide.4 \ @@ -174,6 +174,7 @@ MLINKS+=dbcool.4 adt7476.4 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4 MLINKS+=fpa.4 fea.4 fpa.4 fta.4 +MLINKS+=fujitsu.4 fujbp.4 fujitsu.4 fujhk.4 MLINKS+=hdaudio.4 hdafg.4 MLINKS+=hdaudio.4 hdaudiobus.4 MLINKS+=icp.4 icpsp.4 Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.288 src/sys/arch/amd64/conf/GENERIC:1.289 --- src/sys/arch/amd64/conf/GENERIC:1.288 Wed Nov 3 20:09:09 2010 +++ src/sys/arch/amd64/conf/GENERIC Fri Nov 5 10:28:21 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.288 2010/11/03 20:09:09 christos Exp $ +# $NetBSD: GENERIC,v 1.289 2010/11/05 10:28:21 gsutre Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.288 $ +#ident GENERIC-$Revision: 1.289 $ maxusers 64 # estimated number of users @@ -294,6 +294,8 @@
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: gsutre Date: Fri Nov 5 10:35:01 UTC 2010 Modified Files: src/sys/dev/acpi: fujitsu_acpi.c Log Message: Hm, the warning sign was not big enough. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/fujitsu_acpi.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/acpi/fujitsu_acpi.c diff -u src/sys/dev/acpi/fujitsu_acpi.c:1.1 src/sys/dev/acpi/fujitsu_acpi.c:1.2 --- src/sys/dev/acpi/fujitsu_acpi.c:1.1 Fri Nov 5 10:28:21 2010 +++ src/sys/dev/acpi/fujitsu_acpi.c Fri Nov 5 10:35:00 2010 @@ -1,5 +1,4 @@ -/* XXX REMOVE ME $Id: fujitsu_acpi.c,v 1.1 2010/11/05 10:28:21 gsutre Exp $ */ -/* $NetBSD: fujitsu_acpi.c,v 1.1 2010/11/05 10:28:21 gsutre Exp $ */ +/* $NetBSD: fujitsu_acpi.c,v 1.2 2010/11/05 10:35:00 gsutre Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -78,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fujitsu_acpi.c,v 1.1 2010/11/05 10:28:21 gsutre Exp $); +__KERNEL_RCSID(0, $NetBSD: fujitsu_acpi.c,v 1.2 2010/11/05 10:35:00 gsutre Exp $); #include sys/param.h #include sys/device.h
CVS commit: src/external/mit/lua/usr.bin/lua
Module Name:src
Committed By: he
Date: Fri Nov 5 10:50:51 UTC 2010
Modified Files:
src/external/mit/lua/usr.bin/lua: Makefile
Log Message:
To allow static linking, specify -lterminfo as well, and don't rely
on shared library inter-dependencies to pull everything together.
Fixes the build for sun2.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/lua/usr.bin/lua/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/usr.bin/lua/Makefile
diff -u src/external/mit/lua/usr.bin/lua/Makefile:1.1 src/external/mit/lua/usr.bin/lua/Makefile:1.2
--- src/external/mit/lua/usr.bin/lua/Makefile:1.1 Sun Oct 31 11:26:02 2010
+++ src/external/mit/lua/usr.bin/lua/Makefile Fri Nov 5 10:50:50 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/31 11:26:02 mbalmer Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/05 10:50:50 he Exp $
PROG= lua
SRCS= lua.c
@@ -9,6 +9,9 @@
LDADD+= ${LIBLUA} -lm -ledit
DPADD+= ${LIBLUA}
+LDADD+= -lterminfo
+DPADD+= ${LIBTERMINFO}
+
.include bsd.own.mk
.PATH: ${NETBSDSRCDIR}/external/mit/lua/dist/src \
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Nov 5 11:02:29 UTC 2010 Modified Files: src/share/man/man4: fujitsu.4 Log Message: Serial comma. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/fujitsu.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/fujitsu.4 diff -u src/share/man/man4/fujitsu.4:1.1 src/share/man/man4/fujitsu.4:1.2 --- src/share/man/man4/fujitsu.4:1.1 Fri Nov 5 10:28:22 2010 +++ src/share/man/man4/fujitsu.4 Fri Nov 5 11:02:29 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: fujitsu.4,v 1.1 2010/11/05 10:28:22 gsutre Exp $ +.\ $NetBSD: fujitsu.4,v 1.2 2010/11/05 11:02:29 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -29,7 +29,7 @@ .Os .Sh NAME .Nm fujitsu -.Nd Fujitsu Brightness, Pointer and Hotkeys +.Nd Fujitsu Brightness, Pointer, and Hotkeys .Sh SYNOPSIS .Cd fujbp* at acpi? .Cd fujhk* at acpi?
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Fri Nov 5 11:14:53 UTC 2010 Modified Files: src/share/man/man4: fujitsu.4 Log Message: Make the list pretty. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/fujitsu.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/fujitsu.4 diff -u src/share/man/man4/fujitsu.4:1.2 src/share/man/man4/fujitsu.4:1.3 --- src/share/man/man4/fujitsu.4:1.2 Fri Nov 5 11:02:29 2010 +++ src/share/man/man4/fujitsu.4 Fri Nov 5 11:14:53 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: fujitsu.4,v 1.2 2010/11/05 11:02:29 wiz Exp $ +.\ $NetBSD: fujitsu.4,v 1.3 2010/11/05 11:14:53 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -51,7 +51,7 @@ .Xr sysctl 8 read/write variables are provided (when hardware support is available): .Pp -.Bl -tag -width 28u -compact +.Bl -tag -width hw.acpi.fujbp0.brightness -offset indent .It Va hw.acpi.fujbp0.brightness Brightness level (integer). .It Va hw.acpi.fujbp0.pointer
CVS commit: src/doc
Module Name:src Committed By: gsutre Date: Fri Nov 5 11:23:54 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Mention fujitsu(4). To generate a diff of this commit: cvs rdiff -u -r1.1449 -r1.1450 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1449 src/doc/CHANGES:1.1450 --- src/doc/CHANGES:1.1449 Wed Nov 3 22:40:51 2010 +++ src/doc/CHANGES Fri Nov 5 11:23:54 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1449 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1450 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -768,3 +768,5 @@ xz(1): Import of XZ 5.0.0. [joerg 20101102] if_otus(4): Port the Atheros AR9001U from OpenBSD (Anon Ymous) [christos 20101103] + fujitsu(4): Add brightness and hotkey drivers for Fujitsu laptops. + [gsutre 20101105]
CVS commit: src/tests/fs/ffs
Module Name:src
Committed By: pooka
Date: Fri Nov 5 11:32:09 UTC 2010
Modified Files:
src/tests/fs/ffs: Makefile
Added Files:
src/tests/fs/ffs: t_snapshot_log.c
Log Message:
test fss with underlying fs mounted with MNT_LOG
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/fs/ffs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/ffs/t_snapshot_log.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/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.12 src/tests/fs/ffs/Makefile:1.13
--- src/tests/fs/ffs/Makefile:1.12 Thu Sep 23 09:39:14 2010
+++ src/tests/fs/ffs/Makefile Fri Nov 5 11:32:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/09/23 09:39:14 he Exp $
+# $NetBSD: Makefile,v 1.13 2010/11/05 11:32:09 pooka Exp $
#
.include bsd.own.mk
@@ -8,6 +8,7 @@
TESTS_C+= t_fifos
TESTS_C+= t_snapshot
+TESTS_C+= t_snapshot_log
TESTS_C+= t_mount
LDADD+=-lrumpfs_ffs # ffs
Added files:
Index: src/tests/fs/ffs/t_snapshot_log.c
diff -u /dev/null src/tests/fs/ffs/t_snapshot_log.c:1.1
--- /dev/null Fri Nov 5 11:32:09 2010
+++ src/tests/fs/ffs/t_snapshot_log.c Fri Nov 5 11:32:09 2010
@@ -0,0 +1,45 @@
+/* $NetBSD: t_snapshot_log.c,v 1.1 2010/11/05 11:32:09 pooka Exp $ */
+
+#include sys/types.h
+#include sys/mount.h
+
+#include rump/rump.h
+#include rump/rump_syscalls.h
+
+#include ufs/ufs/ufsmount.h
+
+#include atf-c.h
+#include fcntl.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include unistd.h
+
+#include ../../h_macros.h
+
+#define IMGNAME ffs.img
+#define NEWFS newfs -F -s 1 IMGNAME
+#define BAKNAME /mnt/le_snapp
+
+static void
+mount_diskfs(const char *fspec, const char *path)
+{
+ struct ufs_args uargs;
+ static int flags = MNT_LOG;
+
+ uargs.fspec = __UNCONST(fspec);
+
+ if (rump_sys_mount(MOUNT_FFS,
+ path, flags, uargs, sizeof(uargs)) == -1)
+ atf_tc_fail_errno(mount ffs %s, path);
+ flags = 0;
+}
+
+static void
+begin(void)
+{
+
+ /* empty */
+}
+
+#include ../common/snapshot.c
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Fri Nov 5 11:32:43 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: +tp To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.150 src/distrib/sets/lists/tests/mi:1.151 --- src/distrib/sets/lists/tests/mi:1.150 Thu Nov 4 13:24:26 2010 +++ src/distrib/sets/lists/tests/mi Fri Nov 5 11:32:42 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.150 2010/11/04 13:24:26 pooka Exp $ +# $NetBSD: mi,v 1.151 2010/11/05 11:32:42 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -224,6 +224,7 @@ ./usr/libdata/debug/usr/tests/fs/ffs/t_mount.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_renamerace.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/fs/ffs/t_snapshot.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/t_snapshot_log.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/kernfs tests-fs-debug ./usr/libdata/debug/usr/tests/fs/kernfs/t_basic.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/lfs tests-fs-debug @@ -1024,6 +1025,7 @@ ./usr/tests/fs/ffs/t_mount tests-fs-tests atf ./usr/tests/fs/ffs/t_renamerace tests-obsolete obsolete ./usr/tests/fs/ffs/t_snapshot tests-fs-tests atf +./usr/tests/fs/ffs/t_snapshot_log tests-fs-tests atf ./usr/tests/fs/kernfstests-fs-tests ./usr/tests/fs/kernfs/Atffile tests-fs-tests atf ./usr/tests/fs/kernfs/t_basic tests-fs-tests atf
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Fri Nov 5 11:38:55 UTC 2010 Modified Files: src/lib/libcurses: getch.c Log Message: Don't echo key symbols. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/lib/libcurses/getch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/getch.c diff -u src/lib/libcurses/getch.c:1.55 src/lib/libcurses/getch.c:1.56 --- src/lib/libcurses/getch.c:1.55 Wed Feb 3 15:34:40 2010 +++ src/lib/libcurses/getch.c Fri Nov 5 11:38:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: getch.c,v 1.55 2010/02/03 15:34:40 roy Exp $ */ +/* $NetBSD: getch.c,v 1.56 2010/11/05 11:38:54 blymn Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)getch.c 8.2 (Berkeley) 5/4/94; #else -__RCSID($NetBSD: getch.c,v 1.55 2010/02/03 15:34:40 roy Exp $); +__RCSID($NetBSD: getch.c,v 1.56 2010/11/05 11:38:54 blymn Exp $); #endif #endif /* not lint */ @@ -906,7 +906,7 @@ __restore_termios(); - if (__echoit) + if ((__echoit) (inp KEY_MIN)) waddch(win, (chtype) inp); if (weset)
CVS commit: src/usr.sbin/envstat
Module Name:src
Committed By: pooka
Date: Fri Nov 5 13:42:37 UTC 2010
Modified Files:
src/usr.sbin/envstat: Makefile envstat.c
Log Message:
support rump client mode
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/envstat/Makefile
cvs rdiff -u -r1.80 -r1.81 src/usr.sbin/envstat/envstat.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/envstat/Makefile
diff -u src/usr.sbin/envstat/Makefile:1.7 src/usr.sbin/envstat/Makefile:1.8
--- src/usr.sbin/envstat/Makefile:1.7 Thu Oct 29 14:38:37 2009
+++ src/usr.sbin/envstat/Makefile Fri Nov 5 13:42:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/10/29 14:38:37 christos Exp $
+# $NetBSD: Makefile,v 1.8 2010/11/05 13:42:37 pooka Exp $
PROG= envstat
SRCS+= envstat.c config.c config_yacc.y config_lex.l
@@ -12,4 +12,11 @@
YHEADER= yes
+.ifdef RUMP_ACTION
+LDADD+= -lrumpclient
+CPPFLAGS+= -DRUMP_SYS_OPEN -DRUMP_SYS_CLOSE
+CPPFLAGS+= -DRUMP_ACTION
+DBG= -g
+.endif
+
.include bsd.prog.mk
Index: src/usr.sbin/envstat/envstat.c
diff -u src/usr.sbin/envstat/envstat.c:1.80 src/usr.sbin/envstat/envstat.c:1.81
--- src/usr.sbin/envstat/envstat.c:1.80 Tue Oct 5 00:14:55 2010
+++ src/usr.sbin/envstat/envstat.c Fri Nov 5 13:42:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: envstat.c,v 1.80 2010/10/05 00:14:55 pgoyette Exp $ */
+/* $NetBSD: envstat.c,v 1.81 2010/11/05 13:42:37 pooka Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -27,12 +27,13 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: envstat.c,v 1.80 2010/10/05 00:14:55 pgoyette Exp $);
+__RCSID($NetBSD: envstat.c,v 1.81 2010/11/05 13:42:37 pooka Exp $);
#endif /* not lint */
#include stdio.h
#include stdlib.h
#include stdbool.h
+#include stdarg.h
#include string.h
#include unistd.h
#include fcntl.h
@@ -41,12 +42,19 @@
#include paths.h
#include syslog.h
#include sys/envsys.h
+#include sys/ioctl.h
#include sys/types.h
#include sys/queue.h
#include prop/proplib.h
#include envstat.h
+#ifdef RUMP_ACTION
+#include rump/rump.h
+#include rump/rumpclient.h
+#include rump/rump_syscalls.h
+#endif
+
#define ENVSYS_DFLAG 0x0001 /* list registered devices */
#define ENVSYS_FFLAG 0x0002 /* show temp in farenheit */
#define ENVSYS_LFLAG 0x0004 /* list sensors */
@@ -106,20 +114,47 @@
static u_int header_passes;
static int parse_dictionary(int);
-static int send_dictionary(FILE *, int);
+static int send_dictionary(FILE *);
static int find_sensors(prop_array_t, const char *, dvprops_t);
static void print_sensors(void);
static int check_sensors(char *);
static int usage(void);
+static int sysmonfd; /* fd of /dev/sysmon */
+
+/* sneak in between ioctl() */
+#ifdef RUMP_ACTION
+#include sys/syscall.h
+int
+ioctl(int fd, unsigned long request, ...)
+{
+ va_list ap;
+ int rv;
+
+ va_start(ap, request);
+ if (fd == sysmonfd)
+ rv = rump_sys_ioctl(fd, request, va_arg(ap, void *));
+ else
+ rv = syscall(SYS_ioctl, fd, request, va_arg(ap, void *));
+ va_end(ap);
+
+ return rv;
+}
+#endif
int main(int argc, char **argv)
{
prop_dictionary_t dict;
- int c, fd, rval = 0;
+ int c, rval = 0;
char *endptr, *configfile = NULL;
FILE *cf;
+#ifdef RUMP_ACTION
+ int error;
+ if ((error = rumpclient_init()) != 0)
+ errx(1, rumpclient init failed: %s, strerror(error));
+#endif
+
setprogname(argv[0]);
while ((c = getopt(argc, argv, c:Dd:fIi:klrSs:Tw:Wx)) != -1) {
@@ -207,12 +242,12 @@
errx(EXIT_FAILURE, -d flag cannot be used with -s);
/* Open the device in ro mode */
- if ((fd = open(_PATH_SYSMON, O_RDONLY)) == -1)
+ if ((sysmonfd = open(_PATH_SYSMON, O_RDONLY)) == -1)
err(EXIT_FAILURE, %s, _PATH_SYSMON);
/* Print dictionary in raw mode */
if (flags ENVSYS_XFLAG) {
- rval = prop_dictionary_recv_ioctl(fd,
+ rval = prop_dictionary_recv_ioctl(sysmonfd,
ENVSYS_GETDICTIONARY,
dict);
if (rval)
@@ -223,10 +258,10 @@
/* Remove all properties set in dictionary */
} else if (flags ENVSYS_SFLAG) {
/* Close the ro descriptor */
- (void)close(fd);
+ (void)close(sysmonfd);
/* open the fd in rw mode */
- if ((fd = open(_PATH_SYSMON, O_RDWR)) == -1)
+ if ((sysmonfd = open(_PATH_SYSMON, O_RDWR)) == -1)
err(EXIT_FAILURE, %s, _PATH_SYSMON);
dict = prop_dictionary_create();
@@ -240,7 +275,8 @@
err(EXIT_FAILURE, prop_dict_set_bool);
/* send the dictionary to the kernel now */
- rval = prop_dictionary_send_ioctl(dict, fd, ENVSYS_REMOVEPROPS);
+ rval = prop_dictionary_send_ioctl(dict, sysmonfd,
+ ENVSYS_REMOVEPROPS);
if (rval)
warnx(%s, strerror(rval));
@@ -254,13 +290,13 @@
errx(EXIT_FAILURE, %s, strerror(errno));
}
- rval = send_dictionary(cf, fd);
+ rval = send_dictionary(cf);
(void)fclose(cf);
/* Show sensors with interval */
} else if (interval) {
for (;;) {
- rval = parse_dictionary(fd);
+
CVS commit: src/lib/librumpclient
Module Name:src
Committed By: pooka
Date: Fri Nov 5 13:50:48 UTC 2010
Modified Files:
src/lib/librumpclient: rumpclient.c
Log Message:
use -1/errno for failure: it's much more convenient for the users
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpclient/rumpclient.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.1 src/lib/librumpclient/rumpclient.c:1.2
--- src/lib/librumpclient/rumpclient.c:1.1 Thu Nov 4 21:01:29 2010
+++ src/lib/librumpclient/rumpclient.c Fri Nov 5 13:50:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.1 2010/11/04 21:01:29 pooka Exp $ */
+/* $NetBSD: rumpclient.c,v 1.2 2010/11/05 13:50:48 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -186,25 +186,32 @@
unsigned idx;
int error, s;
- if ((p = getenv(RUMP_SP_CLIENT)) == NULL)
- return ENOENT;
+ if ((p = getenv(RUMP_SP_CLIENT)) == NULL) {
+ errno = ENOENT;
+ return -1;
+ }
- if ((error = parseurl(p, sap, idx, 0)) != 0)
- return error;
+ if ((error = parseurl(p, sap, idx, 0)) != 0) {
+ errno = error;
+ return -1;
+ }
s = socket(parsetab[idx].domain, SOCK_STREAM, 0);
if (s == -1)
- return errno;
+ return -1;
if (connect(s, sap, sap-sa_len) == -1) {
+ error = errno;
fprintf(stderr, rump_sp: client connect failed\n);
- return errno;
+ errno = error;
+ return -1;
}
if ((error = parsetab[idx].connhook(s)) != 0) {
+ error = errno;
fprintf(stderr, rump_sp: connect hook failed\n);
- return error;
+ errno = error;
+ return -1;
}
-
clispc.spc_fd = s;
return 0;
CVS commit: src
Module Name:src Committed By: pooka Date: Fri Nov 5 13:52:42 UTC 2010 Modified Files: src/sbin/ifconfig: ifconfig.c src/sbin/route: route.c src/usr.sbin/envstat: envstat.c Log Message: adapt to new rumpclient_init() signature To generate a diff of this commit: cvs rdiff -u -r1.221 -r1.222 src/sbin/ifconfig/ifconfig.c cvs rdiff -u -r1.124 -r1.125 src/sbin/route/route.c cvs rdiff -u -r1.81 -r1.82 src/usr.sbin/envstat/envstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ifconfig/ifconfig.c diff -u src/sbin/ifconfig/ifconfig.c:1.221 src/sbin/ifconfig/ifconfig.c:1.222 --- src/sbin/ifconfig/ifconfig.c:1.221 Thu Nov 4 23:31:12 2010 +++ src/sbin/ifconfig/ifconfig.c Fri Nov 5 13:52:41 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ifconfig.c,v 1.221 2010/11/04 23:31:12 pooka Exp $ */ +/* $NetBSD: ifconfig.c,v 1.222 2010/11/05 13:52:41 pooka Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ #ifndef lint __COPYRIGHT(@(#) Copyright (c) 1983, 1993\ The Regents of the University of California. All rights reserved.); -__RCSID($NetBSD: ifconfig.c,v 1.221 2010/11/04 23:31:12 pooka Exp $); +__RCSID($NetBSD: ifconfig.c,v 1.222 2010/11/05 13:52:41 pooka Exp $); #endif /* not lint */ #include sys/param.h @@ -541,10 +541,8 @@ const char *ifname; #ifdef RUMP_ACTION - int error; - - if ((error = rumpclient_init()) != 0) - errx(1, rump client init: %s, strerror(error)); + if (rumpclient_init() == -1) + err(1, rump client init); #endif memset(match, 0, sizeof(match)); Index: src/sbin/route/route.c diff -u src/sbin/route/route.c:1.124 src/sbin/route/route.c:1.125 --- src/sbin/route/route.c:1.124 Thu Nov 4 23:38:18 2010 +++ src/sbin/route/route.c Fri Nov 5 13:52:41 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.124 2010/11/04 23:38:18 pooka Exp $ */ +/* $NetBSD: route.c,v 1.125 2010/11/05 13:52:41 pooka Exp $ */ /* * Copyright (c) 1983, 1989, 1991, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = @(#)route.c 8.6 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: route.c,v 1.124 2010/11/04 23:38:18 pooka Exp $); +__RCSID($NetBSD: route.c,v 1.125 2010/11/05 13:52:41 pooka Exp $); #endif #endif /* not lint */ @@ -163,9 +163,8 @@ int ch; #ifdef RUMP_ACTION - int error; - if ((error = rumpclient_init()) != 0) - errx(1, rump client init: %s, strerror(error)); + if (rumpclient_init() == -1) + err(1, rump client init); #endif if (argc 2) Index: src/usr.sbin/envstat/envstat.c diff -u src/usr.sbin/envstat/envstat.c:1.81 src/usr.sbin/envstat/envstat.c:1.82 --- src/usr.sbin/envstat/envstat.c:1.81 Fri Nov 5 13:42:37 2010 +++ src/usr.sbin/envstat/envstat.c Fri Nov 5 13:52:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: envstat.c,v 1.81 2010/11/05 13:42:37 pooka Exp $ */ +/* $NetBSD: envstat.c,v 1.82 2010/11/05 13:52:42 pooka Exp $ */ /*- * Copyright (c) 2007, 2008 Juan Romero Pardines. @@ -27,7 +27,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: envstat.c,v 1.81 2010/11/05 13:42:37 pooka Exp $); +__RCSID($NetBSD: envstat.c,v 1.82 2010/11/05 13:52:42 pooka Exp $); #endif /* not lint */ #include stdio.h @@ -150,9 +150,8 @@ FILE *cf; #ifdef RUMP_ACTION - int error; - if ((error = rumpclient_init()) != 0) - errx(1, rumpclient init failed: %s, strerror(error)); + if (rumpclient_init() == -1) + err(1, rumpclient init failed); #endif setprogname(argv[0]);
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Fri Nov 5 14:23:45 UTC 2010
Modified Files:
src/lib/librumpuser: sp_common.c
Log Message:
Implement support for unix domain sockets (important especially
for testing since we don't want to depend on global resources such
as tcp ports).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/sp_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/sp_common.c
diff -u src/lib/librumpuser/sp_common.c:1.1 src/lib/librumpuser/sp_common.c:1.2
--- src/lib/librumpuser/sp_common.c:1.1 Thu Nov 4 20:54:07 2010
+++ src/lib/librumpuser/sp_common.c Fri Nov 5 14:23:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sp_common.c,v 1.1 2010/11/04 20:54:07 pooka Exp $ */
+/* $NetBSD: sp_common.c,v 1.2 2010/11/05 14:23:45 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -34,6 +34,7 @@
#include sys/types.h
#include sys/mman.h
#include sys/socket.h
+#include sys/un.h
#include arpa/inet.h
#include netinet/in.h
@@ -329,6 +330,31 @@
return 0;
}
+static int
+unix_parse(const char *addr, struct sockaddr **sa, int allow_wildcard)
+{
+ struct sockaddr_un sun;
+
+ if (strlen(addr) sizeof(sun.sun_path))
+ return ENAMETOOLONG;
+
+ /*
+ * The pathname can be all kinds of spaghetti elementals,
+ * so meek and obidient we accept everything.
+ */
+ memset(sun, 0, sizeof(sun));
+ sun.sun_family = AF_LOCAL;
+ strlcpy(sun.sun_path, addr, sizeof(sun.sun_path));
+ sun.sun_len = SUN_LEN(sun);
+
+ *sa = malloc(sun.sun_len);
+ if (*sa == NULL)
+ return errno;
+ memcpy(*sa, sun, sun.sun_len);
+
+ return 0;
+}
+
/*ARGSUSED*/
static int
notsupp(void)
@@ -352,7 +378,7 @@
connecthook_fn connhook;
} parsetab[] = {
{ tcp, PF_INET, tcp_parse, tcp_connecthook },
- { unix, PF_LOCAL, (addrparse_fn)notsupp, (connecthook_fn)success },
+ { unix, PF_LOCAL, unix_parse, (connecthook_fn)success },
{ tcp6, PF_INET6, (addrparse_fn)notsupp, (connecthook_fn)success },
};
#define NPARSE (sizeof(parsetab)/sizeof(parsetab[0]))
CVS commit: src/share/man/man4
Module Name:src Committed By: gsutre Date: Fri Nov 5 14:43:57 UTC 2010 Modified Files: src/share/man/man4: fujitsu.4 Log Message: Remove .Pp before .Bl and bump date. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/fujitsu.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/fujitsu.4 diff -u src/share/man/man4/fujitsu.4:1.3 src/share/man/man4/fujitsu.4:1.4 --- src/share/man/man4/fujitsu.4:1.3 Fri Nov 5 11:14:53 2010 +++ src/share/man/man4/fujitsu.4 Fri Nov 5 14:43:56 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: fujitsu.4,v 1.3 2010/11/05 11:14:53 jruoho Exp $ +.\ $NetBSD: fujitsu.4,v 1.4 2010/11/05 14:43:56 gsutre Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 3, 2010 +.Dd November 5, 2010 .Dt FUJITSU 4 .Os .Sh NAME @@ -50,7 +50,6 @@ The following .Xr sysctl 8 read/write variables are provided (when hardware support is available): -.Pp .Bl -tag -width hw.acpi.fujbp0.brightness -offset indent .It Va hw.acpi.fujbp0.brightness Brightness level (integer).
CVS commit: src/sys/dev/ata
Module Name:src
Committed By: dyoung
Date: Fri Nov 5 15:49:37 UTC 2010
Modified Files:
src/sys/dev/ata: wd.c
Log Message:
Mark a buffer with EIO in wdstrategy() if the device is not enabled
(more like present), not if it is merely asleep.
If the device is not awake, get out of wdstart() right away.
Brett Lymn and KAMADA Ken'ichi report that this stops the kernel from
crashing after a suspend/resume cycle.
To generate a diff of this commit:
cvs rdiff -u -r1.384 -r1.385 src/sys/dev/ata/wd.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/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.384 src/sys/dev/ata/wd.c:1.385
--- src/sys/dev/ata/wd.c:1.384 Wed Feb 24 22:37:57 2010
+++ src/sys/dev/ata/wd.c Fri Nov 5 15:49:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.384 2010/02/24 22:37:57 dyoung Exp $ */
+/* $NetBSD: wd.c,v 1.385 2010/11/05 15:49:37 dyoung Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.384 2010/02/24 22:37:57 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.385 2010/11/05 15:49:37 dyoung Exp $);
#include opt_ata.h
@@ -489,9 +489,10 @@
}
/* If device invalidated (e.g. media change, door open,
- * device suspension), then error.
+ * device detachment), then error.
*/
- if ((wd-sc_flags WDF_LOADED) == 0 || !device_is_active(wd-sc_dev)) {
+ if ((wd-sc_flags WDF_LOADED) == 0 ||
+ !device_is_enabled(wd-sc_dev)) {
bp-b_error = EIO;
goto done;
}
@@ -573,6 +574,10 @@
ATADEBUG_PRINT((wdstart %s\n, device_xname(wd-sc_dev)),
DEBUG_XFERS);
+
+ if (!device_is_active(wd-sc_dev))
+ return;
+
while (wd-openings 0) {
/* Is there a buf for us ? */
CVS commit: src
Module Name:src
Committed By: pooka
Date: Fri Nov 5 15:55:23 UTC 2010
Modified Files:
src/lib/libc/gen: sysctlgetmibinfo.c
src/sbin/sysctl: Makefile sysctl.c
Log Message:
make sysctl(8) work as a rump client
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/gen/sysctlgetmibinfo.c
cvs rdiff -u -r1.18 -r1.19 src/sbin/sysctl/Makefile
cvs rdiff -u -r1.131 -r1.132 src/sbin/sysctl/sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/sysctlgetmibinfo.c
diff -u src/lib/libc/gen/sysctlgetmibinfo.c:1.7 src/lib/libc/gen/sysctlgetmibinfo.c:1.8
--- src/lib/libc/gen/sysctlgetmibinfo.c:1.7 Thu Feb 12 04:13:08 2009
+++ src/lib/libc/gen/sysctlgetmibinfo.c Fri Nov 5 15:55:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctlgetmibinfo.c,v 1.7 2009/02/12 04:13:08 lukem Exp $ */
+/* $NetBSD: sysctlgetmibinfo.c,v 1.8 2010/11/05 15:55:23 pooka Exp $ */
/*-
* Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
@@ -31,13 +31,15 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: sysctlgetmibinfo.c,v 1.7 2009/02/12 04:13:08 lukem Exp $);
+__RCSID($NetBSD: sysctlgetmibinfo.c,v 1.8 2010/11/05 15:55:23 pooka Exp $);
#endif /* LIBC_SCCS and not lint */
+#ifndef RUMP_ACTION
#include namespace.h
#ifdef _REENTRANT
#include reentrant.h
#endif /* _REENTRANT */
+#endif /* RUMP_ACTION */
#include sys/param.h
#include sys/sysctl.h
@@ -51,6 +53,11 @@
__weak_alias(sysctlgetmibinfo,_sysctlgetmibinfo)
#endif
+#ifdef RUMP_ACTION
+#include rump/rump_syscalls.h
+#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
+#endif
+
/*
* the place where we attach stuff we learn on the fly, not
* necessarily used.
Index: src/sbin/sysctl/Makefile
diff -u src/sbin/sysctl/Makefile:1.18 src/sbin/sysctl/Makefile:1.19
--- src/sbin/sysctl/Makefile:1.18 Fri Feb 13 16:02:05 2009
+++ src/sbin/sysctl/Makefile Fri Nov 5 15:55:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/02/13 16:02:05 uebayasi Exp $
+# $NetBSD: Makefile,v 1.19 2010/11/05 15:55:23 pooka Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include bsd.own.mk
@@ -7,4 +7,13 @@
PROG= sysctl
MAN= sysctl.8
+SRCS= sysctl.c
+
+.ifdef RUMP_ACTION
+.PATH: ${.CURDIR}/../../lib/libc/gen
+CPPFLAGS+= -DRUMP_ACTION
+LDADD+= -lrumpclient
+SRCS+= sysctlgetmibinfo.c
+.endif
+
.include bsd.prog.mk
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.131 src/sbin/sysctl/sysctl.c:1.132
--- src/sbin/sysctl/sysctl.c:1.131 Sun Apr 11 01:52:10 2010
+++ src/sbin/sysctl/sysctl.c Fri Nov 5 15:55:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.131 2010/04/11 01:52:10 mrg Exp $ */
+/* $NetBSD: sysctl.c,v 1.132 2010/11/05 15:55:23 pooka Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = @(#)sysctl.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: sysctl.c,v 1.131 2010/04/11 01:52:10 mrg Exp $);
+__RCSID($NetBSD: sysctl.c,v 1.132 2010/11/05 15:55:23 pooka Exp $);
#endif
#endif /* not lint */
@@ -105,6 +105,13 @@
#include time.h
#include unistd.h
+#ifdef RUMP_ACTION
+#include rump/rumpclient.h
+#include rump/rump_syscalls.h
+
+#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
+#endif
+
/*
* this needs to be able to do the printing and the setting
*/
@@ -269,6 +276,11 @@
int name[CTL_MAXNAME];
int ch;
+#ifdef RUMP_ACTION
+ if (rumpclient_init() == -1)
+ err(1, rumpclient init failed);
+#endif
+
while ((ch = getopt(argc, argv, Aabdef:Mnqrwx)) != -1) {
switch (ch) {
case 'A':
CVS commit: src
Module Name:src
Committed By: pooka
Date: Fri Nov 5 16:23:57 UTC 2010
Modified Files:
src/lib/libc/net: getifaddrs.c
src/sbin/ifconfig: Makefile
Log Message:
Need getifaddrs() for the rump client since it executes sysctl(2)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/net/getifaddrs.c
cvs rdiff -u -r1.48 -r1.49 src/sbin/ifconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getifaddrs.c
diff -u src/lib/libc/net/getifaddrs.c:1.12 src/lib/libc/net/getifaddrs.c:1.13
--- src/lib/libc/net/getifaddrs.c:1.12 Mon Apr 27 20:10:49 2009
+++ src/lib/libc/net/getifaddrs.c Fri Nov 5 16:23:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: getifaddrs.c,v 1.12 2009/04/27 20:10:49 dyoung Exp $ */
+/* $NetBSD: getifaddrs.c,v 1.13 2010/11/05 16:23:56 pooka Exp $ */
/*
* Copyright (c) 1995, 1999
@@ -27,10 +27,12 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: getifaddrs.c,v 1.12 2009/04/27 20:10:49 dyoung Exp $);
+__RCSID($NetBSD: getifaddrs.c,v 1.13 2010/11/05 16:23:56 pooka Exp $);
#endif /* LIBC_SCCS and not lint */
+#ifndef RUMP_ACTION
#include namespace.h
+#endif
#include sys/types.h
#include sys/ioctl.h
#include sys/socket.h
@@ -46,11 +48,16 @@
#include stdlib.h
#include string.h
-#ifdef __weak_alias
+#if defined(__weak_alias) !defined(RUMP_ACTION)
__weak_alias(getifaddrs,_getifaddrs)
__weak_alias(freeifaddrs,_freeifaddrs)
#endif
+#ifdef RUMP_ACTION
+#include rump/rump_syscalls.h
+#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
+#endif
+
#define SALIGN (sizeof(long) - 1)
#define SA_RLEN(sa) ((sa)-sa_len ? (((sa)-sa_len + SALIGN) ~SALIGN) : (SALIGN + 1))
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.48 src/sbin/ifconfig/Makefile:1.49
--- src/sbin/ifconfig/Makefile:1.48 Thu Nov 4 23:31:12 2010
+++ src/sbin/ifconfig/Makefile Fri Nov 5 16:23:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2010/11/04 23:31:12 pooka Exp $
+# $NetBSD: Makefile,v 1.49 2010/11/05 16:23:56 pooka Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -31,10 +31,12 @@
# make rump system calls to a server in another process.
#
.ifdef RUMP_ACTION
+.PATH: ${.CURDIR}/../../lib/libc/net
CPPFLAGS+= -DRUMP_SYS_NETWORKING -DRUMP_SYS_IOCTL -DRUMP_SYS_CLOSE
CPPFLAGS+= -DRUMP_ACTION
LDADD+= -lrumpclient
DBG= -g
+SRCS+= getifaddrs.c
.endif
.include bsd.prog.mk
CVS commit: src/sys
Module Name:src
Committed By: jakllsch
Date: Fri Nov 5 18:07:24 UTC 2010
Modified Files:
src/sys/arch/i386/pci: gcscide.c
src/sys/dev/ic: wdcvar.h
src/sys/dev/pci: acardide.c aceride.c artsata.c cmdide.c cypide.c
geodeide.c hptide.c iteide.c ixpide.c jmide.c optiide.c
pciide_common.c pciidevar.h pdcide.c pdcsata.c piixide.c rccide.c
satalink.c siside.c slide.c stpcide.c svwsata.c toshide.c viaide.c
Log Message:
Pave the way for detachment of pciide(4)-family ATA controllers.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/pci/gcscide.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/ic/wdcvar.h
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/acardide.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/aceride.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/artsata.c src/sys/dev/pci/rccide.c \
src/sys/dev/pci/stpcide.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/cmdide.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/cypide.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/geodeide.c \
src/sys/dev/pci/ixpide.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/hptide.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/iteide.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/jmide.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/optiide.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/pciide_common.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/pciidevar.h
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/pdcide.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/pdcsata.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/piixide.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/satalink.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/siside.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/slide.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/svwsata.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/toshide.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/viaide.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/i386/pci/gcscide.c
diff -u src/sys/arch/i386/pci/gcscide.c:1.7 src/sys/arch/i386/pci/gcscide.c:1.8
--- src/sys/arch/i386/pci/gcscide.c:1.7 Tue Mar 18 20:46:36 2008
+++ src/sys/arch/i386/pci/gcscide.c Fri Nov 5 18:07:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscide.c,v 1.7 2008/03/18 20:46:36 cube Exp $ */
+/* $NetBSD: gcscide.c,v 1.8 2010/11/05 18:07:23 jakllsch Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gcscide.c,v 1.7 2008/03/18 20:46:36 cube Exp $);
+__KERNEL_RCSID(0, $NetBSD: gcscide.c,v 1.8 2010/11/05 18:07:23 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
@@ -153,7 +153,6 @@
gcscide_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
{
pcireg_t interface;
- bus_size_t cmdsize, ctlsize;
if (pciide_chipen(sc, pa) == 0)
return;
@@ -184,7 +183,7 @@
return;
pciide_mapchan(pa, sc-pciide_channels[0], interface,
- cmdsize, ctlsize, pciide_pci_intr);
+ pciide_pci_intr);
}
static void
Index: src/sys/dev/ic/wdcvar.h
diff -u src/sys/dev/ic/wdcvar.h:1.90 src/sys/dev/ic/wdcvar.h:1.91
--- src/sys/dev/ic/wdcvar.h:1.90 Tue Dec 1 01:06:31 2009
+++ src/sys/dev/ic/wdcvar.h Fri Nov 5 18:07:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wdcvar.h,v 1.90 2009/12/01 01:06:31 dyoung Exp $ */
+/* $NetBSD: wdcvar.h,v 1.91 2010/11/05 18:07:24 jakllsch Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,9 +47,11 @@
/* Our registers */
bus_space_tag_t cmd_iot;
bus_space_handle_tcmd_baseioh;
+ bus_size_tcmd_ios;
bus_space_handle_tcmd_iohs[WDC_NREG+WDC_NSHADOWREG];
bus_space_tag_t ctl_iot;
bus_space_handle_tctl_ioh;
+ bus_size_tctl_ios;
/* data32{iot,ioh} are only used for 32-bit data xfers */
bus_space_tag_t data32iot;
Index: src/sys/dev/pci/acardide.c
diff -u src/sys/dev/pci/acardide.c:1.23 src/sys/dev/pci/acardide.c:1.24
--- src/sys/dev/pci/acardide.c:1.23 Wed May 14 13:29:29 2008
+++ src/sys/dev/pci/acardide.c Fri Nov 5 18:07:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acardide.c,v 1.23 2008/05/14 13:29:29 tsutsui Exp $ */
+/* $NetBSD: acardide.c,v 1.24 2010/11/05 18:07:24 jakllsch Exp $ */
/*-
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acardide.c,v 1.23 2008/05/14 13:29:29 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: acardide.c,v 1.24 2010/11/05 18:07:24 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
@@ -115,7 +115,6 @@
struct pciide_channel *cp;
int i;
pcireg_t interface;
- bus_size_t cmdsize, ctlsize;
if (pciide_chipen(sc, pa) == 0)
return;
@@ -167,8 +166,7 @@
cp = sc-pciide_channels[i];
if (pciide_chansetup(sc, i, interface) == 0)
continue;
- pciide_mapchan(pa, cp, interface, cmdsize, ctlsize,
- pciide_pci_intr);
+ pciide_mapchan(pa, cp,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Fri Nov 5 19:48:43 UTC 2010 Modified Files: src/sys/dev/pci: pciide_common.c Log Message: Correct copy/paste error in as-of-yet-unused pciide_common_detach(). To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/pciide_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pciide_common.c diff -u src/sys/dev/pci/pciide_common.c:1.44 src/sys/dev/pci/pciide_common.c:1.45 --- src/sys/dev/pci/pciide_common.c:1.44 Fri Nov 5 18:07:24 2010 +++ src/sys/dev/pci/pciide_common.c Fri Nov 5 19:48:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pciide_common.c,v 1.44 2010/11/05 18:07:24 jakllsch Exp $ */ +/* $NetBSD: pciide_common.c,v 1.45 2010/11/05 19:48:43 jakllsch Exp $ */ /* @@ -70,7 +70,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pciide_common.c,v 1.44 2010/11/05 18:07:24 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: pciide_common.c,v 1.45 2010/11/05 19:48:43 jakllsch Exp $); #include sys/param.h #include sys/malloc.h @@ -217,7 +217,7 @@ if (sc-sc_dma_ios != 0) bus_space_unmap(sc-sc_dma_iot, sc-sc_dma_ioh, sc-sc_dma_ios); if (sc-sc_ba5_ss != 0) - bus_space_unmap(sc-sc_dma_iot, sc-sc_dma_ioh, sc-sc_dma_ios); + bus_space_unmap(sc-sc_ba5_st, sc-sc_ba5_sh, sc-sc_ba5_ss); return 0; }
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Fri Nov 5 19:50:18 UTC 2010
Modified Files:
src/sys/dev/pci: pciide.c
Log Message:
pciide(4): Sprinkle static, add detachment support.
To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/sys/dev/pci/pciide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pciide.c
diff -u src/sys/dev/pci/pciide.c:1.217 src/sys/dev/pci/pciide.c:1.218
--- src/sys/dev/pci/pciide.c:1.217 Mon Oct 19 18:41:15 2009
+++ src/sys/dev/pci/pciide.c Fri Nov 5 19:50:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide.c,v 1.217 2009/10/19 18:41:15 bouyer Exp $ */
+/* $NetBSD: pciide.c,v 1.218 2010/11/05 19:50:18 jakllsch Exp $ */
/*
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pciide.c,v 1.217 2009/10/19 18:41:15 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: pciide.c,v 1.218 2010/11/05 19:50:18 jakllsch Exp $);
#include sys/param.h
@@ -78,13 +78,14 @@
#include dev/pci/pciidereg.h
#include dev/pci/pciidevar.h
-int pciide_match(device_t, cfdata_t, void *);
-void pciide_attach(device_t, device_t, void *);
+static int pciide_match(device_t, cfdata_t, void *);
+static void pciide_attach(device_t, device_t, void *);
+static int pciide_detach(device_t, int);
CFATTACH_DECL_NEW(pciide, sizeof(struct pciide_softc),
-pciide_match, pciide_attach, NULL, NULL);
+pciide_match, pciide_attach, pciide_detach, NULL);
-int
+static int
pciide_match(device_t parent, cfdata_t match, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -102,7 +103,7 @@
return (0);
}
-void
+static void
pciide_attach(device_t parent, device_t self, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -112,3 +113,19 @@
pciide_common_attach(sc, pa, NULL);
}
+
+static int
+pciide_detach(device_t self, int flags)
+{
+ struct pciide_softc *sc = device_private(self);
+ int ret;
+
+ ret = pciide_common_detach(sc, flags);
+
+ if (ret != 0)
+ return ret;
+
+ pci_intr_disestablish(sc-sc_pc, sc-sc_pci_ih);
+
+ return ret;
+}
CVS commit: src/crypto/external/bsd/netpgp/dist/src
Module Name:src Committed By: agc Date: Sat Nov 6 00:03:34 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am src/crypto/external/bsd/netpgp/dist/src/libmj: Makefile.am src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.am src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: Makefile.am src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.am Log Message: Avoid specifying the manual page twice in the Makefile.am files, which can lead to problems at installation time on some platforms (RHEL 6, for example), whereas Mac OS X seems to install things fine. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.7 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.8 --- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.7 Fri Nov 5 03:01:57 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Sat Nov 6 00:03:32 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.7 2010/11/05 03:01:57 agc Exp $ +## $NetBSD: Makefile.am,v 1.8 2010/11/06 00:03:32 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -28,6 +28,4 @@ LDADD = ../libmj/libmj.a -man3_MANS = libnetpgp.3 - dist_man_MANS = libnetpgp.3 Index: src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.3 src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.4 --- src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.3 Fri Nov 5 03:37:19 2010 +++ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am Sat Nov 6 00:03:33 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.3 2010/11/05 03:37:19 agc Exp $ +## $NetBSD: Makefile.am,v 1.4 2010/11/06 00:03:33 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -8,6 +8,4 @@ libmj_la_SOURCES = mj.c -man3_MANS = libmj.3 - dist_man_MANS = libmj.3 Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.3 --- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.2 Fri Nov 5 07:39:59 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am Sat Nov 6 00:03:33 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.2 2010/11/05 07:39:59 agc Exp $ +## $NetBSD: Makefile.am,v 1.3 2010/11/06 00:03:33 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -10,6 +10,4 @@ netpgp_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la -man1_MANS = netpgp.1 - dist_man_MANS = netpgp.1 Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.4 --- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.3 Fri Nov 5 07:40:41 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am Sat Nov 6 00:03:33 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.3 2010/11/05 07:40:41 agc Exp $ +## $NetBSD: Makefile.am,v 1.4 2010/11/06 00:03:33 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -10,6 +10,4 @@ netpgpkeys_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la -man1_MANS = netpgpkeys.1 - dist_man_MANS = netpgpkeys.1 Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.4 --- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.3 Fri Nov 5 07:41:20 2010 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am Sat Nov 6 00:03:34 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.3 2010/11/05 07:41:20 agc Exp $ +## $NetBSD: Makefile.am,v 1.4 2010/11/06 00:03:34 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -10,6 +10,4 @@ netpgpverify_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la -man1_MANS = netpgpverify.1 - dist_man_MANS = netpgpverify.1
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Sat Nov 6 00:14:36 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist: configure configure.ac src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.in src/crypto/external/bsd/netpgp/dist/src/libmj: Makefile.in src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.in src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: Makefile.in src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.in Log Message: re-run automake to pick up changes to Makefile.am files. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/netpgp/dist/configure cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/netpgp/dist/configure.ac cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.in cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.in cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.in cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/configure diff -u src/crypto/external/bsd/netpgp/dist/configure:1.36 src/crypto/external/bsd/netpgp/dist/configure:1.37 --- src/crypto/external/bsd/netpgp/dist/configure:1.36 Fri Nov 5 03:37:18 2010 +++ src/crypto/external/bsd/netpgp/dist/configure Sat Nov 6 00:14:35 2010 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.37 . +# From configure.ac Revision: 1.38 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for netpgp 20101104. +# Generated by GNU Autoconf 2.63 for netpgp 20101105. # # Report bugs to Alistair Crooks a...@netbsd.org c0596823. # @@ -746,8 +746,8 @@ # Identity of this package. PACKAGE_NAME='netpgp' PACKAGE_TARNAME='netpgp' -PACKAGE_VERSION='20101104' -PACKAGE_STRING='netpgp 20101104' +PACKAGE_VERSION='20101105' +PACKAGE_STRING='netpgp 20101105' PACKAGE_BUGREPORT='Alistair Crooks a...@netbsd.org c0596823' ac_unique_file=src/netpgp/netpgp.c @@ -1477,7 +1477,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat _ACEOF -\`configure' configures netpgp 20101104 to adapt to many kinds of systems. +\`configure' configures netpgp 20101105 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1547,7 +1547,7 @@ if test -n $ac_init_help; then case $ac_init_help in - short | recursive ) echo Configuration of netpgp 20101104:;; + short | recursive ) echo Configuration of netpgp 20101105:;; esac cat \_ACEOF @@ -1649,7 +1649,7 @@ test -n $ac_init_help exit $ac_status if $ac_init_version; then cat \_ACEOF -netpgp configure 20101104 +netpgp configure 20101105 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1663,7 +1663,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by netpgp $as_me 20101104, which was +It was created by netpgp $as_me 20101105, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2550,7 +2550,7 @@ # Define the identity of the package. PACKAGE='netpgp' - VERSION='20101104' + VERSION='20101105' cat confdefs.h _ACEOF @@ -14131,7 +14131,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log= -This file was extended by netpgp $as_me 20101104, which was +This file was extended by netpgp $as_me 20101105, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -14194,7 +14194,7 @@ _ACEOF cat $CONFIG_STATUS _ACEOF || ac_write_fail=1 ac_cs_version=\\ -netpgp config.status 20101104 +netpgp config.status 20101105 configured by $0, generated by GNU Autoconf 2.63, with options \\`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'`\\ Index: src/crypto/external/bsd/netpgp/dist/configure.ac diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.38 src/crypto/external/bsd/netpgp/dist/configure.ac:1.39 --- src/crypto/external/bsd/netpgp/dist/configure.ac:1.38 Fri Nov 5 03:37:18 2010 +++ src/crypto/external/bsd/netpgp/dist/configure.ac Sat Nov 6 00:14:35 2010 @@ -1,10 +1,10 @@ -# $NetBSD: configure.ac,v 1.38 2010/11/05 03:37:18 agc Exp $ +# $NetBSD: configure.ac,v 1.39 2010/11/06 00:14:35 agc Exp $ # # Process this file with autoconf to produce a configure script. -AC_INIT([netpgp],[20101104],[Alistair Crooks a...@netbsd.org c0596823]) +AC_INIT([netpgp
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Sat Nov 6 00:29:09 UTC 2010
Modified Files:
src/sys/dev/pci: pciide.c pciide_common.c pciidevar.h
Log Message:
Rework pciide(4) detachment to take the legacy interrupt mapping into
consideration and avoid future code duplication.
Ports wanting to enable detachment of controllers with compatibility-mapped
channels will need to supply a pciide_machdep_compat_intr_disestablish()
function.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/dev/pci/pciide.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/pciide_common.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/pciidevar.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/dev/pci/pciide.c
diff -u src/sys/dev/pci/pciide.c:1.218 src/sys/dev/pci/pciide.c:1.219
--- src/sys/dev/pci/pciide.c:1.218 Fri Nov 5 19:50:18 2010
+++ src/sys/dev/pci/pciide.c Sat Nov 6 00:29:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide.c,v 1.218 2010/11/05 19:50:18 jakllsch Exp $ */
+/* $NetBSD: pciide.c,v 1.219 2010/11/06 00:29:09 jakllsch Exp $ */
/*
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pciide.c,v 1.218 2010/11/05 19:50:18 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pciide.c,v 1.219 2010/11/06 00:29:09 jakllsch Exp $);
#include sys/param.h
@@ -80,7 +80,6 @@
static int pciide_match(device_t, cfdata_t, void *);
static void pciide_attach(device_t, device_t, void *);
-static int pciide_detach(device_t, int);
CFATTACH_DECL_NEW(pciide, sizeof(struct pciide_softc),
pciide_match, pciide_attach, pciide_detach, NULL);
@@ -113,19 +112,3 @@
pciide_common_attach(sc, pa, NULL);
}
-
-static int
-pciide_detach(device_t self, int flags)
-{
- struct pciide_softc *sc = device_private(self);
- int ret;
-
- ret = pciide_common_detach(sc, flags);
-
- if (ret != 0)
- return ret;
-
- pci_intr_disestablish(sc-sc_pc, sc-sc_pci_ih);
-
- return ret;
-}
Index: src/sys/dev/pci/pciide_common.c
diff -u src/sys/dev/pci/pciide_common.c:1.45 src/sys/dev/pci/pciide_common.c:1.46
--- src/sys/dev/pci/pciide_common.c:1.45 Fri Nov 5 19:48:43 2010
+++ src/sys/dev/pci/pciide_common.c Sat Nov 6 00:29:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_common.c,v 1.45 2010/11/05 19:48:43 jakllsch Exp $ */
+/* $NetBSD: pciide_common.c,v 1.46 2010/11/06 00:29:09 jakllsch Exp $ */
/*
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pciide_common.c,v 1.45 2010/11/05 19:48:43 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pciide_common.c,v 1.46 2010/11/06 00:29:09 jakllsch Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -222,6 +222,42 @@
return 0;
}
+int
+pciide_detach(device_t self, int flags)
+{
+ struct pciide_softc *sc = device_private(self);
+ struct pciide_channel *cp;
+ int channel;
+#ifndef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH
+ bool has_compat_chan;
+
+ has_compat_chan = false;
+ for (channel = 0; channel sc-sc_wdcdev.sc_atac.atac_nchannels;
+ channel++) {
+ cp = sc-pciide_channels[channel];
+ if (cp-compat != 0) {
+ has_compat_chan = true;
+ }
+ }
+
+ if (has_compat_chan != false)
+ return EBUSY;
+#endif
+
+ for (channel = 0; channel sc-sc_wdcdev.sc_atac.atac_nchannels;
+ channel++) {
+ cp = sc-pciide_channels[channel];
+ if (cp-compat != 0)
+ if (cp-ih != NULL)
+ pciide_unmap_compat_intr(sc-sc_pc, cp, channel);
+ }
+
+ if (sc-sc_pci_ih != NULL)
+ pci_intr_disestablish(sc-sc_pc, sc-sc_pci_ih);
+
+ return pciide_common_detach(sc, flags);
+}
+
/* tell whether the chip is enabled or not */
int
pciide_chipen(struct pciide_softc *sc, struct pci_attach_args *pa)
@@ -888,6 +924,17 @@
}
void
+pciide_unmap_compat_intr(pci_chipset_tag_t pc, struct pciide_channel *cp, int compatchan)
+{
+#ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH
+ struct pciide_softc *sc = CHAN_TO_PCIIDE(cp-ata_channel);
+
+ pciide_machdep_compat_intr_disestablish(sc-sc_wdcdev.sc_atac.atac_dev,
+ sc-sc_pc, compatchan, cp-ih);
+#endif
+}
+
+void
default_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
{
struct pciide_channel *cp;
Index: src/sys/dev/pci/pciidevar.h
diff -u src/sys/dev/pci/pciidevar.h:1.41 src/sys/dev/pci/pciidevar.h:1.42
--- src/sys/dev/pci/pciidevar.h:1.41 Fri Nov 5 18:07:24 2010
+++ src/sys/dev/pci/pciidevar.h Sat Nov 6 00:29:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciidevar.h,v 1.41 2010/11/05 18:07:24 jakllsch Exp $ */
+/* $NetBSD: pciidevar.h,v 1.42 2010/11/06 00:29:09 jakllsch Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -222,12 +222,17 @@
void *pciide_machdep_compat_intr_establish(device_t,
struct pci_attach_args *, int, int (*)(void *), void *);
#endif
+#ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH
+void pciide_machdep_compat_intr_disestablish(device_t,
+ pci_chipset_tag_t, int, void *);
+#endif
const struct
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: jakllsch
Date: Sat Nov 6 00:35:44 UTC 2010
Modified Files:
src/sys/arch/x86/include: pci_machdep_common.h
src/sys/arch/x86/pci: pciide_machdep.c
Log Message:
Implement pciide_machdep_compat_intr_disestablish() to help enable
detachment of compatibility-mapped pciide(4)-family controllers.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/include/pci_machdep_common.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/pci/pciide_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/pci_machdep_common.h
diff -u src/sys/arch/x86/include/pci_machdep_common.h:1.3 src/sys/arch/x86/include/pci_machdep_common.h:1.4
--- src/sys/arch/x86/include/pci_machdep_common.h:1.3 Wed Apr 28 21:27:14 2010
+++ src/sys/arch/x86/include/pci_machdep_common.h Sat Nov 6 00:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.h,v 1.3 2010/04/28 21:27:14 dyoung Exp $ */
+/* $NetBSD: pci_machdep_common.h,v 1.4 2010/11/06 00:35:44 jakllsch Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -37,6 +37,7 @@
* Machine-specific definitions for PCI autoconfiguration.
*/
#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
+#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH
/*
* i386-specific PCI structure and type definitions.
Index: src/sys/arch/x86/pci/pciide_machdep.c
diff -u src/sys/arch/x86/pci/pciide_machdep.c:1.9 src/sys/arch/x86/pci/pciide_machdep.c:1.10
--- src/sys/arch/x86/pci/pciide_machdep.c:1.9 Fri May 1 09:26:34 2009
+++ src/sys/arch/x86/pci/pciide_machdep.c Sat Nov 6 00:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.10 2010/11/06 00:35:44 jakllsch Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: pciide_machdep.c,v 1.10 2010/11/06 00:35:44 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
@@ -90,3 +90,10 @@
PCIIDE_CHANNEL_NAME(chan), irq);
return cookie;
}
+
+void
+pciide_machdep_compat_intr_disestablish(device_t dev, pci_chipset_tag_t pc, int chan, void *cookie)
+{
+ isa_intr_disestablish(NULL, cookie);
+ return;
+}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Sat Nov 6 01:24:56 UTC 2010
Modified Files:
src/sys/dev/pci: viaide.c
Log Message:
Enable detachment.
Tested on nForce 4 IDE (compatiblity mapped) and SATA (native mapped).
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/viaide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/viaide.c
diff -u src/sys/dev/pci/viaide.c:1.70 src/sys/dev/pci/viaide.c:1.71
--- src/sys/dev/pci/viaide.c:1.70 Fri Nov 5 18:07:24 2010
+++ src/sys/dev/pci/viaide.c Sat Nov 6 01:24:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: viaide.c,v 1.70 2010/11/05 18:07:24 jakllsch Exp $ */
+/* $NetBSD: viaide.c,v 1.71 2010/11/06 01:24:55 jakllsch Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: viaide.c,v 1.70 2010/11/05 18:07:24 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: viaide.c,v 1.71 2010/11/06 01:24:55 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
@@ -63,7 +63,7 @@
static bool viaide_resume(device_t, const pmf_qual_t *);
CFATTACH_DECL_NEW(viaide, sizeof(struct pciide_softc),
-viaide_match, viaide_attach, NULL, NULL);
+viaide_match, viaide_attach, pciide_detach, NULL);
static const struct pciide_product_desc pciide_amd_products[] = {
{ PCI_PRODUCT_AMD_PBC756_IDE,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Sat Nov 6 01:25:32 UTC 2010 Modified Files: src/sys/dev/pci: cmdide.c Log Message: Enable detachment. Tested on SiI 0680 (native mapped). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/cmdide.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/cmdide.c diff -u src/sys/dev/pci/cmdide.c:1.30 src/sys/dev/pci/cmdide.c:1.31 --- src/sys/dev/pci/cmdide.c:1.30 Fri Nov 5 18:07:24 2010 +++ src/sys/dev/pci/cmdide.c Sat Nov 6 01:25:32 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cmdide.c,v 1.30 2010/11/05 18:07:24 jakllsch Exp $ */ +/* $NetBSD: cmdide.c,v 1.31 2010/11/06 01:25:32 jakllsch Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cmdide.c,v 1.30 2010/11/05 18:07:24 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: cmdide.c,v 1.31 2010/11/06 01:25:32 jakllsch Exp $); #include sys/param.h #include sys/systm.h @@ -42,7 +42,7 @@ static void cmdide_attach(device_t, device_t, void *); CFATTACH_DECL_NEW(cmdide, sizeof(struct pciide_softc), -cmdide_match, cmdide_attach, NULL, NULL); +cmdide_match, cmdide_attach, pciide_detach, NULL); static void cmd_chip_map(struct pciide_softc*, struct pci_attach_args*); static void cmd0643_9_chip_map(struct pciide_softc*, struct pci_attach_args*);
CVS commit: [netbsd-5] src/distrib/notes/common
Module Name:src Committed By: snj Date: Sat Nov 6 03:42:21 UTC 2010 Modified Files: src/distrib/notes/common [netbsd-5]: main Log Message: ftpd/sftp glob stuff is covered by SA2010-008. No need to duplicate it. To generate a diff of this commit: cvs rdiff -u -r1.425.2.13 -r1.425.2.14 src/distrib/notes/common/main 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/common/main diff -u src/distrib/notes/common/main:1.425.2.13 src/distrib/notes/common/main:1.425.2.14 --- src/distrib/notes/common/main:1.425.2.13 Fri Nov 5 09:28:46 2010 +++ src/distrib/notes/common/main Sat Nov 6 03:42:21 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.425.2.13 2010/11/05 09:28:46 sborrill Exp $ +.\ $NetBSD: main,v 1.425.2.14 2010/11/06 03:42:21 snj Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -603,11 +603,6 @@ Fix an NX regression observed on amd64 kernels, where per-page execution right was disabled (therefore leading to the inability of the kernel to detect fraudulent use of memory mappings marked as not being executable). -.It -.Xr ftpd 8 -and -.Xr sftp 1 : -Prevent remote DoS attack with glob patterns. .bullet) . .Ss2 Kernel
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Sat Nov 6 03:43:00 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist: configure src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am Makefile.in Log Message: specify the libmj.la archive as a pre-req for libnetpgp.la in the correct way - tested on RHEL 6 and Mac OS X. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/netpgp/dist/configure cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/configure diff -u src/crypto/external/bsd/netpgp/dist/configure:1.37 src/crypto/external/bsd/netpgp/dist/configure:1.38 --- src/crypto/external/bsd/netpgp/dist/configure:1.37 Sat Nov 6 00:14:35 2010 +++ src/crypto/external/bsd/netpgp/dist/configure Sat Nov 6 03:42:59 2010 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.38 . +# From configure.ac Revision: 1.39 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.63 for netpgp 20101105. # Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.8 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.9 --- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.8 Sat Nov 6 00:03:32 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Sat Nov 6 03:42:59 2010 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.8 2010/11/06 00:03:32 agc Exp $ +## $NetBSD: Makefile.am,v 1.9 2010/11/06 03:42:59 agc Exp $ AM_CFLAGS = $(WARNCFLAGS) @@ -26,6 +26,6 @@ validate.c \ writer.c -LDADD = ../libmj/libmj.a +libnetpgp_la_LIBADD = ../libmj/libmj.la dist_man_MANS = libnetpgp.3 Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.13 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.14 --- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.13 Sat Nov 6 00:14:35 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Sat Nov 6 03:42:59 2010 @@ -52,7 +52,7 @@ am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(man3dir) libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libnetpgp_la_LIBADD = +libnetpgp_la_DEPENDENCIES = ../libmj/libmj.la am_libnetpgp_la_OBJECTS = libnetpgp_la-bufgap.lo \ libnetpgp_la-compress.lo libnetpgp_la-create.lo \ libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \ @@ -225,7 +225,7 @@ validate.c \ writer.c -LDADD = ../libmj/libmj.a +libnetpgp_la_LIBADD = ../libmj/libmj.la dist_man_MANS = libnetpgp.3 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: jakllsch Date: Sat Nov 6 04:14:30 UTC 2010 Modified Files: src/sys/arch/x86/include: pci_machdep_common.h Log Message: Unbreak Xen build, while not actually fixing the real problem. NetBSD/xen doesn't implement disestablishing interrupts yet. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/include/pci_machdep_common.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/pci_machdep_common.h diff -u src/sys/arch/x86/include/pci_machdep_common.h:1.4 src/sys/arch/x86/include/pci_machdep_common.h:1.5 --- src/sys/arch/x86/include/pci_machdep_common.h:1.4 Sat Nov 6 00:35:44 2010 +++ src/sys/arch/x86/include/pci_machdep_common.h Sat Nov 6 04:14:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep_common.h,v 1.4 2010/11/06 00:35:44 jakllsch Exp $ */ +/* $NetBSD: pci_machdep_common.h,v 1.5 2010/11/06 04:14:30 jakllsch Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -37,7 +37,9 @@ * Machine-specific definitions for PCI autoconfiguration. */ #define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH +#ifndef XEN #define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH +#endif /* * i386-specific PCI structure and type definitions.
