Date: Wed, 14 May 2003 13:25:20 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31188 for review Message-ID: <200305142025.h4EKPKaA055615@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=31188 Change 31188 by peter@peter_hammer on 2003/05/14 13:24:53 IFC @31179 Affected files ... .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#4 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#11 integrate .. //depot/projects/hammer/release/alpha/dokern.sh#6 integrate .. //depot/projects/hammer/release/alpha/drivers.conf#8 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/hammer/share/man/man4/iir.4#3 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#7 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#2 integrate Differences ... ==== //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.22 2003/01/16 02:17:28 anholt Exp $ +# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.23 2003/05/14 07:23:54 anholt Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -27,6 +27,8 @@ .. Xaw .. + Xcursor + .. Xft .. Xmu @@ -115,6 +117,8 @@ .. fs .. + icons + .. lbxproxy .. locale @@ -124,6 +128,8 @@ .. common .. + el_GR.UTF-8 + .. en_US.UTF-8 .. en_US.utf @@ -142,6 +148,8 @@ .. iso8859-10 .. + iso8859-11 + .. iso8859-13 .. iso8859-14 @@ -172,14 +180,22 @@ .. ja.SJIS .. + ja_JP.UTF-8 + .. ko .. + ko_KR.UTF-8 + .. koi8-c .. koi8-r .. koi8-u .. + lib + common + .. + .. microsoft-cp1251 .. microsoft-cp1255 @@ -200,6 +216,8 @@ .. th_TH.TACTIS .. + th_TH.UTF-8 + .. tscii-0 .. vi_VN.tcvn @@ -220,6 +238,10 @@ .. zh_TW.Big5 .. + zh_TW.UTF-8 + .. + zh_TW.big5 + .. .. proxymngr .. @@ -241,6 +263,8 @@ .. xedit lisp + progmodes + .. .. .. xinit @@ -285,6 +309,8 @@ .. nec .. + pc + .. sgi .. sony @@ -322,6 +348,8 @@ .. .. libdata + pkgconfig + .. .. libexec .. ==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.66 2003/04/10 17:41:40 julian Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.68 2003/05/14 15:01:20 jhb Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -100,9 +100,7 @@ struct session sess; struct tty tty; struct vmspace vmspace; -#ifdef JHB_ME_HARDER - struct procsig procsig; -#endif + struct sigacts sigacts; struct pstats pstats; struct ucred ucred; struct thread mtd; @@ -194,17 +192,15 @@ kp->ki_textvp = proc.p_textvp; kp->ki_fd = proc.p_fd; kp->ki_vmspace = proc.p_vmspace; -#if JHB_ME_HARDER - if (proc.p_procsig != NULL) { - if (KREAD(kd, (u_long)proc.p_procsig, &procsig)) { + if (proc.p_sigacts != NULL) { + if (KREAD(kd, (u_long)proc.p_sigacts, &sigacts)) { _kvm_err(kd, kd->program, - "can't read procsig at %x", proc.p_procsig); + "can't read sigacts at %x", proc.p_sigacts); return (-1); } - kp->ki_sigignore = procsig.ps_sigignore; - kp->ki_sigcatch = procsig.ps_sigcatch; + kp->ki_sigignore = sigacts.ps_sigignore; + kp->ki_sigcatch = sigacts.ps_sigcatch; } -#endif if ((proc.p_sflag & PS_INMEM) && proc.p_stats != NULL) { if (KREAD(kd, (u_long)proc.p_stats, &pstats)) { _kvm_err(kd, kd->program, ==== //depot/projects/hammer/release/alpha/dokern.sh#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/alpha/dokern.sh,v 1.68 2003/05/07 18:14:00 obrien Exp $ +# $FreeBSD: src/release/alpha/dokern.sh,v 1.69 2003/05/14 16:01:02 obrien Exp $ # # XXX sort by order in GENERIC, not alphabetical @@ -59,6 +59,9 @@ -e '/ axe /d' \ -e '/ cue /d' \ -e '/ kue /d' \ + -e '/ firewire /d' \ + -e '/ sbp /d' \ + -e '/ fwe /d' \ echo "options SCSI_NO_OP_STRINGS" echo "options SCSI_NO_SENSE_STRINGS" ==== //depot/projects/hammer/release/alpha/drivers.conf#8 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/alpha/drivers.conf,v 1.16 2003/05/12 13:12:08 wilko Exp $ +# $FreeBSD: src/release/alpha/drivers.conf,v 1.17 2003/05/14 15:38:44 obrien Exp $ # # drv: driver name in kernel config file @@ -43,7 +43,7 @@ miibus miibus 2 network "MII bus support" pcn if_pcn 2 network "AMD Am79C97x PCI 10/100" rl if_rl 2 network "RealTek 8129/8139" -tl if_tl 2 network "Texas Instruments ThunderLAN" +tl if_tl 3 network "Texas Instruments ThunderLAN" txp if_txp 2 network "3Com 3XP Typhoon/Sidewinder (3CR990)" vr if_vr 2 network "VIA Rhine, Rhine II" vx if_vx 2 network "3Com 3c590 and 3c595 EtherLink III" ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#9 (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.70 2003/05/13 08:29:49 sheldonh Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.71 2003/05/14 16:22:16 ru Exp $ .\" .Dd April 28, 2003 .Dt IFCONFIG 8 @@ -307,12 +307,12 @@ operating mode on the interface to .Ar mode . For IEEE 802.11 wireless interfaces that support multiple operating modes -this directive is used to select between 802.11a (\c -.Dq 11a ), -802.11b (\c -.Dq 11b ), -and 802.11g (\c -.Dq 11g ) +this directive is used to select between 802.11a +.Pq Dq 11a , +802.11b +.Pq Dq 11b , +and 802.11g +.Pq Dq 11g operating modes. .It Cm rxcsum , txcsum If the driver supports user-configurable checksum offloading, ==== //depot/projects/hammer/share/man/man4/iir.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/iir.4,v 1.3 2003/03/25 18:13:20 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/iir.4,v 1.4 2003/05/14 17:53:40 trhodes Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" @@ -63,11 +63,3 @@ .An Tom Rhodes Aq trhodes@FreeBSD.org and is based on information supplied by the driver authors and the website of .An Mike Smith Aq msmith@FreeBSD.org . -.Sh BUGS -During a -.Fx -install, the -.Nm -controller appears to correctly probe, but finds no disk devices. -The card in question is an Intel SRCU32 RAID controller with 32Mb RAM, -Firmware revision 2.33.01. ==== //depot/projects/hammer/sys/dev/ata/atapi-cam.c#7 (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/dev/ata/atapi-cam.c,v 1.15 2003/03/08 08:01:28 phk Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.16 2003/05/14 14:20:22 thomas Exp $ */ #include <sys/param.h> @@ -167,7 +167,14 @@ void atapi_cam_reinit_bus(struct ata_channel *ata_ch) { struct atapi_xpt_softc *scp = get_softc(ata_ch); - reinit_bus(scp, RESET); + + /* + * scp might be null if the bus is being reinitialised during + * the boot-up sequence, before the ATAPI bus is registered. + */ + + if (scp != NULL) + reinit_bus(scp, RESET); } static void ==== //depot/projects/hammer/sys/dev/puc/pucdata.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.20 2003/04/30 22:15:47 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.21 2003/05/14 09:37:46 wilko Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -891,6 +891,19 @@ }, }, + /* NetMos 4S0P PCI: 4S, 0P */ + { "NetMos NM9845 Quad UART", + NULL, + { 0x9710, 0x9845, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + }, + }, + /* * This is the Middle Digital, Inc. PCI-Weasel, which * uses a PCI interface implemented in FPGA. ==== //depot/projects/hammer/sys/sys/signalvar.h#7 (text+ko) ==== @@ -31,12 +31,13 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/signalvar.h,v 1.61 2003/05/13 20:36:02 jhb Exp $ + * $FreeBSD: src/sys/sys/signalvar.h,v 1.62 2003/05/14 15:00:24 jhb Exp $ */ #ifndef _SYS_SIGNALVAR_H_ #define _SYS_SIGNALVAR_H_ +#include <sys/queue.h> #include <sys/_lock.h> #include <sys/_mutex.h> #include <sys/signal.h> ==== //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: lock_proc.c,v 1.7 2000/10/11 20:23:56 is Exp $ */ -/* $FreeBSD: src/usr.sbin/rpc.lockd/lock_proc.c,v 1.10 2002/03/22 20:00:10 alfred Exp $ */ +/* $FreeBSD: src/usr.sbin/rpc.lockd/lock_proc.c,v 1.11 2003/05/14 13:50:40 rwatson Exp $ */ /* * Copyright (c) 1995 * A.R. Gordon (andrew.gordon@net-tel.co.uk). All rights reserved. @@ -695,7 +695,10 @@ log_from_addr("nlm_granted_msg", rqstp); res.cookie = arg->cookie; - res.stat.stat = nlm_granted; + res.stat.stat = lock_answer(arg->alock.svid, &arg->cookie, + nlm_granted, NULL, NLM_VERS) == 0 ? + nlm_granted : nlm_denied; + transmit_result(NLM_GRANTED_RES, &res, (struct sockaddr *)svc_getcaller(rqstp->rq_xprt)); return (NULL); @@ -1184,7 +1187,9 @@ log_from_addr("nlm4_granted_msg", rqstp); res.cookie = arg->cookie; - res.stat.stat = nlm4_granted; + res.stat.stat = lock_answer(arg->alock.svid, &arg->cookie, + nlm4_granted, NULL, NLM_VERS4) == 0 ? + nlm4_granted : nlm4_denied; transmit4_result(NLM4_GRANTED_RES, &res, (struct sockaddr *)svc_getrpccaller(rqstp->rq_xprt)->buf); return (NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305142025.h4EKPKaA055615>