From owner-p4-projects@FreeBSD.ORG Sun Oct 26 17:37:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B71E16A4C0; Sun, 26 Oct 2003 17:37:30 -0800 (PST) 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 E845616A4B3 for ; Sun, 26 Oct 2003 17:37:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A4B143F85 for ; Sun, 26 Oct 2003 17:37:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9R1bTXJ017350 for ; Sun, 26 Oct 2003 17:37:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9R1bSHQ017347 for perforce@freebsd.org; Sun, 26 Oct 2003 17:37:28 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 26 Oct 2003 17:37:28 -0800 (PST) Message-Id: <200310270137.h9R1bSHQ017347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40596 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: Mon, 27 Oct 2003 01:37:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=40596 Change 40596 by peter@peter_daintree on 2003/10/26 17:36:35 It seems that its just the QuickSort that blows things up. Fall back to the InsertionSort only rather than doing no sorting at all. I think this is behind the mismatched exception lists. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGen.m3#3 edit .. //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGenRep.m3#3 edit .. //depot/projects/ezm3/libs/libm3/src/sort/ArraySort.mg#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGen.m3#3 (text+ko) ==== @@ -8,7 +8,7 @@ MODULE MxGen; -IMPORT Wr, Fmt, Thread, IntRefTbl, Stdio (*, IntArraySort *); +IMPORT Wr, Fmt, Thread, IntRefTbl, Stdio, IntArraySort; IMPORT Mx, MxRep, MxMap, M3ID, M3RT, Target; <*FATAL Wr.Failure, Thread.Alerted*> @@ -311,7 +311,7 @@ units := NEW (REF ARRAY OF UnitInfo, n_units); map := NEW (REF ARRAY OF INTEGER, n_units); -(* + PROCEDURE CmpUnit (a, b: INTEGER): [-1..1] = VAR ax := units[a].unit.name; bx := units[b].unit.name; BEGIN @@ -320,7 +320,7 @@ ELSE RETURN +1; END; END CmpUnit; -*) + BEGIN ui := all_ui; @@ -332,7 +332,7 @@ END; <*ASSERT cnt = n_units*> - (* IntArraySort.Sort (map^, CmpUnit); *) + IntArraySort.Sort (map^, CmpUnit); (* rebuild the linked list *) ui := NIL; ==== //depot/projects/ezm3/language/modula3/m3compiler/m3linker/src/MxGenRep.m3#3 (text+ko) ==== @@ -10,7 +10,7 @@ (* Modified On Fri Jul 2 19:33:09 PDT 1993 By muller *) MODULE MxGenRep; -IMPORT IntRefTbl, Wr, (* IntArraySort,*) Fmt, Thread; +IMPORT IntRefTbl, Wr, IntArraySort, Fmt, Thread; IMPORT Mx, MxRep, M3ID, MxMap; <* FATAL Thread.Alerted, Wr.Failure *> @@ -109,7 +109,6 @@ units := NEW (REF ARRAY OF UnitInfo, n_units); map := NEW (REF ARRAY OF INTEGER, n_units); -(* PROCEDURE CmpUnit (a, b: INTEGER): [-1..1] = VAR ax := units[a].unit.name; bx := units[b].unit.name; BEGIN @@ -118,7 +117,6 @@ ELSE RETURN +1; END; END CmpUnit; -*) BEGIN ui := all_ui; @@ -130,7 +128,7 @@ END; <*ASSERT cnt = n_units*> - (*IntArraySort.Sort (map^, CmpUnit); *) + IntArraySort.Sort (map^, CmpUnit); (* rebuild the linked list *) ui := NIL; ==== //depot/projects/ezm3/libs/libm3/src/sort/ArraySort.mg#2 (text+ko) ==== @@ -9,7 +9,7 @@ PROCEDURE Sort (VAR a: ARRAY OF Elem.T; cmp := Elem.Compare) = BEGIN - QuickSort (a, 0, NUMBER (a), cmp); + (* QuickSort (a, 0, NUMBER (a), cmp); *) InsertionSort (a, 0, NUMBER (a), cmp); END Sort; From owner-p4-projects@FreeBSD.ORG Sun Oct 26 17:50:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 314C916A4C0; Sun, 26 Oct 2003 17:50:48 -0800 (PST) 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 0C6F516A4B3 for ; Sun, 26 Oct 2003 17:50:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A28643F85 for ; Sun, 26 Oct 2003 17:50:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9R1olXJ018016 for ; Sun, 26 Oct 2003 17:50:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9R1oksg018013 for perforce@freebsd.org; Sun, 26 Oct 2003 17:50:46 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 26 Oct 2003 17:50:46 -0800 (PST) Message-Id: <200310270150.h9R1oksg018013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40599 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: Mon, 27 Oct 2003 01:50:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=40599 Change 40599 by peter@peter_daintree on 2003/10/26 17:49:53 no change, just set type to executable. Affected files ... .. //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/configure#2 edit Differences ... ==== //depot/projects/ezm3/language/modula3/m3compiler/m3cc/gcc/configure#2 (xtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Oct 27 08:06:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF08116A4C0; Mon, 27 Oct 2003 08:06:38 -0800 (PST) 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 A20B816A4B3 for ; Mon, 27 Oct 2003 08:06:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17EF143FBF for ; Mon, 27 Oct 2003 08:06:38 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9RG6bXJ093609 for ; Mon, 27 Oct 2003 08:06:37 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9RG6a1u093606 for perforce@freebsd.org; Mon, 27 Oct 2003 08:06:36 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Mon, 27 Oct 2003 08:06:36 -0800 (PST) Message-Id: <200310271606.h9RG6a1u093606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 40632 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: Mon, 27 Oct 2003 16:06:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=40632 Change 40632 by cvance@cvance_osx_laptop on 2003/10/27 08:06:25 Add some notes on the MAC framework entry points Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/SEDARWIN-NOTES#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Oct 27 09:41:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E2CD16A4C0; Mon, 27 Oct 2003 09:41:37 -0800 (PST) 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 DF2E916A4B3 for ; Mon, 27 Oct 2003 09:41:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E2A943F85 for ; Mon, 27 Oct 2003 09:41:35 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9RHfZXJ003947 for ; Mon, 27 Oct 2003 09:41:35 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9RHfYMF003944 for perforce@freebsd.org; Mon, 27 Oct 2003 09:41:34 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 27 Oct 2003 09:41:34 -0800 (PST) Message-Id: <200310271741.h9RHfYMF003944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40636 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: Mon, 27 Oct 2003 17:41:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=40636 Change 40636 by sam@sam_ebb on 2003/10/27 09:40:43 IFC @ 40635 Affected files ... .. //depot/projects/netperf/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/netperf/sys/cam/cam_periph.c#5 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#10 integrate .. //depot/projects/netperf/sys/conf/NOTES#15 integrate .. //depot/projects/netperf/sys/conf/files#19 integrate .. //depot/projects/netperf/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/netperf/sys/conf/options#14 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_button.c#5 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#6 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/netperf/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/netperf/sys/dev/drm/drm_sysctl.h#4 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep_eisa.c#4 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep_isa.c#5 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep_mca.c#4 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/netperf/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/netperf/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/netperf/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_intr.c#4 integrate .. //depot/projects/netperf/sys/dev/ncv/ncr53c500_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/pccard/pccard.c#7 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs.h#8 integrate .. //depot/projects/netperf/sys/dev/pccard/pccardvar.h#5 integrate .. //depot/projects/netperf/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/netperf/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/netperf/sys/dev/sn/if_sn_pccard.c#4 integrate .. //depot/projects/netperf/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/netperf/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/vx/if_vxreg.h#3 integrate .. //depot/projects/netperf/sys/dev/vx/if_vxvar.h#1 branch .. //depot/projects/netperf/sys/dev/xe/if_xe_pccard.c#5 integrate .. //depot/projects/netperf/sys/geom/geom_ccd.c#4 integrate .. //depot/projects/netperf/sys/geom/geom_fox.c#3 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/netperf/sys/i386/conf/NOTES#6 integrate .. //depot/projects/netperf/sys/i386/i386/mp_clock.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/netperf/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/netperf/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/netperf/sys/kern/kern_alq.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_intr.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_resource.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_sig.c#7 integrate .. //depot/projects/netperf/sys/kern/kern_time.c#2 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#12 integrate .. //depot/projects/netperf/sys/kern/subr_bus.c#6 integrate .. //depot/projects/netperf/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/netperf/sys/net/if_loop.c#10 integrate .. //depot/projects/netperf/sys/net/if_types.h#2 integrate .. //depot/projects/netperf/sys/netinet/icmp6.h#5 integrate .. //depot/projects/netperf/sys/netinet/in.h#4 integrate .. //depot/projects/netperf/sys/netinet/in_pcb.h#9 integrate .. //depot/projects/netperf/sys/netinet/ip6.h#3 integrate .. //depot/projects/netperf/sys/netinet/ip_dummynet.c#13 edit .. //depot/projects/netperf/sys/netinet6/frag6.c#7 integrate .. //depot/projects/netperf/sys/netinet6/icmp6.c#12 integrate .. //depot/projects/netperf/sys/netinet6/in6.h#4 integrate .. //depot/projects/netperf/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/netperf/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/netperf/sys/netinet6/ip6_input.c#14 integrate .. //depot/projects/netperf/sys/netinet6/ip6_output.c#19 integrate .. //depot/projects/netperf/sys/netinet6/ip6_var.h#7 integrate .. //depot/projects/netperf/sys/netinet6/mld6.c#4 integrate .. //depot/projects/netperf/sys/netinet6/nd6.c#13 integrate .. //depot/projects/netperf/sys/netinet6/nd6.h#6 integrate .. //depot/projects/netperf/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/netperf/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/netperf/sys/netinet6/route6.c#3 integrate .. //depot/projects/netperf/sys/netinet6/udp6_output.c#5 integrate .. //depot/projects/netperf/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/netperf/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/netperf/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/netperf/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/netperf/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/netperf/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/netperf/sys/sys/bus.h#4 integrate .. //depot/projects/netperf/sys/sys/interrupt.h#4 integrate .. //depot/projects/netperf/sys/sys/time.h#2 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#8 integrate .. //depot/projects/netperf/sys/vm/vm_object.c#8 integrate .. //depot/projects/netperf/sys/vm/vm_page.h#7 integrate .. //depot/projects/netperf/sys/vm/vnode_pager.c#10 integrate Differences ... ==== //depot/projects/netperf/sys/boot/forth/beastie.4th#3 (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/boot/forth/beastie.4th,v 1.5 2003/09/13 18:35:01 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.6 2003/10/27 16:39:49 scottl Exp $ marker task-beastie.4th @@ -209,9 +209,9 @@ dup tkey 0 25 at-xy dup 32 = if nip 0 swap then - dup -1 = if s" boot" evaluate then - dup 13 = if s" boot" evaluate then - dup bootkey @ = if s" boot" evaluate then + dup -1 = if 0 boot then + dup 13 = if 0 boot then + dup bootkey @ = if 0 boot then dup bootacpikey @ = if acpienabled? if s" acpi_load" unsetenv @@ -221,7 +221,7 @@ s" YES" s" acpi_load" setenv s" 0" s" hint.acpi.0.disabled" setenv then - s" boot" evaluate + 0 boot then dup bootsafekey @ = if s" arch-i386" environment? if @@ -233,15 +233,15 @@ s" 0" s" hw.ata.atapi_dma" setenv s" 0" s" hw.ata.wc" setenv s" 0" s" hw.eisa_slots" setenv - s" boot" evaluate + 0 boot then dup bootverbosekey @ = if s" YES" s" boot_verbose" setenv - s" boot" evaluate + 0 boot then dup bootsinglekey @ = if s" YES" s" boot_single" setenv - s" boot" evaluate + 0 boot then dup escapekey @ = if 2drop ==== //depot/projects/netperf/sys/cam/cam_periph.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.54 2003/10/18 11:01:11 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.55 2003/10/27 06:15:54 ken Exp $"); #include #include @@ -994,14 +994,26 @@ scsi_cmd = (struct scsi_start_stop_unit *) &done_ccb->csio.cdb_io.cdb_bytes; if (sense != 0) { + struct ccb_getdev cgd; struct scsi_sense_data *sense; int error_code, sense_key, asc, ascq; + scsi_sense_action err_action; sense = &done_ccb->csio.sense_data; scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq); /* + * Grab the inquiry data for this device. + */ + xpt_setup_ccb(&cgd.ccb_h, done_ccb->ccb_h.path, + /*priority*/ 1); + cgd.ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action((union ccb *)&cgd); + err_action = scsi_error_action(&done_ccb->csio, + &cgd.inq_data, 0); + + /* * If the error is "invalid field in CDB", * and the load/eject flag is set, turn the * flag off and try again. This is just in @@ -1028,12 +1040,15 @@ xpt_action(done_ccb); - } else if (done_ccb->ccb_h.retry_count > 1) { + } else if ((done_ccb->ccb_h.retry_count > 1) + && ((err_action & SS_MASK) != SS_FAIL)) { + /* * In this case, the error recovery * command failed, but we've got * some retries left on it. Give - * it another try. + * it another try unless this is an + * unretryable error. */ /* set the timeout to .5 sec */ ==== //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#10 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.87 2003/10/18 17:24:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.88 2003/10/27 06:15:55 ken Exp $"); #include "opt_cd.h" @@ -2856,20 +2856,6 @@ ccb = cdgetccb(periph, /* priority */ 1); - scsi_test_unit_ready(&ccb->csio, 0, cddone, - MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, 1000); - ccb->ccb_h.ccb_bp = NULL; - - error = cam_periph_runccb(ccb, NULL, - /*cam_flags*/0, - /*sense_flags*/SF_RETRY_UA, - softc->disk.d_devstat); - - if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - xpt_release_ccb(ccb); - return (ENXIO); - } - rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), M_TEMP, M_WAITOK); ==== //depot/projects/netperf/sys/conf/NOTES#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1180 2003/10/24 15:44:08 simokawa Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1182 2003/10/27 11:19:08 harti Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -29,11 +29,11 @@ # comment on the same line if possible. Very detailed descriptions of # devices and subsystems belong in manpages. # -# A space followed by a tab separates 'option' from an option name. Two +# A space followed by a tab separates 'options' from an option name. Two # spaces followed by a tab separate 'device' from a device name. Comments # after an option or device should use one space after the comment character. # To comment out a negative option that disables code and thus should not be -# enabled for LINT builds, precede 'option' with "#!". +# enabled for LINT builds, precede 'options' with "#!". # # @@ -452,7 +452,10 @@ options NETGRAPH_ATM_ATMPIF # NgATM - Netgraph ATM -options NGATM_ATM +options NGATM_ATM +options NGATM_ATMBASE +options NGATM_SSCOP +options NGATM_SSCFU device mn # Munich32x/Falc54 Nx64kbit/sec cards. device lmc # tulip based LanMedia WAN cards ==== //depot/projects/netperf/sys/conf/files#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.838 2003/10/24 15:44:08 simokawa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.841 2003/10/27 11:19:08 harti Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1370,7 +1370,13 @@ netatm/uni/unisig_vc_state.c optional atm_uni atm_core netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif -netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/ngatmbase.c optional ngatm_atmbase +contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase +netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu +contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu +netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop +contrib/ngatm/netnatm/saal/saal_sscop.c optional ngatm_sscop netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async netgraph/ng_base.c optional netgraph ==== //depot/projects/netperf/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kernels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.34 2003/08/22 15:41:44 imp Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.35 2003/10/27 11:19:08 harti Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -35,6 +35,9 @@ # ... and the same for Atheros HAL INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd +# ... and the same for the NgATM stuff +INCLUDES+= -I$S/contrib/ngatm + COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common ==== //depot/projects/netperf/sys/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.417 2003/10/24 15:44:08 simokawa Exp $ +# $FreeBSD: src/sys/conf/options,v 1.418 2003/10/27 11:19:08 harti Exp $ # # On the handling of kernel options # @@ -404,6 +404,9 @@ # NgATM options NGATM_ATM opt_netgraph.h +NGATM_ATMBASE opt_netgraph.h +NGATM_SSCOP opt_netgraph.h +NGATM_SSCFU opt_netgraph.h # DRM options DRM_DEBUG opt_drm.h ==== //depot/projects/netperf/sys/dev/acpica/acpi.c#11 (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/dev/acpica/acpi.c,v 1.105 2003/10/19 05:56:59 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.106 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -51,6 +51,7 @@ #include "acpi.h" #include #include +#include MALLOC_DEFINE(M_ACPIDEV, "acpidev", "ACPI devices"); @@ -2054,6 +2055,27 @@ return (error); } +/* Inform devctl(4) when we receive a Notify. */ +void +acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, uint8_t notify) +{ + char notify_buf[16]; + ACPI_BUFFER handle_buf; + ACPI_STATUS status; + + if (subsystem == NULL) + return; + + handle_buf.Pointer = NULL; + handle_buf.Length = ACPI_ALLOCATE_BUFFER; + status = AcpiNsHandleToPathname(h, &handle_buf); + if (ACPI_FAILURE(status)) + return; + snprintf(notify_buf, sizeof(notify_buf), "notify=0x%02x", notify); + devctl_notify("ACPI", subsystem, handle_buf.Pointer, notify_buf); + AcpiOsFree(handle_buf.Pointer); +} + #ifdef ACPI_DEBUG /* * Support for parsing debug options from the kernel environment. ==== //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#6 (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/dev/acpica/acpi_acad.c,v 1.19 2003/09/26 05:24:55 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.20 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -39,7 +39,7 @@ #include #include -#include "acpi.h" +#include "acpi.h" #include #include @@ -108,6 +108,8 @@ POWER_PROFILE_ECONOMY); ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), "%s Line\n", sc->status ? "On" : "Off"); + + acpi_UserNotify("ACAD", h, sc->status); } } ==== //depot/projects/netperf/sys/dev/acpica/acpi_button.c#5 (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/acpi_button.c,v 1.16 2003/09/22 04:50:29 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.17 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -175,6 +175,8 @@ if (acpi_sc == NULL) return_VOID; + acpi_UserNotify("Button", sc->button_handle, sc->button_type); + switch (sc->button_type) { case ACPI_POWER_BUTTON: ACPI_VPRINT(sc->button_dev, acpi_sc, "power button pressed\n"); @@ -202,6 +204,8 @@ if (acpi_sc == NULL) return_VOID; + acpi_UserNotify("Button", sc->button_handle, sc->button_type); + switch (sc->button_type) { case ACPI_POWER_BUTTON: ACPI_VPRINT(sc->button_dev, acpi_sc, "wakeup by power button\n"); ==== //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#6 (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/acpi_cmbat.c,v 1.25 2003/09/26 05:24:55 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.26 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -295,6 +295,8 @@ if ((sc = device_get_softc(dev)) == NULL) return; + acpi_UserNotify("CMBAT", h, notify); + switch (notify) { case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_BATTERY_BST_CHANGE: ==== //depot/projects/netperf/sys/dev/acpica/acpi_lid.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.14 2003/08/28 16:06:30 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.15 2003/10/25 05:03:24 njl Exp $"); #include "opt_acpi.h" #include @@ -54,7 +54,8 @@ static int acpi_lid_suspend(device_t dev); static int acpi_lid_resume(device_t dev); static void acpi_lid_notify_status_changed(void *arg); -static void acpi_lid_notify_handler(ACPI_HANDLE h,UINT32 notify, void *context); +static void acpi_lid_notify_handler(ACPI_HANDLE h, UINT32 notify, + void *context); static device_method_t acpi_lid_methods[] = { /* Device interface */ @@ -149,6 +150,8 @@ ACPI_VPRINT(sc->lid_dev, acpi_sc, "Lid %s\n", sc->lid_status ? "opened" : "closed"); + acpi_UserNotify("Lid", sc->lid_handle, sc->lid_status); + if (sc->lid_status == 0) EVENTHANDLER_INVOKE(acpi_sleep_event, acpi_sc->acpi_lid_switch_sx); else @@ -178,4 +181,3 @@ return_VOID; } - ==== //depot/projects/netperf/sys/dev/acpica/acpi_thermal.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.32 2003/09/26 05:24:55 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.33 2003/10/25 05:03:24 njl Exp $"); #include "opt_acpi.h" #include @@ -727,6 +727,8 @@ break; } + acpi_UserNotify("Thermal", h, notify); + return_VOID; } ==== //depot/projects/netperf/sys/dev/acpica/acpivar.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/dev/acpica/acpivar.h,v 1.45 2003/09/10 22:06:41 marcel Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.46 2003/10/25 05:03:24 njl Exp $ */ #include "bus_if.h" @@ -188,6 +188,8 @@ extern ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state); extern ACPI_STATUS acpi_Enable(struct acpi_softc *sc); extern ACPI_STATUS acpi_Disable(struct acpi_softc *sc); +extern void acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, + uint8_t notify); struct acpi_parse_resource_set { void (*set_init)(device_t dev, void **context); ==== //depot/projects/netperf/sys/dev/drm/drm_sysctl.h#4 (text+ko) ==== @@ -21,7 +21,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.5 2003/10/24 01:48:16 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.6 2003/10/24 21:45:21 anholt Exp $ */ #ifdef __FreeBSD__ @@ -226,12 +226,11 @@ * copy of the whole structure and the relevant data from buflist. */ DRM_LOCK(); - DRM_SPINLOCK(&dev->dma_lock); if (dma == NULL) { - DRM_SPINUNLOCK(&dev->dma_lock); DRM_UNLOCK(); return 0; } + DRM_SPINLOCK(&dev->dma_lock); tempdma = *dma; templists = DRM(alloc)(sizeof(int) * dma->buf_count, DRM_MEM_BUFS); for (i = 0; i < dma->buf_count; i++) ==== //depot/projects/netperf/sys/dev/ep/if_ep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.124 2003/10/23 05:33:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.127 2003/10/26 22:28:20 imp Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.124 2003/10/23 05:33:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.127 2003/10/26 22:28:20 imp Exp $"); #include #include @@ -90,10 +90,13 @@ {IFM_10_T, IFM_10_5, IFM_NONE, IFM_10_2, IFM_NONE}; /* if functions */ -static void ep_if_init(void *); -static int ep_if_ioctl(struct ifnet *, u_long, caddr_t); -static void ep_if_start(struct ifnet *); -static void ep_if_watchdog(struct ifnet *); +static void epinit(void *); +static int epioctl(struct ifnet *, u_long, caddr_t); +static void epstart(struct ifnet *); +static void epwatchdog(struct ifnet *); + +static void epstart_locked(struct ifnet *); +static void epinit_locked(struct ep_softc *); /* if_media functions */ static int ep_ifmedia_upd(struct ifnet *); @@ -134,13 +137,13 @@ if (eeprom_rdy(sc)) return (ENXIO); - EP_WRITE_2(sc, EP_W0_EEPROM_COMMAND, + CSR_WRITE_2(sc, EP_W0_EEPROM_COMMAND, (EEPROM_CMD_RD << sc->epb.cmd_off) | offset); if (eeprom_rdy(sc)) return (ENXIO); - (*result) = EP_READ_2(sc, EP_W0_EEPROM_DATA); + (*result) = CSR_READ_2(sc, EP_W0_EEPROM_DATA); return (0); } @@ -155,7 +158,7 @@ macaddr = (u_int16_t *) addr; - GO_WINDOW(0); + GO_WINDOW(sc, 0); for (i = EEPROM_NODE_ADDR_0; i <= EEPROM_NODE_ADDR_2; i++) { error = get_e(sc, i, &result); if (error) @@ -200,7 +203,7 @@ sc->ep_connectors = 0; sc->ep_connector = 0; - GO_WINDOW(0); + GO_WINDOW(sc, 0); sc->epb.cmd_off = 0; error = get_e(sc, EEPROM_PROD_ID, &result); @@ -222,8 +225,8 @@ { u_int16_t config; - GO_WINDOW(0); - config = EP_READ_2(sc, EP_W0_CONFIG_CTRL); + GO_WINDOW(sc, 0); + config = CSR_READ_2(sc, EP_W0_CONFIG_CTRL); if (config & IS_AUI) sc->ep_connectors |= AUI; if (config & IS_BNC) @@ -240,7 +243,7 @@ * The cards that require something different can override * this later on. */ - sc->ep_connector = EP_READ_2(sc, EP_W0_ADDRESS_CFG) >> ACF_CONNECTOR_BITS; + sc->ep_connector = CSR_READ_2(sc, EP_W0_ADDRESS_CFG) >> ACF_CONNECTOR_BITS; } void @@ -267,19 +270,20 @@ int error; sc->gone = 0; - + EP_LOCK_INIT(sc); error = ep_get_macaddr(sc, (u_char *)&sc->arpcom.ac_enaddr); if (error) { device_printf(sc->dev, "Unable to get Ethernet address!\n"); + EP_LOCK_DESTORY(sc); return (ENXIO); } /* * Setup the station address */ p = (u_short *)&sc->arpcom.ac_enaddr; - GO_WINDOW(2); + GO_WINDOW(sc, 2); for (i = 0; i < 3; i++) - EP_WRITE_2(sc, EP_W2_ADDR_0 + (i * 2), ntohs(p[i])); + CSR_WRITE_2(sc, EP_W2_ADDR_0 + (i * 2), ntohs(p[i])); device_printf(sc->dev, "Ethernet address %6D\n", sc->arpcom.ac_enaddr, ":"); @@ -293,10 +297,10 @@ ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_output = ether_output; - ifp->if_start = ep_if_start; - ifp->if_ioctl = ep_if_ioctl; - ifp->if_watchdog = ep_if_watchdog; - ifp->if_init = ep_if_init; + ifp->if_start = epstart; + ifp->if_ioctl = epioctl; + ifp->if_watchdog = epwatchdog; + ifp->if_init = epinit; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; if (!sc->epb.mii_trans) { @@ -344,6 +348,7 @@ struct ifnet *ifp; sc = device_get_softc(dev); + EP_ASSERT_UNLOCKED(sc); ifp = &sc->arpcom.ac_if; if (sc->gone) { @@ -358,73 +363,82 @@ sc->gone = 1; ep_free(dev); + EP_LOCK_DESTORY(sc); return (0); } +static void +epinit(void *xsc) +{ + struct ep_softc *sc = xsc; + EP_LOCK(sc); + epinit_locked(sc); + EP_UNLOCK(sc); +} + /* * The order in here seems important. Otherwise we may not receive * interrupts. ?! */ static void -ep_if_init(void *xsc) +epinit_locked(struct ep_softc *sc) { - struct ep_softc *sc = xsc; struct ifnet *ifp = &sc->arpcom.ac_if; - int s, i; + int i; if (sc->gone) return; - s = splimp(); - while (EP_READ_2(sc, EP_STATUS) & S_COMMAND_IN_PROGRESS); + EP_ASSERT_LOCKED(sc); + EP_BUSY_WAIT(sc); - GO_WINDOW(0); - EP_WRITE_2(sc, EP_COMMAND, STOP_TRANSCEIVER); - GO_WINDOW(4); - EP_WRITE_2(sc, EP_W4_MEDIA_TYPE, DISABLE_UTP); - GO_WINDOW(0); + GO_WINDOW(sc, 0); + CSR_WRITE_2(sc, EP_COMMAND, STOP_TRANSCEIVER); + GO_WINDOW(sc, 4); + CSR_WRITE_2(sc, EP_W4_MEDIA_TYPE, DISABLE_UTP); + GO_WINDOW(sc, 0); /* Disable the card */ - EP_WRITE_2(sc, EP_W0_CONFIG_CTRL, 0); + CSR_WRITE_2(sc, EP_W0_CONFIG_CTRL, 0); /* Enable the card */ - EP_WRITE_2(sc, EP_W0_CONFIG_CTRL, ENABLE_DRQ_IRQ); + CSR_WRITE_2(sc, EP_W0_CONFIG_CTRL, ENABLE_DRQ_IRQ); - GO_WINDOW(2); + GO_WINDOW(sc, 2); /* Reload the ether_addr. */ for (i = 0; i < 6; i++) - EP_WRITE_1(sc, EP_W2_ADDR_0 + i, sc->arpcom.ac_enaddr[i]); + CSR_WRITE_1(sc, EP_W2_ADDR_0 + i, sc->arpcom.ac_enaddr[i]); - EP_WRITE_2(sc, EP_COMMAND, RX_RESET); - EP_WRITE_2(sc, EP_COMMAND, TX_RESET); - while (EP_READ_2(sc, EP_STATUS) & S_COMMAND_IN_PROGRESS); + CSR_WRITE_2(sc, EP_COMMAND, RX_RESET); + CSR_WRITE_2(sc, EP_COMMAND, TX_RESET); + EP_BUSY_WAIT(sc); /* Window 1 is operating window */ - GO_WINDOW(1); + GO_WINDOW(sc, 1); for (i = 0; i < 31; i++) - EP_READ_1(sc, EP_W1_TX_STATUS); + CSR_READ_1(sc, EP_W1_TX_STATUS); /* get rid of stray intr's */ - EP_WRITE_2(sc, EP_COMMAND, ACK_INTR | 0xff); + CSR_WRITE_2(sc, EP_COMMAND, ACK_INTR | 0xff); - EP_WRITE_2(sc, EP_COMMAND, SET_RD_0_MASK | S_5_INTS); + CSR_WRITE_2(sc, EP_COMMAND, SET_RD_0_MASK | S_5_INTS); - EP_WRITE_2(sc, EP_COMMAND, SET_INTR_MASK | S_5_INTS); + CSR_WRITE_2(sc, EP_COMMAND, SET_INTR_MASK | S_5_INTS); if (ifp->if_flags & IFF_PROMISC) - EP_WRITE_2(sc, EP_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | - FIL_GROUP | FIL_BRDCST | FIL_ALL); + CSR_WRITE_2(sc, EP_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | + FIL_MULTICAST | FIL_BRDCST | FIL_PROMISC); else - EP_WRITE_2(sc, EP_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | - FIL_GROUP | FIL_BRDCST); + CSR_WRITE_2(sc, EP_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | + FIL_MULTICAST | FIL_BRDCST); if (!sc->epb.mii_trans) ep_ifmedia_upd(ifp); - EP_WRITE_2(sc, EP_COMMAND, RX_ENABLE); - EP_WRITE_2(sc, EP_COMMAND, TX_ENABLE); + CSR_WRITE_2(sc, EP_COMMAND, RX_ENABLE); + CSR_WRITE_2(sc, EP_COMMAND, TX_ENABLE); ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; /* just in case */ @@ -438,8 +452,8 @@ m_freem(sc->top); sc->top = sc->mcur = 0; } - EP_WRITE_2(sc, EP_COMMAND, SET_RX_EARLY_THRESH | RX_INIT_EARLY_THRESH); - EP_WRITE_2(sc, EP_COMMAND, SET_TX_START_THRESH | 16); + CSR_WRITE_2(sc, EP_COMMAND, SET_RX_EARLY_THRESH | RX_INIT_EARLY_THRESH); + CSR_WRITE_2(sc, EP_COMMAND, SET_TX_START_THRESH | 16); /* * Store up a bunch of mbuf's for use later. (MAX_MBS). @@ -447,28 +461,35 @@ * called from intr or somewhere else. */ - GO_WINDOW(1); - ep_if_start(ifp); + GO_WINDOW(sc, 1); + epstart_locked(ifp); +} - splx(s); +static void +epstart(struct ifnet *ifp) +{ + struct ep_softc *sc; + sc = ifp->if_softc; + EP_LOCK(sc); + epstart_locked(ifp); + EP_UNLOCK(sc); } - + static void -ep_if_start(struct ifnet *ifp) +epstart_locked(struct ifnet *ifp) { struct ep_softc *sc; u_int len; struct mbuf *m, *m0; - int s, pad; + int pad; sc = ifp->if_softc; if (sc->gone) return; - - while (EP_READ_2(sc, EP_STATUS) & S_COMMAND_IN_PROGRESS); + EP_ASSERT_LOCKED(sc); + EP_BUSY_WAIT(sc); if (ifp->if_flags & IFF_OACTIVE) return; - startagain: /* Sneak a peek at the next packet */ IF_DEQUEUE(&ifp->if_snd, m0); @@ -490,50 +511,50 @@ m_freem(m0); goto readcheck; } - if (EP_READ_2(sc, EP_W1_FREE_TX) < len + pad + 4) { + if (CSR_READ_2(sc, EP_W1_FREE_TX) < len + pad + 4) { /* no room in FIFO */ - EP_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | (len + pad + 4)); + CSR_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | (len + pad + 4)); /* make sure */ - if (EP_READ_2(sc, EP_W1_FREE_TX) < len + pad + 4) { + if (CSR_READ_2(sc, EP_W1_FREE_TX) < len + pad + 4) { ifp->if_flags |= IFF_OACTIVE; IF_PREPEND(&ifp->if_snd, m0); - return; + goto done; } } else - EP_WRITE_2(sc, EP_COMMAND, + CSR_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | EP_THRESH_DISABLE); - s = splhigh(); + /* XXX 4.x and earlier would splhigh here */ - EP_WRITE_2(sc, EP_W1_TX_PIO_WR_1, len); + CSR_WRITE_2(sc, EP_W1_TX_PIO_WR_1, len); /* Second dword meaningless */ - EP_WRITE_2(sc, EP_W1_TX_PIO_WR_1, 0x0); + CSR_WRITE_2(sc, EP_W1_TX_PIO_WR_1, 0x0); if (EP_FTST(sc, F_ACCESS_32_BITS)) { for (m = m0; m != NULL; m = m->m_next) { if (m->m_len > 3) - EP_WRITE_MULTI_4(sc, EP_W1_TX_PIO_WR_1, + CSR_WRITE_MULTI_4(sc, EP_W1_TX_PIO_WR_1, mtod(m, uint32_t *), m->m_len / 4); if (m->m_len & 3) - EP_WRITE_MULTI_1(sc, EP_W1_TX_PIO_WR_1, + CSR_WRITE_MULTI_1(sc, EP_W1_TX_PIO_WR_1, mtod(m, uint8_t *)+(m->m_len & (~3)), m->m_len & 3); } } else { for (m = m0; m != NULL; m = m->m_next) { if (m->m_len > 1) - EP_WRITE_MULTI_2(sc, EP_W1_TX_PIO_WR_1, + CSR_WRITE_MULTI_2(sc, EP_W1_TX_PIO_WR_1, mtod(m, uint16_t *), m->m_len / 2); if (m->m_len & 1) - EP_WRITE_1(sc, EP_W1_TX_PIO_WR_1, + CSR_WRITE_1(sc, EP_W1_TX_PIO_WR_1, *(mtod(m, uint8_t *)+m->m_len - 1)); } } while (pad--) - EP_WRITE_1(sc, EP_W1_TX_PIO_WR_1, 0); /* Padding */ + CSR_WRITE_1(sc, EP_W1_TX_PIO_WR_1, 0); /* Padding */ - splx(s); + /* XXX and drop splhigh here */ BPF_MTAP(ifp, m0); @@ -546,16 +567,18 @@ * the tiny RX fifo. */ readcheck: - if (EP_READ_2(sc, EP_W1_RX_STATUS) & RX_BYTES_MASK) { + if (CSR_READ_2(sc, EP_W1_RX_STATUS) & RX_BYTES_MASK) { /* * we check if we have packets left, in that case * we prepare to come back later */ if (ifp->if_snd.ifq_head) - EP_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | 8); - return; + CSR_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | 8); + goto done; } goto startagain; +done:; + return; } void @@ -564,29 +587,28 @@ struct ep_softc *sc; int status; struct ifnet *ifp; - int x; - x = splbio(); - sc = (struct ep_softc *) arg; + EP_LOCK(sc); + /* XXX 4.x splbio'd here to reduce interruptability */ /* * quick fix: Try to detect an interrupt when the card goes away. */ - if (sc->gone || EP_READ_2(sc, EP_STATUS) == 0xffff) { - splx(x); + if (sc->gone || CSR_READ_2(sc, EP_STATUS) == 0xffff) { + EP_UNLOCK(sc); return; } ifp = &sc->arpcom.ac_if; - EP_WRITE_2(sc, EP_COMMAND, SET_INTR_MASK); /* disable all Ints */ + CSR_WRITE_2(sc, EP_COMMAND, SET_INTR_MASK); /* disable all Ints */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 27 10:16:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7953C16A4C2; Mon, 27 Oct 2003 10:16:21 -0800 (PST) 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 3691A16A4C1 for ; Mon, 27 Oct 2003 10:16:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CB4843FDF for ; Mon, 27 Oct 2003 10:16:19 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9RIGJXJ006262 for ; Mon, 27 Oct 2003 10:16:19 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9RIGH68006259 for perforce@freebsd.org; Mon, 27 Oct 2003 10:16:17 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 27 Oct 2003 10:16:17 -0800 (PST) Message-Id: <200310271816.h9RIGH68006259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40637 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: Mon, 27 Oct 2003 18:16:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=40637 Change 40637 by sam@sam_ebb on 2003/10/27 10:15:33 IFC @ 40635 Affected files ... .. //depot/projects/hostcache/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/hostcache/sys/cam/cam_periph.c#2 integrate .. //depot/projects/hostcache/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/hostcache/sys/conf/NOTES#3 integrate .. //depot/projects/hostcache/sys/conf/files#4 integrate .. //depot/projects/hostcache/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/hostcache/sys/conf/options#3 integrate .. //depot/projects/hostcache/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/hostcache/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/hostcache/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/hostcache/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/hostcache/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/hostcache/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/hostcache/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/hostcache/sys/dev/drm/drm_sysctl.h#3 integrate .. //depot/projects/hostcache/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/hostcache/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/hostcache/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/hostcache/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/hostcache/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/hostcache/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/hostcache/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/hostcache/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/hostcache/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/hostcache/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/hostcache/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/hostcache/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/hostcache/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/hostcache/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/hostcache/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/hostcache/sys/dev/pccard/pccarddevs.h#2 integrate .. //depot/projects/hostcache/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/hostcache/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/hostcache/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/hostcache/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/hostcache/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/hostcache/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/hostcache/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/hostcache/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/hostcache/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/hostcache/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/hostcache/sys/dev/vx/if_vxreg.h#2 integrate .. //depot/projects/hostcache/sys/dev/vx/if_vxvar.h#1 branch .. //depot/projects/hostcache/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/hostcache/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/hostcache/sys/geom/geom_fox.c#2 integrate .. //depot/projects/hostcache/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/hostcache/sys/i386/conf/NOTES#2 integrate .. //depot/projects/hostcache/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/hostcache/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/hostcache/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/hostcache/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/hostcache/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/hostcache/sys/kern/kern_alq.c#2 integrate .. //depot/projects/hostcache/sys/kern/kern_intr.c#2 integrate .. //depot/projects/hostcache/sys/kern/kern_resource.c#2 integrate .. //depot/projects/hostcache/sys/kern/kern_sig.c#2 integrate .. //depot/projects/hostcache/sys/kern/kern_time.c#2 integrate .. //depot/projects/hostcache/sys/kern/sched_ule.c#2 integrate .. //depot/projects/hostcache/sys/kern/subr_bus.c#2 integrate .. //depot/projects/hostcache/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/hostcache/sys/net/if_loop.c#3 integrate .. //depot/projects/hostcache/sys/net/if_types.h#2 integrate .. //depot/projects/hostcache/sys/netinet/icmp6.h#2 integrate .. //depot/projects/hostcache/sys/netinet/in.h#2 integrate .. //depot/projects/hostcache/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/hostcache/sys/netinet/ip6.h#2 integrate .. //depot/projects/hostcache/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/hostcache/sys/netinet6/frag6.c#2 integrate .. //depot/projects/hostcache/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/hostcache/sys/netinet6/in6.h#2 integrate .. //depot/projects/hostcache/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/hostcache/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/hostcache/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/hostcache/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/hostcache/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/hostcache/sys/netinet6/mld6.c#2 integrate .. //depot/projects/hostcache/sys/netinet6/nd6.c#2 integrate .. //depot/projects/hostcache/sys/netinet6/nd6.h#2 integrate .. //depot/projects/hostcache/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/hostcache/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/hostcache/sys/netinet6/route6.c#2 integrate .. //depot/projects/hostcache/sys/netinet6/udp6_output.c#3 integrate .. //depot/projects/hostcache/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/hostcache/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/hostcache/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/hostcache/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/hostcache/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/hostcache/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/hostcache/sys/sys/bus.h#2 integrate .. //depot/projects/hostcache/sys/sys/interrupt.h#2 integrate .. //depot/projects/hostcache/sys/sys/time.h#2 integrate .. //depot/projects/hostcache/sys/vm/swap_pager.c#3 integrate .. //depot/projects/hostcache/sys/vm/vm_object.c#2 integrate .. //depot/projects/hostcache/sys/vm/vm_page.h#2 integrate .. //depot/projects/hostcache/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/netperf+sockets/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/netperf+sockets/sys/cam/cam_periph.c#2 integrate .. //depot/projects/netperf+sockets/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/netperf+sockets/sys/conf/NOTES#2 integrate .. //depot/projects/netperf+sockets/sys/conf/files#2 integrate .. //depot/projects/netperf+sockets/sys/conf/files.ia64#2 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/netperf+sockets/sys/conf/options#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/dcons/dcons.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/dcons/dcons.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/dcons/dcons_crom.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/drm/drm_sysctl.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccarddevs.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vxreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vxvar.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_fox.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/netperf+sockets/sys/i386/conf/NOTES#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/db_disasm.c#2 delete .. //depot/projects/netperf+sockets/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/inst.h#2 delete .. //depot/projects/netperf+sockets/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_alq.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_intr.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_resource.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_sig.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_time.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sched_ule.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_bus.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/netperf+sockets/sys/modules/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/dcons/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/dcons_crom/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/netgraph/atm/atmbase/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/netgraph/atm/sscfu/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/netgraph/atm/sscop/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/net/if.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_loop.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_types.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/route.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/route.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/ng_sscfu.h#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/ng_sscop.h#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/ngatmbase.c#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/ngatmbase.h#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/sscfu/ng_sscfu.c#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/sscop/ng_sscop.c#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/sscop/ng_sscop_cust.h#1 branch .. //depot/projects/netperf+sockets/sys/netinet/icmp6.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/in.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip6.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/frag6.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/mld6.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/nd6.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/nd6.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/route6.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/netperf+sockets/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/netperf+sockets/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/netperf+sockets/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/netperf+sockets/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/netperf+sockets/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/netperf+sockets/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/netperf+sockets/sys/sparc64/pci/psycho.c#1 branch .. //depot/projects/netperf+sockets/sys/sys/bus.h#2 integrate .. //depot/projects/netperf+sockets/sys/sys/interrupt.h#2 integrate .. //depot/projects/netperf+sockets/sys/sys/mouse.h#1 branch .. //depot/projects/netperf+sockets/sys/sys/mutex.h#1 branch .. //depot/projects/netperf+sockets/sys/sys/time.h#2 integrate .. //depot/projects/netperf+sockets/sys/vm/swap_pager.c#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_object.c#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_page.h#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_pager.h#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/hostcache/sys/boot/forth/beastie.4th#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/boot/forth/beastie.4th,v 1.5 2003/09/13 18:35:01 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.6 2003/10/27 16:39:49 scottl Exp $ marker task-beastie.4th @@ -209,9 +209,9 @@ dup tkey 0 25 at-xy dup 32 = if nip 0 swap then - dup -1 = if s" boot" evaluate then - dup 13 = if s" boot" evaluate then - dup bootkey @ = if s" boot" evaluate then + dup -1 = if 0 boot then + dup 13 = if 0 boot then + dup bootkey @ = if 0 boot then dup bootacpikey @ = if acpienabled? if s" acpi_load" unsetenv @@ -221,7 +221,7 @@ s" YES" s" acpi_load" setenv s" 0" s" hint.acpi.0.disabled" setenv then - s" boot" evaluate + 0 boot then dup bootsafekey @ = if s" arch-i386" environment? if @@ -233,15 +233,15 @@ s" 0" s" hw.ata.atapi_dma" setenv s" 0" s" hw.ata.wc" setenv s" 0" s" hw.eisa_slots" setenv - s" boot" evaluate + 0 boot then dup bootverbosekey @ = if s" YES" s" boot_verbose" setenv - s" boot" evaluate + 0 boot then dup bootsinglekey @ = if s" YES" s" boot_single" setenv - s" boot" evaluate + 0 boot then dup escapekey @ = if 2drop ==== //depot/projects/hostcache/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.54 2003/10/18 11:01:11 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.55 2003/10/27 06:15:54 ken Exp $"); #include #include @@ -994,14 +994,26 @@ scsi_cmd = (struct scsi_start_stop_unit *) &done_ccb->csio.cdb_io.cdb_bytes; if (sense != 0) { + struct ccb_getdev cgd; struct scsi_sense_data *sense; int error_code, sense_key, asc, ascq; + scsi_sense_action err_action; sense = &done_ccb->csio.sense_data; scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq); /* + * Grab the inquiry data for this device. + */ + xpt_setup_ccb(&cgd.ccb_h, done_ccb->ccb_h.path, + /*priority*/ 1); + cgd.ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action((union ccb *)&cgd); + err_action = scsi_error_action(&done_ccb->csio, + &cgd.inq_data, 0); + + /* * If the error is "invalid field in CDB", * and the load/eject flag is set, turn the * flag off and try again. This is just in @@ -1028,12 +1040,15 @@ xpt_action(done_ccb); - } else if (done_ccb->ccb_h.retry_count > 1) { + } else if ((done_ccb->ccb_h.retry_count > 1) + && ((err_action & SS_MASK) != SS_FAIL)) { + /* * In this case, the error recovery * command failed, but we've got * some retries left on it. Give - * it another try. + * it another try unless this is an + * unretryable error. */ /* set the timeout to .5 sec */ ==== //depot/projects/hostcache/sys/cam/scsi/scsi_cd.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.87 2003/10/18 17:24:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.88 2003/10/27 06:15:55 ken Exp $"); #include "opt_cd.h" @@ -2856,20 +2856,6 @@ ccb = cdgetccb(periph, /* priority */ 1); - scsi_test_unit_ready(&ccb->csio, 0, cddone, - MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, 1000); - ccb->ccb_h.ccb_bp = NULL; - - error = cam_periph_runccb(ccb, NULL, - /*cam_flags*/0, - /*sense_flags*/SF_RETRY_UA, - softc->disk.d_devstat); - - if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - xpt_release_ccb(ccb); - return (ENXIO); - } - rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), M_TEMP, M_WAITOK); ==== //depot/projects/hostcache/sys/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1180 2003/10/24 15:44:08 simokawa Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1182 2003/10/27 11:19:08 harti Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -29,11 +29,11 @@ # comment on the same line if possible. Very detailed descriptions of # devices and subsystems belong in manpages. # -# A space followed by a tab separates 'option' from an option name. Two +# A space followed by a tab separates 'options' from an option name. Two # spaces followed by a tab separate 'device' from a device name. Comments # after an option or device should use one space after the comment character. # To comment out a negative option that disables code and thus should not be -# enabled for LINT builds, precede 'option' with "#!". +# enabled for LINT builds, precede 'options' with "#!". # # @@ -452,7 +452,10 @@ options NETGRAPH_ATM_ATMPIF # NgATM - Netgraph ATM -options NGATM_ATM +options NGATM_ATM +options NGATM_ATMBASE +options NGATM_SSCOP +options NGATM_SSCFU device mn # Munich32x/Falc54 Nx64kbit/sec cards. device lmc # tulip based LanMedia WAN cards ==== //depot/projects/hostcache/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.838 2003/10/24 15:44:08 simokawa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.841 2003/10/27 11:19:08 harti Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1370,7 +1370,13 @@ netatm/uni/unisig_vc_state.c optional atm_uni atm_core netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif -netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/ngatmbase.c optional ngatm_atmbase +contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase +netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu +contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu +netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop +contrib/ngatm/netnatm/saal/saal_sscop.c optional ngatm_sscop netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async netgraph/ng_base.c optional netgraph ==== //depot/projects/hostcache/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kernels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.34 2003/08/22 15:41:44 imp Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.35 2003/10/27 11:19:08 harti Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -35,6 +35,9 @@ # ... and the same for Atheros HAL INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd +# ... and the same for the NgATM stuff +INCLUDES+= -I$S/contrib/ngatm + COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common ==== //depot/projects/hostcache/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.417 2003/10/24 15:44:08 simokawa Exp $ +# $FreeBSD: src/sys/conf/options,v 1.418 2003/10/27 11:19:08 harti Exp $ # # On the handling of kernel options # @@ -404,6 +404,9 @@ # NgATM options NGATM_ATM opt_netgraph.h +NGATM_ATMBASE opt_netgraph.h +NGATM_SSCOP opt_netgraph.h +NGATM_SSCFU opt_netgraph.h # DRM options DRM_DEBUG opt_drm.h ==== //depot/projects/hostcache/sys/dev/acpica/acpi.c#2 (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/dev/acpica/acpi.c,v 1.105 2003/10/19 05:56:59 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.106 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -51,6 +51,7 @@ #include "acpi.h" #include #include +#include MALLOC_DEFINE(M_ACPIDEV, "acpidev", "ACPI devices"); @@ -2054,6 +2055,27 @@ return (error); } +/* Inform devctl(4) when we receive a Notify. */ +void +acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, uint8_t notify) +{ + char notify_buf[16]; + ACPI_BUFFER handle_buf; + ACPI_STATUS status; + + if (subsystem == NULL) + return; + + handle_buf.Pointer = NULL; + handle_buf.Length = ACPI_ALLOCATE_BUFFER; + status = AcpiNsHandleToPathname(h, &handle_buf); + if (ACPI_FAILURE(status)) + return; + snprintf(notify_buf, sizeof(notify_buf), "notify=0x%02x", notify); + devctl_notify("ACPI", subsystem, handle_buf.Pointer, notify_buf); + AcpiOsFree(handle_buf.Pointer); +} + #ifdef ACPI_DEBUG /* * Support for parsing debug options from the kernel environment. ==== //depot/projects/hostcache/sys/dev/acpica/acpi_acad.c#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/dev/acpica/acpi_acad.c,v 1.19 2003/09/26 05:24:55 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.20 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -39,7 +39,7 @@ #include #include -#include "acpi.h" +#include "acpi.h" #include #include @@ -108,6 +108,8 @@ POWER_PROFILE_ECONOMY); ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), "%s Line\n", sc->status ? "On" : "Off"); + + acpi_UserNotify("ACAD", h, sc->status); } } ==== //depot/projects/hostcache/sys/dev/acpica/acpi_button.c#2 (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/acpi_button.c,v 1.16 2003/09/22 04:50:29 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.17 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -175,6 +175,8 @@ if (acpi_sc == NULL) return_VOID; + acpi_UserNotify("Button", sc->button_handle, sc->button_type); + switch (sc->button_type) { case ACPI_POWER_BUTTON: ACPI_VPRINT(sc->button_dev, acpi_sc, "power button pressed\n"); @@ -202,6 +204,8 @@ if (acpi_sc == NULL) return_VOID; + acpi_UserNotify("Button", sc->button_handle, sc->button_type); + switch (sc->button_type) { case ACPI_POWER_BUTTON: ACPI_VPRINT(sc->button_dev, acpi_sc, "wakeup by power button\n"); ==== //depot/projects/hostcache/sys/dev/acpica/acpi_cmbat.c#2 (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/acpi_cmbat.c,v 1.25 2003/09/26 05:24:55 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.26 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -295,6 +295,8 @@ if ((sc = device_get_softc(dev)) == NULL) return; + acpi_UserNotify("CMBAT", h, notify); + switch (notify) { case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_BATTERY_BST_CHANGE: ==== //depot/projects/hostcache/sys/dev/acpica/acpi_lid.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.14 2003/08/28 16:06:30 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.15 2003/10/25 05:03:24 njl Exp $"); #include "opt_acpi.h" #include @@ -54,7 +54,8 @@ static int acpi_lid_suspend(device_t dev); static int acpi_lid_resume(device_t dev); static void acpi_lid_notify_status_changed(void *arg); -static void acpi_lid_notify_handler(ACPI_HANDLE h,UINT32 notify, void *context); +static void acpi_lid_notify_handler(ACPI_HANDLE h, UINT32 notify, + void *context); static device_method_t acpi_lid_methods[] = { /* Device interface */ @@ -149,6 +150,8 @@ ACPI_VPRINT(sc->lid_dev, acpi_sc, "Lid %s\n", sc->lid_status ? "opened" : "closed"); + acpi_UserNotify("Lid", sc->lid_handle, sc->lid_status); + if (sc->lid_status == 0) EVENTHANDLER_INVOKE(acpi_sleep_event, acpi_sc->acpi_lid_switch_sx); else @@ -178,4 +181,3 @@ return_VOID; } - ==== //depot/projects/hostcache/sys/dev/acpica/acpi_thermal.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.32 2003/09/26 05:24:55 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.33 2003/10/25 05:03:24 njl Exp $"); #include "opt_acpi.h" #include @@ -727,6 +727,8 @@ break; } + acpi_UserNotify("Thermal", h, notify); + return_VOID; } ==== //depot/projects/hostcache/sys/dev/acpica/acpivar.h#2 (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.45 2003/09/10 22:06:41 marcel Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.46 2003/10/25 05:03:24 njl Exp $ */ #include "bus_if.h" @@ -188,6 +188,8 @@ extern ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state); extern ACPI_STATUS acpi_Enable(struct acpi_softc *sc); extern ACPI_STATUS acpi_Disable(struct acpi_softc *sc); +extern void acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, + uint8_t notify); struct acpi_parse_resource_set { void (*set_init)(device_t dev, void **context); ==== //depot/projects/hostcache/sys/dev/drm/drm_sysctl.h#3 (text+ko) ==== @@ -21,7 +21,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.5 2003/10/24 01:48:16 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.6 2003/10/24 21:45:21 anholt Exp $ */ #ifdef __FreeBSD__ @@ -226,12 +226,11 @@ * copy of the whole structure and the relevant data from buflist. */ DRM_LOCK(); - DRM_SPINLOCK(&dev->dma_lock); if (dma == NULL) { - DRM_SPINUNLOCK(&dev->dma_lock); DRM_UNLOCK(); return 0; } + DRM_SPINLOCK(&dev->dma_lock); tempdma = *dma; templists = DRM(alloc)(sizeof(int) * dma->buf_count, DRM_MEM_BUFS); for (i = 0; i < dma->buf_count; i++) ==== //depot/projects/hostcache/sys/dev/ep/if_ep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.124 2003/10/23 05:33:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.127 2003/10/26 22:28:20 imp Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.124 2003/10/23 05:33:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.127 2003/10/26 22:28:20 imp Exp $"); #include #include @@ -90,10 +90,13 @@ {IFM_10_T, IFM_10_5, IFM_NONE, IFM_10_2, IFM_NONE}; /* if functions */ -static void ep_if_init(void *); -static int ep_if_ioctl(struct ifnet *, u_long, caddr_t); -static void ep_if_start(struct ifnet *); -static void ep_if_watchdog(struct ifnet *); +static void epinit(void *); +static int epioctl(struct ifnet *, u_long, caddr_t); +static void epstart(struct ifnet *); +static void epwatchdog(struct ifnet *); + +static void epstart_locked(struct ifnet *); +static void epinit_locked(struct ep_softc *); /* if_media functions */ static int ep_ifmedia_upd(struct ifnet *); @@ -134,13 +137,13 @@ if (eeprom_rdy(sc)) return (ENXIO); - EP_WRITE_2(sc, EP_W0_EEPROM_COMMAND, + CSR_WRITE_2(sc, EP_W0_EEPROM_COMMAND, (EEPROM_CMD_RD << sc->epb.cmd_off) | offset); if (eeprom_rdy(sc)) return (ENXIO); - (*result) = EP_READ_2(sc, EP_W0_EEPROM_DATA); + (*result) = CSR_READ_2(sc, EP_W0_EEPROM_DATA); return (0); } @@ -155,7 +158,7 @@ macaddr = (u_int16_t *) addr; - GO_WINDOW(0); + GO_WINDOW(sc, 0); for (i = EEPROM_NODE_ADDR_0; i <= EEPROM_NODE_ADDR_2; i++) { error = get_e(sc, i, &result); if (error) @@ -200,7 +203,7 @@ sc->ep_connectors = 0; sc->ep_connector = 0; - GO_WINDOW(0); + GO_WINDOW(sc, 0); sc->epb.cmd_off = 0; error = get_e(sc, EEPROM_PROD_ID, &result); @@ -222,8 +225,8 @@ { u_int16_t config; - GO_WINDOW(0); - config = EP_READ_2(sc, EP_W0_CONFIG_CTRL); + GO_WINDOW(sc, 0); + config = CSR_READ_2(sc, EP_W0_CONFIG_CTRL); if (config & IS_AUI) sc->ep_connectors |= AUI; if (config & IS_BNC) @@ -240,7 +243,7 @@ * The cards that require something different can override * this later on. */ - sc->ep_connector = EP_READ_2(sc, EP_W0_ADDRESS_CFG) >> ACF_CONNECTOR_BITS; + sc->ep_connector = CSR_READ_2(sc, EP_W0_ADDRESS_CFG) >> ACF_CONNECTOR_BITS; } void @@ -267,19 +270,20 @@ int error; sc->gone = 0; - + EP_LOCK_INIT(sc); error = ep_get_macaddr(sc, (u_char *)&sc->arpcom.ac_enaddr); if (error) { device_printf(sc->dev, "Unable to get Ethernet address!\n"); + EP_LOCK_DESTORY(sc); return (ENXIO); } /* * Setup the station address */ p = (u_short *)&sc->arpcom.ac_enaddr; - GO_WINDOW(2); + GO_WINDOW(sc, 2); for (i = 0; i < 3; i++) - EP_WRITE_2(sc, EP_W2_ADDR_0 + (i * 2), ntohs(p[i])); + CSR_WRITE_2(sc, EP_W2_ADDR_0 + (i * 2), ntohs(p[i])); device_printf(sc->dev, "Ethernet address %6D\n", sc->arpcom.ac_enaddr, ":"); @@ -293,10 +297,10 @@ ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_output = ether_output; - ifp->if_start = ep_if_start; - ifp->if_ioctl = ep_if_ioctl; - ifp->if_watchdog = ep_if_watchdog; - ifp->if_init = ep_if_init; + ifp->if_start = epstart; + ifp->if_ioctl = epioctl; + ifp->if_watchdog = epwatchdog; + ifp->if_init = epinit; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; if (!sc->epb.mii_trans) { @@ -344,6 +348,7 @@ struct ifnet *ifp; sc = device_get_softc(dev); + EP_ASSERT_UNLOCKED(sc); ifp = &sc->arpcom.ac_if; if (sc->gone) { @@ -358,73 +363,82 @@ sc->gone = 1; ep_free(dev); + EP_LOCK_DESTORY(sc); return (0); } +static void +epinit(void *xsc) +{ + struct ep_softc *sc = xsc; + EP_LOCK(sc); + epinit_locked(sc); + EP_UNLOCK(sc); +} + /* * The order in here seems important. Otherwise we may not receive * interrupts. ?! */ static void -ep_if_init(void *xsc) +epinit_locked(struct ep_softc *sc) { - struct ep_softc *sc = xsc; struct ifnet *ifp = &sc->arpcom.ac_if; - int s, i; + int i; if (sc->gone) return; - s = splimp(); - while (EP_READ_2(sc, EP_STATUS) & S_COMMAND_IN_PROGRESS); + EP_ASSERT_LOCKED(sc); + EP_BUSY_WAIT(sc); - GO_WINDOW(0); - EP_WRITE_2(sc, EP_COMMAND, STOP_TRANSCEIVER); - GO_WINDOW(4); - EP_WRITE_2(sc, EP_W4_MEDIA_TYPE, DISABLE_UTP); - GO_WINDOW(0); + GO_WINDOW(sc, 0); + CSR_WRITE_2(sc, EP_COMMAND, STOP_TRANSCEIVER); + GO_WINDOW(sc, 4); + CSR_WRITE_2(sc, EP_W4_MEDIA_TYPE, DISABLE_UTP); + GO_WINDOW(sc, 0); /* Disable the card */ - EP_WRITE_2(sc, EP_W0_CONFIG_CTRL, 0); + CSR_WRITE_2(sc, EP_W0_CONFIG_CTRL, 0); /* Enable the card */ - EP_WRITE_2(sc, EP_W0_CONFIG_CTRL, ENABLE_DRQ_IRQ); + CSR_WRITE_2(sc, EP_W0_CONFIG_CTRL, ENABLE_DRQ_IRQ); - GO_WINDOW(2); + GO_WINDOW(sc, 2); /* Reload the ether_addr. */ for (i = 0; i < 6; i++) - EP_WRITE_1(sc, EP_W2_ADDR_0 + i, sc->arpcom.ac_enaddr[i]); + CSR_WRITE_1(sc, EP_W2_ADDR_0 + i, sc->arpcom.ac_enaddr[i]); - EP_WRITE_2(sc, EP_COMMAND, RX_RESET); - EP_WRITE_2(sc, EP_COMMAND, TX_RESET); - while (EP_READ_2(sc, EP_STATUS) & S_COMMAND_IN_PROGRESS); + CSR_WRITE_2(sc, EP_COMMAND, RX_RESET); + CSR_WRITE_2(sc, EP_COMMAND, TX_RESET); + EP_BUSY_WAIT(sc); /* Window 1 is operating window */ - GO_WINDOW(1); + GO_WINDOW(sc, 1); for (i = 0; i < 31; i++) - EP_READ_1(sc, EP_W1_TX_STATUS); + CSR_READ_1(sc, EP_W1_TX_STATUS); /* get rid of stray intr's */ - EP_WRITE_2(sc, EP_COMMAND, ACK_INTR | 0xff); + CSR_WRITE_2(sc, EP_COMMAND, ACK_INTR | 0xff); - EP_WRITE_2(sc, EP_COMMAND, SET_RD_0_MASK | S_5_INTS); + CSR_WRITE_2(sc, EP_COMMAND, SET_RD_0_MASK | S_5_INTS); - EP_WRITE_2(sc, EP_COMMAND, SET_INTR_MASK | S_5_INTS); + CSR_WRITE_2(sc, EP_COMMAND, SET_INTR_MASK | S_5_INTS); if (ifp->if_flags & IFF_PROMISC) - EP_WRITE_2(sc, EP_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | - FIL_GROUP | FIL_BRDCST | FIL_ALL); + CSR_WRITE_2(sc, EP_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | + FIL_MULTICAST | FIL_BRDCST | FIL_PROMISC); else - EP_WRITE_2(sc, EP_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | - FIL_GROUP | FIL_BRDCST); + CSR_WRITE_2(sc, EP_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | + FIL_MULTICAST | FIL_BRDCST); if (!sc->epb.mii_trans) ep_ifmedia_upd(ifp); - EP_WRITE_2(sc, EP_COMMAND, RX_ENABLE); - EP_WRITE_2(sc, EP_COMMAND, TX_ENABLE); + CSR_WRITE_2(sc, EP_COMMAND, RX_ENABLE); + CSR_WRITE_2(sc, EP_COMMAND, TX_ENABLE); ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; /* just in case */ @@ -438,8 +452,8 @@ m_freem(sc->top); sc->top = sc->mcur = 0; } - EP_WRITE_2(sc, EP_COMMAND, SET_RX_EARLY_THRESH | RX_INIT_EARLY_THRESH); - EP_WRITE_2(sc, EP_COMMAND, SET_TX_START_THRESH | 16); + CSR_WRITE_2(sc, EP_COMMAND, SET_RX_EARLY_THRESH | RX_INIT_EARLY_THRESH); + CSR_WRITE_2(sc, EP_COMMAND, SET_TX_START_THRESH | 16); /* * Store up a bunch of mbuf's for use later. (MAX_MBS). @@ -447,28 +461,35 @@ * called from intr or somewhere else. */ - GO_WINDOW(1); - ep_if_start(ifp); + GO_WINDOW(sc, 1); + epstart_locked(ifp); +} - splx(s); +static void +epstart(struct ifnet *ifp) +{ + struct ep_softc *sc; + sc = ifp->if_softc; + EP_LOCK(sc); + epstart_locked(ifp); + EP_UNLOCK(sc); } - + static void -ep_if_start(struct ifnet *ifp) +epstart_locked(struct ifnet *ifp) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 27 13:21:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDE3016A4C3; Mon, 27 Oct 2003 13:21:39 -0800 (PST) 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 8F74F16A4D7 for ; Mon, 27 Oct 2003 13:21:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3FD743FBF for ; Mon, 27 Oct 2003 13:21:36 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9RLLaXJ022853 for ; Mon, 27 Oct 2003 13:21:36 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9RLLY3p022849 for perforce@freebsd.org; Mon, 27 Oct 2003 13:21:34 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 27 Oct 2003 13:21:34 -0800 (PST) Message-Id: <200310272121.h9RLLY3p022849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 40645 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: Mon, 27 Oct 2003 21:21:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=40645 Change 40645 by jhb@jhb_laptop on 2003/10/27 13:21:16 IFC @40644. Affected files ... .. //depot/projects/smpng/sys/amd64/include/stdarg.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/sysarch.h#3 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#4 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#14 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#21 integrate .. //depot/projects/smpng/sys/conf/NOTES#56 integrate .. //depot/projects/smpng/sys/conf/files#88 integrate .. //depot/projects/smpng/sys/conf/files.ia64#35 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#24 integrate .. //depot/projects/smpng/sys/conf/options#63 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#50 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#30 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.c#1 branch .. //depot/projects/smpng/sys/dev/dcons/dcons.h#1 branch .. //depot/projects/smpng/sys/dev/dcons/dcons_crom.c#1 branch .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_auth.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_context.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_dma.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_fops.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_ioctl.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.h#1 branch .. //depot/projects/smpng/sys/dev/drm/drm_memory.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_memory_debug.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pci.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/mga.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/r128.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/r128_state.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/radeon.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/sis.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#5 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#12 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#7 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_mca.c#6 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/ep/if_epreg.h#4 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#5 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#26 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#12 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#13 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#7 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#8 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#4 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#25 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#32 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#32 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#16 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#35 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#20 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#9 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/smpng/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#18 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#12 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#5 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/vx/if_vxreg.h#3 integrate .. //depot/projects/smpng/sys/dev/vx/if_vxvar.h#1 branch .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_fox.c#3 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakecode.S#4 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#65 integrate .. //depot/projects/smpng/sys/i386/i386/mp_clock.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#54 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#49 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm.h#1 branch .. //depot/projects/smpng/sys/ia64/disasm/disasm_decode.c#1 branch .. //depot/projects/smpng/sys/ia64/disasm/disasm_extract.c#1 branch .. //depot/projects/smpng/sys/ia64/disasm/disasm_format.c#1 branch .. //depot/projects/smpng/sys/ia64/disasm/disasm_int.h#1 branch .. //depot/projects/smpng/sys/ia64/ia64/db_disasm.c#7 delete .. //depot/projects/smpng/sys/ia64/ia64/db_interface.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#67 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.S#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/sys_machdep.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#57 integrate .. //depot/projects/smpng/sys/ia64/ia64/unaligned.c#5 integrate .. //depot/projects/smpng/sys/ia64/include/inst.h#3 delete .. //depot/projects/smpng/sys/ia64/include/md_var.h#12 integrate .. //depot/projects/smpng/sys/ia64/include/proc.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/smpng/sys/isa/fd.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_alq.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#26 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#51 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#60 integrate .. //depot/projects/smpng/sys/modules/Makefile#63 integrate .. //depot/projects/smpng/sys/modules/dcons/Makefile#1 branch .. //depot/projects/smpng/sys/modules/dcons_crom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/atm/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/atm/atmbase/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/atm/sscfu/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/atm/sscop/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#37 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#38 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#14 integrate .. //depot/projects/smpng/sys/net/if_loop.c#21 integrate .. //depot/projects/smpng/sys/net/if_tun.c#25 integrate .. //depot/projects/smpng/sys/net/if_types.h#2 integrate .. //depot/projects/smpng/sys/net/if_var.h#17 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#8 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_sscfu.h#1 branch .. //depot/projects/smpng/sys/netgraph/atm/ng_sscop.h#1 branch .. //depot/projects/smpng/sys/netgraph/atm/ngatmbase.c#1 branch .. //depot/projects/smpng/sys/netgraph/atm/ngatmbase.h#1 branch .. //depot/projects/smpng/sys/netgraph/atm/sscfu/ng_sscfu.c#1 branch .. //depot/projects/smpng/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#1 branch .. //depot/projects/smpng/sys/netgraph/atm/sscop/ng_sscop.c#1 branch .. //depot/projects/smpng/sys/netgraph/atm/sscop/ng_sscop_cust.h#1 branch .. //depot/projects/smpng/sys/netinet/icmp6.h#7 integrate .. //depot/projects/smpng/sys/netinet/in.h#24 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#22 integrate .. //depot/projects/smpng/sys/netinet/ip6.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#35 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#5 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#17 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#11 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#23 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#7 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#24 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#19 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#8 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#6 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#14 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#7 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#17 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#5 integrate .. //depot/projects/smpng/sys/netinet6/udp6_output.c#12 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#30 integrate .. //depot/projects/smpng/sys/pci/agp.c#15 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#12 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#46 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/smpng/sys/sys/agpio.h#4 integrate .. //depot/projects/smpng/sys/sys/bus.h#13 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#9 integrate .. //depot/projects/smpng/sys/sys/proc.h#101 integrate .. //depot/projects/smpng/sys/sys/time.h#13 integrate .. //depot/projects/smpng/sys/sys/vnode.h#37 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#31 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#29 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#34 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#45 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#21 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_pager.h#9 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#36 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/include/stdarg.h#3 (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.5 2003/05/10 00:55:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.6 2003/10/24 02:50:39 peter Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -46,9 +46,12 @@ #define va_arg(ap, type) \ __builtin_va_arg((ap), type) +#define __va_copy(dest, src) \ + __builtin_va_copy((dest), (src)) + #if __ISO_C_VISIBLE >= 1999 #define va_copy(dest, src) \ - __builtin_va_copy((dest), (src)) + __va_copy(dest, src) #endif #define va_end(ap) \ ==== //depot/projects/smpng/sys/amd64/include/sysarch.h#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/include/sysarch.h,v 1.19 2003/05/12 02:37:29 peter Exp $ + * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.21 2003/10/23 06:06:14 peter Exp $ */ /* @@ -39,22 +39,21 @@ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ -#define AMD64_GET_FSBASE 0 -#define AMD64_SET_FSBASE 1 -#define AMD64_GET_GSBASE 2 -#define AMD64_SET_GSBASE 3 +/* Leave space for 0-127 for to avoid translating syscalls */ +#define AMD64_GET_FSBASE 128 +#define AMD64_SET_FSBASE 129 +#define AMD64_GET_GSBASE 130 +#define AMD64_SET_GSBASE 131 -#if 0 /* these wrappers need to be implemented in libc first */ #ifndef _KERNEL #include __BEGIN_DECLS -unsigned long amd64_get_fsbase(void); -unsigned long amd64_set_fsbase(unsigned long); -unsigned long amd64_get_gsbase(void); -unsigned long amd64_set_gsbase(unsigned long); +int amd64_get_fsbase(void **); +int amd64_set_fsbase(void *); +int amd64_get_gsbase(void **); +int amd64_set_gsbase(void *); __END_DECLS #endif -#endif #endif /* !_MACHINE_SYSARCH_H_ */ ==== //depot/projects/smpng/sys/boot/forth/beastie.4th#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/boot/forth/beastie.4th,v 1.5 2003/09/13 18:35:01 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.6 2003/10/27 16:39:49 scottl Exp $ marker task-beastie.4th @@ -209,9 +209,9 @@ dup tkey 0 25 at-xy dup 32 = if nip 0 swap then - dup -1 = if s" boot" evaluate then - dup 13 = if s" boot" evaluate then - dup bootkey @ = if s" boot" evaluate then + dup -1 = if 0 boot then + dup 13 = if 0 boot then + dup bootkey @ = if 0 boot then dup bootacpikey @ = if acpienabled? if s" acpi_load" unsetenv @@ -221,7 +221,7 @@ s" YES" s" acpi_load" setenv s" 0" s" hint.acpi.0.disabled" setenv then - s" boot" evaluate + 0 boot then dup bootsafekey @ = if s" arch-i386" environment? if @@ -233,15 +233,15 @@ s" 0" s" hw.ata.atapi_dma" setenv s" 0" s" hw.ata.wc" setenv s" 0" s" hw.eisa_slots" setenv - s" boot" evaluate + 0 boot then dup bootverbosekey @ = if s" YES" s" boot_verbose" setenv - s" boot" evaluate + 0 boot then dup bootsinglekey @ = if s" YES" s" boot_single" setenv - s" boot" evaluate + 0 boot then dup escapekey @ = if 2drop ==== //depot/projects/smpng/sys/cam/cam_periph.c#14 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.54 2003/10/18 11:01:11 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.55 2003/10/27 06:15:54 ken Exp $"); #include #include @@ -994,14 +994,26 @@ scsi_cmd = (struct scsi_start_stop_unit *) &done_ccb->csio.cdb_io.cdb_bytes; if (sense != 0) { + struct ccb_getdev cgd; struct scsi_sense_data *sense; int error_code, sense_key, asc, ascq; + scsi_sense_action err_action; sense = &done_ccb->csio.sense_data; scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq); /* + * Grab the inquiry data for this device. + */ + xpt_setup_ccb(&cgd.ccb_h, done_ccb->ccb_h.path, + /*priority*/ 1); + cgd.ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action((union ccb *)&cgd); + err_action = scsi_error_action(&done_ccb->csio, + &cgd.inq_data, 0); + + /* * If the error is "invalid field in CDB", * and the load/eject flag is set, turn the * flag off and try again. This is just in @@ -1028,12 +1040,15 @@ xpt_action(done_ccb); - } else if (done_ccb->ccb_h.retry_count > 1) { + } else if ((done_ccb->ccb_h.retry_count > 1) + && ((err_action & SS_MASK) != SS_FAIL)) { + /* * In this case, the error recovery * command failed, but we've got * some retries left on it. Give - * it another try. + * it another try unless this is an + * unretryable error. */ /* set the timeout to .5 sec */ ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#21 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.87 2003/10/18 17:24:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.88 2003/10/27 06:15:55 ken Exp $"); #include "opt_cd.h" @@ -2856,20 +2856,6 @@ ccb = cdgetccb(periph, /* priority */ 1); - scsi_test_unit_ready(&ccb->csio, 0, cddone, - MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, 1000); - ccb->ccb_h.ccb_bp = NULL; - - error = cam_periph_runccb(ccb, NULL, - /*cam_flags*/0, - /*sense_flags*/SF_RETRY_UA, - softc->disk.d_devstat); - - if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - xpt_release_ccb(ccb); - return (ENXIO); - } - rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), M_TEMP, M_WAITOK); ==== //depot/projects/smpng/sys/conf/NOTES#56 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1179 2003/10/22 22:27:49 njl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1182 2003/10/27 11:19:08 harti Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -29,11 +29,11 @@ # comment on the same line if possible. Very detailed descriptions of # devices and subsystems belong in manpages. # -# A space followed by a tab separates 'option' from an option name. Two +# A space followed by a tab separates 'options' from an option name. Two # spaces followed by a tab separate 'device' from a device name. Comments # after an option or device should use one space after the comment character. # To comment out a negative option that disables code and thus should not be -# enabled for LINT builds, precede 'option' with "#!". +# enabled for LINT builds, precede 'options' with "#!". # # @@ -452,7 +452,10 @@ options NETGRAPH_ATM_ATMPIF # NgATM - Netgraph ATM -options NGATM_ATM +options NGATM_ATM +options NGATM_ATMBASE +options NGATM_SSCOP +options NGATM_SSCFU device mn # Munich32x/Falc54 Nx64kbit/sec cards. device lmc # tulip based LanMedia WAN cards @@ -2241,11 +2244,21 @@ options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size ##################################################################### -# Firewire support +# FireWire support -device firewire # Firewire bus code +device firewire # FireWire bus code device sbp # SCSI over Firewire (Requires scbus and da) -device fwe # Ethernet over Firewire (non-standard!) +device fwe # Ethernet over FireWire (non-standard!) + +##################################################################### +# dcons support (Dumb Console Device) + +device dcons # dumb console driver +device dcons_crom # FireWire attachment +options DCONS_BUF_SIZE=16384 # buffer size +options DCONS_POLL_HZ=100 # polling rate +options DCONS_FORCE_CONSOLE=0 # force to be the primary console +options DCONS_FORCE_GDB=1 # force to be the gdb device ##################################################################### # crypto subsystem ==== //depot/projects/smpng/sys/conf/files#88 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.837 2003/10/22 20:39:33 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.841 2003/10/27 11:19:08 harti Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -351,6 +351,8 @@ dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs card dev/cs/if_cs_pccard.c optional cs pccard +dev/dcons/dcons.c optional dcons +dev/dcons/dcons_crom.c optional dcons_crom dev/digi/digi.c optional digi dev/digi/digi_isa.c optional digi isa dev/digi/digi_pci.c optional digi pci @@ -1368,7 +1370,13 @@ netatm/uni/unisig_vc_state.c optional atm_uni atm_core netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif -netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/ngatmbase.c optional ngatm_atmbase +contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase +netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu +contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu +netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop +contrib/ngatm/netnatm/saal/saal_sscop.c optional ngatm_sscop netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async netgraph/ng_base.c optional netgraph ==== //depot/projects/smpng/sys/conf/files.ia64#35 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.59 2003/09/20 19:27:48 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.61 2003/10/24 06:48:41 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -80,6 +80,9 @@ ia64/acpica/acpi_machdep.c optional acpi ia64/acpica/acpi_wakeup.c optional acpi ia64/acpica/madt.c optional acpi +ia64/disasm/disasm_decode.c standard +ia64/disasm/disasm_extract.c standard +ia64/disasm/disasm_format.c standard ia64/ia32/ia32_misc.c optional ia32 ia64/ia32/ia32_sysent.c optional ia32 ia64/ia32/ia32_sysvec.c optional ia32 @@ -89,7 +92,6 @@ ia64/ia64/clock_if.m standard ia64/ia64/context.S standard ia64/ia64/critical.c standard -ia64/ia64/db_disasm.c optional ddb ia64/ia64/db_interface.c optional ddb ia64/ia64/db_trace.c optional ddb ia64/ia64/dump_machdep.c standard ==== //depot/projects/smpng/sys/conf/kern.pre.mk#24 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kernels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.34 2003/08/22 15:41:44 imp Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.35 2003/10/27 11:19:08 harti Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -35,6 +35,9 @@ # ... and the same for Atheros HAL INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd +# ... and the same for the NgATM stuff +INCLUDES+= -I$S/contrib/ngatm + COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common ==== //depot/projects/smpng/sys/conf/options#63 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.416 2003/10/22 22:27:49 njl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.418 2003/10/27 11:19:08 harti Exp $ # # On the handling of kernel options # @@ -404,6 +404,9 @@ # NgATM options NGATM_ATM opt_netgraph.h +NGATM_ATMBASE opt_netgraph.h +NGATM_SSCOP opt_netgraph.h +NGATM_SSCFU opt_netgraph.h # DRM options DRM_DEBUG opt_drm.h @@ -673,3 +676,9 @@ AH_DEBUG opt_ah.h AH_DEBUG_ALQ opt_ah.h AH_ASSERT opt_ah.h + +# dcons options +DCONS_BUF_SIZE opt_dcons.h +DCONS_POLL_HZ opt_dcons.h +DCONS_FORCE_CONSOLE opt_dcons.h +DCONS_FORCE_GDB opt_dcons.h ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#50 (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/dev/acpica/acpi.c,v 1.105 2003/10/19 05:56:59 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.106 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -51,6 +51,7 @@ #include "acpi.h" #include #include +#include MALLOC_DEFINE(M_ACPIDEV, "acpidev", "ACPI devices"); @@ -2054,6 +2055,27 @@ return (error); } +/* Inform devctl(4) when we receive a Notify. */ +void +acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, uint8_t notify) +{ + char notify_buf[16]; + ACPI_BUFFER handle_buf; + ACPI_STATUS status; + + if (subsystem == NULL) + return; + + handle_buf.Pointer = NULL; + handle_buf.Length = ACPI_ALLOCATE_BUFFER; + status = AcpiNsHandleToPathname(h, &handle_buf); + if (ACPI_FAILURE(status)) + return; + snprintf(notify_buf, sizeof(notify_buf), "notify=0x%02x", notify); + devctl_notify("ACPI", subsystem, handle_buf.Pointer, notify_buf); + AcpiOsFree(handle_buf.Pointer); +} + #ifdef ACPI_DEBUG /* * Support for parsing debug options from the kernel environment. ==== //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#13 (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/dev/acpica/acpi_acad.c,v 1.19 2003/09/26 05:24:55 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.20 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -39,7 +39,7 @@ #include #include -#include "acpi.h" +#include "acpi.h" #include #include @@ -108,6 +108,8 @@ POWER_PROFILE_ECONOMY); ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), "%s Line\n", sc->status ? "On" : "Off"); + + acpi_UserNotify("ACAD", h, sc->status); } } ==== //depot/projects/smpng/sys/dev/acpica/acpi_button.c#11 (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/acpi_button.c,v 1.16 2003/09/22 04:50:29 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.17 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -175,6 +175,8 @@ if (acpi_sc == NULL) return_VOID; + acpi_UserNotify("Button", sc->button_handle, sc->button_type); + switch (sc->button_type) { case ACPI_POWER_BUTTON: ACPI_VPRINT(sc->button_dev, acpi_sc, "power button pressed\n"); @@ -202,6 +204,8 @@ if (acpi_sc == NULL) return_VOID; + acpi_UserNotify("Button", sc->button_handle, sc->button_type); + switch (sc->button_type) { case ACPI_POWER_BUTTON: ACPI_VPRINT(sc->button_dev, acpi_sc, "wakeup by power button\n"); ==== //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#16 (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/acpi_cmbat.c,v 1.25 2003/09/26 05:24:55 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.26 2003/10/25 05:03:24 njl Exp $ */ #include "opt_acpi.h" @@ -295,6 +295,8 @@ if ((sc = device_get_softc(dev)) == NULL) return; + acpi_UserNotify("CMBAT", h, notify); + switch (notify) { case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_BATTERY_BST_CHANGE: ==== //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.14 2003/08/28 16:06:30 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.15 2003/10/25 05:03:24 njl Exp $"); #include "opt_acpi.h" #include @@ -54,7 +54,8 @@ static int acpi_lid_suspend(device_t dev); static int acpi_lid_resume(device_t dev); static void acpi_lid_notify_status_changed(void *arg); -static void acpi_lid_notify_handler(ACPI_HANDLE h,UINT32 notify, void *context); +static void acpi_lid_notify_handler(ACPI_HANDLE h, UINT32 notify, + void *context); static device_method_t acpi_lid_methods[] = { /* Device interface */ @@ -149,6 +150,8 @@ ACPI_VPRINT(sc->lid_dev, acpi_sc, "Lid %s\n", sc->lid_status ? "opened" : "closed"); + acpi_UserNotify("Lid", sc->lid_handle, sc->lid_status); + if (sc->lid_status == 0) EVENTHANDLER_INVOKE(acpi_sleep_event, acpi_sc->acpi_lid_switch_sx); else @@ -178,4 +181,3 @@ return_VOID; } - ==== //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.32 2003/09/26 05:24:55 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.33 2003/10/25 05:03:24 njl Exp $"); #include "opt_acpi.h" #include @@ -727,6 +727,8 @@ break; } + acpi_UserNotify("Thermal", h, notify); + return_VOID; } ==== //depot/projects/smpng/sys/dev/acpica/acpivar.h#30 (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.45 2003/09/10 22:06:41 marcel Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.46 2003/10/25 05:03:24 njl Exp $ */ #include "bus_if.h" @@ -188,6 +188,8 @@ extern ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state); extern ACPI_STATUS acpi_Enable(struct acpi_softc *sc); extern ACPI_STATUS acpi_Disable(struct acpi_softc *sc); +extern void acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, + uint8_t notify); struct acpi_parse_resource_set { void (*set_init)(device_t dev, void **context); ==== //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.56 2003/09/02 17:30:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.57 2003/10/23 13:42:03 des Exp $"); #include @@ -113,7 +113,7 @@ error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, (ahc->flags & AHC_39BIT_ADDRESSING) - ? 0x7FFFFFFFFF + ? 0x7FFFFFFFFFLL : BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.11 2003/09/02 17:30:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.12 2003/10/23 13:42:03 des Exp $"); #include @@ -116,7 +116,7 @@ error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, (ahd->flags & AHD_39BIT_ADDRESSING) - ? 0x7FFFFFFFFF + ? 0x7FFFFFFFFFLL : BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/smpng/sys/dev/drm/ati_pcigart.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/ati_pcigart.h,v 1.2 2003/08/19 02:57:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/ati_pcigart.h,v 1.3 2003/10/24 01:48:16 anholt Exp $ */ #include "dev/drm/drmP.h" @@ -60,7 +60,7 @@ } address = (long)contigmalloc((1 << ATI_PCIGART_TABLE_ORDER) * PAGE_SIZE, - DRM(M_DRM), M_WAITOK, 0ul, 0xfffffffful, PAGE_SIZE, 0); + DRM(M_DRM), M_NOWAIT, 0ul, 0xfffffffful, PAGE_SIZE, 0); if ( !address ) { DRM_ERROR( "cannot allocate PCI GART page!\n" ); goto done; ==== //depot/projects/smpng/sys/dev/drm/drm.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * Acknowledgements: * Dec 1999, Richard Henderson , move to generic cmpxchg. * - * $FreeBSD: src/sys/dev/drm/drm.h,v 1.4 2003/08/19 02:57:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm.h,v 1.5 2003/10/24 01:48:16 anholt Exp $ */ #ifndef _DRM_H_ @@ -46,7 +46,7 @@ #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -#if defined(__FreeBSD__) && defined(XFree86Server) +#if defined(__FreeBSD__) && defined(IN_MODULE) /* Prevent name collision when including sys/ioccom.h */ #undef ioctl #include @@ -79,10 +79,6 @@ #define DRM_DEV_GID 0 #endif -#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0) -#define DRM_MAJOR 226 -#define DRM_MAX_MINOR 15 -#endif #define DRM_NAME "drm" /* Name in kernel, /dev, and /proc */ #define DRM_MIN_ORDER 5 /* At least 2^5 bytes = 32 bytes */ #define DRM_MAX_ORDER 22 /* Up to 2^22 bytes = 4MB */ @@ -409,6 +405,13 @@ unsigned long handle; /* Used for mapping / unmapping */ } drm_scatter_gather_t; +typedef struct drm_set_version { + int drm_di_major; + int drm_di_minor; + int drm_dd_major; + int drm_dd_minor; +} drm_set_version_t; + #define DRM_IOCTL_BASE 'd' #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) #define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type) @@ -422,6 +425,7 @@ #define DRM_IOCTL_GET_MAP DRM_IOWR(0x04, drm_map_t) #define DRM_IOCTL_GET_CLIENT DRM_IOWR(0x05, drm_client_t) #define DRM_IOCTL_GET_STATS DRM_IOR( 0x06, drm_stats_t) +#define DRM_IOCTL_SET_VERSION DRM_IOWR(0x07, drm_set_version_t) #define DRM_IOCTL_SET_UNIQUE DRM_IOW( 0x10, drm_unique_t) #define DRM_IOCTL_AUTH_MAGIC DRM_IOW( 0x11, drm_auth_t) ==== //depot/projects/smpng/sys/dev/drm/drmP.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.6 2003/09/09 00:24:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.7 2003/10/24 01:48:16 anholt Exp $ */ #ifndef _DRM_P_H_ @@ -50,8 +50,8 @@ #ifndef __HAVE_DMA #define __HAVE_DMA 0 #endif -#ifndef __HAVE_DMA_IRQ -#define __HAVE_DMA_IRQ 0 +#ifndef __HAVE_IRQ +#define __HAVE_IRQ 0 #endif #define DRM_DEBUG_CODE 0 /* Include debugging code (if > 1, then @@ -119,15 +119,19 @@ #define DRM_MIN(a,b) ((a)<(b)?(a):(b)) #define DRM_MAX(a,b) ((a)>(b)?(a):(b)) -#define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1)) -#define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x)) -#define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist) - #define DRM_GET_PRIV_SAREA(_dev, _ctx, _map) do { \ (_map) = (_dev)->context_sareas[_ctx]; \ } while(0) +typedef struct drm_pci_id_list +{ + int vendor; + int device; + long driver_private; + char *name; +} drm_pci_id_list_t; + typedef struct drm_ioctl_desc { int (*func)(DRM_IOCTL_ARGS); int auth_needed; @@ -170,17 +174,6 @@ void *dev_private; /* Per-buffer private storage */ } drm_buf_t; - /* bufs is one longer than it has to be */ -typedef struct drm_waitlist { - int count; /* Number of possible buffers */ - drm_buf_t **bufs; /* List of pointers to buffers */ - drm_buf_t **rp; /* Read pointer */ - drm_buf_t **wp; /* Write pointer */ - drm_buf_t **end; /* End pointer */ - DRM_SPINTYPE read_lock; - DRM_SPINTYPE write_lock; -} drm_waitlist_t; - typedef struct drm_freelist { int initialized; /* Freelist in use */ atomic_t count; /* Number of free buffers */ @@ -188,7 +181,6 @@ int low_mark; /* Low water mark */ int high_mark; /* High water mark */ - DRM_SPINTYPE lock; } drm_freelist_t; typedef struct drm_buf_entry { @@ -224,10 +216,17 @@ typedef struct drm_lock_data { drm_hw_lock_t *hw_lock; /* Hardware lock */ DRMFILE filp; /* Unique identifier of holding process (NULL is kernel)*/ - wait_queue_head_t lock_queue; /* Queue of blocked processes */ + int lock_queue; /* Queue of blocked processes */ unsigned long lock_time; /* Time of last lock in jiffies */ } drm_lock_data_t; +/* This structure, in the drm_device_t, is always initialized while the device + * is open. dev->dma_lock protects the incrementing of dev->buf_use, which + * when set marks that no further bufs may be allocated until device teardown >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 27 15:01:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4546616A4C0; Mon, 27 Oct 2003 15:01:10 -0800 (PST) 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 0081716A4B3 for ; Mon, 27 Oct 2003 15:01:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C21343FEA for ; Mon, 27 Oct 2003 15:01:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9RN16XJ027792 for ; Mon, 27 Oct 2003 15:01:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9RN0nVJ027767 for perforce@freebsd.org; Mon, 27 Oct 2003 15:00:49 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Mon, 27 Oct 2003 15:00:49 -0800 (PST) Message-Id: <200310272300.h9RN0nVJ027767@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 40654 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: Mon, 27 Oct 2003 23:01:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=40654 Change 40654 by marcel@marcel_nfs on 2003/10/27 14:59:59 IFC @40644 Affected files ... .. //depot/projects/tty/Makefile#6 integrate .. //depot/projects/tty/Makefile.inc1#9 integrate .. //depot/projects/tty/UPDATING#7 integrate .. //depot/projects/tty/bin/date/date.c#3 integrate .. //depot/projects/tty/bin/echo/echo.c#3 integrate .. //depot/projects/tty/bin/ls/print.c#4 integrate .. //depot/projects/tty/bin/rcp/rcp.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-common#6 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/tty/contrib/groff/tmac/doc.tmac#5 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_mdoc.man#4 integrate .. //depot/projects/tty/contrib/ngatm/FREEBSD-upgrade#1 branch .. //depot/projects/tty/contrib/ngatm/libngatm/sscfucust.h#1 branch .. //depot/projects/tty/contrib/ngatm/libngatm/sscopcust.h#1 branch .. //depot/projects/tty/contrib/ngatm/libngatm/unimsg.c#1 branch .. //depot/projects/tty/contrib/ngatm/man/unimsg.3#1 branch .. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#5 integrate .. //depot/projects/tty/contrib/sendmail/LICENSE#2 integrate .. //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#5 integrate .. //depot/projects/tty/contrib/sendmail/cf/README#5 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#5 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/submit.mc#3 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/cfhead.m4#4 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/proto.m4#4 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#5 integrate .. //depot/projects/tty/contrib/sendmail/contrib/domainmap.m4#2 integrate .. //depot/projects/tty/contrib/sendmail/contrib/doublebounce.pl#3 integrate .. //depot/projects/tty/contrib/sendmail/contrib/expn.pl#2 integrate .. //depot/projects/tty/contrib/sendmail/doc/op/op.me#5 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/conf.h#4 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/errstring.h#2 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/io.h#2 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/os/sm_os_aix.h#2 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/shm.h#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/README#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/sample.html#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_register.html#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_setconn.html#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_setreply.html#4 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/engine.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/libmilter.h#4 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/listener.c#4 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/signal.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/clock.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/errstring.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/flags.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/shm.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/smstdio.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/stdio.c#4 integrate .. //depot/projects/tty/contrib/sendmail/libsm/vasprintf.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsmdb/smdb2.c#4 integrate .. //depot/projects/tty/contrib/sendmail/mail.local/mail.local.c#5 integrate .. //depot/projects/tty/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/tty/contrib/sendmail/smrsh/smrsh.8#2 integrate .. //depot/projects/tty/contrib/sendmail/src/README#5 integrate .. //depot/projects/tty/contrib/sendmail/src/TRACEFLAGS#3 integrate .. //depot/projects/tty/contrib/sendmail/src/alias.c#2 integrate .. //depot/projects/tty/contrib/sendmail/src/bf.c#2 integrate .. //depot/projects/tty/contrib/sendmail/src/collect.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/control.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/daemon.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/deliver.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/domain.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/headers.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/main.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/map.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/mci.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/milter.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/tty/contrib/sendmail/src/parseaddr.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/queue.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/readcf.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/recipient.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/tty/contrib/sendmail/src/sendmail.h#5 integrate .. //depot/projects/tty/contrib/sendmail/src/sfsasl.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/srvrsmtp.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/stab.c#2 integrate .. //depot/projects/tty/contrib/sendmail/src/udb.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/usersmtp.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/util.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/version.c#5 integrate .. //depot/projects/tty/contrib/telnet/telnet/commands.c#2 integrate .. //depot/projects/tty/crypto/heimdal/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/ChangeLog.2002#1 branch .. //depot/projects/tty/crypto/heimdal/FREEBSD-Xlist#1 branch .. //depot/projects/tty/crypto/heimdal/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/NEWS#2 integrate .. //depot/projects/tty/crypto/heimdal/aclocal.m4#2 integrate .. //depot/projects/tty/crypto/heimdal/admin/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/admin/change.c#2 integrate .. //depot/projects/tty/crypto/heimdal/admin/copy.c#2 integrate .. //depot/projects/tty/crypto/heimdal/admin/get.c#2 integrate .. //depot/projects/tty/crypto/heimdal/admin/ktutil.8#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/afsutil/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/afsutil/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/afsutil/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/afsutil/afslog.1#1 branch .. //depot/projects/tty/crypto/heimdal/appl/afsutil/afslog.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/common/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftp/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftp/ftp.1#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftp/ftp.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftp/gssapi.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftp/main.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/ftpd.8#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/ftpd.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/gss_userok.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/ls.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/pathnames.h#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/kf/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/kf/kf.1#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/kf/kfd.8#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/kf/kfd.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/login/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/login/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/login/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/login/login.1#1 branch .. //depot/projects/tty/crypto/heimdal/appl/login/login.access.5#1 branch .. //depot/projects/tty/crypto/heimdal/appl/login/login.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/push/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/push/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/push/pfrom.1#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/push/push.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rcp/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rcp/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rcp/rcp.1#1 branch .. //depot/projects/tty/crypto/heimdal/appl/rcp/rcp.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rsh/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rsh/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rsh/rsh.1#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rsh/rsh.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rsh/rsh_locl.h#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rsh/rshd.8#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/rsh/rshd.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/su/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/su/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/telnet/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/telnetd/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/test/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/cf/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/cf/Makefile.am.common#2 integrate .. //depot/projects/tty/crypto/heimdal/cf/check-compile-et.m4#2 integrate .. //depot/projects/tty/crypto/heimdal/cf/check-var.m4#2 integrate .. //depot/projects/tty/crypto/heimdal/cf/crypto.m4#2 integrate .. //depot/projects/tty/crypto/heimdal/cf/make-proto.pl#2 integrate .. //depot/projects/tty/crypto/heimdal/cf/roken-frag.m4#2 integrate .. //depot/projects/tty/crypto/heimdal/cf/sunos.m4#2 integrate .. //depot/projects/tty/crypto/heimdal/configure#2 integrate .. //depot/projects/tty/crypto/heimdal/configure.in#2 integrate .. //depot/projects/tty/crypto/heimdal/doc/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/doc/ack.texi#2 integrate .. //depot/projects/tty/crypto/heimdal/doc/intro.texi#2 integrate .. //depot/projects/tty/crypto/heimdal/doc/misc.texi#2 integrate .. //depot/projects/tty/crypto/heimdal/doc/programming.texi#2 integrate .. //depot/projects/tty/crypto/heimdal/doc/setup.texi#2 integrate .. //depot/projects/tty/crypto/heimdal/include/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/include/kadm5/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/include/make_crypto.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/ank.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/init.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/kadm_conn.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/kadmin.8#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/kadmin.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/kadmind.8#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/kadmind.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/mod.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/server.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/util.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/version4.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/524.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/config.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/connect.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/hprop.8#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/hpropd.8#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/hpropd.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/kaserver.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/kdc.8#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/kdc_locl.h#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/kerberos4.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/kerberos5.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/string2key.8#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/string2key.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kdc/v4_dump.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kpasswd/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/kpasswd/kpasswd.1#2 integrate .. //depot/projects/tty/crypto/heimdal/kpasswd/kpasswdd.8#2 integrate .. //depot/projects/tty/crypto/heimdal/kpasswd/kpasswdd.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/kdestroy.1#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/kdestroy.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/kgetcred.1#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/kinit.1#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/kinit.c#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/klist.1#2 integrate .. //depot/projects/tty/crypto/heimdal/kuser/klist.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/45/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/check-common.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/asn1/check-common.h#1 branch .. //depot/projects/tty/crypto/heimdal/lib/asn1/check-der.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/check-gen.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/asn1/der_copy.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/der_put.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/gen.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/k5.asn1#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/pam/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/sia/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/sia/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/com_err/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/8003.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/accept_sec_context.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/acquire_cred.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/add_cred.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/add_oid_set_member.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/compare_name.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/compat.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/context_time.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/copy_ccache.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/create_emtpy_oid_set.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/delete_sec_context.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/display_name.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/display_status.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/duplicate_name.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/export_name.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/export_sec_context.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/get_mic.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/gss_acquire_cred.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/gssapi.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/gssapi.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/gssapi_locl.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/import_name.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/import_sec_context.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/indicate_mechs.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/init_sec_context.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/inquire_context.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/inquire_cred.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/inquire_cred_by_mech.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/inquire_mechs_for_name.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/inquire_names_for_mech.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/process_context_token.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/release_buffer.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/release_cred.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/release_name.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/release_oid_set.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/test_acquire_cred.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/gssapi/test_oid_set_member.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/unwrap.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/verify_mic.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/wrap.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/hdb/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/hdb/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/hdb/common.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/hdb/mkey.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/dump_log.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/init_c.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/ipropd_master.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/ipropd_slave.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/log.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/send_recv.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/afskrb.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/afskrb5.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/afssys.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/afssysdefs.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/common.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/dlfcn.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/kafs.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/kafs.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/kafs_locl.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/addr_families.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/aes-test.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/aname_to_localname.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/cache.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/changepw.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/context.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/convert_creds.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/crypto.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/data.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/get_addrs.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/get_in_tkt.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/init_creds_pw.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/kerberos.8#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/keytab.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/keytab_any.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/keytab_file.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/keytab_keyfile.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5-private.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5-protos.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5-v4compat.h#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5.conf.5#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_425_conv_principal.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_address.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_aname_to_localname.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_appdefault.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_auth_context.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_build_principal.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_ccache.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_config.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_context.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_create_checksum.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_crypto_init.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_data.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_encrypt.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_free_addresses.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_free_principal.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_get_all_client_addrs.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_get_krbhst.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_init_context.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_keytab.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_krbhst_init.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_kuserok.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_openlog.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_parse_name.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_principal_get_realm.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_set_default_realm.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_sname_to_principal.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_timeofday.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_unparse_name.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_verify_user.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_warn.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krbhst.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/kuserok.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/mk_rep.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/name-45-test.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/principal.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/prompter_posix.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/store_emem.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/test_alname.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/test_cc.c#1 branch .. //depot/projects/tty/crypto/heimdal/lib/krb5/transited.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/verify_krb5_conf.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/warn.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/Makefile.am#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/getarg.3#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/getcap.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/parse_bytes.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/parse_time.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/parse_units.h#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/resolve.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/roken.awk#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/snprintf.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/socket.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/strcasecmp.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/strlwr.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/strncasecmp.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/roken/strupr.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/sl/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/vers/ChangeLog#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/vers/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/vers/make-print-version.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/vers/print_version.c#2 integrate .. //depot/projects/tty/crypto/heimdal/tools/Makefile.in#2 integrate .. //depot/projects/tty/crypto/heimdal/tools/build.sh#1 branch .. //depot/projects/tty/crypto/heimdal/tools/krb5-config.1#2 integrate .. //depot/projects/tty/crypto/openssh/FREEBSD-tricks#3 integrate .. //depot/projects/tty/crypto/openssh/auth-chall.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth2-pam-freebsd.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh_config#4 integrate .. //depot/projects/tty/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/tty/crypto/openssh/sshd_config#4 integrate .. //depot/projects/tty/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/tty/crypto/openssh/version.h#5 integrate .. //depot/projects/tty/crypto/openssl/CHANGES#4 integrate .. //depot/projects/tty/crypto/openssl/Configure#4 integrate .. //depot/projects/tty/crypto/openssl/FAQ#4 integrate .. //depot/projects/tty/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/crypto/openssl/LICENSE#2 integrate .. //depot/projects/tty/crypto/openssl/Makefile.org#4 integrate .. //depot/projects/tty/crypto/openssl/Makefile.ssl#4 integrate .. //depot/projects/tty/crypto/openssl/NEWS#4 integrate .. //depot/projects/tty/crypto/openssl/PROBLEMS#4 integrate .. //depot/projects/tty/crypto/openssl/README#4 integrate .. //depot/projects/tty/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/tty/crypto/openssl/apps/Makefile.ssl#4 integrate .. //depot/projects/tty/crypto/openssl/apps/apps.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/ca.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/crl.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/der_chop#2 integrate .. //depot/projects/tty/crypto/openssl/apps/engine.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/openssl.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/pkcs8.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/s_apps.h#3 integrate .. //depot/projects/tty/crypto/openssl/apps/s_client.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/s_server.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/smime.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/x509.c#4 integrate .. //depot/projects/tty/crypto/openssl/bugs/SSLv3#2 integrate .. //depot/projects/tty/crypto/openssl/config#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/aes/aes_ctr.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/a_strnid.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/asn1.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/b_print.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/bf_buff.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/bss_bio.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/Makefile.ssl#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/bn.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/bn_mul.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/bntest.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/exptest.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/cfb_enc.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/destest.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/dh_key.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/dhtest.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_ossl.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_sign.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_vrf.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsatest.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/dso/dso_dlfcn.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/ec/ec_mult.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/engine/engine.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/engine/hw_ubsec.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/err/err.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/err/err.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/bio_b64.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/bio_enc.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/c_all.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/digest.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evp_acnf.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/md2/md2test.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/md5/Makefile.ssl#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/md5/asm/md5-586.pl#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/md5/asm/md5-sparcv9.S#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/o_time.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/ocsp/ocsp_ht.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/opensslv.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/perlasm/x86ms.pl#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/perlasm/x86nasm.pl#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/perlasm/x86unix.pl#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/pkcs12/p12_npas.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/pkcs7/pkcs7.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/rand_win.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_eay.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_lib.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_sign.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_test.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/threads/mttest.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/threads/solaris.sh#2 delete .. //depot/projects/tty/crypto/openssl/crypto/x509/by_file.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509/x509_trs.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509/x509_vfy.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/v3_conf.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/v3_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/v3_prn.c#3 integrate .. //depot/projects/tty/crypto/openssl/demos/engines/zencod/hw_zencod.h#2 integrate .. //depot/projects/tty/crypto/openssl/doc/HOWTO/certificates.txt#3 integrate .. //depot/projects/tty/crypto/openssl/doc/HOWTO/keys.txt#1 branch .. //depot/projects/tty/crypto/openssl/doc/apps/ca.pod#4 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/ocsp.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/s_client.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/s_server.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/crypto/BIO_f_cipher.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/openssl-shared.txt#1 branch .. //depot/projects/tty/crypto/openssl/doc/ssl/SSL_CTX_free.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/ssl/SSL_accept.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/ssl/SSL_connect.pod#2 integrate .. //depot/projects/tty/crypto/openssl/e_os.h#3 integrate .. //depot/projects/tty/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/tty/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/tty/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_lib.c#4 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_rsa.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_sess.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssltest.c#4 integrate .. //depot/projects/tty/crypto/openssl/test/Makefile.ssl#4 integrate .. //depot/projects/tty/crypto/openssl/test/evptests.txt#1 branch .. //depot/projects/tty/crypto/openssl/tools/c_rehash#3 integrate .. //depot/projects/tty/crypto/openssl/util/extract-names.pl#2 integrate .. //depot/projects/tty/crypto/openssl/util/libeay.num#4 integrate .. //depot/projects/tty/crypto/openssl/util/mk1mf.pl#4 integrate .. //depot/projects/tty/crypto/openssl/util/mkdef.pl#4 integrate .. //depot/projects/tty/crypto/openssl/util/mkerr.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/pl/Mingw32.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/pl/Mingw32f.pl#2 delete .. //depot/projects/tty/crypto/openssl/util/point.sh#3 integrate .. //depot/projects/tty/etc/Makefile#7 integrate .. //depot/projects/tty/etc/bluetooth/Makefile#1 branch .. //depot/projects/tty/etc/bluetooth/hcsecd.conf#1 branch .. //depot/projects/tty/etc/bluetooth/hosts#1 branch .. //depot/projects/tty/etc/bluetooth/protocols#1 branch .. //depot/projects/tty/etc/defaults/devfs.rules#2 integrate .. //depot/projects/tty/etc/defaults/pccard.conf#6 integrate .. //depot/projects/tty/etc/defaults/periodic.conf#3 integrate .. //depot/projects/tty/etc/defaults/rc.conf#7 integrate .. //depot/projects/tty/etc/devd.conf#7 integrate .. //depot/projects/tty/etc/etc.alpha/ttys#2 integrate .. //depot/projects/tty/etc/etc.amd64/ttys#2 integrate .. //depot/projects/tty/etc/etc.i386/ttys#2 integrate .. //depot/projects/tty/etc/etc.ia64/ttys#3 integrate .. //depot/projects/tty/etc/etc.sparc64/ttys#4 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/tty/etc/mtree/BSD.root.dist#5 integrate .. //depot/projects/tty/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/tty/etc/netstart#3 integrate .. //depot/projects/tty/etc/periodic/daily/405.status-ata-raid#1 branch .. //depot/projects/tty/etc/periodic/daily/Makefile#3 integrate .. //depot/projects/tty/etc/rc.d/atm3#2 integrate .. //depot/projects/tty/etc/rc.d/diskless#3 integrate .. //depot/projects/tty/etc/rc.d/initdiskless#4 integrate .. //depot/projects/tty/etc/rc.d/ipfilter#5 integrate .. //depot/projects/tty/etc/rc.d/ipnat#3 integrate .. //depot/projects/tty/etc/rc.d/jail#4 integrate .. //depot/projects/tty/etc/rc.d/motd#4 integrate .. //depot/projects/tty/etc/rc.sendmail#3 integrate .. //depot/projects/tty/etc/remote#3 integrate .. //depot/projects/tty/etc/sendmail/Makefile#3 integrate .. //depot/projects/tty/etc/sendmail/freebsd.submit.mc#1 branch .. //depot/projects/tty/etc/services#5 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes2#5 integrate .. //depot/projects/tty/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/fr.ISO8859-1#3 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/ru.KOI8-R#3 integrate .. //depot/projects/tty/gnu/usr.bin/gzip/getopt.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/man/manpath/manpath.config#4 integrate .. //depot/projects/tty/gnu/usr.bin/patch/backupfile.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/rcs/lib/conf.h#2 integrate .. //depot/projects/tty/include/netdb.h#2 integrate .. //depot/projects/tty/include/rpcsvc/ypclnt.h#2 integrate .. //depot/projects/tty/kerberos5/include/Makefile#2 integrate .. //depot/projects/tty/kerberos5/include/config.h#3 integrate .. //depot/projects/tty/kerberos5/include/krb5-private.h#2 integrate .. //depot/projects/tty/kerberos5/include/version.h#3 integrate .. //depot/projects/tty/kerberos5/lib/Makefile#4 integrate .. //depot/projects/tty/kerberos5/lib/Makefile.inc#2 integrate .. //depot/projects/tty/kerberos5/lib/libgssapi/Makefile#3 integrate .. //depot/projects/tty/kerberos5/lib/libhdb/Makefile#4 integrate .. //depot/projects/tty/kerberos5/lib/libkadm5clnt/Makefile#3 integrate .. //depot/projects/tty/kerberos5/lib/libkafs5/Makefile#3 branch .. //depot/projects/tty/kerberos5/lib/libkrb5/Makefile#4 integrate .. //depot/projects/tty/kerberos5/libexec/kdc/Makefile#4 integrate .. //depot/projects/tty/kerberos5/usr.bin/Makefile#4 integrate .. //depot/projects/tty/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/tty/kerberos5/usr.bin/kinit/Makefile#3 integrate .. //depot/projects/tty/kerberos5/usr.bin/klist/Makefile#3 integrate .. //depot/projects/tty/kerberos5/usr.bin/krb5-config/Makefile#3 integrate .. //depot/projects/tty/kerberos5/usr.bin/ksu/Makefile#3 integrate .. //depot/projects/tty/kerberos5/usr.bin/verify_krb5_conf/Makefile#1 branch .. //depot/projects/tty/lib/Makefile#10 integrate .. //depot/projects/tty/lib/csu/common/crtbrand.c#3 integrate .. //depot/projects/tty/lib/libalias/Makefile#4 integrate .. //depot/projects/tty/lib/libalias/alias.c#3 integrate .. //depot/projects/tty/lib/libalias/alias.h#3 integrate .. //depot/projects/tty/lib/libalias/alias_db.c#4 integrate .. //depot/projects/tty/lib/libalias/alias_local.h#2 integrate .. //depot/projects/tty/lib/libalias/alias_skinny.c#1 branch .. //depot/projects/tty/lib/libalias/libalias.3#4 integrate .. //depot/projects/tty/lib/libbluetooth/Makefile#1 branch .. //depot/projects/tty/lib/libbluetooth/bluetooth.3#1 branch .. //depot/projects/tty/lib/libbluetooth/bluetooth.c#1 branch .. //depot/projects/tty/lib/libbluetooth/bluetooth.h#1 branch .. //depot/projects/tty/lib/libc/amd64/gen/Makefile.inc#5 integrate .. //depot/projects/tty/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/gen/rfork_thread.S#1 branch .. //depot/projects/tty/lib/libc/amd64/sys/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/amd64/sys/amd64_get_fsbase.c#1 branch .. //depot/projects/tty/lib/libc/amd64/sys/amd64_get_gsbase.c#1 branch .. //depot/projects/tty/lib/libc/amd64/sys/amd64_set_fsbase.c#1 branch .. //depot/projects/tty/lib/libc/amd64/sys/amd64_set_gsbase.c#1 branch .. //depot/projects/tty/lib/libc/ia64/gen/fpgetmask.c#3 integrate .. //depot/projects/tty/lib/libc/ia64/gen/fpsetmask.c#3 integrate .. //depot/projects/tty/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/tty/lib/libc/net/getaddrinfo.c#5 integrate .. //depot/projects/tty/lib/libc/net/getnameinfo.3#3 integrate .. //depot/projects/tty/lib/libc/net/inet6_opt_init.3#1 branch .. //depot/projects/tty/lib/libc/net/inet6_rth_space.3#1 branch .. //depot/projects/tty/lib/libc/net/ip6opt.c#3 integrate .. //depot/projects/tty/lib/libc/net/rthdr.c#2 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/tty/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/tty/lib/libc/string/bcopy.c#2 integrate .. //depot/projects/tty/lib/libc/sys/kill.2#2 integrate .. //depot/projects/tty/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/tty/lib/libc/sys/stat.2#4 integrate .. //depot/projects/tty/lib/libc/sys/write.2#2 integrate .. //depot/projects/tty/lib/libc_r/uthread/uthread_write.c#2 integrate .. //depot/projects/tty/lib/libdevstat/devstat.c#5 integrate .. //depot/projects/tty/lib/libdisk/libdisk.h#4 integrate .. //depot/projects/tty/lib/libfetch/common.c#4 integrate .. //depot/projects/tty/lib/libipsec/ipsec_dump_policy.c#2 integrate .. //depot/projects/tty/lib/libipsec/ipsec_strerror.3#4 integrate .. //depot/projects/tty/lib/libipsec/pfkey_dump.c#3 integrate .. //depot/projects/tty/lib/libipsec/test-policy.c#2 integrate .. //depot/projects/tty/lib/libkiconv/Makefile#1 branch .. //depot/projects/tty/lib/libkiconv/kiconv.3#1 branch .. //depot/projects/tty/lib/libkiconv/quirks.c#1 branch .. //depot/projects/tty/lib/libkiconv/quirks.h#1 branch .. //depot/projects/tty/lib/libkiconv/xlat16_iconv.c#1 branch .. //depot/projects/tty/lib/libkiconv/xlat16_sysctl.c#1 branch .. //depot/projects/tty/lib/libkvm/kvm.h#3 integrate .. //depot/projects/tty/lib/libkvm/kvm_getprocs.3#3 integrate .. //depot/projects/tty/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/tty/lib/libmd/mdX.3#3 integrate .. //depot/projects/tty/lib/libmd/ripemd.3#3 integrate .. //depot/projects/tty/lib/libmd/sha.3#2 integrate .. //depot/projects/tty/lib/libngatm/Makefile#1 branch .. //depot/projects/tty/lib/libpam/modules/pam_self/pam_self.8#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_ssh/pam_ssh.c#3 integrate .. //depot/projects/tty/lib/libpthread/Makefile#5 integrate .. //depot/projects/tty/lib/libpthread/arch/alpha/alpha/context.S#2 integrate .. //depot/projects/tty/lib/libpthread/arch/alpha/include/atomic_ops.h#2 integrate .. //depot/projects/tty/lib/libpthread/arch/alpha/include/pthread_md.h#2 integrate .. //depot/projects/tty/lib/libpthread/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/tty/lib/libpthread/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/tty/lib/libpthread/arch/i386/i386/thr_getcontext.S#3 integrate .. //depot/projects/tty/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/tty/lib/libpthread/arch/ia64/ia64/context.S#2 integrate .. //depot/projects/tty/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/tty/lib/libpthread/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/tty/lib/libpthread/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/tty/lib/libpthread/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/tty/lib/libpthread/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/tty/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/tty/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/tty/lib/libpthread/man/pthread_attr_get_np.3#3 integrate .. //depot/projects/tty/lib/libpthread/man/pthread_mutex_init.3#2 integrate .. //depot/projects/tty/lib/libpthread/sys/lock.c#5 integrate .. //depot/projects/tty/lib/libpthread/test/mutex_d.c#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_cancel.c#7 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_info.c#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_kern.c#7 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_mutex.c#5 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_private.h#7 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sig.c#7 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sigaction.c#5 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sigmask.c#4 integrate .. //depot/projects/tty/lib/librpcsvc/rnusers.c#2 integrate .. //depot/projects/tty/lib/librpcsvc/rstat.c#2 integrate .. //depot/projects/tty/lib/librpcsvc/rwall.c#2 integrate .. //depot/projects/tty/lib/librpcsvc/yp_passwd.c#2 integrate .. //depot/projects/tty/lib/librpcsvc/yp_update.c#2 integrate .. //depot/projects/tty/lib/libsdp/Makefile#1 branch .. //depot/projects/tty/lib/libsdp/sdp-int.h#1 branch .. //depot/projects/tty/lib/libsdp/sdp.3#1 branch .. //depot/projects/tty/lib/libsdp/sdp.h#1 branch .. //depot/projects/tty/lib/libsdp/search.c#1 branch .. //depot/projects/tty/lib/libsdp/session.c#1 branch .. //depot/projects/tty/lib/libsdp/util.c#1 branch .. //depot/projects/tty/lib/libstand/environment.c#2 integrate .. //depot/projects/tty/lib/libstand/stand.h#2 integrate .. //depot/projects/tty/lib/libthr/Makefile#4 integrate .. //depot/projects/tty/lib/libufs/block.c#6 integrate .. //depot/projects/tty/lib/libufs/bread.3#2 integrate .. //depot/projects/tty/lib/libufs/cgread.3#2 integrate .. //depot/projects/tty/lib/libufs/getino.3#2 integrate .. //depot/projects/tty/lib/libufs/libufs.3#2 integrate .. //depot/projects/tty/lib/libufs/sbread.3#2 integrate .. //depot/projects/tty/lib/libufs/ufs_disk_close.3#2 integrate .. //depot/projects/tty/lib/libutil/Makefile#3 integrate .. //depot/projects/tty/lib/libutil/_secure_path.c#2 integrate .. //depot/projects/tty/lib/libutil/fparseln.c#2 integrate .. //depot/projects/tty/lib/libutil/libutil.h#2 integrate .. //depot/projects/tty/lib/libutil/login.c#2 integrate .. //depot/projects/tty/lib/libutil/login_cap.c#3 integrate .. //depot/projects/tty/lib/libutil/login_cap.h#2 integrate .. //depot/projects/tty/lib/libutil/login_class.c#3 integrate .. //depot/projects/tty/lib/libutil/login_ok.c#3 integrate .. //depot/projects/tty/lib/libutil/login_tty.c#3 integrate .. //depot/projects/tty/lib/libutil/logout.c#3 integrate .. //depot/projects/tty/lib/libutil/logwtmp.c#2 integrate .. //depot/projects/tty/lib/libutil/pty.c#3 integrate .. //depot/projects/tty/lib/libutil/pw_util.c#4 integrate .. //depot/projects/tty/lib/libutil/realhostname.c#3 integrate .. //depot/projects/tty/lib/libutil/stub.c#2 integrate .. //depot/projects/tty/lib/libutil/trimdomain.c#2 integrate .. //depot/projects/tty/lib/libutil/uucplock.c#3 integrate .. //depot/projects/tty/lib/msun/Makefile#3 integrate .. //depot/projects/tty/lib/msun/man/fabs.3#2 integrate .. //depot/projects/tty/lib/msun/src/e_scalb.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/tty/lib/msun/src/math.h#7 integrate .. //depot/projects/tty/lib/msun/src/s_fabsl.c#1 branch .. //depot/projects/tty/libexec/ftpd/ftpcmd.y#4 integrate .. //depot/projects/tty/libexec/makekey/makekey.8#2 integrate .. //depot/projects/tty/libexec/talkd/talkd.c#3 integrate .. //depot/projects/tty/libexec/ypxfr/ypxfr_main.c#3 integrate .. //depot/projects/tty/libexec/ypxfr/ypxfrd_getmap.c#3 integrate .. //depot/projects/tty/release/Makefile#9 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/errata/article.sgml#7 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/early-adopter/article.sgml#4 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/errata/article.sgml#6 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#6 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#4 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#7 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml#2 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/tty/release/i386/fixit_crunch.conf#4 integrate .. //depot/projects/tty/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/tty/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/tty/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/tty/release/scripts/doFS.sh#7 integrate .. //depot/projects/tty/release/scripts/print-cdrom-packages.sh#5 integrate .. //depot/projects/tty/rescue/rescue/Makefile#2 integrate .. //depot/projects/tty/sbin/bsdlabel/bsdlabel.c#5 integrate .. //depot/projects/tty/sbin/devd/devd.8#6 integrate .. //depot/projects/tty/sbin/devd/devd.cc#4 integrate .. //depot/projects/tty/sbin/devd/devd.h#3 integrate .. //depot/projects/tty/sbin/devd/devd.hh#2 integrate .. //depot/projects/tty/sbin/devd/parse.y#3 integrate .. //depot/projects/tty/sbin/devd/token.l#3 integrate .. //depot/projects/tty/sbin/dump/optr.c#3 integrate .. //depot/projects/tty/sbin/fdisk/fdisk.8#2 integrate .. //depot/projects/tty/sbin/fsck_ffs/dir.c#3 integrate .. //depot/projects/tty/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/tty/sbin/gbde/Makefile#4 integrate .. //depot/projects/tty/sbin/gbde/gbde.c#5 integrate .. //depot/projects/tty/sbin/gbde/image.uu#1 branch .. //depot/projects/tty/sbin/gbde/test.sh#2 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/projects/tty/sbin/ip6fw/ip6fw.c#4 integrate .. //depot/projects/tty/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/tty/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/tty/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/tty/sbin/mount/Makefile#2 integrate .. //depot/projects/tty/sbin/mount/mount.8#5 integrate .. //depot/projects/tty/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/tty/sbin/mount_cd9660/mount_cd9660.8#2 integrate .. //depot/projects/tty/sbin/mount_cd9660/mount_cd9660.c#2 integrate .. //depot/projects/tty/sbin/mount_msdosfs/Makefile#2 integrate .. //depot/projects/tty/sbin/mount_msdosfs/iso22dos#2 delete .. //depot/projects/tty/sbin/mount_msdosfs/iso72dos#2 delete .. //depot/projects/tty/sbin/mount_msdosfs/koi2dos#2 delete .. //depot/projects/tty/sbin/mount_msdosfs/koi8u2dos#2 delete .. //depot/projects/tty/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/tty/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/tty/sbin/mount_ntfs/Makefile#2 integrate .. //depot/projects/tty/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/tty/sbin/mount_ntfs/mount_ntfs.c#2 integrate .. //depot/projects/tty/sbin/mount_std/mount_std.8#2 integrate .. //depot/projects/tty/sbin/natd/natd.8#4 integrate .. //depot/projects/tty/sbin/natd/natd.c#4 integrate .. //depot/projects/tty/sbin/newfs/newfs.8#6 integrate .. //depot/projects/tty/sbin/nos-tun/nos-tun.c#2 integrate .. //depot/projects/tty/sbin/ping6/Makefile#2 integrate .. //depot/projects/tty/sbin/ping6/ping6.8#2 integrate .. //depot/projects/tty/sbin/ping6/ping6.c#3 integrate .. //depot/projects/tty/sbin/rcorder/rcorder.c#3 integrate .. //depot/projects/tty/sbin/restore/dirs.c#2 integrate .. //depot/projects/tty/sbin/route/route.8#2 integrate .. //depot/projects/tty/sbin/savecore/savecore.c#3 integrate .. //depot/projects/tty/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/tty/sbin/vinum/list.c#5 integrate .. //depot/projects/tty/share/colldef/Makefile#3 integrate .. //depot/projects/tty/share/colldef/sl_SI.ISO8859-2.src#1 branch .. //depot/projects/tty/share/doc/IPv6/IMPLEMENTATION#2 integrate .. //depot/projects/tty/share/examples/Makefile#2 integrate .. //depot/projects/tty/share/examples/cvsup/cvs-supfile#5 integrate .. //depot/projects/tty/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/tty/share/examples/cvsup/gnats-supfile#3 integrate .. //depot/projects/tty/share/examples/cvsup/ports-supfile#3 integrate .. //depot/projects/tty/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/tty/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/tty/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/tty/share/examples/drivers/make_device_driver.sh#2 integrate .. //depot/projects/tty/share/examples/etc/make.conf#8 integrate .. //depot/projects/tty/share/examples/netgraph/ngctl#2 integrate .. //depot/projects/tty/share/examples/netgraph/udp.tunnel#2 integrate .. //depot/projects/tty/share/examples/scsi_target/scsi_cmds.c#2 integrate .. //depot/projects/tty/share/examples/scsi_target/scsi_target.8#2 integrate .. //depot/projects/tty/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/tty/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/tty/share/man/man4/Makefile#7 integrate .. //depot/projects/tty/share/man/man4/acpi.4#5 integrate .. //depot/projects/tty/share/man/man4/amr.4#4 integrate .. //depot/projects/tty/share/man/man4/ath.4#2 integrate .. //depot/projects/tty/share/man/man4/bktr.4#3 integrate .. //depot/projects/tty/share/man/man4/bridge.4#2 integrate .. //depot/projects/tty/share/man/man4/dcons.4#1 branch .. //depot/projects/tty/share/man/man4/dcons_crom.4#1 branch .. //depot/projects/tty/share/man/man4/ddb.4#3 integrate .. //depot/projects/tty/share/man/man4/hatm.4#2 integrate .. //depot/projects/tty/share/man/man4/hifn.4#2 integrate .. //depot/projects/tty/share/man/man4/iir.4#5 integrate .. //depot/projects/tty/share/man/man4/inet.4#4 integrate .. //depot/projects/tty/share/man/man4/kld.4#4 integrate .. //depot/projects/tty/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/tty/share/man/man4/man4.i386/ep.4#3 integrate .. //depot/projects/tty/share/man/man4/man4.i386/pae.4#4 integrate .. //depot/projects/tty/share/man/man4/multicast.4#1 branch .. //depot/projects/tty/share/man/man4/ng_bluetooth.4#3 integrate .. //depot/projects/tty/share/man/man4/ng_bt3c.4#4 integrate .. //depot/projects/tty/share/man/man4/ng_btsocket.4#3 integrate .. //depot/projects/tty/share/man/man4/ng_h4.4#3 integrate .. //depot/projects/tty/share/man/man4/ng_hci.4#3 integrate .. //depot/projects/tty/share/man/man4/ng_l2cap.4#4 integrate .. //depot/projects/tty/share/man/man4/ng_sscfu.4#1 branch .. //depot/projects/tty/share/man/man4/ng_sscop.4#1 branch .. //depot/projects/tty/share/man/man4/ng_ubt.4#3 integrate .. //depot/projects/tty/share/man/man4/pim.4#1 branch .. //depot/projects/tty/share/man/man4/re.4#2 integrate .. //depot/projects/tty/share/man/man4/sk.4#2 integrate .. //depot/projects/tty/share/man/man4/uart.4#2 integrate .. //depot/projects/tty/share/man/man4/ubtbcmfw.4#2 integrate .. //depot/projects/tty/share/man/man4/ugen.4#3 integrate .. //depot/projects/tty/share/man/man4/ulpt.4#2 integrate .. //depot/projects/tty/share/man/man4/umass.4#6 integrate .. //depot/projects/tty/share/man/man4/utopia.4#2 integrate .. //depot/projects/tty/share/man/man4/vpo.4#2 integrate .. //depot/projects/tty/share/man/man4/wi.4#8 integrate .. //depot/projects/tty/share/man/man4/wlan.4#3 integrate .. //depot/projects/tty/share/man/man4/xl.4#4 integrate .. //depot/projects/tty/share/man/man5/Makefile#5 integrate .. //depot/projects/tty/share/man/man5/bluetooth.hosts.5#1 branch .. //depot/projects/tty/share/man/man5/bluetooth.protocols.5#1 branch .. //depot/projects/tty/share/man/man5/device.hints.5#3 integrate .. //depot/projects/tty/share/man/man5/elf.5#3 integrate .. //depot/projects/tty/share/man/man5/make.conf.5#8 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/tty/share/man/man5/remote.5#2 integrate .. //depot/projects/tty/share/man/man7/release.7#7 integrate .. //depot/projects/tty/share/man/man9/BUS_CONFIG_INTR.9#1 branch .. //depot/projects/tty/share/man/man9/BUS_PRINT_CHILD.9#2 integrate .. //depot/projects/tty/share/man/man9/BUS_READ_IVAR.9#2 integrate .. //depot/projects/tty/share/man/man9/BUS_SETUP_INTR.9#5 integrate .. //depot/projects/tty/share/man/man9/DELAY.9#2 integrate .. //depot/projects/tty/share/man/man9/DEVICE_DETACH.9#2 integrate .. //depot/projects/tty/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/tty/share/man/man9/MD5.9#2 integrate .. //depot/projects/tty/share/man/man9/Makefile#5 integrate .. //depot/projects/tty/share/man/man9/VFS.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_CHECKEXP.9#3 integrate .. //depot/projects/tty/share/man/man9/VFS_FHTOVP.9#3 integrate .. //depot/projects/tty/share/man/man9/VFS_INIT.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_MOUNT.9#3 integrate .. //depot/projects/tty/share/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/tty/share/man/man9/VFS_ROOT.9#3 integrate .. //depot/projects/tty/share/man/man9/VFS_SET.9#4 integrate .. //depot/projects/tty/share/man/man9/VFS_START.9#3 integrate .. //depot/projects/tty/share/man/man9/VFS_STATFS.9#3 integrate .. //depot/projects/tty/share/man/man9/VFS_SYNC.9#3 integrate .. //depot/projects/tty/share/man/man9/VFS_UNMOUNT.9#3 integrate .. //depot/projects/tty/share/man/man9/VFS_VGET.9#4 integrate .. //depot/projects/tty/share/man/man9/VFS_VPTOFH.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_ACLCHECK.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_ADVLOCK.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_CREATE.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_GETACL.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_GETEXTATTR.9#4 integrate .. //depot/projects/tty/share/man/man9/VOP_GETPAGES.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_INACTIVE.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_LEASE.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_LISTEXTATTR.9#2 integrate .. //depot/projects/tty/share/man/man9/VOP_OPENCLOSE.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_RDWR.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_READDIR.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_RENAME.9#3 integrate .. //depot/projects/tty/share/man/man9/VOP_SETACL.9#2 integrate .. //depot/projects/tty/share/man/man9/accept_filter.9#2 integrate .. //depot/projects/tty/share/man/man9/bios.9#2 integrate .. //depot/projects/tty/share/man/man9/boot.9#2 integrate .. //depot/projects/tty/share/man/man9/buf.9#2 integrate .. //depot/projects/tty/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/tty/share/man/man9/bus_generic_attach.9#2 integrate .. //depot/projects/tty/share/man/man9/bus_generic_detach.9#2 integrate .. //depot/projects/tty/share/man/man9/bus_generic_shutdown.9#2 integrate .. //depot/projects/tty/share/man/man9/cd.9#3 integrate .. //depot/projects/tty/share/man/man9/copy.9#2 integrate .. //depot/projects/tty/share/man/man9/devclass.9#4 integrate .. //depot/projects/tty/share/man/man9/devclass_add_driver.9#2 integrate .. //depot/projects/tty/share/man/man9/device.9#3 integrate .. //depot/projects/tty/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/tty/share/man/man9/device_delete_child.9#2 integrate .. //depot/projects/tty/share/man/man9/device_enable.9#2 integrate .. //depot/projects/tty/share/man/man9/device_find_child.9#2 integrate .. //depot/projects/tty/share/man/man9/device_get_children.9#2 integrate .. //depot/projects/tty/share/man/man9/device_get_devclass.9#2 integrate .. //depot/projects/tty/share/man/man9/device_get_driver.9#2 integrate .. //depot/projects/tty/share/man/man9/device_get_ivars.9#4 integrate .. //depot/projects/tty/share/man/man9/device_get_name.9#3 integrate .. //depot/projects/tty/share/man/man9/device_get_parent.9#3 integrate .. //depot/projects/tty/share/man/man9/device_get_softc.9#4 integrate .. //depot/projects/tty/share/man/man9/device_get_state.9#3 integrate .. //depot/projects/tty/share/man/man9/device_get_unit.9#2 integrate .. //depot/projects/tty/share/man/man9/device_ids.9#2 integrate .. //depot/projects/tty/share/man/man9/device_probe_and_attach.9#2 integrate .. //depot/projects/tty/share/man/man9/device_quiet.9#2 integrate .. //depot/projects/tty/share/man/man9/device_set_desc.9#2 integrate .. //depot/projects/tty/share/man/man9/device_set_driver.9#3 integrate .. //depot/projects/tty/share/man/man9/device_set_flags.9#2 integrate .. //depot/projects/tty/share/man/man9/devstat.9#3 integrate .. //depot/projects/tty/share/man/man9/devtoname.9#2 integrate .. //depot/projects/tty/share/man/man9/disk.9#1 branch .. //depot/projects/tty/share/man/man9/driver.9#2 integrate .. //depot/projects/tty/share/man/man9/extattr.9#3 integrate .. //depot/projects/tty/share/man/man9/inittodr.9#2 integrate .. //depot/projects/tty/share/man/man9/make_dev.9#4 integrate .. //depot/projects/tty/share/man/man9/panic.9#2 integrate .. //depot/projects/tty/share/man/man9/pfil.9#3 integrate .. //depot/projects/tty/share/man/man9/pmap.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_activate.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_addr_hint.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_change_wiring.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_clear_modify.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_copy.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_enter.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_extract.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_growkernel.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_init.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_is_modified.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_is_prefaultable.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_map.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_mincore.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_object_init_pt.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_page_exists_quick.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_page_protect.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_pinit.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_qenter.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_release.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_remove.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_resident_count.9#1 branch .. //depot/projects/tty/share/man/man9/pmap_zero_page.9#1 branch .. //depot/projects/tty/share/man/man9/random.9#2 integrate .. //depot/projects/tty/share/man/man9/resettodr.9#2 integrate .. //depot/projects/tty/share/man/man9/rijndael.9#2 integrate .. //depot/projects/tty/share/man/man9/rtalloc.9#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 28 06:31:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 258B316A4D0; Tue, 28 Oct 2003 06:31:57 -0800 (PST) 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 D695216A4CE for ; Tue, 28 Oct 2003 06:31:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 473B743FA3 for ; Tue, 28 Oct 2003 06:31:56 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9SEVuXJ002007 for ; Tue, 28 Oct 2003 06:31:56 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9SEVtjE002004 for perforce@freebsd.org; Tue, 28 Oct 2003 06:31:55 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 28 Oct 2003 06:31:55 -0800 (PST) Message-Id: <200310281431.h9SEVtjE002004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 40671 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, 28 Oct 2003 14:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=40671 Change 40671 by cvance@cvance_osx_laptop on 2003/10/28 06:31:33 Minor updates, move some entry points out of the ifdef 0 block Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/mac_test/mac_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/mac_test/mac_test.c#2 (text+ko) ==== @@ -2272,18 +2272,25 @@ .mpo_check_proc_signal = mac_test_check_proc_signal, .mpo_check_proc_wait = mac_test_check_proc_wait, + .mpo_check_vnode_access = mac_test_check_vnode_access, .mpo_check_vnode_chdir = mac_test_check_vnode_chdir, .mpo_check_vnode_chroot = mac_test_check_vnode_chroot, + .mpo_check_vnode_create = mac_test_check_vnode_create, + .mpo_check_vnode_delete = mac_test_check_vnode_delete, .mpo_check_vnode_link = mac_test_check_vnode_link, - .mpo_check_vnode_revoke = mac_test_check_vnode_revoke, .mpo_check_vnode_lookup = mac_test_check_vnode_lookup, - .mpo_check_vnode_setutimes = mac_test_check_vnode_setutimes, - .mpo_check_vnode_setflags = mac_test_check_vnode_setflags, + .mpo_check_vnode_open = mac_test_check_vnode_open, + .mpo_check_vnode_read = mac_test_check_vnode_read, .mpo_check_vnode_readdir = mac_test_check_vnode_readdir, .mpo_check_vnode_readlink = mac_test_check_vnode_readlink, + .mpo_check_vnode_revoke = mac_test_check_vnode_revoke, + .mpo_check_vnode_setflags = mac_test_check_vnode_setflags, + .mpo_check_vnode_setmode = mac_test_check_vnode_setmode, .mpo_check_vnode_setowner = mac_test_check_vnode_setowner, - + .mpo_check_vnode_setutimes = mac_test_check_vnode_setutimes, + .mpo_check_vnode_stat = mac_test_check_vnode_stat, + .mpo_check_vnode_write = mac_test_check_vnode_write, #if 0 .mpo_syscall = mac_test_syscall, @@ -2433,8 +2440,6 @@ .mpo_check_system_swapon = mac_test_check_system_swapon, .mpo_check_system_swapoff = mac_test_check_system_swapoff, .mpo_check_system_sysctl = mac_test_check_system_sysctl, - .mpo_check_vnode_create = mac_test_check_vnode_create, - .mpo_check_vnode_delete = mac_test_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_test_check_vnode_deleteacl, .mpo_check_vnode_deleteextattr = mac_test_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_test_check_vnode_exec, @@ -2443,17 +2448,12 @@ .mpo_check_vnode_listextattr = mac_test_check_vnode_listextattr, .mpo_check_vnode_mmap = mac_test_check_vnode_mmap, .mpo_check_vnode_mprotect = mac_test_check_vnode_mprotect, - .mpo_check_vnode_open = mac_test_check_vnode_open, .mpo_check_vnode_poll = mac_test_check_vnode_poll, - .mpo_check_vnode_read = mac_test_check_vnode_read, .mpo_check_vnode_relabel = mac_test_check_vnode_relabel, .mpo_check_vnode_rename_from = mac_test_check_vnode_rename_from, .mpo_check_vnode_rename_to = mac_test_check_vnode_rename_to, .mpo_check_vnode_setacl = mac_test_check_vnode_setacl, .mpo_check_vnode_setextattr = mac_test_check_vnode_setextattr, - .mpo_check_vnode_setmode = mac_test_check_vnode_setmode, - .mpo_check_vnode_stat = mac_test_check_vnode_stat, - .mpo_check_vnode_write = mac_test_check_vnode_write, #endif /* 0 */ }; @@ -2467,6 +2467,6 @@ "MAC Test Module", /* full name */ &mac_test_ops, /* policy operations */ 0, /* loadtime flags*/ - 0, /* security field */ + &test_slot, /* security field */ 0 /* runtime flags */ }; From owner-p4-projects@FreeBSD.ORG Tue Oct 28 08:56:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D8E916A4D0; Tue, 28 Oct 2003 08:56:59 -0800 (PST) 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 DBE1416A4CE for ; Tue, 28 Oct 2003 08:56:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 644EB43FDF for ; Tue, 28 Oct 2003 08:56:58 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9SGuwXJ017185 for ; Tue, 28 Oct 2003 08:56:58 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9SGuv0u017182 for perforce@freebsd.org; Tue, 28 Oct 2003 08:56:57 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Tue, 28 Oct 2003 08:56:57 -0800 (PST) Message-Id: <200310281656.h9SGuv0u017182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 40679 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, 28 Oct 2003 16:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=40679 Change 40679 by areisse@areisse_ibook on 2003/10/28 08:56:28 you don't need to free nameidata on darwin Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#22 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#22 (text+ko) ==== @@ -1793,7 +1793,7 @@ int error; static int count = 0; - if (++count < 100) + if (++count < 10) printf("MAC:mac_check_vnode_lookup\n"); ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_lookup"); @@ -3779,8 +3779,6 @@ mac.m_buflen, M_WAITOK); vput (nd.ni_vp); - FREE_ZONE(nd.ni_cnd.cn_pnbuf, nd.ni_cnd.cn_pnlen, M_NAMEI); - mac_destroy_vnode_label(&intlabel); if (error == 0) From owner-p4-projects@FreeBSD.ORG Tue Oct 28 09:01:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3412916A4E6; Tue, 28 Oct 2003 09:01:09 -0800 (PST) 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 C6AFC16A4DB for ; Tue, 28 Oct 2003 09:01:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C45A4404B for ; Tue, 28 Oct 2003 09:01:04 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9SH14XJ017504 for ; Tue, 28 Oct 2003 09:01:04 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9SH13l4017500 for perforce@freebsd.org; Tue, 28 Oct 2003 09:01:03 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 28 Oct 2003 09:01:03 -0800 (PST) Message-Id: <200310281701.h9SH13l4017500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 40680 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, 28 Oct 2003 17:01:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=40680 Change 40680 by cvance@cvance_g4 on 2003/10/28 09:00:59 Bug Fix. Mac labels are initialized in crget, but the newly allocated labels will get over-writen by a normal struct copy. Only copy some of the fields from the ucred. This code is a bit odd, but this is how FreeBSD 5.1 does it. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_prot.c#5 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/ucred.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_prot.c#5 (text+ko) ==== @@ -702,12 +702,16 @@ if (cr->cr_ref == 1) return (cr); newcr = crget(); +#ifdef MAC + bcopy(&cr->cr_startcopy, &newcr->cr_startcopy, + (unsigned)((caddr_t)&cr->cr_endcopy - + (caddr_t)&cr->cr_startcopy)); + mac_create_cred(cr, newcr); +#else *newcr = *cr; +#endif crfree(cr); newcr->cr_ref = 1; -#ifdef MAC - mac_create_cred(cr, newcr); -#endif return (newcr); } @@ -725,11 +729,15 @@ panic("crdup"); #endif newcr = crget(); - *newcr = *cr; - newcr->cr_ref = 1; #ifdef MAC + bcopy(&cr->cr_startcopy, &newcr->cr_startcopy, + (unsigned)((caddr_t)&cr->cr_endcopy - + (caddr_t)&cr->cr_startcopy)); mac_create_cred(cr, newcr); +#else + *newcr = *cr; #endif + newcr->cr_ref = 1; return (newcr); } ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/ucred.h#3 (text+ko) ==== @@ -68,9 +68,11 @@ */ struct ucred { u_long cr_ref; /* reference count */ +#define cr_startcopy cr_uid uid_t cr_uid; /* effective user id */ short cr_ngroups; /* number of groups */ gid_t cr_groups[NGROUPS]; /* groups */ +#define cr_endcopy cr_label struct label cr_label; /* MAC label */ }; #define cr_gid cr_groups[0] From owner-p4-projects@FreeBSD.ORG Tue Oct 28 16:32:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C19116A4D1; Tue, 28 Oct 2003 16:32:43 -0800 (PST) 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 429CA16A4CE for ; Tue, 28 Oct 2003 16:32:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DB3043FE3 for ; Tue, 28 Oct 2003 16:32:41 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9T0WfXJ048824 for ; Tue, 28 Oct 2003 16:32:41 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9T0We94048821 for perforce@freebsd.org; Tue, 28 Oct 2003 16:32:40 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 28 Oct 2003 16:32:40 -0800 (PST) Message-Id: <200310290032.h9T0We94048821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40701 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: Wed, 29 Oct 2003 00:32:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=40701 Change 40701 by sam@sam_ebb on 2003/10/28 16:32:15 checkpoint: multiuser and ping works; tcp locks up; a couple of LOR's to deal with Affected files ... .. //depot/projects/netperf+sockets/sys/kern/sys_socket.c#2 edit .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#2 edit .. //depot/projects/netperf+sockets/sys/kern/uipc_socket2.c#2 edit .. //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#2 edit .. //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#2 edit .. //depot/projects/netperf+sockets/sys/kern/vfs_aio.c#3 edit .. //depot/projects/netperf+sockets/sys/net/raw_usrreq.c#2 edit .. //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#2 edit .. //depot/projects/netperf+sockets/sys/netinet6/in6_proto.c#2 edit .. //depot/projects/netperf+sockets/sys/netinet6/in6_rmx.c#2 edit .. //depot/projects/netperf+sockets/sys/netipx/ipx_pcb.c#2 edit .. //depot/projects/netperf+sockets/sys/netipx/spx_usrreq.c#2 edit .. //depot/projects/netperf+sockets/sys/netnatm/natm.c#2 edit .. //depot/projects/netperf+sockets/sys/netsmb/smb_conn.c#2 edit .. //depot/projects/netperf+sockets/sys/netsmb/smb_trantcp.c#2 edit .. //depot/projects/netperf+sockets/sys/nfsclient/nfs_vfsops.c#2 edit .. //depot/projects/netperf+sockets/sys/nfsserver/nfs_srvcache.c#2 edit .. //depot/projects/netperf+sockets/sys/sys/socketvar.h#2 edit .. //depot/projects/netperf+sockets/sys/sys/unpcb.h#2 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/sys_socket.c#2 (text+ko) ==== @@ -77,19 +77,12 @@ int flags; { struct socket *so = fp->f_data; - int error; - - mtx_lock(&Giant); #ifdef MAC - error = mac_check_socket_receive(active_cred, so); - if (error) { - mtx_unlock(&Giant); + int error = mac_check_socket_receive(active_cred, so); + if (error) return (error); - } #endif - error = so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0); - mtx_unlock(&Giant); - return (error); + return (so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0)); } /* ARGSUSED */ @@ -102,20 +95,13 @@ int flags; { struct socket *so = fp->f_data; - int error; - - mtx_lock(&Giant); #ifdef MAC - error = mac_check_socket_send(active_cred, so); - if (error) { - mtx_unlock(&Giant); + int error = mac_check_socket_send(active_cred, so); + if (error) return (error); - } #endif - error = so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0, - uio->uio_td); - mtx_unlock(&Giant); - return (error); + return (so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0, + uio->uio_td)); } int ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#2 (text+ko) ==== @@ -128,21 +128,14 @@ * soalloc() returns a socket with a ref count of 0. */ struct socket * -soalloc(waitok) - int waitok; +soalloc(int mflags) { struct socket *so; #ifdef MAC int error; #endif - int flag; - if (waitok == 1) - flag = M_WAITOK; - else - flag = M_NOWAIT; - flag |= M_ZERO; - so = uma_zalloc(socket_zone, flag); + so = uma_zalloc(socket_zone, mflags | M_ZERO); if (so) { #ifdef MAC error = mac_init_socket(so, flag); @@ -152,6 +145,8 @@ return so; } #endif + SOCKBUF_LOCK_INIT(&so->so_snd, "so_snd"); + SOCKBUF_LOCK_INIT(&so->so_rcv, "so_rcv"); /* XXX race condition for reentrant kernel */ so->so_gencnt = ++so_gencnt; /* sx_init(&so->so_sxlock, "socket sxlock"); */ @@ -195,7 +190,7 @@ if (prp->pr_type != type) return (EPROTOTYPE); - so = soalloc(1); + so = soalloc(M_WAITOK); if (so == NULL) return (ENOBUFS); @@ -210,6 +205,7 @@ soref(so); error = (*prp->pr_usrreqs->pru_attach)(so, proto, td); if (error) { + SOCK_LOCK(so); so->so_state |= SS_NOFDREF; sorele(so); return (error); @@ -253,6 +249,8 @@ mac_destroy_socket(so); #endif crfree(so->so_cred); + SOCKBUF_LOCK_DESTROY(&so->so_snd); + SOCKBUF_LOCK_DESTROY(&so->so_rcv); /* sx_destroy(&so->so_sxlock); */ uma_zfree(socket_zone, so); --numopensockets; @@ -277,11 +275,13 @@ splx(s); return (error); } + SOCKBUF_LOCK(&so->so_rcv); if (TAILQ_EMPTY(&so->so_comp)) so->so_options |= SO_ACCEPTCONN; if (backlog < 0 || backlog > somaxconn) backlog = somaxconn; so->so_qlimit = backlog; + SOCKBUF_UNLOCK(&so->so_rcv); splx(s); return (0); } @@ -290,13 +290,16 @@ sofree(so) struct socket *so; { - struct socket *head = so->so_head; - KASSERT(so->so_count == 0, ("socket %p so_count not 0", so)); - if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) + if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) { + SOCK_UNLOCK(so); return; - if (head != NULL) { + } + SOCK_UNLOCK(so); + SOCKBUF_LOCK(&so->so_rcv); + if (so->so_head != NULL) { + struct socket *head = so->so_head; if (so->so_state & SS_INCOMP) { TAILQ_REMOVE(&head->so_incomp, so, so_list); head->so_incqlen--; @@ -307,6 +310,7 @@ * accept(2) may hang after select(2) indicated * that the listening socket was ready. */ + /* XXX SOCKBUF_UNLOCK(&so->so_rcv); */ return; } else { panic("sofree: not queued"); @@ -314,7 +318,10 @@ so->so_state &= ~SS_INCOMP; so->so_head = NULL; } + SOCKBUF_UNLOCK(&so->so_rcv); + SOCKBUF_LOCK(&so->so_snd); sbrelease(&so->so_snd, so); + SOCKBUF_UNLOCK(&so->so_snd); sorflush(so); sodealloc(so); } @@ -354,11 +361,14 @@ (void) soabort(sp); } } + SOCK_LOCK(so); if (so->so_pcb == 0) goto discard; if (so->so_state & SS_ISCONNECTED) { if ((so->so_state & SS_ISDISCONNECTING) == 0) { + SOCK_UNLOCK(so); error = sodisconnect(so); + SOCK_LOCK(so); if (error) goto drop; } @@ -376,7 +386,10 @@ } drop: if (so->so_pcb) { - int error2 = (*so->so_proto->pr_usrreqs->pru_detach)(so); + int error2; + SOCK_UNLOCK(so); + error2 = (*so->so_proto->pr_usrreqs->pru_detach)(so); + SOCK_LOCK(so); if (error == 0) error = error2; } @@ -411,14 +424,12 @@ struct socket *so; struct sockaddr **nam; { - int s = splnet(); int error; if ((so->so_state & SS_NOFDREF) == 0) panic("soaccept: !NOFDREF"); so->so_state &= ~SS_NOFDREF; error = (*so->so_proto->pr_usrreqs->pru_accept)(so, nam); - splx(s); return (error); } @@ -428,12 +439,10 @@ struct sockaddr *nam; struct thread *td; { - int s; int error; if (so->so_options & SO_ACCEPTCONN) return (EOPNOTSUPP); - s = splnet(); /* * If protocol is connection-based, can only connect once. * Otherwise, if connected, try to disconnect first. @@ -446,7 +455,6 @@ error = EISCONN; else error = (*so->so_proto->pr_usrreqs->pru_connect)(so, nam, td); - splx(s); return (error); } @@ -455,11 +463,9 @@ struct socket *so1; struct socket *so2; { - int s = splnet(); int error; error = (*so1->so_proto->pr_usrreqs->pru_connect2)(so1, so2); - splx(s); return (error); } @@ -467,20 +473,13 @@ sodisconnect(so) struct socket *so; { - int s = splnet(); int error; - if ((so->so_state & SS_ISCONNECTED) == 0) { - error = ENOTCONN; - goto bad; - } - if (so->so_state & SS_ISDISCONNECTING) { - error = EALREADY; - goto bad; - } + if ((so->so_state & SS_ISCONNECTED) == 0) + return ENOTCONN; + if (so->so_state & SS_ISDISCONNECTING) + return EALREADY; error = (*so->so_proto->pr_usrreqs->pru_disconnect)(so); -bad: - splx(s); return (error); } @@ -565,7 +564,7 @@ clen = control->m_len; #define snderr(errno) { error = (errno); splx(s); goto release; } -restart: + SOCKBUF_LOCK(&so->so_snd); error = sblock(&so->so_snd, SBLOCKWAIT(flags)); if (error) goto out; @@ -605,12 +604,11 @@ (atomic || space < so->so_snd.sb_lowat || space < clen)) { if (so->so_state & SS_NBIO) snderr(EWOULDBLOCK); - sbunlock(&so->so_snd); error = sbwait(&so->so_snd); splx(s); if (error) - goto out; - goto restart; + goto release; + continue; } splx(s); mp = ⊤ @@ -627,10 +625,12 @@ #ifdef ZERO_COPY_SOCKETS cow_send = 0; #endif /* ZERO_COPY_SOCKETS */ + SOCKBUF_UNLOCK(&so->so_snd); if (top == 0) { MGETHDR(m, M_TRYWAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; + SOCKBUF_LOCK(&so->so_snd); /* XXX */ goto release; } mlen = MHLEN; @@ -640,6 +640,7 @@ MGET(m, M_TRYWAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; + SOCKBUF_LOCK(&so->so_snd); /* XXX */ goto release; } mlen = MLEN; @@ -687,6 +688,7 @@ else #endif /* ZERO_COPY_SOCKETS */ error = uiomove(mtod(m, void *), (int)len, uio); + SOCKBUF_LOCK(&so->so_snd); resid = uio->uio_resid; m->m_len = len; *mp = m; @@ -741,6 +743,7 @@ release: sbunlock(&so->so_snd); out: + SOCKBUF_UNLOCK(&so->so_snd); if (top) m_freem(top); if (control) @@ -832,12 +835,13 @@ if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) (*pr->pr_usrreqs->pru_rcvd)(so, 0); -restart: + SOCKBUF_LOCK(&so->so_rcv); error = sblock(&so->so_rcv, SBLOCKWAIT(flags)); if (error) - return (error); + goto out; s = splnet(); +restart: m = so->so_rcv.sb_mb; /* * If we have less data than requested, block awaiting more @@ -855,9 +859,8 @@ (so->so_rcv.sb_cc < so->so_rcv.sb_lowat || ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) && m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0)) { - KASSERT(m != 0 || !so->so_rcv.sb_cc, - ("receive: m == %p so->so_rcv.sb_cc == %u", - m, so->so_rcv.sb_cc)); + KASSERT(!(m == 0 && so->so_rcv.sb_cc), + ("m %p so->so_rcv.sb_cc %u", m, so->so_rcv.sb_cc)); if (so->so_error) { if (m) goto dontblock; @@ -890,11 +893,10 @@ } SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv); - sbunlock(&so->so_rcv); error = sbwait(&so->so_rcv); splx(s); if (error) - return (error); + goto out; goto restart; } dontblock: @@ -908,8 +910,8 @@ ("m->m_type == %d", m->m_type)); orig_resid = 0; if (psa) - *psa = dup_sockaddr(mtod(m, struct sockaddr *), - mp0 == 0); + *psa = sodupsockaddr(mtod(m, struct sockaddr *), + M_NOWAIT); /* XXX */ if (flags & MSG_PEEK) { m = m->m_next; } else { @@ -998,6 +1000,7 @@ SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv); splx(s); + SOCKBUF_UNLOCK(&so->so_rcv); #ifdef ZERO_COPY_SOCKETS if (so_zero_copy_receive) { vm_page_t pg; @@ -1021,6 +1024,7 @@ } else #endif /* ZERO_COPY_SOCKETS */ error = uiomove(mtod(m, char *) + moff, (int)len, uio); + SOCKBUF_LOCK(&so->so_rcv); s = splnet(); if (error) goto release; @@ -1102,9 +1106,8 @@ SBLASTMBUFCHK(&so->so_rcv); error = sbwait(&so->so_rcv); if (error) { - sbunlock(&so->so_rcv); - splx(s); - return (0); + error = 0; + goto release; } m = so->so_rcv.sb_mb; if (m) @@ -1148,6 +1151,8 @@ release: sbunlock(&so->so_rcv); splx(s); +out: + SOCKBUF_UNLOCK(&so->so_rcv); return (error); } @@ -1174,22 +1179,21 @@ { struct sockbuf *sb = &so->so_rcv; struct protosw *pr = so->so_proto; - int s; struct sockbuf asb; + SOCKBUF_LOCK(sb); sb->sb_flags |= SB_NOINTR; (void) sblock(sb, M_WAITOK); - s = splimp(); - socantrcvmore(so); + socantrcvmore_locked(so); sbunlock(sb); asb = *sb; /* - * Invalidate/clear most of the sockbuf structure, but keep - * its selinfo structure valid. + * Invalidate/clear most of the sockbuf structure, but leave + * selinfo and mutex data unchanged. */ bzero(&sb->sb_startzero, sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); - splx(s); + SOCKBUF_UNLOCK(sb); if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose) (*pr->pr_domain->dom_dispose)(asb.sb_mb); @@ -1207,6 +1211,7 @@ struct so_accf *af = so->so_accf; int error = 0; +/* XXX locking */ /* do not set/remove accept filters on non listen sockets */ if ((so->so_options & SO_ACCEPTCONN) == 0) { error = EINVAL; @@ -1794,7 +1799,6 @@ { struct socket *so = kn->kn_fp->f_data; struct sockbuf *sb; - int s; switch (kn->kn_filter) { case EVFILT_READ: @@ -1812,10 +1816,10 @@ return (1); } - s = splnet(); + SOCKBUF_LOCK(sb); SLIST_INSERT_HEAD(&sb->sb_sel.si_note, kn, kn_selnext); sb->sb_flags |= SB_KNOTE; - splx(s); + SOCKBUF_UNLOCK(sb); return (0); } @@ -1823,12 +1827,12 @@ filt_sordetach(struct knote *kn) { struct socket *so = kn->kn_fp->f_data; - int s = splnet(); + SOCKBUF_LOCK(&so->so_rcv); SLIST_REMOVE(&so->so_rcv.sb_sel.si_note, kn, knote, kn_selnext); if (SLIST_EMPTY(&so->so_rcv.sb_sel.si_note)) so->so_rcv.sb_flags &= ~SB_KNOTE; - splx(s); + SOCKBUF_UNLOCK(&so->so_rcv); } /*ARGSUSED*/ @@ -1836,30 +1840,35 @@ filt_soread(struct knote *kn, long hint) { struct socket *so = kn->kn_fp->f_data; + int result; + SOCKBUF_LOCK(&so->so_rcv); /* XXX too conservative? */ kn->kn_data = so->so_rcv.sb_cc - so->so_rcv.sb_ctl; if (so->so_state & SS_CANTRCVMORE) { kn->kn_flags |= EV_EOF; kn->kn_fflags = so->so_error; - return (1); + result = 1; + } else if (so->so_error) { /* temporary udp error */ + result = 1; + } else if (kn->kn_sfflags & NOTE_LOWAT) { + result = (kn->kn_data >= kn->kn_sdata); + } else { + result = (so->so_rcv.sb_cc >= so->so_rcv.sb_lowat); } - if (so->so_error) /* temporary udp error */ - return (1); - if (kn->kn_sfflags & NOTE_LOWAT) - return (kn->kn_data >= kn->kn_sdata); - return (so->so_rcv.sb_cc >= so->so_rcv.sb_lowat); + SOCKBUF_UNLOCK(&so->so_rcv); + return (result); } static void filt_sowdetach(struct knote *kn) { struct socket *so = kn->kn_fp->f_data; - int s = splnet(); + SOCKBUF_LOCK(&so->so_snd); SLIST_REMOVE(&so->so_snd.sb_sel.si_note, kn, knote, kn_selnext); if (SLIST_EMPTY(&so->so_snd.sb_sel.si_note)) so->so_snd.sb_flags &= ~SB_KNOTE; - splx(s); + SOCKBUF_UNLOCK(&so->so_snd); } /*ARGSUSED*/ @@ -1867,21 +1876,26 @@ filt_sowrite(struct knote *kn, long hint) { struct socket *so = kn->kn_fp->f_data; + int result; + SOCKBUF_LOCK(&so->so_snd); /* XXX too conservative? */ kn->kn_data = sbspace(&so->so_snd); if (so->so_state & SS_CANTSENDMORE) { kn->kn_flags |= EV_EOF; kn->kn_fflags = so->so_error; - return (1); + result = 1; + } else if (so->so_error) { /* temporary udp error */ + result = 1; + } else if (((so->so_state & SS_ISCONNECTED) == 0) && + (so->so_proto->pr_flags & PR_CONNREQUIRED)) { + result = 0; + } else if (kn->kn_sfflags & NOTE_LOWAT) { + result = (kn->kn_data >= kn->kn_sdata); + } else { + result = (kn->kn_data >= so->so_snd.sb_lowat); } - if (so->so_error) /* temporary udp error */ - return (1); - if (((so->so_state & SS_ISCONNECTED) == 0) && - (so->so_proto->pr_flags & PR_CONNREQUIRED)) - return (0); - if (kn->kn_sfflags & NOTE_LOWAT) - return (kn->kn_data >= kn->kn_sdata); - return (kn->kn_data >= so->so_snd.sb_lowat); + SOCKBUF_UNLOCK(&so->so_snd); + return (result); } /*ARGSUSED*/ ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket2.c#2 (text+ko) ==== @@ -108,9 +108,14 @@ soisconnecting(so) register struct socket *so; { + int need_lock = !SOCK_OWNED(so); + if (need_lock) + SOCK_LOCK(so); so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= SS_ISCONNECTING; + if (need_lock) + SOCK_UNLOCK(so); } void @@ -118,56 +123,79 @@ struct socket *so; { struct socket *head = so->so_head; + int need_lock = !SOCK_OWNED(so); + if (need_lock) + SOCK_LOCK(so); so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING); so->so_state |= SS_ISCONNECTED; if (head && (so->so_state & SS_INCOMP)) { - if ((so->so_options & SO_ACCEPTFILTER) != 0) { + if ((so->so_options & SO_ACCEPTFILTER) == 0) { + if (need_lock) + SOCK_UNLOCK(so); + SOCK_LOCK(head); + TAILQ_REMOVE(&head->so_incomp, so, so_list); + head->so_incqlen--; + so->so_state &= ~SS_INCOMP; + TAILQ_INSERT_TAIL(&head->so_comp, so, so_list); + head->so_qlen++; + so->so_state |= SS_COMP; + sorwakeup_locked(head); + wakeup_one(&head->so_timeo); + SOCK_UNLOCK(head); + } else { +/* XXX locking */ so->so_upcall = head->so_accf->so_accept_filter->accf_callback; so->so_upcallarg = head->so_accf->so_accept_filter_arg; so->so_rcv.sb_flags |= SB_UPCALL; so->so_options &= ~SO_ACCEPTFILTER; so->so_upcall(so, so->so_upcallarg, M_TRYWAIT); - return; } - TAILQ_REMOVE(&head->so_incomp, so, so_list); - head->so_incqlen--; - so->so_state &= ~SS_INCOMP; - TAILQ_INSERT_TAIL(&head->so_comp, so, so_list); - head->so_qlen++; - so->so_state |= SS_COMP; - sorwakeup(head); - wakeup_one(&head->so_timeo); } else { wakeup(&so->so_timeo); + SOCK_UNLOCK(so); sorwakeup(so); sowwakeup(so); } + if (!need_lock) + SOCK_LOCK(so); } void soisdisconnecting(so) register struct socket *so; { + int need_lock = !SOCK_OWNED(so); + if (need_lock) + SOCK_LOCK(so); so->so_state &= ~SS_ISCONNECTING; so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE); wakeup(&so->so_timeo); + SOCK_UNLOCK(so); sowwakeup(so); sorwakeup(so); + if (!need_lock) + SOCK_LOCK(so); } void soisdisconnected(so) register struct socket *so; { + int need_lock = !SOCK_OWNED(so); + if (need_lock) + SOCK_LOCK(so); so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTED); wakeup(&so->so_timeo); + SOCK_UNLOCK(so); sbdrop(&so->so_snd, so->so_snd.sb_cc); sowwakeup(so); sorwakeup(so); + if (!need_lock) + SOCK_LOCK(so); } /* @@ -186,10 +214,14 @@ int connstatus; { register struct socket *so; + int over; - if (head->so_qlen > 3 * head->so_qlimit / 2) + SOCK_LOCK(head); + over = (head->so_qlen > 3 * head->so_qlimit / 2); + SOCK_UNLOCK(head); + if (over) return ((struct socket *)0); - so = soalloc(0); + so = soalloc(M_NOWAIT); if (so == NULL) return ((struct socket *)0); if ((head->so_options & SO_ACCEPTFILTER) != 0) @@ -205,12 +237,13 @@ #ifdef MAC mac_create_socket_from_socket(head, so); #endif + if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) || (*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) { sodealloc(so); return ((struct socket *)0); } - + SOCKBUF_LOCK(&head->so_rcv); if (connstatus) { TAILQ_INSERT_TAIL(&head->so_comp, so, so_list); so->so_state |= SS_COMP; @@ -225,10 +258,11 @@ so->so_state |= SS_INCOMP; head->so_incqlen++; } + SOCKBUF_UNLOCK(&head->so_rcv); if (connstatus) { + so->so_state |= connstatus; sorwakeup(head); wakeup(&head->so_timeo); - so->so_state |= connstatus; } return (so); } @@ -253,6 +287,16 @@ } void +socantsendmore_locked(so) + struct socket *so; +{ + SOCKBUF_LOCK_ASSERT(&so->so_snd); + + so->so_state |= SS_CANTSENDMORE; + sowwakeup(so); +} + +void socantrcvmore(so) struct socket *so; { @@ -261,6 +305,16 @@ sorwakeup(so); } +void +socantrcvmore_locked(so) + struct socket *so; +{ + SOCKBUF_LOCK_ASSERT(&so->so_rcv); + + so->so_state |= SS_CANTRCVMORE; + sorwakeup_locked(so); +} + /* * Wait for data to arrive at/drain from a socket buffer. */ @@ -268,9 +322,10 @@ sbwait(sb) struct sockbuf *sb; { + SOCKBUF_LOCK_ASSERT(sb); sb->sb_flags |= SB_WAIT; - return (tsleep(&sb->sb_cc, + return (msleep(&sb->sb_cc, &sb->sb_mtx, (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, "sbwait", sb->sb_timeo)); } @@ -285,9 +340,11 @@ { int error; + SOCKBUF_LOCK_ASSERT(sb); + while (sb->sb_flags & SB_LOCK) { sb->sb_flags |= SB_WANT; - error = tsleep(&sb->sb_flags, + error = msleep(&sb->sb_flags, &sb->sb_mtx, (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK|PCATCH, "sblock", 0); if (error) @@ -298,29 +355,71 @@ } /* + * The part of sowakeup that must be done while + * holding the sockbuf lock. + */ +static __inline void +sowakeup_under_lock(struct socket *so, struct sockbuf *sb) +{ + SOCKBUF_LOCK_ASSERT(sb); + + selwakeup(&sb->sb_sel); + sb->sb_flags &= ~SB_SEL; + if (sb->sb_flags & SB_WAIT) { + sb->sb_flags &= ~SB_WAIT; + wakeup(&sb->sb_cc); + } +} + +/* * Wakeup processes waiting on a socket buffer. * Do asynchronous notification via SIGIO * if the socket has the SS_ASYNC flag set. + * + * The caller is assumed to hold the necessary + * sockbuf lock. */ void +sowakeup_locked(so, sb) + register struct socket *so; + register struct sockbuf *sb; +{ + + sowakeup_under_lock(so, sb); + + if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL) + pgsigio(&so->so_sigio, SIGIO, 0); + if (sb->sb_flags & SB_UPCALL) + (*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT); + if (sb->sb_flags & SB_AIO) /* XXX locking */ + aio_swake(so, sb); + KNOTE(&sb->sb_sel.si_note, 0); /* XXX locking? */ +} + +/* + * Wakeup processes waiting on a socket buffer. + * Do asynchronous notification via SIGIO + * if the socket has the SS_ASYNC flag set. + * + * The caller does not hold the sockbuf lock. + */ +void sowakeup(so, sb) register struct socket *so; register struct sockbuf *sb; { - selwakeup(&sb->sb_sel); - sb->sb_flags &= ~SB_SEL; - if (sb->sb_flags & SB_WAIT) { - sb->sb_flags &= ~SB_WAIT; - wakeup(&sb->sb_cc); - } + SOCKBUF_LOCK(sb); + sowakeup_under_lock(so, sb); + SOCKBUF_UNLOCK(sb); + if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL) pgsigio(&so->so_sigio, SIGIO, 0); if (sb->sb_flags & SB_UPCALL) (*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT); - if (sb->sb_flags & SB_AIO) + if (sb->sb_flags & SB_AIO) /* XXX locking */ aio_swake(so, sb); - KNOTE(&sb->sb_sel.si_note, 0); + KNOTE(&sb->sb_sel.si_note, 0); /* XXX locking? */ } /* @@ -474,6 +573,8 @@ { struct mbuf *m = sb->sb_mb; + SOCKBUF_LOCK_ASSERT(sb); + while (m && m->m_nextpkt) m = m->m_nextpkt; @@ -493,6 +594,8 @@ struct mbuf *m = sb->sb_mb; struct mbuf *n; + SOCKBUF_LOCK_ASSERT(sb); + while (m && m->m_nextpkt) m = m->m_nextpkt; @@ -529,7 +632,7 @@ * discarded and mbufs are compacted where possible. */ void -sbappend(sb, m) +sbappend_locked(sb, m) struct sockbuf *sb; struct mbuf *m; { @@ -537,6 +640,9 @@ if (m == 0) return; + + SOCKBUF_LOCK_ASSERT(sb); + SBLASTRECORDCHK(sb); n = sb->sb_mb; if (n) { @@ -544,7 +650,7 @@ n = n->m_nextpkt; do { if (n->m_flags & M_EOR) { - sbappendrecord(sb, m); /* XXXXXX!!!! */ + sbappendrecord_locked(sb, m); /* XXXXXX!!!! */ return; } } while (n->m_next && (n = n->m_next)); @@ -557,7 +663,7 @@ if ((n = sb->sb_lastrecord) != NULL) { do { if (n->m_flags & M_EOR) { - sbappendrecord(sb, m); /* XXXXXX!!!! */ + sbappendrecord_locked(sb, m); /* XXXXXX!!!! */ return; } } while (n->m_next && (n = n->m_next)); @@ -574,13 +680,33 @@ } /* + * Append mbuf chain m to the last record in the + * socket buffer sb. The additional space associated + * the mbuf chain is recorded in sb. Empty mbufs are + * discarded and mbufs are compacted where possible. + */ +void +sbappend(sb, m) + struct sockbuf *sb; + struct mbuf *m; +{ + if (!SOCKBUF_OWNED(sb)) { + SOCKBUF_LOCK(sb); + sbappend_locked(sb, m); + SOCKBUF_UNLOCK(sb); + } else + sbappend_locked(sb, m); +} + +/* * This version of sbappend() should only be used when the caller * absolutely knows that there will never be more than one record * in the socket buffer, that is, a stream protocol (such as TCP). */ void -sbappendstream(struct sockbuf *sb, struct mbuf *m) +sbappendstream_locked(struct sockbuf *sb, struct mbuf *m) { + SOCKBUF_LOCK_ASSERT(sb); KASSERT(m->m_nextpkt == NULL,("sbappendstream 0")); KASSERT(sb->sb_mb == sb->sb_lastrecord,("sbappendstream 1")); @@ -590,13 +716,28 @@ #ifdef MBUFTRACE m_claim(m, sb->sb_mowner); #endif - sbcompress(sb, m, sb->sb_mbtail); sb->sb_lastrecord = sb->sb_mb; SBLASTRECORDCHK(sb); } +/* + * This version of sbappend() should only be used when the caller + * absolutely knows that there will never be more than one record + * in the socket buffer, that is, a stream protocol (such as TCP). + */ +void +sbappendstream(struct sockbuf *sb, struct mbuf *m) +{ + if (!SOCKBUF_OWNED(sb)) { + SOCKBUF_LOCK(sb); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 29 10:27:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CB5016A4D0; Wed, 29 Oct 2003 10:27:58 -0800 (PST) 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 7041A16A4CE for ; Wed, 29 Oct 2003 10:27:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37A5443FDF for ; Wed, 29 Oct 2003 10:27:56 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TIRuXJ040581 for ; Wed, 29 Oct 2003 10:27:56 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TIRt4M040578 for perforce@freebsd.org; Wed, 29 Oct 2003 10:27:55 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 29 Oct 2003 10:27:55 -0800 (PST) Message-Id: <200310291827.h9TIRt4M040578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 40752 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: Wed, 29 Oct 2003 18:27:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=40752 Change 40752 by jhb@jhb_blue on 2003/10/29 10:27:05 IFC @40750. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#10 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#5 integrate .. //depot/projects/smpng/sys/conf/NOTES#57 integrate .. //depot/projects/smpng/sys/conf/options#64 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx.h#3 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.c#3 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.h#3 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.c#3 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.c#3 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.c#4 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.h#4 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#3 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#4 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/Makefile#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/dump_context.c#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/dumpmyself.c#2 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/primeregs.s#1 branch .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#36 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#9 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#5 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#5 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#6 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatmvar.h#4 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_balloc.c#5 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_ialloc.c#4 integrate .. //depot/projects/smpng/sys/i386/acpica/Makefile#4 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakecode.S#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#66 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#50 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.S#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#68 integrate .. //depot/projects/smpng/sys/ia64/ia64/ptrace_machdep.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/sys_machdep.c#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/syscall.S#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#58 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#34 integrate .. //depot/projects/smpng/sys/ia64/include/sysarch.h#3 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#59 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#15 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#11 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#42 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#27 integrate .. //depot/projects/smpng/sys/net/if_loop.c#22 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#20 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#9 integrate .. //depot/projects/smpng/sys/netinet/ip.h#7 integrate .. //depot/projects/smpng/sys/netinet/ip_ecn.c#3 integrate .. //depot/projects/smpng/sys/netinet/ip_ecn.h#3 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#20 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#40 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#38 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#20 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#30 integrate .. //depot/projects/smpng/sys/netinet6/ah_input.c#10 integrate .. //depot/projects/smpng/sys/netinet6/esp_input.c#14 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#6 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/smpng/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#25 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#9 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#18 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#6 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#22 integrate .. //depot/projects/smpng/sys/netkey/key.c#18 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#27 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#13 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#32 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#35 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.266 2003/10/15 02:04:52 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.267 2003/10/28 01:06:37 peter Exp $"); /* * AMD64 Trap and System call handling @@ -258,9 +258,6 @@ default: ucode = code + BUS_SEGM_FAULT ; i = SIGBUS; -printf("trap %d: pid %d err %p eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", type, p->p_pid, (void *)frame.tf_err, -(void *)frame.tf_addr, (void *)frame.tf_rip, (void *)frame.tf_rax, (void *)frame.tf_rbx, (void *)frame.tf_rcx, (void *)frame.tf_rdx, (void *)frame.tf_rsp, (void *)frame.tf_rbp, (void *)frame.tf_rsi, (void *)frame.tf_rdi); - break; case T_PAGEFLT: /* page fault */ @@ -545,12 +542,6 @@ return (-1); } -printf("trap_pfault: pid %d %s %s %s eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", p->p_pid, - frame->tf_err & PGEX_U ? "user" : "supervisor", - frame->tf_err & PGEX_W ? "write" : "read", - frame->tf_err & PGEX_P ? "protection violation" : "page not present", -(void *)eva, (void *)frame->tf_rip, (void *)frame->tf_rax, (void *)frame->tf_rbx, (void *)frame->tf_rcx, (void *)frame->tf_rdx, (void *)frame->tf_rsp, (void *)frame->tf_rbp, (void *)frame->tf_rsi, (void *)frame->tf_rdi); - return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); } ==== //depot/projects/smpng/sys/boot/forth/beastie.4th#5 (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/boot/forth/beastie.4th,v 1.6 2003/10/27 16:39:49 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.7 2003/10/28 17:18:42 scottl Exp $ marker task-beastie.4th @@ -248,7 +248,7 @@ s" NO" s" autoboot_delay" setenv exit then - rebootkey @ = if s" reboot" evaluate then + rebootkey @ = if 0 reboot then repeat ; ==== //depot/projects/smpng/sys/conf/NOTES#57 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1182 2003/10/27 11:19:08 harti Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1183 2003/10/28 05:47:39 sam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2295,6 +2295,7 @@ # Debug options options BUS_DEBUG # enable newbus debugging options DEBUG_VFS_LOCKS # enable vfs lock debugging +options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking ##################################################################### # SYSV IPC KERNEL PARAMETERS ==== //depot/projects/smpng/sys/conf/options#64 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.418 2003/10/27 11:19:08 harti Exp $ +# $FreeBSD: src/sys/conf/options,v 1.421 2003/10/29 14:22:09 iwasaki Exp $ # # On the handling of kernel options # @@ -598,6 +598,7 @@ # options for ACPI support ACPI_DEBUG opt_acpi.h ACPI_MAX_THREADS opt_acpi.h +ACPI_NO_RESET_VIDEO opt_acpi.h ACPI_NO_SEMAPHORES opt_acpi.h ACPICA_PEDANTIC opt_acpi.h @@ -622,6 +623,8 @@ # XXX bogusly global. DEVICE_POLLING opt_global.h +SOCKBUF_DEBUG opt_global.h + # options for ubsec driver UBSEC_DEBUG opt_ubsec.h UBSEC_RNDTEST opt_ubsec.h ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx.h#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include @@ -211,12 +213,12 @@ #define UWX_REG_PFS 6 /* pfs (pseudo-register) */ #define UWX_REG_PREDS 7 /* p0 - p63 */ #define UWX_REG_PRIUNAT 8 /* primary unat (pseudo-register) */ -#define UWX_REG_AR_PFS 9 /* ar.pfs */ -#define UWX_REG_AR_BSPSTORE 10 /* ar.bspstore */ -#define UWX_REG_AR_RNAT 11 /* ar.rnat */ -#define UWX_REG_AR_UNAT 12 /* ar.unat */ -#define UWX_REG_AR_FPSR 13 /* ar.fpsr */ -#define UWX_REG_AR_LC 14 /* ar.lc */ +#define UWX_REG_AR_BSPSTORE 9 /* ar.bspstore */ +#define UWX_REG_AR_RNAT 10 /* ar.rnat */ +#define UWX_REG_AR_UNAT 11 /* ar.unat */ +#define UWX_REG_AR_FPSR 12 /* ar.fpsr */ +#define UWX_REG_AR_LC 13 /* ar.lc */ +#define UWX_REG_AR_PFS 14 /* ar.pfs */ #define UWX_REG_GR(gr) (0x100 | (gr)) #define UWX_REG_FR(fr) (0x200 | (fr)) #define UWX_REG_BR(br) (0x300 | (br)) ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_bstream.h" @@ -71,7 +73,7 @@ if (bstream->ntotal <= 0) return -1; if (bstream->nbuf <= 0) { - if (bstream->source & 0x7) + if (bstream->source & 0x7 || bstream->ntotal < sizeof(uint64_t)) len = sizeof(uint32_t); else len = sizeof(uint64_t); ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ struct uwx_bstream { copyin_cb copyin; ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_context.h" ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.h#2 (text+ko) ==== @@ -1,23 +1,25 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ extern uint64_t uwx_add_to_bsp(uint64_t bsp, int nslots); ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.h#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx.h" ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #define NSB_SPECIAL 9 #define NSB_GR 4 ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_context.h" ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.h#2 (text+ko) ==== @@ -1,1 +1,25 @@ +/* +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ + extern int uwx_restore_markers(struct uwx_env *env); ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_str.h" ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #define STRPOOLSIZE 400 ==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 29 11:20:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E98516A4D1; Wed, 29 Oct 2003 11:20:18 -0800 (PST) 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 07B6F16A4CF for ; Wed, 29 Oct 2003 11:20:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34DFF43FD7 for ; Wed, 29 Oct 2003 11:20:16 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TJKGXJ044143 for ; Wed, 29 Oct 2003 11:20:16 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TJKEjc044138 for perforce@freebsd.org; Wed, 29 Oct 2003 11:20:14 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 29 Oct 2003 11:20:14 -0800 (PST) Message-Id: <200310291920.h9TJKEjc044138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 40768 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: Wed, 29 Oct 2003 19:20:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=40768 Change 40768 by jhb@jhb_blue on 2003/10/29 11:19:42 IFC @40764. Affected files ... .. //depot/projects/power/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/power/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/power/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/power/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/power/sys/cam/cam_periph.c#3 integrate .. //depot/projects/power/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/power/sys/conf/NOTES#3 integrate .. //depot/projects/power/sys/conf/files#3 integrate .. //depot/projects/power/sys/conf/files.ia64#3 integrate .. //depot/projects/power/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/power/sys/conf/options#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx.h#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_env.h#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_step.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_trace.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_trace.h#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/test/Makefile#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/test/dump_context.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/test/dumpmyself.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/test/primeregs.s#1 branch .. //depot/projects/power/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/power/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/power/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/power/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/power/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/power/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/power/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/power/sys/dev/dcons/dcons.c#1 branch .. //depot/projects/power/sys/dev/dcons/dcons.h#1 branch .. //depot/projects/power/sys/dev/dcons/dcons_crom.c#1 branch .. //depot/projects/power/sys/dev/drm/ati_pcigart.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm.h#2 integrate .. //depot/projects/power/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_auth.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_bufs.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_context.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_dma.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_drv.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_fops.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_ioctl.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_irq.h#1 branch .. //depot/projects/power/sys/dev/drm/drm_memory.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_memory_debug.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_pci.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_sysctl.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_vm.h#2 integrate .. //depot/projects/power/sys/dev/drm/mga.h#2 integrate .. //depot/projects/power/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/power/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/power/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/power/sys/dev/drm/r128.h#2 integrate .. //depot/projects/power/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/power/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/power/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/power/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/power/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/power/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/power/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/power/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/power/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/power/sys/dev/drm/sis.h#2 integrate .. //depot/projects/power/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/power/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/power/sys/dev/drm/tdfx.h#2 integrate .. //depot/projects/power/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/power/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/power/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/power/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/power/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/power/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/power/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/power/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/power/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/power/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatm_rx.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatm_tx.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatmvar.h#2 integrate .. //depot/projects/power/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/power/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/power/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/power/sys/dev/pccard/pccarddevs.h#3 integrate .. //depot/projects/power/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/power/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/power/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/power/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/power/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/power/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/power/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/power/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/power/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/power/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/power/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/power/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/power/sys/dev/vx/if_vxreg.h#2 integrate .. //depot/projects/power/sys/dev/vx/if_vxvar.h#1 branch .. //depot/projects/power/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/power/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/power/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/power/sys/geom/geom_fox.c#3 integrate .. //depot/projects/power/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate .. //depot/projects/power/sys/gnu/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/power/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/power/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/power/sys/i386/conf/NOTES#3 integrate .. //depot/projects/power/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/power/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/power/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/power/sys/ia64/disasm/disasm.h#1 branch .. //depot/projects/power/sys/ia64/disasm/disasm_decode.c#1 branch .. //depot/projects/power/sys/ia64/disasm/disasm_extract.c#1 branch .. //depot/projects/power/sys/ia64/disasm/disasm_format.c#1 branch .. //depot/projects/power/sys/ia64/disasm/disasm_int.h#1 branch .. //depot/projects/power/sys/ia64/ia64/db_disasm.c#2 delete .. //depot/projects/power/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/power/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/power/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/power/sys/ia64/ia64/ptrace_machdep.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/power/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/syscall.S#3 integrate .. //depot/projects/power/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/power/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/power/sys/ia64/include/inst.h#2 delete .. //depot/projects/power/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/power/sys/ia64/include/proc.h#3 integrate .. //depot/projects/power/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/power/sys/isa/fd.c#3 integrate .. //depot/projects/power/sys/kern/kern_alq.c#2 integrate .. //depot/projects/power/sys/kern/kern_fork.c#2 integrate .. //depot/projects/power/sys/kern/kern_intr.c#2 integrate .. //depot/projects/power/sys/kern/kern_prot.c#3 integrate .. //depot/projects/power/sys/kern/kern_resource.c#2 integrate .. //depot/projects/power/sys/kern/kern_sig.c#3 integrate .. //depot/projects/power/sys/kern/kern_synch.c#3 integrate .. //depot/projects/power/sys/kern/kern_time.c#2 integrate .. //depot/projects/power/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/power/sys/kern/sched_ule.c#3 integrate .. //depot/projects/power/sys/kern/subr_bus.c#3 integrate .. //depot/projects/power/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/power/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/power/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/power/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/power/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/power/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/power/sys/modules/Makefile#3 integrate .. //depot/projects/power/sys/modules/dcons/Makefile#1 branch .. //depot/projects/power/sys/modules/dcons_crom/Makefile#1 branch .. //depot/projects/power/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/power/sys/modules/netgraph/atm/atmbase/Makefile#1 branch .. //depot/projects/power/sys/modules/netgraph/atm/sscfu/Makefile#1 branch .. //depot/projects/power/sys/modules/netgraph/atm/sscop/Makefile#1 branch .. //depot/projects/power/sys/net/if.c#3 integrate .. //depot/projects/power/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/power/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/power/sys/net/if_loop.c#3 integrate .. //depot/projects/power/sys/net/if_tun.c#3 integrate .. //depot/projects/power/sys/net/if_types.h#2 integrate .. //depot/projects/power/sys/net/if_var.h#3 integrate .. //depot/projects/power/sys/net/if_vlan.c#2 integrate .. //depot/projects/power/sys/netatalk/aarp.c#2 integrate .. //depot/projects/power/sys/netgraph/atm/ng_sscfu.h#1 branch .. //depot/projects/power/sys/netgraph/atm/ng_sscop.h#1 branch .. //depot/projects/power/sys/netgraph/atm/ngatmbase.c#1 branch .. //depot/projects/power/sys/netgraph/atm/ngatmbase.h#1 branch .. //depot/projects/power/sys/netgraph/atm/sscfu/ng_sscfu.c#1 branch .. //depot/projects/power/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#1 branch .. //depot/projects/power/sys/netgraph/atm/sscop/ng_sscop.c#1 branch .. //depot/projects/power/sys/netgraph/atm/sscop/ng_sscop_cust.h#1 branch .. //depot/projects/power/sys/netinet/icmp6.h#3 integrate .. //depot/projects/power/sys/netinet/in.h#2 integrate .. //depot/projects/power/sys/netinet/in_gif.c#3 integrate .. //depot/projects/power/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/power/sys/netinet/ip.h#2 integrate .. //depot/projects/power/sys/netinet/ip6.h#3 integrate .. //depot/projects/power/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/power/sys/netinet/ip_ecn.h#2 integrate .. //depot/projects/power/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/power/sys/netinet/ip_input.c#3 integrate .. //depot/projects/power/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/power/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/power/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/power/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/power/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/power/sys/netinet6/ah_input.c#3 integrate .. //depot/projects/power/sys/netinet6/esp_input.c#3 integrate .. //depot/projects/power/sys/netinet6/frag6.c#3 integrate .. //depot/projects/power/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/power/sys/netinet6/in6.h#3 integrate .. //depot/projects/power/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/power/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/power/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/power/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/power/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/power/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/power/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/power/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/power/sys/netinet6/mld6.c#3 integrate .. //depot/projects/power/sys/netinet6/nd6.c#3 integrate .. //depot/projects/power/sys/netinet6/nd6.h#3 integrate .. //depot/projects/power/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/power/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/power/sys/netinet6/route6.c#3 integrate .. //depot/projects/power/sys/netinet6/udp6_output.c#3 integrate .. //depot/projects/power/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/power/sys/netkey/key.c#3 integrate .. //depot/projects/power/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/power/sys/pci/agp.c#2 integrate .. //depot/projects/power/sys/pci/agp_i810.c#3 integrate .. //depot/projects/power/sys/pci/if_dc.c#3 integrate .. //depot/projects/power/sys/pci/if_sis.c#3 integrate .. //depot/projects/power/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/power/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/power/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/power/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/power/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/power/sys/sys/agpio.h#2 integrate .. //depot/projects/power/sys/sys/bus.h#3 integrate .. //depot/projects/power/sys/sys/interrupt.h#2 integrate .. //depot/projects/power/sys/sys/mbuf.h#3 integrate .. //depot/projects/power/sys/sys/proc.h#3 integrate .. //depot/projects/power/sys/sys/resourcevar.h#2 integrate .. //depot/projects/power/sys/sys/socketvar.h#2 integrate .. //depot/projects/power/sys/sys/time.h#2 integrate .. //depot/projects/power/sys/sys/vnode.h#3 integrate .. //depot/projects/power/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/power/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/power/sys/vm/swap_pager.c#3 integrate .. //depot/projects/power/sys/vm/vm_object.c#3 integrate .. //depot/projects/power/sys/vm/vm_page.h#3 integrate .. //depot/projects/power/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/power/sys/vm/vm_pager.h#2 integrate .. //depot/projects/power/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/power/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.266 2003/10/15 02:04:52 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.267 2003/10/28 01:06:37 peter Exp $"); /* * AMD64 Trap and System call handling @@ -258,9 +258,6 @@ default: ucode = code + BUS_SEGM_FAULT ; i = SIGBUS; -printf("trap %d: pid %d err %p eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", type, p->p_pid, (void *)frame.tf_err, -(void *)frame.tf_addr, (void *)frame.tf_rip, (void *)frame.tf_rax, (void *)frame.tf_rbx, (void *)frame.tf_rcx, (void *)frame.tf_rdx, (void *)frame.tf_rsp, (void *)frame.tf_rbp, (void *)frame.tf_rsi, (void *)frame.tf_rdi); - break; case T_PAGEFLT: /* page fault */ @@ -545,12 +542,6 @@ return (-1); } -printf("trap_pfault: pid %d %s %s %s eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", p->p_pid, - frame->tf_err & PGEX_U ? "user" : "supervisor", - frame->tf_err & PGEX_W ? "write" : "read", - frame->tf_err & PGEX_P ? "protection violation" : "page not present", -(void *)eva, (void *)frame->tf_rip, (void *)frame->tf_rax, (void *)frame->tf_rbx, (void *)frame->tf_rcx, (void *)frame->tf_rdx, (void *)frame->tf_rsp, (void *)frame->tf_rbp, (void *)frame->tf_rsi, (void *)frame->tf_rdi); - return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); } ==== //depot/projects/power/sys/amd64/include/stdarg.h#2 (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.5 2003/05/10 00:55:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.6 2003/10/24 02:50:39 peter Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -46,9 +46,12 @@ #define va_arg(ap, type) \ __builtin_va_arg((ap), type) +#define __va_copy(dest, src) \ + __builtin_va_copy((dest), (src)) + #if __ISO_C_VISIBLE >= 1999 #define va_copy(dest, src) \ - __builtin_va_copy((dest), (src)) + __va_copy(dest, src) #endif #define va_end(ap) \ ==== //depot/projects/power/sys/amd64/include/sysarch.h#2 (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/include/sysarch.h,v 1.19 2003/05/12 02:37:29 peter Exp $ + * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.21 2003/10/23 06:06:14 peter Exp $ */ /* @@ -39,22 +39,21 @@ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ -#define AMD64_GET_FSBASE 0 -#define AMD64_SET_FSBASE 1 -#define AMD64_GET_GSBASE 2 -#define AMD64_SET_GSBASE 3 +/* Leave space for 0-127 for to avoid translating syscalls */ +#define AMD64_GET_FSBASE 128 +#define AMD64_SET_FSBASE 129 +#define AMD64_GET_GSBASE 130 +#define AMD64_SET_GSBASE 131 -#if 0 /* these wrappers need to be implemented in libc first */ #ifndef _KERNEL #include __BEGIN_DECLS -unsigned long amd64_get_fsbase(void); -unsigned long amd64_set_fsbase(unsigned long); -unsigned long amd64_get_gsbase(void); -unsigned long amd64_set_gsbase(unsigned long); +int amd64_get_fsbase(void **); +int amd64_set_fsbase(void *); +int amd64_get_gsbase(void **); +int amd64_set_gsbase(void *); __END_DECLS #endif -#endif #endif /* !_MACHINE_SYSARCH_H_ */ ==== //depot/projects/power/sys/boot/forth/beastie.4th#3 (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/boot/forth/beastie.4th,v 1.5 2003/09/13 18:35:01 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.7 2003/10/28 17:18:42 scottl Exp $ marker task-beastie.4th @@ -209,9 +209,9 @@ dup tkey 0 25 at-xy dup 32 = if nip 0 swap then - dup -1 = if s" boot" evaluate then - dup 13 = if s" boot" evaluate then - dup bootkey @ = if s" boot" evaluate then + dup -1 = if 0 boot then + dup 13 = if 0 boot then + dup bootkey @ = if 0 boot then dup bootacpikey @ = if acpienabled? if s" acpi_load" unsetenv @@ -221,7 +221,7 @@ s" YES" s" acpi_load" setenv s" 0" s" hint.acpi.0.disabled" setenv then - s" boot" evaluate + 0 boot then dup bootsafekey @ = if s" arch-i386" environment? if @@ -233,22 +233,22 @@ s" 0" s" hw.ata.atapi_dma" setenv s" 0" s" hw.ata.wc" setenv s" 0" s" hw.eisa_slots" setenv - s" boot" evaluate + 0 boot then dup bootverbosekey @ = if s" YES" s" boot_verbose" setenv - s" boot" evaluate + 0 boot then dup bootsinglekey @ = if s" YES" s" boot_single" setenv - s" boot" evaluate + 0 boot then dup escapekey @ = if 2drop s" NO" s" autoboot_delay" setenv exit then - rebootkey @ = if s" reboot" evaluate then + rebootkey @ = if 0 reboot then repeat ; ==== //depot/projects/power/sys/cam/cam_periph.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.54 2003/10/18 11:01:11 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.55 2003/10/27 06:15:54 ken Exp $"); #include #include @@ -994,14 +994,26 @@ scsi_cmd = (struct scsi_start_stop_unit *) &done_ccb->csio.cdb_io.cdb_bytes; if (sense != 0) { + struct ccb_getdev cgd; struct scsi_sense_data *sense; int error_code, sense_key, asc, ascq; + scsi_sense_action err_action; sense = &done_ccb->csio.sense_data; scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq); /* + * Grab the inquiry data for this device. + */ + xpt_setup_ccb(&cgd.ccb_h, done_ccb->ccb_h.path, + /*priority*/ 1); + cgd.ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action((union ccb *)&cgd); + err_action = scsi_error_action(&done_ccb->csio, + &cgd.inq_data, 0); + + /* * If the error is "invalid field in CDB", * and the load/eject flag is set, turn the * flag off and try again. This is just in @@ -1028,12 +1040,15 @@ xpt_action(done_ccb); - } else if (done_ccb->ccb_h.retry_count > 1) { + } else if ((done_ccb->ccb_h.retry_count > 1) + && ((err_action & SS_MASK) != SS_FAIL)) { + /* * In this case, the error recovery * command failed, but we've got * some retries left on it. Give - * it another try. + * it another try unless this is an + * unretryable error. */ /* set the timeout to .5 sec */ ==== //depot/projects/power/sys/cam/scsi/scsi_cd.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.87 2003/10/18 17:24:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.88 2003/10/27 06:15:55 ken Exp $"); #include "opt_cd.h" @@ -2856,20 +2856,6 @@ ccb = cdgetccb(periph, /* priority */ 1); - scsi_test_unit_ready(&ccb->csio, 0, cddone, - MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, 1000); - ccb->ccb_h.ccb_bp = NULL; - - error = cam_periph_runccb(ccb, NULL, - /*cam_flags*/0, - /*sense_flags*/SF_RETRY_UA, - softc->disk.d_devstat); - - if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - xpt_release_ccb(ccb); - return (ENXIO); - } - rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), M_TEMP, M_WAITOK); ==== //depot/projects/power/sys/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1179 2003/10/22 22:27:49 njl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1183 2003/10/28 05:47:39 sam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -29,11 +29,11 @@ # comment on the same line if possible. Very detailed descriptions of # devices and subsystems belong in manpages. # -# A space followed by a tab separates 'option' from an option name. Two +# A space followed by a tab separates 'options' from an option name. Two # spaces followed by a tab separate 'device' from a device name. Comments # after an option or device should use one space after the comment character. # To comment out a negative option that disables code and thus should not be -# enabled for LINT builds, precede 'option' with "#!". +# enabled for LINT builds, precede 'options' with "#!". # # @@ -452,7 +452,10 @@ options NETGRAPH_ATM_ATMPIF # NgATM - Netgraph ATM -options NGATM_ATM +options NGATM_ATM +options NGATM_ATMBASE +options NGATM_SSCOP +options NGATM_SSCFU device mn # Munich32x/Falc54 Nx64kbit/sec cards. device lmc # tulip based LanMedia WAN cards @@ -2241,11 +2244,21 @@ options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size ##################################################################### -# Firewire support +# FireWire support -device firewire # Firewire bus code +device firewire # FireWire bus code device sbp # SCSI over Firewire (Requires scbus and da) -device fwe # Ethernet over Firewire (non-standard!) +device fwe # Ethernet over FireWire (non-standard!) + +##################################################################### +# dcons support (Dumb Console Device) + +device dcons # dumb console driver +device dcons_crom # FireWire attachment +options DCONS_BUF_SIZE=16384 # buffer size +options DCONS_POLL_HZ=100 # polling rate +options DCONS_FORCE_CONSOLE=0 # force to be the primary console +options DCONS_FORCE_GDB=1 # force to be the gdb device ##################################################################### # crypto subsystem @@ -2282,6 +2295,7 @@ # Debug options options BUS_DEBUG # enable newbus debugging options DEBUG_VFS_LOCKS # enable vfs lock debugging +options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking ##################################################################### # SYSV IPC KERNEL PARAMETERS ==== //depot/projects/power/sys/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.837 2003/10/22 20:39:33 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.841 2003/10/27 11:19:08 harti Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -351,6 +351,8 @@ dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs card dev/cs/if_cs_pccard.c optional cs pccard +dev/dcons/dcons.c optional dcons +dev/dcons/dcons_crom.c optional dcons_crom dev/digi/digi.c optional digi dev/digi/digi_isa.c optional digi isa dev/digi/digi_pci.c optional digi pci @@ -1368,7 +1370,13 @@ netatm/uni/unisig_vc_state.c optional atm_uni atm_core netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif -netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/ngatmbase.c optional ngatm_atmbase +contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase +netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu +contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu +netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop +contrib/ngatm/netnatm/saal/saal_sscop.c optional ngatm_sscop netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async netgraph/ng_base.c optional netgraph ==== //depot/projects/power/sys/conf/files.ia64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.59 2003/09/20 19:27:48 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.61 2003/10/24 06:48:41 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -80,6 +80,9 @@ ia64/acpica/acpi_machdep.c optional acpi ia64/acpica/acpi_wakeup.c optional acpi ia64/acpica/madt.c optional acpi +ia64/disasm/disasm_decode.c standard +ia64/disasm/disasm_extract.c standard +ia64/disasm/disasm_format.c standard ia64/ia32/ia32_misc.c optional ia32 ia64/ia32/ia32_sysent.c optional ia32 ia64/ia32/ia32_sysvec.c optional ia32 @@ -89,7 +92,6 @@ ia64/ia64/clock_if.m standard ia64/ia64/context.S standard ia64/ia64/critical.c standard -ia64/ia64/db_disasm.c optional ddb ia64/ia64/db_interface.c optional ddb ia64/ia64/db_trace.c optional ddb ia64/ia64/dump_machdep.c standard ==== //depot/projects/power/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kernels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.34 2003/08/22 15:41:44 imp Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.35 2003/10/27 11:19:08 harti Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -35,6 +35,9 @@ # ... and the same for Atheros HAL INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd +# ... and the same for the NgATM stuff +INCLUDES+= -I$S/contrib/ngatm + COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common ==== //depot/projects/power/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.416 2003/10/22 22:27:49 njl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.421 2003/10/29 14:22:09 iwasaki Exp $ # # On the handling of kernel options # @@ -404,6 +404,9 @@ # NgATM options NGATM_ATM opt_netgraph.h +NGATM_ATMBASE opt_netgraph.h +NGATM_SSCOP opt_netgraph.h +NGATM_SSCFU opt_netgraph.h # DRM options DRM_DEBUG opt_drm.h @@ -595,6 +598,7 @@ # options for ACPI support ACPI_DEBUG opt_acpi.h ACPI_MAX_THREADS opt_acpi.h +ACPI_NO_RESET_VIDEO opt_acpi.h ACPI_NO_SEMAPHORES opt_acpi.h ACPICA_PEDANTIC opt_acpi.h @@ -619,6 +623,8 @@ # XXX bogusly global. DEVICE_POLLING opt_global.h +SOCKBUF_DEBUG opt_global.h + # options for ubsec driver UBSEC_DEBUG opt_ubsec.h UBSEC_RNDTEST opt_ubsec.h @@ -673,3 +679,9 @@ AH_DEBUG opt_ah.h AH_DEBUG_ALQ opt_ah.h AH_ASSERT opt_ah.h + +# dcons options +DCONS_BUF_SIZE opt_dcons.h +DCONS_POLL_HZ opt_dcons.h +DCONS_FORCE_CONSOLE opt_dcons.h +DCONS_FORCE_GDB opt_dcons.h ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx.h#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include @@ -211,12 +213,12 @@ #define UWX_REG_PFS 6 /* pfs (pseudo-register) */ #define UWX_REG_PREDS 7 /* p0 - p63 */ #define UWX_REG_PRIUNAT 8 /* primary unat (pseudo-register) */ -#define UWX_REG_AR_PFS 9 /* ar.pfs */ -#define UWX_REG_AR_BSPSTORE 10 /* ar.bspstore */ -#define UWX_REG_AR_RNAT 11 /* ar.rnat */ -#define UWX_REG_AR_UNAT 12 /* ar.unat */ -#define UWX_REG_AR_FPSR 13 /* ar.fpsr */ -#define UWX_REG_AR_LC 14 /* ar.lc */ +#define UWX_REG_AR_BSPSTORE 9 /* ar.bspstore */ +#define UWX_REG_AR_RNAT 10 /* ar.rnat */ +#define UWX_REG_AR_UNAT 11 /* ar.unat */ +#define UWX_REG_AR_FPSR 12 /* ar.fpsr */ +#define UWX_REG_AR_LC 13 /* ar.lc */ +#define UWX_REG_AR_PFS 14 /* ar.pfs */ #define UWX_REG_GR(gr) (0x100 | (gr)) #define UWX_REG_FR(fr) (0x200 | (fr)) #define UWX_REG_BR(br) (0x300 | (br)) ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_bstream.h" @@ -71,7 +73,7 @@ if (bstream->ntotal <= 0) return -1; if (bstream->nbuf <= 0) { - if (bstream->source & 0x7) + if (bstream->source & 0x7 || bstream->ntotal < sizeof(uint64_t)) len = sizeof(uint32_t); else len = sizeof(uint64_t); ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ struct uwx_bstream { copyin_cb copyin; ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_context.h" ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.h#2 (text+ko) ==== @@ -1,23 +1,25 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 29 11:21:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F48116A4D1; Wed, 29 Oct 2003 11:21:19 -0800 (PST) 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 D21B116A4CF for ; Wed, 29 Oct 2003 11:21:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4070643F75 for ; Wed, 29 Oct 2003 11:21:18 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TJLIXJ044208 for ; Wed, 29 Oct 2003 11:21:18 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TJLHhN044205 for perforce@freebsd.org; Wed, 29 Oct 2003 11:21:17 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 29 Oct 2003 11:21:17 -0800 (PST) Message-Id: <200310291921.h9TJLHhN044205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 40769 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: Wed, 29 Oct 2003 19:21:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=40769 Change 40769 by jhb@jhb_blue on 2003/10/29 11:20:37 IFC @40767. Affected files ... .. //depot/projects/power/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/power/sys/netinet/ip_mroute.c#3 integrate Differences ... ==== //depot/projects/power/sys/netinet/ip_dummynet.c#3 (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/netinet/ip_dummynet.c,v 1.70 2003/10/16 16:21:25 sam Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.71 2003/10/29 19:03:58 sam Exp $ */ #define DUMMYNET_DEBUG @@ -39,10 +39,7 @@ * + scheduler and dummynet functions; * + configuration and initialization. * - * NOTA BENE: critical sections are protected by splimp()/splx() - * pairs. One would think that splnet() is enough as for most of - * the netinet code, but it is not so because when used with - * bridging, dummynet is invoked at splimp(). + * NOTA BENE: critical sections are protected by the "dummynet lock". * * Most important Changes: * @@ -152,7 +149,6 @@ CTLFLAG_RD, &red_max_pkt_size, 0, "RED Max packet size"); #endif -#define DUMMYNET_DEBUG #ifdef DUMMYNET_DEBUG int dummynet_debug = 0; #ifdef SYSCTL_NODE @@ -180,7 +176,7 @@ static int config_pipe(struct dn_pipe *p); static int ip_dn_ctl(struct sockopt *sopt); -static void rt_unref(struct rtentry *); +static void rt_unref(struct rtentry *, const char *); static void dummynet(void *); static void dummynet_flush(void); void dummynet_drain(void); @@ -190,14 +186,16 @@ int if_tx_rdy(struct ifnet *ifp); static void -rt_unref(struct rtentry *rt) +rt_unref(struct rtentry *rt, const char *where) { if (rt == NULL) return ; - if (rt->rt_refcnt <= 0) - printf("dummynet: warning, refcnt now %ld, decreasing\n", - rt->rt_refcnt); - RTFREE(rt); + RT_LOCK(rt); + if (rt->rt_refcnt <= 0) { + printf("dummynet: warning, refcnt now %ld, decreasing (%s)\n", + rt->rt_refcnt, where); + } + RTFREE_LOCKED(rt); } /* @@ -452,7 +450,7 @@ switch (pkt->dn_dir) { case DN_TO_IP_OUT: (void)ip_output((struct mbuf *)pkt, NULL, NULL, 0, NULL, NULL); - rt_unref (pkt->ro.ro_rt) ; + rt_unref (pkt->ro.ro_rt, __func__) ; break ; case DN_TO_IP_IN : @@ -1198,11 +1196,15 @@ * a pointer into *ro so it needs to be updated. */ pkt->ro = *(fwa->ro); - if (fwa->ro->ro_rt) - fwa->ro->ro_rt->rt_refcnt++ ; + if (pkt->ro.ro_rt) { + RT_LOCK(pkt->ro.ro_rt); + pkt->ro.ro_rt->rt_refcnt++ ; + KASSERT(pkt->ro.ro_rt->rt_refcnt > 0, + ("bogus refcnt %ld", pkt->ro.ro_rt->rt_refcnt)); + RT_UNLOCK(pkt->ro.ro_rt); + } if (fwa->dst == (struct sockaddr_in *)&fwa->ro->ro_dst) /* dst points into ro */ fwa->dst = (struct sockaddr_in *)&(pkt->ro.ro_dst) ; - pkt->dn_dst = fwa->dst; pkt->flags = fwa->flags; } @@ -1303,7 +1305,7 @@ */ #define DN_FREE_PKT(pkt) { \ struct dn_pkt *n = pkt ; \ - rt_unref ( n->ro.ro_rt ) ; \ + rt_unref ( n->ro.ro_rt, __func__ ) ; \ m_freem(n->dn_m); \ pkt = DN_NEXT(n) ; \ free(n, M_DUMMYNET) ; } ==== //depot/projects/power/sys/netinet/ip_mroute.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ * and PIM-SMv2 and PIM-DM support, advanced API support, * bandwidth metering and signaling * - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.93 2003/10/24 00:09:18 sam Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.94 2003/10/29 19:15:00 sam Exp $ */ #include "opt_mac.h" @@ -661,11 +661,15 @@ VIF_LOCK(); if (encap_cookie) { - encap_detach(encap_cookie); + const struct encaptab *c = encap_cookie; encap_cookie = NULL; + encap_detach(c); } + VIF_UNLOCK(); + callout_stop(&tbf_reprocess_ch); + VIF_LOCK(); /* * For each phyint in use, disable promiscuous reception of all IP * multicasts. @@ -691,11 +695,11 @@ /* * Free all multicast forwarding cache entries. */ - MFC_LOCK(); callout_stop(&expire_upcalls_ch); callout_stop(&bw_upcalls_ch); callout_stop(&bw_meter_ch); + MFC_LOCK(); for (i = 0; i < MFCTBLSIZ; i++) { for (rt = mfctable[i]; rt != NULL; ) { struct mfc *nr = rt->mfc_next; From owner-p4-projects@FreeBSD.ORG Wed Oct 29 11:45:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 790F016A4D0; Wed, 29 Oct 2003 11:45:52 -0800 (PST) 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 5088316A4CE for ; Wed, 29 Oct 2003 11:45:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E167F43F85 for ; Wed, 29 Oct 2003 11:45:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TJjnXJ045172 for ; Wed, 29 Oct 2003 11:45:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TJjmIE045169 for perforce@freebsd.org; Wed, 29 Oct 2003 11:45:48 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 11:45:48 -0800 (PST) Message-Id: <200310291945.h9TJjmIE045169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40771 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: Wed, 29 Oct 2003 19:45:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=40771 Change 40771 by sam@sam_ebb on 2003/10/29 11:44:54 IFC @ 40770 Affected files ... .. //depot/projects/netperf/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/netperf/sys/boot/forth/beastie.4th#4 integrate .. //depot/projects/netperf/sys/conf/NOTES#16 integrate .. //depot/projects/netperf/sys/conf/options#15 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx.h#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_context.c#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_env.h#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_self.c#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_step.c#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_trace.c#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_trace.h#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#3 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/test/Makefile#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/test/dump_context.c#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/test/dumpmyself.c#2 integrate .. //depot/projects/netperf/sys/contrib/ia64/libuwx/test/primeregs.s#1 branch .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#7 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_intr.c#5 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_rx.c#4 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_tx.c#6 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#5 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/ext2_linux_balloc.c#3 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/ext2_linux_ialloc.c#3 integrate .. //depot/projects/netperf/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakecode.S#4 integrate .. //depot/projects/netperf/sys/i386/conf/NOTES#7 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/netperf/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/exception.S#5 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/netperf/sys/ia64/ia64/ptrace_machdep.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/sys_machdep.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/syscall.S#5 integrate .. //depot/projects/netperf/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#7 integrate .. //depot/projects/netperf/sys/ia64/include/sysarch.h#3 integrate .. //depot/projects/netperf/sys/kern/kern_fork.c#6 integrate .. //depot/projects/netperf/sys/kern/kern_synch.c#8 integrate .. //depot/projects/netperf/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#13 integrate .. //depot/projects/netperf/sys/kern/subr_bus.c#7 integrate .. //depot/projects/netperf/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/netperf/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/netperf/sys/kern/uipc_socket2.c#5 integrate .. //depot/projects/netperf/sys/net/if_loop.c#11 integrate .. //depot/projects/netperf/sys/net/if_vlan.c#5 integrate .. //depot/projects/netperf/sys/netinet/in_gif.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip.h#2 integrate .. //depot/projects/netperf/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/netperf/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/netperf/sys/netinet/ip_ecn.h#2 integrate .. //depot/projects/netperf/sys/netinet/ip_icmp.c#8 integrate .. //depot/projects/netperf/sys/netinet/ip_input.c#16 integrate .. //depot/projects/netperf/sys/netinet/ip_mroute.c#17 integrate .. //depot/projects/netperf/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/netperf/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/netperf/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/netperf/sys/netinet6/ah_input.c#3 integrate .. //depot/projects/netperf/sys/netinet6/esp_input.c#4 integrate .. //depot/projects/netperf/sys/netinet6/frag6.c#8 integrate .. //depot/projects/netperf/sys/netinet6/icmp6.c#13 integrate .. //depot/projects/netperf/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/netperf/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/netperf/sys/netinet6/ip6_input.c#15 integrate .. //depot/projects/netperf/sys/netinet6/ip6_var.h#8 integrate .. //depot/projects/netperf/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/netperf/sys/netinet6/route6.c#4 integrate .. //depot/projects/netperf/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/netperf/sys/netkey/key.c#5 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#12 integrate .. //depot/projects/netperf/sys/sys/mbuf.h#6 integrate .. //depot/projects/netperf/sys/sys/resourcevar.h#2 integrate .. //depot/projects/netperf/sys/sys/socketvar.h#4 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#9 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.266 2003/10/15 02:04:52 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.267 2003/10/28 01:06:37 peter Exp $"); /* * AMD64 Trap and System call handling @@ -258,9 +258,6 @@ default: ucode = code + BUS_SEGM_FAULT ; i = SIGBUS; -printf("trap %d: pid %d err %p eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", type, p->p_pid, (void *)frame.tf_err, -(void *)frame.tf_addr, (void *)frame.tf_rip, (void *)frame.tf_rax, (void *)frame.tf_rbx, (void *)frame.tf_rcx, (void *)frame.tf_rdx, (void *)frame.tf_rsp, (void *)frame.tf_rbp, (void *)frame.tf_rsi, (void *)frame.tf_rdi); - break; case T_PAGEFLT: /* page fault */ @@ -545,12 +542,6 @@ return (-1); } -printf("trap_pfault: pid %d %s %s %s eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", p->p_pid, - frame->tf_err & PGEX_U ? "user" : "supervisor", - frame->tf_err & PGEX_W ? "write" : "read", - frame->tf_err & PGEX_P ? "protection violation" : "page not present", -(void *)eva, (void *)frame->tf_rip, (void *)frame->tf_rax, (void *)frame->tf_rbx, (void *)frame->tf_rcx, (void *)frame->tf_rdx, (void *)frame->tf_rsp, (void *)frame->tf_rbp, (void *)frame->tf_rsi, (void *)frame->tf_rdi); - return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); } ==== //depot/projects/netperf/sys/boot/forth/beastie.4th#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/boot/forth/beastie.4th,v 1.6 2003/10/27 16:39:49 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.7 2003/10/28 17:18:42 scottl Exp $ marker task-beastie.4th @@ -248,7 +248,7 @@ s" NO" s" autoboot_delay" setenv exit then - rebootkey @ = if s" reboot" evaluate then + rebootkey @ = if 0 reboot then repeat ; ==== //depot/projects/netperf/sys/conf/NOTES#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1182 2003/10/27 11:19:08 harti Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1183 2003/10/28 05:47:39 sam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # ==== //depot/projects/netperf/sys/conf/options#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.418 2003/10/27 11:19:08 harti Exp $ +# $FreeBSD: src/sys/conf/options,v 1.421 2003/10/29 14:22:09 iwasaki Exp $ # # On the handling of kernel options # @@ -598,6 +598,7 @@ # options for ACPI support ACPI_DEBUG opt_acpi.h ACPI_MAX_THREADS opt_acpi.h +ACPI_NO_RESET_VIDEO opt_acpi.h ACPI_NO_SEMAPHORES opt_acpi.h ACPICA_PEDANTIC opt_acpi.h ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx.h#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include @@ -211,12 +213,12 @@ #define UWX_REG_PFS 6 /* pfs (pseudo-register) */ #define UWX_REG_PREDS 7 /* p0 - p63 */ #define UWX_REG_PRIUNAT 8 /* primary unat (pseudo-register) */ -#define UWX_REG_AR_PFS 9 /* ar.pfs */ -#define UWX_REG_AR_BSPSTORE 10 /* ar.bspstore */ -#define UWX_REG_AR_RNAT 11 /* ar.rnat */ -#define UWX_REG_AR_UNAT 12 /* ar.unat */ -#define UWX_REG_AR_FPSR 13 /* ar.fpsr */ -#define UWX_REG_AR_LC 14 /* ar.lc */ +#define UWX_REG_AR_BSPSTORE 9 /* ar.bspstore */ +#define UWX_REG_AR_RNAT 10 /* ar.rnat */ +#define UWX_REG_AR_UNAT 11 /* ar.unat */ +#define UWX_REG_AR_FPSR 12 /* ar.fpsr */ +#define UWX_REG_AR_LC 13 /* ar.lc */ +#define UWX_REG_AR_PFS 14 /* ar.pfs */ #define UWX_REG_GR(gr) (0x100 | (gr)) #define UWX_REG_FR(fr) (0x200 | (fr)) #define UWX_REG_BR(br) (0x300 | (br)) ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_bstream.h" @@ -71,7 +73,7 @@ if (bstream->ntotal <= 0) return -1; if (bstream->nbuf <= 0) { - if (bstream->source & 0x7) + if (bstream->source & 0x7 || bstream->ntotal < sizeof(uint64_t)) len = sizeof(uint32_t); else len = sizeof(uint64_t); ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ struct uwx_bstream { copyin_cb copyin; ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_context.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_context.h" ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_context.h#2 (text+ko) ==== @@ -1,23 +1,25 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ extern uint64_t uwx_add_to_bsp(uint64_t bsp, int nslots); ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_env.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_env.h#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx.h" ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #define NSB_SPECIAL 9 #define NSB_GR 4 ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_self.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_self.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_step.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_context.h" ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_step.h#2 (text+ko) ==== @@ -1,1 +1,25 @@ +/* +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ + extern int uwx_restore_markers(struct uwx_env *env); ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_str.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_str.h" ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_str.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #define STRPOOLSIZE 400 ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_swap.h" ==== //depot/projects/netperf/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 29 12:20:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B0E416A4D2; Wed, 29 Oct 2003 12:20:33 -0800 (PST) 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 30C6916A4CF for ; Wed, 29 Oct 2003 12:20:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 518EC43FA3 for ; Wed, 29 Oct 2003 12:20:32 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TKKWXJ047581 for ; Wed, 29 Oct 2003 12:20:32 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TKKVnA047578 for perforce@freebsd.org; Wed, 29 Oct 2003 12:20:31 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 12:20:31 -0800 (PST) Message-Id: <200310292020.h9TKKVnA047578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40772 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: Wed, 29 Oct 2003 20:20:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=40772 Change 40772 by sam@sam_ebb on 2003/10/29 12:20:30 diff reduction against HEAD Affected files ... .. //depot/projects/netperf/sys/dev/wi/if_wi.c#10 edit .. //depot/projects/netperf/sys/net80211/ieee80211_radiotap.h#3 edit .. //depot/projects/netperf/sys/netatalk/at_rmx.c#3 edit .. //depot/projects/netperf/sys/netipsec/ipsec_osdep.h#3 edit Differences ... ==== //depot/projects/netperf/sys/dev/wi/if_wi.c#10 (text+ko) ==== @@ -1533,9 +1533,7 @@ /* * Send frame up for processing. */ - WI_UNLOCK(sc); ieee80211_input(ifp, m, ni, rssi, rstamp); - WI_LOCK(sc); /* * The frame may have caused the node to be marked for * reclamation (e.g. in response to a DEAUTH message) ==== //depot/projects/netperf/sys/net80211/ieee80211_radiotap.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.1 2003/09/05 22:19:32 sam Exp $ */ /* $NetBSD: $ */ /*- ==== //depot/projects/netperf/sys/netatalk/at_rmx.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include -#include #include int at_inithead(void **head, int off); ==== //depot/projects/netperf/sys/netipsec/ipsec_osdep.h#3 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/sys/netipsec/ipsec_osdep.h,v 1.1 2003/09/29 22:47:45 sam Exp $ */ /* $NetBSD: ipsec_osdep.h,v 1.1 2003/08/13 20:06:51 jonathan Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Wed Oct 29 13:22:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC36516A4D0; Wed, 29 Oct 2003 13:22:11 -0800 (PST) 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 A315516A4CE for ; Wed, 29 Oct 2003 13:22:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 256A843FCB for ; Wed, 29 Oct 2003 13:22:11 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TLMAXJ057281 for ; Wed, 29 Oct 2003 13:22:11 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TLMA89057278 for perforce@freebsd.org; Wed, 29 Oct 2003 13:22:10 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 13:22:10 -0800 (PST) Message-Id: <200310292122.h9TLMA89057278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40779 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: Wed, 29 Oct 2003 21:22:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=40779 Change 40779 by sam@sam_ebb on 2003/10/29 13:21:44 avoid recursive lock by unlocking before calling rtrequest; this is a bandaid to validate the problem--a proper fix is more involved Affected files ... .. //depot/projects/netperf/sys/net/route.c#20 edit Differences ... ==== //depot/projects/netperf/sys/net/route.c#20 (text+ko) ==== @@ -684,11 +684,12 @@ */ rt2 = rtalloc1(dst, 0, RTF_PRCLONING); if (rt2 && rt2->rt_parent) { + RT_UNLOCK(rt2); /* XXX recursive lock */ rtrequest(RTM_DELETE, rt_key(rt2), rt2->rt_gateway, rt_mask(rt2), rt2->rt_flags, 0); - RTFREE_LOCKED(rt2); + RTFREE(rt2); rn = rnh->rnh_addaddr(ndst, netmask, rnh, rt->rt_nodes); } else if (rt2) { From owner-p4-projects@FreeBSD.ORG Wed Oct 29 14:24:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DAF916A4D0; Wed, 29 Oct 2003 14:24:31 -0800 (PST) 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 6E9F416A4CE for ; Wed, 29 Oct 2003 14:24:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED38743FDD for ; Wed, 29 Oct 2003 14:24:30 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TMOUXJ061280 for ; Wed, 29 Oct 2003 14:24:30 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TMOU6U061277 for perforce@freebsd.org; Wed, 29 Oct 2003 14:24:30 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 14:24:30 -0800 (PST) Message-Id: <200310292224.h9TMOU6U061277@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40785 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: Wed, 29 Oct 2003 22:24:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=40785 Change 40785 by sam@sam_ebb on 2003/10/29 14:23:30 correct LOR by using a local variable to hold result instead of holding a lock while calling out of view Affected files ... .. //depot/projects/netperf/sys/netinet6/in6.c#11 edit Differences ... ==== //depot/projects/netperf/sys/netinet6/in6.c#11 (text+ko) ==== @@ -214,14 +214,16 @@ in6_ifaddloop(struct ifaddr *ifa) { struct rtentry *rt; + int need_loop; /* If there is no loopback entry, allocate one. */ rt = rtalloc1(ifa->ifa_addr, 0, 0); - if (rt == NULL || (rt->rt_flags & RTF_HOST) == 0 || - (rt->rt_ifp->if_flags & IFF_LOOPBACK) == 0) - in6_ifloop_request(RTM_ADD, ifa); + need_loop = (rt == NULL || (rt->rt_flags & RTF_HOST) == 0 || + (rt->rt_ifp->if_flags & IFF_LOOPBACK) == 0); if (rt) rtfree(rt); + if (need_loop) + in6_ifloop_request(RTM_ADD, ifa); } /* From owner-p4-projects@FreeBSD.ORG Wed Oct 29 16:46:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CD8116A4D0; Wed, 29 Oct 2003 16:46:00 -0800 (PST) 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 5FE3216A4CE for ; Wed, 29 Oct 2003 16:46:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D43543FE1 for ; Wed, 29 Oct 2003 16:45:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9U0jxXJ068746 for ; Wed, 29 Oct 2003 16:45:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U0jxxP068743 for perforce@freebsd.org; Wed, 29 Oct 2003 16:45:59 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 16:45:59 -0800 (PST) Message-Id: <200310300045.h9U0jxxP068743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40792 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: Thu, 30 Oct 2003 00:46:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=40792 Change 40792 by sam@sam_ebb on 2003/10/29 16:45:01 Overhaul routing table entry cleanup. The previous logic was flawed. In some cases the reference to the table entry could be used after calling rtrequest(RTM_DELETE) when the entry might have been reclaimed. Also, in some cases, we needed to drop the lock on the entry in order to avoid a recursive lock in order to delete the entry. To correct these problems we introduce a new rtexpunge routine that takes a locked routing table reference and removes all traces to the entry. Normal callbacks to the protocol-specific close methods handle cleanup of ancillary state. This also fixes problems where the close routine might try to immediately delete the entry which would invalidate the callers' references (unbeknownst to them). One remaining issue is the test in the ARP code to reclaim dynamic references specially. This will trigger an assertion failure because it calls rtexpunge with rt_refcnt 1. It's unclear why this call is needed at all as the RTFREE call that immediately follows should call the close method to reclaim state. It may be that we need to move the test for the dynamic entry into the close method instead of doing it in the ARP code. Awaiting feedback on that. Affected files ... .. //depot/projects/netperf/sys/net/route.c#21 edit .. //depot/projects/netperf/sys/net/route.h#10 edit .. //depot/projects/netperf/sys/netinet/if_ether.c#13 edit .. //depot/projects/netperf/sys/netinet/in_pcb.c#8 edit .. //depot/projects/netperf/sys/netinet/in_rmx.c#10 edit .. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#10 edit .. //depot/projects/netperf/sys/netinet6/in6_pcb.c#12 edit .. //depot/projects/netperf/sys/netinet6/in6_rmx.c#11 edit Differences ... ==== //depot/projects/netperf/sys/net/route.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.3.1.1 (Berkeley) 2/23/95 - * $FreeBSD: src/sys/net/route.c,v 1.87 2003/10/16 16:17:17 sam Exp $ + * $FreeBSD: src/sys/net/route.c,v 1.88 2003/10/29 23:01:37 sam Exp $ */ #include "opt_inet.h" @@ -230,7 +230,17 @@ */ if (--rt->rt_refcnt > 0) goto done; - /* XXX refcount==0? */ + + /* + * On last reference give the "close method" a chance + * cleanup private state. This also permits (for IPv4 + * and IPv6) a chance to decide if the routing table + * entry should be purge immediately or at a later time. + * When an immediate purge is to happen the close routine + * typically call rtexpunge which clears the RTF_UP flag + * on the entry so that the following code reclaims the + * storage. + */ if (rt->rt_refcnt == 0 && rnh->rnh_close) rnh->rnh_close((struct radix_node *)rt, rnh); @@ -524,6 +534,82 @@ return (error); } +/* + * Expunges references to a route that's about to be reclaimed. + * The route must be locked and have no held references. + */ +void +rtexpunge(struct rtentry *rt) +{ + struct radix_node *rn; + struct radix_node_head *rnh; + struct ifaddr *ifa; + + RT_LOCK_ASSERT(rt); + KASSERT(rt->rt_refcnt == 0, ("bogus refcnt %ld", rt->rt_refcnt)); + + /* + * Find the correct routing tree to use for this Address Family + */ + rnh = rt_tables[rt_key(rt)->sa_family]; + KASSERT(rnh != 0, ("no table for af %u", rt_key(rt)->sa_family)); + + RADIX_NODE_HEAD_LOCK(rnh); + + /* + * Remove the item from the tree; it must be there. + */ + rn = rnh->rnh_deladdr(rt_key(rt), rt_mask(rt), rnh); + KASSERT(rn != 0, ("no table entry")); + KASSERT((rn->rn_flags & (RNF_ACTIVE | RNF_ROOT)) == 0, + ("unexpected flags 0x%x", rn->rn_flags)); + KASSERT(rt == (struct rtentry *)rn, + ("lookup mismatch, rt %p rn %p", rt, rn)); + + rt->rt_flags &= ~RTF_UP; + + /* + * Now search what's left of the subtree for any cloned + * routes which might have been formed from this node. + */ + if ((rt->rt_flags & (RTF_CLONING | RTF_PRCLONING)) && rt_mask(rt)) + rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt), + rt_fixdelete, rt); + + /* + * Remove any external references we may have. + * This might result in another rtentry being freed if + * we held its last reference. + */ + if (rt->rt_gwroute) { + struct rtentry *gwrt = rt->rt_gwroute; + RTFREE(gwrt); + rt->rt_gwroute = 0; + } + + /* + * give the protocol a chance to keep things in sync. + */ + if ((ifa = rt->rt_ifa) && ifa->ifa_rtrequest) { + struct rt_addrinfo info; + + bzero((caddr_t)&info, sizeof(info)); + info.rti_flags = rt->rt_flags; + info.rti_info[RTAX_DST] = rt_key(rt); + info.rti_info[RTAX_GATEWAY] = rt->rt_gateway; + info.rti_info[RTAX_NETMASK] = rt_mask(rt); + ifa->ifa_rtrequest(RTM_DELETE, rt, &info); + } + + /* + * one more rtentry floating around that is not + * linked to the routing table. + */ + rttrash++; + + RADIX_NODE_HEAD_UNLOCK(rnh); +} + int rtrequest1(int req, struct rt_addrinfo *info, struct rtentry **ret_nrt) { @@ -684,12 +770,8 @@ */ rt2 = rtalloc1(dst, 0, RTF_PRCLONING); if (rt2 && rt2->rt_parent) { - RT_UNLOCK(rt2); /* XXX recursive lock */ - rtrequest(RTM_DELETE, - rt_key(rt2), - rt2->rt_gateway, - rt_mask(rt2), rt2->rt_flags, 0); - RTFREE(rt2); + rtexpunge(rt2); + RT_UNLOCK(rt2); rn = rnh->rnh_addaddr(ndst, netmask, rnh, rt->rt_nodes); } else if (rt2) { ==== //depot/projects/netperf/sys/net/route.h#10 (text+ko) ==== @@ -297,6 +297,7 @@ void rtalloc_ign(struct route *, u_long); /* NB: the rtentry is returned locked */ struct rtentry *rtalloc1(struct sockaddr *, int, u_long); +void rtexpunge(struct rtentry *); void rtfree(struct rtentry *); int rtinit(struct ifaddr *, int, int); int rtioctl(u_long, caddr_t); ==== //depot/projects/netperf/sys/netinet/if_ether.c#13 (text+ko) ==== @@ -949,14 +949,9 @@ * arplookup() is creating the route, then purge * it from the routing table as it is probably bogus. */ - RT_UNLOCK(rt); - if (rt->rt_refcnt == 1 && ISDYNCLONE(rt)) { - rtrequest(RTM_DELETE, - (struct sockaddr *)rt_key(rt), - rt->rt_gateway, rt_mask(rt), - rt->rt_flags, 0); - } - RTFREE(rt); + if (rt->rt_refcnt == 1 && ISDYNCLONE(rt)) + rtexpunge(rt); + RTFREE_LOCKED(rt); return (0); #undef ISDYNCLONE } else { ==== //depot/projects/netperf/sys/netinet/in_pcb.c#8 (text+ko) ==== @@ -871,11 +871,9 @@ info.rti_info[RTAX_GATEWAY] = rt->rt_gateway; info.rti_info[RTAX_NETMASK] = rt_mask(rt); rt_missmsg(RTM_LOSING, &info, rt->rt_flags, 0); - if (rt->rt_flags & RTF_DYNAMIC) { - RT_UNLOCK(rt); /* XXX refcnt? */ - (void) rtrequest1(RTM_DELETE, &info, NULL); - } else - rtfree(rt); + if (rt->rt_flags & RTF_DYNAMIC) + rtexpunge(rt); + RTFREE_LOCKED(rt); /* * A new route can be allocated * the next time output is attempted. ==== //depot/projects/netperf/sys/netinet/in_rmx.c#10 (text+ko) ==== @@ -125,17 +125,12 @@ rt2->rt_flags & RTF_HOST && rt2->rt_gateway && rt2->rt_gateway->sa_family == AF_LINK) { - /* NB: must unlock to avoid recursion */ - RT_UNLOCK(rt2); - rtrequest(RTM_DELETE, - (struct sockaddr *)rt_key(rt2), - rt2->rt_gateway, rt_mask(rt2), - rt2->rt_flags, 0); + rtexpunge(rt2); + RTFREE_LOCKED(rt2); ret = rn_addroute(v_arg, n_arg, head, treenodes); - RT_LOCK(rt2); - } - RTFREE_LOCKED(rt2); + } else + RTFREE_LOCKED(rt2); } } @@ -211,13 +206,7 @@ rt->rt_flags |= RTPRF_OURS; rt->rt_rmx.rmx_expire = time_second + rtq_reallyold; } else { - /* NB: must unlock to avoid recursion */ - RT_UNLOCK(rt); - rtrequest(RTM_DELETE, - (struct sockaddr *)rt_key(rt), - rt->rt_gateway, rt_mask(rt), - rt->rt_flags, 0); - RT_LOCK(rt); + rtexpunge(rt); } } @@ -385,7 +374,6 @@ { struct in_ifadown_arg *ap = xap; struct rtentry *rt = (struct rtentry *)rn; - int err; if (rt->rt_ifa == ap->ifa && (ap->del || !(rt->rt_flags & RTF_STATIC))) { @@ -399,12 +387,8 @@ */ RT_LOCK(rt); rt->rt_flags &= ~(RTF_CLONING | RTF_PRCLONING); - RT_UNLOCK(rt); - err = rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt), - rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0); - if (err) { - log(LOG_WARNING, "in_ifadownkill: error %d\n", err); - } + rtexpunge(rt); + RTFREE_LOCKED(rt); } return 0; } ==== //depot/projects/netperf/sys/netinet6/in6_ifattach.c#10 (text+ko) ==== @@ -906,13 +906,9 @@ sin6.sin6_addr.s6_addr16[1] = htons(ifp->if_index); rt = rtalloc1((struct sockaddr *)&sin6, 0, 0UL); if (rt) { - if (rt->rt_ifp == ifp) { - RT_UNLOCK(rt); - rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt), - rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0); - RTFREE(rt); - } else - rtfree(rt); + if (rt->rt_ifp == ifp) + rtexpunge(rt); + RTFREE_LOCKED(rt); } } ==== //depot/projects/netperf/sys/netinet6/in6_pcb.c#12 (text+ko) ==== @@ -842,11 +842,9 @@ info.rti_info[RTAX_GATEWAY] = rt->rt_gateway; info.rti_info[RTAX_NETMASK] = rt_mask(rt); rt_missmsg(RTM_LOSING, &info, rt->rt_flags, 0); - if (rt->rt_flags & RTF_DYNAMIC) { - RT_UNLOCK(rt); /* XXX refcnt? */ - (void)rtrequest1(RTM_DELETE, &info, NULL); - } else - rtfree(rt); + if (rt->rt_flags & RTF_DYNAMIC) + rtexpunge(rt); + RTFREE_LOCKED(rt); /* * A new route can be allocated * the next time output is attempted. ==== //depot/projects/netperf/sys/netinet6/in6_rmx.c#11 (text+ko) ==== @@ -167,17 +167,12 @@ rt2->rt_flags & RTF_HOST && rt2->rt_gateway && rt2->rt_gateway->sa_family == AF_LINK) { - /* NB: must unlock to avoid recursion */ - RT_UNLOCK(rt2); - rtrequest(RTM_DELETE, - (struct sockaddr *)rt_key(rt2), - rt2->rt_gateway, - rt_mask(rt2), rt2->rt_flags, 0); + rtexpunge(rt2); + RTFREE_LOCKED(rt2); ret = rn_addroute(v_arg, n_arg, head, treenodes); - RT_LOCK(rt2); - } - RTFREE_LOCKED(rt2); + } else + RTFREE_LOCKED(rt2); } } else if (ret == NULL && rt->rt_flags & RTF_CLONING) { struct rtentry *rt2; @@ -276,13 +271,7 @@ rt->rt_flags |= RTPRF_OURS; rt->rt_rmx.rmx_expire = time_second + rtq_reallyold; } else { - /* NB: must unlock to avoid recursion */ - RT_UNLOCK(rt); - rtrequest(RTM_DELETE, - (struct sockaddr *)rt_key(rt), - rt->rt_gateway, rt_mask(rt), - rt->rt_flags, 0); - RT_LOCK(rt); + rtexpunge(rt); } } From owner-p4-projects@FreeBSD.ORG Wed Oct 29 17:53:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 126A716A4D0; Wed, 29 Oct 2003 17:53:22 -0800 (PST) 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 BD5D716A4CE for ; Wed, 29 Oct 2003 17:53:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BC6B43FB1 for ; Wed, 29 Oct 2003 17:53:21 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9U1rKXJ077729 for ; Wed, 29 Oct 2003 17:53:21 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U1rKoT077726 for perforce@freebsd.org; Wed, 29 Oct 2003 17:53:20 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 17:53:20 -0800 (PST) Message-Id: <200310300153.h9U1rKoT077726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40793 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: Thu, 30 Oct 2003 01:53:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=40793 Change 40793 by sam@sam_ebb on 2003/10/29 17:52:59 It is not possible to assume anything about the number of held references when rtexpunge is called; remove the comment and associated assertion. Affected files ... .. //depot/projects/netperf/sys/net/route.c#22 edit Differences ... ==== //depot/projects/netperf/sys/net/route.c#22 (text+ko) ==== @@ -536,7 +536,7 @@ /* * Expunges references to a route that's about to be reclaimed. - * The route must be locked and have no held references. + * The route must be locked. */ void rtexpunge(struct rtentry *rt) @@ -546,8 +546,14 @@ struct ifaddr *ifa; RT_LOCK_ASSERT(rt); - KASSERT(rt->rt_refcnt == 0, ("bogus refcnt %ld", rt->rt_refcnt)); - +#if 0 + /* + * We cannot assume anything about the reference count + * because protocols call us in many situations; often + * before unwinding references to the table entry. + */ + KASSERT(rt->rt_refcnt <= 1, ("bogus refcnt %ld", rt->rt_refcnt)); +#endif /* * Find the correct routing tree to use for this Address Family */ From owner-p4-projects@FreeBSD.ORG Wed Oct 29 17:54:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8CB716A4D1; Wed, 29 Oct 2003 17:54:23 -0800 (PST) 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 7772316A4CF for ; Wed, 29 Oct 2003 17:54:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F246B43FAF for ; Wed, 29 Oct 2003 17:54:22 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9U1sMXJ077780 for ; Wed, 29 Oct 2003 17:54:22 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U1sMgt077777 for perforce@freebsd.org; Wed, 29 Oct 2003 17:54:22 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 17:54:22 -0800 (PST) Message-Id: <200310300154.h9U1sMgt077777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40794 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: Thu, 30 Oct 2003 01:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=40794 Change 40794 by sam@sam_ebb on 2003/10/29 17:54:03 conservatively expand scope of locking Affected files ... .. //depot/projects/netperf/sys/netinet/in_rmx.c#11 edit Differences ... ==== //depot/projects/netperf/sys/netinet/in_rmx.c#11 (text+ko) ==== @@ -375,6 +375,7 @@ struct in_ifadown_arg *ap = xap; struct rtentry *rt = (struct rtentry *)rn; + RT_LOCK(rt); if (rt->rt_ifa == ap->ifa && (ap->del || !(rt->rt_flags & RTF_STATIC))) { /* @@ -385,11 +386,11 @@ * the routes that rtrequest() would have in any case, * so that behavior is not needed there. */ - RT_LOCK(rt); rt->rt_flags &= ~(RTF_CLONING | RTF_PRCLONING); rtexpunge(rt); RTFREE_LOCKED(rt); - } + } else + RT_UNLOCK(rt); return 0; } From owner-p4-projects@FreeBSD.ORG Wed Oct 29 18:14:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E065F16A4D0; Wed, 29 Oct 2003 18:14:48 -0800 (PST) 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 B8CA416A4CE for ; Wed, 29 Oct 2003 18:14:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4218743FBD for ; Wed, 29 Oct 2003 18:14:48 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9U2EmXJ079551 for ; Wed, 29 Oct 2003 18:14:48 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U2El6c079548 for perforce@freebsd.org; Wed, 29 Oct 2003 18:14:47 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 18:14:47 -0800 (PST) Message-Id: <200310300214.h9U2El6c079548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40795 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: Thu, 30 Oct 2003 02:14:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=40795 Change 40795 by sam@sam_ebb on 2003/10/29 18:14:45 grab the tree lock before calling rtexpunge to avoid a LOR seen when ejecting a removable NIC Affected files ... .. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#11 edit Differences ... ==== //depot/projects/netperf/sys/netinet6/in6_ifattach.c#11 (text+ko) ==== @@ -904,12 +904,15 @@ sin6.sin6_family = AF_INET6; sin6.sin6_addr = in6addr_linklocal_allnodes; sin6.sin6_addr.s6_addr16[1] = htons(ifp->if_index); + /* XXX grab lock first to avoid LOR */ + RADIX_NODE_HEAD_LOCK(rt_tables[AF_INET6]); rt = rtalloc1((struct sockaddr *)&sin6, 0, 0UL); if (rt) { if (rt->rt_ifp == ifp) rtexpunge(rt); RTFREE_LOCKED(rt); } + RADIX_NODE_HEAD_UNLOCK(rt_tables[AF_INET6]); } void From owner-p4-projects@FreeBSD.ORG Wed Oct 29 18:15:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D955C16A4D0; Wed, 29 Oct 2003 18:15:50 -0800 (PST) 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 B4B0716A4CE for ; Wed, 29 Oct 2003 18:15:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C98243FBD for ; Wed, 29 Oct 2003 18:15:50 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9U2FoXJ079655 for ; Wed, 29 Oct 2003 18:15:50 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U2FnTm079652 for perforce@freebsd.org; Wed, 29 Oct 2003 18:15:49 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 29 Oct 2003 18:15:49 -0800 (PST) Message-Id: <200310300215.h9U2FnTm079652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40796 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: Thu, 30 Oct 2003 02:15:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=40796 Change 40796 by sam@sam_ebb on 2003/10/29 18:15:18 use a local variable to eliminate holding a lock across a call out of view Affected files ... .. //depot/projects/netperf/sys/netinet6/nd6_nbr.c#6 edit Differences ... ==== //depot/projects/netperf/sys/netinet6/nd6_nbr.c#6 (text+ko) ==== @@ -207,6 +207,7 @@ if (!ifa) { struct rtentry *rt; struct sockaddr_in6 tsin6; + int need_proxy; bzero(&tsin6, sizeof tsin6); tsin6.sin6_len = sizeof(struct sockaddr_in6); @@ -214,8 +215,11 @@ tsin6.sin6_addr = taddr6; rt = rtalloc1((struct sockaddr *)&tsin6, 0, 0); - if (rt && (rt->rt_flags & RTF_ANNOUNCE) != 0 && - rt->rt_gateway->sa_family == AF_LINK) { + need_proxy = (rt && (rt->rt_flags & RTF_ANNOUNCE) != 0 && + rt->rt_gateway->sa_family == AF_LINK); + if (rt) + rtfree(rt); + if (need_proxy) { /* * proxy NDP for single entry */ @@ -226,8 +230,6 @@ proxydl = SDL(rt->rt_gateway); } } - if (rt) - rtfree(rt); } if (!ifa) { /* From owner-p4-projects@FreeBSD.ORG Wed Oct 29 21:20:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D862416A4D0; Wed, 29 Oct 2003 21:20:37 -0800 (PST) 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 B247516A4CE for ; Wed, 29 Oct 2003 21:20:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30D3C43FAF for ; Wed, 29 Oct 2003 21:20:37 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9U5KbXJ095514 for ; Wed, 29 Oct 2003 21:20:37 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U5KasO095511 for perforce@freebsd.org; Wed, 29 Oct 2003 21:20:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 29 Oct 2003 21:20:36 -0800 (PST) Message-Id: <200310300520.h9U5KasO095511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 40802 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: Thu, 30 Oct 2003 05:20:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=40802 Change 40802 by rwatson@rwatson_paprika on 2003/10/29 21:19:41 Fix years. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#14 (text+ko) ==== @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Alfred Perlstein - * Copyright (c) 2001, 2002, 2003 Networks Associates Technology, Inc. + * Copyright (c) 2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project in part by Network From owner-p4-projects@FreeBSD.ORG Wed Oct 29 21:23:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4479616A4D1; Wed, 29 Oct 2003 21:23:42 -0800 (PST) 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 1FC0B16A4CF for ; Wed, 29 Oct 2003 21:23:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D85F43F85 for ; Wed, 29 Oct 2003 21:23:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9U5NfXJ095559 for ; Wed, 29 Oct 2003 21:23:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U5NfhF095556 for perforce@freebsd.org; Wed, 29 Oct 2003 21:23:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 29 Oct 2003 21:23:41 -0800 (PST) Message-Id: <200310300523.h9U5NfhF095556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 40803 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: Thu, 30 Oct 2003 05:23:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=40803 Change 40803 by rwatson@rwatson_paprika on 2003/10/29 21:23:38 M_WAITOK doesn't fail with normal kernel malloc(). Pointed out by: rishi Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#15 (text+ko) ==== @@ -226,8 +226,7 @@ /* XXX Use p31b_getcfg(CTL_P1003_1B_SEM_VALUE_MAX) instead? */ if (value > SEM_VALUE_MAX) return (EINVAL); - if( (ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO)) == NULL) - return (ENOMEM); + ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO); if (name != NULL) { len = strlen(name); if (len > SEM_MAX_NAMELEN) { @@ -239,10 +238,7 @@ free(ret, M_SEM); return (EINVAL); } - if( (ret->ks_name = malloc(len + 1, M_SEM, M_WAITOK)) == NULL){ - free(ret, M_SEM); - return (ENOMEM); - } + ret->ks_name = malloc(len + 1, M_SEM, M_WAITOK); strcpy(ret->ks_name, name); } else { ret->ks_name = NULL; @@ -597,8 +593,7 @@ mtx_assert(&sem_lock, MA_NOTOWNED); mtx_assert(&ks->ks_mtx, MA_NOTOWNED); - if( (ku = malloc(sizeof(*ku), M_SEM, M_WAITOK | M_ZERO)) == NULL) - return; + ku = malloc(sizeof(*ku), M_SEM, M_WAITOK | M_ZERO); ku->ku_pid = p->p_pid; mtx_lock(&sem_lock); k = sem_getuser(p, ks); From owner-p4-projects@FreeBSD.ORG Thu Oct 30 08:38:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80BC216A4D0; Thu, 30 Oct 2003 08:38:43 -0800 (PST) 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 3A87416A4CF for ; Thu, 30 Oct 2003 08:38:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7288943FBD for ; Thu, 30 Oct 2003 08:38:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UGcgXJ043942 for ; Thu, 30 Oct 2003 08:38:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UGcf6B043939 for perforce@freebsd.org; Thu, 30 Oct 2003 08:38:41 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 30 Oct 2003 08:38:41 -0800 (PST) Message-Id: <200310301638.h9UGcf6B043939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40838 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: Thu, 30 Oct 2003 16:38:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=40838 Change 40838 by sam@sam_ebb on 2003/10/30 08:38:35 o change rtexpunge to not assume the entry is in the radix table (a la RTM_DELETE normal behaviour) so callers can invoke it w/o worries o change rtexpunge to return an error code to indicate if a change was done o use rtexpunage to eliminate a recursive lock when deleting a route on an icmp redirect Affected files ... .. //depot/projects/netperf/sys/net/route.c#23 edit .. //depot/projects/netperf/sys/net/route.h#11 edit Differences ... ==== //depot/projects/netperf/sys/net/route.c#23 (text+ko) ==== @@ -538,12 +538,13 @@ * Expunges references to a route that's about to be reclaimed. * The route must be locked. */ -void +int rtexpunge(struct rtentry *rt) { struct radix_node *rn; struct radix_node_head *rnh; struct ifaddr *ifa; + int error = 0; RT_LOCK_ASSERT(rt); #if 0 @@ -558,7 +559,8 @@ * Find the correct routing tree to use for this Address Family */ rnh = rt_tables[rt_key(rt)->sa_family]; - KASSERT(rnh != 0, ("no table for af %u", rt_key(rt)->sa_family)); + if (rnh == 0) + return (EAFNOSUPPORT); RADIX_NODE_HEAD_LOCK(rnh); @@ -566,7 +568,10 @@ * Remove the item from the tree; it must be there. */ rn = rnh->rnh_deladdr(rt_key(rt), rt_mask(rt), rnh); - KASSERT(rn != 0, ("no table entry")); + if (rn == 0) { + error = ESRCH; + goto bad; + } KASSERT((rn->rn_flags & (RNF_ACTIVE | RNF_ROOT)) == 0, ("unexpected flags 0x%x", rn->rn_flags)); KASSERT(rt == (struct rtentry *)rn, @@ -612,8 +617,9 @@ * linked to the routing table. */ rttrash++; - +bad: RADIX_NODE_HEAD_UNLOCK(rnh); + return (error); } int @@ -1024,8 +1030,7 @@ * or a routing redirect, so try to delete it. */ if (rt_key(rt)) - rtrequest(RTM_DELETE, rt_key(rt), - rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0); + rtexpunge(rt); return EADDRNOTAVAIL; } ==== //depot/projects/netperf/sys/net/route.h#11 (text+ko) ==== @@ -297,7 +297,7 @@ void rtalloc_ign(struct route *, u_long); /* NB: the rtentry is returned locked */ struct rtentry *rtalloc1(struct sockaddr *, int, u_long); -void rtexpunge(struct rtentry *); +int rtexpunge(struct rtentry *); void rtfree(struct rtentry *); int rtinit(struct ifaddr *, int, int); int rtioctl(u_long, caddr_t); From owner-p4-projects@FreeBSD.ORG Thu Oct 30 08:42:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEF9816A4D0; Thu, 30 Oct 2003 08:42:49 -0800 (PST) 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 9987C16A4CE for ; Thu, 30 Oct 2003 08:42:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 379B243FAF for ; Thu, 30 Oct 2003 08:42:48 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UGgmXJ044132 for ; Thu, 30 Oct 2003 08:42:48 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UGglQj044129 for perforce@freebsd.org; Thu, 30 Oct 2003 08:42:47 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 30 Oct 2003 08:42:47 -0800 (PST) Message-Id: <200310301642.h9UGglQj044129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40839 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: Thu, 30 Oct 2003 16:42:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=40839 Change 40839 by sam@sam_ebb on 2003/10/30 08:42:36 IFC @ 40838 Affected files ... .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/netperf/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/netperf/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/netperf/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#8 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_intr.c#6 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#6 integrate .. //depot/projects/netperf/sys/dev/sound/isa/mpu.c#3 integrate .. //depot/projects/netperf/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakecode.S#5 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/netperf/sys/i386/i386/trap.c#5 integrate .. //depot/projects/netperf/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_sig.c#8 integrate .. //depot/projects/netperf/sys/kern/vfs_default.c#3 integrate .. //depot/projects/netperf/sys/net/route.c#24 integrate .. //depot/projects/netperf/sys/netinet6/in6.c#12 integrate .. //depot/projects/netperf/sys/netinet6/in6.h#5 integrate .. //depot/projects/netperf/sys/netinet6/in6_src.c#15 integrate .. //depot/projects/netperf/sys/netinet6/in6_var.h#6 integrate .. //depot/projects/netperf/sys/netinet6/ip6_input.c#16 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#10 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#14 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.443 2003/10/14 05:51:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.444 2003/10/30 04:08:22 peter Exp $"); /* * Manages physical address maps. @@ -2695,7 +2695,6 @@ vm_size_t size; { vm_offset_t base, offset, tmpva; - pt_entry_t *pte; /* If we gave a direct map region in pmap_mapdev, do nothing */ if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) @@ -2703,10 +2702,8 @@ base = va & PG_FRAME; offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); - for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) { - pte = vtopte(tmpva); - pte_clear(pte); - } + for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) + pmap_kremove(tmpva); pmap_invalidate_range(kernel_pmap, va, tmpva); kmem_free(kernel_map, base, size); } ==== //depot/projects/netperf/sys/amd64/amd64/trap.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.267 2003/10/28 01:06:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.268 2003/10/30 04:06:28 peter Exp $"); /* * AMD64 Trap and System call handling @@ -261,6 +261,8 @@ break; case T_PAGEFLT: /* page fault */ + if (td->td_flags & TDF_SA) + thread_user_enter(p, td); i = trap_pfault(&frame, TRUE); if (i == -1) goto userout; ==== //depot/projects/netperf/sys/compat/freebsd32/freebsd32.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/compat/freebsd32/freebsd32.h,v 1.2 2003/08/22 23:07:28 peter Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.3 2003/10/30 02:40:30 peter Exp $ */ #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_ @@ -75,6 +75,8 @@ int32_t ru_nivcsw; }; +#define FREEBSD32_MNAMELEN (88 - 2 * sizeof(int32_t)) /* size of on/from name bufs */ + struct statfs32 { int32_t f_spare2; int32_t f_bsize; @@ -91,12 +93,12 @@ int32_t f_syncwrites; int32_t f_asyncwrites; char f_fstypename[MFSNAMELEN]; - char f_mntonname[MNAMELEN]; + char f_mntonname[FREEBSD32_MNAMELEN]; int32_t f_syncreads; int32_t f_asyncreads; int16_t f_spares1; - char f_mntfromname[MNAMELEN]; - int16_t f_spares2; + char f_mntfromname[FREEBSD32_MNAMELEN]; + int16_t f_spares2 __packed; int32_t f_spare[2]; }; ==== //depot/projects/netperf/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.13 2003/08/23 00:04:52 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.14 2003/10/30 02:40:30 peter Exp $"); #include "opt_compat.h" @@ -79,6 +79,11 @@ #include #include +CTASSERT(sizeof(struct timeval32) == 8); +CTASSERT(sizeof(struct timespec32) == 8); +CTASSERT(sizeof(struct statfs32) == 256); +CTASSERT(sizeof(struct rusage32) == 72); + /* * [ taken from the linux emulator ] * Search an alternate path before passing pathname arguments on @@ -356,6 +361,8 @@ int ss_flags; }; +CTASSERT(sizeof(struct sigaltstack32) == 12); + int freebsd32_sigaltstack(struct thread *td, struct freebsd32_sigaltstack_args *uap) @@ -589,6 +596,8 @@ struct timeval32 it_value; }; +CTASSERT(sizeof(struct itimerval32) == 16); + int freebsd32_setitimer(struct thread *td, struct freebsd32_setitimer_args *uap) { @@ -668,6 +677,8 @@ u_int32_t udata; /* opaque user data identifier */ }; +CTASSERT(sizeof(struct kevent32) == 20); + int freebsd32_kevent(struct thread *td, struct freebsd32_kevent_args *uap) { @@ -819,6 +830,8 @@ }; #define STACKGAPLEN 400 +CTASSERT(sizeof(struct iovec32) == 8); + int freebsd32_readv(struct thread *td, struct freebsd32_readv_args *uap) { @@ -1198,8 +1211,14 @@ u_int32_t st_blksize; u_int32_t st_flags; u_int32_t st_gen; + struct timespec32 st_birthtimespec; + unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32)); + unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32)); }; + +CTASSERT(sizeof(struct stat32) == 96); + static void copy_stat( struct stat *in, struct stat32 *out) { @@ -1342,6 +1361,8 @@ sigset_t sa_mask; }; +CTASSERT(sizeof(struct sigaction32) == 24); + int freebsd32_sigaction(struct thread *td, struct freebsd32_sigaction_args *uap) { ==== //depot/projects/netperf/sys/compat/ia32/ia32_signal.h#2 (text+ko) ==== @@ -26,7 +26,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/ia32/ia32_signal.h,v 1.1 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_signal.h,v 1.2 2003/10/30 02:40:30 peter Exp $ */ struct ia32_sigaltstack { @@ -35,7 +35,6 @@ int ss_flags; /* SS_DISABLE and/or SS_ONSTACK */ }; -/* XXX should be 640 bytes long; check and see if __packed is needed */ struct ia32_mcontext { int mc_onstack; /* XXX - sigcontext compat. */ int mc_gs; /* machine state (struct trapframe) */ @@ -69,7 +68,6 @@ int mc_spare2[8]; }; -/* XXX should be 704 bytes long; check and see if __packed is needed */ struct ia32_ucontext { sigset_t uc_sigmask; struct ia32_mcontext uc_mcontext; ==== //depot/projects/netperf/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.9 2003/09/25 01:10:23 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.10 2003/10/30 02:43:19 peter Exp $"); #include "opt_compat.h" @@ -75,6 +75,16 @@ #include #include +CTASSERT(sizeof(struct ia32_mcontext) == 640); +CTASSERT(sizeof(struct ia32_ucontext) == 704); +CTASSERT(sizeof(struct ia32_sigframe) == 800); +CTASSERT(sizeof(struct ia32_siginfo) == 64); +#ifdef COMPAT_FREEBSD4 +CTASSERT(sizeof(struct ia32_mcontext4) == 260); +CTASSERT(sizeof(struct ia32_ucontext4) == 324); +CTASSERT(sizeof(struct ia32_sigframe4) == 408); +#endif + static register_t *ia32_copyout_strings(struct image_params *imgp); static void ia32_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); ==== //depot/projects/netperf/sys/dev/ata/ata-chipset.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.43 2003/10/28 21:08:14 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.44 2003/10/30 13:16:21 sos Exp $"); #include "opt_ata.h" #include @@ -167,6 +167,14 @@ atadev->mode = mode; } +static void +ata_sata_setmode(struct ata_device *atadev, int mode) +{ + mode = ata_limit_mode(atadev, mode, ATA_DMA_MAX); + if (!ata_controlcmd(atadev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode)) + atadev->mode = mode; +} + /* * Acard chipset support functions */ @@ -819,8 +827,10 @@ if (ctlr->chip->chipid == ATA_I82371FB) ctlr->setmode = ata_intel_old_setmode; - else + else if (ctlr->chip->max_dma < ATA_SA150) ctlr->setmode = ata_intel_new_setmode; + else + ctlr->setmode = ata_sata_setmode; return 0; } @@ -849,8 +859,7 @@ mode = ata_limit_mode(atadev, mode, ctlr->chip->max_dma); - if (ctlr->chip->max_dma < ATA_SA150 && mode > ATA_UDMA2 && - !(reg54 & (0x10 << devno))) { + if ( mode > ATA_UDMA2 && !(reg54 & (0x10 << devno))) { ata_prtdev(atadev,"DMA limited to UDMA33, non-ATA66 cable or device\n"); mode = ATA_UDMA2; } @@ -864,47 +873,46 @@ if (error) return; - if (ctlr->chip->max_dma < ATA_SA150) { - if (mode >= ATA_UDMA0) { - pci_write_config(parent, 0x48, reg48 | (0x0001 << devno), 2); - pci_write_config(parent, 0x4a, (reg4a & ~(0x3 << (devno<<2))) | - (0x01 + !(mode & 0x01)), 2); - } - else { - pci_write_config(parent, 0x48, reg48 & ~(0x0001 << devno), 2); - pci_write_config(parent, 0x4a, (reg4a & ~(0x3 << (devno << 2))), 2); - } - if (mode >= ATA_UDMA2) - pci_write_config(parent, 0x54, reg54 | (0x1 << devno), 2); - else - pci_write_config(parent, 0x54, reg54 & ~(0x1 << devno), 2); + if (mode >= ATA_UDMA0) { + pci_write_config(parent, 0x48, reg48 | (0x0001 << devno), 2); + pci_write_config(parent, 0x4a, (reg4a & ~(0x3 << (devno<<2))) | + (0x01 + !(mode & 0x01)), 2); + } + else { + pci_write_config(parent, 0x48, reg48 & ~(0x0001 << devno), 2); + pci_write_config(parent, 0x4a, (reg4a & ~(0x3 << (devno << 2))), 2); + } + if (mode >= ATA_UDMA2) + pci_write_config(parent, 0x54, reg54 | (0x1 << devno), 2); + else + pci_write_config(parent, 0x54, reg54 & ~(0x1 << devno), 2); - if (mode >= ATA_UDMA5) - pci_write_config(parent, 0x54, reg54 | (0x10000 << devno), 2); - else - pci_write_config(parent, 0x54, reg54 & ~(0x10000 << devno), 2); + if (mode >= ATA_UDMA5) + pci_write_config(parent, 0x54, reg54 | (0x10000 << devno), 2); + else + pci_write_config(parent, 0x54, reg54 & ~(0x10000 << devno), 2); - reg40 &= ~0x00ff00ff; - reg40 |= 0x40774077; + reg40 &= ~0x00ff00ff; + reg40 |= 0x40774077; - if (atadev->unit == ATA_MASTER) { - mask40 = 0x3300; - new40 = timings[ata_mode2idx(mode)] << 8; - } - else { - mask44 = 0x0f; - new44 = ((timings[ata_mode2idx(mode)] & 0x30) >> 2) | - (timings[ata_mode2idx(mode)] & 0x03); - } - if (atadev->channel->unit) { - mask40 <<= 16; - new40 <<= 16; - mask44 <<= 4; - new44 <<= 4; - } - pci_write_config(parent, 0x40, (reg40 & ~mask40) | new40, 4); - pci_write_config(parent, 0x44, (reg44 & ~mask44) | new44, 1); + if (atadev->unit == ATA_MASTER) { + mask40 = 0x3300; + new40 = timings[ata_mode2idx(mode)] << 8; + } + else { + mask44 = 0x0f; + new44 = ((timings[ata_mode2idx(mode)] & 0x30) >> 2) | + (timings[ata_mode2idx(mode)] & 0x03); + } + if (atadev->channel->unit) { + mask40 <<= 16; + new40 <<= 16; + mask44 <<= 4; + new44 <<= 4; } + pci_write_config(parent, 0x40, (reg40 & ~mask40) | new40, 4); + pci_write_config(parent, 0x44, (reg44 & ~mask44) | new44, 1); + atadev->mode = mode; } @@ -1199,11 +1207,12 @@ ch->r_io[ATA_BMDTP_PORT].res = ctlr->r_io2; ch->r_io[ATA_BMDTP_PORT].offset = 0x244 + (ch->unit << 7); ch->r_io[ATA_BMDEVSPEC_0].res = ctlr->r_io2; - ch->r_io[ATA_BMDEVSPEC_0].offset = (ch->unit << 2); + ch->r_io[ATA_BMDEVSPEC_0].offset = ((ch->unit + 1) << 2); ch->r_io[ATA_IDX_ADDR].res = ctlr->r_io2; ATA_IDX_OUTL(ch, ATA_BMCMD_PORT, - (ATA_IDX_INL(ch, ATA_BMCMD_PORT) & ~0x00000f8f) | ch->unit); + (ATA_IDX_INL(ch, ATA_BMCMD_PORT) & ~0x00003f9f) | + (ch->unit + 1)); ATA_IDX_OUTL(ch, ATA_BMDEVSPEC_0, 0x00000001); ch->flags |= (ATA_NO_SLAVE | ATA_USE_16BIT); @@ -1274,9 +1283,12 @@ irq_vector = ATA_INL(ctlr->r_io2, 0x0040); for (unit = 0; unit < ctlr->channels; unit++) { - if (irq_vector & (1 << unit)) { + if (irq_vector & (1 << (unit + 1))) { if ((ch = ctlr->interrupt[unit].argument)) { ctlr->interrupt[unit].function(ch); + ATA_IDX_OUTL(ch, ATA_BMCMD_PORT, + (ATA_IDX_INL(ch, ATA_BMCMD_PORT) & ~0x00003f9f) | + (ch->unit + 1)); ATA_IDX_OUTL(ch, ATA_BMDEVSPEC_0, 0x00000001); } } @@ -1619,7 +1631,10 @@ pci_write_config(dev, 0x8a, (pci_read_config(dev, 0x8a, 1) & 0x3f), 1); ctlr->allocate = ata_sii_mio_allocate; - ctlr->setmode = ata_sii_setmode; + if (ctlr->chip->max_dma >= ATA_SA150) + ctlr->setmode = ata_sata_setmode; + else + ctlr->setmode = ata_sii_setmode; } else { if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, @@ -1735,7 +1750,7 @@ int rego = (atadev->channel->unit << 4) + (ATA_DEV(atadev->unit) << 1); int mreg = atadev->channel->unit ? 0x84 : 0x80; int mask = 0x03 << (ATA_DEV(atadev->unit) << 2); - int mval; + int mval = pci_read_config(parent, mreg, 1) & ~mask; int error; mode = ata_limit_mode(atadev, mode, ctlr->chip->max_dma); @@ -1743,12 +1758,10 @@ if (ctlr->chip->max_dma < ATA_UDMA2) { mode = ata_check_80pin(atadev, mode); } - else if (ctlr->chip->max_dma < ATA_SA150 && mode > ATA_UDMA2 && - (pci_read_config(parent, 0x79, 1) & - (atadev->channel->unit ? 0x02 : 0x01))) { - ata_prtdev(atadev, - "DMA limited to UDMA33, non-ATA66 cable or device\n"); - mode = ATA_UDMA2; + else if (mode > ATA_UDMA2 && (pci_read_config(parent, 0x79, 1) & + (atadev->channel->unit ? 0x02 : 0x01))) { + ata_prtdev(atadev,"DMA limited to UDMA33, non-ATA66 cable or device\n"); + mode = ATA_UDMA2; } error = ata_controlcmd(atadev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode); @@ -1757,41 +1770,36 @@ ata_prtdev(atadev, "%ssetting %s on %s chip\n", (error) ? "FAILURE " : "", ata_mode2str(mode), ctlr->chip->text); - if (error) return; - mval = pci_read_config(parent, mreg, 1) & ~mask; + if (mode >= ATA_UDMA0) { + u_int8_t udmatimings[] = { 0xf, 0xb, 0x7, 0x5, 0x3, 0x2, 0x1 }; + u_int8_t ureg = 0xac + rego; - if (ctlr->chip->max_dma < ATA_SA150) { - if (mode >= ATA_UDMA0) { - u_int8_t udmatimings[] = { 0xf, 0xb, 0x7, 0x5, 0x3, 0x2, 0x1 }; - u_int8_t ureg = 0xac + rego; + pci_write_config(parent, mreg, + mval | (0x03 << (ATA_DEV(atadev->unit) << 2)), 1); + pci_write_config(parent, ureg, + (pci_read_config(parent, ureg, 1) & ~0x3f) | + udmatimings[mode & ATA_MODE_MASK], 1); - pci_write_config(parent, mreg, - mval | (0x03 << (ATA_DEV(atadev->unit) << 2)), 1); - pci_write_config(parent, ureg, - (pci_read_config(parent, ureg, 1) & ~0x3f) | - udmatimings[mode & ATA_MODE_MASK], 1); + } + else if (mode >= ATA_WDMA0) { + u_int8_t dreg = 0xa8 + rego; + u_int16_t dmatimings[] = { 0x2208, 0x10c2, 0x10c1 }; - } - else if (mode >= ATA_WDMA0) { - u_int8_t dreg = 0xa8 + rego; - u_int16_t dmatimings[] = { 0x2208, 0x10c2, 0x10c1 }; + pci_write_config(parent, mreg, + mval | (0x02 << (ATA_DEV(atadev->unit) << 2)), 1); + pci_write_config(parent, dreg, dmatimings[mode & ATA_MODE_MASK], 2); - pci_write_config(parent, mreg, - mval | (0x02 << (ATA_DEV(atadev->unit) << 2)), 1); - pci_write_config(parent, dreg, dmatimings[mode & ATA_MODE_MASK], 2); + } + else { + u_int8_t preg = 0xa4 + rego; + u_int16_t piotimings[] = { 0x328a, 0x2283, 0x1104, 0x10c3, 0x10c1 }; - } - else { - u_int8_t preg = 0xa4 + rego; - u_int16_t piotimings[] = { 0x328a, 0x2283, 0x1104, 0x10c3, 0x10c1 }; - - pci_write_config(parent, mreg, - mval | (0x01 << (ATA_DEV(atadev->unit) << 2)), 1); - pci_write_config(parent, preg, piotimings[mode & ATA_MODE_MASK], 2); - } + pci_write_config(parent, mreg, + mval | (0x01 << (ATA_DEV(atadev->unit) << 2)), 1); + pci_write_config(parent, preg, piotimings[mode & ATA_MODE_MASK], 2); } atadev->mode = mode; } @@ -2059,11 +2067,21 @@ { ATA_VIA8233C, 0x00, VIA100, 0x00, ATA_UDMA5, "VIA 8233C" }, { ATA_VIA8233A, 0x00, VIA133, 0x00, ATA_UDMA6, "VIA 8233A" }, { ATA_VIA8235, 0x00, VIA133, 0x00, ATA_UDMA6, "VIA 8235" }, + { ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "VIA 8237" }, + { 0, 0, 0, 0, 0, 0 }}; + static struct ata_chip_id new_ids[] = + {{ ATA_VIA8237, 0x00, 0x00, 0x00, ATA_SA150, "VIA 8237" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; - if (!(idx = ata_find_chip(dev, ids, pci_get_slot(dev)))) - return ENXIO; + if (pci_get_devid(dev) == ATA_VIA82C571) { + if (!(idx = ata_find_chip(dev, ids, pci_get_slot(dev)))) + return ENXIO; + } + else { + if (!(idx = ata_match_chip(dev, new_ids))) + return ENXIO; + } sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); @@ -2080,6 +2098,11 @@ if (ata_setup_interrupt(dev)) return ENXIO; + if (ctlr->chip->max_dma >= ATA_SA150) { + ctlr->setmode = ata_sata_setmode; + return 0; + } + /* prepare for ATA-66 on the 82C686a and 82C596b */ if (ctlr->chip->cfg2 & VIACLK) pci_write_config(dev, 0x50, 0x030b030b, 4); ==== //depot/projects/netperf/sys/dev/ata/ata-pci.h#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/dev/ata/ata-pci.h,v 1.16 2003/09/08 13:55:05 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.17 2003/10/30 13:16:21 sos Exp $ */ /* structure holding chipset config info */ @@ -217,6 +217,7 @@ #define ATA_VIA8233A 0x31471106 #define ATA_VIA8233C 0x31091106 #define ATA_VIA8235 0x31771106 +#define ATA_VIA8237 0x31491106 #define ATA_VIA8361 0x31121106 #define ATA_VIA8363 0x03051106 #define ATA_VIA8371 0x03911106 ==== //depot/projects/netperf/sys/dev/hatm/if_hatm.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.15 2003/10/29 15:07:10 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.16 2003/10/30 10:43:52 harti Exp $"); #include "opt_inet.h" #include "opt_natm.h" @@ -307,15 +307,22 @@ { u_int i, b; struct mbuf_page *pg; + struct mbuf_chunk_hdr *h; if (sc->mbuf_pages != NULL) { for (i = 0; i < sc->mbuf_npages; i++) { pg = sc->mbuf_pages[i]; for (b = 0; b < pg->hdr.nchunks; b++) { - if (MBUF_TST_BIT(pg->hdr.card, b)) + h = (struct mbuf_chunk_hdr *) ((char *)pg + + b * pg->hdr.chunksize + pg->hdr.hdroff); + if (h->flags & MBUF_CARD) if_printf(&sc->ifatm.ifnet, "%s -- mbuf page=%u card buf %u\n", __func__, i, b); + if (h->flags & MBUF_USED) + if_printf(&sc->ifatm.ifnet, + "%s -- mbuf page=%u used buf %u\n", + __func__, i, b); } bus_dmamap_unload(sc->mbuf_tag, pg->hdr.map); bus_dmamap_destroy(sc->mbuf_tag, pg->hdr.map); @@ -2332,10 +2339,14 @@ for (p = 0; p < sc->mbuf_npages; p++) { pg = sc->mbuf_pages[p]; for (i = 0; i < pg->hdr.nchunks; i++) { - if (MBUF_TST_BIT(pg->hdr.card, i)) { - MBUF_CLR_BIT(pg->hdr.card, i); - ch = (struct mbuf_chunk_hdr *) ((char *)pg + - i * pg->hdr.chunksize + pg->hdr.hdroff); + ch = (struct mbuf_chunk_hdr *) ((char *)pg + + i * pg->hdr.chunksize + pg->hdr.hdroff); + if (ch->flags & MBUF_CARD) { + ch->flags &= ~MBUF_CARD; + ch->flags |= MBUF_USED; + hatm_ext_free(&sc->mbuf_list[pg->hdr.pool], + (struct mbufx_free *)((u_char *)ch - + pg->hdr.hdroff)); } } } ==== //depot/projects/netperf/sys/dev/hatm/if_hatm_intr.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.12 2003/10/29 15:11:26 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.14 2003/10/30 16:19:50 harti Exp $"); /* * ForeHE driver. @@ -83,13 +83,34 @@ CTASSERT(sizeof(((struct mbuf1_chunk *)NULL)->storage) >= MBUF1_SIZE); CTASSERT(sizeof(struct tpd) <= HE_TPD_SIZE); +CTASSERT(MBUF0_PER_PAGE <= 256); +CTASSERT(MBUF1_PER_PAGE <= 256); + static void hatm_mbuf_page_alloc(struct hatm_softc *sc, u_int group); /* * Free an external mbuf to a list. We use atomic functions so that * we don't need a mutex for the list. + * + * Note that in general this algorithm is not safe when multiple readers + * and writers are present. To cite from a mail from David Schultz + * : + * + * It looks like this is subject to the ABA problem. For instance, + * suppose X, Y, and Z are the top things on the freelist and a + * thread attempts to make an allocation. You set buf to X and load + * buf->link (Y) into a register. Then the thread get preempted, and + * another thread allocates both X and Y, then frees X. When the + * original thread gets the CPU again, X is still on top of the + * freelist, so the atomic operation succeeds. However, the atomic + * op places Y on top of the freelist, even though Y is no longer + * free. + * + * We are, however sure that we have only one thread that ever allocates + * buffers because the only place we're call from is the interrupt handler. + * Under these circumstances the code looks safe. */ -static __inline void +__inline void hatm_ext_free(struct mbufx_free **list, struct mbufx_free *buf) { for (;;) { @@ -179,7 +200,6 @@ return; if ((pg = malloc(MBUF_ALLOC_SIZE, M_DEVBUF, M_NOWAIT)) == NULL) return; - bzero(pg->hdr.card, sizeof(pg->hdr.card)); err = bus_dmamap_create(sc->mbuf_tag, 0, &pg->hdr.map); if (err != 0) { @@ -203,6 +223,7 @@ if (group == 0) { struct mbuf0_chunk *c; + pg->hdr.pool = 0; pg->hdr.nchunks = MBUF0_PER_PAGE; pg->hdr.chunksize = MBUF0_CHUNK; pg->hdr.hdroff = sizeof(c->storage); @@ -210,12 +231,14 @@ for (i = 0; i < MBUF0_PER_PAGE; i++, c++) { c->hdr.pageno = sc->mbuf_npages; c->hdr.chunkno = i; + c->hdr.flags = MBUF_USED; hatm_ext_free(&sc->mbuf_list[0], (struct mbufx_free *)c); } } else { struct mbuf1_chunk *c; + pg->hdr.pool = 1; pg->hdr.nchunks = MBUF1_PER_PAGE; pg->hdr.chunksize = MBUF1_CHUNK; pg->hdr.hdroff = sizeof(c->storage); @@ -223,6 +246,7 @@ for (i = 0; i < MBUF1_PER_PAGE; i++, c++) { c->hdr.pageno = sc->mbuf_npages; c->hdr.chunkno = i; + c->hdr.flags = MBUF_USED; hatm_ext_free(&sc->mbuf_list[1], (struct mbufx_free *)c); } @@ -239,6 +263,9 @@ struct hatm_softc *sc = args; struct mbuf0_chunk *c = buf; + KASSERT((c->hdr.flags & (MBUF_USED | MBUF_CARD)) == MBUF_USED, + ("freeing unused mbuf %x", c->hdr.flags)); + c->hdr.flags &= ~MBUF_USED; hatm_ext_free(&sc->mbuf_list[0], (struct mbufx_free *)c); } static void @@ -247,6 +274,9 @@ struct hatm_softc *sc = args; struct mbuf1_chunk *c = buf; + KASSERT((c->hdr.flags & (MBUF_USED | MBUF_CARD)) == MBUF_USED, + ("freeing unused mbuf %x", c->hdr.flags)); + c->hdr.flags &= ~MBUF_USED; hatm_ext_free(&sc->mbuf_list[1], (struct mbufx_free *)c); } @@ -333,7 +363,7 @@ break; buf0 = (struct mbuf0_chunk *)cf; pg = sc->mbuf_pages[buf0->hdr.pageno]; - MBUF_SET_BIT(pg->hdr.card, buf0->hdr.chunkno); + buf0->hdr.flags |= MBUF_CARD; rbp->rbp[rbp->tail].phys = pg->hdr.phys + buf0->hdr.chunkno * MBUF0_CHUNK + MBUF0_OFFSET; rbp->rbp[rbp->tail].handle = @@ -351,7 +381,7 @@ break; buf1 = (struct mbuf1_chunk *)cf; pg = sc->mbuf_pages[buf1->hdr.pageno]; - MBUF_SET_BIT(pg->hdr.card, buf1->hdr.chunkno); + buf1->hdr.flags |= MBUF_CARD; rbp->rbp[rbp->tail].phys = pg->hdr.phys + buf1->hdr.chunkno * MBUF1_CHUNK + MBUF1_OFFSET; rbp->rbp[rbp->tail].handle = @@ -400,7 +430,6 @@ } MBUF_PARSE_HANDLE(handle, pageno, chunkno); - MBUF_CLR_BIT(sc->mbuf_pages[pageno]->hdr.card, chunkno); DBG(sc, RX, ("RX group=%u handle=%x page=%u chunk=%u", group, handle, pageno, chunkno)); @@ -415,7 +444,14 @@ c0->hdr.pageno, pageno)); KASSERT(c0->hdr.chunkno == chunkno, ("chunkno = %u/%u", c0->hdr.chunkno, chunkno)); + KASSERT(c0->hdr.flags & MBUF_CARD, ("mbuf not on card %u/%u", + pageno, chunkno)); + KASSERT(!(c0->hdr.flags & MBUF_USED), ("used mbuf %u/%u", + pageno, chunkno)); + c0->hdr.flags |= MBUF_USED; + c0->hdr.flags &= ~MBUF_CARD; + if (m != NULL) { m->m_ext.ref_cnt = &c0->hdr.ref_cnt; m_extadd(m, (void *)c0, MBUF0_SIZE, @@ -432,6 +468,13 @@ c1->hdr.pageno, pageno)); KASSERT(c1->hdr.chunkno == chunkno, ("chunkno = %u/%u", c1->hdr.chunkno, chunkno)); + KASSERT(c1->hdr.flags & MBUF_CARD, ("mbuf not on card %u/%u", + pageno, chunkno)); + KASSERT(!(c1->hdr.flags & MBUF_USED), ("used mbuf %u/%u", + pageno, chunkno)); + + c1->hdr.flags |= MBUF_USED; + c1->hdr.flags &= ~MBUF_CARD; if (m != NULL) { m->m_ext.ref_cnt = &c1->hdr.ref_cnt; ==== //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt * - * $FreeBSD: src/sys/dev/hatm/if_hatmvar.h,v 1.11 2003/10/29 15:07:10 harti Exp $ + * $FreeBSD: src/sys/dev/hatm/if_hatmvar.h,v 1.12 2003/10/30 10:43:52 harti Exp $ * * Fore HE driver for NATM */ @@ -239,12 +239,12 @@ /* each allocated page has one of these structures at its very end. */ struct mbuf_page_hdr { - uint8_t card[32]; /* bitmap for on-card */ uint16_t nchunks; /* chunks on this page */ bus_dmamap_t map; /* the DMA MAP */ uint32_t phys; /* physical base address */ uint32_t hdroff; /* chunk header offset */ uint32_t chunksize; /* chunk size */ + u_int pool; /* pool number */ }; struct mbuf_page { char storage[MBUF_ALLOC_SIZE - sizeof(struct mbuf_page_hdr)]; @@ -257,10 +257,6 @@ #define MBUF1_PER_PAGE ((MBUF_ALLOC_SIZE - sizeof(struct mbuf_page_hdr)) / \ MBUF1_CHUNK) -#define MBUF_CLR_BIT(ARRAY, BIT) ((ARRAY)[(BIT) / 8] &= ~(1 << ((BIT) % 8))) -#define MBUF_SET_BIT(ARRAY, BIT) ((ARRAY)[(BIT) / 8] |= (1 << ((BIT) % 8))) -#define MBUF_TST_BIT(ARRAY, BIT) ((ARRAY)[(BIT) / 8] & (1 << ((BIT) % 8))) - /* * Convert to/from handles */ @@ -281,12 +277,15 @@ #define MBUF_LARGE_FLAG 0x80000000 -/* chunks have the following structure at the end (4 byte) */ +/* chunks have the following structure at the end (8 byte) */ struct mbuf_chunk_hdr { - uint16_t pageno; - uint16_t chunkno; - u_int ref_cnt; + uint16_t pageno; + uint8_t chunkno; + uint8_t flags; + u_int ref_cnt; }; +#define MBUF_CARD 0x01 /* buffer is on card */ +#define MBUF_USED 0x02 /* buffer is somewhere in the system */ #define MBUFX_STORAGE_SIZE(X) (MBUF##X##_CHUNK \ - sizeof(struct mbuf_chunk_hdr)) @@ -628,3 +627,5 @@ void hatm_tx_vcc_closed(struct hatm_softc *sc, u_int cid); void hatm_vcc_closed(struct hatm_softc *sc, u_int cid); void hatm_load_vc(struct hatm_softc *sc, u_int cid, int reopen); + +void hatm_ext_free(struct mbufx_free **, struct mbufx_free *); ==== //depot/projects/netperf/sys/dev/sound/isa/mpu.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * This handles io against /dev/midi, the midi {in, out}put event queues * and the event/message transmittion to/from an MPU401 interface. * - * $FreeBSD: src/sys/dev/sound/isa/mpu.c,v 1.17 2003/09/16 11:04:22 bde Exp $ + * $FreeBSD: src/sys/dev/sound/isa/mpu.c,v 1.18 2003/10/29 21:54:37 deischen Exp $ * */ @@ -362,6 +362,7 @@ /* Allocate the resources, switch to uart mode. */ if (mpu_allocres(scp, dev) || mpu_uartmode(scp)) { mpu_releaseres(scp, dev); + mtx_destroy(&scp->mtx); return (ENXIO); } @@ -768,7 +769,6 @@ bus_release_resource(dev, SYS_RES_IOPORT, scp->io_rid, scp->io); scp->io = NULL; } - mtx_destroy(&scp->mtx); } static device_method_t mpu_methods[] = { ==== //depot/projects/netperf/sys/dev/syscons/syscons.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.408 2003/09/26 18:57:34 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.409 2003/10/29 20:48:13 njl Exp $"); #include "opt_syscons.h" #include "opt_splash.h" @@ -2147,6 +2147,9 @@ DPRINTF(5, ("sc0: sc_switch_scr() %d ", next_scr + 1)); + if (sc->cur_scp == NULL) + return (0); + /* prevent switch if previously requested */ if (sc->flags & SC_SCRN_VTYLOCK) { sc_bell(sc->cur_scp, sc->cur_scp->bell_pitch, ==== //depot/projects/netperf/sys/i386/acpica/acpi_machdep.c#5 (text+ko) ==== @@ -25,12 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.13 2003/09/17 08:47:39 iwasaki Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.14 2003/10/30 16:14:55 iwasaki Exp $"); #include #include #include #include +#include +#include #include #include "acpi.h" @@ -59,6 +61,9 @@ #include #endif +u_int32_t acpi_no_reset_video = 0; +TUNABLE_INT("hw.acpi.no_reset_video", &acpi_no_reset_video); + static struct apm_softc apm_softc; static d_open_t apmopen; @@ -327,6 +332,11 @@ if (intr_model != ACPI_INTR_PIC) acpi_SetIntrModel(intr_model); + + SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "no_reset_video", CTLFLAG_RD | CTLFLAG_RW, &acpi_no_reset_video, 0, + "Disable calling the VESA reset BIOS vector on the resume path"); + return (0); } ==== //depot/projects/netperf/sys/i386/acpica/acpi_wakecode.S#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.5 2003/10/29 03:30:45 iwasaki Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.6 2003/10/30 16:14:55 iwasaki Exp $"); #define LOCORE @@ -48,12 +48,15 @@ * Re-initialize video BIOS. Restore DS and SS from CS in * case the BIOS modified them. */ + cmp $1, no_reset_video + je wakeup_16_gdt lcall $0xc000, $3 movw %cs, %ax movw %ax, %ds movw %ax, %ss #endif +wakeup_16_gdt: /* Load GDT for real mode */ lgdt physical_gdt @@ -211,6 +214,7 @@ previous_cr2: .long 0 previous_cr3: .long 0 previous_cr4: .long 0 +no_reset_video: .long 0 /* transfer from real mode to protected mode */ previous_cr0: .long 0 ==== //depot/projects/netperf/sys/i386/acpica/acpi_wakeup.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 30 10:13:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D6CF16A4D0; Thu, 30 Oct 2003 10:13:42 -0800 (PST) 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 66E2616A4CE for ; Thu, 30 Oct 2003 10:13:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A570343F85 for ; Thu, 30 Oct 2003 10:13:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UIDfXJ055369 for ; Thu, 30 Oct 2003 10:13:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UIDfnF055366 for perforce@freebsd.org; Thu, 30 Oct 2003 10:13:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 30 Oct 2003 10:13:41 -0800 (PST) Message-Id: <200310301813.h9UIDfnF055366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 40844 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: Thu, 30 Oct 2003 18:13:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=40844 Change 40844 by jmallett@jmallett_sprout on 2003/10/30 10:13:21 Nuke stuff which is meant to interact with fairly high-level bits of code which are: 1) Unused 2) Gross 3) Fairly NetBSD-geared. I totally want to get rid of locore.h... As a step in that direction, I've cut mips_subr down to just TLB stuff, which I mostly plan to rewrite in C using cpufunc stuff. Once that stuff is taken care of, just a few edge cases involving NetBSD code need rewritten to get rid of . Affected files ... .. //depot/projects/mips/sys/mips/include/locore.h#9 edit .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#11 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#32 edit .. //depot/projects/mips/sys/mips/mips/mips_subr.S#12 edit Differences ... ==== //depot/projects/mips/sys/mips/include/locore.h#9 (text+ko) ==== @@ -37,58 +37,16 @@ int mips64_TLBUpdate(u_int, u_int); void mips64_TLBRead(int, struct tlb *); void mips64_wbflush(void); -void mips64_proc_trampoline(void); -void mips64_cpu_switch_resume(void); -void mips64_pagezero(caddr_t dst); - -uint32_t mips3_cp0_compare_read(void); -void mips3_cp0_compare_write(uint32_t); -uint32_t mips3_cp0_config_read(void); -void mips3_cp0_config_write(uint32_t); uint32_t mipsNN_cp0_config1_read(void); void mipsNN_cp0_config1_write(uint32_t); uint32_t mipsNN_cp0_config2_read(void); uint32_t mipsNN_cp0_config3_read(void); -uint32_t mips3_cp0_count_read(void); -void mips3_cp0_count_write(uint32_t); - -uint32_t mips3_cp0_wired_read(void); -void mips3_cp0_wired_write(uint32_t); - -/* - * A vector with an entry for each mips-ISA-level dependent - * locore function, and macros which jump through it. - * - * XXX the macro names are chosen to be compatible with the old - * XXX Sprite coding-convention names used in 4.4bsd/pmax. - */ -typedef struct { - void (*TBIA)(int); - void (*TBIAP)(int); - void (*TBIS)(vm_paddr_t); - int (*tlbUpdate)(u_int highreg, u_int lowreg); - void (*wbflush)(void); -} mips_locore_jumpvec_t; - -void mips_wait_idle(void); - -/* - * The "active" locore-fuction vector, and - */ -extern mips_locore_jumpvec_t mips_locore_jumpvec; -extern long *mips_locoresw[]; - #define MIPS_TBIA() mips64_TBIA(mips_num_tlb_entries) #define MIPS_TBIAP() mips64_TBIAP(mips_num_tlb_entries) #define MIPS_TBIS mips64_TBIS #define MachTLBUpdate mips64_TLBUpdate -#define proc_trampoline mips64_proc_trampoline - -#define CPU_IDLE (mips_locoresw[2]) - -/* cpu_switch_resume is called inside locore.S */ /* * CPU identification, from PRID register. ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#11 (text+ko) ==== @@ -182,93 +182,6 @@ .set pop END(mipsNN_cp0_config3_read) -LEAF(mips_wait_idle) - j mips_maybewait_idle - li t1, 1 -END(mips_wait_idle) - -LEAF(mips_idle) - j mips_maybewait_idle - move t1, zero -END(mips_idle) - -/* - * mips_maybewait_idle: - * - * When no processes are on the runq, cpu_switch branches to - * idle to wait for something to come ready. - * - * NOTE: This is really part of cpu_switch(), but defined here - * for kernel profiling. - * - * This version takes advantage of power-saving features on - * the QED RM52xx family of CPUs, and MIPS32 & MIPS64 CPUs, - * if t1 is non-zero. - */ -LEAF(mips_maybewait_idle) - ld t0, pcpup - sd zero, PC_CURTHREAD(t0) # set curthread NULL -#if defined(LOCKDEBUG) - jal sched_unlock_idle # release sched_lock - nop -#endif - li t0, (MIPS_INT_MASK | MIPS_SR_INT_IE) - mtc0 t0, MIPS_COP_0_STATUS # enable all interrupts - COP0_SYNC - nop - -#if XXX - /* Try to zero some free pages. */ - lw t0, uvm + UVM_PAGE_IDLE_ZERO - nop - beq t0, zero, 1f - nop - jal uvm_pageidlezero - nop -#endif -1: -#if XXX - lw t0, sched_whichqs # look for non-empty queue - bne t0, zero, 1f - nop -#endif - beq t1, zero, 1b - nop - wait - nop - nop - nop - b 1b - nop -1: -#if defined(LOCKDEBUG) - mtc0 zero, MIPS_COP_0_STATUS # disable all interrupts - COP0_SYNC - nop - nop - nop - nop - jal _C_LABEL(sched_lock_idle) # acquire sched_lock - nop -#if XXX - la ra, cpu_switch_queuescan - j ra - nop -#endif -#else - mtc0 zero, MIPS_COP_0_STATUS # disable all interrupts - COP0_SYNC - nop - nop - nop -#if XXX - la ra, cpu_switch_queuescan - j ra - nop -#endif -#endif -END(mips_maybewait_idle) - #if defined(DDB) || defined(KGDB) /* * setjmp(label_t *) ==== //depot/projects/mips/sys/mips/mips/machdep.c#32 (text+ko) ==== @@ -165,7 +165,6 @@ #include #include #include -#include #include #include #include @@ -348,12 +347,7 @@ */ static void mips64_vector_init(void); -extern long *mips64_locoresw[]; - -mips_locore_jumpvec_t mips_locore_jumpvec; -long *mips_locoresw[3]; - struct pridtab { int cpu_cid; int cpu_pid; @@ -573,18 +567,6 @@ }; #define ncidnames (sizeof(cidnames) / sizeof(cidnames[0])) -/* - * MIPS64 locore function vector - */ -const mips_locore_jumpvec_t mips64_locore_vec = -{ - mips64_TBIA, - mips64_TBIAP, - mips64_TBIS, - mips64_TLBUpdate, - mips_wbflush, -}; - static void mips64_vector_install(vm_offset_t addr, char *begin, char *end) { @@ -630,12 +612,6 @@ mips64_vector_install(MIPS3_INTR_EXC_VEC, ExceptionVector, ExceptionVectorEnd); - /* - * Copy locore-function vector. - */ - memcpy(&mips_locore_jumpvec, &mips64_locore_vec, - sizeof(mips_locore_jumpvec_t)); - mips_icache_sync_all(); mips_dcache_wbinv_all(); @@ -770,19 +746,11 @@ mips64_TBIA(mips_num_tlb_entries); mips_wr_wired(MIPS3_TLB_WIRED_UPAGES); mips64_vector_init(); - memcpy(mips_locoresw, mips64_locoresw, sizeof(mips_locoresw)); break; default: printf("cpu_arch 0x%x: not supported\n", cpu_arch); cpu_halt(); } - - /* - * Install power-saving idle routines. - */ - if ((mips_cpu_flags & CPU_MIPS_USE_WAIT) && - !(mips_cpu_flags & CPU_MIPS_NO_WAIT)) - CPU_IDLE = (long *)mips_wait_idle; } /* ==== //depot/projects/mips/sys/mips/mips/mips_subr.S#12 (text+ko) ==== @@ -359,162 +359,6 @@ END(MIPSX(TLBRead)) /* - * mipsN_proc_trampoline() - * - * Arrange for a function to be invoked neatly, after a cpu_switch(). - * Call the service function with one argument, specified by the s0 - * and s1 respectively. There is no need register save operation. - */ -LEAF(MIPSX(proc_trampoline)) - addu sp, sp, -CALLFRAME_SIZ - jal ra, s0 - move a0, s1 - .set noat - /* - * Make sure to disable interrupts here, as otherwise - * we can take an interrupt *after* EXL is set, and - * end up returning to a bogus PC since the PC is not - * saved if EXL=1. - */ - mtc0 zero, MIPS_COP_0_STATUS # disable int - COP0_SYNC - nop # 3 op delay - nop - nop - li a0, MIPS_SR_EXL # set exception level - mtc0 a0, MIPS_COP_0_STATUS - COP0_SYNC - nop - nop - addu a1, sp, CALLFRAME_SIZ - /* REG_L a0, FRAME_SR(a1) */ - REG_L t0, FRAME_MULLO(a1) - REG_L t1, FRAME_MULHI(a1) - REG_L v0, FRAME_EPC(a1) - mtlo t0 - mthi t1 - _MTC0 v0, MIPS_COP_0_EXC_PC - COP0_SYNC - nop - move k1, a1 -#ifdef IPL_ICU_MASK - .set at - lw t0, FRAME_PPL(k1) - sw t0, md_imask - jal md_imask_update - nop - .set noat -#endif - REG_L AT, FRAME_AST(k1) - REG_L v0, FRAME_V0(k1) - REG_L v1, FRAME_V1(k1) - REG_L a0, FRAME_A0(k1) - REG_L a1, FRAME_A1(k1) - REG_L a2, FRAME_A2(k1) - REG_L a3, FRAME_A3(k1) - REG_L t0, FRAME_T0(k1) - REG_L t1, FRAME_T1(k1) - REG_L t2, FRAME_T2(k1) - REG_L t3, FRAME_T3(k1) - REG_L ta0, FRAME_TA0(k1) - REG_L ta1, FRAME_TA1(k1) - REG_L ta2, FRAME_TA2(k1) - REG_L ta3, FRAME_TA3(k1) - REG_L s0, FRAME_S0(k1) - REG_L s1, FRAME_S1(k1) - REG_L s2, FRAME_S2(k1) - REG_L s3, FRAME_S3(k1) - REG_L s4, FRAME_S4(k1) - REG_L s5, FRAME_S5(k1) - REG_L s6, FRAME_S6(k1) - REG_L s7, FRAME_S7(k1) - REG_L t8, FRAME_T8(k1) - REG_L t9, FRAME_T9(k1) - REG_L k0, FRAME_SR(k1) - REG_L gp, FRAME_GP(k1) - REG_L s8, FRAME_S8(k1) - REG_L ra, FRAME_RA(k1) - REG_L sp, FRAME_SP(k1) - mtc0 k0, MIPS_COP_0_STATUS - COP0_SYNC - nop - nop - eret - .set at -END(MIPSX(proc_trampoline)) - -/* - * void mipsN_cpu_switch_resume(struct lwp *newlwp) - * - * Wiredown the USPACE of newproc in TLB entry#0. Check whether target - * USPACE is already in another place of TLB before that, and make - * sure TBIS(it) in the case. - */ -LEAF_NOPROFILE(MIPSX(cpu_switch_resume)) - lw a1, TD_MD_UPTE_0(a0) # a1 = upte[0] - lw a2, TD_MD_UPTE_1(a0) # a2 = upte[1] - ld v0, TD_PROC(a0) # v0 = td->proc - ld v0, P_UAREA(v0) # va = v0->p_uarea - li s0, MIPS_KSEG2_START - blt v0, s0, resume - nop - - and s0, v0, PG_ODDPG - beq s0, zero, entry0 - nop - - PANIC("USPACE sat on odd page boundary") - -entry0: - _MTC0 v0, MIPS_COP_0_TLB_HI # VPN = va - COP0_SYNC - nop - nop - tlbp # probe VPN - COP0_SYNC - nop - nop - mfc0 s0, MIPS_COP_0_TLB_INDEX - nop - bltz s0, entry0set - sll s0, s0, 13 # PAGE_SHIFT + 1 - la s0, MIPS_KSEG0_START(s0) - _MTC0 s0, MIPS_COP_0_TLB_HI - COP0_SYNC - _MTC0 zero, MIPS_COP_0_TLB_LO0 - COP0_SYNC - _MTC0 zero, MIPS_COP_0_TLB_LO1 - COP0_SYNC - nop - nop - tlbwi - COP0_SYNC - nop - nop - _MTC0 v0, MIPS_COP_0_TLB_HI # set VPN again - COP0_SYNC -entry0set: - mtc0 zero, MIPS_COP_0_TLB_INDEX # TLB entry #0 - COP0_SYNC - or a1, PG_G - _MTC0 a1, MIPS_COP_0_TLB_LO0 # upte[0] | PG_G - COP0_SYNC - or a2, PG_G - _MTC0 a2, MIPS_COP_0_TLB_LO1 # upte[1] | PG_G - COP0_SYNC - nop - nop - tlbwi # set TLB entry #0 - COP0_SYNC - nop - nop - -resume: - j ra - nop -END(MIPSX(cpu_switch_resume)) - -/* * void mipsN_TBIS(vaddr_t va) * * Invalidate a TLB entry which has the given vaddr and ASID if found. @@ -680,30 +524,3 @@ mtc0 v1, MIPS_COP_0_STATUS # restore status register COP0_SYNC # XXXX - not executed!! END(MIPSX(TBIA)) - -LEAF(MIPSX(pagezero)) - li a1, NBPG >> 6 - -1: sd zero, 0(a0) # try to miss cache first - sd zero, 32(a0) - subu a1, 1 - sd zero, 16(a0) - sd zero, 48(a0) - sd zero, 8(a0) # fill in cache lines - sd zero, 40(a0) - sd zero, 24(a0) - sd zero, 56(a0) - bgtz a1, 1b - addu a0, 64 - - j ra - nop -END(MIPSX(pagezero)) - - .data - - .globl MIPSX(locoresw) -MIPSX(locoresw): - .dword MIPSX(cpu_switch_resume) - .dword MIPSX(proc_trampoline) - .dword mips_idle From owner-p4-projects@FreeBSD.ORG Thu Oct 30 10:17:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C554B16A4D0; Thu, 30 Oct 2003 10:17:48 -0800 (PST) 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 A07D916A4CE for ; Thu, 30 Oct 2003 10:17:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08B0643FAF for ; Thu, 30 Oct 2003 10:17:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UIHlXJ055511 for ; Thu, 30 Oct 2003 10:17:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UIHl7F055508 for perforce@freebsd.org; Thu, 30 Oct 2003 10:17:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 30 Oct 2003 10:17:47 -0800 (PST) Message-Id: <200310301817.h9UIHl7F055508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 40846 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: Thu, 30 Oct 2003 18:17:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=40846 Change 40846 by jmallett@jmallett_sprout on 2003/10/30 10:16:59 Kill SUPPORT_SB1 and CCA-related bits. Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#12 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#33 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#12 (text+ko) ==== @@ -128,9 +128,6 @@ #define CPU_MIPS_R4K_MMU 0x0001 #define CPU_MIPS_NO_LLSC 0x0002 #define CPU_MIPS_CAUSE_IV 0x0004 -#define CPU_MIPS_HAVE_SPECIAL_CCA 0x0008 /* Defaults to '3' if not set. */ -#define CPU_MIPS_CACHED_CCA_MASK 0x0070 -#define CPU_MIPS_CACHED_CCA_SHIFT 4 #define CPU_MIPS_DOUBLE_COUNT 0x0080 /* 1 cp0 count == 2 clock cycles */ #define CPU_MIPS_USE_WAIT 0x0100 /* Use "wait"-based cpu_idle() */ #define CPU_MIPS_NO_WAIT 0x0200 /* Inverse of previous, for mips32/64 */ ==== //depot/projects/mips/sys/mips/mips/machdep.c#33 (text+ko) ==== @@ -173,9 +173,6 @@ int mips_cpu_flags; int mips_has_r4k_mmu; int mips_has_llsc; -#ifdef SUPPORT_SB1 -int mips3_pg_cached; -#endif int mips_num_tlb_entries; @@ -532,14 +529,6 @@ MIPS32_FLAGS | CPU_MIPS_NO_WAIT | CPU_MIPS_I_D_CACHE_COHERENT, "Au1100 (Rev 2 core)" }, -#ifdef SUPPORT_SB1 - /* The SB1 CPUs use a CCA of 5 - "Cacheable Coherent Shareable" */ - { MIPS_PRID_CID_SIBYTE, MIPS_SB1, -1, -1, -1, 0, - MIPS64_FLAGS | CPU_MIPS_D_CACHE_COHERENT | - CPU_MIPS_HAVE_SPECIAL_CCA | (5 << CPU_MIPS_CACHED_CCA_SHIFT), - "SB1" }, -#endif /* SUPPORT_SB1 */ - { 0, 0, 0, 0, 0, 0, 0, NULL } }; @@ -715,17 +704,6 @@ mips_has_r4k_mmu = mips_cpu_flags & CPU_MIPS_R4K_MMU; mips_has_llsc = (mips_cpu_flags & CPU_MIPS_NO_LLSC) == 0; -#ifdef SUPPORT_SB1 - if (mycpu->cpu_flags & CPU_MIPS_HAVE_SPECIAL_CCA) { - uint32_t cca; - - cca = (ct->cpu_flags & CPU_MIPS_CACHED_CCA_MASK) >> - CPU_MIPS_CACHED_CCA_SHIFT; - mips3_pg_cached = MIPS3_CCA_TO_PG(cca); - } else - mips3_pg_cached = MIPS3_DEFAULT_PG_CACHED; -#endif SUPPORT_SB1 - #ifdef __HAVE_MIPS_MACHDEP_CACHE_CONFIG mips_machdep_cache_config(); #endif From owner-p4-projects@FreeBSD.ORG Thu Oct 30 10:19:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2B0D16A4D1; Thu, 30 Oct 2003 10:19:52 -0800 (PST) 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 9C11816A4CF for ; Thu, 30 Oct 2003 10:19:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CDC443FE0 for ; Thu, 30 Oct 2003 10:19:51 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UIJpXJ055571 for ; Thu, 30 Oct 2003 10:19:51 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UIJo73055568 for perforce@freebsd.org; Thu, 30 Oct 2003 10:19:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 30 Oct 2003 10:19:50 -0800 (PST) Message-Id: <200310301819.h9UIJo73055568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 40847 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: Thu, 30 Oct 2003 18:19:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=40847 Change 40847 by jmallett@jmallett_sprout on 2003/10/30 10:19:39 No KGDB. Affected files ... .. //depot/projects/mips/sys/mips/include/db_machdep.h#6 edit .. //depot/projects/mips/sys/mips/mips/db_interface.c#6 edit .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#12 edit Differences ... ==== //depot/projects/mips/sys/mips/include/db_machdep.h#6 (text+ko) ==== @@ -88,13 +88,6 @@ #define DB_SMALL_VALUE_MIN (-0x40001) /* - * Constants for KGDB. - */ -typedef register_t kgdb_reg_t; -#define KGDB_NUMREGS 90 -#define KGDB_BUFLEN 1024 - -/* * MIPS cpus have no hardware single-step. */ #define SOFTWARE_SSTEP ==== //depot/projects/mips/sys/mips/mips/db_interface.c#6 (text+ko) ==== @@ -46,11 +46,9 @@ #include #include #include -#ifndef KGDB #include #include #include -#endif int db_active = 0; db_regs_t ddb_regs; @@ -129,7 +127,6 @@ } #endif -#ifndef KGDB int kdb_trap(int type, struct trapframe *tfp) { @@ -187,7 +184,6 @@ __asm("break"); } -#endif /* !KGDB */ void db_set_ddb_regs(int type, struct trapframe *tfp) @@ -284,7 +280,6 @@ mips_icache_sync_range((db_addr_t) addr, size); } -#ifndef KGDB DB_COMMAND(tlb, db_tlbdump_cmd) { @@ -411,7 +406,6 @@ SHOW64(MIPS_COP_0_ERROR_PC, "errorpc"); } } -#endif /* !KGDB */ /* * Determine whether the instruction involves a delay slot. ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#12 (text+ko) ==== @@ -182,7 +182,7 @@ .set pop END(mipsNN_cp0_config3_read) -#if defined(DDB) || defined(KGDB) +#if defined(DDB) /* * setjmp(label_t *) * longjmp(label_t *) From owner-p4-projects@FreeBSD.ORG Thu Oct 30 10:22:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7610C16A4D1; Thu, 30 Oct 2003 10:22:56 -0800 (PST) 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 4E4BF16A4CE for ; Thu, 30 Oct 2003 10:22:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F01743FBF for ; Thu, 30 Oct 2003 10:22:55 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UIMtXJ055742 for ; Thu, 30 Oct 2003 10:22:55 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UIMt7B055739 for perforce@freebsd.org; Thu, 30 Oct 2003 10:22:55 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 30 Oct 2003 10:22:55 -0800 (PST) Message-Id: <200310301822.h9UIMt7B055739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 40848 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: Thu, 30 Oct 2003 18:22:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=40848 Change 40848 by cvance@cvance_osx_laptop on 2003/10/30 10:22:00 Print MAC labels. The makefile is currently hardcoded to link in libmac.a You also need to install a copy of mac.conf into /etc for this to work correctly. Affected files ... .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/extern.h#2 edit .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/keyword.c#2 edit .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/print.c#2 edit .. //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/ps.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/Makefile#2 (text+ko) ==== @@ -26,7 +26,7 @@ NEXTSTEP_INSTALLDIR = /bin WINDOWS_INSTALLDIR = /Library/Executables PDO_UNIX_INSTALLDIR = /bin -LIBS = +LIBS = ../../../libmac/libmac.a DEBUG_LIBS = $(LIBS) PROF_LIBS = $(LIBS) ==== //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/extern.h#2 (text+ko) ==== @@ -55,6 +55,8 @@ char *fmt_argv __P((char **, char *, int)); int getpcpu __P((KINFO *)); double getpmem __P((KINFO *)); +void label(KINFO *, VARENT *); +int s_label(KINFO *); void logname __P((KINFO *, VARENT *)); void longtname __P((KINFO *, VARENT *)); void lstarted __P((KINFO *, VARENT *)); ==== //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/keyword.c#2 (text+ko) ==== @@ -104,6 +104,8 @@ NULL, 0, pvar, NULL, 8, POFF(p_traceflag), INT, "x"}, {"ktracep", "KTRACEP", NULL, 0, pvar, NULL, 8, POFF(p_tracep), LONG, "lx"}, + {"label", "LABEL", NULL, LJUST|DSIZ, label, s_label, SHRT_MAX, 0, CHAR, + NULL}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5}, {"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1}, {"logname", "", "login"}, ==== //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/print.c#2 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include +#include #include #include #include @@ -1049,3 +1050,53 @@ else (void)printf("%*s", v->width, "-"); } + +void +label(KINFO *k, VARENT *ve) +{ + char *string; + VAR *v; + mac_t proclabel; + int error; + + v = ve->var; + string = NULL; + if (mac_prepare_process_label(&proclabel) == -1) { + perror("mac_prepare_process_label"); + goto out; + } + error = mac_get_pid(KI_PROC(k)->p_pid, proclabel); + if (error == 0) { + if (mac_to_text(proclabel, &string) == -1) + string = NULL; + } + mac_free(proclabel); + out: + if (string != NULL) { + (void)printf("%-*s", v->width, string); + free(string); + } else + (void)printf("%-*s", v->width, ""); + return; +} + +int +s_label(KINFO *k) +{ + char *string = NULL; + mac_t proclabel; + int error, size = 0; + + error = mac_prepare_process_label(&proclabel); + if (error != 0) { + perror("mac_prepare_process_label"); + return (0); + } + error = mac_get_pid(KI_PROC(k)->p_pid, proclabel); + if (error == 0 && mac_to_text(proclabel, &string) == 0) { + size = strlen(string); + free(string); + } + mac_free(proclabel); + return (size); +} ==== //depot/projects/trustedbsd/sedarwin/other/adv_cmds/ps.tproj/ps.c#2 (text+ko) ==== @@ -108,6 +108,7 @@ char ufmt[] = "user pid %cpu %mem vsz rss tt state start time command"; char mfmt[] = "user pid tt %cpu state pri stime utime command"; char vfmt[] = "pid state time sl re pagein vsz rss lim tsiz %cpu %mem command"; +char Zfmt[] = "label"; int mflg = 0; /* if -M option to display all mach threads */ int print_thread_num=0; @@ -157,9 +158,9 @@ memf = _PATH_MEM; while ((ch = getopt(argc, argv, #if defined(LAZY_PS) - "aCcefghjLlM:mN:O:o:p:rSTt:U:uvW:wx")) != -1) + "aCcefghjLlM:mN:O:o:p:rSTt:U:uvW:wxZ")) != -1) #else - "aCceghjLlMmO:o:p:rSTt:U:uvwx")) != -1) + "aCceghjLlMmO:o:p:rSTt:U:uvwxZ")) != -1) #endif switch((char)ch) { case 'a': @@ -299,6 +300,10 @@ case 'x': xflg = 1; break; + case 'Z': + parsefmt(Zfmt); + Zfmt[0] = '\0'; + break; case '?': default: usage(); @@ -743,7 +748,7 @@ { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ps [-aChjlmMrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]", + "usage: ps [-aChjlmMrSTuvwxZ] [-O|o fmt] [-p pid] [-t tty] [-U user]", " [-N system] [-W swap]", " ps [-L]"); exit(1); From owner-p4-projects@FreeBSD.ORG Thu Oct 30 11:12:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1125616A4D1; Thu, 30 Oct 2003 11:12:00 -0800 (PST) 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 D52CF16A4CF for ; Thu, 30 Oct 2003 11:11:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AF5443FBD for ; Thu, 30 Oct 2003 11:11:58 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UJBwXJ059255 for ; Thu, 30 Oct 2003 11:11:58 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UJBv7h059252 for perforce@freebsd.org; Thu, 30 Oct 2003 11:11:57 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 30 Oct 2003 11:11:57 -0800 (PST) Message-Id: <200310301911.h9UJBv7h059252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 40853 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: Thu, 30 Oct 2003 19:12:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=40853 Change 40853 by jhb@jhb_laptop on 2003/10/30 11:11:18 Compile. Affected files ... .. //depot/projects/power/sys/dev/acpica/acpi.c#5 edit Differences ... ==== //depot/projects/power/sys/dev/acpica/acpi.c#5 (text+ko) ==== @@ -1425,7 +1425,7 @@ acpi_GetPowerState(ACPI_HANDLE handle, int *state) { - return (acpi_EvaluateInteger(handle, "_PSC", state); + return (acpi_EvaluateInteger(handle, "_PSC", state)); } /* @@ -1452,7 +1452,7 @@ default: return (AE_BAD_PARAMETER); } - return (AcpiEvaluateObject(handle, method, NULL, NULL); + return (AcpiEvaluateObject(handle, method, NULL, NULL)); } /* From owner-p4-projects@FreeBSD.ORG Thu Oct 30 11:12:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 415E316A4E7; Thu, 30 Oct 2003 11:12:00 -0800 (PST) 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 1058D16A4D0 for ; Thu, 30 Oct 2003 11:12:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D374043FCB for ; Thu, 30 Oct 2003 11:11:58 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UJBwXJ059263 for ; Thu, 30 Oct 2003 11:11:58 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UJBw2j059259 for perforce@freebsd.org; Thu, 30 Oct 2003 11:11:58 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 30 Oct 2003 11:11:58 -0800 (PST) Message-Id: <200310301911.h9UJBw2j059259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 40854 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: Thu, 30 Oct 2003 19:12:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=40854 Change 40854 by jhb@jhb_laptop on 2003/10/30 11:11:56 - Fix pci_resume() compile. - Export pci_resume() and pci_suspend(). Affected files ... .. //depot/projects/power/sys/dev/pci/pci.c#4 edit .. //depot/projects/power/sys/dev/pci/pci_private.h#4 edit Differences ... ==== //depot/projects/power/sys/dev/pci/pci.c#4 (text+ko) ==== @@ -74,8 +74,6 @@ device_t dev); static int pci_probe(device_t dev); static int pci_attach(device_t dev); -static int pci_suspend(device_t dev); -static int pci_resume(device_t dev); static void pci_load_vendor_data(void); static int pci_describe_parse_line(char **ptr, int *vendor, int *device, char **desc); @@ -933,7 +931,7 @@ return (bus_generic_attach(dev)); } -static int +int pci_suspend(device_t dev) { int numdevs; @@ -957,7 +955,7 @@ return (bus_generic_suspend(dev)); } -static int +int pci_resume(device_t dev) { int numdevs; @@ -1626,7 +1624,8 @@ pci_write_config(dev, PCIR_MINGNT, dinfo->cfg.mingnt, 1); pci_write_config(dev, PCIR_MAXLAT, dinfo->cfg.maxlat, 1); if (dinfo->cfg.intpin > 0 && PCI_INTERRUPT_VALID(dinfo->cfg.intline)) - dinfo->cfg.intline = PCI_ASSIGN_INTERRUPT(dev, child); + dinfo->cfg.intline = PCI_ASSIGN_INTERRUPT( + device_get_parent(dev), dev); pci_write_config(dev, PCIR_INTLINE, dinfo->cfg.intline, 1); pci_write_config(dev, PCIR_INTPIN, dinfo->cfg.intpin, 1); } ==== //depot/projects/power/sys/dev/pci/pci_private.h#4 (text+ko) ==== @@ -75,4 +75,5 @@ char *buf, size_t buflen); int pci_assign_interrupt_method(device_t dev, device_t child); int pci_resume(device_t dev); +int pci_suspend(device_t dev); #endif /* _PCI_PRIVATE_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Oct 30 11:13:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 387BA16A4D1; Thu, 30 Oct 2003 11:13:02 -0800 (PST) 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 F2E5116A4CE for ; Thu, 30 Oct 2003 11:13:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36B4B43FBF for ; Thu, 30 Oct 2003 11:13:01 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UJD0XJ059338 for ; Thu, 30 Oct 2003 11:13:00 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UJD0JL059335 for perforce@freebsd.org; Thu, 30 Oct 2003 11:13:00 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 30 Oct 2003 11:13:00 -0800 (PST) Message-Id: <200310301913.h9UJD0JL059335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 40855 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: Thu, 30 Oct 2003 19:13:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=40855 Change 40855 by jhb@jhb_laptop on 2003/10/30 11:12:34 Fix ACPI and sparc64 OFW PCI bus drivers to use PCI suspend/resume functions. Affected files ... .. //depot/projects/power/sys/dev/acpica/acpi_pci.c#4 edit .. //depot/projects/power/sys/sparc64/pci/ofw_pcibus.c#2 edit Differences ... ==== //depot/projects/power/sys/dev/acpica/acpi_pci.c#4 (text+ko) ==== @@ -75,7 +75,7 @@ DEVMETHOD(device_probe, acpi_pci_probe), DEVMETHOD(device_attach, acpi_pci_attach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_suspend, pci_suspend), DEVMETHOD(device_resume, pci_resume), /* Bus interface */ ==== //depot/projects/power/sys/sparc64/pci/ofw_pcibus.c#2 (text+ko) ==== @@ -69,8 +69,8 @@ DEVMETHOD(device_probe, ofw_pcibus_probe), DEVMETHOD(device_attach, ofw_pcibus_attach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_suspend, pci_suspend), + DEVMETHOD(device_resume, pci_resume), /* Bus interface */ DEVMETHOD(bus_print_child, pci_print_child), From owner-p4-projects@FreeBSD.ORG Thu Oct 30 11:24:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7777416A4D0; Thu, 30 Oct 2003 11:24:40 -0800 (PST) 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 47E5716A4CE for ; Thu, 30 Oct 2003 11:24:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86D9B43FBD for ; Thu, 30 Oct 2003 11:24:38 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UJOcXJ061163 for ; Thu, 30 Oct 2003 11:24:38 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UJObFo061139 for perforce@freebsd.org; Thu, 30 Oct 2003 11:24:38 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 30 Oct 2003 11:24:38 -0800 (PST) Message-Id: <200310301924.h9UJObFo061139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 40858 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: Thu, 30 Oct 2003 19:24:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=40858 Change 40858 by cvance@cvance_osx_laptop on 2003/10/30 11:23:37 Integ from vendor branch Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/PROJECT#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chflags/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chflags/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chflags/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chflags/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chflags/chflags.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chflags/chflags.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chmod/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chmod/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chmod/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chmod/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chmod/chmod.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chmod/chmod.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chown/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chown/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chown/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chown/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chown/chgrp.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chown/chown.8#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/chown/chown.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cksum/crc.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/compress.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/compress.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/uncompress.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/zopen.3#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/compress/zopen.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cp/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cp/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cp/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cp/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cp/cp.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cp/cp.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cp/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/cp/utils.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/csh/strpct.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/args.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/conv.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/conv_tab.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/dd.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/dd.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/dd.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/misc.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/dd/position.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/df/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/df/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/df/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/df/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/df/df.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/df/df.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/du/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/du/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/du/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/du/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/du/du.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/du/du.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/LEGAL.NOTICE#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/MAINT#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/PORTING#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/README#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/apprentice.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/ascmagic.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/compress.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/file.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/file.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/file.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/fsmagic.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/internat.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/is_tar.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/386bsd#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/Header#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/Localstuff#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/OpenBSD#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/adventure#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/alliant#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/alpha#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/amanda#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/amigaos#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/animation#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/apl#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/apple#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/applix#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/archive#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/asterix#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/att3b#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/audio#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/blit#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/bsdi#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/c-lang#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/chi#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/cisco#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/clipper#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/commands#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/compress#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/convex#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/database#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/diamond#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/diff#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/digital#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/dump#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/elf#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/encore#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/filesystems#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/flash#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/fonts#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/frame#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/freebsd#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/gimp#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/gnu#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/hp#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/ibm370#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/ibm6000#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/iff#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/images#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/intel#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/interleaf#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/island#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/ispell#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/java#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/karma#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/lecter#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/lex#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/lif#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/linux#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/lisp#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/mach#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/macintosh#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/magic#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/mail.news#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/microsoft#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/mime#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/mirage#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/mkid#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/mmdf#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/modem#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/motorola#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/msdos#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/ncr#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/netbsd#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/news#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/octave#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/olf#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/os2#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/os9#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/osf1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/pbm#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/pdf#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/pdp#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/pgp#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/pkgadd#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/plus5#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/printer#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/psdbms#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/pyramid#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/riff#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/rpm#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/rtf#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/sc#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/sccs#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/sendmail#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/sequent#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/sgi#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/sgml#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/sniffer#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/softquad#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/sun#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/teapot#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/terminfo#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/tex#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/ti-8x#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/timezone#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/troff#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/typeset#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/unknown#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/uuencode#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/varied.out#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/vax#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/vicar#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/visx#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/vms#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/wordperfect#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/xenix#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/zilog#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magdir/zyxel#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/magic.5#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/names.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/patchlevel.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/print.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/readelf.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/readelf.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/readfat.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/softmagic.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/file/tar.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/install/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/install/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/install/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/install/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/install/install.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/install/pathnames.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/install/xinstall.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ln/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ln/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ln/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ln/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ln/ln.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ln/ln.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ln/symlink.7#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/cmp.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/ls.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/ls.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/ls.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/print.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/stat_flags.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/util.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkdir/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkdir/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkdir/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkdir/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkdir/mkdir.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkdir/mkdir.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkfifo/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkfifo/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkfifo/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkfifo/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkfifo/mkfifo.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mkfifo/mkfifo.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mknod/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mknod/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mknod/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mknod/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mknod/mknod.8#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mknod/mknod.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/compare.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/create.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/excludes.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/misc.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/mtree.8#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/mtree.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/mtree.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/spec.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mtree/verify.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mv/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mv/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mv/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mv/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mv/mv.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mv/mv.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/mv/pathnames.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/ar_io.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/ar_subs.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/buf_subs.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/cache.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/cache.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/cpio.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/cpio.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/cpio.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/file_subs.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/ftree.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/ftree.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/gen_subs.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/getoldopt.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/options.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/options.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/pat_rep.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/pat_rep.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/pax.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/pax.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/pax.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/sel_subs.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/sel_subs.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/tables.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/tables.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/tar.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/tar.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/tar.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/pax/tty_subs.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rm/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rm/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rm/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rm/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rm/rm.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rm/rm.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmdir/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmdir/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmdir/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmdir/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmdir/rmdir.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmdir/rmdir.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmt/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmt/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmt/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmt/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmt/rmt.8#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/rmt/rmt.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/shar/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/shar/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/shar/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/shar/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/shar/shar.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/shar/shar.sh#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/tcopy/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/tcopy/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/tcopy/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/tcopy/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/tcopy/tcopy.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/tcopy/tcopy.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/touch/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/touch/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/touch/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/touch/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/touch/touch.1#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/touch/touch.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 30 13:27:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DA0B16A4D0; Thu, 30 Oct 2003 13:27:13 -0800 (PST) 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 4CC8A16A4CE for ; Thu, 30 Oct 2003 13:27:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20FE043FBD for ; Thu, 30 Oct 2003 13:27:12 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9ULRCXJ075320 for ; Thu, 30 Oct 2003 13:27:12 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9ULRB04075317 for perforce@freebsd.org; Thu, 30 Oct 2003 13:27:11 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 30 Oct 2003 13:27:11 -0800 (PST) Message-Id: <200310302127.h9ULRB04075317@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40865 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: Thu, 30 Oct 2003 21:27:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=40865 Change 40865 by sam@sam_ebb on 2003/10/30 13:27:08 IFC @ 40864 Affected files ... .. //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/netperf/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/netperf/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/netperf/sys/dev/sbni/if_sbni.c#3 integrate .. //depot/projects/netperf/sys/dev/xe/if_xe.c#4 integrate .. //depot/projects/netperf/sys/i386/isa/if_rdp.c#3 integrate .. //depot/projects/netperf/sys/netinet6/in6_src.c#16 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.217 2003/08/29 20:04:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.218 2003/10/30 19:04:58 peter Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -205,7 +205,8 @@ cpu_thread_exit(struct thread *td) { - npxexit(td); + if (td == PCPU_GET(fpcurthread)) + npxdrop(); } void @@ -265,6 +266,7 @@ * more analysis) (need a good safe default). */ bcopy(td0->td_pcb, pcb2, sizeof(*pcb2)); + pcb2->pcb_flags &= ~(PCB_NPXTRAP|PCB_NPXINITDONE); /* * Create a new fresh stack for the new thread. ==== //depot/projects/netperf/sys/dev/cm/smc90cx6.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.10 2003/08/24 17:46:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.11 2003/10/30 19:45:57 brooks Exp $"); /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -312,34 +312,32 @@ */ cm_stop(sc); - if (!ifp->if_name) { - ifp->if_softc = sc; - ifp->if_unit = unit; - ifp->if_name = "cm"; - ifp->if_output = arc_output; - ifp->if_start = cm_start; - ifp->if_ioctl = cm_ioctl; - ifp->if_watchdog = cm_watchdog; - ifp->if_init = cm_init; - /* XXX IFQ_SET_READY(&ifp->if_snd); */ - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - ifp->if_timer = 0; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX; + ifp->if_softc = sc; + ifp->if_unit = unit; + ifp->if_name = "cm"; + ifp->if_output = arc_output; + ifp->if_start = cm_start; + ifp->if_ioctl = cm_ioctl; + ifp->if_watchdog = cm_watchdog; + ifp->if_init = cm_init; + /* XXX IFQ_SET_READY(&ifp->if_snd); */ + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifp->if_timer = 0; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX; - arc_ifattach(ifp, linkaddress); + arc_ifattach(ifp, linkaddress); #ifdef CMSOFTCOPY - sc->sc_rxcookie = softintr_establish(IPL_SOFTNET, cm_srint, sc); - sc->sc_txcookie = softintr_establish(IPL_SOFTNET, - (void (*)(void *))cm_start, ifp); + sc->sc_rxcookie = softintr_establish(IPL_SOFTNET, cm_srint, sc); + sc->sc_txcookie = softintr_establish(IPL_SOFTNET, + (void (*)(void *))cm_start, ifp); #endif #if __FreeBSD_version < 500000 - callout_init(&sc->sc_recon_ch); + callout_init(&sc->sc_recon_ch); #else - callout_init(&sc->sc_recon_ch, 0); + callout_init(&sc->sc_recon_ch, 0); #endif - } if_printf(ifp, "link addr 0x%02x (%d)\n", linkaddress, linkaddress); return 0; ==== //depot/projects/netperf/sys/dev/cs/if_cs.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.25 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.26 2003/10/30 19:45:57 brooks Exp $"); /* * @@ -582,85 +582,83 @@ cs_stop( sc ); - if (!ifp->if_name) { - ifp->if_softc=sc; - ifp->if_unit=unit; - ifp->if_name="cs"; - ifp->if_output=ether_output; - ifp->if_start=cs_start; - ifp->if_ioctl=cs_ioctl; - ifp->if_watchdog=cs_watchdog; - ifp->if_init=cs_init; - ifp->if_snd.ifq_maxlen= IFQ_MAXLEN; - /* - * MIB DATA - */ - /* - ifp->if_linkmib=&sc->mibdata; - ifp->if_linkmiblen=sizeof sc->mibdata; - */ + ifp->if_softc=sc; + ifp->if_unit=unit; + ifp->if_name="cs"; + ifp->if_output=ether_output; + ifp->if_start=cs_start; + ifp->if_ioctl=cs_ioctl; + ifp->if_watchdog=cs_watchdog; + ifp->if_init=cs_init; + ifp->if_snd.ifq_maxlen= IFQ_MAXLEN; + /* + * MIB DATA + */ + /* + ifp->if_linkmib=&sc->mibdata; + ifp->if_linkmiblen=sizeof sc->mibdata; + */ - ifp->if_flags=(IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST ); + ifp->if_flags=(IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST ); - /* - * this code still in progress (DMA support) - * + /* + * this code still in progress (DMA support) + * - sc->recv_ring=malloc(CS_DMA_BUFFER_SIZE<<1, M_DEVBUF, M_NOWAIT); - if (sc->recv_ring == NULL) { - log(LOG_ERR,CS_NAME - "%d: Couldn't allocate memory for NIC\n", unit); - return(0); - } - if ((sc->recv_ring-(sc->recv_ring & 0x1FFFF)) - < (128*1024-CS_DMA_BUFFER_SIZE)) - sc->recv_ring+=16*1024; + sc->recv_ring=malloc(CS_DMA_BUFFER_SIZE<<1, M_DEVBUF, M_NOWAIT); + if (sc->recv_ring == NULL) { + log(LOG_ERR,CS_NAME + "%d: Couldn't allocate memory for NIC\n", unit); + return(0); + } + if ((sc->recv_ring-(sc->recv_ring & 0x1FFFF)) + < (128*1024-CS_DMA_BUFFER_SIZE)) + sc->recv_ring+=16*1024; - */ + */ - sc->buffer=malloc(ETHER_MAX_LEN-ETHER_CRC_LEN,M_DEVBUF,M_NOWAIT); - if (sc->buffer == NULL) { - if_printf(ifp, "Couldn't allocate memory for NIC\n"); - return(0); - } + sc->buffer=malloc(ETHER_MAX_LEN-ETHER_CRC_LEN,M_DEVBUF,M_NOWAIT); + if (sc->buffer == NULL) { + if_printf(ifp, "Couldn't allocate memory for NIC\n"); + return(0); + } - /* - * Initialize the media structures. - */ - ifmedia_init(&sc->media, 0, cs_mediachange, cs_mediastatus); + /* + * Initialize the media structures. + */ + ifmedia_init(&sc->media, 0, cs_mediachange, cs_mediastatus); - if (sc->adapter_cnf & A_CNF_10B_T) { - ifmedia_add(&sc->media, IFM_ETHER|IFM_10_T, 0, NULL); - if (sc->chip_type != CS8900) { - ifmedia_add(&sc->media, - IFM_ETHER|IFM_10_T|IFM_FDX, 0, NULL); - ifmedia_add(&sc->media, - IFM_ETHER|IFM_10_T|IFM_HDX, 0, NULL); - } - } + if (sc->adapter_cnf & A_CNF_10B_T) { + ifmedia_add(&sc->media, IFM_ETHER|IFM_10_T, 0, NULL); + if (sc->chip_type != CS8900) { + ifmedia_add(&sc->media, + IFM_ETHER|IFM_10_T|IFM_FDX, 0, NULL); + ifmedia_add(&sc->media, + IFM_ETHER|IFM_10_T|IFM_HDX, 0, NULL); + } + } - if (sc->adapter_cnf & A_CNF_10B_2) - ifmedia_add(&sc->media, IFM_ETHER|IFM_10_2, 0, NULL); + if (sc->adapter_cnf & A_CNF_10B_2) + ifmedia_add(&sc->media, IFM_ETHER|IFM_10_2, 0, NULL); - if (sc->adapter_cnf & A_CNF_AUI) - ifmedia_add(&sc->media, IFM_ETHER|IFM_10_5, 0, NULL); + if (sc->adapter_cnf & A_CNF_AUI) + ifmedia_add(&sc->media, IFM_ETHER|IFM_10_5, 0, NULL); - if (sc->adapter_cnf & A_CNF_MEDIA) - ifmedia_add(&sc->media, IFM_ETHER|IFM_AUTO, 0, NULL); + if (sc->adapter_cnf & A_CNF_MEDIA) + ifmedia_add(&sc->media, IFM_ETHER|IFM_AUTO, 0, NULL); - /* Set default media from EEPROM */ - switch (sc->adapter_cnf & A_CNF_MEDIA_TYPE) { - case A_CNF_MEDIA_AUTO: media = IFM_ETHER|IFM_AUTO; break; - case A_CNF_MEDIA_10B_T: media = IFM_ETHER|IFM_10_T; break; - case A_CNF_MEDIA_10B_2: media = IFM_ETHER|IFM_10_2; break; - case A_CNF_MEDIA_AUI: media = IFM_ETHER|IFM_10_5; break; - default: if_printf(ifp, "adapter has no media\n"); - } - ifmedia_set(&sc->media, media); - cs_mediaset(sc, media); + /* Set default media from EEPROM */ + switch (sc->adapter_cnf & A_CNF_MEDIA_TYPE) { + case A_CNF_MEDIA_AUTO: media = IFM_ETHER|IFM_AUTO; break; + case A_CNF_MEDIA_10B_T: media = IFM_ETHER|IFM_10_T; break; + case A_CNF_MEDIA_10B_2: media = IFM_ETHER|IFM_10_2; break; + case A_CNF_MEDIA_AUI: media = IFM_ETHER|IFM_10_5; break; + default: if_printf(ifp, "adapter has no media\n"); + } + ifmedia_set(&sc->media, media); + cs_mediaset(sc, media); - ether_ifattach(ifp, sc->arpcom.ac_enaddr); - } + ether_ifattach(ifp, sc->arpcom.ac_enaddr); if (bootverbose) if_printf(ifp, "ethernet address %6D\n", ==== //depot/projects/netperf/sys/dev/ed/if_ed.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/ed/if_ed.c,v 1.219 2003/10/15 17:22:15 shiba Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.220 2003/10/30 19:45:57 brooks Exp $ */ /* @@ -1713,51 +1713,49 @@ */ ed_stop(sc); - if (!ifp->if_name) { - /* - * Initialize ifnet structure - */ - ifp->if_softc = sc; - ifp->if_unit = unit; - ifp->if_name = "ed"; - ifp->if_output = ether_output; - ifp->if_start = ed_start; - ifp->if_ioctl = ed_ioctl; - ifp->if_watchdog = ed_watchdog; - ifp->if_init = ed_init; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - ifp->if_linkmib = &sc->mibdata; - ifp->if_linkmiblen = sizeof sc->mibdata; - /* - * XXX - should do a better job. - */ - if (sc->chip_type == ED_CHIP_TYPE_WD790) - sc->mibdata.dot3StatsEtherChipSet = - DOT3CHIPSET(dot3VendorWesternDigital, - dot3ChipSetWesternDigital83C790); - else - sc->mibdata.dot3StatsEtherChipSet = - DOT3CHIPSET(dot3VendorNational, - dot3ChipSetNational8390); - sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + /* + * Initialize ifnet structure + */ + ifp->if_softc = sc; + ifp->if_unit = unit; + ifp->if_name = "ed"; + ifp->if_output = ether_output; + ifp->if_start = ed_start; + ifp->if_ioctl = ed_ioctl; + ifp->if_watchdog = ed_watchdog; + ifp->if_init = ed_init; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifp->if_linkmib = &sc->mibdata; + ifp->if_linkmiblen = sizeof sc->mibdata; + /* + * XXX - should do a better job. + */ + if (sc->chip_type == ED_CHIP_TYPE_WD790) + sc->mibdata.dot3StatsEtherChipSet = + DOT3CHIPSET(dot3VendorWesternDigital, + dot3ChipSetWesternDigital83C790); + else + sc->mibdata.dot3StatsEtherChipSet = + DOT3CHIPSET(dot3VendorNational, + dot3ChipSetNational8390); + sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; - /* - * Set default state for ALTPHYS flag (used to disable the - * tranceiver for AUI operation), based on compile-time - * config option. - */ - if (flags & ED_FLAGS_DISABLE_TRANCEIVER) - ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | - IFF_MULTICAST | IFF_ALTPHYS); - else - ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | - IFF_MULTICAST); + /* + * Set default state for ALTPHYS flag (used to disable the + * tranceiver for AUI operation), based on compile-time + * config option. + */ + if (flags & ED_FLAGS_DISABLE_TRANCEIVER) + ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | + IFF_MULTICAST | IFF_ALTPHYS); + else + ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | + IFF_MULTICAST); - /* - * Attach the interface - */ - ether_ifattach(ifp, sc->arpcom.ac_enaddr); - } + /* + * Attach the interface + */ + ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ /* ==== //depot/projects/netperf/sys/dev/sbni/if_sbni.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.12 2003/08/24 18:03:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.13 2003/10/30 19:45:57 brooks Exp $"); /* * Device driver for Granch SBNI12 leased line adapters @@ -226,26 +226,24 @@ set_initial_values(sc, flags); callout_handle_init(&sc->wch); - if (!ifp->if_name) { - /* Initialize ifnet structure */ - ifp->if_softc = sc; - ifp->if_unit = unit; - ifp->if_name = "sbni"; - ifp->if_init = sbni_init; - ifp->if_start = sbni_start; - ifp->if_output = ether_output; - ifp->if_ioctl = sbni_ioctl; - ifp->if_watchdog = sbni_watchdog; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + /* Initialize ifnet structure */ + ifp->if_softc = sc; + ifp->if_unit = unit; + ifp->if_name = "sbni"; + ifp->if_init = sbni_init; + ifp->if_start = sbni_start; + ifp->if_output = ether_output; + ifp->if_ioctl = sbni_ioctl; + ifp->if_watchdog = sbni_watchdog; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - /* report real baud rate */ - csr0 = sbni_inb(sc, CSR0); - ifp->if_baudrate = - (csr0 & 0x01 ? 500000 : 2000000) / (1 << flags.rate); + /* report real baud rate */ + csr0 = sbni_inb(sc, CSR0); + ifp->if_baudrate = + (csr0 & 0x01 ? 500000 : 2000000) / (1 << flags.rate); - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ether_ifattach(ifp, sc->arpcom.ac_enaddr); - } + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ if_printf(ifp, "speed %ld, address %6D, rxl ", ==== //depot/projects/netperf/sys/dev/xe/if_xe.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.39 2003/10/14 22:51:35 rsm Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.40 2003/10/30 19:45:57 brooks Exp $"); /* * Portions of this software were derived from Werner Koch's xirc2ps driver @@ -218,22 +218,20 @@ scp->autoneg_status = XE_AUTONEG_NONE; /* Initialise the ifnet structure */ - if (!scp->ifp->if_name) { - scp->ifp->if_softc = scp; - scp->ifp->if_name = "xe"; - scp->ifp->if_unit = device_get_unit(dev); - scp->ifp->if_timer = 0; - scp->ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); - scp->ifp->if_linkmib = &scp->mibdata; - scp->ifp->if_linkmiblen = sizeof scp->mibdata; - scp->ifp->if_output = ether_output; - scp->ifp->if_start = xe_start; - scp->ifp->if_ioctl = xe_ioctl; - scp->ifp->if_watchdog = xe_watchdog; - scp->ifp->if_init = xe_init; - scp->ifp->if_baudrate = 100000000; - scp->ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - } + scp->ifp->if_softc = scp; + scp->ifp->if_name = "xe"; + scp->ifp->if_unit = device_get_unit(dev); + scp->ifp->if_timer = 0; + scp->ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); + scp->ifp->if_linkmib = &scp->mibdata; + scp->ifp->if_linkmiblen = sizeof scp->mibdata; + scp->ifp->if_output = ether_output; + scp->ifp->if_start = xe_start; + scp->ifp->if_ioctl = xe_ioctl; + scp->ifp->if_watchdog = xe_watchdog; + scp->ifp->if_init = xe_init; + scp->ifp->if_baudrate = 100000000; + scp->ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; /* Initialise the ifmedia structure */ ifmedia_init(scp->ifm, 0, xe_media_change, xe_media_status); ==== //depot/projects/netperf/sys/i386/isa/if_rdp.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.21 2003/08/05 20:11:50 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.22 2003/10/30 19:45:58 brooks Exp $"); /* * Device driver for RealTek RTL 8002 (`REDP') based pocket-ethernet @@ -591,25 +591,23 @@ */ rdp_stop(sc); - if (!ifp->if_name) { - /* - * Initialize ifnet structure - */ - ifp->if_softc = sc; - ifp->if_unit = unit; - ifp->if_name = "rdp"; - ifp->if_start = rdp_start; - ifp->if_ioctl = rdp_ioctl; - ifp->if_watchdog = rdp_watchdog; - ifp->if_init = rdp_init; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX; + /* + * Initialize ifnet structure + */ + ifp->if_softc = sc; + ifp->if_unit = unit; + ifp->if_name = "rdp"; + ifp->if_start = rdp_start; + ifp->if_ioctl = rdp_ioctl; + ifp->if_watchdog = rdp_watchdog; + ifp->if_init = rdp_init; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX; - /* - * Attach the interface - */ - ether_ifattach(ifp, sc->arpcom.ac_enaddr); - } + /* + * Attach the interface + */ + ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* * Print additional info when attached ==== //depot/projects/netperf/sys/netinet6/in6_src.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_src.c,v 1.18 2003/10/30 15:29:17 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_src.c,v 1.19 2003/10/30 18:42:25 ume Exp $ */ /* $KAME: in6_src.c,v 1.37 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -647,6 +647,8 @@ { struct addrsel_policyent *new, *pol; + MALLOC(new, struct addrsel_policyent *, sizeof(*new), M_IFADDR, + M_WAITOK); ADDRSEL_LOCK(); /* duplication check */ @@ -656,12 +658,12 @@ &pol->ape_policy.addr) && SA6_ARE_ADDR_EQUAL(&newpolicy->addrmask, &pol->ape_policy.addrmask)) { + ADDRSEL_UNLOCK(); + FREE(new, M_IFADDR); return (EEXIST); /* or override it? */ } } - MALLOC(new, struct addrsel_policyent *, sizeof(*new), M_IFADDR, - M_WAITOK); bzero(new, sizeof(*new)); /* XXX: should validate entry */ @@ -690,8 +692,10 @@ break; } } - if (pol == NULL) + if (pol == NULL) { + ADDRSEL_UNLOCK(); return (ESRCH); + } TAILQ_REMOVE(&addrsel_policytab, pol, ape_entry); ADDRSEL_UNLOCK(); @@ -710,8 +714,10 @@ ADDRSEL_LOCK(); for (pol = TAILQ_FIRST(&addrsel_policytab); pol; pol = TAILQ_NEXT(pol, ape_entry)) { - if ((error = (*callback)(&pol->ape_policy, w)) != 0) + if ((error = (*callback)(&pol->ape_policy, w)) != 0) { + ADDRSEL_UNLOCK(); return (error); + } } ADDRSEL_UNLOCK(); From owner-p4-projects@FreeBSD.ORG Thu Oct 30 13:36:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE4D816A4D0; Thu, 30 Oct 2003 13:36:32 -0800 (PST) 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 A56CF16A4CE for ; Thu, 30 Oct 2003 13:36:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31C5243FAF for ; Thu, 30 Oct 2003 13:36:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9ULaTXJ075778 for ; Thu, 30 Oct 2003 13:36:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9ULaN5G075775 for perforce@freebsd.org; Thu, 30 Oct 2003 13:36:23 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 13:36:23 -0800 (PST) Message-Id: <200310302136.h9ULaN5G075775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40866 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: Thu, 30 Oct 2003 21:36:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=40866 Change 40866 by peter@peter_daintree on 2003/10/30 13:35:54 IFC @40861 Affected files ... .. //depot/projects/hammer/UPDATING#20 integrate .. //depot/projects/hammer/bin/echo/echo.c#4 integrate .. //depot/projects/hammer/bin/ls/print.c#7 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#6 integrate .. //depot/projects/hammer/contrib/ngatm/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/ngatm/libngatm/sscfucust.h#1 branch .. //depot/projects/hammer/contrib/ngatm/libngatm/sscopcust.h#1 branch .. //depot/projects/hammer/contrib/ngatm/libngatm/unimsg.c#1 branch .. //depot/projects/hammer/contrib/ngatm/man/unimsg.3#1 branch .. //depot/projects/hammer/contrib/ngatm/sscop/common.c#1 branch .. //depot/projects/hammer/contrib/ngatm/sscop/common.h#1 branch .. //depot/projects/hammer/contrib/ngatm/sscop/sscop.1#1 branch .. //depot/projects/hammer/contrib/ngatm/sscop/sscop_main.c#1 branch .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#6 integrate .. //depot/projects/hammer/contrib/telnet/telnet/commands.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pam-freebsd.c#6 integrate .. //depot/projects/hammer/etc/Makefile#19 integrate .. //depot/projects/hammer/etc/bluetooth/Makefile#1 branch .. //depot/projects/hammer/etc/bluetooth/hcsecd.conf#1 branch .. //depot/projects/hammer/etc/bluetooth/hosts#1 branch .. //depot/projects/hammer/etc/bluetooth/protocols#1 branch .. //depot/projects/hammer/etc/defaults/periodic.conf#6 integrate .. //depot/projects/hammer/etc/devd.conf#6 integrate .. //depot/projects/hammer/etc/etc.alpha/ttys#2 integrate .. //depot/projects/hammer/etc/etc.amd64/ttys#4 integrate .. //depot/projects/hammer/etc/etc.i386/ttys#2 integrate .. //depot/projects/hammer/etc/etc.ia64/ttys#3 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#4 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#9 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#5 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#10 integrate .. //depot/projects/hammer/etc/netstart#3 integrate .. //depot/projects/hammer/etc/periodic/daily/405.status-ata-raid#1 branch .. //depot/projects/hammer/etc/periodic/daily/Makefile#3 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#13 integrate .. //depot/projects/hammer/etc/rc.d/atm3#2 integrate .. //depot/projects/hammer/etc/rc.d/diskless#7 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#8 integrate .. //depot/projects/hammer/etc/rc.d/ip6addrctl#1 branch .. //depot/projects/hammer/etc/rc.d/ipfilter#12 integrate .. //depot/projects/hammer/etc/rc.d/ipnat#7 integrate .. //depot/projects/hammer/etc/rc.d/jail#4 integrate .. //depot/projects/hammer/etc/rc.d/motd#5 integrate .. //depot/projects/hammer/etc/rc.sendmail#4 integrate .. //depot/projects/hammer/etc/remote#3 integrate .. //depot/projects/hammer/etc/sendmail/Makefile#6 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.submit.mc#1 branch .. //depot/projects/hammer/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/hammer/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gzip/getopt.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/man/man/man.c#4 integrate .. //depot/projects/hammer/gnu/usr.bin/patch/backupfile.c#3 integrate .. //depot/projects/hammer/gnu/usr.bin/rcs/lib/conf.h#2 integrate .. //depot/projects/hammer/include/Makefile#16 integrate .. //depot/projects/hammer/include/netdb.h#3 integrate .. //depot/projects/hammer/include/rpcsvc/ypclnt.h#2 integrate .. //depot/projects/hammer/include/strhash.h#2 delete .. //depot/projects/hammer/include/vis.h#3 integrate .. //depot/projects/hammer/lib/Makefile#26 integrate .. //depot/projects/hammer/lib/csu/common/crtbrand.c#3 integrate .. //depot/projects/hammer/lib/libbluetooth/Makefile#1 branch .. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#1 branch .. //depot/projects/hammer/lib/libbluetooth/bluetooth.c#1 branch .. //depot/projects/hammer/lib/libbluetooth/bluetooth.h#1 branch .. //depot/projects/hammer/lib/libc/alpha/SYS.h#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#13 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/rfork_thread.S#3 branch .. //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/amd64_get_fsbase.c#1 branch .. //depot/projects/hammer/lib/libc/amd64/sys/amd64_get_gsbase.c#1 branch .. //depot/projects/hammer/lib/libc/amd64/sys/amd64_set_fsbase.c#1 branch .. //depot/projects/hammer/lib/libc/amd64/sys/amd64_set_gsbase.c#1 branch .. //depot/projects/hammer/lib/libc/gen/getcwd.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/getvfsbyname.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/glob.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/vis.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/vis.c#3 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/fpgetmask.c#3 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/fpsetmask.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.c#6 integrate .. //depot/projects/hammer/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#5 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#11 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.3#5 integrate .. //depot/projects/hammer/lib/libc/net/inet6_opt_init.3#1 branch .. //depot/projects/hammer/lib/libc/net/inet6_rth_space.3#1 branch .. //depot/projects/hammer/lib/libc/net/ip6opt.c#3 integrate .. //depot/projects/hammer/lib/libc/net/rthdr.c#2 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.c#6 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_dg.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_simple.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_generic.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/rpcb_clnt.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#10 integrate .. //depot/projects/hammer/lib/libc/stdlib/strhash.c#2 delete .. //depot/projects/hammer/lib/libc/string/bcopy.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/kill.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/kqueue.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/stat.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#4 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.c#6 integrate .. //depot/projects/hammer/lib/libfetch/common.c#6 integrate .. //depot/projects/hammer/lib/libipsec/ipsec_dump_policy.c#2 integrate .. //depot/projects/hammer/lib/libipsec/ipsec_strerror.3#4 integrate .. //depot/projects/hammer/lib/libipsec/pfkey_dump.c#3 integrate .. //depot/projects/hammer/lib/libipsec/test-policy.c#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm.c#4 integrate .. //depot/projects/hammer/lib/libkvm/kvm.h#4 integrate .. //depot/projects/hammer/lib/libngatm/Makefile#1 branch .. //depot/projects/hammer/lib/libpam/modules/pam_self/pam_self.8#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/context.S#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 integrate .. //depot/projects/hammer/lib/libpthread/test/mutex_d.c#2 integrate .. //depot/projects/hammer/lib/librpcsvc/rnusers.c#2 integrate .. //depot/projects/hammer/lib/librpcsvc/rstat.c#3 integrate .. //depot/projects/hammer/lib/librpcsvc/rwall.c#2 integrate .. //depot/projects/hammer/lib/librpcsvc/yp_passwd.c#2 integrate .. //depot/projects/hammer/lib/librpcsvc/yp_update.c#2 integrate .. //depot/projects/hammer/lib/libsdp/Makefile#1 branch .. //depot/projects/hammer/lib/libsdp/sdp-int.h#1 branch .. //depot/projects/hammer/lib/libsdp/sdp.3#1 branch .. //depot/projects/hammer/lib/libsdp/sdp.h#1 branch .. //depot/projects/hammer/lib/libsdp/search.c#1 branch .. //depot/projects/hammer/lib/libsdp/session.c#1 branch .. //depot/projects/hammer/lib/libsdp/util.c#1 branch .. //depot/projects/hammer/lib/libstand/environment.c#2 integrate .. //depot/projects/hammer/lib/libstand/stand.h#4 integrate .. //depot/projects/hammer/lib/libutil/Makefile#4 integrate .. //depot/projects/hammer/lib/libutil/_secure_path.c#2 integrate .. //depot/projects/hammer/lib/libutil/fparseln.c#2 integrate .. //depot/projects/hammer/lib/libutil/libutil.h#2 integrate .. //depot/projects/hammer/lib/libutil/login.c#2 integrate .. //depot/projects/hammer/lib/libutil/login_cap.c#4 integrate .. //depot/projects/hammer/lib/libutil/login_cap.h#3 integrate .. //depot/projects/hammer/lib/libutil/login_class.c#5 integrate .. //depot/projects/hammer/lib/libutil/login_ok.c#3 integrate .. //depot/projects/hammer/lib/libutil/login_tty.c#3 integrate .. //depot/projects/hammer/lib/libutil/logout.c#4 integrate .. //depot/projects/hammer/lib/libutil/logwtmp.c#3 integrate .. //depot/projects/hammer/lib/libutil/pty.c#3 integrate .. //depot/projects/hammer/lib/libutil/pw_util.c#7 integrate .. //depot/projects/hammer/lib/libutil/realhostname.c#3 integrate .. //depot/projects/hammer/lib/libutil/stub.c#2 integrate .. //depot/projects/hammer/lib/libutil/trimdomain.c#2 integrate .. //depot/projects/hammer/lib/libutil/uucplock.c#3 integrate .. //depot/projects/hammer/lib/msun/Makefile#6 integrate .. //depot/projects/hammer/lib/msun/man/fabs.3#2 integrate .. //depot/projects/hammer/lib/msun/src/e_scalb.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#9 integrate .. //depot/projects/hammer/lib/msun/src/s_fabsl.c#1 branch .. //depot/projects/hammer/libexec/ftpd/ftpcmd.y#7 integrate .. //depot/projects/hammer/libexec/makekey/makekey.8#3 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_main.c#3 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfrd_getmap.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#30 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#41 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#5 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#9 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#10 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#11 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#13 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#7 integrate .. //depot/projects/hammer/sbin/devd/devd.h#4 integrate .. //depot/projects/hammer/sbin/devd/devd.hh#2 integrate .. //depot/projects/hammer/sbin/devd/parse.y#4 integrate .. //depot/projects/hammer/sbin/devd/token.l#4 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.8#3 integrate .. //depot/projects/hammer/sbin/fsck/Makefile#2 integrate .. //depot/projects/hammer/sbin/fsck/fsck.c#8 integrate .. //depot/projects/hammer/sbin/fsck/fsutil.h#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/dir.c#4 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/check.c#3 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/ext.h#3 integrate .. //depot/projects/hammer/sbin/gbde/Makefile#7 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#8 integrate .. //depot/projects/hammer/sbin/gbde/test.sh#3 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.c#5 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#8 integrate .. //depot/projects/hammer/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate .. //depot/projects/hammer/sbin/mount/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount/mount.8#6 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.8#5 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#4 integrate .. //depot/projects/hammer/sbin/mount_std/mount_std.8#3 integrate .. //depot/projects/hammer/sbin/newfs/newfs.8#7 integrate .. //depot/projects/hammer/sbin/nos-tun/nos-tun.c#3 integrate .. //depot/projects/hammer/sbin/ping6/Makefile#2 integrate .. //depot/projects/hammer/sbin/ping6/ping6.8#2 integrate .. //depot/projects/hammer/sbin/ping6/ping6.c#5 integrate .. //depot/projects/hammer/sbin/restore/dirs.c#3 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#5 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#7 integrate .. //depot/projects/hammer/sbin/umount/umount.c#7 integrate .. //depot/projects/hammer/sbin/vinum/list.c#6 integrate .. //depot/projects/hammer/share/doc/IPv6/IMPLEMENTATION#3 integrate .. //depot/projects/hammer/share/examples/Makefile#4 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#3 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.8#2 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.c#4 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#21 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#12 integrate .. //depot/projects/hammer/share/man/man4/bktr.4#3 integrate .. //depot/projects/hammer/share/man/man4/dcons.4#1 branch .. //depot/projects/hammer/share/man/man4/dcons_crom.4#1 branch .. //depot/projects/hammer/share/man/man4/ddb.4#3 integrate .. //depot/projects/hammer/share/man/man4/hatm.4#2 integrate .. //depot/projects/hammer/share/man/man4/inet.4#6 integrate .. //depot/projects/hammer/share/man/man4/kld.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/pae.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/svr4.4#3 integrate .. //depot/projects/hammer/share/man/man4/multicast.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_bluetooth.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_bt3c.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_btsocket.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_h4.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_hci.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_l2cap.4#6 integrate .. //depot/projects/hammer/share/man/man4/ng_sscfu.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_sscop.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_ubt.4#5 integrate .. //depot/projects/hammer/share/man/man4/pim.4#1 branch .. //depot/projects/hammer/share/man/man4/ubtbcmfw.4#3 integrate .. //depot/projects/hammer/share/man/man4/utopia.4#3 integrate .. //depot/projects/hammer/share/man/man4/vpo.4#3 integrate .. //depot/projects/hammer/share/man/man5/Makefile#6 integrate .. //depot/projects/hammer/share/man/man5/bluetooth.hosts.5#1 branch .. //depot/projects/hammer/share/man/man5/bluetooth.protocols.5#1 branch .. //depot/projects/hammer/share/man/man5/elf.5#5 integrate .. //depot/projects/hammer/share/man/man5/remote.5#3 integrate .. //depot/projects/hammer/share/man/man9/BUS_CONFIG_INTR.9#2 integrate .. //depot/projects/hammer/share/man/man9/BUS_PRINT_CHILD.9#2 integrate .. //depot/projects/hammer/share/man/man9/BUS_READ_IVAR.9#2 integrate .. //depot/projects/hammer/share/man/man9/BUS_SETUP_INTR.9#5 integrate .. //depot/projects/hammer/share/man/man9/DELAY.9#2 integrate .. //depot/projects/hammer/share/man/man9/DEVICE_DETACH.9#2 integrate .. //depot/projects/hammer/share/man/man9/DEVICE_PROBE.9#3 integrate .. //depot/projects/hammer/share/man/man9/MD5.9#2 integrate .. //depot/projects/hammer/share/man/man9/VFS.9#3 integrate .. //depot/projects/hammer/share/man/man9/VFS_CHECKEXP.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_FHTOVP.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_INIT.9#3 integrate .. //depot/projects/hammer/share/man/man9/VFS_MOUNT.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_QUOTACTL.9#3 integrate .. //depot/projects/hammer/share/man/man9/VFS_ROOT.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_SET.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_START.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_STATFS.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_SYNC.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_UNMOUNT.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_VGET.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_VPTOFH.9#3 integrate .. //depot/projects/hammer/share/man/man9/VOP_ACLCHECK.9#5 integrate .. //depot/projects/hammer/share/man/man9/VOP_ADVLOCK.9#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_CREATE.9#5 integrate .. //depot/projects/hammer/share/man/man9/VOP_GETACL.9#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_GETEXTATTR.9#8 integrate .. //depot/projects/hammer/share/man/man9/VOP_GETPAGES.9#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_INACTIVE.9#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_LEASE.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_LISTEXTATTR.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_OPENCLOSE.9#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_RDWR.9#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_READDIR.9#5 integrate .. //depot/projects/hammer/share/man/man9/VOP_RENAME.9#5 integrate .. //depot/projects/hammer/share/man/man9/VOP_SETACL.9#4 integrate .. //depot/projects/hammer/share/man/man9/accept_filter.9#4 integrate .. //depot/projects/hammer/share/man/man9/bios.9#2 integrate .. //depot/projects/hammer/share/man/man9/boot.9#2 integrate .. //depot/projects/hammer/share/man/man9/buf.9#3 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#6 integrate .. //depot/projects/hammer/share/man/man9/bus_generic_attach.9#2 integrate .. //depot/projects/hammer/share/man/man9/bus_generic_detach.9#2 integrate .. //depot/projects/hammer/share/man/man9/bus_generic_shutdown.9#2 integrate .. //depot/projects/hammer/share/man/man9/cd.9#3 integrate .. //depot/projects/hammer/share/man/man9/copy.9#2 integrate .. //depot/projects/hammer/share/man/man9/devclass.9#4 integrate .. //depot/projects/hammer/share/man/man9/devclass_add_driver.9#2 integrate .. //depot/projects/hammer/share/man/man9/device.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_add_child.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_delete_child.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_enable.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_find_child.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_get_children.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_get_devclass.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_get_driver.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_get_ivars.9#4 integrate .. //depot/projects/hammer/share/man/man9/device_get_name.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_get_parent.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_get_softc.9#4 integrate .. //depot/projects/hammer/share/man/man9/device_get_state.9#4 integrate .. //depot/projects/hammer/share/man/man9/device_get_unit.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_ids.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_probe_and_attach.9#2 integrate .. //depot/projects/hammer/share/man/man9/device_quiet.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_set_desc.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_set_driver.9#3 integrate .. //depot/projects/hammer/share/man/man9/device_set_flags.9#3 integrate .. //depot/projects/hammer/share/man/man9/devstat.9#3 integrate .. //depot/projects/hammer/share/man/man9/devtoname.9#2 integrate .. //depot/projects/hammer/share/man/man9/disk.9#2 integrate .. //depot/projects/hammer/share/man/man9/driver.9#3 integrate .. //depot/projects/hammer/share/man/man9/extattr.9#5 integrate .. //depot/projects/hammer/share/man/man9/inittodr.9#3 integrate .. //depot/projects/hammer/share/man/man9/make_dev.9#4 integrate .. //depot/projects/hammer/share/man/man9/panic.9#2 integrate .. //depot/projects/hammer/share/man/man9/random.9#4 integrate .. //depot/projects/hammer/share/man/man9/resettodr.9#2 integrate .. //depot/projects/hammer/share/man/man9/rijndael.9#2 integrate .. //depot/projects/hammer/share/man/man9/rtalloc.9#4 integrate .. //depot/projects/hammer/share/man/man9/rtentry.9#3 integrate .. //depot/projects/hammer/share/man/man9/sleep.9#5 integrate .. //depot/projects/hammer/share/man/man9/spl.9#2 integrate .. //depot/projects/hammer/share/man/man9/suser.9#2 integrate .. //depot/projects/hammer/share/man/man9/time.9#2 integrate .. //depot/projects/hammer/share/man/man9/vfs_busy.9#2 integrate .. //depot/projects/hammer/share/man/man9/vfs_getnewfsid.9#3 integrate .. //depot/projects/hammer/share/man/man9/vfs_getvfs.9#3 integrate .. //depot/projects/hammer/share/man/man9/vfs_mount.9#3 integrate .. //depot/projects/hammer/share/man/man9/vfs_mountedon.9#3 integrate .. //depot/projects/hammer/share/man/man9/vfs_rootmountalloc.9#2 integrate .. //depot/projects/hammer/share/man/man9/vfs_timestamp.9#2 integrate .. //depot/projects/hammer/share/man/man9/vfs_unbusy.9#2 integrate .. //depot/projects/hammer/share/man/man9/vget.9#4 integrate .. //depot/projects/hammer/share/man/man9/vm_map.9#2 integrate .. //depot/projects/hammer/share/man/man9/vm_map_max.9#2 integrate .. //depot/projects/hammer/share/man/man9/vnode.9#6 integrate .. //depot/projects/hammer/share/man/man9/vref.9#4 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#9 integrate .. //depot/projects/hammer/share/misc/pci_vendors#8 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#17 integrate .. //depot/projects/hammer/share/zoneinfo/asia#4 integrate .. //depot/projects/hammer/share/zoneinfo/australasia#4 integrate .. //depot/projects/hammer/share/zoneinfo/backward#2 integrate .. //depot/projects/hammer/share/zoneinfo/europe#3 integrate .. //depot/projects/hammer/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#3 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#4 integrate .. //depot/projects/hammer/share/zoneinfo/zone.tab#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#58 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#15 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/signal.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/stdarg.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/ucontext.h#12 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#5 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#12 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#15 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#8 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#8 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_signal.c#7 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#8 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/hammer/sys/conf/NOTES#27 integrate .. //depot/projects/hammer/sys/conf/files#30 integrate .. //depot/projects/hammer/sys/conf/files.amd64#25 integrate .. //depot/projects/hammer/sys/conf/files.ia64#13 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#13 integrate .. //depot/projects/hammer/sys/conf/options#25 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#6 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx.h#3 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_context.c#3 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_env.h#3 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_self.c#3 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_step.c#3 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_trace.c#4 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_trace.h#4 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#3 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#4 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/test/Makefile#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/test/dump_context.c#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/test/dumpmyself.c#2 integrate .. //depot/projects/hammer/sys/contrib/ia64/libuwx/test/primeregs.s#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.c#5 integrate .. //depot/projects/hammer/sys/contrib/ngatm/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/misc/unimsg_common.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscfu.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscfudef.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscfupriv.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscop.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscopdef.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/saal/sscoppriv.h#1 branch .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/unimsg.h#1 branch .. //depot/projects/hammer/sys/crypto/blowfish/bf_ecb.c#1 branch .. //depot/projects/hammer/sys/crypto/blowfish/blowfish.h#2 integrate .. //depot/projects/hammer/sys/crypto/rijndael/Makefile#1 branch .. //depot/projects/hammer/sys/crypto/rijndael/boxes-fst.dat#2 delete .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-alg-fst.c#3 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-alg-fst.h#2 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api-fst.c#5 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael_local.h#2 integrate .. //depot/projects/hammer/sys/crypto/rijndael/test00.c#1 branch .. //depot/projects/hammer/sys/dev/aac/aac.c#16 integrate .. //depot/projects/hammer/sys/dev/aac/aac_disk.c#6 integrate .. //depot/projects/hammer/sys/dev/aac/aacreg.h#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#13 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#9 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#6 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#1 branch .. //depot/projects/hammer/sys/dev/dcons/dcons.h#1 branch .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#1 branch .. //depot/projects/hammer/sys/dev/drm/ati_pcigart.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_auth.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_context.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_dma.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_irq.h#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_memory.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory_debug.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pci.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/mga.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/mga_dma.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/r128_cce.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_state.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/radeon.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/sis.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#5 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#8 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#6 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/hammer/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#17 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#8 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#5 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_mca.c#5 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#4 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#19 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#7 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#21 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#1 branch .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#24 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#6 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_intr.c#4 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_rx.c#4 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_tx.c#4 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatmvar.h#3 integrate .. //depot/projects/hammer/sys/dev/ips/ips_commands.c#6 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/hammer/sys/dev/matcd/matcd.c#3 integrate .. //depot/projects/hammer/sys/dev/mcd/mcd.c#8 integrate .. //depot/projects/hammer/sys/dev/md/md.c#17 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/null/null.c#7 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#6 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#14 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#17 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#17 integrate .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#9 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#17 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/pci/pci_user.c#5 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#10 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_freebsdkintf.c#6 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#8 integrate .. //depot/projects/hammer/sys/dev/scd/scd.c#6 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/hammer/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mpu.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.h#2 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/hammer/sys/dev/streams/streams.c#6 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#11 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#8 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#9 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_eisa.c#4 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/vx/if_vxreg.h#2 integrate .. //depot/projects/hammer/sys/dev/vx/if_vxvar.h#1 branch .. //depot/projects/hammer/sys/dev/wi/if_wi.c#18 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#7 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/xe/if_xereg.h#2 integrate .. //depot/projects/hammer/sys/dev/xe/if_xevar.h#2 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#14 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_ccd.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_fox.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#17 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_inode.c#6 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_linux_balloc.c#4 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_linux_ialloc.c#3 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/hammer/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#11 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakecode.S#4 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#13 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#21 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/locore.s#9 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/mp_clock.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#21 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#20 integrate .. //depot/projects/hammer/sys/i386/i386/tsc.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#14 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_signal.c#8 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.h#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#7 integrate .. //depot/projects/hammer/sys/i386/isa/if_rdp.c#8 integrate .. //depot/projects/hammer/sys/i386/isa/isa_compat.c#4 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#12 integrate .. //depot/projects/hammer/sys/ia64/disasm/disasm.h#1 branch .. //depot/projects/hammer/sys/ia64/disasm/disasm_decode.c#1 branch .. //depot/projects/hammer/sys/ia64/disasm/disasm_extract.c#1 branch .. //depot/projects/hammer/sys/ia64/disasm/disasm_format.c#1 branch .. //depot/projects/hammer/sys/ia64/disasm/disasm_int.h#1 branch .. //depot/projects/hammer/sys/ia64/ia64/db_disasm.c#2 delete .. //depot/projects/hammer/sys/ia64/ia64/db_interface.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.S#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#26 integrate .. //depot/projects/hammer/sys/ia64/ia64/ptrace_machdep.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/support.S#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/sys_machdep.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/syscall.S#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#19 integrate .. //depot/projects/hammer/sys/ia64/ia64/unaligned.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#14 integrate .. //depot/projects/hammer/sys/ia64/include/inst.h#2 delete .. //depot/projects/hammer/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/hammer/sys/ia64/include/proc.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/vmparam.h#5 integrate .. //depot/projects/hammer/sys/isa/fd.c#12 integrate .. //depot/projects/hammer/sys/isa/syscons_isa.c#7 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#8 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_physio.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#8 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#13 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_disk.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_kobj.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#17 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#18 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#17 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#17 integrate .. //depot/projects/hammer/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#8 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#10 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#6 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#15 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#20 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#15 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/hammer/sys/modules/Makefile#27 integrate .. //depot/projects/hammer/sys/modules/dcons/Makefile#1 branch .. //depot/projects/hammer/sys/modules/dcons_crom/Makefile#1 branch .. //depot/projects/hammer/sys/modules/firewire/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/firewire/sbp_targ/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/atm/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/netgraph/atm/atmbase/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/atm/sscfu/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/atm/sscop/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bluetooth/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bt3c/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/h4/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/hci/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/l2cap/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/socket/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bpf.h#4 integrate .. //depot/projects/hammer/sys/net/if.c#11 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/hammer/sys/net/if_loop.c#10 integrate .. //depot/projects/hammer/sys/net/if_tun.c#7 integrate .. //depot/projects/hammer/sys/net/if_types.h#2 integrate .. //depot/projects/hammer/sys/net/if_var.h#7 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#8 integrate .. //depot/projects/hammer/sys/net/net_osdep.h#3 integrate .. //depot/projects/hammer/sys/net/pfkeyv2.h#3 integrate .. //depot/projects/hammer/sys/net/route.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#6 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_sscfu.h#1 branch .. //depot/projects/hammer/sys/netgraph/atm/ng_sscop.h#1 branch .. //depot/projects/hammer/sys/netgraph/atm/ngatmbase.c#1 branch .. //depot/projects/hammer/sys/netgraph/atm/ngatmbase.h#1 branch .. //depot/projects/hammer/sys/netgraph/atm/sscfu/ng_sscfu.c#1 branch .. //depot/projects/hammer/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#1 branch .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop.c#1 branch .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop_cust.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#3 integrate .. //depot/projects/hammer/sys/netinet/icmp6.h#5 integrate .. //depot/projects/hammer/sys/netinet/in.h#9 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#5 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip.h#4 integrate .. //depot/projects/hammer/sys/netinet/ip6.h#4 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#13 integrate .. //depot/projects/hammer/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/hammer/sys/netinet/ip_ecn.h#2 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#8 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#16 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/hammer/sys/netinet6/ah.h#2 integrate .. //depot/projects/hammer/sys/netinet6/ah6.h#2 integrate .. //depot/projects/hammer/sys/netinet6/ah_aesxcbcmac.c#1 branch .. //depot/projects/hammer/sys/netinet6/ah_aesxcbcmac.h#1 branch .. //depot/projects/hammer/sys/netinet6/ah_core.c#4 integrate .. //depot/projects/hammer/sys/netinet6/ah_input.c#3 integrate .. //depot/projects/hammer/sys/netinet6/ah_output.c#5 integrate .. //depot/projects/hammer/sys/netinet6/dest6.c#3 integrate .. //depot/projects/hammer/sys/netinet6/esp.h#2 integrate .. //depot/projects/hammer/sys/netinet6/esp_aesctr.c#1 branch .. //depot/projects/hammer/sys/netinet6/esp_aesctr.h#1 branch .. //depot/projects/hammer/sys/netinet6/esp_core.c#4 integrate .. //depot/projects/hammer/sys/netinet6/esp_input.c#5 integrate .. //depot/projects/hammer/sys/netinet6/esp_rijndael.c#3 integrate .. //depot/projects/hammer/sys/netinet6/esp_rijndael.h#2 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#4 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#8 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#4 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#5 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/hammer/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/hammer/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#6 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#9 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#6 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#5 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#7 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#4 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#6 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#6 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/hammer/sys/netinet6/route6.c#4 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#4 integrate .. //depot/projects/hammer/sys/netinet6/scope6_var.h#3 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#5 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/hammer/sys/netkey/key.c#6 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#10 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#19 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#12 integrate .. //depot/projects/hammer/sys/pc98/pc98/wd.c#8 integrate .. //depot/projects/hammer/sys/pc98/pc98/wd_cd.c#6 integrate .. //depot/projects/hammer/sys/pccard/pcic.c#6 integrate .. //depot/projects/hammer/sys/pccard/pcic_pci.c#7 integrate .. //depot/projects/hammer/sys/pci/agp.c#8 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#11 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#21 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#14 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#19 integrate .. //depot/projects/hammer/sys/security/mac/mac_internal.h#1 branch .. //depot/projects/hammer/sys/security/mac/mac_net.c#1 branch .. //depot/projects/hammer/sys/security/mac/mac_pipe.c#1 branch .. //depot/projects/hammer/sys/security/mac/mac_process.c#1 branch .. //depot/projects/hammer/sys/security/mac/mac_system.c#1 branch .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#1 branch .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#23 integrate .. //depot/projects/hammer/sys/sys/agpio.h#3 integrate .. //depot/projects/hammer/sys/sys/bio.h#8 integrate .. //depot/projects/hammer/sys/sys/buf.h#8 integrate .. //depot/projects/hammer/sys/sys/bus.h#8 integrate .. //depot/projects/hammer/sys/sys/cdio.h#3 integrate .. //depot/projects/hammer/sys/sys/conf.h#7 integrate .. //depot/projects/hammer/sys/sys/cons.h#4 integrate .. //depot/projects/hammer/sys/sys/domain.h#2 integrate .. //depot/projects/hammer/sys/sys/endian.h#3 integrate .. //depot/projects/hammer/sys/sys/interrupt.h#4 integrate .. //depot/projects/hammer/sys/sys/kernel.h#6 integrate .. //depot/projects/hammer/sys/sys/kobj.h#3 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#13 integrate .. //depot/projects/hammer/sys/sys/mutex.h#8 integrate .. //depot/projects/hammer/sys/sys/param.h#21 integrate .. //depot/projects/hammer/sys/sys/proc.h#33 integrate .. //depot/projects/hammer/sys/sys/resourcevar.h#6 integrate .. //depot/projects/hammer/sys/sys/sched.h#4 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#8 integrate .. //depot/projects/hammer/sys/sys/syscall.h#17 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#17 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#11 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#17 integrate .. //depot/projects/hammer/sys/sys/time.h#4 integrate .. //depot/projects/hammer/sys/sys/vnode.h#17 integrate .. //depot/projects/hammer/sys/tools/makeobjops.awk#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_bmap.c#4 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#13 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#10 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#13 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#29 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#11 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.h#7 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_pager.h#5 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#15 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.c#1 branch .. //depot/projects/hammer/tools/tools/pciid/mk_pci_vendors.pl#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#7 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#6 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/tb.css#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#21 integrate .. //depot/projects/hammer/usr.bin/atm/Makefile#1 branch .. //depot/projects/hammer/usr.bin/atm/Makefile.inc#1 branch .. //depot/projects/hammer/usr.bin/atm/sscop/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/bluetooth/Makefile.inc#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/bthost/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/bthost/bthost.1#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/bthost/bthost.c#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.1#5 integrate .. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.c#3 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#3 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.australia#4 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#12 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.history#8 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte#4 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft#3 integrate .. //depot/projects/hammer/usr.bin/chat/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/gprof/gprof.c#3 integrate .. //depot/projects/hammer/usr.bin/gprof/gprof.h#4 integrate .. //depot/projects/hammer/usr.bin/gprof/hp300.c#3 delete .. //depot/projects/hammer/usr.bin/gprof/hp300.h#2 delete .. //depot/projects/hammer/usr.bin/gprof/mips.c#3 delete .. //depot/projects/hammer/usr.bin/gprof/mips.h#2 delete .. //depot/projects/hammer/usr.bin/gprof/sparc.c#3 delete .. //depot/projects/hammer/usr.bin/gprof/sparc.h#2 delete .. //depot/projects/hammer/usr.bin/gprof/tahoe.c#3 delete .. //depot/projects/hammer/usr.bin/gprof/tahoe.h#2 delete .. //depot/projects/hammer/usr.bin/gprof/vax.c#3 delete .. //depot/projects/hammer/usr.bin/gprof/vax.h#2 delete .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#3 integrate .. //depot/projects/hammer/usr.bin/netstat/inet.c#6 integrate .. //depot/projects/hammer/usr.bin/newgrp/newgrp.c#2 integrate .. //depot/projects/hammer/usr.bin/rup/rup.c#2 integrate .. //depot/projects/hammer/usr.bin/rusers/rusers.c#2 integrate .. //depot/projects/hammer/usr.bin/rwall/rwall.c#3 integrate .. //depot/projects/hammer/usr.bin/showmount/showmount.c#3 integrate .. //depot/projects/hammer/usr.bin/su/su.c#8 integrate .. //depot/projects/hammer/usr.bin/systat/devs.c#3 integrate .. //depot/projects/hammer/usr.bin/systat/vmstat.c#5 integrate .. //depot/projects/hammer/usr.bin/tftp/main.c#4 integrate .. //depot/projects/hammer/usr.bin/time/time.c#4 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#6 integrate .. //depot/projects/hammer/usr.bin/vgrind/vfontedpr.c#2 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/hammer/usr.bin/who/who.c#4 integrate .. //depot/projects/hammer/usr.bin/xlint/xlint/xlint.c#4 integrate .. //depot/projects/hammer/usr.bin/ypcat/ypcat.c#2 integrate .. //depot/projects/hammer/usr.bin/ypmatch/ypmatch.c#2 integrate .. //depot/projects/hammer/usr.bin/ypwhich/ypwhich.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/input.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/trace.c#2 integrate .. //depot/projects/hammer/usr.sbin/Makefile#30 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi.c#6 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/Makefile.inc#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/bcmfw.8#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.8#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.8#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.h#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/info.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_control.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_policy.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/node.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/send_recv.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/status.c#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/util.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.8#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.h#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/parser.y#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.8#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2cap.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.8#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.8#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 30 13:43:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9B6616A4D0; Thu, 30 Oct 2003 13:43:41 -0800 (PST) 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 BE67B16A4CE for ; Thu, 30 Oct 2003 13:43:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30CDE43FDF for ; Thu, 30 Oct 2003 13:43:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9ULhdXJ076314 for ; Thu, 30 Oct 2003 13:43:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9ULhd9k076311 for perforce@freebsd.org; Thu, 30 Oct 2003 13:43:39 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 13:43:39 -0800 (PST) Message-Id: <200310302143.h9ULhd9k076311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40868 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: Thu, 30 Oct 2003 21:43:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=40868 Change 40868 by peter@peter_daintree on 2003/10/30 13:43:01 p4 integrate -I -b smp_hammer (ie: merge in jhb_acpipci changes) Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#9 integrate .. //depot/projects/hammer/sys/jhb_notes#6 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#4 (text+ko) ==== @@ -76,7 +76,7 @@ static int madt_find_cpu(u_int acpi_id, u_int *apic_id); static int madt_find_interrupt(int intr, void **apic, u_int *pin); static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); -static void *madt_map_table(vm_paddr_t pa, int offset); +static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); static void madt_parse_apics(APIC_HEADER *entry, void *arg); static void madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr); static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); @@ -147,12 +147,16 @@ } static void * -madt_map_table(vm_paddr_t pa, int offset) +madt_map_table(vm_paddr_t pa, int offset, const char *sig) { ACPI_TABLE_HEADER *header; vm_offset_t length; header = madt_map(pa, offset, sizeof(ACPI_TABLE_HEADER)); + if (strncmp(header->Signature, sig, 4) != 0) { + madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); + return (NULL); + } length = header->Length; madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); return (madt_map(pa, offset, length)); @@ -192,7 +196,9 @@ /* XXXTEST */ printf("rsdp_ptr.Pointer.Logical = %p\n", (void *)rsdp_ptr.Pointer.Logical); - KASSERT(rsdp_ptr.Pointer.Physical < 1024 * 1024, ("RSDP too high")); + printf("rsdp_ptr.Pointer.Physical = 0x%jx\n", + (uintmax_t)rsdp_ptr.Pointer.Physical); + KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { #if 0 @@ -204,18 +210,13 @@ /* * For ACPI < 2.0, use the RSDT. For ACPI >= 2.0, use the XSDT. - * Note that we are assuming throughout here that pmap_mapdev() - * is going to give us addresses in the KERNBASE to KERNBASE + 1mb - * range and as such, that the lengths don't have to be perfect. - * The XSDT and RSDT are variable length and we don't map in their - * full length before using the variable length portion. We also - * don't do any pmap_unmapdev()'s as we assume that they wouldn't - * do anything anyway. + * We map the XSDT and RSDT at page 1 in the crashdump area. + * Page 0 is used to map in the headers of candidate ACPI tables. */ - if (rsdp->Revision >= 2) { + if (rsdp->Revision >= 2 /* && rsdp->RsdtPhysicalAddress == 0 */) { /* XXXTEST */ printf("XSDT PA = 0x%jx\n", (uintmax_t)rsdp->XsdtPhysicalAddress); - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1); + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); if (xsdt == NULL) { #if 0 if (bootverbose) @@ -231,8 +232,8 @@ madt_unmap_table(xsdt); } else { /* XXXTEST */ - printf("RSDT PA = 0x%jx\n", (uintmax_t)rsdp->XsdtPhysicalAddress); - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1); + printf("RSDT PA = 0x%jx\n", (uintmax_t)rsdp->RsdtPhysicalAddress); + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); if (rsdt == NULL) { #if 0 if (bootverbose) @@ -304,7 +305,8 @@ madt_probe_cpus(void) { - madt = madt_map_table(madt_physaddr, 0); + madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + KASSERT(madt != NULL, ("Unable to re-map MADT")); madt_walk_table(madt_probe_cpus_handler, NULL); madt_unmap_table(madt); madt = NULL; ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#8 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/apic_vector.s,v 1.89 2003/07/10 01:02:59 peter Exp $ + * $FreeBSD: src/sys/i386/isa/apic_vector.s,v 1.90 2003/10/16 10:44:24 bde Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#9 (text+ko) ==== @@ -369,25 +369,28 @@ * Assume that pin 0 on the first IO APIC is an ExtINT pin by * default. Assume that intpins 1-15 are ISA interrupts and * use suitable defaults for those. Assume that all other - * intpins are PCI interrupts. + * intpins are PCI interrupts. Enable the ExtINT pin by + * default but mask all other pins. */ if (intpin->io_vector == 0) { intpin->io_activehi = 1; intpin->io_edgetrigger = 1; intpin->io_vector = VECTOR_EXTINT; + intpin->io_masked = 0; } else if (intpin->io_vector < IOAPIC_ISA_INTS) { intpin->io_activehi = 1; intpin->io_edgetrigger = 1; + intpin->io_masked = 1; } else { intpin->io_activehi = 0; intpin->io_edgetrigger = 0; + intpin->io_masked = 1; } /* - * Start off with this intpin masked and not having a - * logical cluster destination until it is enabled. + * Start off without a logical cluster destination until + * the pin is enabled. */ - intpin->io_masked = 1; intpin->io_dest = DEST_NONE; if (bootverbose) { printf("ioapic%u: intpin %d -> ", io->io_id, i); @@ -507,6 +510,7 @@ if (io->io_pins[pin].io_vector < 0) return (EINVAL); io->io_pins[pin].io_vector = VECTOR_EXTINT; + io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; #if 0 @@ -566,7 +570,7 @@ io = (struct ioapic *)cookie; apic = io->io_addr; mtx_lock_spin(&icu_lock); - flags = ioapic_read(apic, IOAPIC_VER) && IOART_VER_VERSION; + flags = ioapic_read(apic, IOAPIC_VER) & IOART_VER_VERSION; STAILQ_INSERT_TAIL(&ioapic_list, io, io_next); mtx_unlock_spin(&icu_lock); printf("ioapic%u irqs %u-%u on motherboard\n", io->io_id, @@ -661,8 +665,9 @@ /* * Support for mixed-mode interrupt sources. These sources route an ISA * IRQ through the 8259A's via the ExtINT on pin 0 of the I/O APIC that - * routes the ISA interrupts. We basically mix and match APIC and atpic - * functionality to build these interrupt sources. + * routes the ISA interrupts. We just ignore the intpins that use this + * mode and allow the atpic driver to register its interrupt source for + * that IRQ instead. */ void @@ -680,13 +685,11 @@ extint = &io->io_pins[0]; if (extint->io_vector != VECTOR_EXTINT) panic("Can't find ExtINT pin to route through!"); - if (extint->io_dest == DEST_NONE) { #if 0 - /* XXXTEST? */ + /* XXXTEST? */ + if (extint->io_dest == DEST_NONE) ioapic_assign_cluster(extint); #endif - ioapic_enable_source(&extint->io_intsrc); - } } #endif /* MIXED_MODE */ ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#12 (text+ko) ==== @@ -75,10 +75,10 @@ struct lapic { struct lvt la_lvts[LVT_MAX + 1]; - int la_id:8; - int la_cluster:4; - int la_cluster_id:2; - int la_present:1; + u_int la_id:8; + u_int la_cluster:4; + u_int la_cluster_id:2; + u_int la_present:1; } static lapics[MAX_APICID]; /* XXX: should thermal be an NMI? */ ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#16 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.216 2003/09/10 01:36:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.218 2003/10/24 21:02:26 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -132,8 +132,8 @@ int cpu_present:1; int cpu_bsp:1; } static cpu_info[MAXCPU]; +static int cpu_apic_ids[MAXCPU]; - static u_int boot_address; static void set_logical_apic_ids(void); @@ -234,7 +234,12 @@ void cpu_mp_start(void) { + int i; + /* Initialize the logical ID to APIC ID table. */ + for (i = 0; i < MAXCPU; i++) + cpu_apic_ids[i] = -1; + /* Install an inter-CPU IPI for TLB invalidation */ setidt(IPI_INVLTLB, IDTVEC(invltlb), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLPG, IDTVEC(invlpg), SDT_SYSIGT, SEL_KPL, 0); @@ -270,6 +275,7 @@ } else KASSERT(boot_cpu_id == PCPU_GET(apic_id), ("BSP's APIC ID doesn't match boot_cpu_id")); + cpu_apic_ids[0] = boot_cpu_id; /* Start each Application Processor */ start_all_aps(boot_address); @@ -364,14 +370,14 @@ panic("cpuid mismatch! boom!!"); } + mtx_lock_spin(&ap_boot_mtx); + /* Init local apic for irq's */ lapic_setup(); /* Set memory range attributes for this CPU to match the BSP */ mem_range_AP_init(); - mtx_lock_spin(&ap_boot_mtx); - smp_cpus++; CTR1(KTR_SMP, "SMP: AP CPU #%d Launched", PCPU_GET(cpuid)); @@ -476,6 +482,9 @@ continue; cpu++; + /* save APIC ID for this logical ID */ + cpu_apic_ids[cpu] = apic_id; + /* Get per-cpu data */ pc = &__pcpu[cpu]; @@ -564,6 +573,7 @@ u_int16_t *dst16; u_int32_t *dst32; + pmap_kenter(boot_addr + KERNBASE, boot_addr); for (x = 0; x < size; ++x) *dst++ = *src++; @@ -907,7 +917,9 @@ CTR3(KTR_SMP, "%s: cpus: %x ipi: %x", __func__, cpus, ipi); while ((cpu = ffs(cpus)) != 0) { cpu--; - lapic_ipi_vectored(ipi, cpu); + KASSERT(cpu_apic_ids[cpu] != -1, + ("IPI to non-existent CPU %d", cpu)); + lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]); cpus &= ~(1 << cpu); } } ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#9 (text+ko) ==== @@ -31,7 +31,7 @@ * mpboot.s: FreeBSD machine support for the Intel MP Spec * multiprocessor systems. * - * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.20 2003/03/30 05:24:52 jake Exp $ + * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.21 2003/10/01 23:46:08 peter Exp $ */ #include /* miscellaneous asm macros */ ==== //depot/projects/hammer/sys/jhb_notes#6 (text+ko) ==== @@ -17,6 +17,7 @@ - include/mptable.h (from mp_machdep.c) Files removed in this branch: +- conf/SMP - i386/mpapic.c - isa/intr_machdep.c - isa/intr_machdep.h @@ -52,19 +53,25 @@ (this is gross) - doesn't work when loaded as a module - UMA needs to be fixed to not need mp_maxid so early + - other workaround is to fix mp_maxid at MAXCPU - move cpu_mp_probe() to SI_SUB_CPU (perhaps shuffle SI of other SMP sysinits as a result) - update apic enumerators to probe CPUs later - have apic enumerators hookup to the apic subsystem after SI_SUB_KLD maybe SI_ORDER_LAST + - disable ACPI module for now - Need to fix kernel profiling madness. Add an 'etrap' and perhaps support for bintr2() and eintr2(). + Implement mixed-mode and use it for IRQ0 unless no ExtINT pin or NO_MIXED_MODE + Add NO_MIXED_MODE option - Add runtime decision for IRQ0 mixed mode? -- SMP bogons - - pmap_lazyfix unhappy with old-style critical sections ++ SMP bogons + + doesn't work on 750x + + pmap_lazyfix unhappy with old-style critical sections +- Chokes on scott's dual P3 when looking for ACPI RSDT. +- Perhaps change the IRQ resource manager such that it starts out empty + and a resource entry for each IRQ is added as each IRQ is registered - Clean up includes in new files. - Check #ifdef's in new files and look for #if 0 in new code - Add handling of local APIC ERROR lvt. @@ -81,6 +88,11 @@ - reimplement lazy masking of interrupts for critical sections w/o bitmasks?? - Enhance acpi_cpu(4) driver to grok SMP at all? - Rip out CPU halting stuff perhaps and maybe disable MPTable HTT fixup? +- Support bus_config_intr()? + - nexus would have to call intr_config_source() + - intr_config_source() would call config_source() method of PIC driver + - AT PIC driver could just ignore + - APIC driver could reprogram I/O redirection entry Unrelated to this branch: - Work on cleaning up nested includes in sys/* headers. According to Bruce, From owner-p4-projects@FreeBSD.ORG Thu Oct 30 14:29:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F31E16A4D0; Thu, 30 Oct 2003 14:29:43 -0800 (PST) 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 05C8916A4CE for ; Thu, 30 Oct 2003 14:29:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16FD043FD7 for ; Thu, 30 Oct 2003 14:29:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UMTfXJ079815 for ; Thu, 30 Oct 2003 14:29:41 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UMTfk6079812 for perforce@freebsd.org; Thu, 30 Oct 2003 14:29:41 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 14:29:41 -0800 (PST) Message-Id: <200310302229.h9UMTfk6079812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40876 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: Thu, 30 Oct 2003 22:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=40876 Change 40876 by peter@peter_daintree on 2003/10/30 14:29:27 integrate -I smp_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#10 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#5 (text+ko) ==== @@ -213,7 +213,7 @@ * We map the XSDT and RSDT at page 1 in the crashdump area. * Page 0 is used to map in the headers of candidate ACPI tables. */ - if (rsdp->Revision >= 2 /* && rsdp->RsdtPhysicalAddress == 0 */) { + if (rsdp->Revision >= 2) { /* XXXTEST */ printf("XSDT PA = 0x%jx\n", (uintmax_t)rsdp->XsdtPhysicalAddress); xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#17 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.218 2003/10/24 21:02:26 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.219 2003/10/30 21:42:16 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#10 (text+ko) ==== @@ -31,7 +31,7 @@ * mpboot.s: FreeBSD machine support for the Intel MP Spec * multiprocessor systems. * - * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.21 2003/10/01 23:46:08 peter Exp $ + * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.22 2003/10/30 21:42:44 jhb Exp $ */ #include /* miscellaneous asm macros */ From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:02:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5AA516A4F4; Thu, 30 Oct 2003 15:02:27 -0800 (PST) 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 943A416A4CE for ; Thu, 30 Oct 2003 15:02:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8FC343FD7 for ; Thu, 30 Oct 2003 15:02:26 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UN2QXJ082825 for ; Thu, 30 Oct 2003 15:02:26 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UN2QUa082822 for perforce@freebsd.org; Thu, 30 Oct 2003 15:02:26 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:02:26 -0800 (PST) Message-Id: <200310302302.h9UN2QUa082822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40882 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: Thu, 30 Oct 2003 23:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=40882 Change 40882 by peter@peter_daintree on 2003/10/30 15:01:53 I am more evil that jhb Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#6 (text+ko) ==== @@ -48,6 +48,8 @@ #include #include +#define bootverbose 1 /* XXX debugging */ + #define NIOAPICS 16 /* Max number of I/O APICs */ #define NLAPICS 16 /* Max number of local APICs */ @@ -201,9 +203,7 @@ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { -#if 0 if (bootverbose) -#endif printf("MADT: Failed to map RSDP\n"); return (ENXIO); } @@ -218,9 +218,7 @@ printf("XSDT PA = 0x%jx\n", (uintmax_t)rsdp->XsdtPhysicalAddress); xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); if (xsdt == NULL) { -#if 0 if (bootverbose) -#endif printf("MADT: Failed to map XSDT\n"); return (ENXIO); } @@ -235,9 +233,7 @@ printf("RSDT PA = 0x%jx\n", (uintmax_t)rsdp->RsdtPhysicalAddress); rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); if (rsdt == NULL) { -#if 0 if (bootverbose) -#endif printf("MADT: Failed to map RSDT\n"); return (ENXIO); } @@ -250,15 +246,11 @@ } pmap_unmapdev((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); if (madt_physaddr == 0) { -#if 0 if (bootverbose) -#endif printf("MADT: No MADT table found\n"); return (ENXIO); } else -#if 0 if (bootverbose) -#endif printf("MADT: Found table at %p\n", (void *)madt_physaddr); return (0); @@ -274,16 +266,12 @@ table = madt_map(address, 0, sizeof(ACPI_TABLE_HEADER)); if (table == NULL) { -#if 0 if (bootverbose) -#endif printf("MADT: Failed to map table at %p\n", (void *)address); return (0); } -#if 0 if (bootverbose) -#endif printf("Table '%.4s' at %p\n", table->Signature, (void *)address); @@ -398,9 +386,7 @@ * its own. */ proc = (PROCESSOR_APIC *)entry; -#if 0 if (bootverbose) -#endif printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", proc->LocalApicId, proc->ProcessorApicId, proc->ProcessorEnabled ? "enabled" : "disabled"); @@ -433,9 +419,7 @@ switch (entry->Type) { case APIC_IO: apic = (IO_APIC *)entry; -#if 0 if (bootverbose) -#endif printf("MADT: Found IO APIC ID %d, Vector %d at %p\n", apic->IoApicId, apic->Vector, (void *)apic->IoApicAddress); @@ -597,9 +581,7 @@ if (nmi->ProcessorApicId == 0xff) apic_id = APIC_ID_ALL; else if (madt_find_cpu(nmi->ProcessorApicId, &apic_id) != 0) { -#if 0 if (bootverbose) -#endif printf("MADT: Ignoring local NMI routed to ACPI CPU %u\n", nmi->ProcessorApicId); return; From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:32:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 791C716A4D0; Thu, 30 Oct 2003 15:32:35 -0800 (PST) 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 5458216A4CE for ; Thu, 30 Oct 2003 15:32:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC05643F93 for ; Thu, 30 Oct 2003 15:32:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNWYXJ085875 for ; Thu, 30 Oct 2003 15:32:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNWYnW085870 for perforce@freebsd.org; Thu, 30 Oct 2003 15:32:34 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:32:34 -0800 (PST) Message-Id: <200310302332.h9UNWYnW085870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40890 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: Thu, 30 Oct 2003 23:32:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=40890 Change 40890 by peter@peter_daintree on 2003/10/30 15:32:17 as on -current, test against kernel_pmap Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#40 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#40 (text+ko) ==== @@ -666,7 +666,7 @@ * XXX we may need to hold schedlock to get a coherent pm_active * XXX critical sections disable interrupts again */ - if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { + if (pmap == kernel_pmap || pmap->pm_active == all_cpus) { invlpg(va); smp_invlpg(va); } else { @@ -702,7 +702,7 @@ * XXX we may need to hold schedlock to get a coherent pm_active * XXX critical sections disable interrupts again */ - if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { + if (pmap == kernel_pmap || pmap->pm_active == all_cpus) { for (addr = sva; addr < eva; addr += PAGE_SIZE) invlpg(addr); smp_invlpg_range(sva, eva); @@ -740,7 +740,7 @@ * XXX we may need to hold schedlock to get a coherent pm_active * XXX critical sections disable interrupts again */ - if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { + if (pmap == kernel_pmap || pmap->pm_active == all_cpus) { invltlb(); smp_invltlb(); } else { From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:35:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C391C16A4D1; Thu, 30 Oct 2003 15:35:41 -0800 (PST) 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 9E94516A4CE for ; Thu, 30 Oct 2003 15:35:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FABC43FBF for ; Thu, 30 Oct 2003 15:35:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNZdXJ086035 for ; Thu, 30 Oct 2003 15:35:39 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNZdfG086032 for perforce@freebsd.org; Thu, 30 Oct 2003 15:35:39 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:35:39 -0800 (PST) Message-Id: <200310302335.h9UNZdfG086032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40892 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: Thu, 30 Oct 2003 23:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=40892 Change 40892 by peter@peter_daintree on 2003/10/30 15:34:51 for now. I dont think we'll ever need this since there is no way to describe it the madt. Affected files ... .. //depot/projects/hammer/sys/conf/options.amd64#13 edit Differences ... ==== //depot/projects/hammer/sys/conf/options.amd64#13 (text+ko) ==== @@ -29,3 +29,4 @@ PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h IA32 +NO_MIXED_MODE From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:39:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72D1416A4D0; Thu, 30 Oct 2003 15:39:48 -0800 (PST) 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 36CC116A4CE for ; Thu, 30 Oct 2003 15:39:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AD4743F75 for ; Thu, 30 Oct 2003 15:39:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNdlXJ086225 for ; Thu, 30 Oct 2003 15:39:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNdkqs086222 for perforce@freebsd.org; Thu, 30 Oct 2003 15:39:47 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:39:47 -0800 (PST) Message-Id: <200310302339.h9UNdkqs086222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40895 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: Thu, 30 Oct 2003 23:39:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=40895 Change 40895 by peter@peter_daintree on 2003/10/30 15:38:50 fix merge conflict Affected files ... .. //depot/projects/hammer/sys/amd64/include/apicvar.h#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#7 (text+ko) ==== @@ -162,7 +162,6 @@ int lapic_set_lvt_polarity(u_int apic_id, u_int lvt, u_char activehi); int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, u_char edgetrigger); void lapic_setup(void); -void lapic_disable(void); #endif /* !LOCORE */ #endif /* _MACHINE_APICVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:55:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCF9716A4D0; Thu, 30 Oct 2003 15:55:08 -0800 (PST) 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 B5D6F16A4CE for ; Thu, 30 Oct 2003 15:55:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B50F743FF7 for ; Thu, 30 Oct 2003 15:55:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNt7XJ087245 for ; Thu, 30 Oct 2003 15:55:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNt7JD087242 for perforce@freebsd.org; Thu, 30 Oct 2003 15:55:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:55:07 -0800 (PST) Message-Id: <200310302355.h9UNt7JD087242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40898 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: Thu, 30 Oct 2003 23:55:09 -0000 X-List-Received-Date: Thu, 30 Oct 2003 23:55:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=40898 Change 40898 by peter@peter_daintree on 2003/10/30 15:54:37 fix errors in KASSERT() Affected files ... .. //depot/projects/hammer/sys/amd64/isa/atpic.c#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#7 (text+ko) ==== @@ -310,8 +310,7 @@ struct intsrc *isrc; int vec = (uintptr_t)cookie; - KASSERT((uint)iframe.if_vec < ICU_LEN, - ("unknown int %d\n", iframe.if_vec)); + KASSERT(vec < ICU_LEN, ("unknown int %d\n", vec)); isrc = &atintrs[vec].at_intsrc; intr_execute_handlers(isrc, &iframe); } From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:55:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD8C016A4CE; Thu, 30 Oct 2003 15:55:09 -0800 (PST) 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 E465616A4CE for ; Thu, 30 Oct 2003 15:55:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FE0743F93 for ; Thu, 30 Oct 2003 15:55:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNt8XJ087251 for ; Thu, 30 Oct 2003 15:55:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNt75D087248 for perforce@freebsd.org; Thu, 30 Oct 2003 15:55:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:55:07 -0800 (PST) Message-Id: <200310302355.h9UNt75D087248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40899 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: Thu, 30 Oct 2003 23:55:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=40899 Change 40899 by peter@peter_daintree on 2003/10/30 15:54:59 sync up with jhb Affected files ... .. //depot/projects/hammer/sys/amd64/isa/icu.h#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/icu.h#8 (text+ko) ==== @@ -121,12 +121,15 @@ */ #define ICU_OFFSET 32 /* 0-31 are processor exceptions */ #define ICU_LEN 16 /* 32-47 are ISA interrupts */ -#define HWI_MASK 0xffff /* bits for h/w interrupts */ -#define NHWI 16 - #define ICU_IMR_OFFSET 1 #define ICU_SLAVEID 2 #define ICU_EOI (OCW2_EOI) /* non-specific EOI */ #define ICU_SETPRI (OCW2_R | OCW2_SL) /* set rotation priority */ +#define HWI_MASK 0xffff /* bits for h/w interrupts */ + +#ifndef LOCORE +void atpic_sched_ithd(void *cookie, struct intrframe iframe); +void atpic_startup(void); +#endif #endif /* !_I386_ISA_ICU_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:56:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2331916A4D1; Thu, 30 Oct 2003 15:56:12 -0800 (PST) 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 ECFB016A4CE for ; Thu, 30 Oct 2003 15:56:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26BFB43FDD for ; Thu, 30 Oct 2003 15:56:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNu9XJ087328 for ; Thu, 30 Oct 2003 15:56:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNu9P7087325 for perforce@freebsd.org; Thu, 30 Oct 2003 15:56:09 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:56:09 -0800 (PST) Message-Id: <200310302356.h9UNu9P7087325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40900 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: Thu, 30 Oct 2003 23:56:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=40900 Change 40900 by peter@peter_daintree on 2003/10/30 15:55:23 hmm. how did that get back in here? Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#31 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#31 (text+ko) ==== @@ -259,9 +259,6 @@ default: ucode = code + BUS_SEGM_FAULT ; i = SIGBUS; -printf("trap %d: pid %d err %p eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", type, p->p_pid, (void *)frame.tf_err, -(void *)frame.tf_addr, (void *)frame.tf_rip, (void *)frame.tf_rax, (void *)frame.tf_rbx, (void *)frame.tf_rcx, (void *)frame.tf_rdx, (void *)frame.tf_rsp, (void *)frame.tf_rbp, (void *)frame.tf_rsi, (void *)frame.tf_rdi); - break; case T_PAGEFLT: /* page fault */ @@ -548,12 +545,6 @@ return (-1); } -printf("trap_pfault: pid %d %s %s %s eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", p->p_pid, - frame->tf_err & PGEX_U ? "user" : "supervisor", - frame->tf_err & PGEX_W ? "write" : "read", - frame->tf_err & PGEX_P ? "protection violation" : "page not present", -(void *)eva, (void *)frame->tf_rip, (void *)frame->tf_rax, (void *)frame->tf_rbx, (void *)frame->tf_rcx, (void *)frame->tf_rdx, (void *)frame->tf_rsp, (void *)frame->tf_rbp, (void *)frame->tf_rsi, (void *)frame->tf_rdi); - return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); } From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:56:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E1F116A4E8; Thu, 30 Oct 2003 15:56:12 -0800 (PST) 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 F25F516A4CF for ; Thu, 30 Oct 2003 15:56:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DBED43F93 for ; Thu, 30 Oct 2003 15:56:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNuAXJ087334 for ; Thu, 30 Oct 2003 15:56:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNuAN5087331 for perforce@freebsd.org; Thu, 30 Oct 2003 15:56:10 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:56:10 -0800 (PST) Message-Id: <200310302356.h9UNuAN5087331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40901 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: Thu, 30 Oct 2003 23:56:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=40901 Change 40901 by peter@peter_daintree on 2003/10/30 15:56:08 compile hacks. KERNLOAD doesn't exist here since we have dmap. I need to fix this properly. Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#7 (text+ko) ==== @@ -200,7 +200,9 @@ (void *)rsdp_ptr.Pointer.Logical); printf("rsdp_ptr.Pointer.Physical = 0x%jx\n", (uintmax_t)rsdp_ptr.Pointer.Physical); +#ifdef __i386__ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); +#endif rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { if (bootverbose) @@ -422,7 +424,7 @@ if (bootverbose) printf("MADT: Found IO APIC ID %d, Vector %d at %p\n", apic->IoApicId, apic->Vector, - (void *)apic->IoApicAddress); + (void *)(uintptr_t)apic->IoApicAddress); if (apic->IoApicId >= NIOAPICS) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:57:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B7A416A4D0; Thu, 30 Oct 2003 15:57:13 -0800 (PST) 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 7113C16A4CE for ; Thu, 30 Oct 2003 15:57:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92A2843FF5 for ; Thu, 30 Oct 2003 15:57:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNvCXJ087404 for ; Thu, 30 Oct 2003 15:57:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNvClH087401 for perforce@freebsd.org; Thu, 30 Oct 2003 15:57:12 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:57:12 -0800 (PST) Message-Id: <200310302357.h9UNvClH087401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40902 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: Thu, 30 Oct 2003 23:57:14 -0000 X-List-Received-Date: Thu, 30 Oct 2003 23:57:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=40902 Change 40902 by peter@peter_daintree on 2003/10/30 15:56:34 tidy up some loose ends to make things compile. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#14 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#59 edit .. //depot/projects/hammer/sys/amd64/include/md_var.h#17 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#14 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#59 (text+ko) ==== @@ -112,6 +112,10 @@ #include #endif +#ifdef DEV_ISA +#include +#endif + #include #include #include ==== //depot/projects/hammer/sys/amd64/include/md_var.h#17 (text+ko) ==== @@ -68,6 +68,7 @@ void fillw(int /*u_short*/ pat, void *base, size_t cnt); void pagezero(void *addr); int is_physical_memory(vm_offset_t addr); +int isa_nmi(int cd); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int ist); void fpstate_drop(struct thread *td); From owner-p4-projects@FreeBSD.ORG Thu Oct 30 15:59:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5ADC16A4D0; Thu, 30 Oct 2003 15:59:16 -0800 (PST) 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 9FF8916A4CE for ; Thu, 30 Oct 2003 15:59:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2657043F93 for ; Thu, 30 Oct 2003 15:59:16 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UNxFXJ087508 for ; Thu, 30 Oct 2003 15:59:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNxFdG087505 for perforce@freebsd.org; Thu, 30 Oct 2003 15:59:15 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 15:59:15 -0800 (PST) Message-Id: <200310302359.h9UNxFdG087505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40903 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: Thu, 30 Oct 2003 23:59:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=40903 Change 40903 by peter@peter_daintree on 2003/10/30 15:58:54 integ -I -b smp_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#8 integrate .. //depot/projects/hammer/sys/amd64/isa/nmi.c#1 branch Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#8 (text+ko) ==== @@ -128,6 +128,7 @@ pa += PAGE_SIZE; length -= PAGE_SIZE; pmap_kenter(va, pa); + invlpg(va); } return (data); } @@ -143,6 +144,7 @@ va &= ~PAGE_MASK; while (length > 0) { pmap_kremove(va); + invlpg(va); va += PAGE_SIZE; length -= PAGE_SIZE; } @@ -251,7 +253,7 @@ if (bootverbose) printf("MADT: No MADT table found\n"); return (ENXIO); - } else + } if (bootverbose) printf("MADT: Found table at %p\n", (void *)madt_physaddr); From owner-p4-projects@FreeBSD.ORG Thu Oct 30 16:00:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B8F016A4D0; Thu, 30 Oct 2003 16:00:19 -0800 (PST) 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 14EFD16A4CF for ; Thu, 30 Oct 2003 16:00:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2913843FE9 for ; Thu, 30 Oct 2003 16:00:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9V00HXJ087541 for ; Thu, 30 Oct 2003 16:00:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V00HgV087538 for perforce@freebsd.org; Thu, 30 Oct 2003 16:00:17 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 16:00:17 -0800 (PST) Message-Id: <200310310000.h9V00HgV087538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40904 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: Fri, 31 Oct 2003 00:00:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=40904 Change 40904 by peter@peter_daintree on 2003/10/30 15:59:47 bring over nmi.c Affected files ... .. //depot/projects/hammer/sys/conf/files.amd64#26 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#26 (text+ko) ==== @@ -92,6 +92,7 @@ amd64/isa/clock.c standard amd64/isa/isa.c standard amd64/isa/isa_dma.c standard +amd64/isa/nmi.c standard amd64/isa/npx.c standard amd64/pci/pci_cfgreg.c optional pci From owner-p4-projects@FreeBSD.ORG Thu Oct 30 16:04:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D48F16A4D0; Thu, 30 Oct 2003 16:04:24 -0800 (PST) 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 38DA316A4CE for ; Thu, 30 Oct 2003 16:04:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B38F643FDD for ; Thu, 30 Oct 2003 16:04:23 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9V04NXJ088757 for ; Thu, 30 Oct 2003 16:04:23 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V04Ngr088754 for perforce@freebsd.org; Thu, 30 Oct 2003 16:04:23 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 16:04:23 -0800 (PST) Message-Id: <200310310004.h9V04Ngr088754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40905 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: Fri, 31 Oct 2003 00:04:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=40905 Change 40905 by peter@peter_daintree on 2003/10/30 16:03:51 tidy up loose ends Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#9 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#9 (text+ko) ==== @@ -67,24 +67,7 @@ movq %r12,TF_R12(%rsp) ; \ movq %r13,TF_R13(%rsp) ; \ movq %r14,TF_R14(%rsp) ; \ - movq %r15,TF_R15(%rsp) \ - -#if 0 - maybe_extra_ipending ; \ - movb imen + IRQ_BYTE(irq_num),%al ; \ - orb $IRQ_BIT(irq_num),%al ; \ - movb %al,imen + IRQ_BYTE(irq_num) ; \ - outb %al,$icu+ICU_IMR_OFFSET ; \ - enable_icus ; \ - movq PCPU(CURTHREAD),%rbx ; \ - incl TD_INTR_NESTING_LEVEL(%rbx) ; \ - FAKE_MCOUNT(13*4(%rsp)) ; /* XXX late to avoid double count */ \ - movq $irq_num, %rdi; /* pass the IRQ */ \ - call sched_ithd ; \ - decl TD_INTR_NESTING_LEVEL(%rbx) ; \ - MEXITCOUNT ; \ - jmp doreti -#endif + movq %r15,TF_R15(%rsp) #define POP_FRAME \ movq TF_RDI(%rsp),%rdi ; \ From owner-p4-projects@FreeBSD.ORG Thu Oct 30 16:07:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB16B16A4D0; Thu, 30 Oct 2003 16:07:28 -0800 (PST) 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 966CF16A4CE for ; Thu, 30 Oct 2003 16:07:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 162D643F3F for ; Thu, 30 Oct 2003 16:07:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9V07RXJ088915 for ; Thu, 30 Oct 2003 16:07:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V07Rw4088912 for perforce@freebsd.org; Thu, 30 Oct 2003 16:07:27 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 16:07:27 -0800 (PST) Message-Id: <200310310007.h9V07Rw4088912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40906 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: Fri, 31 Oct 2003 00:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=40906 Change 40906 by peter@peter_daintree on 2003/10/30 16:07:12 AUTO_EOI? whats that? Affected files ... .. //depot/projects/hammer/sys/amd64/isa/atpic.c#8 edit .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#8 (text+ko) ==== @@ -161,11 +161,9 @@ KASSERT(isrc->is_pic == &atpics[MASTER].at_pic, ("%s: mismatched pic", __func__)); -#ifndef AUTO_EOI_1 mtx_lock_spin(&icu_lock); outb(atpics[MASTER].at_ioaddr, ICU_EOI); mtx_unlock_spin(&icu_lock); -#endif } static void @@ -174,14 +172,10 @@ KASSERT(isrc->is_pic == &atpics[SLAVE].at_pic, ("%s: mismatched pic", __func__)); -#ifndef AUTO_EOI_2 mtx_lock_spin(&icu_lock); outb(atpics[SLAVE].at_ioaddr, ICU_EOI); -#ifndef AUTO_EOI_1 outb(atpics[MASTER].at_ioaddr, ICU_EOI); -#endif mtx_unlock_spin(&icu_lock); -#endif } static void @@ -250,19 +244,10 @@ outb(imr_addr, IRQ_SLAVE); /* slave on line 7 */ /* Set mode. */ - if (slave) { -#ifdef AUTO_EOI_2 - outb(imr_addr, ICW4_AEOI | ICW4_8086); -#else + if (slave) outb(imr_addr, ICW4_8086); -#endif - } else { -#ifdef AUTO_EOI_1 - outb(imr_addr, ICW4_AEOI | ICW4_8086); -#else + else outb(imr_addr, ICW4_8086); -#endif - } /* Set interrupt enable mask. */ outb(imr_addr, *pic->at_imen); ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#6 (text+ko) ==== @@ -56,7 +56,7 @@ #define ENABLE_ICU1_AND_2 \ movb $ICU_EOI,%al ; /* as above */ \ outb %al,$IO_ICU2 ; /* but do second icu first ... */ \ - outb %al,$IO_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ + outb %al,$IO_ICU1 /* ... then first icu */ #define PUSH_FRAME \ From owner-p4-projects@FreeBSD.ORG Thu Oct 30 19:11:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E5E816A4D0; Thu, 30 Oct 2003 19:11:31 -0800 (PST) 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 5952016A4CE for ; Thu, 30 Oct 2003 19:11:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDF0E43FF2 for ; Thu, 30 Oct 2003 19:11:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9V3BRXJ008241 for ; Thu, 30 Oct 2003 19:11:27 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V3BRFx008237 for perforce@freebsd.org; Thu, 30 Oct 2003 19:11:27 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 19:11:27 -0800 (PST) Message-Id: <200310310311.h9V3BRFx008237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40925 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: Fri, 31 Oct 2003 03:11:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=40925 Change 40925 by peter@peter_daintree on 2003/10/30 19:10:47 express evilness Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#18 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#18 (text+ko) ==== @@ -67,6 +67,8 @@ #include #include +#define bootverbose 1 + #define WARMBOOT_TARGET 0 #define WARMBOOT_OFF (KERNBASE + 0x0467) #define WARMBOOT_SEG (KERNBASE + 0x0469) @@ -182,9 +184,7 @@ mp_ncpus++; if (apic_id > mp_maxid) mp_maxid = apic_id; -#if 0 if (bootverbose) -#endif printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); @@ -390,9 +390,7 @@ /* Build our map of 'other' CPUs. */ PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask)); -#if 0 if (bootverbose) -#endif lapic_dump("AP"); if (smp_cpus == mp_ncpus) { From owner-p4-projects@FreeBSD.ORG Thu Oct 30 19:13:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CB4416A4D0; Thu, 30 Oct 2003 19:13:32 -0800 (PST) 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 EA84616A4CE for ; Thu, 30 Oct 2003 19:13:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33A8643FE0 for ; Thu, 30 Oct 2003 19:13:31 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9V3DVXJ008338 for ; Thu, 30 Oct 2003 19:13:31 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V3DUKn008335 for perforce@freebsd.org; Thu, 30 Oct 2003 19:13:30 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 30 Oct 2003 19:13:30 -0800 (PST) Message-Id: <200310310313.h9V3DUKn008335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 40926 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: Fri, 31 Oct 2003 03:13:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=40926 Change 40926 by peter@peter_daintree on 2003/10/30 19:13:27 rewrite mpboot.s. There are still a couple of loose ends yet. TODO: * set the segment base for %cs/%ds so we can remain relocatable * hook up the pagetables * make it compile (yeah, this would be useful) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#11 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 1995, Jack F. Vogel +/*- + * Copyright (c) 2003 Peter Wemm * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,16 +10,11 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Jack F. Vogel - * 4. The name of the developer may be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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) @@ -28,188 +23,160 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * mpboot.s: FreeBSD machine support for the Intel MP Spec - * multiprocessor systems. - * * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.22 2003/10/30 21:42:44 jhb Exp $ */ #include /* miscellaneous asm macros */ -#include #include #include "assym.s" -/* - * the APs enter here from their trampoline code (bootMP, below) - */ - .section .data32 + .section .bootcode .p2align 4 - .code32 - .globl MPentry -MPentry: - movl %cr4,%eax - orl $CR4_PSE|CR4_PGE|CR4_PAE,%eax /* Enable features */ - movl %eax,%cr4 - - /* Now enable paging mode */ - movl IdlePTD32, %eax - movl %eax, %cr3 - movl %cr0,%eax - orl $CR0_PE|CR0_PG,%eax /* enable paging */ - movl %eax,%cr0 /* let the games begin! */ - movl bootSTK32,%esp /* boot stack end loc. */ - -#ifdef SMP_ME_HARDER /* 64 bit reference in 32 bit code */ - pushl $init_secondary /* jump to high mem */ -#endif - ret - - .p2align 4 - -BOOTMP_start: - + .globl mptramp_start +mptramp_start: .code16 - .globl bootMP -bootMP: - cli - /* First guarantee a 'clean slate' */ - xorl %eax, %eax - movl %eax, %ebx - movl %eax, %ecx - movl %eax, %edx - movl %eax, %esi - movl %eax, %edi - - /* set up data segments */ - mov %cs, %ax - mov %ax, %ds - mov %ax, %es - mov %ax, %fs - mov %ax, %gs + /* + * The AP enters here in response to the startup IPI. + * We are in real mode. %cs is the only segment register set. + */ + cli /* make sure no interrupts */ + mov %cs, %ax /* copy %cs to %ds. Remember these */ + mov %ax, %ds /* are offsets rather than selectors */ mov %ax, %ss - mov $(boot_stk-bootMP), %esp - /* Now load the global descriptor table */ - lgdt MP_GDTptr-bootMP + /* + * Load the descriptor table pointer. We'll need it when running + * in 16 bit protected mode. + */ + lgdt lgdt_desc-mptramp_start /* Enable protected mode */ - movl %cr0, %eax - orl $CR0_PE, %eax + movl $CR0_PE, %eax movl %eax, %cr0 /* - * make intrasegment jump to flush the processor pipeline and - * reload CS register + * Now execute a far jump to turn on protected mode. This + * causes the segment registers to turn into selectors and causes + * %cs to be loaded from the gdt. */ - pushl $0x18 - pushl $(protmode-bootMP) - lretl + .byte 0xea /* opcode for far jump */ + .word protmode-mptramp_start /* offset in segment */ + .word bootcode-gdt /* index in gdt for 16 bit code */ - .code32 + /* + * At this point, we are running in 32 bit legacy protected mode. + * However, we have a non-zero base address in our segment registers + * so that we can remain relocatable. + */ + .code32 protmode: + mov $bootdata-gdt, %eax + mov %ax, %ds + mov %ax, %ss + + /* Turn on the PAE, PSE and PGE bits for when paging is enabled */ + mov %cr4, %eax + orl $(CR4_PAE | CR4_PSE | CR4_PGE), %eax + mov %eax, %cr4 /* - * we are NOW running for the first time with %eip - * having the full physical address, BUT we still - * are using a segment descriptor with the origin - * not matching the booting kernel. - * - * SO NOW... for the BIG Jump into kernel's segment - * and physical text above 1 Meg. + * Point to the embedded page tables for startup. Note that this + * only gets accessed after we're actually in 64 bit mode, however + * we can only set the bottom 32 bits of %cr3 in this state. This + * means we are required to use a temporary page table that is below + * the 4GB limit. */ - mov $0x10, %ebx - movw %bx, %ds - movw %bx, %es - movw %bx, %fs - movw %bx, %gs - movw %bx, %ss + movl $pagetables, %eax XXX + mov %eax, %cr3 - .globl bigJump -bigJump: - /* this will be modified by mpInstallTramp() */ - ljmp $0x08, $0 /* far jmp to MPentry() */ - -/* - * MP boot strap Global Descriptor Table - */ - .p2align 4 - .globl MP_GDT - .globl bootCodeSeg - .globl bootDataSeg -MP_GDT: + /* + * Enable EFER.LME so that we get long mode when all the prereqs are + * in place. In this case, it turns on when CR0_PG is finally enabled. + */ + movl $MSR_EFER, %ecx + rdmsr + orl $EFER_LME, %eax + wrmsr -nulldesc: /* offset = 0x0 */ + /* + * Finally, switch to 64 bit mode by enabling paging. We have + * to be very careful here because all the segmentation disappears + * out from underneath us. The spec says we can depend on the + * subsequent pipelined long jump to execute. This is Magic. + */ + mov %cr0, %eax + orl $CR0_PG, %eax + mov %eax, %cr3 - .word 0x0 - .word 0x0 - .byte 0x0 - .byte 0x0 - .byte 0x0 - .byte 0x0 + .byte 0xea /* opcode for far jump */ + .long entry_64 /* 64 bit flat address */ + .word kernelcode-gdt /* selector offset */ -kernelcode: /* offset = 0x08 */ + .p2align 4,0 +gdt: + /* + * All segment descriptor tables start with a null descriptor */ + */ + .long 0x00000000 + .long 0x00000000 - .word 0xffff /* segment limit 0..15 */ - .word 0x0000 /* segment base 0..15 */ - .byte 0x0 /* segment base 16..23; set for 0K */ - .byte 0x9f /* flags; Type */ - .byte 0xcf /* flags; Limit */ - .byte 0x0 /* segment base 24..32 */ + /* + * This is the 64 bit long mode code descriptor. There is no + * 64 bit data descriptor. + */ +kernelcode: + .long 0x00000000 + .long 0x00209800 -kerneldata: /* offset = 0x10 */ + /* + * This is the descriptor for the 32 bit boot code. + * %cs: +A, +R, -C, DPL=0, +P, +D, +G + * Accessed, Readable, Present, 32 bit, 4G granularity + */ +bootcode: + .long 0x0000ffff + .long 0x00cf9b00 - .word 0xffff /* segment limit 0..15 */ - .word 0x0000 /* segment base 0..15 */ - .byte 0x0 /* segment base 16..23; set for 0k */ - .byte 0x93 /* flags; Type */ - .byte 0xcf /* flags; Limit */ - .byte 0x0 /* segment base 24..32 */ + /* + * This is the descriptor for the 32 bit boot data. + * We load it into %ds and %ss. The bits for each selector + * are interpreted slightly differently. + * %ds: +A, +W, -E, DPL=0, +P, +D, +G + * %ss: +A, +W, -E, DPL=0, +P, +B, +G + * Accessed, Writeable, Expand up, Present, 32 bit, 4GB + * For %ds, +D means 'default operand size is 32 bit'. + * For %ss, +B means the stack register is %esp rather than %sp. + */ +bootdata: + .long 0x0000ffff + .long 0x00cf9300 -bootcode: /* offset = 0x18 */ +gdtend: - .word 0xffff /* segment limit 0..15 */ -bootCodeSeg: /* this will be modified by mpInstallTramp() */ - .word 0x0000 /* segment base 0..15 */ - .byte 0x00 /* segment base 16...23; set for 0x000xx000 */ - .byte 0x9e /* flags; Type */ - .byte 0xcf /* flags; Limit */ - .byte 0x0 /*segment base 24..32 */ + /* + * The pseudo descriptor for lgdt to use. + */ +lgdt_desc: + .word gdtend - gdt /* Length */ + .long gdt - mptramp_start /* Offset plus %ds << 4 */ -bootdata: /* offset = 0x20 */ + .globl mptramp_end +mptramp_end: - .word 0xffff -bootDataSeg: /* this will be modified by mpInstallTramp() */ - .word 0x0000 /* segment base 0..15 */ - .byte 0x00 /* segment base 16...23; set for 0x000xx000 */ - .byte 0x92 - .byte 0xcf - .byte 0x0 -/* - * GDT pointer for the lgdt call - */ - -MP_GDTptr: -mp_gdtlimit: - .word 0x0028 - .globl mp_gdtbase -mp_gdtbase: /* this will be modified by mpInstallTramp() */ - .long 0 - - .space 0x100 /* space for boot_stk - 1st temporary stack */ -boot_stk: - - .globl bootSTK32 -bootSTK32: - .long 0 - .globl IdlePTD32 -IdlePTD32: - .long 0 - -BOOTMP_end: - - .globl bootMP_size -bootMP_size: - .long BOOTMP_end - BOOTMP_start + /* + * Yeehar! We're running in 64 bit mode! We can mostly ignore our + * segment registers, and get on with it. + * Load a basic stack pointer and jump into the kernel. + * Note that we are running at the correct virtual address, but with + * a 1:1 1GB mirrored mapping over entire address space. We had better + * switch to a real %cr3 promptly. + */ + .text + .code64 +entry_64: + movq $bootSTK, %rsp + pushq $init_secondary + ret From owner-p4-projects@FreeBSD.ORG Thu Oct 30 22:28:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBC5D16A4D0; Thu, 30 Oct 2003 22:28:39 -0800 (PST) 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 89EDC16A4CE for ; Thu, 30 Oct 2003 22:28:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2D7B43FE3 for ; Thu, 30 Oct 2003 22:28:38 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9V6ScXJ027531 for ; Thu, 30 Oct 2003 22:28:38 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V6Sche027528 for perforce@freebsd.org; Thu, 30 Oct 2003 22:28:38 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 30 Oct 2003 22:28:38 -0800 (PST) Message-Id: <200310310628.h9V6Sche027528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 40943 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: Fri, 31 Oct 2003 06:28:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=40943 Change 40943 by jmallett@jmallett_sprout on 2003/10/30 22:28:24 First stab at entryhi region stuff, probably fairly wrong. Affected files ... .. //depot/projects/mips/sys/mips/include/pte.h#10 edit .. //depot/projects/mips/sys/mips/mips/mips_subr.S#13 edit .. //depot/projects/mips/sys/mips/mips/tlb.c#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pte.h#10 (text+ko) ==== @@ -67,6 +67,9 @@ * bit 12 to bit 8 there is a 5-bit 0 field. Low byte is ASID. */ #define MIPS_HI_R_SHIFT 62 +#define MIPS_HI_R_USER (0x00 << MIPS_HI_R_SHIFT) +#define MIPS_HI_R_SUPERVISOR (0x01 << MIPS_HI_R_SHIFT) +#define MIPS_HI_R_KERNEL (0x11 << MIPS_HI_R_SHIFT) #define MIPS_HI_FILL_SHIFT 40 #define MIPS_HI_VPN2_SHIFT 13 #define MIPS_HI_VPN2_BMASK 0xFFFFFFE @@ -75,10 +78,16 @@ /* * TLB page bits that aren't really flags: + * R0: Region 0, user + * R1: Region 1, supervisor + * R3: Region 3, kernel * ODDPG: Is this page odd? ! XXX NetBSD compat * HVPN: Hardware VPN mask ! XXX NetBSD compat * ASID: Address space ID */ +#define PG_R0 MIPS_HI_R_USER +#define PG_R1 MIPS_HI_R_SUPERVISOR +#define PG_R3 MIPS_HI_R_KERNEL #define PG_ODDPG 0x00001000 #define PG_HVPN MIPS_HI_VPN2_MASK #define PG_ASID 0x000000ff ==== //depot/projects/mips/sys/mips/mips/mips_subr.S#13 (text+ko) ==== @@ -368,7 +368,7 @@ mtc0 zero, MIPS_COP_0_STATUS # disable interrupts COP0_SYNC - li v0, (PG_HVPN | PG_ASID) + li v0, (PG_HVPN | PG_ASID | PG_R3) # XXX assumes Region3 _MFC0 t0, MIPS_COP_0_TLB_HI # save current ASID mfc0 t3, MIPS_COP_0_TLB_PG_MASK # save current pgMask and a0, a0, v0 # make sure valid entryHi ==== //depot/projects/mips/sys/mips/mips/tlb.c#3 (text+ko) ==== @@ -137,7 +137,8 @@ { va &= ~PAGE_SIZE; critical_enter(); - mips_wr_entryhi(MIPS_HI_VA_TO_VPN2(va) /* XXX | ASID */); + /* XXX assumes kernel region - region 3. */ + mips_wr_entryhi(MIPS_HI_R_KERNEL | MIPS_HI_VA_TO_VPN2(va) /* XXX | ASID */); mips_wr_entrylo0(pte0); mips_wr_entrylo1(pte1); mips_tlbwr(); From owner-p4-projects@FreeBSD.ORG Thu Oct 30 22:42:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C6A116A4D3; Thu, 30 Oct 2003 22:42:59 -0800 (PST) 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 DCC6816A4DB for ; Thu, 30 Oct 2003 22:42:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D895843FBD for ; Thu, 30 Oct 2003 22:42:57 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9V6gvXJ028340 for ; Thu, 30 Oct 2003 22:42:57 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V6gvXD028336 for perforce@freebsd.org; Thu, 30 Oct 2003 22:42:57 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 30 Oct 2003 22:42:57 -0800 (PST) Message-Id: <200310310642.h9V6gvXD028336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 40945 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: Fri, 31 Oct 2003 06:43:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=40945 Change 40945 by jmallett@jmallett_sprout on 2003/10/30 22:42:05 Either some dumbwit (me) confused PAGE_SIZE and PAGE_MASK at some point, or some drunkard (again, me) is confused by their use right now. Assume the former, be prepared for the latter. Affected files ... .. //depot/projects/mips/sys/mips/mips/tlb.c#4 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/tlb.c#4 (text+ko) ==== @@ -121,8 +121,10 @@ void tlb_remove_pages(pmap_t pmap, vm_offset_t va, int pages) { + va &= ~PAGE_MASK; while (pages--) { tlb_remove(pmap, va); + va += PAGE_SIZE; } } @@ -135,7 +137,7 @@ void tlb_insert(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1) { - va &= ~PAGE_SIZE; + va &= ~PAGE_MASK; critical_enter(); /* XXX assumes kernel region - region 3. */ mips_wr_entryhi(MIPS_HI_R_KERNEL | MIPS_HI_VA_TO_VPN2(va) /* XXX | ASID */); @@ -148,7 +150,7 @@ void tlb_invalidate_page(vm_offset_t va) { - va &= ~PAGE_SIZE; + va &= ~PAGE_MASK; #if 0 /* XXX NetBSD code is faulty. Invalidate ALL. */ MIPS_TBIS(va); #else @@ -159,7 +161,7 @@ void tlb_update(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1) { - va &= ~PAGE_SIZE; + va &= ~PAGE_MASK; tlb_invalidate_page(va); tlb_insert(va, pte0, pte1); } From owner-p4-projects@FreeBSD.ORG Fri Oct 31 07:21:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CA6916A4D0; Fri, 31 Oct 2003 07:21:32 -0800 (PST) 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 083F316A4CE for ; Fri, 31 Oct 2003 07:21:32 -0800 (PST) Received: from mail.speakeasy.net (mail8.speakeasy.net [216.254.0.208]) by mx1.FreeBSD.org (Postfix) with ESMTP id A64B543FAF for ; Fri, 31 Oct 2003 07:21:30 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 22336 invoked from network); 31 Oct 2003 15:21:30 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 31 Oct 2003 15:21:30 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id h9VFLQce044609; Fri, 31 Oct 2003 10:21:27 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200310302335.h9UNZdfG086032@repoman.freebsd.org> Date: Fri, 31 Oct 2003 10:21:26 -0500 (EST) From: John Baldwin To: Peter Wemm X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: Perforce Change Reviews Subject: RE: PERFORCE change 40892 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: Fri, 31 Oct 2003 15:21:33 -0000 On 30-Oct-2003 Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=40892 > > Change 40892 by peter@peter_daintree on 2003/10/30 15:34:51 > > for now. I dont think we'll ever need this since there is no way > to describe it the madt. Actually, I would hope that NO_MIXED_MODE should be on by default for amd64. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Fri Oct 31 08:31:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BBE316A509; Fri, 31 Oct 2003 08:31:13 -0800 (PST) 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 11CB816A501 for ; Fri, 31 Oct 2003 08:31:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4559743FA3 for ; Fri, 31 Oct 2003 08:31:12 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9VGVCXJ083561 for ; Fri, 31 Oct 2003 08:31:12 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9VGVBHo083557 for perforce@freebsd.org; Fri, 31 Oct 2003 08:31:11 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 31 Oct 2003 08:31:11 -0800 (PST) Message-Id: <200310311631.h9VGVBHo083557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 40978 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: Fri, 31 Oct 2003 16:31:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=40978 Change 40978 by sam@sam_ebb on 2003/10/31 08:30:54 minor changes for forthcoming HAL update: verify the ABI checksum, print the mac, phy, and radio h/w revs at attach time (maybe should be under bootverbose) Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#29 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#29 (text+ko) ==== @@ -174,6 +174,33 @@ #define DPRINTF2(X) #endif +/* + * Calculate a "checksum" that the driver can use to + * check for ABI compatibility. We just sum the offsets + * of all the function pointers which are assumed to + * start with ah_getRateTable and continue sequentially + * to the end of the structure. If a new method is added + * or moved this will be detected. This will not, however + * catch methods being moved around or some number added + * while an equal number are replaced, or arguments being + * changed, or lots of other things. + * + * This is stopgap. Improvements are welcome. + */ +static u_int32_t +ath_calcsum(void) +{ + u_int32_t sum = 0; + u_int32_t off; + + off = offsetof(struct ath_hal, ah_getRateTable); + while (off < sizeof(struct ath_hal)) { + sum += off; + off += sizeof(void (*)(void)); + } + return sum; +} + int ath_attach(u_int16_t devid, struct ath_softc *sc) { @@ -196,6 +223,23 @@ error = ENXIO; goto bad; } + if (ah->ah_checksum != ath_calcsum()) { + if_printf(ifp, "HAL ABI mismatch detected (%u != %u)\n", + ah->ah_checksum, ath_calcsum()); + error = ENXIO; + goto bad; + } + if_printf(ifp, "mac %d.%d phy %d.%d", + ah->ah_macVersion, ah->ah_macRev, + ah->ah_phyRev >> 4, ah->ah_phyRev & 0xf); + if (ah->ah_analog5GhzRev) + printf(" 5ghz radio %d.%d", + ah->ah_analog5GhzRev >> 4, ah->ah_analog5GhzRev & 0xf); + if (ah->ah_analog2GhzRev) + printf(" 2ghz radio %d.%d", + ah->ah_analog2GhzRev >> 4, ah->ah_analog2GhzRev & 0xf); + printf("\n"); + sc->sc_ah = ah; sc->sc_invalid = 0; /* ready to go, enable interrupt handling */ From owner-p4-projects@FreeBSD.ORG Fri Oct 31 11:01:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BC1C16A4D1; Fri, 31 Oct 2003 11:01:28 -0800 (PST) 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 1CEB616A4D0 for ; Fri, 31 Oct 2003 11:01:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D973243FCB for ; Fri, 31 Oct 2003 11:01:26 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9VJ1QXJ002937 for ; Fri, 31 Oct 2003 11:01:26 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9VJ1Qp4002934 for perforce@freebsd.org; Fri, 31 Oct 2003 11:01:26 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Fri, 31 Oct 2003 11:01:26 -0800 (PST) Message-Id: <200310311901.h9VJ1Qp4002934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 40993 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: Fri, 31 Oct 2003 19:01:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=40993 Change 40993 by areisse@areisse_ibook on 2003/10/31 11:01:09 initial support for exec transitions leak some memory because mach free needs size hfs associate_extattr hook Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_cnode.c#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_exec.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/linux-compat.h#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/security.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/hfs/hfs_cnode.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -443,6 +444,10 @@ panic("hfs_getcnode: missing vp!"); UBCINFOCHECK("hfs_getcnode", vp); + +#ifdef MAC + mac_associate_vnode_extattr (hfsmp->hfs_mp, vp); +#endif *vpp = vp; return (0); } ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_exec.c#3 (text+ko) ==== @@ -116,8 +116,16 @@ (type *)( ( (unsigned)(addr) + 16 - 1) \ & ~(16 - 1) ) +struct mac_execve_args { + char *fname; + char **argp; + char **envp; + struct mac *mac_p; +}; + static int load_return_to_errno(load_return_t lrtn); int execve(struct proc *p, struct execve_args *uap, register_t *retval); +int mac_execve(struct proc *p, struct mac_execve_args *uap, register_t *retval); static int execargs_alloc(vm_offset_t *addrp); static int execargs_free(vm_offset_t addr); @@ -131,11 +139,24 @@ return (execve(p, args, retval)); } -/* ARGSUSED */ +int +execve(p, args, retval) + struct proc *p; + struct execve_args *args; + int *retval; +{ + struct mac_execve_args margs; + margs.fname = args->fname; + margs.argp = args->argp; + margs.envp = args->envp; + margs.mac_p = NULL; + return (mac_execve(p, &margs, retval)); +} + int -execve(p, uap, retval) - register struct proc *p; - register struct execve_args *uap; +mac_execve(p, uap, retval) + register struct proc *p; + register struct mac_execve_args *uap; register_t *retval; { register struct ucred *cred = p->p_ucred; @@ -189,6 +210,13 @@ unsigned long arch_offset =0; unsigned long arch_size = 0; char *ws_cache_name = NULL; /* used for pre-heat */ + int cred_change = 0; +#ifdef MAC + struct label execlabel; + struct label *execlabelp; + int no_trans = 0; + int will_transition = 0; +#endif task = current_task(); thr_act = current_act(); @@ -207,10 +235,14 @@ } } -#ifdef MAC_TBD - error = mac_execve_enter(NULL, NULL); - if (error) - return(error); +#ifdef MAC + if (uap->mac_p) { + error = mac_execve_enter (uap->mac_p, &execlabel); + if (error) + return(error); + execlabelp = &execlabel; + } else + execlabelp = NULL; #endif error = execargs_alloc(&execargs); @@ -277,8 +309,12 @@ } indir = 0; - if ((vp->v_mount->mnt_flag & MNT_NOSUID) || (p->p_flag & P_TRACED)) + if ((vp->v_mount->mnt_flag & MNT_NOSUID) || (p->p_flag & P_TRACED)) { origvattr.va_mode &= ~(VSUID | VSGID); +#ifdef MAC + no_trans = 1; +#endif + } *(&vattr) = *(&origvattr); @@ -564,6 +600,13 @@ /* load_machfile() maps the vnode */ ubc_map(vp); + /* Transitions */ +#ifdef MAC + will_transition = mac_execve_will_transition (p->p_ucred, vp, NULL, + execlabelp); + cred_change |= will_transition; +#endif + /* * deal with set[ug]id. */ @@ -571,8 +614,10 @@ if (((origvattr.va_mode & VSUID) != 0 && p->p_ucred->cr_uid != origvattr.va_uid) || (origvattr.va_mode & VSGID) != 0 && - p->p_ucred->cr_gid != origvattr.va_gid) { - p->p_ucred = crcopy(cred); + p->p_ucred->cr_gid != origvattr.va_gid) + cred_change = 1; + + if (cred_change) { #if KTRACE /* * If process is being ktraced, turn off - unless @@ -585,13 +630,25 @@ vrele(tvp); } #endif - if (origvattr.va_mode & VSUID) - p->p_ucred->cr_uid = origvattr.va_uid; - if (origvattr.va_mode & VSGID) - p->p_ucred->cr_gid = origvattr.va_gid; + + p->p_ucred = crdup(cred); + + if (origvattr.va_mode & (VSUID || VSGID)) { + if (origvattr.va_mode & VSUID) + p->p_ucred->cr_uid = origvattr.va_uid; + if (origvattr.va_mode & VSGID) + p->p_ucred->cr_gid = origvattr.va_gid; + + set_security_token(p); + p->p_flag |= P_SUGID; + } + +#ifdef MAC + if (will_transition && !no_trans) + mac_execve_transition (cred, p->p_ucred, vp, NULL, execlabelp); +#endif - set_security_token(p); - p->p_flag |= P_SUGID; + crfree (cred); /* Radar 2261856; setuid security hole fix */ /* Patch from OpenBSD: A. Ramesh */ ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/linux-compat.h#4 (text+ko) ==== @@ -133,7 +133,7 @@ #endif /* __APPLE__ */ #define kmalloc(size,flags) sebsd_malloc(size, flags) -#define kfree(v) free(v, M_SEBSD) +#define kfree(v) /*free(v, M_SEBSD)*/ /* XXX need page size */ #define __get_free_page(flags) sebsd_malloc(4096, flags) #define GFP_ATOMIC M_NOWAIT ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/security.h#2 (text+ko) ==== @@ -67,7 +67,7 @@ int security_genfs_sid(const char *fstype, char *name, security_class_t sclass, security_id_t *sid); -#define security_free_context(ctx) ({ if (ctx) free(ctx, M_SEBSD); }) +#define security_free_context(ctx) /*({ if (ctx) free(ctx, M_SEBSD); })*/ #endif /* _SELINUX_SECURITY_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Oct 31 12:09:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E80716A4D0; Fri, 31 Oct 2003 12:09:08 -0800 (PST) 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 4218216A4CE for ; Fri, 31 Oct 2003 12:09:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7D5443F93 for ; Fri, 31 Oct 2003 12:09:06 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9VK96XJ008715 for ; Fri, 31 Oct 2003 12:09:06 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9VK94Mu008712 for perforce@freebsd.org; Fri, 31 Oct 2003 12:09:04 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 31 Oct 2003 12:09:04 -0800 (PST) Message-Id: <200310312009.h9VK94Mu008712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 41006 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: Fri, 31 Oct 2003 20:09:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=41006 Change 41006 by sam@sam_ebb on 2003/10/31 12:08:38 IFC @ 41005 Affected files ... .. //depot/projects/netperf/sys/alpha/osf1/osf1_ioctl.c#3 integrate .. //depot/projects/netperf/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/netperf/sys/conf/options.i386#3 integrate .. //depot/projects/netperf/sys/conf/options.pc98#2 integrate .. //depot/projects/netperf/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate .. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/netperf/sys/dev/an/if_an.c#4 integrate .. //depot/projects/netperf/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath.c#30 integrate .. //depot/projects/netperf/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/netperf/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/netperf/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/netperf/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/netperf/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/netperf/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/netperf/sys/dev/cnw/if_cnw.c#3 integrate .. //depot/projects/netperf/sys/dev/cs/if_cs.c#4 integrate .. //depot/projects/netperf/sys/dev/cs/if_cs_isa.c#3 integrate .. //depot/projects/netperf/sys/dev/cs/if_cs_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/netperf/sys/dev/em/if_em.c#9 integrate .. //depot/projects/netperf/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/en/midway.c#3 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep.c#8 integrate .. //depot/projects/netperf/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/netperf/sys/dev/fatm/if_fatm.c#7 integrate .. //depot/projects/netperf/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/netperf/sys/dev/fe/if_fevar.h#2 integrate .. //depot/projects/netperf/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/netperf/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/netperf/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/netperf/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/netperf/sys/dev/gx/if_gx.c#4 integrate .. //depot/projects/netperf/sys/dev/harp/if_harp.c#3 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#9 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#7 integrate .. //depot/projects/netperf/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/netperf/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/netperf/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/netperf/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/netperf/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/netperf/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/netperf/sys/dev/my/if_my.c#4 integrate .. //depot/projects/netperf/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/netperf/sys/dev/patm/if_patm_attach.c#5 integrate .. //depot/projects/netperf/sys/dev/pdq/if_fea.c#3 integrate .. //depot/projects/netperf/sys/dev/pdq/if_fpa.c#3 integrate .. //depot/projects/netperf/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/netperf/sys/dev/pdq/pdqvar.h#2 integrate .. //depot/projects/netperf/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/netperf/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/netperf/sys/dev/re/if_re.c#3 integrate .. //depot/projects/netperf/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/netperf/sys/dev/sbni/if_sbni_isa.c#3 integrate .. //depot/projects/netperf/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/netperf/sys/dev/sn/if_sn.c#4 integrate .. //depot/projects/netperf/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/netperf/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/netperf/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/netperf/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/netperf/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx.c#4 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx_eisa.c#4 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx_pci.c#6 integrate .. //depot/projects/netperf/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi.c#11 integrate .. //depot/projects/netperf/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/netperf/sys/dev/xe/if_xe.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/netperf/sys/i386/i386/mpboot.s#3 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#21 integrate .. //depot/projects/netperf/sys/i386/include/segments.h#3 integrate .. //depot/projects/netperf/sys/i386/isa/cx.c#2 integrate .. //depot/projects/netperf/sys/i386/isa/if_cx.c#2 integrate .. //depot/projects/netperf/sys/i386/isa/if_el.c#2 integrate .. //depot/projects/netperf/sys/i386/isa/if_le.c#2 integrate .. //depot/projects/netperf/sys/i386/isa/if_rdp.c#4 integrate .. //depot/projects/netperf/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/netperf/sys/i4b/driver/i4b_isppp.c#2 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#14 integrate .. //depot/projects/netperf/sys/kern/subr_smp.c#3 integrate .. //depot/projects/netperf/sys/net/bpf.c#8 integrate .. //depot/projects/netperf/sys/net/bridge.c#13 integrate .. //depot/projects/netperf/sys/net/if.c#11 integrate .. //depot/projects/netperf/sys/net/if.h#3 integrate .. //depot/projects/netperf/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/netperf/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/netperf/sys/net/if_disc.c#5 integrate .. //depot/projects/netperf/sys/net/if_ef.c#4 integrate .. //depot/projects/netperf/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/netperf/sys/net/if_faith.c#7 integrate .. //depot/projects/netperf/sys/net/if_gif.c#2 integrate .. //depot/projects/netperf/sys/net/if_gre.c#2 integrate .. //depot/projects/netperf/sys/net/if_loop.c#12 integrate .. //depot/projects/netperf/sys/net/if_media.c#2 integrate .. //depot/projects/netperf/sys/net/if_mib.c#2 integrate .. //depot/projects/netperf/sys/net/if_ppp.c#5 integrate .. //depot/projects/netperf/sys/net/if_sl.c#2 integrate .. //depot/projects/netperf/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/netperf/sys/net/if_stf.c#5 integrate .. //depot/projects/netperf/sys/net/if_tap.c#2 integrate .. //depot/projects/netperf/sys/net/if_tun.c#4 integrate .. //depot/projects/netperf/sys/net/if_var.h#4 integrate .. //depot/projects/netperf/sys/net/if_vlan.c#6 integrate .. //depot/projects/netperf/sys/net/net_osdep.c#3 integrate .. //depot/projects/netperf/sys/net/net_osdep.h#3 integrate .. //depot/projects/netperf/sys/net/ppp_tty.c#2 integrate .. //depot/projects/netperf/sys/net/route.c#25 integrate .. //depot/projects/netperf/sys/net/route.h#12 integrate .. //depot/projects/netperf/sys/net/rtsock.c#8 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_node.c#14 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_proto.c#7 integrate .. //depot/projects/netperf/sys/netatalk/ddp_output.c#5 integrate .. //depot/projects/netperf/sys/netatm/atm_if.c#4 integrate .. //depot/projects/netperf/sys/netatm/atm_if.h#2 integrate .. //depot/projects/netperf/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/netperf/sys/netatm/atm_usrreq.c#3 integrate .. //depot/projects/netperf/sys/netatm/atm_var.h#3 integrate .. //depot/projects/netperf/sys/netatm/ipatm/ipatm_usrreq.c#4 integrate .. //depot/projects/netperf/sys/netatm/spans/spans_arp.c#3 integrate .. //depot/projects/netperf/sys/netatm/uni/uniarp.c#4 integrate .. //depot/projects/netperf/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/netperf/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/netperf/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/netperf/sys/netinet/if_ether.c#14 integrate .. //depot/projects/netperf/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/netperf/sys/netinet/in_rmx.c#12 integrate .. //depot/projects/netperf/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/netperf/sys/netinet/ip_dummynet.c#15 integrate .. //depot/projects/netperf/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/netperf/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/netperf/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/netperf/sys/netinet6/esp_input.c#5 integrate .. //depot/projects/netperf/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/netperf/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/netperf/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/netperf/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/netperf/sys/netinet6/ip6_fw.c#6 integrate .. //depot/projects/netperf/sys/netinet6/ip6_fw.h#3 integrate .. //depot/projects/netperf/sys/netinet6/ip6_input.c#17 integrate .. //depot/projects/netperf/sys/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/netperf/sys/netinet6/ip6_output.c#20 integrate .. //depot/projects/netperf/sys/netinet6/mld6.c#5 integrate .. //depot/projects/netperf/sys/netinet6/mld6_var.h#3 integrate .. //depot/projects/netperf/sys/netinet6/nd6.h#7 integrate .. //depot/projects/netperf/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/netperf/sys/netipx/ipx_ip.c#2 integrate .. //depot/projects/netperf/sys/netnatm/natm.c#4 integrate .. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#6 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/netperf/sys/pc98/i386/machdep.c#7 integrate .. //depot/projects/netperf/sys/pc98/pc98/syscons_pc98.c#2 integrate .. //depot/projects/netperf/sys/pci/if_dc.c#10 integrate .. //depot/projects/netperf/sys/pci/if_de.c#3 integrate .. //depot/projects/netperf/sys/pci/if_devar.h#2 integrate .. //depot/projects/netperf/sys/pci/if_pcn.c#3 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#9 integrate .. //depot/projects/netperf/sys/pci/if_sf.c#3 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#13 integrate .. //depot/projects/netperf/sys/pci/if_sk.c#4 integrate .. //depot/projects/netperf/sys/pci/if_ste.c#3 integrate .. //depot/projects/netperf/sys/pci/if_ti.c#5 integrate .. //depot/projects/netperf/sys/pci/if_tl.c#3 integrate .. //depot/projects/netperf/sys/pci/if_vr.c#3 integrate .. //depot/projects/netperf/sys/pci/if_wb.c#3 integrate .. //depot/projects/netperf/sys/pci/if_xl.c#7 integrate .. //depot/projects/netperf/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/netperf/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/netperf/sys/sys/cdefs.h#4 integrate .. //depot/projects/netperf/sys/sys/param.h#10 integrate .. //depot/projects/netperf/sys/sys/proc.h#8 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#11 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#10 integrate .. //depot/projects/netperf/sys/vm/vm_object.c#9 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/osf1/osf1_ioctl.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.10 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.12 2003/10/31 18:31:55 brooks Exp $"); #include #include @@ -207,7 +207,7 @@ * because osf/1 doesn't know about most of them. */ if (ifp->if_type == IFT_ETHER - && strcmp(ifp->if_name, "ti")) { /* looks good */ + && strcmp(ifp->if_dname, "ti") != 0) { /* looks good */ /* walk the address list */ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr) /* we have an address structure */ ==== //depot/projects/netperf/sys/compat/linux/linux_ioctl.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.111 2003/10/20 17:56:10 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.112 2003/10/31 18:31:55 brooks Exp $"); #include #include @@ -1881,8 +1881,7 @@ /* Short-circuit non ethernet interfaces */ if (!IFP_IS_ETH(ifp)) - return (snprintf(buffer, buflen, "%s%d", ifp->if_name, - ifp->if_unit)); + return (strlcpy(buffer, ifp->if_xname, buflen)); /* Determine the (relative) unit number for ethernet interfaces */ ethno = 0; @@ -1932,15 +1931,14 @@ * we never have an interface named "eth", so don't make * the test optional based on is_eth. */ - if (ifp->if_unit == unit && ifp->if_name[len] == '\0' && - strncmp(ifp->if_name, lxname, len) == 0) + if (strncmp(ifp->if_xname, lxname, LINUX_IFNAMSIZ) == 0) break; if (is_eth && IFP_IS_ETH(ifp) && unit == index++) break; } IFNET_RUNLOCK(); if (ifp != NULL) - snprintf(bsdname, IFNAMSIZ, "%s%d", ifp->if_name, ifp->if_unit); + strlcpy(bsdname, ifp->if_xname, IFNAMSIZ); return (ifp); } @@ -1988,8 +1986,7 @@ snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "eth%d", ethno++); else - snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "%s%d", - ifp->if_name, ifp->if_unit); + strlcpy(ifr.ifr_name, ifp->if_xname, LINUX_IFNAMSIZ); /* Walk the address list */ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { ==== //depot/projects/netperf/sys/conf/options.i386#3 (text+ko) ==== @@ -1,19 +1,19 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.197 2003/08/31 16:20:34 phk Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.198 2003/10/30 21:45:34 jhb Exp $ # Options specific to the i386 platform kernels +AUTO_EOI_1 opt_auto_eoi.h +AUTO_EOI_2 opt_auto_eoi.h +BROKEN_KEYBOARD_RESET opt_reset.h +COMPAT_OLDISA +I586_PMC_GUPROF opt_i586_guprof.h +MAXMEM +PERFMON DISABLE_PSE opt_pmap.h +DISABLE_PG_G opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h -DISABLE_PG_G opt_pmap.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -MAXMEM -PERFMON opt_perfmon.h POWERFAIL_NMI opt_trap.h -AUTO_EOI_1 opt_auto_eoi.h -AUTO_EOI_2 opt_auto_eoi.h -I586_PMC_GUPROF opt_i586_guprof.h -COMPAT_OLDISA -BROKEN_KEYBOARD_RESET opt_reset.h # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems ==== //depot/projects/netperf/sys/conf/options.pc98#2 (text+ko) ==== @@ -1,19 +1,19 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.167 2003/07/22 08:11:12 peter Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.168 2003/10/31 13:50:09 nyan Exp $ # Options specific to the pc98 platform kernels +AUTO_EOI_1 opt_auto_eoi.h +AUTO_EOI_2 opt_auto_eoi.h +BROKEN_KEYBOARD_RESET opt_reset.h +COMPAT_OLDISA +I586_PMC_GUPROF opt_i586_guprof.h +MAXMEM +PERFMON DISABLE_PSE opt_pmap.h +DISABLE_PG_G opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h -DISABLE_PG_G opt_pmap.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -MAXMEM -PERFMON opt_perfmon.h POWERFAIL_NMI opt_trap.h -AUTO_EOI_1 opt_auto_eoi.h -AUTO_EOI_2 opt_auto_eoi.h -I586_PMC_GUPROF opt_i586_guprof.h -COMPAT_OLDISA -BROKEN_KEYBOARD_RESET opt_reset.h # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems ==== //depot/projects/netperf/sys/contrib/dev/oltr/if_oltr.c#4 (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/contrib/dev/oltr/if_oltr.c,v 1.30 2003/08/22 15:28:22 imp Exp $ + * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.31 2003/10/31 18:31:56 brooks Exp $ */ #include @@ -394,8 +394,7 @@ * Do the ifnet initialization */ ifp->if_softc = sc; - ifp->if_unit = device_get_unit(dev); - ifp->if_name = "oltr"; + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_init = oltr_init; ifp->if_start = oltr_start; ifp->if_ioctl = oltr_ioctl; ==== //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_compat.h#2 (text+ko) ==== @@ -5,7 +5,7 @@ * * @(#)ip_compat.h 1.8 1/14/96 * $Id: ip_compat.h,v 2.26.2.9 2001/01/14 14:58:01 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.20 2003/02/15 06:23:45 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.21 2003/10/31 18:31:56 brooks Exp $ */ #ifndef __IP_COMPAT_H__ @@ -542,7 +542,8 @@ # ifndef linux # define GETUNIT(n, v) ifunit(n) # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) # define IFNAME(x) ((struct ifnet *)x)->if_xname # else # define USE_GETIFNAME 1 ==== //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_fil.c#7 (text+ko) ==== @@ -131,7 +131,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.42.2.34 2001/07/23 13:49:57 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.41 2003/10/17 20:20:14 ume Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.42 2003/10/31 18:31:56 brooks Exp $"; #endif extern struct protosw inetsw[]; @@ -2075,7 +2075,8 @@ int fd; # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) sprintf(fname, "%s", ifp->if_xname); # else sprintf(fname, "%s%d", ifp->if_name, ifp->if_unit); @@ -2095,7 +2096,8 @@ struct ifnet *ifp; { # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return ifp->if_xname; # else static char fullifname[LIFNAMSIZ]; @@ -2114,7 +2116,8 @@ for (ifa = ifneta; ifa && (ifp = *ifa); ifa++) { # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) if (!strncmp(ifname, ifp->if_xname, sizeof(ifp->if_xname))) # else char fullname[LIFNAMSIZ]; @@ -2156,7 +2159,8 @@ ifp = ifneta[nifs - 1]; # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) strncpy(ifp->if_xname, ifname, sizeof(ifp->if_xname)); # else ifp->if_name = strdup(ifname); @@ -2183,7 +2187,8 @@ int fd; # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) for (ifa = ifneta; ifa && (ifp = *ifa); ifa++) { ifp->if_output = write_output; sprintf(fname, "/tmp/%s", ifp->if_xname); ==== //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_log.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * $Id: ip_log.c,v 2.5.2.1 2000/07/19 13:11:47 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.24 2003/02/15 06:23:45 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.25 2003/10/31 18:31:56 brooks Exp $ */ #include #if defined(KERNEL) && !defined(_KERNEL) @@ -253,7 +253,8 @@ mlen = (flags & FR_LOGBODY) ? MIN(msgdsize(m) - hlen, 128) : 0; # else # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) + (defined(OpenBSD) && (OpenBSD >= 199603) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) ) strncpy(ipfl.fl_ifname, ifp->if_xname, IFNAMSIZ); # else ipfl.fl_unit = (u_char)ifp->if_unit; ==== //depot/projects/netperf/sys/dev/an/if_an.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.54 2003/08/24 17:48:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.55 2003/10/31 18:31:56 brooks Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -752,8 +752,9 @@ sc->arpcom.ac_enaddr, ":"); ifp->if_softc = sc; - ifp->if_unit = sc->an_unit = unit; - ifp->if_name = "an"; + sc->an_unit = unit; + if_initname(ifp, device_get_name(sc->an_dev), + device_get_unit(sc->an_dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = an_ioctl; ==== //depot/projects/netperf/sys/dev/ar/if_ar.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.59 2003/08/24 17:48:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.60 2003/10/31 18:31:56 brooks Exp $"); /* * Programming assumptions and other issues. @@ -293,8 +293,8 @@ ifp = &sc->ifsppp.pp_if; ifp->if_softc = sc; - ifp->if_unit = sc->unit; - ifp->if_name = "ar"; + if_initname(ifp, device_get_name(device), + device_get_unit(device)); ifp->if_mtu = PP_MTU; ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST; ifp->if_ioctl = arioctl; ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#30 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.29 2003/10/22 04:37:34 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.30 2003/10/31 18:31:56 brooks Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -213,8 +213,8 @@ DPRINTF(("ath_attach: devid 0x%x\n", devid)); /* set these up early for if_printf use */ - ifp->if_unit = device_get_unit(sc->sc_dev); - ifp->if_name = "ath"; + if_initname(ifp, device_get_name(sc->sc_dev), + device_get_unit(sc->sc_dev)); ah = ath_hal_attach(devid, sc, sc->sc_st, sc->sc_sh, &status); if (ah == NULL) { ==== //depot/projects/netperf/sys/dev/awi/if_awi_pccard.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.12 2003/08/24 17:48:06 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.14 2003/10/31 18:31:57 brooks Exp $"); #include #include @@ -141,15 +141,9 @@ psc->sc_mem_res = 0; psc->sc_intrhand = 0; - ifp->if_name = "awi"; - ifp->if_unit = device_get_unit(dev); - if (ifp->if_name == NULL) { - printf("awi%d: awi_pccard_attach: cannot get device name\n", - device_get_unit(dev)); - goto fail; - } - snprintf(sc->sc_dev.dv_xname, sizeof(sc->sc_dev.dv_xname), - "%s%d", ifp->if_name, ifp->if_unit); + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); + strlcpy(sc->sc_dev.dv_xname, ifp->if_xname, + sizeof(sc->sc_dev.dv_xname)); psc->sc_port_rid = 0; psc->sc_port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, ==== //depot/projects/netperf/sys/dev/bfe/if_bfe.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.2 2003/09/09 18:21:17 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.3 2003/10/31 18:31:57 brooks Exp $"); #include #include @@ -368,8 +368,7 @@ /* Set up ifnet structure */ ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_unit = sc->bfe_unit; - ifp->if_name = "bfe"; + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = bfe_ioctl; ifp->if_output = ether_output; ==== //depot/projects/netperf/sys/dev/bge/if_bge.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.55 2003/09/23 19:54:32 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.57 2003/10/31 18:31:57 brooks Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.55 2003/09/23 19:54:32 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.57 2003/10/31 18:31:57 brooks Exp $"); #include #include @@ -157,6 +157,8 @@ "Broadcom BCM5705M Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5782, "Broadcom BCM5782 Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5788, + "Broadcom BCM5788 Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5901, "Broadcom BCM5901 Fast Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5901A2, @@ -2358,8 +2360,7 @@ /* Set up ifnet structure */ ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_unit = sc->bge_unit; - ifp->if_name = "bge"; + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = bge_ioctl; ifp->if_output = ether_output; ==== //depot/projects/netperf/sys/dev/bge/if_bgereg.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.23 2003/08/20 04:06:00 ambrisko Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.24 2003/10/31 16:25:39 wpaul Exp $ */ /* @@ -1822,6 +1822,7 @@ #define BCOM_DEVICEID_BCM5705M 0x165D #define BCOM_DEVICEID_BCM5705M_ALT 0x165E #define BCOM_DEVICEID_BCM5782 0x1696 +#define BCOM_DEVICEID_BCM5788 0x169C #define BCOM_DEVICEID_BCM5901 0x170D #define BCOM_DEVICEID_BCM5901A2 0x170E ==== //depot/projects/netperf/sys/dev/cm/if_cm_isa.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.4 2003/08/24 17:46:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.5 2003/10/31 18:31:58 brooks Exp $"); /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ return (error); } - return cm_attach(sc, device_get_unit(dev)); + return cm_attach(dev); } static int ==== //depot/projects/netperf/sys/dev/cm/smc90cx6.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.11 2003/10/30 19:45:57 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.12 2003/10/31 18:31:58 brooks Exp $"); /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -274,10 +274,10 @@ } int -cm_attach(sc, unit) - struct cm_softc *sc; - int unit; +cm_attach(dev) + device_t dev; { + struct cm_softc *sc = device_get_softc(dev); struct ifnet *ifp = &sc->sc_arccom.ac_if; int s; u_int8_t linkaddress; @@ -313,8 +313,7 @@ cm_stop(sc); ifp->if_softc = sc; - ifp->if_unit = unit; - ifp->if_name = "cm"; + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_output = arc_output; ifp->if_start = cm_start; ifp->if_ioctl = cm_ioctl; @@ -841,8 +840,8 @@ */ PUTREG(CMCMD, CM_CLR(CLR_POR)); log(LOG_WARNING, - "%s%d: intr: got spurious power on reset int\n", - ifp->if_name, ifp->if_unit); + "%s: intr: got spurious power on reset int\n", + ifp->if_xname); } if (maskedisr & CM_RECON) { @@ -872,9 +871,9 @@ if ((newsec - sc->sc_recontime <= 2) && (++sc->sc_reconcount == ARC_EXCESSIVE_RECONS)) { log(LOG_WARNING, - "%s%d: excessive token losses, " + "%s: excessive token losses, " "cable problem?\n", - ifp->if_name, ifp->if_unit); + ifp->if_xname); } sc->sc_recontime = newsec; callout_reset(&sc->sc_recon_ch, 15 * hz, @@ -895,8 +894,8 @@ * configured sender) */ log(LOG_WARNING, - "%s%d: spurious RX interupt or sender 0 " - " (ignored)\n", ifp->if_name, ifp->if_unit); + "%s: spurious RX interupt or sender 0 " + " (ignored)\n", ifp->if_xname); /* * restart receiver on same buffer. * XXX maybe better reset interface? @@ -958,8 +957,8 @@ if (sc->sc_reconcount >= ARC_EXCESSIVE_RECONS) { sc->sc_reconcount = 0; - log(LOG_WARNING, "%s%d: token valid again.\n", - ifp->if_name, ifp->if_unit); + log(LOG_WARNING, "%s: token valid again.\n", + ifp->if_xname); } sc->sc_reconcount = 0; } ==== //depot/projects/netperf/sys/dev/cm/smc90cx6var.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: smc90cx6var.h,v 1.5 2000/03/23 07:01:32 thorpej Exp $ */ -/* $FreeBSD: src/sys/dev/cm/smc90cx6var.h,v 1.2 2002/03/20 02:04:09 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/cm/smc90cx6var.h,v 1.3 2003/10/31 18:31:58 brooks Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -87,7 +87,7 @@ u_char sc_retransmits[2]; /* unused at the moment */ }; -int cm_attach(struct cm_softc *, int unit); +int cm_attach(device_t dev); void cmintr(void *); int cm_probe(device_t dev); ==== //depot/projects/netperf/sys/dev/cnw/if_cnw.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.12 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.13 2003/10/31 18:31:58 brooks Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -1632,8 +1632,7 @@ sc->arpcom.ac_enaddr, ":"); ifp->if_softc = sc; - ifp->if_name = "cnw"; - ifp->if_unit = device_get_unit(dev); + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_timer = 0; ifp->if_mtu = ETHERMTU; ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); ==== //depot/projects/netperf/sys/dev/cs/if_cs.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.26 2003/10/30 19:45:57 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.27 2003/10/31 18:31:58 brooks Exp $"); /* * @@ -575,16 +575,16 @@ * Install the interface into kernel networking data structures */ int -cs_attach(struct cs_softc *sc, int unit, int flags) +cs_attach(device_t dev) { int media=0; + struct cs_softc *sc = device_get_softc(dev);; struct ifnet *ifp = &(sc->arpcom.ac_if); cs_stop( sc ); ifp->if_softc=sc; - ifp->if_unit=unit; - ifp->if_name="cs"; + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_output=ether_output; ifp->if_start=cs_start; ifp->if_ioctl=cs_ioctl; @@ -607,8 +607,8 @@ sc->recv_ring=malloc(CS_DMA_BUFFER_SIZE<<1, M_DEVBUF, M_NOWAIT); if (sc->recv_ring == NULL) { - log(LOG_ERR,CS_NAME - "%d: Couldn't allocate memory for NIC\n", unit); + log(LOG_ERR, + "%s: Couldn't allocate memory for NIC\n", ifp->if_xname); return(0); } if ((sc->recv_ring-(sc->recv_ring & 0x1FFFF)) @@ -1137,7 +1137,7 @@ struct cs_softc *sc = ifp->if_softc; ifp->if_oerrors++; - log(LOG_ERR, CS_NAME"%d: device timeout\n", ifp->if_unit); + log(LOG_ERR, "%s: device timeout\n", ifp->if_xname); /* Reset the interface */ if (ifp->if_flags & IFF_UP) ==== //depot/projects/netperf/sys/dev/cs/if_cs_isa.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.4 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.5 2003/10/31 18:31:58 brooks Exp $"); #include #include @@ -90,7 +90,6 @@ cs_isa_attach(device_t dev) { struct cs_softc *sc = device_get_softc(dev); - int flags = device_get_flags(dev); int error; cs_alloc_port(dev, 0, CS_89x0_IO_PORTS); @@ -106,7 +105,7 @@ return (error); } - return (cs_attach(sc, device_get_unit(dev), flags)); + return (cs_attach(dev)); } static device_method_t cs_isa_methods[] = { ==== //depot/projects/netperf/sys/dev/cs/if_cs_pccard.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.7 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.8 2003/10/31 18:31:58 brooks Exp $"); #include #include @@ -81,7 +81,6 @@ cs_pccard_attach(device_t dev) { struct cs_softc *sc = device_get_softc(dev); - int flags = device_get_flags(dev); int error; error = cs_alloc_port(dev, sc->port_rid, CS_89x0_IO_PORTS); @@ -95,7 +94,7 @@ if (error != 0) goto bad; - return (cs_attach(sc, device_get_unit(dev), flags)); + return (cs_attach(dev)); bad: cs_release_resources(dev); return (error); ==== //depot/projects/netperf/sys/dev/cs/if_csvar.h#2 (text+ko) ==== @@ -22,7 +22,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/cs/if_csvar.h,v 1.1 2001/01/21 04:56:12 imp Exp $ + * $FreeBSD: src/sys/dev/cs/if_csvar.h,v 1.2 2003/10/31 18:31:58 brooks Exp $ */ #ifndef _IF_CSVAR_H @@ -70,7 +70,7 @@ int cs_alloc_port(device_t dev, int rid, int size); int cs_alloc_memory(device_t dev, int rid, int size); int cs_alloc_irq(device_t dev, int rid, int flags); -int cs_attach(struct cs_softc *, int, int); +int cs_attach(device_t dev); int cs_cs89x0_probe(device_t dev); void cs_release_resources(device_t dev); driver_intr_t csintr; ==== //depot/projects/netperf/sys/dev/ed/if_ed.c#5 (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/ed/if_ed.c,v 1.220 2003/10/30 19:45:57 brooks Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.221 2003/10/31 18:31:58 brooks Exp $ */ /* @@ -1700,11 +1700,10 @@ * Install interface into kernel networking data structures */ int -ed_attach(sc, unit, flags) - struct ed_softc *sc; - int unit; - int flags; +ed_attach(dev) + device_t dev; { + struct ed_softc *sc = device_get_softc(dev); struct ifnet *ifp = &sc->arpcom.ac_if; callout_handle_init(&sc->tick_ch); @@ -1717,8 +1716,7 @@ * Initialize ifnet structure */ ifp->if_softc = sc; - ifp->if_unit = unit; - ifp->if_name = "ed"; + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_output = ether_output; ifp->if_start = ed_start; ifp->if_ioctl = ed_ioctl; @@ -1745,7 +1743,7 @@ * tranceiver for AUI operation), based on compile-time * config option. */ - if (flags & ED_FLAGS_DISABLE_TRANCEIVER) + if (device_get_flags(dev) & ED_FLAGS_DISABLE_TRANCEIVER) ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | IFF_ALTPHYS); else @@ -1846,7 +1844,7 @@ if (sc->gone) return; - log(LOG_ERR, "ed%d: device timeout\n", ifp->if_unit); + log(LOG_ERR, "%s: device timeout\n", ifp->if_xname); ifp->if_oerrors++; ed_reset(ifp); @@ -2349,8 +2347,8 @@ * Really BAD. The ring pointers are corrupted. */ log(LOG_ERR, - "ed%d: NIC memory corrupt - invalid packet length %d\n", - ifp->if_unit, len); + "%s: NIC memory corrupt - invalid packet length %d\n", + ifp->if_xname, len); ifp->if_ierrors++; ed_reset(ifp); return; @@ -2554,8 +2552,8 @@ ifp->if_ierrors++; #ifdef DIAGNOSTIC log(LOG_WARNING, - "ed%d: warning - receiver ring buffer overrun\n", - ifp->if_unit); + "%s: warning - receiver ring buffer overrun\n", + ifp->if_xname); #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 31 15:54:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DF2316A4D0; Fri, 31 Oct 2003 15:54:14 -0800 (PST) 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 0B34916A4CE for ; Fri, 31 Oct 2003 15:54:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F5F843FB1 for ; Fri, 31 Oct 2003 15:54:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9VNsCXJ032089 for ; Fri, 31 Oct 2003 15:54:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9VNs7rL032077 for perforce@freebsd.org; Fri, 31 Oct 2003 15:54:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 31 Oct 2003 15:54:07 -0800 (PST) Message-Id: <200310312354.h9VNs7rL032077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 41026 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: Fri, 31 Oct 2003 23:54:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=41026 Change 41026 by peter@peter_daintree on 2003/10/31 15:53:43 IFC @41023 Affected files ... .. //depot/projects/hammer/UPDATING#21 integrate .. //depot/projects/hammer/bin/chmod/chmod.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/smrsh/smrsh.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#6 integrate .. //depot/projects/hammer/lib/libc/locale/frune.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/wcsftime.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcstod.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/wcstof.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcstold.c#2 integrate .. //depot/projects/hammer/release/Makefile#38 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#42 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#8 integrate .. //depot/projects/hammer/sbin/Makefile#16 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.c#6 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#16 integrate .. //depot/projects/hammer/share/man/man7/hier.7#8 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#8 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#10 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_ioctl.c#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#13 integrate .. //depot/projects/hammer/sys/conf/options.i386#14 integrate .. //depot/projects/hammer/sys/conf/options.pc98#13 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#6 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.c#6 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#11 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/hammer/sys/dev/cm/if_cm_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#7 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#6 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#7 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#9 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#7 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#18 integrate .. //depot/projects/hammer/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#16 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#9 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/hammer/sys/dev/fe/if_fevar.h#2 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#11 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#16 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#22 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#25 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#8 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/hammer/sys/dev/gx/if_gx.c#7 integrate .. //depot/projects/hammer/sys/dev/harp/if_harp.c#3 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#7 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatmvar.h#4 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#8 integrate .. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#6 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#9 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#8 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#9 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fea.c#4 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fpa.c#4 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_freebsd.h#4 integrate .. //depot/projects/hammer/sys/dev/pdq/pdqvar.h#3 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#7 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#3 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#9 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#7 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#8 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#9 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#10 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_eisa.c#5 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#19 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#23 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/mpboot.s#4 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/hammer/sys/i386/include/segments.h#7 integrate .. //depot/projects/hammer/sys/i386/isa/cx.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/if_cx.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/if_el.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/if_le.c#8 integrate .. //depot/projects/hammer/sys/i386/isa/if_rdp.c#9 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#13 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#7 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#7 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#14 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#9 integrate .. //depot/projects/hammer/sys/net/bpf.c#12 integrate .. //depot/projects/hammer/sys/net/bridge.c#9 integrate .. //depot/projects/hammer/sys/net/if.c#12 integrate .. //depot/projects/hammer/sys/net/if.h#7 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#12 integrate .. //depot/projects/hammer/sys/net/if_disc.c#6 integrate .. //depot/projects/hammer/sys/net/if_ef.c#5 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/hammer/sys/net/if_faith.c#6 integrate .. //depot/projects/hammer/sys/net/if_gif.c#8 integrate .. //depot/projects/hammer/sys/net/if_gre.c#7 integrate .. //depot/projects/hammer/sys/net/if_loop.c#11 integrate .. //depot/projects/hammer/sys/net/if_media.c#4 integrate .. //depot/projects/hammer/sys/net/if_mib.c#2 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#8 integrate .. //depot/projects/hammer/sys/net/if_sl.c#6 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/hammer/sys/net/if_stf.c#8 integrate .. //depot/projects/hammer/sys/net/if_tap.c#7 integrate .. //depot/projects/hammer/sys/net/if_tun.c#8 integrate .. //depot/projects/hammer/sys/net/if_var.h#8 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#9 integrate .. //depot/projects/hammer/sys/net/net_osdep.c#3 integrate .. //depot/projects/hammer/sys/net/net_osdep.h#4 integrate .. //depot/projects/hammer/sys/net/ppp_tty.c#5 integrate .. //depot/projects/hammer/sys/net/route.c#7 integrate .. //depot/projects/hammer/sys/net/route.h#5 integrate .. //depot/projects/hammer/sys/net/rtsock.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/hammer/sys/netatalk/ddp_output.c#5 integrate .. //depot/projects/hammer/sys/netatm/atm_if.c#9 integrate .. //depot/projects/hammer/sys/netatm/atm_if.h#5 integrate .. //depot/projects/hammer/sys/netatm/atm_socket.c#6 integrate .. //depot/projects/hammer/sys/netatm/atm_usrreq.c#5 integrate .. //depot/projects/hammer/sys/netatm/atm_var.h#5 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_usrreq.c#6 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_arp.c#6 integrate .. //depot/projects/hammer/sys/netatm/uni/uniarp.c#7 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#5 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/hammer/sys/netinet6/esp_input.c#6 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#5 integrate .. //depot/projects/hammer/sys/netinet6/ip6_fw.c#6 integrate .. //depot/projects/hammer/sys/netinet6/ip6_fw.h#3 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#6 integrate .. //depot/projects/hammer/sys/netinet6/mld6_var.h#3 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#5 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/hammer/sys/netipx/ipx_ip.c#7 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#7 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#5 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#20 integrate .. //depot/projects/hammer/sys/pc98/pc98/syscons_pc98.c#7 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#22 integrate .. //depot/projects/hammer/sys/pci/if_de.c#10 integrate .. //depot/projects/hammer/sys/pci/if_devar.h#4 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#10 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#18 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#11 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#15 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#11 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#12 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#14 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#9 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#10 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#10 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#21 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#17 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#10 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#12 integrate .. //depot/projects/hammer/sys/sys/param.h#22 integrate .. //depot/projects/hammer/sys/sys/proc.h#34 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#23 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#30 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#13 integrate .. //depot/projects/hammer/tools/tools/ministat/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/ministat/ministat.c#2 integrate .. //depot/projects/hammer/usr.bin/chat/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/chat/chat.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/if.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/route.c#5 integrate .. //depot/projects/hammer/usr.sbin/Makefile#31 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.c#3 integrate .. //depot/projects/hammer/usr.sbin/inetd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/inetd/inetd.c#7 integrate .. //depot/projects/hammer/usr.sbin/mountd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.c#7 integrate .. //depot/projects/hammer/usr.sbin/mrouted/Makefile.inc#3 integrate .. //depot/projects/hammer/usr.sbin/mtree/compare.c#5 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.8#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/test/test02.sh#1 branch .. //depot/projects/hammer/usr.sbin/route6d/route6d.c#5 integrate Differences ... ==== //depot/projects/hammer/UPDATING#21 (text+ko) ==== @@ -17,6 +17,14 @@ developers choose to disable these features on build machines to maximize performance. +20031031: + The API and ABI of struct ifnet have been changed by removing + the if_name and if_unit members and replacing them with + if_xname, if_dname, and if_dunit. All network drivers and most + userland programs which include net/if_var.h must be updated + and recompiled. __FreeBSD_version has been bumped to 501113 to + reflect this change. + 20030928: Changes to the cdevsw default functions have been made to remove the need to specify nullopen() and nullclose() explicitly. @@ -1384,4 +1392,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.272 2003/10/19 10:24:59 phk Exp $ +$FreeBSD: src/UPDATING,v 1.274 2003/10/31 21:58:15 brooks Exp $ ==== //depot/projects/hammer/bin/chmod/chmod.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.29 2003/05/01 16:58:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.30 2003/10/31 13:20:09 tobez Exp $"); #include #include @@ -65,16 +65,13 @@ FTS *ftsp; FTSENT *p; mode_t *set; - long val; - int oct; int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval; int vflag; - char *ep, *mode; - mode_t newmode, omode; + char *mode; + mode_t newmode; int (*change_mode)(const char *, mode_t); set = NULL; - omode = 0; Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; while ((ch = getopt(argc, argv, "HLPRXfghorstuvwx")) != -1) switch (ch) { @@ -152,22 +149,8 @@ change_mode = chmod; mode = *argv; - if (*mode >= '0' && *mode <= '7') { - errno = 0; - val = strtol(mode, &ep, 8); - if (val > USHRT_MAX || val < 0) - errno = ERANGE; - if (errno) - err(1, "invalid file mode: %s", mode); - if (*ep) - errx(1, "invalid file mode: %s", mode); - omode = (mode_t)val; - oct = 1; - } else { - if ((set = setmode(mode)) == NULL) - errx(1, "invalid file mode: %s", mode); - oct = 0; - } + if ((set = setmode(mode)) == NULL) + errx(1, "invalid file mode: %s", mode); if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL) err(1, "fts_open"); @@ -200,7 +183,7 @@ default: break; } - newmode = oct ? omode : getmode(set, p->fts_statp->st_mode); + newmode = getmode(set, p->fts_statp->st_mode); if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) continue; if ((*change_mode)(p->fts_accpath, newmode) && !fflag) { ==== //depot/projects/hammer/contrib/sendmail/smrsh/smrsh.c#5 (text+ko) ==== @@ -9,6 +9,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD: src/contrib/sendmail/smrsh/smrsh.c,v 1.16 2003/10/31 22:12:09 gshapiro Exp $ */ #include @@ -423,7 +424,8 @@ #ifdef DEBUG (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, "%s\n", newcmdbuf); #endif /* DEBUG */ - (void) execle("/bin/sh", "/bin/sh", "-c", newcmdbuf, NULL, newenv); + (void) execle("/bin/sh", "/bin/sh", "-c", newcmdbuf, + (char *)NULL, newenv); save_errno = errno; #ifndef DEBUG syslog(LOG_CRIT, "Cannot exec /bin/sh: %s", sm_errstring(errno)); ==== //depot/projects/hammer/crypto/openssh/sshd_config.5#6 (text+ko) ==== @@ -35,7 +35,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.15 2003/03/28 10:11:43 jmc Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.12 2003/09/24 19:20:23 des Exp $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.13 2003/10/31 21:49:47 simon Exp $ .Dd September 25, 1999 .Dt SSHD_CONFIG 5 .Os @@ -432,7 +432,7 @@ Specifies whether password authentication is allowed. The default is .Dq yes . -Note that +Note that if .Cm ChallengeResponseAuthentication is .Dq yes , ==== //depot/projects/hammer/lib/libc/locale/frune.c#4 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Tim J. Robbins. All rights reserved. * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * @@ -41,39 +42,24 @@ static char sccsid[] = "@(#)frune.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/frune.c,v 1.4 2003/06/13 07:13:54 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/frune.c,v 1.5 2003/10/31 10:55:19 tjr Exp $"); #include #include #include #include +#include __warn_references(fgetrune, "warning: fgetrune() is deprecated. See fgetrune(3)."); long fgetrune(fp) FILE *fp; { - rune_t r; - int c, len; - char buf[MB_LEN_MAX]; - char const *result; + wint_t ch; - len = 0; - do { - if ((c = getc(fp)) == EOF) { - if (len) - break; - return (EOF); - } - buf[len++] = c; - - if ((r = sgetrune(buf, len, &result)) != _INVALID_RUNE) - return (r); - } while (result == buf && len < MB_LEN_MAX); - - while (--len > 0) - ungetc(buf[len], fp); - return (_INVALID_RUNE); + if ((ch = fgetwc(fp)) == WEOF) + return (feof(fp) ? EOF : _INVALID_RUNE); + return ((long)ch); } __warn_references(fungetrune, "warning: fungetrune() is deprecated. See fungetrune(3)."); @@ -82,14 +68,8 @@ rune_t r; FILE* fp; { - int len; - char buf[MB_LEN_MAX]; - len = sputrune(r, buf, MB_LEN_MAX, 0); - while (len-- > 0) - if (ungetc(buf[len], fp) == EOF) - return (EOF); - return (0); + return (ungetwc((wint_t)r, fp) == WEOF ? EOF : 0); } __warn_references(fputrune, "warning: fputrune() is deprecated. See fputrune(3)."); @@ -98,14 +78,6 @@ rune_t r; FILE *fp; { - int i, len; - char buf[MB_LEN_MAX]; - len = sputrune(r, buf, MB_LEN_MAX, 0); - - for (i = 0; i < len; ++i) - if (putc(buf[i], fp) == EOF) - return (EOF); - - return (0); + return (fputwc((wchar_t)r, fp) == WEOF ? EOF : 0); } ==== //depot/projects/hammer/lib/libc/locale/wcsftime.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.2 2002/09/15 08:06:17 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.3 2003/10/31 13:29:00 tjr Exp $"); #include #include @@ -50,8 +50,6 @@ wcsftime(wchar_t * __restrict wcs, size_t maxsize, const wchar_t * __restrict format, const struct tm * __restrict timeptr) { - static const mbstate_t initial; - mbstate_t state; char *dst, *dstp, *sformat; size_t n, sflen; int sverrno; @@ -61,15 +59,17 @@ /* * Convert the supplied format string to a multibyte representation * for strftime(), which only handles single-byte characters. + * + * We pass NULL as the state pointer to wcrtomb() because we don't + * support state-dependent encodings and don't want to waste time + * creating a zeroed mbstate_t that will not be used. */ - state = initial; - sflen = wcsrtombs(NULL, &format, 0, &state); + sflen = wcsrtombs(NULL, &format, 0, NULL); if (sflen == (size_t)-1) goto error; if ((sformat = malloc(sflen + 1)) == NULL) goto error; - state = initial; - wcsrtombs(sformat, &format, sflen + 1, &state); + wcsrtombs(sformat, &format, sflen + 1, NULL); /* * Allocate memory for longest multibyte sequence that will fit @@ -86,9 +86,8 @@ goto error; if (strftime(dst, maxsize, sformat, timeptr) == 0) goto error; - state = initial; dstp = dst; - n = mbsrtowcs(wcs, (const char **)&dstp, maxsize, &state); + n = mbsrtowcs(wcs, (const char **)&dstp, maxsize, NULL); if (n == (size_t)-2 || n == (size_t)-1 || dstp != NULL) goto error; ==== //depot/projects/hammer/lib/libc/locale/wcstod.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcstod.c,v 1.2 2003/02/22 00:06:05 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcstod.c,v 1.3 2003/10/31 13:29:00 tjr Exp $"); #include #include @@ -43,12 +43,10 @@ double wcstod(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) { - static const mbstate_t initial; - mbstate_t state; double val; - char *buf, *end, *p; + char *buf, *end; const wchar_t *wcp; - size_t clen, len; + size_t len; while (iswspace(*nptr)) nptr++; @@ -62,18 +60,20 @@ * the input string contains a lot of text after the number * duplicates a lot of strtod()'s functionality and slows down the * most common cases. + * + * We pass NULL as the state pointer to wcrtomb() because we don't + * support state-dependent encodings and don't want to waste time + * creating a zeroed mbstate_t that will not be used. */ - state = initial; wcp = nptr; - if ((len = wcsrtombs(NULL, &wcp, 0, &state)) == (size_t)-1) { + if ((len = wcsrtombs(NULL, &wcp, 0, NULL)) == (size_t)-1) { if (endptr != NULL) *endptr = (wchar_t *)nptr; return (0.0); } if ((buf = malloc(len + 1)) == NULL) return (0.0); - state = initial; - wcsrtombs(buf, &wcp, len + 1, &state); + wcsrtombs(buf, &wcp, len + 1, NULL); /* Let strtod() do most of the work for us. */ val = strtod(buf, &end); @@ -84,22 +84,9 @@ * where it ended, count multibyte characters to find the * corresponding position in the wide char string. */ - if (endptr != NULL) { -#if 1 /* Fast, assume 1:1 WC:MBS mapping. */ + if (endptr != NULL) + /* XXX Assume each wide char is one byte. */ *endptr = (wchar_t *)nptr + (end - buf); - (void)clen; - (void)p; -#else /* Slow, conservative approach. */ - state = initial; - *endptr = (wchar_t *)nptr; - p = buf; - while (p < end && - (clen = mbrlen(p, end - p, &state)) > 0) { - p += clen; - (*endptr)++; - } -#endif - } free(buf); ==== //depot/projects/hammer/lib/libc/locale/wcstof.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcstof.c,v 1.1 2003/03/13 06:29:53 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcstof.c,v 1.2 2003/10/31 13:29:00 tjr Exp $"); #include #include @@ -37,46 +37,28 @@ float wcstof(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) { - static const mbstate_t initial; - mbstate_t state; float val; - char *buf, *end, *p; + char *buf, *end; const wchar_t *wcp; - size_t clen, len; + size_t len; while (iswspace(*nptr)) nptr++; - state = initial; wcp = nptr; - if ((len = wcsrtombs(NULL, &wcp, 0, &state)) == (size_t)-1) { + if ((len = wcsrtombs(NULL, &wcp, 0, NULL)) == (size_t)-1) { if (endptr != NULL) *endptr = (wchar_t *)nptr; return (0.0); } if ((buf = malloc(len + 1)) == NULL) return (0.0); - state = initial; - wcsrtombs(buf, &wcp, len + 1, &state); + wcsrtombs(buf, &wcp, len + 1, NULL); val = strtof(buf, &end); - if (endptr != NULL) { -#if 1 /* Fast, assume 1:1 WC:MBS mapping. */ + if (endptr != NULL) *endptr = (wchar_t *)nptr + (end - buf); - (void)clen; - (void)p; -#else /* Slow, conservative approach. */ - state = initial; - *endptr = (wchar_t *)nptr; - p = buf; - while (p < end && - (clen = mbrlen(p, end - p, &state)) > 0) { - p += clen; - (*endptr)++; - } -#endif - } free(buf); ==== //depot/projects/hammer/lib/libc/locale/wcstold.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcstold.c,v 1.1 2003/03/13 06:29:53 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcstold.c,v 1.2 2003/10/31 13:29:00 tjr Exp $"); #include #include @@ -37,8 +37,6 @@ long double wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr) { - static const mbstate_t initial; - mbstate_t state; long double val; char *buf, *end, *p; const wchar_t *wcp; @@ -47,36 +45,20 @@ while (iswspace(*nptr)) nptr++; - state = initial; wcp = nptr; - if ((len = wcsrtombs(NULL, &wcp, 0, &state)) == (size_t)-1) { + if ((len = wcsrtombs(NULL, &wcp, 0, NULL)) == (size_t)-1) { if (endptr != NULL) *endptr = (wchar_t *)nptr; return (0.0); } if ((buf = malloc(len + 1)) == NULL) return (0.0); - state = initial; - wcsrtombs(buf, &wcp, len + 1, &state); + wcsrtombs(buf, &wcp, len + 1, NULL); val = strtold(buf, &end); - if (endptr != NULL) { -#if 1 /* Fast, assume 1:1 WC:MBS mapping. */ + if (endptr != NULL) *endptr = (wchar_t *)nptr + (end - buf); - (void)clen; - (void)p; -#else /* Slow, conservative approach. */ - state = initial; - *endptr = (wchar_t *)nptr; - p = buf; - while (p < end && - (clen = mbrlen(p, end - p, &state)) > 0) { - p += clen; - (*endptr)++; - } -#endif - } free(buf); ==== //depot/projects/hammer/release/Makefile#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.821 2003/10/06 11:52:34 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.822 2003/10/31 13:15:07 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -669,7 +669,8 @@ .if exists(${.CURDIR}/../sys/boot/${TARGET}/loader) cd ${.CURDIR}/../sys/boot/${TARGET}/loader; \ ${WMAKE} clean cleandepend; \ - ${WMAKE} -DNOMAN -DNOFORTH all install DESTDIR=${RD}/trees/special + ${WMAKE} -DNOMAN -DNOFORTH all; \ + ${WMAKE} -DNOMAN -DNOFORTH install DESTDIR=${RD}/trees/special .endif cp ${RD}/trees/base/etc/disktab /etc rm -rf ${RD}/mfsfd ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#42 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.646 2003/10/20 15:17:44 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.647 2003/10/31 16:58:43 bmah Exp $ 2000 @@ -184,9 +184,15 @@ &merged; The DRM kernel modules have been updated from - DRI CVS as of 9 September 2003. Among other changes, this - import includes a newly-ported SiS 300/305/540/630/730 - driver. + DRI CVS as of 23 October 2003. Among other changes, this + change includes a newly-ported SiS 300/305/540/630/730 + driver and mostly-complete SMPng locking. + + The &man.dcons.4; dumb console driver has + been added to provide a local and remote console. It can be + accessed over Firewire using the &man.dcons.crom.4; driver. A + &man.dconschat.8; utility provides user access to &man.dcons.4; + devices. A multi-byte character set conversion method is now supported by the LIBICONV kernel option. @@ -248,6 +254,11 @@ Floating point emulation in the kernel has been removed. + Problems with some Pentium 4 CPUs and some older + Pentium Pro and Pentium II CPUs have been worked around. + Typically these manifested themselves as memory corruption or + unexplained crashes. + @@ -315,6 +326,13 @@ The xe driver now supports CE2, CEM28, and CEM33 cards, and &man.multicast.4; datagram. Also several bugs in the driver has been fixed. + + A number of network drivers have had their interrupt + handlers marked as MPSAFE, meaning they can run without + the Giant lock. Among the drivers so converted are: + &man.ath.4;, &man.em.4;, &man.ep.4;, &man.fxp.4;, &man.sn.4;, + &man.wi.4;, and &man.sis.4;. + @@ -401,6 +419,12 @@ the Linux BlueZ SDP package, has been added. + + Support for the IPv6 Advanced Sockets API now conforms to + RFC 3542 (also known as RFC 2292bis), rather than RFC 2292. + Applications using this API have been updated + accordingly. + @@ -508,6 +532,10 @@ Source Language (ASL) and ACPI Machine language (AML), has been added. + &man.ifconfig.8; now supports a + option for an interface, which disables the sending of ARP + requests for that interface. + &man.ipfw.8; list and show command now support ranges of rule numbers. &merged; @@ -532,6 +560,9 @@ support working with loadable character set conversion tables in the kernel. + libkse is now the default + threading library on &os;/ia64. + The libthr 1:1 threading library is now built by default. ==== //depot/projects/hammer/rescue/rescue/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.19 2003/09/27 17:27:02 markm Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.20 2003/10/31 19:48:40 brooks Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -128,7 +128,7 @@ .endif .if !defined(NO_IPFILTER) -CRUNCH_PROGS_sbin+= ipf ipfs ipfstat ipmon ipnat +CRUNCH_PROGS_sbin+= ipf ipfs ipmon .endif # crunchgen does not like C++ programs; this should be fixed someday ==== //depot/projects/hammer/sbin/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.127 2003/08/29 10:35:00 phk Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.128 2003/10/31 18:54:46 brooks Exp $ # XXX MISSING: icheck ncheck @@ -87,9 +87,7 @@ .if !defined(NO_IPFILTER) SUBDIR+=ipf \ ipfs \ - ipfstat \ - ipmon \ - ipnat + ipmon .endif .if !defined(NOINET6) ==== //depot/projects/hammer/sbin/ip6fw/ip6fw.c#6 (text+ko) ==== @@ -48,7 +48,7 @@ * NEW command line interface for IP firewall facility * * $Id: ip6fw.c,v 1.1.2.2.2.2 1999/05/14 05:13:50 shin Exp $ - * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.14 2003/10/11 10:37:43 ume Exp $ + * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.15 2003/10/31 18:31:55 brooks Exp $ */ #include @@ -187,15 +187,9 @@ static void print_iface(char *key, union ip6_fw_if *un, int byname) { - char ifnb[IP6FW_IFNLEN+1]; if (byname) { - strncpy(ifnb, un->fu_via_if.name, IP6FW_IFNLEN); - ifnb[IP6FW_IFNLEN]='\0'; - if (un->fu_via_if.unit == -1) - printf(" %s %s*", key, ifnb); - else - printf(" %s %s%d", key, ifnb, un->fu_via_if.unit); + printf(" %s %s", key, un->fu_via_if.name); } else if (!IN6_IS_ADDR_UNSPECIFIED(&un->fu_via_ip6)) { printf(" %s %s", key, inet_ntop(AF_INET6,&un->fu_via_ip6,ntop_buf,sizeof(ntop_buf))); } else @@ -825,13 +819,7 @@ { struct ifreq ifr; - /* - * If a unit was specified, check for that exact interface. - * If a wildcard was specified, check for unit 0. - */ - snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s%d", - ifu->fu_via_if.name, - ifu->fu_via_if.unit == -1 ? 0 : ifu->fu_via_if.unit); + strlcpy(ifr.ifr_name, ifu->fu_via_if.name, sizeof(ifr.ifr_name)); if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) warnx("warning: interface ``%s'' does not exist", ifr.ifr_name); @@ -851,14 +839,17 @@ char *q; *byname = 1; - strncpy(ifu->fu_via_if.name, arg, sizeof(ifu->fu_via_if.name)); - ifu->fu_via_if.name[sizeof(ifu->fu_via_if.name) - 1] = '\0'; - for (q = ifu->fu_via_if.name; - *q && !isdigit(*q) && *q != '*'; q++) - continue; - ifu->fu_via_if.unit = (*q == '*') ? -1 : atoi(q); - *q = '\0'; - verify_interface(ifu); + strlcpy(ifu->fu_via_if.name, arg, sizeof(ifu->fu_via_if.name)); + /* + * We assume that strings containing '*', '?', or '[' + * are ment to be shell pattern. + */ + if (strpbrk(arg, "*?[") != NULL) { + ifu->fu_via_if.glob = 1; + } else { + ifu->fu_via_if.glob = 0; + verify_interface(ifu); + } } else if (inet_pton(AF_INET6, arg, &ifu->fu_via_ip6) != 1) { show_usage("bad ip6 address ``%s''", arg); } else ==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#16 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.41 2003/10/03 21:01:48 sam Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.42 2003/10/31 18:31:55 brooks Exp $ */ #include @@ -1156,11 +1156,7 @@ if (cmdif->name[0] == '\0') printf(" %s %s", s, inet_ntoa(cmdif->p.ip)); - else if (cmdif->p.unit == -1) - printf(" %s %s*", s, cmdif->name); - else - printf(" %s %s%d", s, cmdif->name, - cmdif->p.unit); + printf(" %s %s", s, cmdif->name); } break; @@ -2144,7 +2140,8 @@ * fill the interface structure. We do not check the name as we can * create interfaces dynamically, so checking them at insert time * makes relatively little sense. - * A '*' following the name means any unit. + * Interface names containing '*', '?', or '[' are assumed to be shell + * patterns which match interfaces. */ static void fill_iface(ipfw_insn_if *cmd, char *arg) @@ -2156,15 +2153,8 @@ if (!strcmp(arg, "any")) cmd->o.len = 0; /* effectively ignore this command */ else if (!isdigit(*arg)) { - char *q; - - strncpy(cmd->name, arg, sizeof(cmd->name)); - cmd->name[sizeof(cmd->name) - 1] = '\0'; - /* find first digit or wildcard */ - for (q = cmd->name; *q && !isdigit(*q) && *q != '*'; q++) - continue; - cmd->p.unit = (*q == '*') ? -1 : atoi(q); - *q = '\0'; + strlcpy(cmd->name, arg, sizeof(cmd->name)); + cmd->p.glob = strpbrk(arg, "*?[") != NULL ? 1 : 0; } else if (!inet_aton(arg, &cmd->p.ip)) errx(EX_DATAERR, "bad ip address ``%s''", arg); } ==== //depot/projects/hammer/share/man/man7/hier.7#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.87 2003/09/13 16:23:49 eivind Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.88 2003/10/30 21:25:37 fjoe Exp $ .\" .Dd June 5, 1993 .Dt HIER 7 @@ -362,8 +362,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 31 15:55:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A98416A4D0; Fri, 31 Oct 2003 15:55:16 -0800 (PST) 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 C0E2416A4CE for ; Fri, 31 Oct 2003 15:55:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AF1243FE3 for ; Fri, 31 Oct 2003 15:55:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9VNtEXJ032180 for ; Fri, 31 Oct 2003 15:55:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9VNtDQq032177 for perforce@freebsd.org; Fri, 31 Oct 2003 15:55:13 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 31 Oct 2003 15:55:13 -0800 (PST) Message-Id: <200310312355.h9VNtDQq032177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 41027 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: Fri, 31 Oct 2003 23:55:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=41027 Change 41027 by peter@peter_daintree on 2003/10/31 15:55:10 p4 integ -b smp_hammer -I (indirect integrate) Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#5 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#9 integrate .. //depot/projects/hammer/sys/jhb_notes#7 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#9 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -62,9 +63,9 @@ } ioapics[NIOAPICS]; struct lapic_info { - int la_present:1; - int la_enabled:1; - int la_apic_id:8; + u_int la_present:1; + u_int la_enabled:1; + u_int la_apic_id:8; } lapics[NLAPICS + 1]; static APIC_TABLE *madt; @@ -197,11 +198,6 @@ */ if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) return (ENXIO); - /* XXXTEST */ - printf("rsdp_ptr.Pointer.Logical = %p\n", - (void *)rsdp_ptr.Pointer.Logical); - printf("rsdp_ptr.Pointer.Physical = 0x%jx\n", - (uintmax_t)rsdp_ptr.Pointer.Physical); #ifdef __i386__ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); #endif @@ -218,8 +214,6 @@ * Page 0 is used to map in the headers of candidate ACPI tables. */ if (rsdp->Revision >= 2) { - /* XXXTEST */ - printf("XSDT PA = 0x%jx\n", (uintmax_t)rsdp->XsdtPhysicalAddress); xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); if (xsdt == NULL) { if (bootverbose) @@ -233,8 +227,6 @@ break; madt_unmap_table(xsdt); } else { - /* XXXTEST */ - printf("RSDT PA = 0x%jx\n", (uintmax_t)rsdp->RsdtPhysicalAddress); rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); if (rsdt == NULL) { if (bootverbose) @@ -531,9 +523,9 @@ void *ioapic; u_int pin; - /* XXXTEST */ - printf("MADT: intr override: source %u, irq %u\n", intr->Source, - intr->GlobalSystemInterrupt); + if (bootverbose) + printf("MADT: intr override: source %u, irq %u\n", + intr->Source, intr->GlobalSystemInterrupt); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); if (madt_find_interrupt(intr->GlobalSystemInterrupt, &ioapic, &pin) != 0) { @@ -623,3 +615,36 @@ break; } } + +/* + * Setup per-CPU ACPI IDs. + */ +static void +madt_set_ids(void *dummy) +{ + struct pcpu *pc; + u_int i, j; + + if (madt == NULL) + return; + for (i = 0; i < MAXCPU; i++) { + if (CPU_ABSENT(i)) + continue; + pc = pcpu_find(i); + KASSERT(pc != NULL, ("no pcpu data for CPU %d", i)); + for (j = 0; j < NLAPICS + 1; j++) { + if (!lapics[j].la_present || !lapics[j].la_enabled) + continue; + if (lapics[j].la_apic_id == pc->pc_apic_id) { + pc->pc_acpi_id = j; + if (bootverbose) + printf("APIC: CPU %u has ACPI ID %u\n", + i, j); + break; + } + } + if (pc->pc_acpi_id == -1) + panic("Unable to find ACPI ID for CPU %d", i); + } +} +SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL) ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#10 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include +#include #include "assym.s" ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#10 (text+ko) ==== @@ -85,6 +85,15 @@ * IO APIC has a contiguous chunk of the System Interrupt address space. */ +/* + * Direct the ExtINT pin on the first I/O APIC to a logical cluster of + * CPUs rather than a physical destination of just the BSP. + * + * Note: This is disabled by default as test systems seem to croak with it + * enabled. +#define ENABLE_EXTINT_LOGICAL_DESTINATION + */ + struct ioapic_intsrc { struct intsrc io_intsrc; int io_intpin:8; @@ -207,13 +216,15 @@ ("intpin not assigned to a cluster")); KASSERT(intpin->io_dest != DEST_EXTINT, ("intpin routed via ExtINT")); - /* XXXTEST */ - printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); - if (intpin->io_vector == VECTOR_EXTINT) - printf("ExtINT"); - else - printf("IRQ %u", intpin->io_vector); - printf(") to cluster %u\n", intpin->io_dest); + if (bootverbose) { + printf("ioapic%u: routing intpin %u (", io->io_id, + intpin->io_intpin); + if (intpin->io_vector == VECTOR_EXTINT) + printf("ExtINT"); + else + printf("IRQ %u", intpin->io_vector); + printf(") to cluster %u\n", intpin->io_dest); + } mtx_lock_spin(&icu_lock); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin)); value &= ~IOART_DESTMOD; @@ -316,13 +327,10 @@ struct ioapic *io; struct ioapic_intsrc *intpin; volatile ioapic_t *apic; - uintptr_t poffs; u_int numintr, i; uint32_t value; - poffs = addr - trunc_page(addr); - apic = (ioapic_t *)((char *)pmap_mapdev(addr - poffs, - poffs + IOAPIC_MEM_REGION) + poffs); + apic = (ioapic_t *)pmap_mapdev(addr, IOAPIC_MEM_REGION); mtx_lock_spin(&icu_lock); numintr = ((ioapic_read(apic, IOAPIC_VER) & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT) + 1; @@ -429,9 +437,7 @@ if (io->io_pins[pin].io_vector == VECTOR_DISABLED) return (EINVAL); io->io_pins[pin].io_vector = VECTOR_DISABLED; -#if 0 if (bootverbose) -#endif printf("ioapic%u: intpin %d disabled\n", io->io_id, pin); return (0); } @@ -447,9 +453,7 @@ if (io->io_pins[pin].io_vector < 0) return (EINVAL); io->io_pins[pin].io_vector = vector; -#if 0 if (bootverbose) -#endif printf("ioapic%u: Routing IRQ %d -> intpin %d\n", io->io_id, vector, pin); return (0); @@ -469,9 +473,7 @@ io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; -#if 0 if (bootverbose) -#endif printf("ioapic%u: Routing NMI -> intpin %d\n", io->io_id, pin); return (0); @@ -491,9 +493,7 @@ io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; -#if 0 if (bootverbose) -#endif printf("ioapic%u: Routing SMI -> intpin %d\n", io->io_id, pin); return (0); @@ -513,9 +513,7 @@ io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; -#if 0 if (bootverbose) -#endif printf("ioapic%u: Routing external 8259A's -> intpin %d\n", io->io_id, pin); return (0); @@ -578,7 +576,7 @@ for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) { /* * Finish initializing the pins by programming the vectors - * and delivery mode. XXX this may not be all right yet + * and delivery mode. */ if (pin->io_vector == VECTOR_DISABLED) continue; @@ -623,7 +621,6 @@ */ flags = ioapic_read(apic, IOAPIC_REDTBL_HI(i)); flags &= ~IOART_DEST; - KASSERT(PCPU_GET(apic_id) == lapic_id(), ("APIC ID mismatch")); /* XXXTEST */ flags |= PCPU_GET(apic_id) << APIC_ID_SHIFT; ioapic_write(apic, IOAPIC_REDTBL_HI(i), flags); mtx_unlock_spin(&icu_lock); @@ -654,8 +651,7 @@ STAILQ_FOREACH(io, &ioapic_list, io_next) for (i = 0; i < io->io_numintr; i++) if (io->io_pins[i].io_dest != DEST_NONE && - io->io_pins[i].io_dest != DEST_EXTINT && - io->io_pins[i].io_vector != VECTOR_EXTINT /* XXXTEST */) + io->io_pins[i].io_dest != DEST_EXTINT) ioapic_program_destination(&io->io_pins[i]); } SYSINIT(ioapic_destinations, SI_SUB_SMP, SI_ORDER_SECOND, @@ -685,8 +681,7 @@ extint = &io->io_pins[0]; if (extint->io_vector != VECTOR_EXTINT) panic("Can't find ExtINT pin to route through!"); -#if 0 - /* XXXTEST? */ +#ifdef ENABLE_EXTINT_LOGICAL_DESTINATION if (extint->io_dest == DEST_NONE) ioapic_assign_cluster(extint); #endif ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#13 (text+ko) ==== @@ -266,9 +266,6 @@ lapic->dfr = value; /* Set this APIC's logical ID. */ - /* XXXTEST */ - printf("cpu %d: Programming physical ID %u to cluster %u, ID %u\n", - PCPU_GET(cpuid), lapic_id(), la->la_cluster, la->la_cluster_id); value = lapic->ldr; value &= ~APIC_ID_MASK; value |= (la->la_cluster << APIC_ID_CLUSTER_SHIFT | @@ -342,17 +339,20 @@ if (pin > LVT_MAX) return (EINVAL); - if (apic_id == APIC_ID_ALL) + if (apic_id == APIC_ID_ALL) { lvts[pin].lvt_masked = masked; - else { + if (bootverbose) + printf("lapic:"); + } else { KASSERT(lapics[apic_id].la_present, ("%s: missing APIC %u", __func__, apic_id)); lapics[apic_id].la_lvts[pin].lvt_masked = masked; lapics[apic_id].la_lvts[pin].lvt_active = 1; + if (bootverbose) + printf("lapic%u:", apic_id); } - /* XXXTEST */ - printf("lapic%u: LINT%u %s\n", apic_id, pin, - masked ? "masked" : "unmasked"); + if (bootverbose) + printf(" LINT%u %s\n", pin, masked ? "masked" : "unmasked"); return (0); } @@ -363,14 +363,17 @@ if (pin > LVT_MAX) return (EINVAL); - if (apic_id == APIC_ID_ALL) + if (apic_id == APIC_ID_ALL) { lvt = &lvts[pin]; - else { + if (bootverbose) + printf("lapic:"); + } else { KASSERT(lapics[apic_id].la_present, ("%s: missing APIC %u", __func__, apic_id)); lvt = &lapics[apic_id].la_lvts[pin]; lvt->lvt_active = 1; - + if (bootverbose) + printf("lapic%u:", apic_id); } lvt->lvt_mode = mode; switch (mode) { @@ -388,23 +391,24 @@ default: panic("Unsupported delivery mode: 0x%x\n", mode); } - /* XXXTEST */ - printf("lapic%u: Routing ", apic_id); - switch (mode) { - case APIC_LVT_DM_NMI: - printf("NMI"); - break; - case APIC_LVT_DM_SMI: - printf("SMI"); - break; - case APIC_LVT_DM_INIT: - printf("INIT"); - break; - case APIC_LVT_DM_EXTINT: - printf("ExtINT"); - break; + if (bootverbose) { + printf(" Routing "); + switch (mode) { + case APIC_LVT_DM_NMI: + printf("NMI"); + break; + case APIC_LVT_DM_SMI: + printf("SMI"); + break; + case APIC_LVT_DM_INIT: + printf("INIT"); + break; + case APIC_LVT_DM_EXTINT: + printf("ExtINT"); + break; + } + printf(" -> LINT%u\n", pin); } - printf(" -> LINT%u\n", pin); return (0); } @@ -414,17 +418,21 @@ if (pin > LVT_MAX) return (EINVAL); - if (apic_id == APIC_ID_ALL) + if (apic_id == APIC_ID_ALL) { lvts[pin].lvt_activehi = activehi; - else { + if (bootverbose) + printf("lapic:"); + } else { KASSERT(lapics[apic_id].la_present, ("%s: missing APIC %u", __func__, apic_id)); lapics[apic_id].la_lvts[pin].lvt_active = 1; lapics[apic_id].la_lvts[pin].lvt_activehi = activehi; + if (bootverbose) + printf("lapic%u:", apic_id); } - /* XXXTEST */ - printf("lapic%u: LINT%u polarity: active-%s\n", apic_id, pin, - activehi ? "hi" : "lo"); + if (bootverbose) + printf(" LINT%u polarity: active-%s\n", pin, + activehi ? "hi" : "lo"); return (0); } @@ -434,17 +442,21 @@ if (pin > LVT_MAX) return (EINVAL); - if (apic_id == APIC_ID_ALL) + if (apic_id == APIC_ID_ALL) { lvts[pin].lvt_edgetrigger = edgetrigger; - else { + if (bootverbose) + printf("lapic:"); + } else { KASSERT(lapics[apic_id].la_present, ("%s: missing APIC %u", __func__, apic_id)); lapics[apic_id].la_lvts[pin].lvt_edgetrigger = edgetrigger; lapics[apic_id].la_lvts[pin].lvt_active = 1; + if (bootverbose) + printf("lapic%u:", apic_id); } - /* XXXTEST */ - printf("lapic%u: LINT%u trigger: %s\n", apic_id, pin, - edgetrigger ? "edge" : "level"); + if (bootverbose) + printf(" LINT%u trigger: %s\n", pin, + edgetrigger ? "edge" : "level"); return (0); } @@ -538,16 +550,12 @@ } } if (best_enum == NULL) { -#if 0 if (bootverbose) -#endif printf("APIC: Could not find any APICs.\n"); return; } -#if 0 if (bootverbose) -#endif printf("APIC: Using the %s enumerator.\n", best_enum->apic_name); @@ -597,9 +605,7 @@ * properly program the LINT pins. */ lapic_setup(); -#if 0 if (bootverbose) -#endif lapic_dump("BSP"); } SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL) ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#19 (text+ko) ==== @@ -268,7 +268,6 @@ mtx_init(&smp_tlb_mtx, "tlb", NULL, MTX_SPIN); /* Set boot_cpu_id if needed. */ - KASSERT(PCPU_GET(apic_id) == lapic_id(), ("APIC ID mismatch")); /* XXXTEST */ if (boot_cpu_id == -1) { boot_cpu_id = PCPU_GET(apic_id); cpu_info[boot_cpu_id].cpu_bsp = 1; @@ -445,9 +444,9 @@ cluster_id = 0; } else cluster_id++; - /* XXXTEST */ - printf("APIC ID: physical %u, logical %u:%u\n", apic_id, - cluster, cluster_id); + if (bootverbose) + printf("APIC ID: physical %u, logical %u:%u\n", + apic_id, cluster, cluster_id); lapic_set_logical_id(apic_id, cluster, cluster_id); } } ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#5 (text+ko) ==== @@ -267,9 +267,7 @@ mpct->signature[2], mpct->signature[3]); return (ENXIO); } -#if 0 if (bootverbose) -#endif printf( "MP Configuration Table version 1.%d found at %p\n", mpct->spec_rev, mpct); @@ -820,9 +818,7 @@ while ((id = ffs(id_mask)) != 0) { id--; for (i = id + 1; i < id + logical_cpus; i++) { -#if 0 if (bootverbose) -#endif printf( "MPTable: Adding logical CPU %d from main CPU %d\n", i, id); ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#9 (text+ko) ==== @@ -33,6 +33,7 @@ * PIC driver for the 8259A Master and Slave PICs in PC/AT machines. */ +#include "opt_auto_eoi.h" #include "opt_isa.h" #include @@ -300,10 +301,6 @@ intr_execute_handlers(isrc, &iframe); } -/* - * Older stuff that is not cleaned up yet. - */ - #ifdef DEV_ISA /* * Return a bitmap of the current interrupt requests. This is 8259-specific ==== //depot/projects/hammer/sys/jhb_notes#7 (text+ko) ==== @@ -49,6 +49,8 @@ + Fix bogus SMP probe when only 1 CPU - Kill isa_irq_pending() (maybe, is this an MI function?) + Add ACPI MADT APIC enumerator. + - Use APIC ID's for index in lapics[] array instead of ACPI IDs, ACPI + IDs are not guaranteed to be non-sparse + solve ACPI module problem where madt wants APIC symbols :( (this is gross) - doesn't work when loaded as a module @@ -66,6 +68,7 @@ NO_MIXED_MODE + Add NO_MIXED_MODE option - Add runtime decision for IRQ0 mixed mode? + - Don't use mixed mode with MADT? + SMP bogons + doesn't work on 750x + pmap_lazyfix unhappy with old-style critical sections @@ -73,7 +76,6 @@ - Perhaps change the IRQ resource manager such that it starts out empty and a resource entry for each IRQ is added as each IRQ is registered - Clean up includes in new files. -- Check #ifdef's in new files and look for #if 0 in new code - Add handling of local APIC ERROR lvt. - Use the local apic timer to drive hard/stat/profclock (maybe too hard) - Do we need to be able to renumber I/O APICs? @@ -84,9 +86,12 @@ it was a BIOS bug. May have to bump NAPICID to 256 though. - Flesh out cpu topology map - Suspend/resume support for I/O APICs -- check XXX and XXXTEST in new code - reimplement lazy masking of interrupts for critical sections w/o bitmasks?? - Enhance acpi_cpu(4) driver to grok SMP at all? + - njl doing this + - add per-CPU ACPI IDs + + works for SMP + - doesn't get set for UP case - Rip out CPU halting stuff perhaps and maybe disable MPTable HTT fixup? - Support bus_config_intr()? - nexus would have to call intr_config_source() From owner-p4-projects@FreeBSD.ORG Fri Oct 31 17:37:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4E6916A4D0; Fri, 31 Oct 2003 17:37:23 -0800 (PST) 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 9EA3616A4CE for ; Fri, 31 Oct 2003 17:37:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 205F443FDD for ; Fri, 31 Oct 2003 17:37:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA11bMXJ046428 for ; Fri, 31 Oct 2003 17:37:22 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA11bMDC046425 for perforce@freebsd.org; Fri, 31 Oct 2003 17:37:22 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 31 Oct 2003 17:37:22 -0800 (PST) Message-Id: <200311010137.hA11bMDC046425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 41035 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: Sat, 01 Nov 2003 01:37:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=41035 Change 41035 by sam@sam_ebb on 2003/10/31 17:37:19 o replace calculate checksum by a static HAL ABI version o print HAL version when !bootverbose (otherwise it's printed by the ath_hal module) Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#31 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#31 (text+ko) ==== @@ -174,33 +174,6 @@ #define DPRINTF2(X) #endif -/* - * Calculate a "checksum" that the driver can use to - * check for ABI compatibility. We just sum the offsets - * of all the function pointers which are assumed to - * start with ah_getRateTable and continue sequentially - * to the end of the structure. If a new method is added - * or moved this will be detected. This will not, however - * catch methods being moved around or some number added - * while an equal number are replaced, or arguments being - * changed, or lots of other things. - * - * This is stopgap. Improvements are welcome. - */ -static u_int32_t -ath_calcsum(void) -{ - u_int32_t sum = 0; - u_int32_t off; - - off = offsetof(struct ath_hal, ah_getRateTable); - while (off < sizeof(struct ath_hal)) { - sum += off; - off += sizeof(void (*)(void)); - } - return sum; -} - int ath_attach(u_int16_t devid, struct ath_softc *sc) { @@ -223,9 +196,17 @@ error = ENXIO; goto bad; } - if (ah->ah_checksum != ath_calcsum()) { - if_printf(ifp, "HAL ABI mismatch detected (%u != %u)\n", - ah->ah_checksum, ath_calcsum()); + if (!bootverbose) { + /* + * The ath_hal module prints the version string + * with bootverbose so only do it here for the + * other case. + */ + if_printf(ifp, "hal %s\n", ath_hal_version); + } + if (ah->ah_abi != HAL_ABI_VERSION) { + if_printf(ifp, "HAL ABI mismatch detected (0x%x != 0x%x)\n", + ah->ah_abi, HAL_ABI_VERSION); error = ENXIO; goto bad; } From owner-p4-projects@FreeBSD.ORG Sat Nov 1 12:41:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 821F916A4D0; Sat, 1 Nov 2003 12:41:59 -0800 (PST) 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 5D10816A4CE for ; Sat, 1 Nov 2003 12:41:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C36A243FAF for ; Sat, 1 Nov 2003 12:41:58 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA1KfwXJ074948 for ; Sat, 1 Nov 2003 12:41:58 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA1KfwWq074945 for perforce@freebsd.org; Sat, 1 Nov 2003 12:41:58 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 1 Nov 2003 12:41:58 -0800 (PST) Message-Id: <200311012041.hA1KfwWq074945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 41073 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: Sat, 01 Nov 2003 20:41:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=41073 Change 41073 by jmallett@jmallett_dalek on 2003/11/01 12:41:55 Mark qdivrem nowerror. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#20 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#20 (text+ko) ==== @@ -54,7 +54,7 @@ libkern/divdi3.c standard libkern/ffs.c standard libkern/moddi3.c standard -libkern/qdivrem.c standard +libkern/qdivrem.c standard nowerror libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard From owner-p4-projects@FreeBSD.ORG Sat Nov 1 12:45:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6939516A4D0; Sat, 1 Nov 2003 12:45:13 -0800 (PST) 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 42D4D16A4CE for ; Sat, 1 Nov 2003 12:45:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2272843F75 for ; Sat, 1 Nov 2003 12:45:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA1KjCXJ075241 for ; Sat, 1 Nov 2003 12:45:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA1KjBF8075238 for perforce@freebsd.org; Sat, 1 Nov 2003 12:45:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 1 Nov 2003 12:45:11 -0800 (PST) Message-Id: <200311012045.hA1KjBF8075238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 41076 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: Sat, 01 Nov 2003 20:45:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=41076 Change 41076 by jmallett@jmallett_dalek on 2003/11/01 12:44:05 Clean up warnings. Hackish in some places, a big improvement in others. Affected files ... .. //depot/projects/mips/sys/dev/arcbios/arcbios.c#9 edit .. //depot/projects/mips/sys/mips/include/asm.h#11 edit .. //depot/projects/mips/sys/mips/include/db_machdep.h#7 edit .. //depot/projects/mips/sys/mips/include/pmap.h#11 edit .. //depot/projects/mips/sys/mips/include/pte.h#11 edit .. //depot/projects/mips/sys/mips/include/tlb.h#2 edit .. //depot/projects/mips/sys/mips/mips/cache.c#5 edit .. //depot/projects/mips/sys/mips/mips/cache_r5k.c#4 edit .. //depot/projects/mips/sys/mips/mips/db_disasm.c#2 edit .. //depot/projects/mips/sys/mips/mips/db_interface.c#7 edit .. //depot/projects/mips/sys/mips/mips/db_trace.c#4 edit .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#13 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#34 edit .. //depot/projects/mips/sys/mips/mips/mips_subr.S#14 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#18 edit .. //depot/projects/mips/sys/mips/mips/syscall.c#2 edit .. //depot/projects/mips/sys/mips/mips/tlb.c#5 edit .. //depot/projects/mips/sys/mips/mips/trap.c#9 edit .. //depot/projects/mips/sys/mips/sgimips/ip22.c#5 edit .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#20 edit Differences ... ==== //depot/projects/mips/sys/dev/arcbios/arcbios.c#9 (text+ko) ==== @@ -139,7 +139,7 @@ static void arcbios_fill_vector(struct arcbios *A, const struct arcbios_fv *V) { -#define ARCSET(Func) A->Func = (void (*)(void))(int) V->Func +#define ARCSET(Func) A->Func = (void *)(intptr_t)(int) V->Func ARCSET(Load); ARCSET(Invoke); ARCSET(Execute); @@ -230,7 +230,7 @@ dstsize--; if (dstsize > node->IdentifierLength) dstsize = node->IdentifierLength; - memcpy(dst, MIPS_PHYS_TO_KSEG1(node->Identifier), dstsize); + memcpy(dst, (void *)MIPS_PHYS_TO_KSEG1(node->Identifier), dstsize); dst[dstsize] = '\0'; } @@ -245,7 +245,7 @@ arcbios_consdev.cn_dev = makedev(MAJOR_AUTO, 0); make_dev(&arcbios_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "arccons"); cnadd(&arcbios_consdev); - return (0); + return; } int ==== //depot/projects/mips/sys/mips/include/asm.h#11 (text+ko) ==== ==== //depot/projects/mips/sys/mips/include/db_machdep.h#7 (text+ko) ==== @@ -83,6 +83,7 @@ void kdb_kbd_trap(db_regs_t *); void db_set_ddb_regs(int type, struct trapframe *); int kdb_trap(int type, struct trapframe *); +int kdbpeek(db_addr_t); #define DB_SMALL_VALUE_MAX (0x7fffffff) #define DB_SMALL_VALUE_MIN (-0x40001) ==== //depot/projects/mips/sys/mips/include/pmap.h#11 (text+ko) ==== @@ -79,6 +79,8 @@ void pmap_bootstrap(void); vm_offset_t pmap_kextract(vm_offset_t); vm_offset_t pmap_steal_memory(vm_size_t); +void *pmap_mapdev(vm_offset_t, vm_size_t); +void pmap_unmapdev(vm_offset_t, vm_size_t); #define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) #define vtophys(va) pmap_kextract((vm_offset_t)(va)) ==== //depot/projects/mips/sys/mips/include/pte.h#11 (text+ko) ==== @@ -67,12 +67,22 @@ * bit 12 to bit 8 there is a 5-bit 0 field. Low byte is ASID. */ #define MIPS_HI_R_SHIFT 62 +#ifdef LOCORE #define MIPS_HI_R_USER (0x00 << MIPS_HI_R_SHIFT) #define MIPS_HI_R_SUPERVISOR (0x01 << MIPS_HI_R_SHIFT) #define MIPS_HI_R_KERNEL (0x11 << MIPS_HI_R_SHIFT) +#else +#define MIPS_HI_R_USER (0x00UL << MIPS_HI_R_SHIFT) +#define MIPS_HI_R_SUPERVISOR (0x01UL << MIPS_HI_R_SHIFT) +#define MIPS_HI_R_KERNEL (0x11UL << MIPS_HI_R_SHIFT) +#endif #define MIPS_HI_FILL_SHIFT 40 #define MIPS_HI_VPN2_SHIFT 13 +#ifdef LOCORE #define MIPS_HI_VPN2_BMASK 0xFFFFFFE +#else +#define MIPS_HI_VPN2_BMASK 0xFFFFFFEUL +#endif #define MIPS_HI_VPN2_MASK (MIPS_HI_VPN2_BMASK << MIPS_HI_VPN2_SHIFT) #define MIPS_HI_VA_TO_VPN2(va) ((va) & MIPS_HI_VPN2_MASK) ==== //depot/projects/mips/sys/mips/include/tlb.h#2 (text+ko) ==== @@ -21,6 +21,7 @@ void tlb_bootstrap(vm_size_t, vm_offset_t (*)(vm_size_t)); void tlb_enter(pmap_t, vm_offset_t, vm_paddr_t, pt_entry_t); void tlb_invalidate_page(vm_offset_t); +void tlb_modified(void *); void tlb_remove(pmap_t, vm_offset_t); void tlb_remove_pages(pmap_t, vm_offset_t, int); void tlb_remove_range(pmap_t, vm_offset_t, vm_offset_t); ==== //depot/projects/mips/sys/mips/mips/cache.c#5 (text+ko) ==== @@ -727,9 +727,9 @@ break; #ifdef MIPS_DISABLE_L1_CACHE case 0: - mips_cache_ops.mco_icache_sync_all = (void *)cache_noop; - mips_cache_ops.mco_icache_sync_range = (void *)cache_noop; - mips_cache_ops.mco_icache_sync_range_index = (void *)cache_noop; + mips_cache_ops.mco_icache_sync_all = (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_icache_sync_range = (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_icache_sync_range_index = (void *)(uintptr_t)cache_noop; break; #endif default: @@ -770,17 +770,17 @@ break; #ifdef MIPS_DISABLE_L1_CACHE case 0: - mips_cache_ops.mco_pdcache_wbinv_all = (void *)cache_noop; + mips_cache_ops.mco_pdcache_wbinv_all = (void *)(uintptr_t)cache_noop; mips_cache_ops.mco_intern_pdcache_wbinv_all = - (void *)cache_noop; - mips_cache_ops.mco_pdcache_wbinv_range = (void *)cache_noop; + (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range = (void *)(uintptr_t)cache_noop; mips_cache_ops.mco_pdcache_wbinv_range_index = - (void *)cache_noop; + (void *)(uintptr_t)cache_noop; mips_cache_ops.mco_intern_pdcache_wbinv_range_index = - (void *)cache_noop; - mips_cache_ops.mco_pdcache_inv_range = (void *)cache_noop; - mips_cache_ops.mco_pdcache_wb_range = (void *)cache_noop; - mips_cache_ops.mco_intern_pdcache_wb_range = (void *)cache_noop; + (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_pdcache_inv_range = (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_pdcache_wb_range = (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_intern_pdcache_wb_range = (void *)(uintptr_t)cache_noop; break; #endif default: @@ -795,22 +795,22 @@ #ifdef CACHE_DEBUG printf(" Dcache is coherent\n"); #endif - mips_cache_ops.mco_pdcache_wbinv_all = (void *)cache_noop; - mips_cache_ops.mco_pdcache_wbinv_range = (void *)cache_noop; + mips_cache_ops.mco_pdcache_wbinv_all = (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_pdcache_wbinv_range = (void *)(uintptr_t)cache_noop; mips_cache_ops.mco_pdcache_wbinv_range_index = - (void *)cache_noop; - mips_cache_ops.mco_pdcache_inv_range = (void *)cache_noop; - mips_cache_ops.mco_pdcache_wb_range = (void *)cache_noop; + (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_pdcache_inv_range = (void *)(uintptr_t)cache_noop; + mips_cache_ops.mco_pdcache_wb_range = (void *)(uintptr_t)cache_noop; } if (mips_cpu_flags & CPU_MIPS_I_D_CACHE_COHERENT) { #ifdef CACHE_DEBUG printf(" Icache is coherent against Dcache\n"); #endif mips_cache_ops.mco_intern_pdcache_wbinv_all = - (void *)cache_noop; + (void *)(uintptr_t)cache_noop; mips_cache_ops.mco_intern_pdcache_wbinv_range_index = - (void *)cache_noop; + (void *)(uintptr_t)cache_noop; mips_cache_ops.mco_intern_pdcache_wb_range = - (void *)cache_noop; + (void *)(uintptr_t)cache_noop; } } ==== //depot/projects/mips/sys/mips/mips/cache_r5k.c#4 (text+ko) ==== @@ -618,9 +618,6 @@ r5k_sdcache_wbinv_all(); } -#define round_page(x) (((x) + (128 * 32 - 1)) & ~(128 * 32 - 1)) -#define trunc_page(x) ((x) & ~(128 * 32 - 1)) - void r5k_sdcache_wbinv_range(vm_paddr_t va, vm_size_t size) { ==== //depot/projects/mips/sys/mips/mips/db_disasm.c#2 (text+ko) ==== @@ -498,8 +498,8 @@ print_addr(db_addr_t loc) { db_expr_t diff; - db_sym_t sym; - char *symname; + c_db_sym_t sym; + const char *symname; diff = INT_MAX; symname = NULL; ==== //depot/projects/mips/sys/mips/mips/db_interface.c#7 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -179,13 +180,6 @@ } void -cpu_Debugger(void) -{ - - __asm("break"); -} - -void db_set_ddb_regs(int type, struct trapframe *tfp) { struct frame *f = (struct frame *)&ddb_regs; @@ -292,12 +286,12 @@ db_printf("TLB%c%2d Hi 0x%016lx ", (tlb.tlb_lo0 | tlb.tlb_lo1) & PG_V ? ' ' : '*', i, tlb.tlb_hi); - db_printf("Lo0=0x%016lx %c%c attr %x ", + db_printf("Lo0=0x%016lx %c%c attr %lx ", MIPS_PFN_TO_PA(tlb.tlb_lo0), (tlb.tlb_lo0 & PG_D) ? 'D' : ' ', (tlb.tlb_lo0 & PG_G) ? 'G' : ' ', (tlb.tlb_lo0 >> 3) & 7); - db_printf("Lo1=0x%016lx %c%c attr %x sz=%x\n", + db_printf("Lo1=0x%016lx %c%c attr %lx sz=%x\n", MIPS_PFN_TO_PA(tlb.tlb_lo1), (tlb.tlb_lo1 & PG_D) ? 'D' : ' ', (tlb.tlb_lo1 & PG_G) ? 'G' : ' ', @@ -332,7 +326,7 @@ \ __asm __volatile("mfc0 %0,$" __STRING(reg) : "=r"(__val)); \ printf(" %s:%*s %#x\n", name, FLDWIDTH - (int) strlen(name), \ - "", __val); \ + "", (u_int)__val); \ } while (0) /* XXX not 64-bit ABI safe! */ @@ -341,8 +335,8 @@ uint64_t __val; \ \ __asm __volatile("dmfc0 %0,$" __STRING(reg):"=r"(__val)); \ - printf(" %s:%*s %#llx\n", name, FLDWIDTH - (int) strlen(name), \ - "", __val); \ + printf(" %s:%*s %#lx\n", name, FLDWIDTH - (int) strlen(name), \ + "", (u_long)__val); \ } while (0) DB_COMMAND(cp0, db_cp0dump_cmd) ==== //depot/projects/mips/sys/mips/mips/db_trace.c#4 (text+ko) ==== @@ -70,50 +70,51 @@ void db_mips_stack_trace(int, vm_offset_t, vm_offset_t, vm_offset_t, int, vm_offset_t); int db_mips_variable_func(const struct db_variable *, db_expr_t *, int); -#define DB_SETF_REGS db_mips_variable_func #define DBREGS_REG() struct db_variable db_regs[] = { - { "at", (long *)&ddb_regs.f_regs[AST], DB_SETF_REGS }, - { "v0", (long *)&ddb_regs.f_regs[V0], DB_SETF_REGS }, - { "v1", (long *)&ddb_regs.f_regs[V1], DB_SETF_REGS }, - { "a0", (long *)&ddb_regs.f_regs[A0], DB_SETF_REGS }, - { "a1", (long *)&ddb_regs.f_regs[A1], DB_SETF_REGS }, - { "a2", (long *)&ddb_regs.f_regs[A2], DB_SETF_REGS }, - { "a3", (long *)&ddb_regs.f_regs[A3], DB_SETF_REGS }, - { "a4", (long *)&ddb_regs.f_regs[A4], DB_SETF_REGS }, - { "a5", (long *)&ddb_regs.f_regs[A5], DB_SETF_REGS }, - { "a6", (long *)&ddb_regs.f_regs[A6], DB_SETF_REGS }, - { "a7", (long *)&ddb_regs.f_regs[A7], DB_SETF_REGS }, - { "t0", (long *)&ddb_regs.f_regs[T0], DB_SETF_REGS }, - { "t1", (long *)&ddb_regs.f_regs[T1], DB_SETF_REGS }, - { "t2", (long *)&ddb_regs.f_regs[T2], DB_SETF_REGS }, - { "t3", (long *)&ddb_regs.f_regs[T3], DB_SETF_REGS }, - { "s0", (long *)&ddb_regs.f_regs[S0], DB_SETF_REGS }, - { "s1", (long *)&ddb_regs.f_regs[S1], DB_SETF_REGS }, - { "s2", (long *)&ddb_regs.f_regs[S2], DB_SETF_REGS }, - { "s3", (long *)&ddb_regs.f_regs[S3], DB_SETF_REGS }, - { "s4", (long *)&ddb_regs.f_regs[S4], DB_SETF_REGS }, - { "s5", (long *)&ddb_regs.f_regs[S5], DB_SETF_REGS }, - { "s6", (long *)&ddb_regs.f_regs[S6], DB_SETF_REGS }, - { "s7", (long *)&ddb_regs.f_regs[S7], DB_SETF_REGS }, - { "t8", (long *)&ddb_regs.f_regs[T8], DB_SETF_REGS }, - { "t9", (long *)&ddb_regs.f_regs[T9], DB_SETF_REGS }, - { "k0", (long *)&ddb_regs.f_regs[K0], DB_SETF_REGS }, - { "k1", (long *)&ddb_regs.f_regs[K1], DB_SETF_REGS }, - { "gp", (long *)&ddb_regs.f_regs[GP], DB_SETF_REGS }, - { "sp", (long *)&ddb_regs.f_regs[SP], DB_SETF_REGS }, - { "fp", (long *)&ddb_regs.f_regs[S8], DB_SETF_REGS }, /* frame ptr */ - { "ra", (long *)&ddb_regs.f_regs[RA], DB_SETF_REGS }, - { "sr", (long *)&ddb_regs.f_regs[SR], DB_SETF_REGS }, - { "mdlo",(long *)&ddb_regs.f_regs[MULLO], DB_SETF_REGS }, - { "mdhi",(long *)&ddb_regs.f_regs[MULHI], DB_SETF_REGS }, - { "bad", (long *)&ddb_regs.f_regs[BADVADDR], DB_SETF_REGS }, - { "cs", (long *)&ddb_regs.f_regs[CAUSE], DB_SETF_REGS }, - { "pc", (long *)&ddb_regs.f_regs[PC], DB_SETF_REGS }, + { "at", (db_expr_t *)&ddb_regs.f_regs[AST], FCN_NULL }, + { "v0", (db_expr_t *)&ddb_regs.f_regs[V0], FCN_NULL }, + { "v1", (db_expr_t *)&ddb_regs.f_regs[V1], FCN_NULL }, + { "a0", (db_expr_t *)&ddb_regs.f_regs[A0], FCN_NULL }, + { "a1", (db_expr_t *)&ddb_regs.f_regs[A1], FCN_NULL }, + { "a2", (db_expr_t *)&ddb_regs.f_regs[A2], FCN_NULL }, + { "a3", (db_expr_t *)&ddb_regs.f_regs[A3], FCN_NULL }, + { "a4", (db_expr_t *)&ddb_regs.f_regs[A4], FCN_NULL }, + { "a5", (db_expr_t *)&ddb_regs.f_regs[A5], FCN_NULL }, + { "a6", (db_expr_t *)&ddb_regs.f_regs[A6], FCN_NULL }, + { "a7", (db_expr_t *)&ddb_regs.f_regs[A7], FCN_NULL }, + { "t0", (db_expr_t *)&ddb_regs.f_regs[T0], FCN_NULL }, + { "t1", (db_expr_t *)&ddb_regs.f_regs[T1], FCN_NULL }, + { "t2", (db_expr_t *)&ddb_regs.f_regs[T2], FCN_NULL }, + { "t3", (db_expr_t *)&ddb_regs.f_regs[T3], FCN_NULL }, + { "s0", (db_expr_t *)&ddb_regs.f_regs[S0], FCN_NULL }, + { "s1", (db_expr_t *)&ddb_regs.f_regs[S1], FCN_NULL }, + { "s2", (db_expr_t *)&ddb_regs.f_regs[S2], FCN_NULL }, + { "s3", (db_expr_t *)&ddb_regs.f_regs[S3], FCN_NULL }, + { "s4", (db_expr_t *)&ddb_regs.f_regs[S4], FCN_NULL }, + { "s5", (db_expr_t *)&ddb_regs.f_regs[S5], FCN_NULL }, + { "s6", (db_expr_t *)&ddb_regs.f_regs[S6], FCN_NULL }, + { "s7", (db_expr_t *)&ddb_regs.f_regs[S7], FCN_NULL }, + { "t8", (db_expr_t *)&ddb_regs.f_regs[T8], FCN_NULL }, + { "t9", (db_expr_t *)&ddb_regs.f_regs[T9], FCN_NULL }, + { "k0", (db_expr_t *)&ddb_regs.f_regs[K0], FCN_NULL }, + { "k1", (db_expr_t *)&ddb_regs.f_regs[K1], FCN_NULL }, + { "gp", (db_expr_t *)&ddb_regs.f_regs[GP], FCN_NULL }, + { "sp", (db_expr_t *)&ddb_regs.f_regs[SP], FCN_NULL }, + { "fp", (db_expr_t *)&ddb_regs.f_regs[S8], FCN_NULL }, /* frame ptr */ + { "ra", (db_expr_t *)&ddb_regs.f_regs[RA], FCN_NULL }, + { "sr", (db_expr_t *)&ddb_regs.f_regs[SR], FCN_NULL }, + { "mdlo",(db_expr_t *)&ddb_regs.f_regs[MULLO], FCN_NULL }, + { "mdhi",(db_expr_t *)&ddb_regs.f_regs[MULHI], FCN_NULL }, + { "bad", (db_expr_t *)&ddb_regs.f_regs[BADVADDR], FCN_NULL }, + { "cs", (db_expr_t *)&ddb_regs.f_regs[CAUSE], FCN_NULL }, + { "pc", (db_expr_t *)&ddb_regs.f_regs[PC], FCN_NULL }, }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); +extern char btext[]; + void db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif) @@ -129,8 +130,7 @@ InstFmt i; int stacksize; db_addr_t offset; - char *name; - extern char btext[]; + const char *name; pc = ddb_regs.f_regs[PC]; sp = ddb_regs.f_regs[SP]; @@ -166,8 +166,8 @@ db_find_sym_and_offset(func, &name, &offset); if (name == 0) name = "?"; - db_printf("%s()+0x%x, called by %p, stack size %d\n", - name, pc - func, (void *)ra, stacksize); + db_printf("%s()+0x%lx, called by %p, stack size %d\n", + name, (u_long)(pc - func), (void *)ra, stacksize); if (ra == pc) { db_printf("-- loop? --\n"); @@ -175,7 +175,7 @@ } sp += stacksize; pc = ra; - } while (pc > btext); + } while (pc > (register_t)btext); if (pc < 0x80000000) db_printf("-- user process --\n"); else @@ -191,22 +191,6 @@ } -int -db_mips_variable_func (const struct db_variable *vp, db_expr_t *valuep, - int db_var_fcn) -{ - - switch (db_var_fcn) { - case DB_VAR_GET: - *valuep = *(register_t *) vp->valuep; - break; - case DB_VAR_SET: - *(register_t *) vp->valuep = *valuep; - break; - } - return 0; -} - void db_print_backtrace(void) { ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#13 (text+ko) ==== @@ -89,8 +89,6 @@ #include "opt_ddb.h" -#include - #include #include #include ==== //depot/projects/mips/sys/mips/mips/machdep.c#34 (text+ko) ==== @@ -150,6 +150,8 @@ #include #include #include +#include +#include #include #include #include @@ -157,7 +159,9 @@ #include #include +#include #include +#include #include #include @@ -165,10 +169,15 @@ #include #include #include +#include #include #include #include +#ifdef DDB +#include +#endif + int cpu_arch; int mips_cpu_flags; int mips_has_r4k_mmu; @@ -192,11 +201,11 @@ vm_size_t physsz; +static void mips_vector_init(void); static void cpu_identify(void); void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); - void mips_init(void) { @@ -572,19 +581,19 @@ memcpy((void *)addr, begin, len); } +/* r4000 exception handler address and end */ +extern char ExceptionVector[], ExceptionVectorEnd[]; + +/* TLB miss handler address and end */ +extern char TLBMissVector[], TLBMissVectorEnd[]; +extern char XTLBMissVector[], XTLBMissVectorEnd[]; + +/* Cache error handler */ +extern char CacheVector[], CacheVectorEnd[]; + static void mips64_vector_init(void) { - /* r4000 exception handler address and end */ - extern char ExceptionVector[], ExceptionVectorEnd[]; - - /* TLB miss handler address and end */ - extern char TLBMissVector[], TLBMissVectorEnd[]; - extern char XTLBMissVector[], XTLBMissVectorEnd[]; - - /* Cache error handler */ - extern char CacheVector[], CacheVectorEnd[]; - /* * Copy down exception vector code. */ @@ -628,7 +637,7 @@ * call locore cache and TLB management functions, based on the kind * of CPU the kernel is running on. */ -void +static void mips_vector_init(void) { const struct pridtab *ct; ==== //depot/projects/mips/sys/mips/mips/mips_subr.S#14 (text+ko) ==== @@ -121,8 +121,6 @@ */ #include "opt_ddb.h" -#include - #include #include #include ==== //depot/projects/mips/sys/mips/mips/pmap.c#18 (text+ko) ==== @@ -197,6 +197,9 @@ struct msgbuf *msgbufp; +PMAP_INLINE void pmap_kenter(vm_offset_t, vm_offset_t); +PMAP_INLINE void pmap_kremove(vm_offset_t); + /* * Data for the ASID allocator */ @@ -584,12 +587,13 @@ pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) { vm_offset_t va; + int i; + i = 0; va = sva; while (count-- > 0) { - pmap_kenter(va, *m); + pmap_kenter(va, (vm_offset_t)m[i]); va += PAGE_SIZE; - m++; } } @@ -1786,57 +1790,6 @@ } /* - * pmap_emulate_reference: - * - * Emulate reference and/or modified bit hits. - * From NetBSD - */ -void -pmap_emulate_reference(struct vmspace *vm, vm_offset_t v, int user, int write) -{ - pt_entry_t faultoff, *pte; - vm_offset_t pa; - int user_addr; - - /* - * Convert process and virtual address to physical address. - */ - if (v >= VM_MIN_KERNEL_ADDRESS) { - if (user) - panic("pmap_emulate_reference: user ref to kernel"); - pte = pmap_pte(kernel_pmap, v); - user_addr = 0; - } else { - KASSERT(vm != NULL, ("pmap_emulate_reference: bad vmspace")); - pte = pmap_pte(vm->vm_map.pmap, v); - user_addr = 1; - } -#ifdef DEBUG /* These checks are more expensive */ - if (!pmap_pte_v(pte)) - panic("pmap_emulate_reference: invalid pte"); - /* Other diagnostics? */ -#endif - pa = pmap_pte_pa(pte); - - /* - * Twiddle the appropriate bits to reflect the reference - * and/or modification.. - * - * The rules: - * (1) always mark page as used, and - * (2) if it was a write fault, mark page as modified. - */ - if (write) { - faultoff = PG_D | PG_RO; - } else { - faultoff = PG_D; - } - - *pte = (*pte & ~faultoff); - MIPS_TBIS(v); -} - -/* * Miscellaneous support routines follow */ @@ -1850,17 +1803,13 @@ * uncached space. */ void * -pmap_mapdev(pa, size) - vm_offset_t pa; - vm_size_t size; +pmap_mapdev(vm_offset_t pa, vm_size_t size) { return (void*) MIPS_PHYS_TO_KSEG1(pa); } void -pmap_unmapdev(va, size) - vm_offset_t va; - vm_size_t size; +pmap_unmapdev(vm_offset_t va, vm_size_t size) { } @@ -1953,20 +1902,6 @@ } /* - * Deactivate the pmap for a thread. Go back to the kernel ASID. - */ -void -pmap_deactivate(struct thread *td) -{ - pmap_t pmap; - - pmap = vmspace_pmap(td->td_proc->p_vmspace); - atomic_clear_int(&pmap->pm_active, PCPU_GET(cpumask)); - pmap_active = 0; - mips_wr_entryhi(kernel_pmap->pm_asid); -} - -/* * XXX ? */ vm_offset_t ==== //depot/projects/mips/sys/mips/mips/syscall.c#2 (text+ko) ==== @@ -29,6 +29,9 @@ #include #include +/* XXX belongs in a header once things are actually meaningful. */ +void syscall_enter(void); + void syscall_enter(void) { ==== //depot/projects/mips/sys/mips/mips/tlb.c#5 (text+ko) ==== @@ -58,10 +58,12 @@ pt_entry_t *kptmap; vm_size_t kptsize; +#ifdef notyet /* * XXX Move the ASID code here. */ static int tlb_maxasid = MIPS3_TLB_NUM_ASIDS; +#endif void tlb_bootstrap(vm_size_t pages, vm_offset_t (*ptalloc)(vm_size_t)) @@ -134,7 +136,7 @@ tlb_remove_pages(pmap, va, eva - va); } -void +static void tlb_insert(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1) { va &= ~PAGE_MASK; ==== //depot/projects/mips/sys/mips/mips/trap.c#9 (text+ko) ==== @@ -31,9 +31,19 @@ #include #include +#include +#include + #include +#include +#include +#include #include +#ifdef DDB +#include +#endif + struct trap_identifier { u_int ExcCode; const char *Mnemonic; @@ -74,6 +84,9 @@ }; #define MAXTRAPID 31 +/* XXX belongs in a header some day? */ +void trap(struct trapframe *, u_int, void *); + void trap(struct trapframe *tf, u_int cause, void *badvaddr) { ==== //depot/projects/mips/sys/mips/sgimips/ip22.c#5 (text+ko) ==== @@ -68,7 +68,6 @@ unsigned long ip22_cal_timer(u_int32_t, u_int32_t); /* ip22_cache.S */ -extern void ip22_sdcache_do_wbinv(vaddr_t, vaddr_t); extern void ip22_sdcache_enable(void); extern void ip22_sdcache_disable(void); @@ -281,7 +280,9 @@ u_int32_t mstat; u_int32_t mmask; u_int32_t int23addr; - int which = (int)arg; + uintptr_t which; + + which = (uintptr_t)arg; if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) int23addr = 0x1fbd9000; ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#20 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -184,6 +185,7 @@ ctob(availmem) / (1024 * 1024)); } +#if notyet void cpu_intr(u_int32_t status, u_int32_t cause, u_int32_t pc, u_int32_t ipending) { @@ -192,6 +194,7 @@ else panic("Soft interrupt!?\n"); } +#endif /* * XXX Maybe return the state of the watchdog in enter, and pass it to