PERFORCE change 31121 for review
Peter Wemm
peter at FreeBSD.org
Tue May 13 20:28:54 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=31121
Change 31121 by peter at peter_daintree on 2003/05/13 20:28:11
IFC @31120
Affected files ...
.. //depot/projects/hammer/crypto/openssh/log.h#4 integrate
.. //depot/projects/hammer/lib/libc/sys/stat.2#3 integrate
.. //depot/projects/hammer/lib/libwrap/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#6 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#8 integrate
.. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#6 integrate
.. //depot/projects/hammer/share/man/man4/agp.4#2 integrate
.. //depot/projects/hammer/share/man/man4/dc.4#3 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/gsc.4#2 integrate
.. //depot/projects/hammer/share/man/man8/Makefile#4 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#11 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#9 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#33 integrate
.. //depot/projects/hammer/sys/amd64/ia32/Makefile#2 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32.h#2 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_misc.c#4 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_proto.h#4 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.h#4 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_sysent.c#4 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_sysvec.c#4 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_util.h#2 integrate
.. //depot/projects/hammer/sys/amd64/ia32/syscalls.conf#2 integrate
.. //depot/projects/hammer/sys/amd64/ia32/syscalls.master#4 integrate
.. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#9 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#6 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#4 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#8 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.c#11 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#7 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#7 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#15 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#9 integrate
.. //depot/projects/hammer/sys/i386/svr4/svr4_machdep.c#5 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#12 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_condvar.c#9 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_kthread.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_time.c#6 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#12 integrate
.. //depot/projects/hammer/sys/kern/tty.c#7 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#4 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#16 integrate
.. //depot/projects/hammer/sys/modules/Makefile#17 integrate
.. //depot/projects/hammer/sys/netncp/ncp_ncp.c#6 integrate
.. //depot/projects/hammer/sys/netsmb/smb_subr.c#6 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#7 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#13 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#14 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#18 integrate
.. //depot/projects/hammer/sys/sys/proc.h#22 integrate
.. //depot/projects/hammer/sys/sys/signalvar.h#6 integrate
.. //depot/projects/hammer/sys/sys/user.h#7 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#15 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#9 integrate
Differences ...
==== //depot/projects/hammer/crypto/openssh/log.h#4 (text+ko) ====
@@ -1,5 +1,5 @@
/* $OpenBSD: log.h,v 1.8 2002/07/19 15:43:33 markus Exp $ */
-/* $FreeBSD: src/crypto/openssh/log.h,v 1.2 2003/05/12 19:22:47 des Exp $ */
+/* $FreeBSD: src/crypto/openssh/log.h,v 1.3 2003/05/13 10:18:49 des Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -62,13 +62,13 @@
#define debug2 ssh_debug2
#define debug3 ssh_debug3
-void ssh_fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_error(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_log(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_debug(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
+void fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
+void error(const char *, ...) __attribute__((format(printf, 1, 2)));
+void log(const char *, ...) __attribute__((format(printf, 1, 2)));
+void verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
+void debug(const char *, ...) __attribute__((format(printf, 1, 2)));
+void debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
+void debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
void fatal_cleanup(void);
void fatal_add_cleanup(void (*) (void *), void *);
==== //depot/projects/hammer/lib/libc/sys/stat.2#3 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)stat.2 8.4 (Berkeley) 5/1/95
-.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.31 2002/12/19 09:40:25 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.32 2003/05/13 08:10:05 dougb Exp $
.\"
.Dd February 15, 2002
.Dt STAT 2
@@ -85,36 +85,7 @@
structure
as defined by
.Aq Pa sys/stat.h
-(shown below)
and into which information is placed concerning the file.
-.Bd -literal
-struct stat {
- dev_t st_dev; /* inode's device */
- ino_t st_ino; /* inode's number */
- mode_t st_mode; /* inode protection mode */
- nlink_t st_nlink; /* number of hard links */
- uid_t st_uid; /* user ID of the file's owner */
- gid_t st_gid; /* group ID of the file's group */
- dev_t st_rdev; /* device type */
-#ifndef _POSIX_SOURCE
- struct timespec st_atimespec; /* time of last access */
- struct timespec st_mtimespec; /* time of last data modification */
- struct timespec st_ctimespec; /* time of last file status change */
-#else
- time_t st_atime; /* time of last access */
- long st_atimensec; /* nsec of last access */
- time_t st_mtime; /* time of last data modification */
- long st_mtimensec; /* nsec of last data modification */
- time_t st_ctime; /* time of last file status change */
- long st_ctimensec; /* nsec of last file status change */
-#endif
- off_t st_size; /* file size, in bytes */
- int64_t st_blocks; /* blocks allocated for file */
- u_int32_t st_blksize; /* optimal blocksize for I/O */
- fflags_t st_flags; /* user defined flags for file */
- u_int32_t st_gen; /* file generation number */
-};
-.Ed
.Pp
The time-related fields of
.Fa struct stat
@@ -149,6 +120,8 @@
and
.Xr write 2
system calls.
+.It st_birthtime
+Time when the inode was created.
.El
.Pp
If
==== //depot/projects/hammer/lib/libwrap/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/lib/libwrap/Makefile,v 1.11 2002/09/28 00:25:32 peter Exp $
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.12 2003/05/12 21:59:16 hmp Exp $
#
MAINTAINER=markm at FreeBSD.org
@@ -9,6 +9,8 @@
INCS= tcpd.h
MAN= hosts_access.3
MAN+= hosts_access.5 hosts_options.5
+MLINKS= hosts_access.3 hosts_ctl.3 hosts_access.3 request_init.3 \
+ hosts_access.3 request_set.3
.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 (text+ko) ====
@@ -31,7 +31,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.148 2003/05/10 16:30:56 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.149 2003/05/13 18:15:28 bmah Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -834,6 +834,8 @@
</itemizedlist>
</para>
+ <para arch="i386">IBM / Adaptec ServeRAID series (ips driver)</para>
+
<para arch="i386,alpha,pc98,sparc64">LSI Logic Fusion/MP
architecture Fiber Channel controllers (mpt driver)
<itemizedlist>
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.566 2003/05/08 22:31:00 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.567 2003/05/13 18:15:28 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -439,6 +439,9 @@
believed to fix problems detecting attached disks during
installation.</para>
+ <para arch="i386">The ips driver, which supports the IBM (now
+ Adaptec) ServeRAID series, has been added.</para>
+
<para>A bug in the &man.mly.4; driver that caused hangs has been
corrected.</para>
==== //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#6 (text+ko) ====
@@ -54,7 +54,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.92 2003/05/09 20:26:17 phk Exp $");
+__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.93 2003/05/13 19:42:52 phk Exp $");
#include <sys/param.h>
#include <stdint.h>
@@ -165,6 +165,10 @@
labeloffset = 512;
bbsize = 8192;
alphacksum = 0;
+ } else if (!strcmp(optarg, "pc98")) {
+ labeloffset = 512;
+ bbsize = 8192;
+ alphacksum = 0;
} else if (!strcmp(optarg, "alpha")) {
labeloffset = 64;
bbsize = 8192;
==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#8 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.69 2003/04/28 16:47:40 sam Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.70 2003/05/13 08:29:49 sheldonh Exp $
.\"
.Dd April 28, 2003
.Dt IFCONFIG 8
@@ -466,7 +466,7 @@
See the
.Ar address
option above for more information.
-3\" see
+.\" see
.\" Xr eon 5 .
.\" .It Cm nsellength Ar n
.\" .Pf ( Tn ISO
==== //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#6 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.60 2003/05/03 18:41:58 obrien Exp $");
+__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.61 2003/05/12 19:48:47 trhodes Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -264,7 +264,7 @@
nfsargs = nfsdefargs;
nfsargsp = &nfsargs;
while ((c = getopt(argc, argv,
- "23a:bcdD:g:I:iLl:No:PpR:r:sTt:w:x:U")) != -1)
+ "23a:bcdD:g:I:iLl:No:PR:r:sTt:w:x:U")) != -1)
switch (c) {
case '2':
mountmode = V2;
==== //depot/projects/hammer/share/man/man4/agp.4#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/agp.4,v 1.3 2001/11/19 07:15:45 kuriyama Exp $
+.\" $FreeBSD: src/share/man/man4/agp.4,v 1.4 2003/05/12 21:34:29 hmp Exp $
.\"
.Dd October 5, 2001
.Dt AGP 4
@@ -58,6 +58,105 @@
is for running
.Xr XFree86 1
on the Intel i81x controllers.
+.Sh IOCTLS
+The following
+.Xr ioctl 2
+operations can be performed on
+.Pa /dev/agpgart ,
+which are defined in
+.Aq Pa sys/agpio.h :
+.Ss Dv AGPIOC_INFO
+Returns state of the
+.Nm
+system.
+The result is a pointer to the following structure:
+.Bd -literal
+typedef struct _agp_info {
+ agp_version version; /* version of the driver */
+ u_int32_t bridge_id; /* bridge vendor/device */
+ u_int32_t agp_mode; /* mode info of bridge */
+ off_t aper_base; /* base of aperture */
+ size_t aper_size; /* size of aperture */
+ size_t pg_total; /* max pages (swap + system) */
+ size_t pg_system; /* max pages (system) */
+ size_t pg_used; /* current pages used */
+} agp_info;
+.Ed
+.Ss Dv AGPIOC_ACQUIRE
+Acquire control of the AGP chipset for use by this client.
+Returns
+.Er EBUSY
+if the AGP chipset is already acquired by another client.
+.Ss Dv AGPIOC_RELEASE
+Release control of the AGP chipset.
+This does not unbind or free any allocated memory, which is the
+responsibility of the client to handle if necessary.
+.Ss Dv AGPIOC_SETUP
+Enable the AGP hardware with the relevant mode.
+This
+.Xr ioctl 2
+takes the following structure:
+.Bd -literal
+typedef struct _agp_setup {
+ u_int32_t agp_mode; /* mode info of bridge */
+} agp_setup;
+.Ed
+.Pp
+The mode bits are defined in
+.Aq Pa sys/agpio.h .
+.Ss Dv AGPIOC_ALLOCATE
+Allocate physical memory suitable for mapping into the AGP aperture.
+This
+.Xr ioctl 2
+takes the following structure:
+.Bd -literal
+typedef struct _agp_allocate {
+ int key; /* tag of allocation */
+ size_t pg_count; /* number of pages */
+ u_int32_t type; /* 0 == normal, other devspec */
+ u_int32_t physical; /* device specific (some devices
+ * need a phys address of the
+ * actual page behind the gatt
+ * table) */
+} agp_allocate;
+.Ed
+.Pp
+Returns a handle to the allocated memory.
+.Ss Dv AGPIOC_DEALLOCATE
+Free the previously allocated memory associated with the handle passed.
+.Ss Dv AGPIOC_BIND
+Bind the allocated memory at given offset with the AGP aperture.
+Returns
+.Er EINVAL
+if the memory is already bound or the offset is not at AGP page boundary.
+This
+.Xr ioctl 2
+takes the following structure:
+.Bd -literal
+typedef struct _agp_bind {
+ int key; /* tag of allocation */
+ off_t pg_start; /* starting page to populate */
+} agp_bind;
+.Ed
+.Pp
+The
+.Sq tag of allocation ,
+is the handle returned by
+.Dv AGPIOC_ALLOCATE.
+.Ss Dv AGPIOC_UNBIND
+Unbind memory from the AGP aperture.
+Returns
+.Er EINVAL
+if the memory is not bound.
+This
+.Xr ioctl
+takes the following structure:
+.Bd -literal
+typedef struct _agp_unbind {
+ int key; /* tag of allocation */
+ u_int32_t priority; /* priority for paging out */
+} agp_unbind;
+.Ed
.Sh FILES
.Bl -tag -width ".Pa /dev/agpgart" -compact
.It Pa /dev/agpgart
==== //depot/projects/hammer/share/man/man4/dc.4#3 (text+ko) ====
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/dc.4,v 1.19 2003/02/15 17:12:53 trhodes Exp $
+.\" $FreeBSD: src/share/man/man4/dc.4,v 1.20 2003/05/12 19:50:21 mbr Exp $
.\"
.Dd November 20, 1999
.Dt DC 4
@@ -143,6 +143,8 @@
CNet Pro110B (ASIX AX88140A)
.It
LinkSys LNE100TX v4.0/4.1 (ADMtek AN985 Centaur-P)
+.It
+3Com OfficeConnect 10/100B (ADMtek AN985 Centaur-P)
.El
.Pp
The
==== //depot/projects/hammer/share/man/man4/man4.i386/gsc.4#2 (text+ko) ====
@@ -28,7 +28,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/man4.i386/gsc.4,v 1.22 2002/01/21 12:36:12 mpp Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/gsc.4,v 1.23 2003/05/12 21:47:39 hmp Exp $
.\"
.Dd January 9, 1995
.Os
@@ -110,7 +110,7 @@
shall be reached.
With this feature you are able to
directly copy the scanner output into a pbm file with
-.Xr cat .
+.Xr cat 1 .
Of course you can obtain a similar effect by using
.Xr dd 1
with the driver in
==== //depot/projects/hammer/share/man/man8/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD: src/share/man/man8/Makefile,v 1.32 2003/03/25 15:07:01 keramida Exp $
+# $FreeBSD: src/share/man/man8/Makefile,v 1.33 2003/05/12 21:52:46 hmp Exp $
MAN= MAKEDEV.8 \
adding_user.8 \
@@ -15,6 +15,7 @@
MLINKS= rc.8 rc.early.8 rc.8 rc.serial.8 rc.8 rc.pccard.8 rc.8 rc.network.8
MLINKS+=rc.8 rc.firewall.8 rc.8 rc.atm.8 rc.8 rc.local.8 rc.8 rc.shutdown.8
+MLINKS+=rc.8 rc.d.8
MLINKS+=yp.8 YP.8 yp.8 NIS.8 yp.8 nis.8
.include <bsd.prog.mk>
==== //depot/projects/hammer/sys/alpha/alpha/machdep.c#11 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.201 2003/04/25 01:50:28 deischen Exp $
+ * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.202 2003/05/13 20:35:56 jhb Exp $
*/
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1133,11 +1133,13 @@
td = curthread;
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
+ psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
+
frame = td->td_frame;
- oonstack = sigonstack(alpha_pal_rdusp());
fsize = sizeof ksi;
rndfsize = ((fsize + 15) / 16) * 16;
- psp = p->p_sigacts;
+ oonstack = sigonstack(alpha_pal_rdusp());
/*
* Allocate and validate space for the signal handler
@@ -1155,6 +1157,7 @@
#endif
} else
sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize);
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/*
@@ -1210,7 +1213,8 @@
frame->tf_regs[FRAME_A0] = sig;
frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */
PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig))
+ mtx_lock(&psp->ps_mtx);
+ if (SIGISMEMBER(psp->ps_siginfo, sig))
frame->tf_regs[FRAME_A1] = (u_int64_t)sip;
else
frame->tf_regs[FRAME_A1] = code;
@@ -1235,6 +1239,7 @@
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
frame = td->td_frame;
oonstack = sigonstack(alpha_pal_rdusp());
@@ -1276,6 +1281,7 @@
#endif
} else
sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize);
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/* save the floating-point state, if necessary, then copy it. */
@@ -1311,7 +1317,8 @@
frame->tf_regs[FRAME_PC] = PS_STRINGS - szfreebsd4_sigcode;
frame->tf_regs[FRAME_A0] = sig;
PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) {
+ mtx_lock(&psp->ps_mtx);
+ if (SIGISMEMBER(psp->ps_siginfo, sig)) {
frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si);
/* Fill in POSIX parts */
@@ -1343,6 +1350,7 @@
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
#ifdef COMPAT_FREEBSD4
if (SIGISMEMBER(psp->ps_freebsd4, sig)) {
freebsd4_sendsig(catcher, sig, mask, code);
@@ -1397,6 +1405,7 @@
#endif
} else
sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize);
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/* save the floating-point state, if necessary, then copy it. */
@@ -1432,7 +1441,8 @@
frame->tf_regs[FRAME_PC] = PS_STRINGS - szsigcode;
frame->tf_regs[FRAME_A0] = sig;
PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) {
+ mtx_lock(&psp->ps_mtx);
+ if (SIGISMEMBER(psp->ps_siginfo, sig)) {
frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si);
/* Fill in POSIX parts */
==== //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#9 (text+ko) ====
@@ -30,7 +30,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.32 2003/04/29 06:33:03 alc Exp $
+ * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.33 2003/05/13 20:35:56 jhb Exp $
*/
#include "opt_compat.h"
@@ -471,6 +471,7 @@
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
frame = td->td_frame;
oonstack = sigonstack(alpha_pal_rdusp());
@@ -490,6 +491,7 @@
p->p_sigstk.ss_flags |= SS_ONSTACK;
} else
sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize);
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/*
@@ -551,6 +553,7 @@
frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */
alpha_pal_wrusp((unsigned long)sip);
PROC_LOCK(p);
+ mtx_lock(&psp->ps_mtx);
}
==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#33 (text+ko) ====
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.575 2003/05/12 18:37:56 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.576 2003/05/13 20:35:57 jhb Exp $
*/
#include "opt_atalk.h"
@@ -234,6 +234,7 @@
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
regs = td->td_frame;
oonstack = sigonstack(regs->tf_rsp);
@@ -261,7 +262,6 @@
sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128;
/* Align to 16 bytes. */
sfp = (struct sigframe *)((unsigned long)sp & ~0xF);
- PROC_UNLOCK(p);
/* Translate the signal if appropriate. */
if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize)
@@ -270,8 +270,7 @@
/* Build the argument list for the signal handler. */
regs->tf_rdi = sig; /* arg 1 in %rdi */
regs->tf_rdx = (register_t)&sfp->sf_uc; /* arg 3 in %rdx */
- PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) {
+ if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
regs->tf_rsi = (register_t)&sfp->sf_si; /* arg 2 in %rsi */
sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher;
@@ -286,6 +285,7 @@
regs->tf_rcx = regs->tf_addr; /* arg 4 in %rcx */
sf.sf_ahu.sf_handler = catcher;
}
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/*
@@ -304,6 +304,7 @@
regs->tf_rflags &= ~PSL_T;
regs->tf_cs = _ucodesel;
PROC_LOCK(p);
+ mtx_lock(&psp->ps_mtx);
}
/*
==== //depot/projects/hammer/sys/amd64/ia32/Makefile#2 (text+ko) ====
@@ -1,6 +1,6 @@
# Makefile for syscall tables
#
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/ia32/Makefile,v 1.1 2002/04/10 19:34:51 dfr Exp $
all:
@echo "make sysent only"
==== //depot/projects/hammer/sys/amd64/ia32/ia32.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia32/ia32.h,v 1.1 2002/07/20 02:56:10 peter Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32.h,v 1.1 2002/07/20 02:56:10 peter Exp $
*/
#ifndef _IA64_IA32_IA32_H_
==== //depot/projects/hammer/sys/amd64/ia32/ia32_misc.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia32/ia32_misc.c,v 1.9 2003/04/22 18:23:49 jhb Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_misc.c,v 1.9 2003/04/22 18:23:49 jhb Exp $
*/
#include "opt_compat.h"
==== //depot/projects/hammer/sys/amd64/ia32/ia32_proto.h#4 (text+ko) ====
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp
+ * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp
*/
#ifndef _IA32_SYSPROTO_H_
==== //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.h#4 (text+ko) ====
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp
+ * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp
*/
#define IA32_SYS_syscall 0
==== //depot/projects/hammer/sys/amd64/ia32/ia32_sysent.c#4 (text+ko) ====
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp
+ * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp
*/
#include "opt_compat.h"
==== //depot/projects/hammer/sys/amd64/ia32/ia32_sysvec.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia32/ia32_sysvec.c,v 1.2 2002/09/01 21:41:23 jake Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.2 2002/09/01 21:41:23 jake Exp $
*/
#include "opt_compat.h"
==== //depot/projects/hammer/sys/amd64/ia32/ia32_util.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia32/ia32_util.h,v 1.4 2002/12/14 01:56:25 alfred Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_util.h,v 1.4 2002/12/14 01:56:25 alfred Exp $
*/
#include <vm/vm.h>
==== //depot/projects/hammer/sys/amd64/ia32/syscalls.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/ia64/ia32/syscalls.conf,v 1.1 2002/04/10 19:34:51 dfr Exp $
+# $FreeBSD: src/sys/amd64/ia32/syscalls.conf,v 1.1 2002/04/10 19:34:51 dfr Exp $
sysnames="/dev/null"
sysproto="ia32_proto.h"
sysproto_h=_IA32_SYSPROTO_H_
==== //depot/projects/hammer/sys/amd64/ia32/syscalls.master#4 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp $
+ $FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.21 2003/04/25 15:59:18 jhb Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
==== //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#9 (text+ko) ====
@@ -38,7 +38,7 @@
*
* @(#)procfs_status.c 8.4 (Berkeley) 6/15/94
*
- * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.64 2003/04/17 21:58:45 jhb Exp $
+ * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.65 2003/05/13 20:35:57 jhb Exp $
*/
#include <sys/param.h>
@@ -547,6 +547,7 @@
char *state;
segsz_t lsize;
struct thread *td2;
+ struct sigacts *ps;
int i;
PROC_LOCK(p);
@@ -653,8 +654,11 @@
* relation to struct proc, so SigBlk is left unimplemented.
*/
sbuf_printf(sb, "SigBlk:\t%08x\n", 0); /* XXX */
- sbuf_printf(sb, "SigIgn:\t%08x\n", p->p_sigignore.__bits[0]);
- sbuf_printf(sb, "SigCgt:\t%08x\n", p->p_sigcatch.__bits[0]);
+ ps = p->p_sigacts;
+ mtx_lock(&ps->ps_mtx);
+ sbuf_printf(sb, "SigIgn:\t%08x\n", ps->ps_sigignore.__bits[0]);
+ sbuf_printf(sb, "SigCgt:\t%08x\n", ps->ps_sigcatch.__bits[0]);
+ mtx_unlock(&ps->ps_mtx);
PROC_UNLOCK(p);
/*
==== //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.27 2003/03/31 22:49:14 jeff Exp $
+ * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.28 2003/05/13 20:35:57 jhb Exp $
*/
#include <sys/param.h>
@@ -132,10 +132,21 @@
DPRINTF(("svr4_read(%d, 0x%0x, %d) = %d\n",
uap->fd, uap->buf, uap->nbyte, rv));
if (rv == EAGAIN) {
+#ifdef DEBUG_SVR4
+ struct sigacts *ps;
+
+ PROC_LOCK(td->td_proc);
+ ps = td->td_proc->p_sigacts;
+ mtx_lock(&ps->ps_mtx);
+#endif
DPRINTF(("sigmask = 0x%x\n", td->td_sigmask));
- DPRINTF(("sigignore = 0x%x\n", td->td_proc->p_sigignore));
- DPRINTF(("sigcaught = 0x%x\n", td->td_proc->p_sigcatch));
+ DPRINTF(("sigignore = 0x%x\n", ps->ps_sigignore));
+ DPRINTF(("sigcaught = 0x%x\n", ps->ps_sigcatch));
DPRINTF(("siglist = 0x%x\n", td->td_siglist));
+#ifdef DEBUG_SVR4
+ mtx_unlock(&ps->ps_mtx);
+ PROC_UNLOCK(td->td_proc);
+#endif
}
#if defined(GROTTY_READ_HACK)
==== //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.62 2003/04/17 22:09:08 jhb Exp $
+ * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.63 2003/05/13 20:35:57 jhb Exp $
*/
/*
@@ -1363,12 +1363,8 @@
sx_xunlock(&proctree_lock);
PROC_LOCK(q);
- if (--q->p_procsig->ps_refcnt == 0) {
- if (q->p_sigacts != &q->p_uarea->u_sigacts)
- FREE(q->p_sigacts, M_SUBPROC);
- FREE(q->p_procsig, M_SUBPROC);
- q->p_procsig = NULL;
- }
+ sigacts_free(q->p_sigacts);
+ q->p_sigacts = NULL;
PROC_UNLOCK(q);
/*
==== //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.7 2003/05/12 16:54:55 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.8 2003/05/13 16:59:46 jhb Exp $
*/
/*
@@ -36,7 +36,11 @@
#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/pci_cfgreg.h>
+#if __FreeBSD_version >= 500000
#include <dev/pci/pcireg.h>
+#else
+#include <pci/pcireg.h>
+#endif
/*
* ACPICA's rather gung-ho approach to hardware resource ownership is a little
==== //depot/projects/hammer/sys/dev/acpica/acpivar.h#8 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.40 2003/04/29 18:50:33 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.41 2003/05/13 16:59:46 jhb Exp $
*/
#include "bus_if.h"
@@ -39,6 +39,10 @@
#include <machine/bus.h>
#include <machine/resource.h>
+#if __FreeBSD_version < 500000
+typedef vm_offset_t vm_paddr_t;
+#endif
+
struct acpi_softc {
device_t acpi_dev;
dev_t acpi_dev_t;
@@ -389,12 +393,14 @@
extern int acpi_acad_get_acline(int *);
+#if __FreeBSD_version >= 500000
#ifndef ACPI_MAX_THREADS
#define ACPI_MAX_THREADS 3
#endif
#if ACPI_MAX_THREADS > 0
#define ACPI_USE_THREADS
#endif
+#endif
#ifdef ACPI_USE_THREADS
/*
==== //depot/projects/hammer/sys/geom/geom_disk.c#11 (text+ko) ====
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/geom/geom_disk.c,v 1.69 2003/05/02 06:20:57 phk Exp $
+ * $FreeBSD: src/sys/geom/geom_disk.c,v 1.70 2003/05/12 20:15:28 phk Exp $
*/
#include "opt_geom.h"
@@ -345,6 +345,15 @@
* XXX: disk_create() and disk_destroy() is currently undefined (but generally
* XXX: undesirable) so any solution seems to involve an intrusive decision.
*/
+
+static void
+disk_destroy_event(void *ptr, int flag)
+{
+
+ g_topology_assert();
+ g_wither_geom(ptr, ENXIO);
+}
+
void
disk_destroy(struct disk *dp)
{
@@ -356,7 +365,7 @@
return;
gp->softc = NULL;
devstat_remove_entry(dp->d_devstat);
- g_wither_geom(gp, ENXIO);
+ g_post_event(disk_destroy_event, gp, M_WAITOK, NULL, NULL);
}
static void
==== //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#7 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.8 2003/03/24 19:14:45 mdodd Exp $
+ * $FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.9 2003/05/13 16:59:46 jhb Exp $
*/
#include <sys/param.h>
@@ -52,7 +52,11 @@
#include <machine/apm_bios.h>
#include <machine/pc/bios.h>
+#if __FreeBSD_version < 500000
+#include <i386/apm/apm.h>
+#else
#include <i386/bios/apm.h>
+#endif
static struct apm_softc apm_softc;
==== //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#7 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.18 2003/03/25 00:07:01 jake Exp $
+ * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.19 2003/05/13 16:59:46 jhb Exp $
*/
#include <sys/param.h>
@@ -58,6 +58,11 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list