From owner-p4-projects@FreeBSD.ORG Mon Jul 14 21:53:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6264C37B404; Mon, 14 Jul 2003 21:53:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC2D537B401 for ; Mon, 14 Jul 2003 21:53:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7256443F3F for ; Mon, 14 Jul 2003 21:53:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6F4rd0U030898 for ; Mon, 14 Jul 2003 21:53:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6F4rcYC030895 for perforce@freebsd.org; Mon, 14 Jul 2003 21:53:38 -0700 (PDT) Date: Mon, 14 Jul 2003 21:53:38 -0700 (PDT) Message-Id: <200307150453.h6F4rcYC030895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 34527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 04:53:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=34527 Change 34527 by marcel@marcel_nfs on 2003/07/14 21:52:47 IFC @34526 Affected files ... .. //depot/projects/ia64/lib/csu/ia64/crt1.S#2 integrate .. //depot/projects/ia64/share/man/man4/wi.4#25 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#81 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#59 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#58 integrate .. //depot/projects/ia64/usr.sbin/Makefile#45 edit Differences ... ==== //depot/projects/ia64/lib/csu/ia64/crt1.S#2 (text+ko) ==== @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - .ident "$FreeBSD: src/lib/csu/ia64/crt1.S,v 1.1 2003/07/13 23:11:37 marcel Exp $" + .ident "$FreeBSD: src/lib/csu/ia64/crt1.S,v 1.2 2003/07/15 03:50:38 marcel Exp $" .text @@ -169,7 +169,7 @@ } { .mib mov gp=GP - mov out2=r8 + mov out0=r8 br.call.sptk b0=exit ;; } ==== //depot/projects/ia64/share/man/man4/wi.4#25 (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/wi.4,v 1.47 2003/07/11 09:25:18 imp Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.48 2003/07/15 03:41:13 imp Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd February 17, 2003 @@ -202,6 +202,7 @@ Proxim Harmony Prism-II PCMCIA Proxim RangeLAN-DS Prism-II PCMCIA Samsung MagicLAN SWL-2000N Prism-II PCMCIA +Siemens SpeedStream SS1021 Prism-II PCMCIA SMC 2602 EZ Connect (3.3V) Prism-II PCI or PCMCIA SMC 2632 EZ Connect Prism-II PCMCIA Socket Low Power WLAN-CF Prism-II CF ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#81 (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/ia64/machdep.c,v 1.141 2003/06/28 06:34:07 davidxu Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.142 2003/07/15 04:43:33 marcel Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/sys/kern/kern_sig.c#59 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.250 2003/07/11 13:42:23 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.251 2003/07/15 04:24:11 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1509,7 +1509,7 @@ ps->ps_sigact[_SIG_IDX(sig)], sig, &td->td_sigmask, code); else { - thread_siginfo(sig, code, &siginfo); + cpu_thread_siginfo(sig, code, &siginfo); mtx_unlock(&ps->ps_mtx); PROC_UNLOCK(p); error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, ==== //depot/projects/ia64/sys/kern/kern_thread.c#58 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.150 2003/07/04 01:41:32 mtm Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.151 2003/07/15 04:26:26 davidxu Exp $"); #include #include @@ -1492,7 +1492,7 @@ ps = p->p_sigacts; mtx_assert(&ps->ps_mtx, MA_OWNED); - thread_siginfo(sig, 0, &siginfo); + cpu_thread_siginfo(sig, 0, &siginfo); mtx_unlock(&ps->ps_mtx); PROC_UNLOCK(p); error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, sizeof(siginfo)); ==== //depot/projects/ia64/usr.sbin/Makefile#45 (text+ko) ====