PERFORCE change 30901 for review
Peter Wemm
peter at FreeBSD.org
Fri May 9 18:10:36 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30901
Change 30901 by peter at peter_daintree on 2003/05/09 18:10:22
IFC @30900
Affected files ...
.. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#9 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#16 integrate
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#5 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#15 integrate
.. //depot/projects/hammer/sys/amd64/amd64/support.S#3 integrate
.. //depot/projects/hammer/sys/amd64/include/_types.h#5 integrate
.. //depot/projects/hammer/sys/amd64/include/asm.h#7 integrate
.. //depot/projects/hammer/sys/amd64/include/md_var.h#7 integrate
.. //depot/projects/hammer/sys/amd64/include/stdarg.h#4 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#13 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#13 integrate
Differences ...
==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#9 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $
+# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.21 2003/05/10 00:47:52 peter Exp $
SRCS+= _setjmp.S setjmp.S sigsetjmp.S \
fabs.S modf.S \
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#16 (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.146 2003/05/03 23:47:21 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.147 2003/05/09 23:14:02 bmah Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -3397,13 +3397,26 @@
<para arch="i386,pc98,alpha">Floppy drives (&man.fdc.4; driver)</para>
<para arch="i386">Genius and Mustek hand scanners</para>
<para arch="i386">GPB and Transputer drivers</para>
+
+ <para arch="i386,pc98,alpha,ia64">VGA-compatible video cards
+ (&man.vga.4; driver)
+
+ <note>
+ <para>Information regarding specific video cards and
+ compatibility with <application>XFree86</application> can be
+ found at <ulink
+ url="http://www.xfree86.org/"></ulink>.</para>
+ </note>
+
+ </para>
+
<para arch="i386,pc98,alpha,ia64">Keyboards including:
<itemizedlist>
<listitem arch="i386,alpha">
- <para>AT-style keyboards</para>
+ <para>AT-style keyboards (&man.atkbd.4; driver)</para>
</listitem>
<listitem arch="i386,alpha,ia64">
- <para>PS/2 keyboards</para>
+ <para>PS/2 keyboards (&man.atkbd.4; driver)</para>
</listitem>
<listitem arch="pc98">
<para>Standard keyboards</para>
@@ -3415,22 +3428,30 @@
</itemizedlist>
</para>
<para arch="i386">Loran-C receiver (Dave Mills experimental hardware, loran driver).</para>
- <para arch="i386,pc98,alpha,ia64">Mice including:
+ <para arch="i386,pc98,alpha,ia64">Pointing devices including:
<itemizedlist>
<listitem arch="i386,pc98">
- <para>Bus mice (&man.mse.4; driver)</para>
+ <para>Bus mice and compatible devices (&man.mse.4; driver)</para>
</listitem>
<listitem arch="i386,alpha,ia64">
- <para>PS/2 mice (&man.psm.4; driver)</para>
+ <para>PS/2 mice and compatible devices, including many laptop
+ pointing devices (&man.psm.4; driver)</para>
</listitem>
<listitem>
- <para>Serial mice</para>
+ <para>Serial mice and compatible devices</para>
</listitem>
<listitem arch="i386,pc98,alpha">
<para>USB mice (specific instances are listed in the
section describing <link linkend="usb">USB devices</link>)</para>
</listitem>
</itemizedlist>
+
+ <note>
+ <para>&man.moused.8; has more information on using pointing
+ devices with &os;. Information on using pointing devices
+ with <application>XFree86</application> can be found at
+ <ulink url="http://www.xfree86.org/"></ulink>.</para>
+ </note>
</para>
<para arch="i386,alpha"><quote>PC standard</quote> parallel ports (&man.ppc.4; driver)</para>
==== //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#5 (text+ko) ====
@@ -54,7 +54,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.90 2003/05/04 19:27:22 phk Exp $");
+__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.92 2003/05/09 20:26:17 phk Exp $");
#include <sys/param.h>
#include <stdint.h>
@@ -308,18 +308,17 @@
if (fd < 0)
err(1, "cannot open %s", xxboot);
fstat(fd, &st);
- if (st.st_size == BBSIZE) {
- i = read(fd, bootarea, BBSIZE);
- if (i != BBSIZE)
+ if (alphacksum && st.st_size <= BBSIZE - 512) {
+ i = read(fd, bootarea + 512, st.st_size);
+ if (i != st.st_size)
err(1, "read error %s", xxboot);
return;
- }
- if (alphacksum && st.st_size == BBSIZE - 512) {
- i = read(fd, bootarea + 512, BBSIZE - 512);
- if (i != BBSIZE - 512)
+ } else if ((!alphacksum) && st.st_size <= BBSIZE) {
+ i = read(fd, bootarea, st.st_size);
+ if (i != st.st_size)
err(1, "read error %s", xxboot);
return;
- }
+ }
errx(1, "boot code %s is wrong size", xxboot);
}
@@ -424,7 +423,6 @@
gctl_rw_param(grq, "mbroffset", sizeof(mbroffset), &mbroffset);
errstr = gctl_issue(grq);
if (errstr != NULL) {
- warnx("%s", errstr);
mbroffset = 0;
gctl_free(grq);
return (error);
@@ -658,6 +656,7 @@
int lineno = 0, errors = 0;
int i;
+ makelabel("auto", lp);
bzero(&part_set, sizeof(part_set));
bzero(&part_size_type, sizeof(part_size_type));
bzero(&part_offset_type, sizeof(part_offset_type));
==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#15 (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.568 2003/05/08 08:25:51 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.569 2003/05/10 00:49:56 peter Exp $
*/
#include "opt_atalk.h"
==== //depot/projects/hammer/sys/amd64/amd64/support.S#3 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.97 2003/05/01 01:05:21 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.98 2003/05/10 00:49:56 peter Exp $
*/
#include <machine/asmacros.h>
==== //depot/projects/hammer/sys/amd64/include/_types.h#5 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/amd64/include/_types.h,v 1.4 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/_types.h,v 1.5 2003/05/10 00:55:15 peter Exp $
*/
#ifndef _MACHINE__TYPES_H_
==== //depot/projects/hammer/sys/amd64/include/asm.h#7 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90
- * $FreeBSD: src/sys/amd64/include/asm.h,v 1.11 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/asm.h,v 1.12 2003/05/10 00:53:34 peter Exp $
*/
#ifndef _MACHINE_ASM_H_
==== //depot/projects/hammer/sys/amd64/include/md_var.h#7 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.63 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.64 2003/05/10 00:51:29 peter Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
==== //depot/projects/hammer/sys/amd64/include/stdarg.h#4 (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/amd64/include/stdarg.h,v 1.4 2002/10/06 22:01:07 mike Exp $
+ * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.5 2003/05/10 00:55:15 peter Exp $
*/
#ifndef _MACHINE_STDARG_H_
==== //depot/projects/hammer/sys/geom/geom_dev.c#14 (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_dev.c,v 1.57 2003/05/02 06:42:59 phk Exp $
+ * $FreeBSD: src/sys/geom/geom_dev.c,v 1.58 2003/05/09 21:25:28 phk Exp $
*/
#include <sys/param.h>
@@ -215,7 +215,7 @@
{
struct g_geom *gp;
struct g_consumer *cp;
- int error, r, w, e;
+ int error, r, w, e, i;
gp = dev->si_drv1;
cp = dev->si_drv2;
@@ -236,8 +236,20 @@
error = ENXIO; /* We were orphaned */
else
error = g_access_rel(cp, r, w, e);
- KASSERT((cp->acr || cp->acw) || (cp->nstart == cp->nend),
- ("final g_dev_close() with outstanding bios"));
+ for (i = 0; i < 10 * hz;) {
+ if (cp->acr != 0 || cp->acw != 0)
+ break;
+ if (cp->nstart == cp->nend)
+ break;
+ tsleep(&i, PRIBIO, "gdevwclose", hz / 10);
+ i += hz / 10;
+ }
+ if (cp->acr == 0 && cp->acw == 0 && cp->nstart != cp->nend) {
+ printf("WARNING: Final close of geom_dev(%s) %s %s",
+ gp->name,
+ "still has outstanding I/O after 10 seconds.",
+ "Completing close anyway, panic may happen later.");
+ }
g_topology_unlock();
PICKUP_GIANT();
g_waitidle();
==== //depot/projects/hammer/sys/kern/kern_sig.c#13 (text+ko) ====
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_sig.c 8.7 (Berkeley) 4/18/94
- * $FreeBSD: src/sys/kern/kern_sig.c,v 1.236 2003/05/05 21:26:25 jhb Exp $
+ * $FreeBSD: src/sys/kern/kern_sig.c,v 1.237 2003/05/09 19:11:32 jhb Exp $
*/
#include "opt_compat.h"
@@ -1072,7 +1072,6 @@
kern_sigsuspend(struct thread *td, sigset_t mask)
{
struct proc *p = td->td_proc;
- register struct sigacts *ps;
/*
* When returning from sigsuspend, we want
@@ -1081,9 +1080,7 @@
* save it here and mark the sigacts structure
* to indicate this.
*/
- mtx_lock(&Giant);
PROC_LOCK(p);
- ps = p->p_sigacts;
td->td_oldsigmask = td->td_sigmask;
mtx_lock_spin(&sched_lock);
td->td_flags |= TDF_OLDMASK;
@@ -1091,10 +1088,9 @@
SIG_CANTMASK(mask);
td->td_sigmask = mask;
signotify(td);
- while (msleep(ps, &p->p_mtx, PPAUSE|PCATCH, "pause", 0) == 0)
+ while (msleep(p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "pause", 0) == 0)
/* void */;
PROC_UNLOCK(p);
- mtx_unlock(&Giant);
/* always return EINTR rather than ERESTART... */
return (EINTR);
}
@@ -1116,11 +1112,8 @@
{
struct proc *p = td->td_proc;
sigset_t mask;
- register struct sigacts *ps;
- mtx_lock(&Giant);
PROC_LOCK(p);
- ps = p->p_sigacts;
td->td_oldsigmask = td->td_sigmask;
mtx_lock_spin(&sched_lock);
td->td_flags |= TDF_OLDMASK;
@@ -1129,10 +1122,9 @@
SIG_CANTMASK(mask);
SIGSETLO(td->td_sigmask, mask);
signotify(td);
- while (msleep(ps, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0)
+ while (msleep(p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0)
/* void */;
PROC_UNLOCK(p);
- mtx_unlock(&Giant);
/* always return EINTR rather than ERESTART... */
return (EINTR);
}
==== //depot/projects/hammer/usr.sbin/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.250 2003/04/27 05:42:07 imp Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.251 2003/05/09 21:06:41 peter Exp $
.if ${MACHINE_ARCH} != "powerpc"
_sysinstall=sysinstall
More information about the p4-projects
mailing list