From owner-p4-projects@FreeBSD.ORG Mon Dec 22 08:40:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23CD716A4D0; Mon, 22 Dec 2003 08:40:29 -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 EE54416A4CE for ; Mon, 22 Dec 2003 08:40:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB0E643D1F for ; Mon, 22 Dec 2003 08:40:09 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBMGe90B091877 for ; Mon, 22 Dec 2003 08:40:09 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBMGe7II091873 for perforce@freebsd.org; Mon, 22 Dec 2003 08:40:07 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 22 Dec 2003 08:40:07 -0800 (PST) Message-Id: <200312221640.hBMGe7II091873@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 44192 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, 22 Dec 2003 16:40:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=44192 Change 44192 by jhb@jhb_blue on 2003/12/22 08:39:24 IFC @44189. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_sigtramp.S#3 branch .. //depot/projects/smpng/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#7 integrate .. //depot/projects/smpng/sys/boot/efi/include/efiapi.h#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#5 integrate .. //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#8 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sigtramp.S#2 delete .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_util.h#3 integrate .. //depot/projects/smpng/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/smpng/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/smpng/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/smpng/sys/conf/files#98 integrate .. //depot/projects/smpng/sys/conf/files.amd64#11 integrate .. //depot/projects/smpng/sys/conf/files.i386#50 integrate .. //depot/projects/smpng/sys/conf/files.ia64#36 integrate .. //depot/projects/smpng/sys/conf/majors#32 integrate .. //depot/projects/smpng/sys/conf/options.i386#37 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#54 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#19 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#17 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#17 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.reg#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_inline.h#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.c#1 branch .. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.h#1 branch .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#8 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#16 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/smpng/sys/dev/bktr/ioctl_bt848.h#2 integrate .. //depot/projects/smpng/sys/dev/bktr/ioctl_meteor.h#2 integrate .. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#3 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#25 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#21 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#1 branch .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#1 branch .. //depot/projects/smpng/sys/dev/led/led.c#4 integrate .. //depot/projects/smpng/sys/dev/md/md.c#43 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#8 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#38 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#41 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#41 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#41 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#16 integrate .. //depot/projects/smpng/sys/dev/vinum/vinum.c#15 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#17 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#10 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#16 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#62 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#53 integrate .. //depot/projects/smpng/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/smpng/sys/i386/include/cpu.h#9 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#12 integrate .. //depot/projects/smpng/sys/ia64/ia32/Makefile#2 delete .. //depot/projects/smpng/sys/ia64/ia32/ia32.h#2 delete .. //depot/projects/smpng/sys/ia64/ia32/ia32_misc.c#6 delete .. //depot/projects/smpng/sys/ia64/ia32/ia32_proto.h#10 delete .. //depot/projects/smpng/sys/ia64/ia32/ia32_signal.c#1 branch .. //depot/projects/smpng/sys/ia64/ia32/ia32_sigtramp.c#1 branch .. //depot/projects/smpng/sys/ia64/ia32/ia32_syscall.h#10 delete .. //depot/projects/smpng/sys/ia64/ia32/ia32_sysent.c#10 delete .. //depot/projects/smpng/sys/ia64/ia32/ia32_sysvec.c#6 delete .. //depot/projects/smpng/sys/ia64/ia32/ia32_util.h#4 delete .. //depot/projects/smpng/sys/ia64/ia32/syscalls.conf#2 delete .. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#13 delete .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#76 integrate .. //depot/projects/smpng/sys/ia64/include/cpufunc.h#18 integrate .. //depot/projects/smpng/sys/ia64/include/runq.h#3 integrate .. //depot/projects/smpng/sys/isa/psm.c#20 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#34 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#23 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#38 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#37 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#25 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#56 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#64 integrate .. //depot/projects/smpng/sys/modules/Makefile#67 integrate .. //depot/projects/smpng/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/if_ndis/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ndis/Makefile#1 branch .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_etf.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#27 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#29 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#40 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#15 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#26 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#17 integrate .. //depot/projects/smpng/sys/opencrypto/crmbuf.c#3 delete .. //depot/projects/smpng/sys/opencrypto/cryptodev.h#6 integrate .. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#5 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#36 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#34 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#23 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#18 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#22 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#18 integrate .. //depot/projects/smpng/sys/sys/_null.h#2 integrate .. //depot/projects/smpng/sys/sys/ioctl_bt848.h#2 delete .. //depot/projects/smpng/sys/sys/ioctl_meteor.h#2 delete .. //depot/projects/smpng/sys/sys/mac.h#23 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#19 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#30 integrate .. //depot/projects/smpng/sys/sys/param.h#53 integrate .. //depot/projects/smpng/sys/sys/proc.h#107 integrate .. //depot/projects/smpng/sys/sys/syscall.h#38 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#38 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#40 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#18 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#38 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#44 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.230 2003/12/03 14:57:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.231 2003/12/11 02:47:35 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -163,9 +163,9 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id > MAXCPU) { + if (apic_id >= MAXCPU) { printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU); + apic_id, MAXCPU - 1); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", ==== //depot/projects/smpng/sys/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.228 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.229 2003/12/11 02:47:35 peter Exp $"); #include #include @@ -54,7 +54,7 @@ /* string defined by the Intel MP Spec as identifying the MP table */ #define MP_SIG 0x5f504d5f /* _MP_ */ -#define NAPICID 32 /* Max number of I/O APIC's */ +#define NAPICID 32 /* Max number of APIC's */ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -811,7 +811,7 @@ * physical processor. If any of those ID's are * already in the table, then kill the fixup. */ - for (id = 0; id <= MAXCPU; id++) { + for (id = 0; id < NAPICID; id++) { if ((id_mask & 1 << id) == 0) continue; /* First, make sure we are on a logical_cpus boundary. */ ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#19 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.448 2003/12/06 23:18:42 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.449 2003/12/22 01:01:31 alc Exp $"); /* * Manages physical address maps. @@ -227,7 +227,6 @@ static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); -static void *pmap_pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); @@ -526,13 +525,6 @@ invltlb(); } -static void * -pmap_pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) -{ - *flags = UMA_SLAB_PRIV; - return (void *)kmem_alloc(kernel_map, bytes); -} - /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap @@ -545,7 +537,6 @@ vm_paddr_t phys_start, phys_end; { int i; - int initial_pvs; /* * Allocate memory for random pmap data structures. Includes the @@ -563,13 +554,9 @@ /* * init the pv free list */ - initial_pvs = vm_page_array_size; - if (initial_pvs < MINPV) - initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_zone_set_allocf(pvzone, pmap_pv_allocf); - uma_prealloc(pvzone, initial_pvs); + uma_prealloc(pvzone, MINPV); /* * Now it is safe to enable pv_table recording. ==== //depot/projects/smpng/sys/amd64/include/apicreg.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.26 2003/12/11 02:48:25 peter Exp $ */ #ifndef _MACHINE_APICREG_H_ @@ -342,38 +342,6 @@ #define APIC_TDCR_128 0x0a #define APIC_TDCR_1 0x0b - -/* - * fields in IRR - * ISA INTerrupts are in bits 16-31 of the 1st IRR register. - * these masks DON'T EQUAL the isa IRQs of the same name. - */ -#define APIC_IRQ0 0x00000001 -#define APIC_IRQ1 0x00000002 -#define APIC_IRQ2 0x00000004 -#define APIC_IRQ3 0x00000008 -#define APIC_IRQ4 0x00000010 -#define APIC_IRQ5 0x00000020 -#define APIC_IRQ6 0x00000040 -#define APIC_IRQ7 0x00000080 -#define APIC_IRQ8 0x00000100 -#define APIC_IRQ9 0x00000200 -#define APIC_IRQ10 0x00000400 -#define APIC_IRQ11 0x00000800 -#define APIC_IRQ12 0x00001000 -#define APIC_IRQ13 0x00002000 -#define APIC_IRQ14 0x00004000 -#define APIC_IRQ15 0x00008000 -#define APIC_IRQ16 0x00010000 -#define APIC_IRQ17 0x00020000 -#define APIC_IRQ18 0x00040000 -#define APIC_IRQ19 0x00080000 -#define APIC_IRQ20 0x00100000 -#define APIC_IRQ21 0x00200000 -#define APIC_IRQ22 0x00400000 -#define APIC_IRQ23 0x00800000 - - /****************************************************************************** * I/O APIC defines */ ==== //depot/projects/smpng/sys/amd64/include/param.h#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.9 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.10 2003/12/20 20:03:10 alc Exp $ */ /* @@ -142,7 +142,7 @@ * the kern.maxbcache /boot/loader.conf variable. */ #ifndef VM_BCACHE_SIZE_MAX -#define VM_BCACHE_SIZE_MAX (200 * 1024 * 1024) +#define VM_BCACHE_SIZE_MAX (400 * 1024 * 1024) #endif /* ==== //depot/projects/smpng/sys/boot/efi/include/efiapi.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.5 2002/12/08 20:47:44 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.6 2003/12/10 19:08:09 jhb Exp $ */ #ifndef _EFI_API_H #define _EFI_API_H @@ -204,7 +204,7 @@ /* - * EFI platform varibles + * EFI platform variables */ #define EFI_GLOBAL_VARIABLE \ ==== //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#5 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.28 2003/12/09 05:40:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.29 2003/12/11 20:40:12 jhb Exp $ # A 512-byte boot manager. @@ -176,7 +176,7 @@ callw putx # item # # Now that we've printed the drive (if we needed to), display a prompt. -# Get ready for the input byte noting the time. +# Get ready for the input by noting the time. # main.7: movw $prompt,%si # Display callw putstr # prompt ==== //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.9 2001/11/07 01:20:33 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.10 2003/12/11 22:42:50 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -139,10 +139,26 @@ jmp error # Halt have_vd: # Have Primary VD # -# Lookup the loader binary. +# Try to look up the loader binary using the paths in the loader_paths +# array. # - mov $loader_path,%si # File to lookup - call lookup # Try to find it + mov $loader_paths,%si # Point to start of array +lookup_path: push %si # Save file name pointer + call lookup # Try to find file + pop %di # Restore file name pointer + jnc lookup_found # Found this file + xor %al,%al # Look for next + mov $0xffff,%cx # path name by + repnz # scanning for + scasb # nul char + inc %di # Skip nul + mov %di,%si # Point %si at next path + mov (%si),%al # Get first char of next path + or %al,%al # Is it double nul? + jnz lookup_path # No, try it. + mov $msg_failed,%si # Failed message + jmp error # Halt +lookup_found: # Found a loader file # # Load the binary into the buffer. Due to real mode addressing limitations # we have to read it in in 64k chunks. @@ -266,7 +282,8 @@ # Lookup the file in the path at [SI] from the root directory. # # Trashes: All but BX -# Returns: BX = pointer to record +# Returns: CF = 0 (success), BX = pointer to record +# CF = 1 (not found) # lookup: mov $VD_ROOTDIR+MEM_VOLDESC,%bx # Root directory record push %si @@ -286,17 +303,21 @@ dec %si # Undo lodsb side effect call find_file # Lookup first path item jnc lookup_dir # Try next component - mov $msg_lookupfail,%si # Not found. + mov $msg_lookupfail,%si # Not found message + call putstr + stc # Set carry + ret jmp error lookup_done: mov $msg_lookupok,%si # Success message call putstr + clc # Clear carry ret # # Lookup file at [SI] in directory whose record is at [BX]. # # Trashes: All but returns -# Returns: CF = 0 (success), BX = pointer to record, SX = next path item +# Returns: CF = 0 (success), BX = pointer to record, SI = next path item # CF = 1 (not found), SI = preserved # find_file: mov DIR_EXTENT(%bx),%eax # Load extent @@ -536,7 +557,7 @@ twiddle_index: .byte 0x0 -msg_welcome: .asciz "CD Loader 1.01\r\n\n" +msg_welcome: .asciz "CD Loader 1.2\r\n\n" msg_bootinfo: .asciz "Building the boot loader arguments\r\n" msg_relocate: .asciz "Relocating the loader and the BTX\r\n" msg_jump: .asciz "Starting the BTX loader\r\n" @@ -548,6 +569,9 @@ msg_lookupok: .asciz "Found\r\n" msg_lookupfail: .asciz "File not found\r\n" msg_load2big: .asciz "File too big\r\n" -loader_path: .asciz "/BOOT/LOADER" +msg_failed: .asciz "Boot failed\r\n" twiddle_chars: .ascii "|/-\\" +loader_paths: .asciz "/BOOT/LOADER" + .asciz "/boot/loader" + .byte 0 ==== //depot/projects/smpng/sys/boot/ofw/common/main.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/boot/ofw/common/main.c,v 1.3 2002/11/10 19:17:35 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/common/main.c,v 1.4 2003/12/21 12:11:31 grehan Exp $ */ #include @@ -42,7 +42,9 @@ phandle_t chosen; -#define HEAP_SIZE 0x40000 +static char bootargs[128]; + +#define HEAP_SIZE 0x80000 void init_heap(void) @@ -54,7 +56,7 @@ OF_enter(); } - setheap(base, base + (HEAP_SIZE / sizeof(base))); + setheap(base, (void *)((int)base + HEAP_SIZE)); } uint32_t @@ -62,14 +64,21 @@ { ihandle_t meminstance; phandle_t memory; - struct ofw_reg reg; + struct ofw_reg reg[4]; + int i; + int sz, memsz; OF_getprop(chosen, "memory", &meminstance, sizeof(meminstance)); memory = OF_instance_to_package(meminstance); - OF_getprop(memory, "reg", ®, sizeof(reg)); + sz = OF_getprop(memory, "reg", ®, sizeof(reg)); + + sz /= sizeof(struct ofw_reg); - return (reg.size); + for (i = 0, memsz = 0; i < sz; i++) + memsz += reg[i].size; + + return (memsz); } int @@ -78,6 +87,8 @@ int i; char bootpath[64]; char *ch; + int bargc; + char **bargv; /* * Initalise the OpenFirmware routines by giving them the entry point. @@ -122,8 +133,19 @@ printf("\n"); - env_setenv("currdev", EV_VOLATILE, bootpath, - ofw_setcurrdev, env_nounset); + /* + * Only parse the first bootarg if present. It should + * be simple to handle extra arguments + */ + OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs)); + bargc = 0; + parse(&bargc, &bargv, bootargs); + if (bargc == 1) + env_setenv("currdev", EV_VOLATILE, bargv[0], ofw_setcurrdev, + env_nounset); + else + env_setenv("currdev", EV_VOLATILE, bootpath, + ofw_setcurrdev, env_nounset); env_setenv("loaddev", EV_VOLATILE, bootpath, env_noset, env_nounset); setenv("LINES", "24", 1); /* optional */ ==== //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.13 2003/04/16 21:09:41 phk Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.14 2003/12/21 12:38:25 grehan Exp $ */ #include @@ -47,7 +47,8 @@ * device, go with the current device. */ if ((devspec == NULL) || - (strchr(devspec, '@') == NULL)) { + ((strchr(devspec, '@') == NULL) && + (strchr(devspec, ':') == NULL))) { if (((rv = ofw_parsedev(dev, getenv("currdev"), NULL)) == 0) && (path != NULL)) @@ -112,7 +113,7 @@ } int -ofw_setcurrdev(struct env_var *ev, int flags, void *value) +ofw_setcurrdev(struct env_var *ev, int flags, const void *value) { struct ofw_devdesc *ncurr; int rv; ==== //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.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/boot/ofw/libofw/elf_freebsd.c,v 1.5 2003/05/01 03:56:30 peter Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.6 2003/12/21 12:27:01 grehan Exp $ */ #include @@ -42,7 +42,7 @@ extern vm_offset_t reloc; /* From /conf.c */ int -__elfN(ofw_loadfile)(char *filename, vm_offset_t dest, +__elfN(ofw_loadfile)(char *filename, u_int64_t dest, struct preloaded_file **result) { int r; @@ -52,6 +52,9 @@ if (r != 0) return (r); +#if defined(__powerpc__) + __syncicache((void *) (*result)->f_addr, (*result)->f_size); +#endif return (0); } ==== //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#6 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/libofw.h,v 1.7 2002/11/10 19:17:36 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/libofw.h,v 1.8 2003/12/21 12:38:25 grehan Exp $ */ #include "openfirm.h" @@ -36,7 +36,7 @@ }; extern int ofw_getdev(void **vdev, const char *devspec, const char **path); -extern int ofw_setcurrdev(struct env_var *ev, int flags, void *value); +extern ev_sethook_t ofw_setcurrdev; extern struct devsw ofwdisk; extern struct netif_driver ofwnet; ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.11 2002/07/18 12:39:02 benno Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.12 2003/12/21 12:19:38 grehan Exp $ */ /* * MD primitives supporting placement of module data @@ -98,7 +98,8 @@ got = read(fd, buf, get); if (got <= 0) { - printf("ofw_readin: read failed\n"); + if (got < 0) + printf("ofw_readin: read failed\n"); break; } ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#8 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.9 2003/04/16 21:09:41 phk Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.10 2003/12/21 12:16:58 grehan Exp $ */ /* @@ -70,7 +70,7 @@ size_t *rsize) { struct ofw_devdesc *dp = (struct ofw_devdesc *)devdata; - unsigned long pos; + daddr_t pos; int n; int i, j; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.15 2003/11/07 21:27:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.16 2003/12/11 02:34:49 peter Exp $"); #include "opt_compat.h" @@ -761,29 +761,21 @@ freebsd32_gettimeofday(struct thread *td, struct freebsd32_gettimeofday_args *uap) { - int error; - caddr_t sg; - struct timeval32 *p32, s32; - struct timeval *p = NULL, s; + struct timeval atv; + struct timeval32 atv32; + struct timezone rtz; + int error = 0; - p32 = uap->tp; - if (p32) { - sg = stackgap_init(); - p = stackgap_alloc(&sg, sizeof(struct timeval)); - uap->tp = (struct timeval32 *)p; + if (uap->tp) { + microtime(&atv); + CP(atv, atv32, tv_sec); + CP(atv, atv32, tv_usec); + error = copyout(&atv32, uap->tp, sizeof (atv32)); } - error = gettimeofday(td, (struct gettimeofday_args *) uap); - if (error) - return (error); - if (p32) { - error = copyin(p, &s, sizeof(s)); - if (error) - return (error); - CP(s, s32, tv_sec); - CP(s, s32, tv_usec); - error = copyout(&s32, p32, sizeof(s32)); - if (error) - return (error); + if (error == 0 && uap->tzp != NULL) { + rtz.tz_minuteswest = tz_minuteswest; + rtz.tz_dsttime = tz_dsttime; + error = copyout(&rtz, uap->tzp, sizeof (rtz)); } return (error); } ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.14 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.16 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.14 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.16 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #define FREEBSD32_SYS_syscall 0 @@ -53,7 +53,7 @@ #define FREEBSD32_SYS_getlogin 49 #define FREEBSD32_SYS_setlogin 50 #define FREEBSD32_SYS_acct 51 -#define FREEBSD32_SYS_sigpending 52 + /* 52 is obsolete osigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 #define FREEBSD32_SYS_ioctl 54 #define FREEBSD32_SYS_reboot 55 @@ -98,7 +98,7 @@ #define FREEBSD32_SYS_setpriority 96 #define FREEBSD32_SYS_socket 97 #define FREEBSD32_SYS_connect 98 -#define FREEBSD32_SYS_accept 99 + /* 99 is obsolete oaccept */ #define FREEBSD32_SYS_getpriority 100 /* 101 is obsolete osend */ /* 102 is obsolete orecv */ @@ -123,7 +123,7 @@ #define FREEBSD32_SYS_freebsd32_settimeofday 122 #define FREEBSD32_SYS_fchown 123 #define FREEBSD32_SYS_fchmod 124 -#define FREEBSD32_SYS_recvfrom 125 + /* 125 is obsolete orecvfrom */ #define FREEBSD32_SYS_setreuid 126 #define FREEBSD32_SYS_setregid 127 #define FREEBSD32_SYS_rename 128 @@ -149,7 +149,7 @@ #define FREEBSD32_SYS_quotactl 148 /* 149 is obsolete oquota */ /* 150 is obsolete ogetsockname */ -#define FREEBSD32_SYS_getdirentries 156 + /* 156 is obsolete ogetdirentries */ #define FREEBSD32_SYS_freebsd32_statfs 157 #define FREEBSD32_SYS_freebsd32_fstatfs 158 #define FREEBSD32_SYS_getfh 161 @@ -295,4 +295,4 @@ #define FREEBSD32_SYS__umtx_lock 434 #define FREEBSD32_SYS__umtx_unlock 435 #define FREEBSD32_SYS_jail_attach 436 -#define FREEBSD32_SYS_MAXSYSCALL 437 +#define FREEBSD32_SYS_MAXSYSCALL 441 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.5 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.7 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ const char *freebsd32_syscallnames[] = { @@ -59,7 +59,7 @@ "getlogin", /* 49 = getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "sigpending", /* 52 = sigpending */ + "obs_osigpending", /* 52 = obsolete osigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ "ioctl", /* 54 = ioctl */ "reboot", /* 55 = reboot */ @@ -106,7 +106,7 @@ "setpriority", /* 96 = setpriority */ "socket", /* 97 = socket */ "connect", /* 98 = connect */ - "accept", /* 99 = accept */ + "obs_oaccept", /* 99 = obsolete oaccept */ "getpriority", /* 100 = getpriority */ "obs_osend", /* 101 = obsolete osend */ "obs_orecv", /* 102 = obsolete orecv */ @@ -132,7 +132,7 @@ "freebsd32_settimeofday", /* 122 = freebsd32_settimeofday */ "fchown", /* 123 = fchown */ "fchmod", /* 124 = fchmod */ - "recvfrom", /* 125 = recvfrom */ + "obs_orecvfrom", /* 125 = obsolete orecvfrom */ "setreuid", /* 126 = setreuid */ "setregid", /* 127 = setregid */ "rename", /* 128 = rename */ @@ -163,7 +163,7 @@ "#153", /* 153 = asyncdaemon */ "#154", /* 154 = nosys */ "#155", /* 155 = nfssvc */ - "getdirentries", /* 156 = getdirentries */ + "obs_ogetdirentries", /* 156 = obsolete ogetdirentries */ "freebsd32_statfs", /* 157 = freebsd32_statfs */ "freebsd32_fstatfs", /* 158 = freebsd32_fstatfs */ "#159", /* 159 = nosys */ @@ -444,4 +444,8 @@ "_umtx_lock", /* 434 = _umtx_lock */ "_umtx_unlock", /* 435 = _umtx_unlock */ "jail_attach", /* 436 = jail_attach */ + "#437", /* 437 = extattr_list_fd */ + "#438", /* 438 = extattr_list_file */ + "#439", /* 439 = extattr_list_link */ + "#440", /* 440 = kse_switchin */ }; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.15 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.17 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #include "opt_compat.h" @@ -77,7 +77,7 @@ { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin }, /* 49 = getlogin */ { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin }, /* 50 = setlogin */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)sigpending }, /* 52 = sigpending */ + { 0, (sy_call_t *)nosys }, /* 52 = obsolete osigpending */ { SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack }, /* 53 = freebsd32_sigaltstack */ { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl }, /* 54 = ioctl */ { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot }, /* 55 = reboot */ @@ -124,7 +124,7 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority }, /* 96 = setpriority */ { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket }, /* 97 = socket */ { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect }, /* 98 = connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept }, /* 99 = accept */ + { 0, (sy_call_t *)nosys }, /* 99 = obsolete oaccept */ { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority }, /* 100 = getpriority */ { 0, (sy_call_t *)nosys }, /* 101 = obsolete osend */ { 0, (sy_call_t *)nosys }, /* 102 = obsolete orecv */ @@ -141,7 +141,7 @@ { 0, (sy_call_t *)nosys }, /* 113 = obsolete orecvmsg */ { 0, (sy_call_t *)nosys }, /* 114 = obsolete osendmsg */ { 0, (sy_call_t *)nosys }, /* 115 = obsolete vtrace */ - { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */ + { SYF_MPSAFE | AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */ { AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage }, /* 117 = freebsd32_getrusage */ { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys }, /* 119 = resuba */ @@ -150,7 +150,7 @@ { AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday }, /* 122 = freebsd32_settimeofday */ { AS(fchown_args), (sy_call_t *)fchown }, /* 123 = fchown */ { AS(fchmod_args), (sy_call_t *)fchmod }, /* 124 = fchmod */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom }, /* 125 = recvfrom */ + { 0, (sy_call_t *)nosys }, /* 125 = obsolete orecvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 127 = setregid */ { AS(rename_args), (sy_call_t *)rename }, /* 128 = rename */ @@ -181,7 +181,7 @@ { 0, (sy_call_t *)nosys }, /* 153 = asyncdaemon */ { 0, (sy_call_t *)nosys }, /* 154 = nosys */ { 0, (sy_call_t *)nosys }, /* 155 = nfssvc */ - { AS(getdirentries_args), (sy_call_t *)getdirentries }, /* 156 = getdirentries */ + { 0, (sy_call_t *)nosys }, /* 156 = obsolete ogetdirentries */ { AS(freebsd32_statfs_args), (sy_call_t *)freebsd32_statfs }, /* 157 = freebsd32_statfs */ { AS(freebsd32_fstatfs_args), (sy_call_t *)freebsd32_fstatfs }, /* 158 = freebsd32_fstatfs */ { 0, (sy_call_t *)nosys }, /* 159 = nosys */ @@ -462,4 +462,8 @@ { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */ { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock }, /* 435 = _umtx_unlock */ { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach }, /* 436 = jail_attach */ + { 0, (sy_call_t *)nosys }, /* 437 = extattr_list_fd */ + { 0, (sy_call_t *)nosys }, /* 438 = extattr_list_file */ + { 0, (sy_call_t *)nosys }, /* 439 = extattr_list_link */ + { 0, (sy_call_t *)nosys }, /* 440 = kse_switchin */ }; ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#4 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -110,7 +110,7 @@ 49 MNOPROTO BSD { int getlogin(char *namebuf, u_int namelen); } 50 MNOPROTO BSD { int setlogin(char *namebuf); } 51 MNOPROTO BSD { int acct(char *path); } -52 MNOPROTO POSIX { int sigpending(void); } +52 OBSOL POSIX osigpending 53 MSTD BSD { int freebsd32_sigaltstack(struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } 54 MNOPROTO POSIX { int ioctl(int fd, u_long com, caddr_t data); } @@ -171,8 +171,7 @@ 96 MNOPROTO BSD { int setpriority(int which, int who, int prio); } 97 MNOPROTO BSD { int socket(int domain, int type, int protocol); } 98 MNOPROTO BSD { int connect(int s, caddr_t name, int namelen); } -99 MNOPROTO BSD { int accept(int s, caddr_t name, int *anamelen); } \ - accept accept_args int +99 OBSOL BSD oaccept >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 22 08:42:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A0D816A4D0; Mon, 22 Dec 2003 08:42: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 13D9A16A4CE for ; Mon, 22 Dec 2003 08:42:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63C9E43D50 for ; Mon, 22 Dec 2003 08:42:15 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBMGgF0B093562 for ; Mon, 22 Dec 2003 08:42:15 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBMGgFcd093553 for perforce@freebsd.org; Mon, 22 Dec 2003 08:42:15 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 22 Dec 2003 08:42:15 -0800 (PST) Message-Id: <200312221642.hBMGgFcd093553@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 44194 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, 22 Dec 2003 16:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44194 Change 44194 by jhb@jhb_blue on 2003/12/22 08:41:25 IFC these again since their removal/readd confused p4. Affected files ... .. //depot/projects/smpng/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/smpng/sys/i386/include/ioctl_meteor.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/include/ioctl_meteor.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 1995 Mark Tinguely and Jim Lowe +/*- + * Copyright (c) 2003 David O'Brien * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,11 +10,6 @@ * 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 Mark Tinguely and Jim Lowe - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -28,160 +23,16 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.1 2000/04/15 08:07:56 roger Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.4 2003/12/08 07:22:41 obrien Exp $ */ -/* - * ioctl constants for Matrox Meteor Capture card. - */ #ifndef _MACHINE_IOCTL_METEOR_H_ #define _MACHINE_IOCTL_METEOR_H_ -#ifndef _KERNEL -#include +#ifdef __GNUC__ +#warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif -#include -struct meteor_capframe { - short command; /* see below for valid METEORCAPFRM commands */ - short lowat; /* start transfer if < this number */ - short hiwat; /* stop transfer if > this number */ -} ; +#include -/* structure for METEOR[GS]ETGEO - get/set geometry */ -struct meteor_geomet { - u_short rows; - u_short columns; - u_short frames; - u_long oformat; -} ; - -/* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */ -struct meteor_counts { - u_long fifo_errors; /* count of fifo errors since open */ - u_long dma_errors; /* count of dma errors since open */ - u_long frames_captured; /* count of frames captured since open */ - u_long even_fields_captured; /* count of even fields captured */ - u_long odd_fields_captured; /* count of odd fields captured */ -} ; - -/* structure for getting and setting direct transfers to vram */ -struct meteor_video { - u_long addr; /* Address of location to dma to */ - u_long width; /* Width of memory area */ - u_long banksize; /* Size of Vram bank */ - u_long ramsize; /* Size of Vram */ -}; - -#define METEORCAPTUR _IOW('x', 1, int) /* capture a frame */ -#define METEORCAPFRM _IOW('x', 2, struct meteor_capframe) /* sync capture */ -#define METEORSETGEO _IOW('x', 3, struct meteor_geomet) /* set geometry */ -#define METEORGETGEO _IOR('x', 4, struct meteor_geomet) /* get geometry */ -#define METEORSTATUS _IOR('x', 5, unsigned short) /* get status */ -#define METEORSHUE _IOW('x', 6, signed char) /* set hue */ -#define METEORGHUE _IOR('x', 6, signed char) /* get hue */ -#define METEORSFMT _IOW('x', 7, unsigned long) /* set format */ -#define METEORGFMT _IOR('x', 7, unsigned long) /* get format */ -#define METEORSINPUT _IOW('x', 8, unsigned long) /* set input dev */ -#define METEORGINPUT _IOR('x', 8, unsigned long) /* get input dev */ -#define METEORSCHCV _IOW('x', 9, unsigned char) /* set uv gain */ -#define METEORGCHCV _IOR('x', 9, unsigned char) /* get uv gain */ -#define METEORSCOUNT _IOW('x',10, struct meteor_counts) -#define METEORGCOUNT _IOR('x',10, struct meteor_counts) -#define METEORSFPS _IOW('x',11, unsigned short) /* set fps */ -#define METEORGFPS _IOR('x',11, unsigned short) /* get fps */ -#define METEORSSIGNAL _IOW('x', 12, unsigned int) /* set signal */ -#define METEORGSIGNAL _IOR('x', 12, unsigned int) /* get signal */ -#define METEORSVIDEO _IOW('x', 13, struct meteor_video) /* set video */ -#define METEORGVIDEO _IOR('x', 13, struct meteor_video) /* get video */ -#define METEORSBRIG _IOW('x', 14, unsigned char) /* set brightness */ -#define METEORGBRIG _IOR('x', 14, unsigned char) /* get brightness */ -#define METEORSCSAT _IOW('x', 15, unsigned char) /* set chroma sat */ -#define METEORGCSAT _IOR('x', 15, unsigned char) /* get uv saturation */ -#define METEORSCONT _IOW('x', 16, unsigned char) /* set contrast */ -#define METEORGCONT _IOR('x', 16, unsigned char) /* get contrast */ -#define METEORSBT254 _IOW('x', 17, unsigned short) /* set Bt254 reg */ -#define METEORGBT254 _IOR('x', 17, unsigned short) /* get Bt254 reg */ -#define METEORSHWS _IOW('x', 18, unsigned char) /* set hor start reg */ -#define METEORGHWS _IOR('x', 18, unsigned char) /* get hor start reg */ -#define METEORSVWS _IOW('x', 19, unsigned char) /* set vert start reg */ -#define METEORGVWS _IOR('x', 19, unsigned char) /* get vert start reg */ -#define METEORSTS _IOW('x', 20, unsigned char) /* set time stamp */ -#define METEORGTS _IOR('x', 20, unsigned char) /* get time stamp */ - -#define METEOR_STATUS_ID_MASK 0xf000 /* ID of 7196 */ -#define METEOR_STATUS_DIR 0x0800 /* Direction of Expansion port YUV */ -#define METEOR_STATUS_OEF 0x0200 /* Field detected: Even/Odd */ -#define METEOR_STATUS_SVP 0x0100 /* State of VRAM Port:inactive/active */ -#define METEOR_STATUS_STTC 0x0080 /* Time Constant: TV/VCR */ -#define METEOR_STATUS_HCLK 0x0040 /* Horiz PLL: locked/unlocked */ -#define METEOR_STATUS_FIDT 0x0020 /* Field detect: 50/60hz */ -#define METEOR_STATUS_ALTD 0x0002 /* Line alt: no line alt/line alt */ -#define METEOR_STATUS_CODE 0x0001 /* Colour info: no colour/colour */ - - /* METEORCAPTUR capture options */ -#define METEOR_CAP_SINGLE 0x0001 /* capture one frame */ -#define METEOR_CAP_CONTINOUS 0x0002 /* continuously capture */ -#define METEOR_CAP_STOP_CONT 0x0004 /* stop the continuous capture */ - - /* METEORCAPFRM capture commands */ -#define METEOR_CAP_N_FRAMES 0x0001 /* capture N frames */ -#define METEOR_CAP_STOP_FRAMES 0x0002 /* stop capture N frames */ -#define METEOR_HALT_N_FRAMES 0x0003 /* halt of capture N frames */ -#define METEOR_CONT_N_FRAMES 0x0004 /* continue after above halt */ - - /* valid video input formats: */ -#define METEOR_FMT_NTSC 0x00100 /* NTSC -- initialized default */ -#define METEOR_FMT_PAL 0x00200 /* PAL */ -#define METEOR_FMT_SECAM 0x00400 /* SECAM */ -#define METEOR_FMT_AUTOMODE 0x00800 /* auto-mode */ -#define METEOR_INPUT_DEV0 0x01000 /* camera input 0 -- default */ -#define METEOR_INPUT_DEV_RCA METEOR_INPUT_DEV0 -#define METEOR_INPUT_DEV1 0x02000 /* camera input 1 */ -#define METEOR_INPUT_DEV2 0x04000 /* camera input 2 */ -#define METEOR_INPUT_DEV3 0x08000 /* camera input 3 */ -#define METEOR_INPUT_DEV_RGB 0x0a000 /* for rgb version of meteor */ -#define METEOR_INPUT_DEV_SVIDEO 0x06000 /* S-video input port */ - - /* valid video output formats: */ -#define METEOR_GEO_RGB16 0x0010000 /* packed -- initialized default */ -#define METEOR_GEO_RGB24 0x0020000 /* RBG 24 bits packed */ - /* internally stored in 32 bits */ -#define METEOR_GEO_YUV_PACKED 0x0040000 /* 4-2-2 YUV 16 bits packed */ -#define METEOR_GEO_YUV_PLANAR 0x0080000 /* 4-2-2 YUV 16 bits planer */ -#define METEOR_GEO_YUV_PLANER METEOR_GEO_YUV_PLANAR -#define METEOR_GEO_UNSIGNED 0x0400000 /* unsigned uv outputs */ -#define METEOR_GEO_EVEN_ONLY 0x1000000 /* set for even only field capture */ -#define METEOR_GEO_ODD_ONLY 0x2000000 /* set for odd only field capture */ -#define METEOR_GEO_FIELD_MASK 0x3000000 -#define METEOR_GEO_YUV_422 0x4000000 /* 4-2-2 YUV in Y-U-V combined */ -#define METEOR_GEO_OUTPUT_MASK 0x40f0000 -#define METEOR_GEO_YUV_12 0x10000000 /* YUV 12 format */ -#define METEOR_GEO_YUV_9 0x40000000 /* YUV 9 format */ - -#define METEOR_FIELD_MODE 0x80000000 /* Field cap or Frame cap */ - -#define METEOR_SIG_MODE_MASK 0xffff0000 -#define METEOR_SIG_FRAME 0x00000000 /* signal every frame */ -#define METEOR_SIG_FIELD 0x00010000 /* signal every field */ - - /* following structure is used to coordinate the synchronous */ - -struct meteor_mem { - /* kernel write only */ - int frame_size; /* row*columns*depth */ - unsigned num_bufs; /* number of frames in buffer (1-32) */ - /* user and kernel change these */ - int lowat; /* kernel starts capture if < this number */ - int hiwat; /* kernel stops capture if > this number. - hiwat <= numbufs */ - unsigned active; /* bit mask of active frame buffers - kernel sets, user clears */ - int num_active_bufs; /* count of active frame buffer - kernel increments, user decrements */ - - /* reference to mmapped data */ - caddr_t buf; /* The real space (virtual addr) */ -} ; - -#endif /* !_MACHINE_IOCTL_METEOR_H_ */ +#endif /* _MACHINE_IOCTL_METEOR_H_ */ ==== //depot/projects/smpng/sys/i386/include/ioctl_meteor.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 1995 Mark Tinguely and Jim Lowe +/*- + * Copyright (c) 2003 David O'Brien * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,11 +10,6 @@ * 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 Mark Tinguely and Jim Lowe - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -28,160 +23,16 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.11 1999/12/29 04:33:02 peter Exp $ + * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.14 2003/12/08 07:22:41 obrien Exp $ */ -/* - * ioctl constants for Matrox Meteor Capture card. - */ #ifndef _MACHINE_IOCTL_METEOR_H_ #define _MACHINE_IOCTL_METEOR_H_ -#ifndef _KERNEL -#include +#ifdef __GNUC__ +#warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif -#include -struct meteor_capframe { - short command; /* see below for valid METEORCAPFRM commands */ - short lowat; /* start transfer if < this number */ - short hiwat; /* stop transfer if > this number */ -} ; +#include -/* structure for METEOR[GS]ETGEO - get/set geometry */ -struct meteor_geomet { - u_short rows; - u_short columns; - u_short frames; - u_long oformat; -} ; - -/* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */ -struct meteor_counts { - u_long fifo_errors; /* count of fifo errors since open */ - u_long dma_errors; /* count of dma errors since open */ - u_long frames_captured; /* count of frames captured since open */ - u_long even_fields_captured; /* count of even fields captured */ - u_long odd_fields_captured; /* count of odd fields captured */ -} ; - -/* structure for getting and setting direct transfers to vram */ -struct meteor_video { - u_long addr; /* Address of location to dma to */ - u_long width; /* Width of memory area */ - u_long banksize; /* Size of Vram bank */ - u_long ramsize; /* Size of Vram */ -}; - -#define METEORCAPTUR _IOW('x', 1, int) /* capture a frame */ -#define METEORCAPFRM _IOW('x', 2, struct meteor_capframe) /* sync capture */ -#define METEORSETGEO _IOW('x', 3, struct meteor_geomet) /* set geometry */ -#define METEORGETGEO _IOR('x', 4, struct meteor_geomet) /* get geometry */ -#define METEORSTATUS _IOR('x', 5, unsigned short) /* get status */ -#define METEORSHUE _IOW('x', 6, signed char) /* set hue */ -#define METEORGHUE _IOR('x', 6, signed char) /* get hue */ -#define METEORSFMT _IOW('x', 7, unsigned long) /* set format */ -#define METEORGFMT _IOR('x', 7, unsigned long) /* get format */ -#define METEORSINPUT _IOW('x', 8, unsigned long) /* set input dev */ -#define METEORGINPUT _IOR('x', 8, unsigned long) /* get input dev */ -#define METEORSCHCV _IOW('x', 9, unsigned char) /* set uv gain */ -#define METEORGCHCV _IOR('x', 9, unsigned char) /* get uv gain */ -#define METEORSCOUNT _IOW('x',10, struct meteor_counts) -#define METEORGCOUNT _IOR('x',10, struct meteor_counts) -#define METEORSFPS _IOW('x',11, unsigned short) /* set fps */ -#define METEORGFPS _IOR('x',11, unsigned short) /* get fps */ -#define METEORSSIGNAL _IOW('x', 12, unsigned int) /* set signal */ -#define METEORGSIGNAL _IOR('x', 12, unsigned int) /* get signal */ -#define METEORSVIDEO _IOW('x', 13, struct meteor_video) /* set video */ -#define METEORGVIDEO _IOR('x', 13, struct meteor_video) /* get video */ -#define METEORSBRIG _IOW('x', 14, unsigned char) /* set brightness */ -#define METEORGBRIG _IOR('x', 14, unsigned char) /* get brightness */ -#define METEORSCSAT _IOW('x', 15, unsigned char) /* set chroma sat */ -#define METEORGCSAT _IOR('x', 15, unsigned char) /* get uv saturation */ -#define METEORSCONT _IOW('x', 16, unsigned char) /* set contrast */ -#define METEORGCONT _IOR('x', 16, unsigned char) /* get contrast */ -#define METEORSBT254 _IOW('x', 17, unsigned short) /* set Bt254 reg */ -#define METEORGBT254 _IOR('x', 17, unsigned short) /* get Bt254 reg */ -#define METEORSHWS _IOW('x', 18, unsigned char) /* set hor start reg */ -#define METEORGHWS _IOR('x', 18, unsigned char) /* get hor start reg */ -#define METEORSVWS _IOW('x', 19, unsigned char) /* set vert start reg */ -#define METEORGVWS _IOR('x', 19, unsigned char) /* get vert start reg */ -#define METEORSTS _IOW('x', 20, unsigned char) /* set time stamp */ -#define METEORGTS _IOR('x', 20, unsigned char) /* get time stamp */ - -#define METEOR_STATUS_ID_MASK 0xf000 /* ID of 7196 */ -#define METEOR_STATUS_DIR 0x0800 /* Direction of Expansion port YUV */ -#define METEOR_STATUS_OEF 0x0200 /* Field detected: Even/Odd */ -#define METEOR_STATUS_SVP 0x0100 /* State of VRAM Port:inactive/active */ -#define METEOR_STATUS_STTC 0x0080 /* Time Constant: TV/VCR */ -#define METEOR_STATUS_HCLK 0x0040 /* Horiz PLL: locked/unlocked */ -#define METEOR_STATUS_FIDT 0x0020 /* Field detect: 50/60hz */ -#define METEOR_STATUS_ALTD 0x0002 /* Line alt: no line alt/line alt */ -#define METEOR_STATUS_CODE 0x0001 /* Colour info: no colour/colour */ - - /* METEORCAPTUR capture options */ -#define METEOR_CAP_SINGLE 0x0001 /* capture one frame */ -#define METEOR_CAP_CONTINOUS 0x0002 /* continuously capture */ -#define METEOR_CAP_STOP_CONT 0x0004 /* stop the continuous capture */ - - /* METEORCAPFRM capture commands */ -#define METEOR_CAP_N_FRAMES 0x0001 /* capture N frames */ -#define METEOR_CAP_STOP_FRAMES 0x0002 /* stop capture N frames */ -#define METEOR_HALT_N_FRAMES 0x0003 /* halt of capture N frames */ -#define METEOR_CONT_N_FRAMES 0x0004 /* continue after above halt */ - - /* valid video input formats: */ -#define METEOR_FMT_NTSC 0x00100 /* NTSC -- initialized default */ -#define METEOR_FMT_PAL 0x00200 /* PAL */ -#define METEOR_FMT_SECAM 0x00400 /* SECAM */ -#define METEOR_FMT_AUTOMODE 0x00800 /* auto-mode */ -#define METEOR_INPUT_DEV0 0x01000 /* camera input 0 -- default */ -#define METEOR_INPUT_DEV_RCA METEOR_INPUT_DEV0 -#define METEOR_INPUT_DEV1 0x02000 /* camera input 1 */ -#define METEOR_INPUT_DEV2 0x04000 /* camera input 2 */ -#define METEOR_INPUT_DEV3 0x08000 /* camera input 3 */ -#define METEOR_INPUT_DEV_RGB 0x0a000 /* for rgb version of meteor */ -#define METEOR_INPUT_DEV_SVIDEO 0x06000 /* S-video input port */ - - /* valid video output formats: */ -#define METEOR_GEO_RGB16 0x0010000 /* packed -- initialized default */ -#define METEOR_GEO_RGB24 0x0020000 /* RBG 24 bits packed */ - /* internally stored in 32 bits */ -#define METEOR_GEO_YUV_PACKED 0x0040000 /* 4-2-2 YUV 16 bits packed */ -#define METEOR_GEO_YUV_PLANAR 0x0080000 /* 4-2-2 YUV 16 bits planer */ -#define METEOR_GEO_YUV_PLANER METEOR_GEO_YUV_PLANAR -#define METEOR_GEO_UNSIGNED 0x0400000 /* unsigned uv outputs */ -#define METEOR_GEO_EVEN_ONLY 0x1000000 /* set for even only field capture */ -#define METEOR_GEO_ODD_ONLY 0x2000000 /* set for odd only field capture */ -#define METEOR_GEO_FIELD_MASK 0x3000000 -#define METEOR_GEO_YUV_422 0x4000000 /* 4-2-2 YUV in Y-U-V combined */ -#define METEOR_GEO_OUTPUT_MASK 0x40f0000 -#define METEOR_GEO_YUV_12 0x10000000 /* YUV 12 format */ -#define METEOR_GEO_YUV_9 0x40000000 /* YUV 9 format */ - -#define METEOR_FIELD_MODE 0x80000000 /* Field cap or Frame cap */ - -#define METEOR_SIG_MODE_MASK 0xffff0000 -#define METEOR_SIG_FRAME 0x00000000 /* signal every frame */ -#define METEOR_SIG_FIELD 0x00010000 /* signal every field */ - - /* following structure is used to coordinate the synchronous */ - -struct meteor_mem { - /* kernel write only */ - int frame_size; /* row*columns*depth */ - unsigned num_bufs; /* number of frames in buffer (1-32) */ - /* user and kernel change these */ - int lowat; /* kernel starts capture if < this number */ - int hiwat; /* kernel stops capture if > this number. - hiwat <= numbufs */ - unsigned active; /* bit mask of active frame buffers - kernel sets, user clears */ - int num_active_bufs; /* count of active frame buffer - kernel increments, user decrements */ - - /* reference to mmapped data */ - caddr_t buf; /* The real space (virtual addr) */ -} ; - -#endif /* !_MACHINE_IOCTL_METEOR_H_ */ +#endif /* _MACHINE_IOCTL_METEOR_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Dec 22 16:45:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 656DE16A4D0; Mon, 22 Dec 2003 16: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 39E2816A4CE for ; Mon, 22 Dec 2003 16:45:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 759B543D45 for ; Mon, 22 Dec 2003 16:45:11 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBN0jB0B009422 for ; Mon, 22 Dec 2003 16:45:11 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBN0jAkd009419 for perforce@freebsd.org; Mon, 22 Dec 2003 16:45:11 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 22 Dec 2003 16:45:11 -0800 (PST) Message-Id: <200312230045.hBN0jAkd009419@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 44208 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, 23 Dec 2003 00:45:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=44208 Change 44208 by sam@sam_ebb on 2003/12/22 16:44:11 Redo soreceive's handling of MT_CONTROL mbufs to eliminate a LOR between so_rcv and the file descriptor lock. Instead of calling the externalize method as each MT_CONTROL mbuf is identified, hold them until after the sockbuf lock has been dropped and then process them. This potentially changes the semantics of soreceive when errors occur; must monitor the effect of this change carefully. While here fix some bugs and cleanup some code: o handle sodupsockaddr failing; return ENOMEM if it happens o handle m_copy (aka m_copym) failing; return ENOBUFS if it happens o optimize the handling of controlp based on the knowledged that MT_CONTROL mbufs come one at a time o simplify MT_CONTROL processing by using if { do { } while } and hoisting code out of the loop o add a KASSERT to validate an assumption about error that's used to optimize some subsequent code o note that the goto restart case at the bottom of soreceive causes msg recv statistics to be wrong Open issue: it's unclear what to do if the externalize returns an error after retrieving data from the socket. This is likely to confuse applications. Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#8 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#8 (text+ko) ==== @@ -775,14 +775,19 @@ int flags, len, error, offset; struct protosw *pr = so->so_proto; struct mbuf *nextrecord; + struct mbuf *cm, **cme; int moff, type = 0; int orig_resid = uio->uio_resid; mp = mp0; if (psa) *psa = 0; - if (controlp) + cm = NULL; + if (controlp) { *controlp = 0; + cme = &cm; + } else + cme = &cm; /* XXX to silence gcc */ if (flagsp) flags = *flagsp &~ MSG_EOR; else @@ -893,6 +898,7 @@ goto restart; } dontblock: + KASSERT(error == 0, ("unexpected state, error %u", error)); if (uio->uio_td) uio->uio_td->td_proc->p_stats->p_ru.ru_msgrcv++; SBLASTRECORDCHK(&so->so_rcv); @@ -901,10 +907,14 @@ if (pr->pr_flags & PR_ADDR) { KASSERT(m->m_type == MT_SONAME, ("m->m_type == %d", m->m_type)); - orig_resid = 0; - if (psa) + if (psa) { *psa = sodupsockaddr(mtod(m, struct sockaddr *), M_NOWAIT); /* XXX */ + if (*psa == NULL) { + error = ENOMEM; + goto release; + } + } if (flags & MSG_PEEK) { m = m->m_next; } else { @@ -912,30 +922,39 @@ so->so_rcv.sb_mb = m_free(m); m = so->so_rcv.sb_mb; } + orig_resid = 0; } - while (m && m->m_type == MT_CONTROL && error == 0) { - if (flags & MSG_PEEK) { - if (controlp) - *controlp = m_copy(m, 0, m->m_len); - m = m->m_next; - } else { - sbfree(&so->so_rcv, m); - so->so_rcv.sb_mb = m->m_next; - m->m_next = NULL; - if (pr->pr_domain->dom_externalize) - error = - (*pr->pr_domain->dom_externalize)(m, controlp); - else if (controlp) - *controlp = m; - else - m_freem(m); - m = so->so_rcv.sb_mb; - } - if (controlp) { - orig_resid = 0; - while (*controlp != NULL) - controlp = &(*controlp)->m_next; - } + if (m && m->m_type == MT_CONTROL) { + do { + if (flags & MSG_PEEK) { + if (controlp) { + *controlp = m_copy(m, 0, m->m_len); + if (*controlp == NULL) { + error = ENOBUFS; + goto release; + } + controlp = &(*controlp)->m_next; + } + m = m->m_next; + } else { + sbfree(&so->so_rcv, m); + so->so_rcv.sb_mb = m->m_next; + m->m_next = NULL; + if (controlp) { + /* + * Link mbufs together for processing + * below. See the comments there for + * an explanation of why we delay the + * work. + */ + *cme = m; + cme = &(*cme)->m_next; + } else + m_free(m); + m = so->so_rcv.sb_mb; + } + } while (m && m->m_type == MT_CONTROL); + orig_resid = 0; } if (m) { if ((flags & MSG_PEEK) == 0) { @@ -1132,7 +1151,7 @@ } if (orig_resid == uio->uio_resid && orig_resid && (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) - goto restart; + goto restart; /* XXX multi-counts msgs */ if (flagsp) *flagsp |= flags; @@ -1140,6 +1159,20 @@ sbunlock(&so->so_rcv); out: SOCKBUF_UNLOCK(&so->so_rcv); + if (cm != NULL) { + /* + * Deal with control data now that we've dopped the + * sockbuf lock. This is important as otherwise, for + * unix domain sockets, we create a LOR between so_rcv + * and the file descriptor lock. Note we assume the + * externalize method handles a list of mbufs. + */ + if (error == 0 && pr->pr_domain->dom_externalize) { + /* XXX ignore error? */ + error = (*pr->pr_domain->dom_externalize)(cm, controlp); + } else + m_freem(cm); + } return (error); } From owner-p4-projects@FreeBSD.ORG Mon Dec 22 17:39:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADA3716A4D0; Mon, 22 Dec 2003 17:39: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 87BCF16A4CE for ; Mon, 22 Dec 2003 17:39:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5DB943D3F for ; Mon, 22 Dec 2003 17:39:17 -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.10/8.12.10) with ESMTP id hBN1dH0B027409 for ; Mon, 22 Dec 2003 17:39:17 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBN1dHXk027406 for perforce@freebsd.org; Mon, 22 Dec 2003 17:39:17 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 22 Dec 2003 17:39:17 -0800 (PST) Message-Id: <200312230139.hBN1dHXk027406@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 44210 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, 23 Dec 2003 01:39:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=44210 Change 44210 by rwatson@rwatson_powerbook on 2003/12/22 17:38:47 Define one include per line, so that diffs make more sense and there are fewer conflicts. Add sbuf.h. Affected files ... .. //depot/projects/trustedbsd/sedarwin/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/Makefile#5 (text+ko) ==== @@ -3,7 +3,13 @@ dummy: @echo Please following the directions in bootstrap_instructions.txt -TBSDHEADERS=extattr.h mac.h mac_policy.h _label.h ucred.h +TBSDHEADERS=\ + _label.h \ + extattr.h \ + mac.h \ + mac_policy.h \ + sbuf.h \ + ucred.h SRC1=apsl/xnu/bsd/sys DEST1=/usr/include/sys From owner-p4-projects@FreeBSD.ORG Mon Dec 22 17:47:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B87816A4D0; Mon, 22 Dec 2003 17:47: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 1BB7216A4CE for ; Mon, 22 Dec 2003 17:47:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86CCF43D41 for ; Mon, 22 Dec 2003 17:47:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBN1lT0B029406 for ; Mon, 22 Dec 2003 17:47:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBN1lT1V029403 for perforce@freebsd.org; Mon, 22 Dec 2003 17:47:29 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 22 Dec 2003 17:47:29 -0800 (PST) Message-Id: <200312230147.hBN1lT1V029403@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 44212 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, 23 Dec 2003 01:47:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=44212 Change 44212 by peter@peter_daintree on 2003/12/22 17:46:41 checkpoint of what I was doing to get rid of some stackgap abuse. The only thing we actually need here is using a different ld-elf.so.1, and use different library search paths to go from there. This allows an intercept at execve() time instead of translating all the file paths. While here, optimize elf exec a bit. This eliminates a malloc()/snprintf()/free() that actually doesn't do a damn thing in the native code path. Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#8 edit .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#11 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#6 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#5 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#5 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#5 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#5 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_util.h#2 edit .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#8 edit .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#8 edit .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#8 edit .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#10 edit .. //depot/projects/hammer/sys/kern/imgact_elf.c#11 edit .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#7 edit .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#8 edit .. //depot/projects/hammer/sys/sys/imgact_elf.h#3 edit Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#8 (text+ko) ==== @@ -81,15 +81,31 @@ ELFOSABI_FREEBSD, EM_ALPHA, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec + &elf64_freebsd_sysvec, + NULL, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); +static Elf64_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_oinfo); + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#11 (text+ko) ==== @@ -78,15 +78,30 @@ ELFOSABI_FREEBSD, EM_X86_64, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec + &elf64_freebsd_sysvec, + NULL, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); +static Elf64_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_X86_64, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_oinfo); + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -84,157 +84,7 @@ CTASSERT(sizeof(struct statfs32) == 256); CTASSERT(sizeof(struct rusage32) == 72); -/* - * [ taken from the linux emulator ] - * Search an alternate path before passing pathname arguments on - * to system calls. Useful for keeping a separate 'emulation tree'. - * - * If cflag is set, we check if an attempt can be made to create - * the named file, i.e. we check if the directory it should - * be in exists. - */ int -freebsd32_emul_find(td, sgp, prefix, path, pbuf, cflag) - struct thread *td; - caddr_t *sgp; /* Pointer to stackgap memory */ - const char *prefix; - char *path; - char **pbuf; - int cflag; -{ - int error; - size_t len, sz; - char *buf, *cp, *ptr; - struct ucred *ucred; - struct nameidata nd; - struct nameidata ndroot; - struct vattr vat; - struct vattr vatroot; - - buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - *pbuf = path; - - for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++) - continue; - - sz = MAXPATHLEN - (ptr - buf); - - /* - * If sgp is not given then the path is already in kernel space - */ - if (sgp == NULL) - error = copystr(path, ptr, sz, &len); - else - error = copyinstr(path, ptr, sz, &len); - - if (error) { - free(buf, M_TEMP); - return error; - } - - if (*ptr != '/') { - free(buf, M_TEMP); - return EINVAL; - } - - /* - * We know that there is a / somewhere in this pathname. - * Search backwards for it, to find the file's parent dir - * to see if it exists in the alternate tree. If it does, - * and we want to create a file (cflag is set). We don't - * need to worry about the root comparison in this case. - */ - - if (cflag) { - for (cp = &ptr[len] - 1; *cp != '/'; cp--) - ; - *cp = '\0'; - - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, buf, td); - - if ((error = namei(&nd)) != 0) { - free(buf, M_TEMP); - return error; - } - - *cp = '/'; - } else { - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, buf, td); - - if ((error = namei(&nd)) != 0) { - free(buf, M_TEMP); - return error; - } - - /* - * We now compare the vnode of the freebsd32_root to the one - * vnode asked. If they resolve to be the same, then we - * ignore the match so that the real root gets used. - * This avoids the problem of traversing "../.." to find the - * root directory and never finding it, because "/" resolves - * to the emulation root directory. This is expensive :-( - */ - NDINIT(&ndroot, LOOKUP, FOLLOW, UIO_SYSSPACE, - freebsd32_emul_path, td); - - if ((error = namei(&ndroot)) != 0) { - /* Cannot happen! */ - free(buf, M_TEMP); - vrele(nd.ni_vp); - return error; - } - - ucred = td->td_ucred; - if ((error = VOP_GETATTR(nd.ni_vp, &vat, ucred, td)) != 0) { - goto bad; - } - - if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, ucred, - td)) != 0) { - goto bad; - } - - if (vat.va_fsid == vatroot.va_fsid && - vat.va_fileid == vatroot.va_fileid) { - error = ENOENT; - goto bad; - } - - } - if (sgp == NULL) - *pbuf = buf; - else { - sz = &ptr[len] - buf; - *pbuf = stackgap_alloc(sgp, sz + 1); - error = copyout(buf, *pbuf, sz); - free(buf, M_TEMP); - } - - vrele(nd.ni_vp); - if (!cflag) - vrele(ndroot.ni_vp); - - return error; - -bad: - vrele(ndroot.ni_vp); - vrele(nd.ni_vp); - free(buf, M_TEMP); - return error; -} - -int -freebsd32_open(struct thread *td, struct freebsd32_open_args *uap) -{ - caddr_t sg; - - sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); - - return open(td, (struct open_args *) uap); -} - -int freebsd32_wait4(struct thread *td, struct freebsd32_wait4_args *uap) { int error; @@ -333,28 +183,6 @@ return (error); } -int -freebsd32_access(struct thread *td, struct freebsd32_access_args *uap) -{ - caddr_t sg; - - sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); - - return access(td, (struct access_args *)uap); -} - -int -freebsd32_chflags(struct thread *td, struct freebsd32_chflags_args *uap) -{ - caddr_t sg; - - sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->path); - - return chflags(td, (struct chflags_args *)uap); -} - struct sigaltstack32 { u_int32_t ss_sp; u_int32_t ss_size; @@ -402,7 +230,6 @@ int count; sg = stackgap_init(); - CHECKALTEXIST(td, &sg, uap->fname); ap.fname = uap->fname; if (uap->argv) { ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#5 (text+ko) ==== @@ -32,11 +32,6 @@ #define PADR_(t) 0 #endif -struct freebsd32_open_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; -}; struct freebsd32_wait4_args { char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)]; char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)]; @@ -48,14 +43,6 @@ char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; -struct freebsd32_access_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct freebsd32_chflags_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; struct freebsd32_sigaltstack_args { char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; @@ -227,11 +214,8 @@ struct freebsd32_sigreturn_args { char sigcntxp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd32_ucontext *)]; }; -int freebsd32_open(struct thread *, struct freebsd32_open_args *); int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_getfsstat(struct thread *, struct freebsd32_getfsstat_args *); -int freebsd32_access(struct thread *, struct freebsd32_access_args *); -int freebsd32_chflags(struct thread *, struct freebsd32_chflags_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#5 (text+ko) ==== @@ -11,7 +11,7 @@ #define FREEBSD32_SYS_fork 2 #define FREEBSD32_SYS_read 3 #define FREEBSD32_SYS_write 4 -#define FREEBSD32_SYS_freebsd32_open 5 +#define FREEBSD32_SYS_open 5 #define FREEBSD32_SYS_close 6 #define FREEBSD32_SYS_freebsd32_wait4 7 /* 8 is obsolete old creat */ @@ -38,8 +38,8 @@ #define FREEBSD32_SYS_accept 30 #define FREEBSD32_SYS_getpeername 31 #define FREEBSD32_SYS_getsockname 32 -#define FREEBSD32_SYS_freebsd32_access 33 -#define FREEBSD32_SYS_freebsd32_chflags 34 +#define FREEBSD32_SYS_access 33 +#define FREEBSD32_SYS_chflags 34 #define FREEBSD32_SYS_fchflags 35 #define FREEBSD32_SYS_sync 36 #define FREEBSD32_SYS_kill 37 ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#5 (text+ko) ==== @@ -12,7 +12,7 @@ "fork", /* 2 = fork */ "read", /* 3 = read */ "write", /* 4 = write */ - "freebsd32_open", /* 5 = freebsd32_open */ + "open", /* 5 = open */ "close", /* 6 = close */ "freebsd32_wait4", /* 7 = freebsd32_wait4 */ "obs_old", /* 8 = obsolete old creat */ @@ -40,8 +40,8 @@ "accept", /* 30 = accept */ "getpeername", /* 31 = getpeername */ "getsockname", /* 32 = getsockname */ - "freebsd32_access", /* 33 = freebsd32_access */ - "freebsd32_chflags", /* 34 = freebsd32_chflags */ + "access", /* 33 = access */ + "chflags", /* 34 = chflags */ "fchflags", /* 35 = fchflags */ "sync", /* 36 = sync */ "kill", /* 37 = kill */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ { SYF_MPSAFE | 0, (sy_call_t *)fork }, /* 2 = fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */ - { AS(freebsd32_open_args), (sy_call_t *)freebsd32_open }, /* 5 = freebsd32_open */ + { AS(open_args), (sy_call_t *)open }, /* 5 = open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ { SYF_MPSAFE | AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4 }, /* 7 = freebsd32_wait4 */ { 0, (sy_call_t *)nosys }, /* 8 = obsolete old creat */ @@ -58,8 +58,8 @@ { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept }, /* 30 = accept */ { SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername }, /* 31 = getpeername */ { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname }, /* 32 = getsockname */ - { AS(freebsd32_access_args), (sy_call_t *)freebsd32_access }, /* 33 = freebsd32_access */ - { AS(freebsd32_chflags_args), (sy_call_t *)freebsd32_chflags }, /* 34 = freebsd32_chflags */ + { AS(access_args), (sy_call_t *)access }, /* 33 = access */ + { AS(chflags_args), (sy_call_t *)chflags }, /* 34 = chflags */ { AS(fchflags_args), (sy_call_t *)fchflags }, /* 35 = fchflags */ { 0, (sy_call_t *)sync }, /* 36 = sync */ { SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill }, /* 37 = kill */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_util.h#2 (text+ko) ==== @@ -74,22 +74,3 @@ *sgp += ALIGN(sz); return p; } - - -extern const char freebsd32_emul_path[]; -int freebsd32_emul_find(struct thread *, caddr_t *, const char *, char *, - char **, int); - -#define CHECKALT(p, sgp, path, i) \ - do { \ - int _error; \ - \ - _error = freebsd32_emul_find(p, sgp, \ - freebsd32_emul_path, path, \ - &path, i); \ - if (_error == EFAULT) \ - return (_error); \ - } while (0) - -#define CHECKALTEXIST(p, sgp, path) CHECKALT((p), (sgp), (path), 0) -#define CHECKALTCREAT(p, sgp, path) CHECKALT((p), (sgp), (path), 1) ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#8 (text+ko) ==== @@ -20,7 +20,7 @@ 2 MNOPROTO POSIX { int fork(void); } 3 MNOPROTO POSIX { ssize_t read(int fd, void *buf, size_t nbyte); } 4 MNOPROTO POSIX { ssize_t write(int fd, const void *buf, size_t nbyte); } -5 STD POSIX { int freebsd32_open(char *path, int flags, int mode); } +5 NOPROTO POSIX { int open(char *path, int flags, int mode); } 6 MNOPROTO POSIX { int close(int fd); } 7 MSTD BSD { int freebsd32_wait4(int pid, int *status, int options, \ struct rusage32 *rusage); } @@ -55,8 +55,8 @@ 30 MNOPROTO BSD { int accept(int s, caddr_t name, int *anamelen); } 31 MNOPROTO BSD { int getpeername(int fdes, caddr_t asa, int *alen); } 32 MNOPROTO BSD { int getsockname(int fdes, caddr_t asa, int *alen); } -33 STD POSIX { int freebsd32_access(char *path, int flags); } -34 STD BSD { int freebsd32_chflags(char *path, int flags); } +33 NOPROTO POSIX { int access(char *path, int flags); } +34 NOPROTO BSD { int chflags(char *path, int flags); } 35 NOPROTO BSD { int fchflags(int fd, int flags); } 36 NOPROTO BSD { int sync(void); } 37 MNOPROTO POSIX { int kill(int pid, int signum); } ==== //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#8 (text+ko) ==== @@ -129,21 +129,34 @@ }; -const char freebsd32_emul_path[] = "/compat/ia32"; - static Elf32_Brandinfo ia32_brand_info = { ELFOSABI_FREEBSD, EM_386, "FreeBSD", - "/compat/ia32", - "/usr/libexec/ld-elf.so.1", - &ia32_freebsd_sysvec + NULL, + "/libexec/ld-elf.so.1", + &ia32_freebsd_sysvec, + "/libexec/ld-elf-32.so.1", }; SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &ia32_brand_info); +static Elf32_Brandinfo ia32_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_386, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &ia32_freebsd_sysvec, + "/usr/libexec/ld-elf-32.so.1", + }; + +SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &ia32_brand_oinfo); + /* XXX may be freebsd32 MI */ static register_t * ia32_copyout_strings(struct image_params *imgp) ==== //depot/projects/hammer/sys/i386/i386/elf_machdep.c#8 (text+ko) ==== @@ -78,15 +78,30 @@ ELFOSABI_FREEBSD, EM_386, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec + &elf32_freebsd_sysvec, + NULL, }; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); +static Elf32_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_386, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf32_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd_brand_oinfo); + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) ==== //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#10 (text+ko) ==== @@ -84,15 +84,30 @@ ELFOSABI_FREEBSD, EM_IA_64, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec + &elf64_freebsd_sysvec, + NULL, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); +static Elf64_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_IA_64, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_oinfo); + Elf_Addr link_elf_get_gp(linker_file_t); extern Elf_Addr fptr_storage[]; ==== //depot/projects/hammer/sys/kern/imgact_elf.c#11 (text+ko) ==== @@ -708,6 +708,8 @@ goto fail; } sv = brand_info->sysvec; + if (brand_info->interp_newpath != NULL) + interp = brand_info->interp_newpath; if ((error = exec_extract_strings(imgp)) != 0) goto fail; @@ -818,21 +820,24 @@ imgp->entry_addr = entry; imgp->proc->p_sysent = sv; - if (interp != NULL) { + if (interp != NULL && brand_info->emul_path != NULL && + brand_info->emul_path[0] != '\0') { path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); snprintf(path, MAXPATHLEN, "%s%s", brand_info->emul_path, interp); - if ((error = __elfN(load_file)(imgp->proc, path, &addr, - &imgp->entry_addr, sv->sv_pagesize)) != 0) { - if ((error = __elfN(load_file)(imgp->proc, interp, - &addr, &imgp->entry_addr, sv->sv_pagesize)) != 0) { - uprintf("ELF interpreter %s not found\n", - path); - free(path, M_TEMP); - goto fail; - } + error = __elfN(load_file)(imgp->proc, path, &addr, + &imgp->entry_addr, sv->sv_pagesize); + free(path, M_TEMP); + if (error == 0) + interp = NULL; + } + if (interp != NULL) { + error = __elfN(load_file)(imgp->proc, interp, &addr, + &imgp->entry_addr, sv->sv_pagesize); + if (error != 0) { + uprintf("ELF interpreter %s not found\n", interp); + goto fail; } - free(path, M_TEMP); } /* ==== //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#7 (text+ko) ==== @@ -80,15 +80,30 @@ ELFOSABI_FREEBSD, EM_PPC, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec + &elf32_freebsd_sysvec, + NULL, }; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); +static Elf32_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_PPC, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf32_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd_brand_oinfo); + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) ==== //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#8 (text+ko) ==== @@ -91,15 +91,30 @@ ELFOSABI_FREEBSD, EM_SPARCV9, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec + &elf64_freebsd_sysvec, + NULL, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); +static Elf64_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_SPARCV9, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_oinfo); + /* * The following table holds for each relocation type: * - the width in bits of the memory location the relocation ==== //depot/projects/hammer/sys/sys/imgact_elf.h#3 (text+ko) ==== @@ -61,13 +61,14 @@ const char *compat_3_brand; /* pre Binutils 2.10 method (FBSD 3) */ const char *emul_path; const char *interp_path; - struct sysentvec *sysvec; + struct sysentvec *sysvec; + const char *interp_newpath; } __ElfN(Brandinfo); __ElfType(Auxargs); __ElfType(Brandinfo); -#define MAX_BRANDS 8 +#define MAX_BRANDS 8 int __elfN(brand_inuse)(Elf_Brandinfo *entry); int __elfN(insert_brand_entry)(Elf_Brandinfo *entry); From owner-p4-projects@FreeBSD.ORG Mon Dec 22 18:22:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87E2716A4D0; Mon, 22 Dec 2003 18:22: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 6048816A4CE for ; Mon, 22 Dec 2003 18:22:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C49043D46 for ; Mon, 22 Dec 2003 18:22:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBN2MD0B037893 for ; Mon, 22 Dec 2003 18:22:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBN2MDZ2037887 for perforce@freebsd.org; Mon, 22 Dec 2003 18:22:13 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 22 Dec 2003 18:22:13 -0800 (PST) Message-Id: <200312230222.hBN2MDZ2037887@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 44215 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, 23 Dec 2003 02:22:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=44215 Change 44215 by peter@peter_daintree on 2003/12/22 18:21:22 dont set interp if it wasn't already set. Affected files ... .. //depot/projects/hammer/sys/kern/imgact_elf.c#12 edit Differences ... ==== //depot/projects/hammer/sys/kern/imgact_elf.c#12 (text+ko) ==== @@ -708,7 +708,7 @@ goto fail; } sv = brand_info->sysvec; - if (brand_info->interp_newpath != NULL) + if (interp != NULL && brand_info->interp_newpath != NULL) interp = brand_info->interp_newpath; if ((error = exec_extract_strings(imgp)) != 0) From owner-p4-projects@FreeBSD.ORG Mon Dec 22 18:24:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B34B016A4D0; Mon, 22 Dec 2003 18:24:17 -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 8E13A16A4CE for ; Mon, 22 Dec 2003 18:24:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C0CE43D1D for ; Mon, 22 Dec 2003 18:24:16 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBN2OG0B038162 for ; Mon, 22 Dec 2003 18:24:16 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBN2OGj3038159 for perforce@freebsd.org; Mon, 22 Dec 2003 18:24:16 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 22 Dec 2003 18:24:16 -0800 (PST) Message-Id: <200312230224.hBN2OGj3038159@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 44216 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, 23 Dec 2003 02:24:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=44216 Change 44216 by peter@peter_daintree on 2003/12/22 18:24:00 do the other abis as well Affected files ... .. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#7 edit .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#9 edit .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#13 edit Differences ... ==== //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#7 (text+ko) ==== @@ -210,7 +210,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.1", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; static Elf64_Brandinfo linux_glibc2brand = { @@ -219,7 +220,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.2", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; Elf64_Brandinfo *linux_brandlist[] = { ==== //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#9 (text+ko) ==== @@ -199,7 +199,8 @@ "SVR4", svr4_emul_path, "/lib/libc.so.1", - &svr4_sysvec + &svr4_sysvec, + NULL, }; const char svr4_emul_path[] = "/compat/svr4"; ==== //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#13 (text+ko) ==== @@ -899,7 +899,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.1", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; static Elf32_Brandinfo linux_glibc2brand = { @@ -908,7 +909,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.2", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; Elf32_Brandinfo *linux_brandlist[] = { From owner-p4-projects@FreeBSD.ORG Mon Dec 22 19:19:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4E9A16A4D0; Mon, 22 Dec 2003 19:19: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 7494B16A4CE for ; Mon, 22 Dec 2003 19:19:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A2EC43D2D for ; Mon, 22 Dec 2003 19:19:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBN3JT0B050086 for ; Mon, 22 Dec 2003 19:19:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBN3JRW8050083 for perforce@freebsd.org; Mon, 22 Dec 2003 19:19:27 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 22 Dec 2003 19:19:27 -0800 (PST) Message-Id: <200312230319.hBN3JRW8050083@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 44223 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, 23 Dec 2003 03:19:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=44223 Change 44223 by peter@peter_daintree on 2003/12/22 19:18:49 IFC @44221 Affected files ... .. //depot/projects/hammer/UPDATING#30 integrate .. //depot/projects/hammer/bin/chmod/chmod.c#5 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/freebsd.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#10 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/freebsd.h#7 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#7 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#18 integrate .. //depot/projects/hammer/etc/devd.conf#7 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#13 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#16 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#14 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#6 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#1 branch .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/auto-host.h#9 integrate .. //depot/projects/hammer/include/fnmatch.h#3 integrate .. //depot/projects/hammer/include/regex.h#3 integrate .. //depot/projects/hammer/kerberos5/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/libc/Makefile#11 integrate .. //depot/projects/hammer/lib/libc/locale/gbk.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/atexit.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/atexit.h#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/exit.c#2 integrate .. //depot/projects/hammer/lib/libc/string/index.c#3 integrate .. //depot/projects/hammer/lib/libc/string/rindex.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/ktrace.2#6 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_write.c#5 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_echo/pam_echo.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_group/pam_group.c#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/pam_krb5.c#5 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ksu/pam_ksu.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_login_access/pam_login_access.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_rhosts/pam_rhosts.c#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_securetty/pam_securetty.c#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#28 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#21 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#3 integrate .. //depot/projects/hammer/lib/libusbhid/usbhid.3#5 integrate .. //depot/projects/hammer/libexec/rshd/rshd.8#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#9 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#53 integrate .. //depot/projects/hammer/release/i386/drivers.conf#16 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#11 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#15 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#17 integrate .. //depot/projects/hammer/share/colldef/Makefile#10 integrate .. //depot/projects/hammer/share/colldef/be_BY.CP1131.src#1 branch .. //depot/projects/hammer/share/colldef/be_BY.CP1251.src#1 branch .. //depot/projects/hammer/share/colldef/be_BY.ISO8859-5.src#1 branch .. //depot/projects/hammer/share/colldef/map.CP1131#1 branch .. //depot/projects/hammer/share/man/man4/Makefile#31 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#15 integrate .. //depot/projects/hammer/share/man/man4/ata.4#6 integrate .. //depot/projects/hammer/share/man/man4/ath.4#9 integrate .. //depot/projects/hammer/share/man/man4/firewire.4#5 integrate .. //depot/projects/hammer/share/man/man4/fpa.4#3 integrate .. //depot/projects/hammer/share/man/man4/fwe.4#3 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#12 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ndis.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#4 integrate .. //depot/projects/hammer/share/man/man4/pccbb.4#4 integrate .. //depot/projects/hammer/share/man/man4/sbp.4#5 integrate .. //depot/projects/hammer/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/hammer/share/man/man4/umass.4#10 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#5 integrate .. //depot/projects/hammer/share/man/man9/Makefile#23 integrate .. //depot/projects/hammer/share/man/man9/cr_seeothergids.9#1 branch .. //depot/projects/hammer/share/man/man9/cr_seeotheruids.9#1 branch .. //depot/projects/hammer/share/man/man9/hexdump.9#2 integrate .. //depot/projects/hammer/share/man/man9/mutex.9#6 integrate .. //depot/projects/hammer/share/man/man9/p_candebug.9#1 branch .. //depot/projects/hammer/share/man/man9/prison_check.9#1 branch .. //depot/projects/hammer/share/mklocale/Makefile#9 integrate .. //depot/projects/hammer/share/mklocale/be_BY.CP1131.src#1 branch .. //depot/projects/hammer/share/mklocale/zh_HK.Big5HKSCS.src#1 branch .. //depot/projects/hammer/share/monetdef/Makefile#9 integrate .. //depot/projects/hammer/share/monetdef/be_BY.CP1131.src#1 branch .. //depot/projects/hammer/share/monetdef/be_BY.CP1251.src#1 branch .. //depot/projects/hammer/share/monetdef/be_BY.ISO8859-5.src#1 branch .. //depot/projects/hammer/share/msgdef/Makefile#9 integrate .. //depot/projects/hammer/share/msgdef/be_BY.CP1131.src#1 branch .. //depot/projects/hammer/share/msgdef/be_BY.CP1251.src#1 branch .. //depot/projects/hammer/share/msgdef/be_BY.ISO8859-5.src#1 branch .. //depot/projects/hammer/share/numericdef/Makefile#8 integrate .. //depot/projects/hammer/share/numericdef/be_BY.CP1251.src#1 branch .. //depot/projects/hammer/share/syscons/fonts/INDEX.fonts#4 integrate .. //depot/projects/hammer/share/syscons/fonts/Makefile#3 integrate .. //depot/projects/hammer/share/syscons/fonts/swiss-1131-8x16.fnt#1 branch .. //depot/projects/hammer/share/syscons/fonts/swiss-1251-8x16.fnt#1 branch .. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#7 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#7 integrate .. //depot/projects/hammer/share/syscons/keymaps/by.cp1131.kbd#1 branch .. //depot/projects/hammer/share/syscons/keymaps/by.cp1251.kbd#1 branch .. //depot/projects/hammer/share/syscons/keymaps/by.iso5.kbd#1 branch .. //depot/projects/hammer/share/timedef/Makefile#9 integrate .. //depot/projects/hammer/share/timedef/be_BY.CP1131.src#1 branch .. //depot/projects/hammer/share/timedef/be_BY.CP1251.src#1 branch .. //depot/projects/hammer/share/timedef/be_BY.ISO8859-5.src#1 branch .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dump_machdep.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#9 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#8 integrate .. //depot/projects/hammer/sys/alpha/pci/apecs.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#51 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#50 integrate .. //depot/projects/hammer/sys/amd64/include/apicreg.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#14 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.s#5 integrate .. //depot/projects/hammer/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/hammer/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/devicename.c#5 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_disk.c#4 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_util.h#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/hammer/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/hammer/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/hammer/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#10 integrate .. //depot/projects/hammer/sys/conf/files#43 integrate .. //depot/projects/hammer/sys/conf/files.i386#20 integrate .. //depot/projects/hammer/sys/conf/majors#19 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#18 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#9 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7770.c#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#11 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.seq#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_inline.h#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#9 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.h#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.reg#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.seq#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_93cx6.c#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_inline.h#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.c#1 branch .. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.h#1 branch .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_scan.l#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#22 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#14 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/hammer/sys/dev/bktr/ioctl_bt848.h#2 integrate .. //depot/projects/hammer/sys/dev/bktr/ioctl_meteor.h#2 integrate .. //depot/projects/hammer/sys/dev/bktr/msp34xx.c#3 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#17 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#17 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#1 branch .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#1 branch .. //depot/projects/hammer/sys/dev/led/led.c#5 integrate .. //depot/projects/hammer/sys/dev/md/md.c#19 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#7 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#20 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/ohcivar.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#21 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#21 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#10 integrate .. //depot/projects/hammer/sys/dev/vinum/vinum.c#8 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#11 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#8 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#7 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#26 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/hammer/sys/i386/include/cpu.h#4 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#6 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#14 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#11 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#32 integrate .. //depot/projects/hammer/sys/isa/psm.c#12 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#39 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#23 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#12 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/hammer/sys/modules/Makefile#33 integrate .. //depot/projects/hammer/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/if_ndis/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ndis/Makefile#1 branch .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_etf.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.h#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#6 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#13 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#9 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#17 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_mbuf.c#5 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/hammer/sys/opencrypto/crmbuf.c#3 delete .. //depot/projects/hammer/sys/opencrypto/cryptodev.h#6 integrate .. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#5 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#25 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#20 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#16 integrate .. //depot/projects/hammer/sys/security/mac/mac_net.c#8 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#22 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#16 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#22 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#6 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#20 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#9 integrate .. //depot/projects/hammer/sys/sys/_null.h#2 integrate .. //depot/projects/hammer/sys/sys/imgact_elf.h#4 integrate .. //depot/projects/hammer/sys/sys/mac.h#17 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#16 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#17 integrate .. //depot/projects/hammer/sys/sys/param.h#25 integrate .. //depot/projects/hammer/sys/sys/proc.h#40 integrate .. //depot/projects/hammer/sys/sys/umtx.h#3 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#8 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#19 integrate .. //depot/projects/hammer/tools/debugscripts/README#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/etc/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/experimental.rc#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#8 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#3 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military#1 branch .. //depot/projects/hammer/usr.bin/make/job.h#6 integrate .. //depot/projects/hammer/usr.bin/make/main.c#12 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#10 integrate .. //depot/projects/hammer/usr.sbin/Makefile#37 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.8#4 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#7 integrate .. //depot/projects/hammer/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/ndiscvt/inf-parse.y#1 branch .. //depot/projects/hammer/usr.sbin/ndiscvt/inf-token.l#1 branch .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#1 branch .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.h#1 branch .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.8#1 branch .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.c#1 branch .. //depot/projects/hammer/usr.sbin/pkg_install/add/extract.c#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pl.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#11 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#12 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/securelevel.hlp#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#16 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#20 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/system.c#3 integrate Differences ... ==== //depot/projects/hammer/UPDATING#30 (text+ko) ==== @@ -17,6 +17,18 @@ developers choose to disable these features on build machines to maximize performance. +20031213: + src/lib/libc/gen/initgroups.c:1.8 now causes logins to fail + if the login process is unable to successfully set the + process credentials to include all groups defined for the + user. The current kernel limit is 16 groups; administrators + may wish to check that users do not have over 16 groups + defined, or they will be unable to log in. + +20031203: + The ACPI module has been reactivated. It is no longer required + to compile ACPI support into kernels statically. + 20031112: The statfs structure has been updated with 64-bit fields to allow accurate reporting of multi-terabyte filesystem @@ -1439,4 +1451,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.283 2003/12/10 15:59:20 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.285 2003/12/15 19:19:16 jhb Exp $ ==== //depot/projects/hammer/bin/chmod/chmod.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.30 2003/10/31 13:20:09 tobez Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.31 2003/12/16 15:17:30 ru Exp $"); #include #include @@ -191,7 +191,7 @@ rval = 1; } else { if (vflag) { - (void)printf("%s", p->fts_accpath); + (void)printf("%s", p->fts_path); if (vflag > 1) { char m1[12], m2[12]; ==== //depot/projects/hammer/contrib/gcc/config/alpha/freebsd.h#5 (text+ko) ==== @@ -20,17 +20,18 @@ Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/alpha/freebsd.h,v 1.17 2003/08/24 16:56:31 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/alpha/freebsd.h,v 1.18 2003/12/15 10:34:00 obrien Exp $ */ /* Provide a FBSD_TARGET_CPU_CPP_BUILTINS and CPP_SPEC appropriate for FreeBSD/alpha. Besides the dealing with the GCC option `-posix', and PIC issues as on all FreeBSD platforms, we must deal with the Alpha's FP issues. */ -#undef FBSD_TARGET_CPU_CPP_BUILTINS +#undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ { \ + builtin_define ("__LP64__"); \ if (flag_pic) \ { \ builtin_define ("__PIC__"); \ ==== //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#10 (text+ko) ==== @@ -22,7 +22,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.66 2003/08/24 16:56:31 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.67 2003/12/22 04:27:17 kan Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" @@ -153,18 +153,26 @@ #undef ASM_OUTPUT_LABELREF #define ASM_OUTPUT_LABELREF(FILE, NAME) \ do { \ - char *_name = (NAME); \ + const char *xname = (NAME); \ /* Hack to avoid writing lots of rtl in \ FUNCTION_PROFILER_EPILOGUE (). */ \ - if (*_name == '.' && strcmp(_name + 1, "mexitcount") == 0) \ + if (*xname == '.' && strcmp(xname + 1, "mexitcount") == 0) \ { \ if (flag_pic) \ - fprintf ((FILE), "*%s@GOT(%%ebx)", _name); \ + fprintf ((FILE), "*%s@GOT(%%ebx)", xname); \ else \ - fprintf ((FILE), "%s", _name); \ + fprintf ((FILE), "%s", xname); \ + } \ + else \ + { \ + if (xname[0] == '%') \ + xname += 2; \ + if (xname[0] == '*') \ + xname += 1; \ + else \ + fputs (user_label_prefix, FILE); \ + fputs (xname, FILE); \ } \ - else \ - fprintf (FILE, "%s", _name); \ } while (0) /* This is how to hack on the symbol code of certain relcalcitrant ==== //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#5 (text+ko) ==== @@ -19,12 +19,23 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.6 2003/08/17 08:17:44 gordon Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.8 2003/12/16 05:40:06 obrien Exp $ */ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (FreeBSD/x86-64 ELF)"); +#undef FBSD_TARGET_CPU_CPP_BUILTINS +#define FBSD_TARGET_CPU_CPP_BUILTINS() \ + do \ + { \ + if (TARGET_64BIT) \ + { \ + builtin_define ("__LP64__"); \ + } \ + } \ + while (0) + /* Provide a LINK_SPEC appropriate for the FreeBSD/x86-64 ELF target. This is a copy of LINK_SPEC from tweaked for the x86-64 target. */ ==== //depot/projects/hammer/contrib/gcc/config/sparc/freebsd.h#7 (text+ko) ==== @@ -18,7 +18,7 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.7 2003/08/17 08:17:44 gordon Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.8 2003/12/15 10:34:01 obrien Exp $ */ /* FreeBSD needs the platform name (sparc64) defined. Emacs needs to know if the arch is 64 or 32-bits. */ @@ -27,6 +27,14 @@ #define CPP_CPU64_DEFAULT_SPEC \ "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__" +#undef FBSD_TARGET_CPU_CPP_BUILTINS +#define FBSD_TARGET_CPU_CPP_BUILTINS() \ + do \ + { \ + builtin_define ("__LP64__"); \ + } \ + while (0) + /* Because we include sparc/sysv4.h. */ #undef CPP_PREDEFINES /* Do not define it here, we now use TARGET_OS_CPP_BUILTINS. */ ==== //depot/projects/hammer/etc/defaults/periodic.conf#7 (text+ko) ==== @@ -10,7 +10,7 @@ # values set in this file. This eases the upgrade path when defaults # are changed and new features are added. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.26 2003/10/27 20:14:53 jesper Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.27 2003/12/12 21:23:27 jesper Exp $ # # What files override these defaults ? @@ -86,7 +86,7 @@ daily_status_disks_df_flags="-k -t nonfs" # df(1) flags for check # 405.status-ata_raid -status_ata_raid_enable="NO" # Check ATA raid status +daily_status_ata_raid_enable="NO" # Check ATA raid status # 420.status-network daily_status_network_enable="YES" # Check network status ==== //depot/projects/hammer/etc/defaults/rc.conf#18 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.191 2003/11/28 17:28:42 bms Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.194 2003/12/18 04:39:57 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -441,6 +441,10 @@ devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing # devfs(8) rules. devfs_system_ruleset="" # The name of a ruleset to apply to /dev +performance_cx_lowest="HIGH" # Online CPU idle state +performance_throttle_state="HIGH" # Online throttling state +economy_cx_lowest="LOW" # Offline CPU idle state +economy_throttle_state="HIGH" # Offline throttling state ############################################################## ### Jail Configuration ####################################### ==== //depot/projects/hammer/etc/devd.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.9 2003/10/25 05:03:25 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.10 2003/12/18 04:39:57 njl Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -70,6 +70,13 @@ # action "logger Unknown device: $pnpinfo $location $bus"; }; +# Switch power profiles when the AC line state changes +notify 10 { + match "system" "ACPI"; + match "subsystem" "ACAD"; + action "/etc/rc.d/power_profile $notify"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/hammer/etc/mtree/BSD.local.dist#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.104 2003/11/29 18:22:01 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.106 2003/12/20 11:05:34 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -279,6 +279,12 @@ .. am_ET.UTF-8 .. + be_BY.CP1131 + .. + be_BY.CP1251 + .. + be_BY.ISO8859-5 + .. bg_BG.CP1251 .. ca_ES.ISO8859-1 @@ -457,6 +463,8 @@ .. zh_CN.eucCN .. + zh_HK.Big5HKSCS + .. zh_TW.Big5 .. .. ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.287 2003/11/29 18:22:01 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.289 2003/12/20 11:05:34 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -347,6 +347,12 @@ .. am_ET.UTF-8 .. + be_BY.CP1131 + .. + be_BY.CP1251 + .. + be_BY.ISO8859-5 + .. bg_BG.CP1251 .. ca_ES.ISO8859-1 @@ -527,6 +533,8 @@ .. zh_CN.eucCN .. + zh_HK.Big5HKSCS + .. zh_TW.Big5 .. .. @@ -683,6 +691,12 @@ .. am_ET.UTF-8 .. + be_BY.CP1131 + .. + be_BY.CP1251 + .. + be_BY.ISO8859-5 + .. bg_BG.CP1251 .. ca_ES.ISO8859-1 @@ -861,6 +875,8 @@ .. zh_CN.eucCN .. + zh_HK.Big5HKSCS + .. zh_TW.Big5 .. .. ==== //depot/projects/hammer/etc/rc.d/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.26 2003/10/30 17:55:52 ume Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.29 2003/12/18 04:39:57 njl Exp $ .include @@ -26,7 +26,7 @@ network_ipv6 nfsclient nfsd \ nfslocking nfsserver nisdomain ntpd ntpdate \ othermta \ - pccard pcvt ppp-user pppoed pwcheck \ + pccard pcvt power_profile ppp-user pppoed pwcheck \ quota \ random rarpd rcconf.sh root \ route6d routed routing rpcbind rtadvd rwho \ ==== //depot/projects/hammer/etc/rc.d/mountcritlocal#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.6 2003/12/09 08:17:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.8 2003/12/14 13:36:36 seanc Exp $ # # PROVIDE: mountcritlocal ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/auto-host.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.16 2003/07/13 02:41:48 kan Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.17 2003/12/19 18:20:48 kan Exp $ */ #ifndef __FreeBSD_version #include @@ -370,7 +370,7 @@ register C++ destructors for local statics and global objects. This is essential for fully standards-compliant handling of destructors, but requires __cxa_atexit in libc. */ -/* #undef DEFAULT_USE_CXA_ATEXIT */ +#define DEFAULT_USE_CXA_ATEXIT 1 /* Define if you want the C and C++ compilers to support multibyte character sets for source code. */ ==== //depot/projects/hammer/include/fnmatch.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/include/fnmatch.h,v 1.11 2002/09/17 22:25:40 mike Exp $ + * $FreeBSD: src/include/fnmatch.h,v 1.15 2003/12/18 10:41:39 jkh Exp $ * @(#)fnmatch.h 8.1 (Berkeley) 6/2/93 */ @@ -45,6 +45,10 @@ #define FNM_PATHNAME 0x02 /* Slash must be matched by slash. */ #define FNM_PERIOD 0x04 /* Period must be matched by period. */ +#if __XSI_VISIBLE +#define FNM_NOSYS (-1) /* Reserved. */ +#endif + #if __BSD_VISIBLE #define FNM_LEADING_DIR 0x08 /* Ignore / after Imatch. */ #define FNM_CASEFOLD 0x10 /* Case insensitive search. */ ==== //depot/projects/hammer/include/regex.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)regex.h 8.2 (Berkeley) 1/3/94 - * $FreeBSD: src/include/regex.h,v 1.6 2002/10/03 18:12:03 mike Exp $ + * $FreeBSD: src/include/regex.h,v 1.10 2003/12/18 10:41:39 jkh Exp $ */ #ifndef _REGEX_H_ @@ -75,6 +75,7 @@ #define REG_DUMP 0200 /* regerror() flags */ +#define REG_ENOSYS (-1) #define REG_NOMATCH 1 #define REG_BADPAT 2 #define REG_ECOLLATE 3 ==== //depot/projects/hammer/kerberos5/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.19 2003/07/18 13:21:55 markm Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.20 2003/12/17 16:13:10 nectar Exp $ DISTRIBUTION?= crypto NOLINT= true @@ -16,7 +16,7 @@ OPENLDAPBASE?= /usr/local LDAPLIBS=-lldap -llber LDAPCFLAGS=-I${OPENLDAPBASE}/include -DOPENLDAP=1 -LDAPLDADD=-L${OPENLDAPBASE}/lib ${LDAPLIBS} +LDAPLDADD=-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib ${LDAPLIBS} .endif .if exists(${.OBJDIR}/../../include) ==== //depot/projects/hammer/lib/libc/Makefile#11 (text+ko) ==== @@ -1,16 +1,15 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.46 2003/12/10 16:33:17 mikeh Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.47 2003/12/11 09:53:25 bde Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does # not contain these strings, add -DSTRIP_FBSDID (see ) to CFLAGS -# below. Note, there are no IDs for syscall stubs whose sources are generated. -# To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS -# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the -# system call stubs. +# below. Note: there are no IDs for syscall stubs whose sources are generated. +# To include legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS +# to CFLAGS below. -DSYSLIBC_SCCS affects just the system call stubs. LIB=c -# If you bump SHLIB_MAJOR, remove kluge from gen/gethostname.c. -# If you bump SHLIB_MAJOR, see standards/55112 +# If you bump SHLIB_MAJOR, remove the kluge from gen/gethostname.c. +# If you bump SHLIB_MAJOR, see standards/55112. SHLIB_MAJOR= 5 SHLIBDIR?= /lib WARNS?= 1 ==== //depot/projects/hammer/lib/libc/locale/gbk.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.3 2003/11/08 02:58:36 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.4 2003/12/19 12:54:42 ache Exp $"); #include #include @@ -68,7 +68,7 @@ { c &= 0xff; - return ((c >= 0x80 && c <= 0xfe) ? 2 : 1); + return ((c >= 0x81 && c <= 0xfe) ? 2 : 1); } size_t ==== //depot/projects/hammer/lib/libc/stdlib/atexit.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)atexit.c 8.2 (Berkeley) 7/3/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/atexit.c,v 1.6 2002/03/22 21:53:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/atexit.c,v 1.7 2003/12/19 17:11:20 kan Exp $"); #include "namespace.h" #include @@ -50,19 +50,38 @@ #include "libc_private.h" +#define ATEXIT_FN_EMPTY 0 +#define ATEXIT_FN_STD 1 +#define ATEXIT_FN_CXA 2 + static pthread_mutex_t atexit_mutex = PTHREAD_MUTEX_INITIALIZER; #define _MUTEX_LOCK(x) if (__isthreaded) _pthread_mutex_lock(x) #define _MUTEX_UNLOCK(x) if (__isthreaded) _pthread_mutex_unlock(x) -struct atexit *__atexit; /* points to head of LIFO stack */ +struct atexit { + struct atexit *next; /* next in list */ + int ind; /* next index in this table */ + struct atexit_fn { + int fn_type; /* ATEXIT_? from above */ + union { + void (*std_func)(void); + void (*cxa_func)(void *); + } fn_ptr; /* function pointer */ + void *fn_arg; /* argument for CXA callback */ + void *fn_dso; /* shared module handle */ + } fns[ATEXIT_SIZE]; /* the table itself */ +}; + +static struct atexit *__atexit; /* points to head of LIFO stack */ /* - * Register a function to be performed at exit. + * Register the function described by 'fptr' to be called at application + * exit or owning shared object unload time. This is a helper function + * for atexit and __cxa_atexit. */ -int -atexit(fn) - void (*fn)(); +static int +atexit_register(struct atexit_fn *fptr) { static struct atexit __atexit0; /* one guaranteed table */ struct atexit *p; @@ -89,7 +108,82 @@ p->next = __atexit; __atexit = p; } - p->fns[p->ind++] = fn; + p->fns[p->ind++] = *fptr; + _MUTEX_UNLOCK(&atexit_mutex); + return 0; +} + +/* + * Register a function to be performed at exit. + */ +int +atexit(void (*func)(void)) +{ + struct atexit_fn fn; + int error; + + fn.fn_type = ATEXIT_FN_STD; + fn.fn_ptr.std_func = func;; + fn.fn_arg = NULL; + fn.fn_dso = NULL; + + error = atexit_register(&fn); + return (error); +} + +/* + * Register a function to be performed at exit or when an shared object + * with given dso handle is unloaded dynamically. + */ +int +__cxa_atexit(void (*func)(void *), void *arg, void *dso) +{ + struct atexit_fn fn; + int error; + + fn.fn_type = ATEXIT_FN_CXA; + fn.fn_ptr.cxa_func = func;; + fn.fn_arg = arg; + fn.fn_dso = dso; + + error = atexit_register(&fn); + return (error); +} + +/* + * Call all handlers registered with __cxa_atexit for the shared + * object owning 'dso'. Note: if 'dso' is NULL, then all remaining + * handlers are called. + */ +void +__cxa_finalize(void *dso) +{ + struct atexit *p; + struct atexit_fn fn; + int n; + + _MUTEX_LOCK(&atexit_mutex); + for (p = __atexit; p; p = p->next) { + for (n = p->ind; --n >= 0;) { + if (p->fns[n].fn_type == ATEXIT_FN_EMPTY) + continue; /* already been called */ + if (dso != NULL && dso != p->fns[n].fn_dso) + continue; /* wrong DSO */ + fn = p->fns[n]; + /* + Mark entry to indicate that this particular handler + has already been called. + */ + p->fns[n].fn_type = ATEXIT_FN_EMPTY; + _MUTEX_UNLOCK(&atexit_mutex); + + /* Call the function of correct type. */ + if (fn.fn_type == ATEXIT_FN_CXA) + fn.fn_ptr.cxa_func(fn.fn_arg); + else if (fn.fn_type == ATEXIT_FN_STD) + fn.fn_ptr.std_func(); + _MUTEX_LOCK(&atexit_mutex); + } + } _MUTEX_UNLOCK(&atexit_mutex); - return (0); } ==== //depot/projects/hammer/lib/libc/stdlib/atexit.h#2 (text+ko) ==== @@ -31,16 +31,10 @@ * SUCH DAMAGE. * * @(#)atexit.h 8.2 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdlib/atexit.h,v 1.2 2002/03/22 23:42:03 obrien Exp $ + * $FreeBSD: src/lib/libc/stdlib/atexit.h,v 1.3 2003/12/19 17:11:20 kan Exp $ */ /* must be at least 32 to guarantee ANSI conformance */ #define ATEXIT_SIZE 32 -struct atexit { - struct atexit *next; /* next in list */ - int ind; /* next index in this table */ - void (*fns[ATEXIT_SIZE])(); /* the table itself */ -}; - -extern struct atexit *__atexit; /* points to head of LIFO stack */ +void __cxa_finalize(void *dso); ==== //depot/projects/hammer/lib/libc/stdlib/exit.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)exit.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/exit.c,v 1.6 2002/03/22 21:53:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/exit.c,v 1.7 2003/12/19 17:11:20 kan Exp $"); #include "namespace.h" #include @@ -61,17 +61,12 @@ exit(status) int status; { - struct atexit *p; - int n; - /* Ensure that the auto-initialization routine is linked in: */ extern int _thread_autoinit_dummy_decl; _thread_autoinit_dummy_decl = 1; - for (p = __atexit; p; p = p->next) - for (n = p->ind; --n >= 0;) - (*p->fns[n])(); + __cxa_finalize(NULL); if (__cleanup) (*__cleanup)(); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 22 21:25:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46D8216A4D0; Mon, 22 Dec 2003 21:25:05 -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 0AEB816A4CE for ; Mon, 22 Dec 2003 21:25:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AE1743D1F for ; Mon, 22 Dec 2003 21:25:03 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBN5P30B083862 for ; Mon, 22 Dec 2003 21:25:03 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBN5P2jK083859 for perforce@freebsd.org; Mon, 22 Dec 2003 21:25:03 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 22 Dec 2003 21:25:03 -0800 (PST) Message-Id: <200312230525.hBN5P2jK083859@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 44227 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, 23 Dec 2003 05:25:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=44227 Change 44227 by sam@sam_ebb on 2003/12/22 21:24:29 Fix braino: we can drop the mutex because we have the sockbuf marked locked (via sblock). This means the previous change to move the externalization of MT_CONTROL mbufs doesn't need to be moved to the bottom of soreceive--we can do it in the same place it was before by just dropping the sockbuf lock. This means we don't change the order of processing and so don't change any of the semantics of error handling. With this re-realization we can also fix the calls to dup sockaddr's and copy data when peeking to use M_WAITOK/M_TRYWAIT. It may not be worthwhile for performance reasons as doing so requires that we drop+reaquire the sockbuf mutex but we can revisit that. At the least the peek case is unlikely to be noticed and the cost is probably down in the noice for recvfrom/recvmsg too. Need to move local variable decls back up to the top of the function before committing to keep bde happy. Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#9 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#9 (text+ko) ==== @@ -775,19 +775,14 @@ int flags, len, error, offset; struct protosw *pr = so->so_proto; struct mbuf *nextrecord; - struct mbuf *cm, **cme; int moff, type = 0; int orig_resid = uio->uio_resid; mp = mp0; if (psa) *psa = 0; - cm = NULL; - if (controlp) { + if (controlp) *controlp = 0; - cme = &cm; - } else - cme = &cm; /* XXX to silence gcc */ if (flagsp) flags = *flagsp &~ MSG_EOR; else @@ -908,12 +903,10 @@ KASSERT(m->m_type == MT_SONAME, ("m->m_type == %d", m->m_type)); if (psa) { + SOCKBUF_UNLOCK(&so->so_rcv); *psa = sodupsockaddr(mtod(m, struct sockaddr *), - M_NOWAIT); /* XXX */ - if (*psa == NULL) { - error = ENOMEM; - goto release; - } + M_WAITOK); + SOCKBUF_LOCK(&so->so_rcv); } if (flags & MSG_PEEK) { m = m->m_next; @@ -925,10 +918,16 @@ orig_resid = 0; } if (m && m->m_type == MT_CONTROL) { + struct mbuf *cm = NULL; + struct mbuf **cme = &cm; + do { if (flags & MSG_PEEK) { if (controlp) { - *controlp = m_copy(m, 0, m->m_len); + SOCKBUF_UNLOCK(&so->so_rcv); + *controlp = m_copym(m, 0, m->m_len, + M_TRYWAIT); + SOCKBUF_LOCK(&so->so_rcv); if (*controlp == NULL) { error = ENOBUFS; goto release; @@ -942,10 +941,7 @@ m->m_next = NULL; if (controlp) { /* - * Link mbufs together for processing - * below. See the comments there for - * an explanation of why we delay the - * work. + * Collect mbufs for processing below. */ *cme = m; cme = &(*cme)->m_next; @@ -954,6 +950,20 @@ m = so->so_rcv.sb_mb; } } while (m && m->m_type == MT_CONTROL); + if (cm != NULL) { + if (pr->pr_domain->dom_externalize) { + /* + * NB: drop the lock to avoid potential LORs; + * in particular unix domain sockets grab the + * file descriptor lock which would be a LOR. + */ + SOCKBUF_UNLOCK(&so->so_rcv); + error = (*pr->pr_domain->dom_externalize) + (cm, controlp); + SOCKBUF_LOCK(&so->so_rcv); + } else + m_freem(cm); + } orig_resid = 0; } if (m) { @@ -1159,20 +1169,6 @@ sbunlock(&so->so_rcv); out: SOCKBUF_UNLOCK(&so->so_rcv); - if (cm != NULL) { - /* - * Deal with control data now that we've dopped the - * sockbuf lock. This is important as otherwise, for - * unix domain sockets, we create a LOR between so_rcv - * and the file descriptor lock. Note we assume the - * externalize method handles a list of mbufs. - */ - if (error == 0 && pr->pr_domain->dom_externalize) { - /* XXX ignore error? */ - error = (*pr->pr_domain->dom_externalize)(cm, controlp); - } else - m_freem(cm); - } return (error); } From owner-p4-projects@FreeBSD.ORG Tue Dec 23 06:11:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 946C516A4D1; Tue, 23 Dec 2003 06:11:46 -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 6F46016A4CE for ; Tue, 23 Dec 2003 06:11:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B32EF43D2D for ; Tue, 23 Dec 2003 06:11:44 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBNEBi0B009603 for ; Tue, 23 Dec 2003 06:11:44 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBNEBimP009594 for perforce@freebsd.org; Tue, 23 Dec 2003 06:11:44 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 23 Dec 2003 06:11:44 -0800 (PST) Message-Id: <200312231411.hBNEBimP009594@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 44238 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, 23 Dec 2003 14:11:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=44238 Change 44238 by cvance@cvance_sony on 2003/12/23 06:10:44 Add a /boot/loader.conf file pre-populated with SEBSD-specific options (commented out by default). Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf.sebsd#1 add .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/loader/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/boot/i386/loader/Makefile#5 (text+ko) ==== @@ -101,9 +101,10 @@ cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth -FILES= ${PROG}.help loader.4th support.4th loader.conf +FILES= ${PROG}.help loader.4th support.4th loader.conf loader.conf.sebsd FILES+= screen.4th frames.4th beastie.4th FILESDIR_loader.conf= /boot/defaults +FILESNAME_loader.conf.sebsd= loader.conf .if !exists(${DESTDIR}/boot/loader.rc) FILES+= ${.CURDIR}/loader.rc From owner-p4-projects@FreeBSD.ORG Tue Dec 23 06:11:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD28316A4F0; Tue, 23 Dec 2003 06:11:46 -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 8B95A16A4CF for ; Tue, 23 Dec 2003 06:11:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19DD543D31 for ; Tue, 23 Dec 2003 06:11:45 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBNEBi0B009617 for ; Tue, 23 Dec 2003 06:11:44 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBNEBiXK009609 for perforce@freebsd.org; Tue, 23 Dec 2003 06:11:44 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 23 Dec 2003 06:11:44 -0800 (PST) Message-Id: <200312231411.hBNEBiXK009609@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 44239 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, 23 Dec 2003 14:11:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=44239 Change 44239 by cvance@cvance_sony on 2003/12/23 06:11:40 Integ from MAC branch to get release build fixes Affected files ... .. //depot/projects/trustedbsd/sebsd/release/Makefile#9 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/release/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.822 2003/10/31 13:15:07 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.824 2003/11/15 03:58:12 kuriyama Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -347,10 +347,9 @@ ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE} .endif .if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) - cd ${CHROOTDIR}/usr/${RELEASESRCMODULE} .for p in ${LOCAL_PATCHES} .if exists(${p}) - patch ${PATCH_FLAGS} < ${p} + patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p} .endif .endfor .endif @@ -697,7 +696,10 @@ ${RD}/trees/base/etc/services | \ sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ > ${RD}/mfsfd/stand/etc/services + grep 'operator' ${RD}/trees/base/etc/group \ + > ${RD}/mfsfd/stand/etc/group ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services + ln ${RD}/mfsfd/stand/etc/group ${RD}/mfsfd/etc/group ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp .if !defined(NODOC) From owner-p4-projects@FreeBSD.ORG Tue Dec 23 06:12:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAF4916A4D0; Tue, 23 Dec 2003 06:12:47 -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 C4BCF16A4CE for ; Tue, 23 Dec 2003 06:12:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 000AB43D2F for ; Tue, 23 Dec 2003 06:12:46 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBNECk0B010152 for ; Tue, 23 Dec 2003 06:12:46 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBNECkAL010149 for perforce@freebsd.org; Tue, 23 Dec 2003 06:12:46 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 23 Dec 2003 06:12:46 -0800 (PST) Message-Id: <200312231412.hBNECkAL010149@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 44240 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, 23 Dec 2003 14:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=44240 Change 44240 by cvance@cvance_sony on 2003/12/23 06:12:31 Too much stuff on driver floppy, randomly delete largest network driver. Perhaps SEBSD users won't have gigabit ethernet... Affected files ... .. //depot/projects/trustedbsd/sebsd/release/i386/drivers.conf#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/release/i386/drivers.conf#5 (text+ko) ==== @@ -87,7 +87,7 @@ sk if_sk 3 network "SysKonnect PCI gigabit ethernet card" sl if_sl 3 network "Kernel SLIP" sn if_sn 3 network "SMC's 9000 series of ethernet chips" -ti if_ti 3 network "Alteon Networks PCI gigabit ethernet card" +#ti if_ti 3 network "Alteon Networks PCI gigabit ethernet card" tl if_tl 3 network "Texas Instruments ThunderLAN PCI ethernet card" tx if_tx 3 network "SMC 9432TX ethernet card" wi if_wi 3 network "Lucent WaveLAN/IEEE 802.11 PCMCIA card" From owner-p4-projects@FreeBSD.ORG Tue Dec 23 06:13:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A1AF16A4D0; Tue, 23 Dec 2003 06:13: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 D8A1A16A4CE for ; Tue, 23 Dec 2003 06:13:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0F9543D39 for ; Tue, 23 Dec 2003 06:13:48 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBNEDm0B010237 for ; Tue, 23 Dec 2003 06:13:48 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBNEDmuA010234 for perforce@freebsd.org; Tue, 23 Dec 2003 06:13:48 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 23 Dec 2003 06:13:48 -0800 (PST) Message-Id: <200312231413.hBNEDmuA010234@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 44241 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, 23 Dec 2003 14:13:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=44241 Change 44241 by cvance@cvance_sony on 2003/12/23 06:13:18 Integ from MAC branch. Allow sysinstall to have correct partition names. Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libdisk/create_chunk.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libdisk/write_ia64_disk.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/libdisk/create_chunk.c#5 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.82 2003/11/02 08:39:08 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.83 2003/11/12 17:44:37 marcel Exp $"); #include #include @@ -159,8 +159,12 @@ max = NDOSPART; #endif for (j = 1; j <= max; j++) { +#ifdef __ia64__ sprintf(c2->oname, "%s%c%d", c1->name, (c1->type == whole) ? 'p' : 's', j); +#else + sprintf(c2->oname, "%ss%d", c1->name, j); +#endif for (c3 = c1->part; c3; c3 = c3->next) if (c3 != c2 && !strcmp(c3->name, c2->oname)) goto match; ==== //depot/projects/trustedbsd/sebsd/lib/libdisk/write_ia64_disk.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.12 2003/11/04 03:49:01 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.13 2003/11/17 05:47:42 marcel Exp $"); #include #include @@ -98,7 +98,7 @@ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -uint32_t +static uint32_t crc32(const void *buf, size_t size) { const uint8_t *p; From owner-p4-projects@FreeBSD.ORG Wed Dec 24 05:01:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A8BA16A4CE; Wed, 24 Dec 2003 05:01:14 -0800 (PST) Received: from c-24-10-230-233.client.comcast.net (c-24-10-230-233.client.comcast.net [24.10.230.233]) by mx1.FreeBSD.org (Postfix) with SMTP id 3B90843D50; Wed, 24 Dec 2003 05:01:12 -0800 (PST) (envelope-from ehpngslpqg@terra.com) Received: from [24.10.230.233] by 530000x.comIP with HTTP; Tue, 23 Dec 2003 20:01:44 -0500 From: "Gibbs Brett" To: p4-projects@freebsd.org Mime-Version: 1.0 X-Mailer: mPOP Web-Mail 2.19 X-Originating-IP: [530000x.comIP] Date: Wed, 24 Dec 2003 04:57:44 +0400 Message-Id: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.1 cc: p4-user@freebsd.org Subject: Re: ZVMCYMK, and the administrator X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Gibbs List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Dec 2003 13:01:14 -0000 cinnabar haphazard shipboard judas ada starfish spice prospectus cleat bluejacket spurious hornwort elusive accuse deletion good gordon coronate beechwood brisbane From owner-p4-projects@FreeBSD.ORG Wed Dec 24 10:31:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F79816A4D0; Wed, 24 Dec 2003 10:31:20 -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 4A0CE16A4CE for ; Wed, 24 Dec 2003 10:31:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D83F43D1F for ; Wed, 24 Dec 2003 10:31:19 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBOIVJ0B018791 for ; Wed, 24 Dec 2003 10:31:19 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBOIVIsn018785 for perforce@freebsd.org; Wed, 24 Dec 2003 10:31:18 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 24 Dec 2003 10:31:18 -0800 (PST) Message-Id: <200312241831.hBOIVIsn018785@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 44281 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, 24 Dec 2003 18:31:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44281 Change 44281 by sam@sam_ebb on 2003/12/24 10:31:15 bandaid LOR between IPFW and inpcb head Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/ip_fw2.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/ip_fw2.c#4 (text+ko) ==== @@ -1296,7 +1296,8 @@ } static int -check_uidgid(ipfw_insn_u32 *insn, +check_uidgid(struct ip_fw_chain *chain, + ipfw_insn_u32 *insn, int proto, struct ifnet *oif, struct in_addr dst_ip, u_int16_t dst_port, struct in_addr src_ip, u_int16_t src_port) @@ -1317,7 +1318,10 @@ match = 0; - INP_INFO_RLOCK(pi); /* XXX LOR with IPFW */ + /* NB: reorder to avoid LOR between IPFW and inp */ + IPFW_UNLOCK(chain); + INP_INFO_RLOCK(pi); + IPFW_LOCK(chain); pcb = (oif) ? in_pcblookup_hash(pi, dst_ip, htons(dst_port), @@ -1657,7 +1661,7 @@ break; if (proto == IPPROTO_TCP || proto == IPPROTO_UDP) - match = check_uidgid( + match = check_uidgid(chain, (ipfw_insn_u32 *)cmd, proto, oif, dst_ip, dst_port, From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:04:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4206D16A4D0; Wed, 24 Dec 2003 11:04: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 1B2DF16A4CE for ; Wed, 24 Dec 2003 11:04:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8365043D1D for ; Wed, 24 Dec 2003 11:04:09 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBOJ490B027019 for ; Wed, 24 Dec 2003 11:04:09 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBOJ41oR027015 for perforce@freebsd.org; Wed, 24 Dec 2003 11:04:01 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 24 Dec 2003 11:04:01 -0800 (PST) Message-Id: <200312241904.hBOJ41oR027015@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 44285 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, 24 Dec 2003 19:04:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=44285 Change 44285 by sam@sam_ebb on 2003/12/24 11:03:35 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/netperf/sys/alpha/alpha/dump_machdep.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/elf_machdep.c#4 integrate .. //depot/projects/netperf/sys/alpha/include/kse.h#2 delete .. //depot/projects/netperf/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/netperf/sys/alpha/linux/linux_syscall.h#3 integrate .. //depot/projects/netperf/sys/alpha/linux/linux_sysent.c#3 integrate .. //depot/projects/netperf/sys/alpha/linux/linux_sysvec.c#4 integrate .. //depot/projects/netperf/sys/alpha/linux/syscalls.conf#2 integrate .. //depot/projects/netperf/sys/alpha/linux/syscalls.master#3 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_proto.h#3 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_syscall.h#3 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_sysent.c#3 integrate .. //depot/projects/netperf/sys/alpha/osf1/syscalls.conf#2 integrate .. //depot/projects/netperf/sys/alpha/osf1/syscalls.master#3 integrate .. //depot/projects/netperf/sys/alpha/pci/apecs.c#4 integrate .. //depot/projects/netperf/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/netperf/sys/amd64/include/kse.h#2 delete .. //depot/projects/netperf/sys/amd64/include/param.h#4 integrate .. //depot/projects/netperf/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/netperf/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/netperf/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/netperf/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/netperf/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/netperf/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/netperf/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/netperf/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/netperf/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/netperf/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/netperf/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/netperf/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#7 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#11 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_pci_link.c#7 integrate .. //depot/projects/netperf/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/netperf/sys/dev/bktr/ioctl_bt848.h#3 integrate .. //depot/projects/netperf/sys/dev/bktr/ioctl_meteor.h#3 integrate .. //depot/projects/netperf/sys/dev/drm/drm_bufs.h#5 integrate .. //depot/projects/netperf/sys/dev/drm/drm_dma.h#4 integrate .. //depot/projects/netperf/sys/dev/fatm/if_fatm.c#8 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci.c#8 integrate .. //depot/projects/netperf/sys/dev/gfb/gfb_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_intr.c#8 integrate .. //depot/projects/netperf/sys/dev/idt/idt.c#4 integrate .. //depot/projects/netperf/sys/dev/idt/idt_harp.c#3 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/netperf/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/pccbb/pccbb.c#9 integrate .. //depot/projects/netperf/sys/dev/pci/pci.c#10 integrate .. //depot/projects/netperf/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/netperf/sys/dev/sio/sio.c#10 integrate .. //depot/projects/netperf/sys/dev/usb/ohci.c#6 integrate .. //depot/projects/netperf/sys/dev/usb/ohci_pci.c#8 integrate .. //depot/projects/netperf/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/netperf/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/netperf/sys/geom/geom_event.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/netperf/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/netperf/sys/i386/include/kse.h#2 delete .. //depot/projects/netperf/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/netperf/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/netperf/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/netperf/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/netperf/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/netperf/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/netperf/sys/ia64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/netperf/sys/ia64/include/kse.h#2 delete .. //depot/projects/netperf/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/netperf/sys/kern/init_sysent.c#10 integrate .. //depot/projects/netperf/sys/kern/kern_clock.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#10 integrate .. //depot/projects/netperf/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#22 integrate .. //depot/projects/netperf/sys/kern/subr_smp.c#6 integrate .. //depot/projects/netperf/sys/kern/syscalls.c#10 integrate .. //depot/projects/netperf/sys/kern/syscalls.master#10 integrate .. //depot/projects/netperf/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/netperf/sys/kern/vfs_bio.c#17 integrate .. //depot/projects/netperf/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/netperf/sys/modules/acpi/Makefile#6 integrate .. //depot/projects/netperf/sys/modules/acpi/acpi/Makefile#1 branch .. //depot/projects/netperf/sys/net/bridge.c#15 integrate .. //depot/projects/netperf/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/netperf/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/netperf/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/netperf/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/netperf/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/netperf/sys/netinet/if_ether.c#18 integrate .. //depot/projects/netperf/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/netperf/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/netperf/sys/netinet/ip_mroute.c#22 integrate .. //depot/projects/netperf/sys/netinet6/in6_src.c#21 integrate .. //depot/projects/netperf/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/netperf/sys/netinet6/ip6_output.c#29 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#16 integrate .. //depot/projects/netperf/sys/powerpc/include/kse.h#2 delete .. //depot/projects/netperf/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/netperf/sys/sparc64/include/kse.h#2 delete .. //depot/projects/netperf/sys/sparc64/sparc64/elf_machdep.c#4 integrate .. //depot/projects/netperf/sys/sys/_null.h#3 integrate .. //depot/projects/netperf/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/netperf/sys/sys/kse.h#4 integrate .. //depot/projects/netperf/sys/sys/proc.h#15 integrate .. //depot/projects/netperf/sys/sys/socket.h#3 integrate .. //depot/projects/netperf/sys/sys/syscall.h#10 integrate .. //depot/projects/netperf/sys/sys/syscall.mk#10 integrate .. //depot/projects/netperf/sys/sys/sysproto.h#10 integrate .. //depot/projects/netperf/sys/sys/umtx.h#2 integrate .. //depot/projects/netperf/sys/vm/uma_int.h#5 integrate .. //depot/projects/netperf/sys/vm/vm_mmap.c#10 integrate .. //depot/projects/netperf/sys/vm/vm_page.c#12 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/db_trace.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.16 2003/11/29 11:57:02 jeff Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -99,7 +99,7 @@ { (uintptr_t)&XentSys, "syscall" }, { (uintptr_t)&XentUna, "unaligned access fault" }, { (uintptr_t)&XentRestart, "console restart" }, - { NULL } + { 0, NULL } }; @@ -180,7 +180,7 @@ { int i; - for (i = 0; special_symbols[i].ss_val != NULL; ++i) + for (i = 0; special_symbols[i].ss_val != 0; ++i) if (v == special_symbols[i].ss_val) return 1; return 0; @@ -339,7 +339,7 @@ if (sym_is_trapsymbol(symval)) { tf = (struct trapframe *)frame; - for (i = 0; special_symbols[i].ss_val != NULL; ++i) + for (i = 0; special_symbols[i].ss_val != 0; ++i) if (symval == special_symbols[i].ss_val) db_printf("--- %s", special_symbols[i].ss_note); ==== //depot/projects/netperf/sys/alpha/alpha/dump_machdep.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.5 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.6 2003/12/23 02:36:41 peter Exp $"); #include #include @@ -88,7 +88,7 @@ dumplo = di->mediaoffset + di->mediasize - Maxmem * (off_t)PAGE_SIZE; dumplo -= sizeof kdh * 2; - i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh); + i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh); if (i) printf("\nDump failed writing header (%d)\n", i); dumplo += sizeof kdh; @@ -111,7 +111,7 @@ printf(" %d", count / (1024 * 1024 / PAGE_SIZE)); mb = i; } - i = di->dumper(di->priv, va, NULL, dumplo, left * PAGE_SIZE); + i = di->dumper(di->priv, va, 0, dumplo, left * PAGE_SIZE); if (i) break; count += left; @@ -120,10 +120,10 @@ } if (i) printf("\nDump failed writing data (%d)\n", i); - i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh); + i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh); if (i) printf("\nDump failed writing trailer (%d)\n", i); - di->dumper(di->priv, NULL, NULL, 0, 0); /* tell them we are done */ + di->dumper(di->priv, NULL, 0, 0, 0); /* tell them we are done */ printf("\nDump complete\n"); return; } ==== //depot/projects/netperf/sys/alpha/alpha/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.16 2003/09/25 01:10:22 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.17 2003/12/23 02:42:38 peter Exp $"); #include #include @@ -81,15 +81,31 @@ ELFOSABI_FREEBSD, EM_ALPHA, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec + &elf64_freebsd_sysvec, + NULL, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); +static Elf64_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_oinfo); + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) ==== //depot/projects/netperf/sys/alpha/linux/linux_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.13 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.14 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/netperf/sys/alpha/linux/linux_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.11 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.12 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/netperf/sys/alpha/linux/linux_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.11 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.12 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #include "opt_compat.h" ==== //depot/projects/netperf/sys/alpha/linux/linux_sysvec.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.91 2003/09/25 01:10:22 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.92 2003/12/23 02:42:38 peter Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -210,7 +210,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.1", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; static Elf64_Brandinfo linux_glibc2brand = { @@ -219,7 +220,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.2", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; Elf64_Brandinfo *linux_brandlist[] = { ==== //depot/projects/netperf/sys/alpha/linux/syscalls.conf#2 (text+ko) ==== @@ -1,11 +1,10 @@ -# $FreeBSD: src/sys/alpha/linux/syscalls.conf,v 1.5 1999/08/28 00:45:25 peter Exp $ +# $FreeBSD: src/sys/alpha/linux/syscalls.conf,v 1.6 2003/12/24 00:32:07 peter Exp $ sysnames="/dev/null" sysproto="linux_proto.h" sysproto_h=_LINUX_SYSPROTO_H_ syshdr="linux_syscall.h" syssw="linux_sysent.c" sysmk="/dev/null" -syshide="/dev/null" syscallprefix="LINUX_SYS_" switchname="linux_sysent" namesname="linux_syscallnames" ==== //depot/projects/netperf/sys/alpha/linux/syscalls.master#3 (text+ko) ==== @@ -1,14 +1,13 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to created linux_sysent.c, linux_syscalls.c and linux_syscall.h. -; Columns: number type nargs namespc name alt{name,tag,rtyp}/comments +; Columns: number type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, ; NODEF, NOARGS, NOPROTO -; namespc one of POSIX, BSD, STD, NOHIDE (I dont care :-) -Peter ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -37,467 +36,426 @@ ; #ifdef's, etc. may be included, and are copied to the output files. -0 UNIMPL LINUX -1 MNOPROTO LINUX { void sys_exit(int rval); } exit sys_exit_args void -2 MSTD LINUX { int linux_fork(void); } -3 MNOPROTO LINUX { int read(int fd, char *buf, u_int nbyte); } -4 MNOPROTO LINUX { int write(int fd, char *buf, u_int nbyte); } -5 UNIMPL LINUX -6 MNOPROTO LINUX { int close(int fd); } -7 STD OSF1 { int osf1_wait4(int pid, int *status, int options, \ +0 UNIMPL +1 MNOPROTO { void sys_exit(int rval); } exit sys_exit_args void +2 MSTD { int linux_fork(void); } +3 MNOPROTO { int read(int fd, char *buf, u_int nbyte); } +4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); } +5 UNIMPL +6 MNOPROTO { int close(int fd); } +7 STD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } -8 UNIMPL LINUX -9 STD LINUX { int linux_link(char *path, char *to); } -10 STD LINUX { int linux_unlink(char *path); } -11 UNIMPL LINUX -12 STD LINUX { int linux_chdir(char *path); } -13 NOPROTO LINUX { int fchdir(int fd); } -14 STD LINUX { int linux_mknod(char *path, l_int mode, \ - l_dev_t dev); } -15 STD LINUX { int linux_chmod(char *path, l_mode_t mode); } -16 STD LINUX { int linux_chown(char *path, l_uid_t uid, \ - l_gid_t gid); } -17 STD OSF1 { int linux_brk(l_ulong dsend); } -18 UNIMPL LINUX -19 STD LINUX { int linux_lseek(l_uint fdes, l_off_t off, \ - l_int whence); } -20 NOPROTO BSD { int getpid(void); } -21 UNIMPL OSF1 osf1_mount -22 STD LINUX { int linux_umount(char *path, l_int flags); } -23 MNOPROTO LINUX { int setuid(uid_t uid); } -24 MNOPROTO BSD { int getuid(void); } -25 UNIMPL LINUX -26 MSTD LINUX { int linux_ptrace(void); } -27 UNIMPL LINUX -28 UNIMPL LINUX -29 UNIMPL LINUX -30 UNIMPL LINUX -31 UNIMPL LINUX -32 UNIMPL LINUX -33 STD LINUX { int linux_access(char *path, l_int flags); } -34 UNIMPL LINUX -35 UNIMPL LINUX -36 NOPROTO LINUX { int sync(void); } -37 MSTD LINUX { int linux_kill(l_int pid, l_int signum); } -38 UNIMPL LINUX -39 MNOPROTO LINUX { int setpgid(int pid, int pgid); } -40 UNIMPL LINUX -41 MNOPROTO LINUX { int dup(u_int fd); } -42 MNOPROTO BSD { int pipe(void); } -43 UNIMPL OSF1 osf_set_program_attributes -44 UNIMPL LINUX -45 STD LINUX { int linux_open(char *path, l_int flags, \ - l_int mode); } -46 UNIMPL LINUX -47 MNOPROTO BSD { int getgid(void); } -48 MSTD OSF1 { int osf1_sigprocmask(int how, u_long mask); } -49 UNIMPL LINUX -50 UNIMPL LINUX -51 NOPROTO LINUX { int acct(char *path); } -52 MSTD LINUX { int linux_sigpending(void); } -53 UNIMPL LINUX -54 STD LINUX { int linux_ioctl(l_uint fd, l_uint cmd, \ - l_ulong arg); } -55 UNIMPL LINUX -56 UNIMPL LINUX -57 STD LINUX { int linux_symlink(char *path, char *to); } -58 STD LINUX { int linux_readlink(char *name, char *buf, \ - l_int count); } -59 STD LINUX { int linux_execve(char *path, char **argp, \ - char **envp); } -60 MNOPROTO LINUX { int umask(int newmask); } -61 NOPROTO LINUX { int chroot(char *path); } -62 UNIMPL LINUX -63 MNOPROTO LINUX { int getpgrp(void); } -64 STD LINUX { int linux_getpagesize(void); } -65 UNIMPL LINUX -66 MSTD LINUX { int linux_vfork(void); } -67 STD LINUX { int linux_newstat(char *path, \ - struct l_newstat *buf); } -68 STD LINUX { int linux_newlstat(char *path, \ - struct l_newstat *buf); } -69 UNIMPL LINUX -70 UNIMPL LINUX -71 STD OSF1 { int linux_mmap(l_ulong addr, l_ulong len, \ - l_ulong prot, l_ulong flags, l_ulong fd, \ - l_ulong pos); } -72 UNIMPL LINUX -73 STD LINUX { int linux_munmap(l_ulong addr, l_size_t len); } -74 STD LINUX { int linux_mprotect(l_ulong addr, l_size_t len, \ +8 UNIMPL +9 STD { int linux_link(char *path, char *to); } +10 STD { int linux_unlink(char *path); } +11 UNIMPL +12 STD { int linux_chdir(char *path); } +13 NOPROTO { int fchdir(int fd); } +14 STD { int linux_mknod(char *path, l_int mode, l_dev_t dev); } +15 STD { int linux_chmod(char *path, l_mode_t mode); } +16 STD { int linux_chown(char *path, l_uid_t uid, l_gid_t gid); } +17 STD { int linux_brk(l_ulong dsend); } +18 UNIMPL +19 STD { int linux_lseek(l_uint fdes, l_off_t off, l_int whence); } +20 NOPROTO { int getpid(void); } +21 UNIMPL osf1_mount +22 STD { int linux_umount(char *path, l_int flags); } +23 MNOPROTO { int setuid(uid_t uid); } +24 MNOPROTO { int getuid(void); } +25 UNIMPL +26 MSTD { int linux_ptrace(void); } +27 UNIMPL +28 UNIMPL +29 UNIMPL +30 UNIMPL +31 UNIMPL +32 UNIMPL +33 STD { int linux_access(char *path, l_int flags); } +34 UNIMPL +35 UNIMPL +36 NOPROTO { int sync(void); } +37 MSTD { int linux_kill(l_int pid, l_int signum); } +38 UNIMPL +39 MNOPROTO { int setpgid(int pid, int pgid); } +40 UNIMPL +41 MNOPROTO { int dup(u_int fd); } +42 MNOPROTO { int pipe(void); } +43 UNIMPL osf_set_program_attributes +44 UNIMPL +45 STD { int linux_open(char *path, l_int flags, l_int mode); } +46 UNIMPL +47 MNOPROTO { int getgid(void); } +48 MSTD { int osf1_sigprocmask(int how, u_long mask); } +49 UNIMPL +50 UNIMPL +51 NOPROTO { int acct(char *path); } +52 MSTD { int linux_sigpending(void); } +53 UNIMPL +54 STD { int linux_ioctl(l_uint fd, l_uint cmd, l_ulong arg); } +55 UNIMPL +56 UNIMPL +57 STD { int linux_symlink(char *path, char *to); } +58 STD { int linux_readlink(char *name, char *buf, l_int count); } +59 STD { int linux_execve(char *path, char **argp, char **envp); } +60 MNOPROTO { int umask(int newmask); } +61 NOPROTO { int chroot(char *path); } +62 UNIMPL +63 MNOPROTO { int getpgrp(void); } +64 STD { int linux_getpagesize(void); } +65 UNIMPL +66 MSTD { int linux_vfork(void); } +67 STD { int linux_newstat(char *path, struct l_newstat *buf); } +68 STD { int linux_newlstat(char *path, struct l_newstat *buf); } +69 UNIMPL +70 UNIMPL +71 STD { int linux_mmap(l_ulong addr, l_ulong len, l_ulong prot, \ + l_ulong flags, l_ulong fd, l_ulong pos); } +72 UNIMPL +73 STD { int linux_munmap(l_ulong addr, l_size_t len); } +74 STD { int linux_mprotect(l_ulong addr, l_size_t len, \ l_ulong prot); } -75 STD LINUX { int linux_madvise(void); } -76 STD LINUX { int linux_vhangup(void); } -77 UNIMPL LINUX -78 UNIMPL LINUX -79 MSTD LINUX { int linux_setgroups(l_int gidsetsize, \ - l_gid_t *grouplist); } -80 MSTD LINUX { int linux_getgroups(l_int gidsetsize, \ - l_gid_t *grouplist); } -81 UNIMPL LINUX -82 MNODEF LINUX setpgid setpgid setpgid_args int -83 STD OSF1 { int osf1_setitimer(u_int which, \ - struct itimerval *itv, \ +75 STD { int linux_madvise(void); } +76 STD { int linux_vhangup(void); } +77 UNIMPL +78 UNIMPL +79 MSTD { int linux_setgroups(l_int gidsetsize, l_gid_t *grouplist); } +80 MSTD { int linux_getgroups(l_int gidsetsize, l_gid_t *grouplist); } +81 UNIMPL +82 MNODEF setpgid setpgid setpgid_args int +83 STD { int osf1_setitimer(u_int which, struct itimerval *itv, \ struct itimerval *oitv); } -84 UNIMPL LINUX -85 UNIMPL LINUX -86 UNIMPL OSF1 osf_getitimer -87 STD LINUX { int linux_gethostname(void); } -88 MNOPROTO LINUX { int osethostname(char *hostname, u_int len); } \ +84 UNIMPL +85 UNIMPL +86 UNIMPL osf_getitimer +87 STD { int linux_gethostname(void); } +88 MNOPROTO { int osethostname(char *hostname, u_int len); } \ osethostname sethostname_args int -89 STD LINUX { int linux_getdtablesize(void); } -90 MNOPROTO LINUX { int dup2(u_int from, u_int to); } -91 STD LINUX { int linux_newfstat(l_uint fd, \ - struct l_newstat *buf); } -92 STD LINUX { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } -93 STD OSF1 { int osf1_select(u_int nd, fd_set *in, fd_set *ou, \ +89 STD { int linux_getdtablesize(void); } +90 MNOPROTO { int dup2(u_int from, u_int to); } +91 STD { int linux_newfstat(l_uint fd, struct l_newstat *buf); } +92 STD { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } +93 STD { int osf1_select(u_int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval *tv); } -94 NOPROTO LINUX { int poll(struct pollfd*, unsigned int nfds, \ - long timeout); } -95 NOPROTO LINUX { int fsync(int fd); } -96 MNOPROTO LINUX { int setpriority(int which, int who, int prio); } -97 STD LINUX { int osf1_socket(int domain, int type, \ - int protocol); } -98 STD LINUX { int linux_connect(l_int s, struct l_sockaddr *name, \ +94 NOPROTO { int poll(struct pollfd*, unsigned int nfds, long timeout); } +95 NOPROTO { int fsync(int fd); } +96 MNOPROTO { int setpriority(int which, int who, int prio); } +97 STD { int osf1_socket(int domain, int type, int protocol); } +98 STD { int linux_connect(l_int s, struct l_sockaddr *name, \ l_int namelen); } -99 NOPROTO LINUX { int oaccept(int s, caddr_t name, int *anamelen); } \ +99 NOPROTO { int oaccept(int s, caddr_t name, int *anamelen); } \ accept accept_args int -100 UNIMPL OSF1 osf_getpriority -101 NOPROTO LINUX { int osend(int s, caddr_t buf, int len, int flags); } -102 NOPROTO LINUX { int orecv(int s, caddr_t buf, int len, int flags); } -103 MSTD LINUX { int osf1_sigreturn(struct osigcontext *sigcntxp); } -104 NOPROTO LINUX { int bind(int s, caddr_t name, int namelen); } -105 NOPROTO LINUX { int setsockopt(int s, int level, int name, \ - caddr_t val, int valsize); } -106 NOPROTO LINUX { int listen(int s, int backlog); } -107 UNIMPL LINUX -108 UNIMPL LINUX -109 UNIMPL LINUX -110 UNIMPL LINUX -111 MSTD LINUX { int osf1_sigsuspend(unsigned long ss); } -112 UNIMPL OSF1 osf_sigstack -113 STD LINUX { int linux_recvmsg(void); } -114 STD LINUX { int linux_sendmsg(void); } -115 UNIMPL LINUX -116 MSTD OSF1 { int osf1_gettimeofday(struct timeval *tp, \ +100 UNIMPL osf_getpriority +101 NOPROTO { int osend(int s, caddr_t buf, int len, int flags); } +102 NOPROTO { int orecv(int s, caddr_t buf, int len, int flags); } +103 MSTD { int osf1_sigreturn(struct osigcontext *sigcntxp); } +104 NOPROTO { int bind(int s, caddr_t name, int namelen); } +105 NOPROTO { int setsockopt(int s, int level, int name, caddr_t val, \ + int valsize); } +106 NOPROTO { int listen(int s, int backlog); } +107 UNIMPL +108 UNIMPL +109 UNIMPL +110 UNIMPL +111 MSTD { int osf1_sigsuspend(unsigned long ss); } +112 UNIMPL osf_sigstack +113 STD { int linux_recvmsg(void); } +114 STD { int linux_sendmsg(void); } +115 UNIMPL +116 MSTD { int osf1_gettimeofday(struct timeval *tp, \ struct timezone *tzp); } -117 STD OSF1 { int osf1_getrusage(long who, void *rusage); } -118 NOPROTO LINUX { int getsockopt(int s, int level, int name, \ - caddr_t val, int *avalsize); } -119 UNIMPL LINUX -120 NOPROTO LINUX { int readv(int fd, struct iovec *iovp, \ - u_int iovcnt); } -121 NOPROTO LINUX { int writev(int fd, struct iovec *iovp, \ - u_int iovcnt); } -122 UNIMPL OSF1 osf_settimeofday -123 NOPROTO LINUX { int fchown(int fd, int uid, int gid); } -124 NOPROTO LINUX { int fchmod(int fd, int mode); } -125 NOPROTO LINUX { int orecvfrom(int s, caddr_t buf, size_t len, \ - int flags, caddr_t from, int *fromlenaddr); } \ +117 STD { int osf1_getrusage(long who, void *rusage); } +118 NOPROTO { int getsockopt(int s, int level, int name, caddr_t val, \ + int *avalsize); } +119 UNIMPL +120 NOPROTO { int readv(int fd, struct iovec *iovp, u_int iovcnt); } +121 NOPROTO { int writev(int fd, struct iovec *iovp, u_int iovcnt); } +122 UNIMPL osf_settimeofday +123 NOPROTO { int fchown(int fd, int uid, int gid); } +124 NOPROTO { int fchmod(int fd, int mode); } +125 NOPROTO { int orecvfrom(int s, caddr_t buf, size_t len, int flags, \ + caddr_t from, int *fromlenaddr); } \ recvfrom recvfrom_args int -126 MNOPROTO LINUX { int setreuid(int ruid, int euid); } -127 MNOPROTO LINUX { int setregid(int rgid, int egid); } -128 STD LINUX { int linux_rename(char *from, char *to); } -129 STD LINUX { int linux_truncate(char *path, l_ulong length); } -130 NOPROTO LINUX { int oftruncate(int fd, long length); } -131 NOPROTO LINUX { int flock(int fd, int how); } -132 MNOPROTO LINUX { int setgid(gid_t gid); } -133 STD LINUX { int osf1_sendto(int s, caddr_t buf, size_t len, \ - int flags, struct sockaddr *to, int tolen); } -134 NOPROTO LINUX { int shutdown(int s, int how); } -135 STD LINUX { int linux_socketpair(void); } -136 STD LINUX { int linux_mkdir(char *path, l_int mode); } -137 STD LINUX { int linux_rmdir(char *path); } -138 NOPROTO OSF1 { int utimes(char *path, struct timeval *tptr); } -139 UNIMPL LINUX -140 UNIMPL LINUX -141 NOPROTO LINUX { int ogetpeername(int fdes, caddr_t asa, int *alen); } -142 UNIMPL LINUX -143 UNIMPL LINUX -144 STD LINUX { int linux_getrlimit(l_uint resource, \ +126 MNOPROTO { int setreuid(int ruid, int euid); } +127 MNOPROTO { int setregid(int rgid, int egid); } +128 STD { int linux_rename(char *from, char *to); } +129 STD { int linux_truncate(char *path, l_ulong length); } +130 NOPROTO { int oftruncate(int fd, long length); } +131 NOPROTO { int flock(int fd, int how); } +132 MNOPROTO { int setgid(gid_t gid); } +133 STD { int osf1_sendto(int s, caddr_t buf, size_t len, int flags, \ + struct sockaddr *to, int tolen); } +134 NOPROTO { int shutdown(int s, int how); } +135 STD { int linux_socketpair(void); } +136 STD { int linux_mkdir(char *path, l_int mode); } +137 STD { int linux_rmdir(char *path); } +138 NOPROTO { int utimes(char *path, struct timeval *tptr); } +139 UNIMPL +140 UNIMPL +141 NOPROTO { int ogetpeername(int fdes, caddr_t asa, int *alen); } +142 UNIMPL +143 UNIMPL +144 STD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -145 STD LINUX { int linux_setrlimit(l_uint resource, \ +145 STD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } -146 UNIMPL LINUX -147 MNOPROTO LINUX { int setsid(void); } -148 STD LINUX { int linux_quotactl(void); } -149 UNIMPL LINUX -150 NOPROTO LINUX { int ogetsockname(int fdec, caddr_t asa, int *alen);} \ +146 UNIMPL +147 MNOPROTO { int setsid(void); } +148 STD { int linux_quotactl(void); } +149 UNIMPL +150 NOPROTO { int ogetsockname(int fdec, caddr_t asa, int *alen);} \ getsockname getsockname_args int -151 UNIMPL LINUX -152 UNIMPL LINUX -153 UNIMPL LINUX -154 UNIMPL LINUX -155 UNIMPL LINUX -156 MSTD OSF1 { int osf1_sigaction(int sig, \ - struct osf1_sigaction *nsa, \ +151 UNIMPL +152 UNIMPL +153 UNIMPL +154 UNIMPL +155 UNIMPL +156 MSTD { int osf1_sigaction(int sig, struct osf1_sigaction *nsa, \ struct osf1_sigaction *osa); } -157 UNIMPL LINUX -158 UNIMPL LINUX -159 UNIMPL OSF1 osf_getdirentries -160 UNIMPL OSF1 osf_statfs -161 UNIMPL OSF1 osf_fstatfs -162 UNIMPL LINUX -163 UNIMPL LINUX -164 UNIMPL LINUX -165 UNIMPL OSF1 osf_getdomainname -166 MNOPROTO LINUX { int setdomainname(char *name, int len); } -167 UNIMPL LINUX -168 UNIMPL LINUX -169 UNIMPL LINUX -170 UNIMPL LINUX -171 UNIMPL LINUX -172 UNIMPL LINUX -173 UNIMPL LINUX -174 UNIMPL LINUX -175 UNIMPL LINUX -176 UNIMPL LINUX -177 UNIMPL LINUX -178 UNIMPL LINUX -179 UNIMPL LINUX -180 UNIMPL LINUX -181 UNIMPL LINUX -182 UNIMPL LINUX -183 UNIMPL LINUX -184 UNIMPL LINUX -185 UNIMPL LINUX -186 UNIMPL LINUX -187 UNIMPL LINUX -188 UNIMPL LINUX -189 UNIMPL LINUX -190 UNIMPL LINUX -191 UNIMPL LINUX -192 UNIMPL LINUX -193 UNIMPL LINUX -194 UNIMPL LINUX -195 UNIMPL LINUX -196 UNIMPL LINUX -197 UNIMPL LINUX -198 UNIMPL LINUX -199 UNIMPL OSF1 osf_swapon -200 STD LINUX { int linux_msgctl(l_int msqid, l_int cmd, \ +157 UNIMPL +158 UNIMPL +159 UNIMPL osf_getdirentries +160 UNIMPL osf_statfs +161 UNIMPL osf_fstatfs +162 UNIMPL +163 UNIMPL +164 UNIMPL +165 UNIMPL osf_getdomainname +166 MNOPROTO { int setdomainname(char *name, int len); } +167 UNIMPL +168 UNIMPL +169 UNIMPL +170 UNIMPL +171 UNIMPL +172 UNIMPL +173 UNIMPL +174 UNIMPL +175 UNIMPL +176 UNIMPL +177 UNIMPL +178 UNIMPL +179 UNIMPL +180 UNIMPL +181 UNIMPL +182 UNIMPL +183 UNIMPL +184 UNIMPL +185 UNIMPL +186 UNIMPL +187 UNIMPL +188 UNIMPL +189 UNIMPL +190 UNIMPL +191 UNIMPL +192 UNIMPL +193 UNIMPL +194 UNIMPL +195 UNIMPL +196 UNIMPL +197 UNIMPL +198 UNIMPL +199 UNIMPL osf_swapon +200 STD { int linux_msgctl(l_int msqid, l_int cmd, \ struct l_msqid_ds *buf); } -201 STD LINUX { int linux_msgget(l_key_t key, l_int msgflg); } -202 STD LINUX { int linux_msgrcv(l_int msqid, struct l_msgbuf *msgp, \ +201 STD { int linux_msgget(l_key_t key, l_int msgflg); } +202 STD { int linux_msgrcv(l_int msqid, struct l_msgbuf *msgp, \ l_size_t msgsz, l_long msgtyp, l_int msgflg); } -203 STD LINUX { int linux_msgsnd(l_int msqid, struct l_msgbuf *msgp, \ +203 STD { int linux_msgsnd(l_int msqid, struct l_msgbuf *msgp, \ l_size_t msgsz, l_int msgflg); } -204 STD LINUX { int linux_semctl(l_int semid, l_int semnum, \ +204 STD { int linux_semctl(l_int semid, l_int semnum, \ l_int cmd, union l_semun arg); } -205 STD LINUX { int linux_semget(l_key_t key, l_int nsems, \ +205 STD { int linux_semget(l_key_t key, l_int nsems, \ l_int semflg); } -206 STD LINUX { int linux_semop(l_int semid, struct l_sembuf *tsops, \ +206 STD { int linux_semop(l_int semid, struct l_sembuf *tsops, \ l_uint nsops); } -207 UNIMPL OSF1 osf_utsname -208 STD LINUX { int linux_lchown(char *path, l_uid_t uid, \ - l_gid_t gid); } -209 STD OSF1 { int linux_shmat(l_int shmid, char *shmaddr, \ - l_int shmflg); } -210 STD LINUX { int linux_shmctl(l_int shmid, l_int cmd, \ +207 UNIMPL osf_utsname +208 STD { int linux_lchown(char *path, l_uid_t uid, l_gid_t gid); } +209 STD { int linux_shmat(l_int shmid, char *shmaddr, l_int shmflg); } +210 STD { int linux_shmctl(l_int shmid, l_int cmd, \ struct l_shmid_ds *buf); } -211 STD LINUX { int linux_shmdt(char *shmaddr); } -212 STD LINUX { int linux_shmget(l_key_t key, l_size_t size, \ - l_int shmflg); } -213 UNIMPL LINUX -214 UNIMPL LINUX -215 UNIMPL LINUX -216 UNIMPL LINUX -217 STD LINUX { int linux_msync(l_ulong addr, l_size_t len, \ - l_int fl); } -218 UNIMPL LINUX -219 UNIMPL LINUX -220 UNIMPL LINUX -221 UNIMPL LINUX -222 UNIMPL LINUX -223 UNIMPL LINUX -224 UNIMPL LINUX -225 UNIMPL LINUX -226 UNIMPL LINUX -227 UNIMPL LINUX -228 UNIMPL LINUX -229 UNIMPL LINUX -230 UNIMPL LINUX -231 UNIMPL LINUX -232 UNIMPL LINUX -233 MNOPROTO LINUX { int getpgid(int pid); } -234 MSTD LINUX { int linux_getsid(l_pid_t pid); } -235 STD LINUX { int linux_sigaltstack(void); } -236 UNIMPL LINUX -237 UNIMPL LINUX -238 UNIMPL LINUX -239 UNIMPL LINUX -240 UNIMPL LINUX -241 MSTD OSF1 { int osf1_sysinfo(int cmd, char *buf, long count); } -242 UNIMPL LINUX -243 UNIMPL LINUX -244 UNIMPL OSF1 osf_proplist_syscall -245 UNIMPL LINUX -246 UNIMPL LINUX -247 UNIMPL LINUX -248 UNIMPL LINUX -249 UNIMPL LINUX -250 UNIMPL LINUX -251 UNIMPL OSF1 osf_usleep_thread -252 UNIMPL LINUX -253 UNIMPL LINUX -254 STD LINUX { int linux_sysfs(l_int option, l_ulong arg1, \ - l_ulong arg2); } -255 UNIMPL LINUX -256 STD OSF1 { int osf1_getsysinfo(u_long op, caddr_t buffer, \ +211 STD { int linux_shmdt(char *shmaddr); } +212 STD { int linux_shmget(l_key_t key, l_size_t size, l_int shmflg); } +213 UNIMPL +214 UNIMPL +215 UNIMPL +216 UNIMPL +217 STD { int linux_msync(l_ulong addr, l_size_t len, l_int fl); } +218 UNIMPL +219 UNIMPL +220 UNIMPL +221 UNIMPL +222 UNIMPL +223 UNIMPL +224 UNIMPL +225 UNIMPL +226 UNIMPL +227 UNIMPL +228 UNIMPL +229 UNIMPL +230 UNIMPL +231 UNIMPL +232 UNIMPL +233 MNOPROTO { int getpgid(int pid); } +234 MSTD { int linux_getsid(l_pid_t pid); } +235 STD { int linux_sigaltstack(void); } +236 UNIMPL +237 UNIMPL +238 UNIMPL +239 UNIMPL +240 UNIMPL +241 MSTD { int osf1_sysinfo(int cmd, char *buf, long count); } +242 UNIMPL +243 UNIMPL +244 UNIMPL osf_proplist_syscall +245 UNIMPL +246 UNIMPL +247 UNIMPL +248 UNIMPL +249 UNIMPL +250 UNIMPL +251 UNIMPL osf_usleep_thread +252 UNIMPL +253 UNIMPL +254 STD { int linux_sysfs(l_int option, l_ulong arg1, l_ulong arg2); } +255 UNIMPL +256 STD { int osf1_getsysinfo(u_long op, caddr_t buffer, \ u_long nbytes, caddr_t arg, u_long flag); } -257 STD OSF1 { int osf1_setsysinfo(u_long op, caddr_t buffer, \ +257 STD { int osf1_setsysinfo(u_long op, caddr_t buffer, \ u_long nbytes, caddr_t arg, u_long flag); } -258 UNIMPL LINUX -259 UNIMPL LINUX -260 UNIMPL LINUX -261 UNIMPL LINUX -262 UNIMPL LINUX -263 UNIMPL LINUX -264 UNIMPL LINUX -265 UNIMPL LINUX -266 UNIMPL LINUX -267 UNIMPL LINUX -268 UNIMPL LINUX -269 UNIMPL LINUX -270 UNIMPL LINUX -271 UNIMPL LINUX -272 UNIMPL LINUX -273 UNIMPL LINUX -274 UNIMPL LINUX -275 UNIMPL LINUX -276 UNIMPL LINUX -277 UNIMPL LINUX -278 UNIMPL LINUX -279 UNIMPL LINUX -280 UNIMPL LINUX -281 UNIMPL LINUX -282 UNIMPL LINUX -283 UNIMPL LINUX -284 UNIMPL LINUX -285 UNIMPL LINUX -286 UNIMPL LINUX -287 UNIMPL LINUX -288 UNIMPL LINUX -289 UNIMPL LINUX -290 UNIMPL LINUX -291 UNIMPL LINUX -292 UNIMPL LINUX >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:15:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBCBE16A4D0; Wed, 24 Dec 2003 11:15: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 A35A616A4CE for ; Wed, 24 Dec 2003 11:15:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6D6943D2D for ; Wed, 24 Dec 2003 11:15:27 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBOJFR0B029223 for ; Wed, 24 Dec 2003 11:15:27 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBOJFORY029208 for perforce@freebsd.org; Wed, 24 Dec 2003 11:15:24 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 24 Dec 2003 11:15:24 -0800 (PST) Message-Id: <200312241915.hBOJFORY029208@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 44287 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, 24 Dec 2003 19:15:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=44287 Change 44287 by sam@sam_ebb on 2003/12/24 11:14:47 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/alpha/alpha/db_trace.c#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/dump_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/include/kse.h#2 delete .. //depot/projects/netperf+sockets/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/linux_syscall.h#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/linux_sysent.c#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/syscalls.conf#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/syscalls.master#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_proto.h#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_syscall.h#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_sysent.c#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/syscalls.conf#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/syscalls.master#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/pci/apecs.c#3 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/kse.h#2 delete .. //depot/projects/netperf+sockets/sys/amd64/include/param.h#3 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/netperf+sockets/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/ioctl_bt848.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/ioctl_meteor.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_bufs.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_dma.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/hatm/if_hatm_intr.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/idt/idt.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/idt/idt_harp.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/pci/pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/sio/sio.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ohci_pci.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/netperf+sockets/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_event.c#3 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/kse.h#2 delete .. //depot/projects/netperf+sockets/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/kse.h#2 delete .. //depot/projects/netperf+sockets/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/init_sysent.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_clock.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_thread.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sched_ule.c#6 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_smp.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/syscalls.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/syscalls.master#4 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/netperf+sockets/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/netperf+sockets/sys/modules/acpi/acpi/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/net/bridge.c#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/if_ether.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/netperf+sockets/sys/pci/if_rl.c#3 integrate .. //depot/projects/netperf+sockets/sys/powerpc/include/kse.h#2 delete .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/sparc64/include/kse.h#2 delete .. //depot/projects/netperf+sockets/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/sys/_null.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/netperf+sockets/sys/sys/kse.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/proc.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/socket.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/syscall.h#4 integrate .. //depot/projects/netperf+sockets/sys/sys/syscall.mk#4 integrate .. //depot/projects/netperf+sockets/sys/sys/sysproto.h#4 integrate .. //depot/projects/netperf+sockets/sys/sys/umtx.h#2 integrate .. //depot/projects/netperf+sockets/sys/vm/uma_int.h#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_page.c#3 integrate .. //depot/projects/netperf/sys/kern/syscalls.master#11 integrate .. //depot/projects/netperf/sys/sys/sysproto.h#11 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/alpha/alpha/db_trace.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.16 2003/11/29 11:57:02 jeff Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -99,7 +99,7 @@ { (uintptr_t)&XentSys, "syscall" }, { (uintptr_t)&XentUna, "unaligned access fault" }, { (uintptr_t)&XentRestart, "console restart" }, - { NULL } + { 0, NULL } }; @@ -180,7 +180,7 @@ { int i; - for (i = 0; special_symbols[i].ss_val != NULL; ++i) + for (i = 0; special_symbols[i].ss_val != 0; ++i) if (v == special_symbols[i].ss_val) return 1; return 0; @@ -339,7 +339,7 @@ if (sym_is_trapsymbol(symval)) { tf = (struct trapframe *)frame; - for (i = 0; special_symbols[i].ss_val != NULL; ++i) + for (i = 0; special_symbols[i].ss_val != 0; ++i) if (symval == special_symbols[i].ss_val) db_printf("--- %s", special_symbols[i].ss_note); ==== //depot/projects/netperf+sockets/sys/alpha/alpha/dump_machdep.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.5 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.6 2003/12/23 02:36:41 peter Exp $"); #include #include @@ -88,7 +88,7 @@ dumplo = di->mediaoffset + di->mediasize - Maxmem * (off_t)PAGE_SIZE; dumplo -= sizeof kdh * 2; - i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh); + i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh); if (i) printf("\nDump failed writing header (%d)\n", i); dumplo += sizeof kdh; @@ -111,7 +111,7 @@ printf(" %d", count / (1024 * 1024 / PAGE_SIZE)); mb = i; } - i = di->dumper(di->priv, va, NULL, dumplo, left * PAGE_SIZE); + i = di->dumper(di->priv, va, 0, dumplo, left * PAGE_SIZE); if (i) break; count += left; @@ -120,10 +120,10 @@ } if (i) printf("\nDump failed writing data (%d)\n", i); - i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh); + i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh); if (i) printf("\nDump failed writing trailer (%d)\n", i); - di->dumper(di->priv, NULL, NULL, 0, 0); /* tell them we are done */ + di->dumper(di->priv, NULL, 0, 0, 0); /* tell them we are done */ printf("\nDump complete\n"); return; } ==== //depot/projects/netperf+sockets/sys/alpha/alpha/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.16 2003/09/25 01:10:22 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.17 2003/12/23 02:42:38 peter Exp $"); #include #include @@ -81,15 +81,31 @@ ELFOSABI_FREEBSD, EM_ALPHA, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec + &elf64_freebsd_sysvec, + NULL, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); +static Elf64_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_oinfo); + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) ==== //depot/projects/netperf+sockets/sys/alpha/linux/linux_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.13 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.14 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/netperf+sockets/sys/alpha/linux/linux_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.11 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.12 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/netperf+sockets/sys/alpha/linux/linux_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.11 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.12 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #include "opt_compat.h" ==== //depot/projects/netperf+sockets/sys/alpha/linux/linux_sysvec.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.91 2003/09/25 01:10:22 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.92 2003/12/23 02:42:38 peter Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -210,7 +210,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.1", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; static Elf64_Brandinfo linux_glibc2brand = { @@ -219,7 +220,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.2", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; Elf64_Brandinfo *linux_brandlist[] = { ==== //depot/projects/netperf+sockets/sys/alpha/linux/syscalls.conf#2 (text+ko) ==== @@ -1,11 +1,10 @@ -# $FreeBSD: src/sys/alpha/linux/syscalls.conf,v 1.5 1999/08/28 00:45:25 peter Exp $ +# $FreeBSD: src/sys/alpha/linux/syscalls.conf,v 1.6 2003/12/24 00:32:07 peter Exp $ sysnames="/dev/null" sysproto="linux_proto.h" sysproto_h=_LINUX_SYSPROTO_H_ syshdr="linux_syscall.h" syssw="linux_sysent.c" sysmk="/dev/null" -syshide="/dev/null" syscallprefix="LINUX_SYS_" switchname="linux_sysent" namesname="linux_syscallnames" ==== //depot/projects/netperf+sockets/sys/alpha/linux/syscalls.master#3 (text+ko) ==== @@ -1,14 +1,13 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to created linux_sysent.c, linux_syscalls.c and linux_syscall.h. -; Columns: number type nargs namespc name alt{name,tag,rtyp}/comments +; Columns: number type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, ; NODEF, NOARGS, NOPROTO -; namespc one of POSIX, BSD, STD, NOHIDE (I dont care :-) -Peter ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -37,467 +36,426 @@ ; #ifdef's, etc. may be included, and are copied to the output files. -0 UNIMPL LINUX -1 MNOPROTO LINUX { void sys_exit(int rval); } exit sys_exit_args void -2 MSTD LINUX { int linux_fork(void); } -3 MNOPROTO LINUX { int read(int fd, char *buf, u_int nbyte); } -4 MNOPROTO LINUX { int write(int fd, char *buf, u_int nbyte); } -5 UNIMPL LINUX -6 MNOPROTO LINUX { int close(int fd); } -7 STD OSF1 { int osf1_wait4(int pid, int *status, int options, \ +0 UNIMPL +1 MNOPROTO { void sys_exit(int rval); } exit sys_exit_args void +2 MSTD { int linux_fork(void); } +3 MNOPROTO { int read(int fd, char *buf, u_int nbyte); } +4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); } +5 UNIMPL +6 MNOPROTO { int close(int fd); } +7 STD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } -8 UNIMPL LINUX -9 STD LINUX { int linux_link(char *path, char *to); } -10 STD LINUX { int linux_unlink(char *path); } -11 UNIMPL LINUX -12 STD LINUX { int linux_chdir(char *path); } -13 NOPROTO LINUX { int fchdir(int fd); } -14 STD LINUX { int linux_mknod(char *path, l_int mode, \ - l_dev_t dev); } -15 STD LINUX { int linux_chmod(char *path, l_mode_t mode); } -16 STD LINUX { int linux_chown(char *path, l_uid_t uid, \ - l_gid_t gid); } -17 STD OSF1 { int linux_brk(l_ulong dsend); } -18 UNIMPL LINUX -19 STD LINUX { int linux_lseek(l_uint fdes, l_off_t off, \ - l_int whence); } -20 NOPROTO BSD { int getpid(void); } -21 UNIMPL OSF1 osf1_mount -22 STD LINUX { int linux_umount(char *path, l_int flags); } -23 MNOPROTO LINUX { int setuid(uid_t uid); } -24 MNOPROTO BSD { int getuid(void); } -25 UNIMPL LINUX -26 MSTD LINUX { int linux_ptrace(void); } -27 UNIMPL LINUX -28 UNIMPL LINUX -29 UNIMPL LINUX -30 UNIMPL LINUX -31 UNIMPL LINUX -32 UNIMPL LINUX -33 STD LINUX { int linux_access(char *path, l_int flags); } -34 UNIMPL LINUX -35 UNIMPL LINUX -36 NOPROTO LINUX { int sync(void); } -37 MSTD LINUX { int linux_kill(l_int pid, l_int signum); } -38 UNIMPL LINUX -39 MNOPROTO LINUX { int setpgid(int pid, int pgid); } -40 UNIMPL LINUX -41 MNOPROTO LINUX { int dup(u_int fd); } -42 MNOPROTO BSD { int pipe(void); } -43 UNIMPL OSF1 osf_set_program_attributes -44 UNIMPL LINUX -45 STD LINUX { int linux_open(char *path, l_int flags, \ - l_int mode); } -46 UNIMPL LINUX -47 MNOPROTO BSD { int getgid(void); } -48 MSTD OSF1 { int osf1_sigprocmask(int how, u_long mask); } -49 UNIMPL LINUX -50 UNIMPL LINUX -51 NOPROTO LINUX { int acct(char *path); } -52 MSTD LINUX { int linux_sigpending(void); } -53 UNIMPL LINUX -54 STD LINUX { int linux_ioctl(l_uint fd, l_uint cmd, \ - l_ulong arg); } -55 UNIMPL LINUX -56 UNIMPL LINUX -57 STD LINUX { int linux_symlink(char *path, char *to); } -58 STD LINUX { int linux_readlink(char *name, char *buf, \ - l_int count); } -59 STD LINUX { int linux_execve(char *path, char **argp, \ - char **envp); } -60 MNOPROTO LINUX { int umask(int newmask); } -61 NOPROTO LINUX { int chroot(char *path); } -62 UNIMPL LINUX -63 MNOPROTO LINUX { int getpgrp(void); } -64 STD LINUX { int linux_getpagesize(void); } -65 UNIMPL LINUX -66 MSTD LINUX { int linux_vfork(void); } -67 STD LINUX { int linux_newstat(char *path, \ - struct l_newstat *buf); } -68 STD LINUX { int linux_newlstat(char *path, \ - struct l_newstat *buf); } -69 UNIMPL LINUX -70 UNIMPL LINUX -71 STD OSF1 { int linux_mmap(l_ulong addr, l_ulong len, \ - l_ulong prot, l_ulong flags, l_ulong fd, \ - l_ulong pos); } -72 UNIMPL LINUX -73 STD LINUX { int linux_munmap(l_ulong addr, l_size_t len); } -74 STD LINUX { int linux_mprotect(l_ulong addr, l_size_t len, \ +8 UNIMPL +9 STD { int linux_link(char *path, char *to); } +10 STD { int linux_unlink(char *path); } +11 UNIMPL +12 STD { int linux_chdir(char *path); } +13 NOPROTO { int fchdir(int fd); } +14 STD { int linux_mknod(char *path, l_int mode, l_dev_t dev); } +15 STD { int linux_chmod(char *path, l_mode_t mode); } +16 STD { int linux_chown(char *path, l_uid_t uid, l_gid_t gid); } +17 STD { int linux_brk(l_ulong dsend); } +18 UNIMPL +19 STD { int linux_lseek(l_uint fdes, l_off_t off, l_int whence); } +20 NOPROTO { int getpid(void); } +21 UNIMPL osf1_mount +22 STD { int linux_umount(char *path, l_int flags); } +23 MNOPROTO { int setuid(uid_t uid); } +24 MNOPROTO { int getuid(void); } +25 UNIMPL +26 MSTD { int linux_ptrace(void); } +27 UNIMPL +28 UNIMPL +29 UNIMPL +30 UNIMPL +31 UNIMPL +32 UNIMPL +33 STD { int linux_access(char *path, l_int flags); } +34 UNIMPL +35 UNIMPL +36 NOPROTO { int sync(void); } +37 MSTD { int linux_kill(l_int pid, l_int signum); } +38 UNIMPL +39 MNOPROTO { int setpgid(int pid, int pgid); } +40 UNIMPL +41 MNOPROTO { int dup(u_int fd); } +42 MNOPROTO { int pipe(void); } +43 UNIMPL osf_set_program_attributes +44 UNIMPL +45 STD { int linux_open(char *path, l_int flags, l_int mode); } +46 UNIMPL +47 MNOPROTO { int getgid(void); } +48 MSTD { int osf1_sigprocmask(int how, u_long mask); } +49 UNIMPL +50 UNIMPL +51 NOPROTO { int acct(char *path); } +52 MSTD { int linux_sigpending(void); } +53 UNIMPL +54 STD { int linux_ioctl(l_uint fd, l_uint cmd, l_ulong arg); } +55 UNIMPL +56 UNIMPL +57 STD { int linux_symlink(char *path, char *to); } +58 STD { int linux_readlink(char *name, char *buf, l_int count); } +59 STD { int linux_execve(char *path, char **argp, char **envp); } +60 MNOPROTO { int umask(int newmask); } +61 NOPROTO { int chroot(char *path); } +62 UNIMPL +63 MNOPROTO { int getpgrp(void); } +64 STD { int linux_getpagesize(void); } +65 UNIMPL +66 MSTD { int linux_vfork(void); } +67 STD { int linux_newstat(char *path, struct l_newstat *buf); } +68 STD { int linux_newlstat(char *path, struct l_newstat *buf); } +69 UNIMPL +70 UNIMPL +71 STD { int linux_mmap(l_ulong addr, l_ulong len, l_ulong prot, \ + l_ulong flags, l_ulong fd, l_ulong pos); } +72 UNIMPL +73 STD { int linux_munmap(l_ulong addr, l_size_t len); } +74 STD { int linux_mprotect(l_ulong addr, l_size_t len, \ l_ulong prot); } -75 STD LINUX { int linux_madvise(void); } -76 STD LINUX { int linux_vhangup(void); } -77 UNIMPL LINUX -78 UNIMPL LINUX -79 MSTD LINUX { int linux_setgroups(l_int gidsetsize, \ - l_gid_t *grouplist); } -80 MSTD LINUX { int linux_getgroups(l_int gidsetsize, \ - l_gid_t *grouplist); } -81 UNIMPL LINUX -82 MNODEF LINUX setpgid setpgid setpgid_args int -83 STD OSF1 { int osf1_setitimer(u_int which, \ - struct itimerval *itv, \ +75 STD { int linux_madvise(void); } +76 STD { int linux_vhangup(void); } +77 UNIMPL +78 UNIMPL +79 MSTD { int linux_setgroups(l_int gidsetsize, l_gid_t *grouplist); } +80 MSTD { int linux_getgroups(l_int gidsetsize, l_gid_t *grouplist); } +81 UNIMPL +82 MNODEF setpgid setpgid setpgid_args int +83 STD { int osf1_setitimer(u_int which, struct itimerval *itv, \ struct itimerval *oitv); } -84 UNIMPL LINUX -85 UNIMPL LINUX -86 UNIMPL OSF1 osf_getitimer -87 STD LINUX { int linux_gethostname(void); } -88 MNOPROTO LINUX { int osethostname(char *hostname, u_int len); } \ +84 UNIMPL +85 UNIMPL +86 UNIMPL osf_getitimer +87 STD { int linux_gethostname(void); } +88 MNOPROTO { int osethostname(char *hostname, u_int len); } \ osethostname sethostname_args int -89 STD LINUX { int linux_getdtablesize(void); } -90 MNOPROTO LINUX { int dup2(u_int from, u_int to); } -91 STD LINUX { int linux_newfstat(l_uint fd, \ - struct l_newstat *buf); } -92 STD LINUX { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } -93 STD OSF1 { int osf1_select(u_int nd, fd_set *in, fd_set *ou, \ +89 STD { int linux_getdtablesize(void); } +90 MNOPROTO { int dup2(u_int from, u_int to); } +91 STD { int linux_newfstat(l_uint fd, struct l_newstat *buf); } +92 STD { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } +93 STD { int osf1_select(u_int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval *tv); } -94 NOPROTO LINUX { int poll(struct pollfd*, unsigned int nfds, \ - long timeout); } -95 NOPROTO LINUX { int fsync(int fd); } -96 MNOPROTO LINUX { int setpriority(int which, int who, int prio); } -97 STD LINUX { int osf1_socket(int domain, int type, \ - int protocol); } -98 STD LINUX { int linux_connect(l_int s, struct l_sockaddr *name, \ +94 NOPROTO { int poll(struct pollfd*, unsigned int nfds, long timeout); } +95 NOPROTO { int fsync(int fd); } +96 MNOPROTO { int setpriority(int which, int who, int prio); } +97 STD { int osf1_socket(int domain, int type, int protocol); } +98 STD { int linux_connect(l_int s, struct l_sockaddr *name, \ l_int namelen); } -99 NOPROTO LINUX { int oaccept(int s, caddr_t name, int *anamelen); } \ +99 NOPROTO { int oaccept(int s, caddr_t name, int *anamelen); } \ accept accept_args int -100 UNIMPL OSF1 osf_getpriority -101 NOPROTO LINUX { int osend(int s, caddr_t buf, int len, int flags); } -102 NOPROTO LINUX { int orecv(int s, caddr_t buf, int len, int flags); } -103 MSTD LINUX { int osf1_sigreturn(struct osigcontext *sigcntxp); } -104 NOPROTO LINUX { int bind(int s, caddr_t name, int namelen); } -105 NOPROTO LINUX { int setsockopt(int s, int level, int name, \ - caddr_t val, int valsize); } -106 NOPROTO LINUX { int listen(int s, int backlog); } -107 UNIMPL LINUX -108 UNIMPL LINUX -109 UNIMPL LINUX -110 UNIMPL LINUX -111 MSTD LINUX { int osf1_sigsuspend(unsigned long ss); } -112 UNIMPL OSF1 osf_sigstack -113 STD LINUX { int linux_recvmsg(void); } -114 STD LINUX { int linux_sendmsg(void); } -115 UNIMPL LINUX -116 MSTD OSF1 { int osf1_gettimeofday(struct timeval *tp, \ +100 UNIMPL osf_getpriority +101 NOPROTO { int osend(int s, caddr_t buf, int len, int flags); } +102 NOPROTO { int orecv(int s, caddr_t buf, int len, int flags); } +103 MSTD { int osf1_sigreturn(struct osigcontext *sigcntxp); } +104 NOPROTO { int bind(int s, caddr_t name, int namelen); } +105 NOPROTO { int setsockopt(int s, int level, int name, caddr_t val, \ + int valsize); } +106 NOPROTO { int listen(int s, int backlog); } +107 UNIMPL +108 UNIMPL +109 UNIMPL +110 UNIMPL +111 MSTD { int osf1_sigsuspend(unsigned long ss); } +112 UNIMPL osf_sigstack +113 STD { int linux_recvmsg(void); } +114 STD { int linux_sendmsg(void); } +115 UNIMPL +116 MSTD { int osf1_gettimeofday(struct timeval *tp, \ struct timezone *tzp); } -117 STD OSF1 { int osf1_getrusage(long who, void *rusage); } -118 NOPROTO LINUX { int getsockopt(int s, int level, int name, \ - caddr_t val, int *avalsize); } -119 UNIMPL LINUX -120 NOPROTO LINUX { int readv(int fd, struct iovec *iovp, \ - u_int iovcnt); } -121 NOPROTO LINUX { int writev(int fd, struct iovec *iovp, \ - u_int iovcnt); } -122 UNIMPL OSF1 osf_settimeofday -123 NOPROTO LINUX { int fchown(int fd, int uid, int gid); } -124 NOPROTO LINUX { int fchmod(int fd, int mode); } -125 NOPROTO LINUX { int orecvfrom(int s, caddr_t buf, size_t len, \ - int flags, caddr_t from, int *fromlenaddr); } \ +117 STD { int osf1_getrusage(long who, void *rusage); } +118 NOPROTO { int getsockopt(int s, int level, int name, caddr_t val, \ + int *avalsize); } +119 UNIMPL +120 NOPROTO { int readv(int fd, struct iovec *iovp, u_int iovcnt); } +121 NOPROTO { int writev(int fd, struct iovec *iovp, u_int iovcnt); } +122 UNIMPL osf_settimeofday +123 NOPROTO { int fchown(int fd, int uid, int gid); } +124 NOPROTO { int fchmod(int fd, int mode); } +125 NOPROTO { int orecvfrom(int s, caddr_t buf, size_t len, int flags, \ + caddr_t from, int *fromlenaddr); } \ recvfrom recvfrom_args int -126 MNOPROTO LINUX { int setreuid(int ruid, int euid); } -127 MNOPROTO LINUX { int setregid(int rgid, int egid); } -128 STD LINUX { int linux_rename(char *from, char *to); } -129 STD LINUX { int linux_truncate(char *path, l_ulong length); } -130 NOPROTO LINUX { int oftruncate(int fd, long length); } -131 NOPROTO LINUX { int flock(int fd, int how); } -132 MNOPROTO LINUX { int setgid(gid_t gid); } -133 STD LINUX { int osf1_sendto(int s, caddr_t buf, size_t len, \ - int flags, struct sockaddr *to, int tolen); } -134 NOPROTO LINUX { int shutdown(int s, int how); } -135 STD LINUX { int linux_socketpair(void); } -136 STD LINUX { int linux_mkdir(char *path, l_int mode); } -137 STD LINUX { int linux_rmdir(char *path); } -138 NOPROTO OSF1 { int utimes(char *path, struct timeval *tptr); } -139 UNIMPL LINUX -140 UNIMPL LINUX -141 NOPROTO LINUX { int ogetpeername(int fdes, caddr_t asa, int *alen); } -142 UNIMPL LINUX -143 UNIMPL LINUX -144 STD LINUX { int linux_getrlimit(l_uint resource, \ +126 MNOPROTO { int setreuid(int ruid, int euid); } +127 MNOPROTO { int setregid(int rgid, int egid); } +128 STD { int linux_rename(char *from, char *to); } +129 STD { int linux_truncate(char *path, l_ulong length); } +130 NOPROTO { int oftruncate(int fd, long length); } +131 NOPROTO { int flock(int fd, int how); } +132 MNOPROTO { int setgid(gid_t gid); } +133 STD { int osf1_sendto(int s, caddr_t buf, size_t len, int flags, \ + struct sockaddr *to, int tolen); } +134 NOPROTO { int shutdown(int s, int how); } +135 STD { int linux_socketpair(void); } +136 STD { int linux_mkdir(char *path, l_int mode); } +137 STD { int linux_rmdir(char *path); } +138 NOPROTO { int utimes(char *path, struct timeval *tptr); } +139 UNIMPL +140 UNIMPL +141 NOPROTO { int ogetpeername(int fdes, caddr_t asa, int *alen); } +142 UNIMPL +143 UNIMPL +144 STD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -145 STD LINUX { int linux_setrlimit(l_uint resource, \ +145 STD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } -146 UNIMPL LINUX -147 MNOPROTO LINUX { int setsid(void); } -148 STD LINUX { int linux_quotactl(void); } -149 UNIMPL LINUX -150 NOPROTO LINUX { int ogetsockname(int fdec, caddr_t asa, int *alen);} \ +146 UNIMPL +147 MNOPROTO { int setsid(void); } +148 STD { int linux_quotactl(void); } +149 UNIMPL +150 NOPROTO { int ogetsockname(int fdec, caddr_t asa, int *alen);} \ getsockname getsockname_args int -151 UNIMPL LINUX -152 UNIMPL LINUX -153 UNIMPL LINUX -154 UNIMPL LINUX -155 UNIMPL LINUX -156 MSTD OSF1 { int osf1_sigaction(int sig, \ - struct osf1_sigaction *nsa, \ +151 UNIMPL +152 UNIMPL +153 UNIMPL +154 UNIMPL +155 UNIMPL +156 MSTD { int osf1_sigaction(int sig, struct osf1_sigaction *nsa, \ struct osf1_sigaction *osa); } -157 UNIMPL LINUX -158 UNIMPL LINUX -159 UNIMPL OSF1 osf_getdirentries -160 UNIMPL OSF1 osf_statfs -161 UNIMPL OSF1 osf_fstatfs -162 UNIMPL LINUX -163 UNIMPL LINUX -164 UNIMPL LINUX -165 UNIMPL OSF1 osf_getdomainname -166 MNOPROTO LINUX { int setdomainname(char *name, int len); } -167 UNIMPL LINUX -168 UNIMPL LINUX -169 UNIMPL LINUX -170 UNIMPL LINUX -171 UNIMPL LINUX -172 UNIMPL LINUX -173 UNIMPL LINUX -174 UNIMPL LINUX -175 UNIMPL LINUX -176 UNIMPL LINUX -177 UNIMPL LINUX -178 UNIMPL LINUX -179 UNIMPL LINUX -180 UNIMPL LINUX -181 UNIMPL LINUX -182 UNIMPL LINUX -183 UNIMPL LINUX -184 UNIMPL LINUX -185 UNIMPL LINUX -186 UNIMPL LINUX -187 UNIMPL LINUX -188 UNIMPL LINUX -189 UNIMPL LINUX -190 UNIMPL LINUX -191 UNIMPL LINUX -192 UNIMPL LINUX -193 UNIMPL LINUX -194 UNIMPL LINUX -195 UNIMPL LINUX -196 UNIMPL LINUX -197 UNIMPL LINUX -198 UNIMPL LINUX -199 UNIMPL OSF1 osf_swapon -200 STD LINUX { int linux_msgctl(l_int msqid, l_int cmd, \ +157 UNIMPL +158 UNIMPL +159 UNIMPL osf_getdirentries +160 UNIMPL osf_statfs +161 UNIMPL osf_fstatfs +162 UNIMPL +163 UNIMPL +164 UNIMPL +165 UNIMPL osf_getdomainname +166 MNOPROTO { int setdomainname(char *name, int len); } +167 UNIMPL +168 UNIMPL +169 UNIMPL +170 UNIMPL +171 UNIMPL +172 UNIMPL +173 UNIMPL +174 UNIMPL +175 UNIMPL +176 UNIMPL +177 UNIMPL +178 UNIMPL +179 UNIMPL +180 UNIMPL +181 UNIMPL +182 UNIMPL +183 UNIMPL +184 UNIMPL +185 UNIMPL +186 UNIMPL +187 UNIMPL +188 UNIMPL +189 UNIMPL +190 UNIMPL +191 UNIMPL +192 UNIMPL +193 UNIMPL +194 UNIMPL +195 UNIMPL +196 UNIMPL +197 UNIMPL +198 UNIMPL +199 UNIMPL osf_swapon +200 STD { int linux_msgctl(l_int msqid, l_int cmd, \ struct l_msqid_ds *buf); } -201 STD LINUX { int linux_msgget(l_key_t key, l_int msgflg); } -202 STD LINUX { int linux_msgrcv(l_int msqid, struct l_msgbuf *msgp, \ +201 STD { int linux_msgget(l_key_t key, l_int msgflg); } +202 STD { int linux_msgrcv(l_int msqid, struct l_msgbuf *msgp, \ l_size_t msgsz, l_long msgtyp, l_int msgflg); } -203 STD LINUX { int linux_msgsnd(l_int msqid, struct l_msgbuf *msgp, \ +203 STD { int linux_msgsnd(l_int msqid, struct l_msgbuf *msgp, \ l_size_t msgsz, l_int msgflg); } -204 STD LINUX { int linux_semctl(l_int semid, l_int semnum, \ +204 STD { int linux_semctl(l_int semid, l_int semnum, \ l_int cmd, union l_semun arg); } -205 STD LINUX { int linux_semget(l_key_t key, l_int nsems, \ +205 STD { int linux_semget(l_key_t key, l_int nsems, \ l_int semflg); } -206 STD LINUX { int linux_semop(l_int semid, struct l_sembuf *tsops, \ +206 STD { int linux_semop(l_int semid, struct l_sembuf *tsops, \ l_uint nsops); } -207 UNIMPL OSF1 osf_utsname -208 STD LINUX { int linux_lchown(char *path, l_uid_t uid, \ - l_gid_t gid); } -209 STD OSF1 { int linux_shmat(l_int shmid, char *shmaddr, \ - l_int shmflg); } -210 STD LINUX { int linux_shmctl(l_int shmid, l_int cmd, \ +207 UNIMPL osf_utsname +208 STD { int linux_lchown(char *path, l_uid_t uid, l_gid_t gid); } +209 STD { int linux_shmat(l_int shmid, char *shmaddr, l_int shmflg); } +210 STD { int linux_shmctl(l_int shmid, l_int cmd, \ struct l_shmid_ds *buf); } -211 STD LINUX { int linux_shmdt(char *shmaddr); } -212 STD LINUX { int linux_shmget(l_key_t key, l_size_t size, \ - l_int shmflg); } -213 UNIMPL LINUX -214 UNIMPL LINUX -215 UNIMPL LINUX -216 UNIMPL LINUX -217 STD LINUX { int linux_msync(l_ulong addr, l_size_t len, \ - l_int fl); } -218 UNIMPL LINUX -219 UNIMPL LINUX -220 UNIMPL LINUX -221 UNIMPL LINUX -222 UNIMPL LINUX -223 UNIMPL LINUX -224 UNIMPL LINUX -225 UNIMPL LINUX -226 UNIMPL LINUX -227 UNIMPL LINUX -228 UNIMPL LINUX -229 UNIMPL LINUX -230 UNIMPL LINUX -231 UNIMPL LINUX -232 UNIMPL LINUX -233 MNOPROTO LINUX { int getpgid(int pid); } -234 MSTD LINUX { int linux_getsid(l_pid_t pid); } -235 STD LINUX { int linux_sigaltstack(void); } -236 UNIMPL LINUX -237 UNIMPL LINUX -238 UNIMPL LINUX -239 UNIMPL LINUX -240 UNIMPL LINUX -241 MSTD OSF1 { int osf1_sysinfo(int cmd, char *buf, long count); } -242 UNIMPL LINUX -243 UNIMPL LINUX -244 UNIMPL OSF1 osf_proplist_syscall -245 UNIMPL LINUX -246 UNIMPL LINUX -247 UNIMPL LINUX -248 UNIMPL LINUX -249 UNIMPL LINUX -250 UNIMPL LINUX -251 UNIMPL OSF1 osf_usleep_thread -252 UNIMPL LINUX -253 UNIMPL LINUX -254 STD LINUX { int linux_sysfs(l_int option, l_ulong arg1, \ - l_ulong arg2); } -255 UNIMPL LINUX -256 STD OSF1 { int osf1_getsysinfo(u_long op, caddr_t buffer, \ +211 STD { int linux_shmdt(char *shmaddr); } +212 STD { int linux_shmget(l_key_t key, l_size_t size, l_int shmflg); } +213 UNIMPL +214 UNIMPL +215 UNIMPL +216 UNIMPL +217 STD { int linux_msync(l_ulong addr, l_size_t len, l_int fl); } +218 UNIMPL +219 UNIMPL +220 UNIMPL +221 UNIMPL +222 UNIMPL +223 UNIMPL +224 UNIMPL +225 UNIMPL +226 UNIMPL +227 UNIMPL +228 UNIMPL +229 UNIMPL +230 UNIMPL +231 UNIMPL +232 UNIMPL +233 MNOPROTO { int getpgid(int pid); } +234 MSTD { int linux_getsid(l_pid_t pid); } +235 STD { int linux_sigaltstack(void); } +236 UNIMPL +237 UNIMPL +238 UNIMPL +239 UNIMPL +240 UNIMPL +241 MSTD { int osf1_sysinfo(int cmd, char *buf, long count); } +242 UNIMPL +243 UNIMPL +244 UNIMPL osf_proplist_syscall +245 UNIMPL +246 UNIMPL +247 UNIMPL +248 UNIMPL +249 UNIMPL +250 UNIMPL +251 UNIMPL osf_usleep_thread +252 UNIMPL +253 UNIMPL +254 STD { int linux_sysfs(l_int option, l_ulong arg1, l_ulong arg2); } +255 UNIMPL +256 STD { int osf1_getsysinfo(u_long op, caddr_t buffer, \ u_long nbytes, caddr_t arg, u_long flag); } -257 STD OSF1 { int osf1_setsysinfo(u_long op, caddr_t buffer, \ +257 STD { int osf1_setsysinfo(u_long op, caddr_t buffer, \ u_long nbytes, caddr_t arg, u_long flag); } -258 UNIMPL LINUX -259 UNIMPL LINUX -260 UNIMPL LINUX -261 UNIMPL LINUX -262 UNIMPL LINUX -263 UNIMPL LINUX -264 UNIMPL LINUX -265 UNIMPL LINUX -266 UNIMPL LINUX -267 UNIMPL LINUX -268 UNIMPL LINUX -269 UNIMPL LINUX -270 UNIMPL LINUX -271 UNIMPL LINUX -272 UNIMPL LINUX -273 UNIMPL LINUX -274 UNIMPL LINUX -275 UNIMPL LINUX -276 UNIMPL LINUX -277 UNIMPL LINUX -278 UNIMPL LINUX -279 UNIMPL LINUX -280 UNIMPL LINUX -281 UNIMPL LINUX -282 UNIMPL LINUX -283 UNIMPL LINUX -284 UNIMPL LINUX -285 UNIMPL LINUX -286 UNIMPL LINUX -287 UNIMPL LINUX -288 UNIMPL LINUX -289 UNIMPL LINUX -290 UNIMPL LINUX >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:16:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB97D16A4D0; Wed, 24 Dec 2003 11:16: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 A72D016A4CE for ; Wed, 24 Dec 2003 11:16:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA35343D1D for ; Wed, 24 Dec 2003 11:16:29 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBOJGT0B029248 for ; Wed, 24 Dec 2003 11:16:29 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBOJGTJk029245 for perforce@freebsd.org; Wed, 24 Dec 2003 11:16:29 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 24 Dec 2003 11:16:29 -0800 (PST) Message-Id: <200312241916.hBOJGTJk029245@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 44288 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, 24 Dec 2003 19:16:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=44288 Change 44288 by sam@sam_ebb on 2003/12/24 11:15:35 IFC to fix build Affected files ... .. //depot/projects/netperf+sockets/sys/kern/syscalls.master#5 integrate .. //depot/projects/netperf+sockets/sys/sys/sysproto.h#5 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/kern/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.163 2003/12/24 18:47:42 alfred Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.164 2003/12/24 19:09:45 alfred Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -80,14 +80,14 @@ 27 MSTD { int recvmsg(int s, struct msghdr *msg, int flags); } 28 MSTD { int sendmsg(int s, struct msghdr *msg, int flags); } 29 MSTD { int recvfrom(int s, caddr_t buf, size_t len, int flags, \ - struct sockaddr * __restrict from, \ - __socklen_t * __restrict fromlenaddr); } -30 MSTD { int accept(int s, struct sockaddr * __restrict name, \ - __socklen_t * __restrict *anamelen); } -31 MSTD { int getpeername(int fdes, struct sockaddr * __restrict asa, \ - __socklen_t * __restrict *alen); } -32 MSTD { int getsockname(int fdes, struct sockaddr * __restrict asa, \ - __socklen_t * __restrict *alen); } + struct sockaddr * from, \ + __socklen_t * fromlenaddr); } +30 MSTD { int accept(int s, struct sockaddr * name, \ + __socklen_t *anamelen); } +31 MSTD { int getpeername(int fdes, struct sockaddr * asa, \ + __socklen_t *alen); } +32 MSTD { int getsockname(int fdes, struct sockaddr * asa, \ + __socklen_t *alen); } 33 STD { int access(char *path, int flags); } 34 STD { int chflags(char *path, int flags); } 35 STD { int fchflags(int fd, int flags); } ==== //depot/projects/netperf+sockets/sys/sys/sysproto.h#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.145 2003/12/24 18:52:09 alfred Exp $ + * $FreeBSD: src/sys/sys/sysproto.h,v 1.146 2003/12/24 19:10:16 alfred Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.163 2003/12/24 18:47:42 alfred Exp */ @@ -138,23 +138,23 @@ char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char from_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict from; char from_r_[PADR_(struct sockaddr *__restrict)]; - char fromlenaddr_l_[PADL_(__socklen_t *__restrict)]; __socklen_t *__restrict fromlenaddr; char fromlenaddr_r_[PADR_(__socklen_t *__restrict)]; + char from_l_[PADL_(struct sockaddr *)]; struct sockaddr * from; char from_r_[PADR_(struct sockaddr *)]; + char fromlenaddr_l_[PADL_(__socklen_t *)]; __socklen_t * fromlenaddr; char fromlenaddr_r_[PADR_(__socklen_t *)]; }; struct accept_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict name; char name_r_[PADR_(struct sockaddr *__restrict)]; - char anamelen_l_[PADL_(__socklen_t *__restrict *)]; __socklen_t *__restrict * anamelen; char anamelen_r_[PADR_(__socklen_t *__restrict *)]; + char name_l_[PADL_(struct sockaddr *)]; struct sockaddr * name; char name_r_[PADR_(struct sockaddr *)]; + char anamelen_l_[PADL_(__socklen_t *)]; __socklen_t * anamelen; char anamelen_r_[PADR_(__socklen_t *)]; }; struct getpeername_args { char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)]; - char asa_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict asa; char asa_r_[PADR_(struct sockaddr *__restrict)]; - char alen_l_[PADL_(__socklen_t *__restrict *)]; __socklen_t *__restrict * alen; char alen_r_[PADR_(__socklen_t *__restrict *)]; + char asa_l_[PADL_(struct sockaddr *)]; struct sockaddr * asa; char asa_r_[PADR_(struct sockaddr *)]; + char alen_l_[PADL_(__socklen_t *)]; __socklen_t * alen; char alen_r_[PADR_(__socklen_t *)]; }; struct getsockname_args { char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)]; - char asa_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict asa; char asa_r_[PADR_(struct sockaddr *__restrict)]; - char alen_l_[PADL_(__socklen_t *__restrict *)]; __socklen_t *__restrict * alen; char alen_r_[PADR_(__socklen_t *__restrict *)]; + char asa_l_[PADL_(struct sockaddr *)]; struct sockaddr * asa; char asa_r_[PADR_(struct sockaddr *)]; + char alen_l_[PADL_(__socklen_t *)]; __socklen_t * alen; char alen_r_[PADR_(__socklen_t *)]; }; struct access_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; From owner-p4-projects@FreeBSD.ORG Wed Dec 24 12:12:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E44FE16A4D0; Wed, 24 Dec 2003 12:12: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 B8B9416A4CE for ; Wed, 24 Dec 2003 12:12:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB6CB43D45 for ; Wed, 24 Dec 2003 12:12:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBOKCd0B041954 for ; Wed, 24 Dec 2003 12:12:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBOKCdVC041951 for perforce@freebsd.org; Wed, 24 Dec 2003 12:12:39 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 24 Dec 2003 12:12:39 -0800 (PST) Message-Id: <200312242012.hBOKCdVC041951@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 44291 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, 24 Dec 2003 20:12:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=44291 Change 44291 by sam@sam_ebb on 2003/12/24 12:12:16 fix merge botch Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#6 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#6 (text+ko) ==== @@ -3378,25 +3378,6 @@ } #endif /* PIM */ -static void -ip_mrouter_reset(void) -{ - bzero((caddr_t)mfctable, sizeof(mfctable)); - bzero((caddr_t)nexpire, sizeof(nexpire)); - - pim_assert = 0; - mrt_api_config = 0; - - callout_init(&expire_upcalls_ch, CALLOUT_MPSAFE); - - bw_upcalls_n = 0; - bzero((caddr_t)bw_meter_timers, sizeof(bw_meter_timers)); - callout_init(&bw_upcalls_ch, CALLOUT_MPSAFE); - callout_init(&bw_meter_ch, CALLOUT_MPSAFE); - - callout_init(&tbf_reprocess_ch, CALLOUT_MPSAFE); -} - static int ip_mroute_modevent(module_t mod, int type, void *unused) { From owner-p4-projects@FreeBSD.ORG Wed Dec 24 17:13:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C679016A4D0; Wed, 24 Dec 2003 17:13:44 -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 9D7EB16A4CE for ; Wed, 24 Dec 2003 17:13:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7D9043D2F for ; Wed, 24 Dec 2003 17:13:43 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBP1Dh0B017876 for ; Wed, 24 Dec 2003 17:13:43 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBP1DhU9017873 for perforce@freebsd.org; Wed, 24 Dec 2003 17:13:43 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 24 Dec 2003 17:13:43 -0800 (PST) Message-Id: <200312250113.hBP1DhU9017873@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 44295 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, 25 Dec 2003 01:13:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=44295 Change 44295 by sam@sam_ebb on 2003/12/24 17:13:18 blindly workaround compiler warnings that don't make sense Affected files ... .. //depot/projects/netperf+sockets/sys/compat/linux/linux_socket.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/compat/linux/linux_socket.c#3 (text+ko) ==== @@ -719,7 +719,7 @@ return (error); bsd_args.s = linux_args.s; - bsd_args.name = (caddr_t)linux_args.addr; + bsd_args.name = (void *)linux_args.addr; bsd_args.anamelen = linux_args.namelen; error = oaccept(td, &bsd_args); if (error) @@ -767,7 +767,7 @@ return (error); bsd_args.fdes = linux_args.s; - bsd_args.asa = (caddr_t) linux_args.addr; + bsd_args.asa = (void *) linux_args.addr; bsd_args.alen = linux_args.namelen; error = ogetsockname(td, &bsd_args); if (error) @@ -958,7 +958,7 @@ bsd_args.buf = linux_args.buf; bsd_args.len = linux_args.len; bsd_args.flags = linux_to_bsd_msg_flags(linux_args.flags); - bsd_args.from = linux_args.from; + bsd_args.from = (void *)linux_args.from; bsd_args.fromlenaddr = linux_args.fromlen; error = orecvfrom(td, &bsd_args); if (error) From owner-p4-projects@FreeBSD.ORG Wed Dec 24 17:52:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D438716A4D0; Wed, 24 Dec 2003 17:52: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 AF73316A4CE for ; Wed, 24 Dec 2003 17:52:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC2D343D39 for ; Wed, 24 Dec 2003 17:52:32 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBP1qW0B026200 for ; Wed, 24 Dec 2003 17:52:32 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBP1qWkI026197 for perforce@freebsd.org; Wed, 24 Dec 2003 17:52:32 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 24 Dec 2003 17:52:32 -0800 (PST) Message-Id: <200312250152.hBP1qWkI026197@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 44299 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, 25 Dec 2003 01:52:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=44299 Change 44299 by sam@sam_ebb on 2003/12/24 17:52:19 revert use of M_WAITOK when dup'ing a sockaddr; this causes grief for nfs; need to think about this some more Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#10 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#10 (text+ko) ==== @@ -903,10 +903,12 @@ KASSERT(m->m_type == MT_SONAME, ("m->m_type == %d", m->m_type)); if (psa) { - SOCKBUF_UNLOCK(&so->so_rcv); *psa = sodupsockaddr(mtod(m, struct sockaddr *), - M_WAITOK); - SOCKBUF_LOCK(&so->so_rcv); + M_NOWAIT); + if (*psa == NULL) { + error = ENOMEM; + goto release; + } } if (flags & MSG_PEEK) { m = m->m_next; From owner-p4-projects@FreeBSD.ORG Thu Dec 25 11:45:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6823516A4D1; Thu, 25 Dec 2003 11:45: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 2357216A4CF for ; Thu, 25 Dec 2003 11:45:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33A7B43D53 for ; Thu, 25 Dec 2003 11:45:11 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPJjB0B079873 for ; Thu, 25 Dec 2003 11:45:11 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPJjAYO079854 for perforce@freebsd.org; Thu, 25 Dec 2003 11:45:10 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 25 Dec 2003 11:45:10 -0800 (PST) Message-Id: <200312251945.hBPJjAYO079854@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 44310 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, 25 Dec 2003 19:45:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=44310 Change 44310 by sam@sam_ebb on 2003/12/25 11:45:09 IFC Affected files ... .. //depot/projects/netperf/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/netperf/sys/conf/kmod.mk#10 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/netperf/sys/dev/hifn/hifn7751.c#9 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/netperf/sys/dev/raidframe/rf_freebsdkintf.c#5 integrate .. //depot/projects/netperf/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/netperf/sys/kern/uipc_mbuf.c#5 integrate Differences ... ==== //depot/projects/netperf/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.44 2003/11/09 17:04:04 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.45 2003/12/25 09:59:02 bde Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -405,20 +405,20 @@ linux_check_hdrincl(struct thread *td, caddr_t *sg, int s) { struct getsockopt_args /* { - int s; - int level; - int name; - caddr_t val; - int *avalsize; + int s; + int level; + int name; + void * __restrict val; + socklen_t * __restrict avalsize; } */ bsd_args; - int error; - caddr_t val, valsize; - int size_val = sizeof val; - int optval; + void * __restrict val; + socklen_t * __restrict valsize; + int error, optval, size_val; - val = stackgap_alloc(sg, sizeof(int)); - valsize = stackgap_alloc(sg, sizeof(int)); + val = stackgap_alloc(sg, sizeof(size_val)); + valsize = stackgap_alloc(sg, sizeof(socklen_t)); + size_val = sizeof(val); if ((error = copyout(&size_val, valsize, sizeof(size_val)))) return (error); @@ -426,7 +426,7 @@ bsd_args.level = IPPROTO_IP; bsd_args.name = IP_HDRINCL; bsd_args.val = val; - bsd_args.avalsize = (int *)valsize; + bsd_args.avalsize = valsize; if ((error = getsockopt(td, &bsd_args))) return (error); @@ -701,17 +701,17 @@ { struct linux_accept_args linux_args; struct accept_args /* { - int s; - caddr_t name; - int *anamelen; + int s; + struct sockaddr * __restrict name; + socklen_t * __restrict anamelen; } */ bsd_args; struct close_args /* { int fd; } */ c_args; struct fcntl_args /* { - int fd; - int cmd; - long arg; + int fd; + int cmd; + long arg; } */ f_args; int error; @@ -719,8 +719,9 @@ return (error); bsd_args.s = linux_args.s; - bsd_args.name = (caddr_t)linux_args.addr; - bsd_args.anamelen = linux_args.namelen; + /* XXX: */ + bsd_args.name = (struct sockaddr * __restrict)linux_args.addr; + bsd_args.anamelen = linux_args.namelen; /* XXX */ error = oaccept(td, &bsd_args); if (error) return (error); @@ -757,9 +758,9 @@ { struct linux_getsockname_args linux_args; struct getsockname_args /* { - int fdes; - caddr_t asa; - int *alen; + int fdes; + struct sockaddr * __restrict asa; + socklen_t * __restrict alen; } */ bsd_args; int error; @@ -767,8 +768,9 @@ return (error); bsd_args.fdes = linux_args.s; - bsd_args.asa = (caddr_t) linux_args.addr; - bsd_args.alen = linux_args.namelen; + /* XXX: */ + bsd_args.asa = (struct sockaddr * __restrict)linux_args.addr; + bsd_args.alen = linux_args.namelen; /* XXX */ error = ogetsockname(td, &bsd_args); if (error) return (error); @@ -942,12 +944,12 @@ { struct linux_recvfrom_args linux_args; struct recvfrom_args /* { - int s; - caddr_t buf; - size_t len; - int flags; - caddr_t from; - int *fromlenaddr; + int s; + caddr_t buf; + size_t len; + int flags; + struct sockaddr * __restrict from; + socklen_t * __restrict fromlenaddr; } */ bsd_args; int error; @@ -958,8 +960,9 @@ bsd_args.buf = linux_args.buf; bsd_args.len = linux_args.len; bsd_args.flags = linux_to_bsd_msg_flags(linux_args.flags); - bsd_args.from = linux_args.from; - bsd_args.fromlenaddr = linux_args.fromlen; + /* XXX: */ + bsd_args.from = (struct sockaddr * __restrict)linux_args.from; + bsd_args.fromlenaddr = linux_args.fromlen; /* XXX */ error = orecvfrom(td, &bsd_args); if (error) return (error); ==== //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.9 2003/12/24 18:23:02 alfred Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.11 2003/12/25 06:04:39 wpaul Exp $"); #include #include @@ -328,8 +328,8 @@ } void -ndis_return_packet(packet, arg) - void *packet; +ndis_return_packet(buf, arg) + void *buf; /* not used */ void *arg; { struct ndis_softc *sc; @@ -337,25 +337,25 @@ ndis_packet *p; __stdcall ndis_return_handler returnfunc; - if (arg == NULL || packet == NULL) + if (arg == NULL) return; - p = packet; + p = arg; /* Decrement refcount. */ - p->np_private.npp_count--; + p->np_refcnt--; /* Release packet when refcount hits zero, otherwise return. */ - if (p->np_private.npp_count) + if (p->np_refcnt) return; - sc = arg; + sc = p->np_softc; returnfunc = sc->ndis_chars.nmc_return_packet_func; adapter = sc->ndis_block.nmb_miniportadapterctx; if (returnfunc == NULL) - ndis_free_packet((ndis_packet *)packet); + ndis_free_packet(p); else - returnfunc(adapter, (ndis_packet *)packet); + returnfunc(adapter, p); return; } @@ -474,7 +474,7 @@ priv = &p->np_private; buf = priv->npp_head; - priv->npp_count = 0; + p->np_refcnt = 0; for (buf = priv->npp_head; buf != NULL; buf = buf->nb_next) { if (buf == priv->npp_head) @@ -489,9 +489,8 @@ m->m_len = buf->nb_bytecount; m->m_data = MDL_VA(buf); MEXTADD(m, m->m_data, m->m_len, ndis_return_packet, - p->np_rsvd[0], 0, EXT_NDIS); - m->m_ext.ext_buf = (void *)p; /* XXX */ - priv->npp_count++; + p, 0, EXT_NDIS); + p->np_refcnt++; totlen += m->m_len; if (m->m_flags & MT_HEADER) *m0 = m; @@ -753,12 +752,15 @@ ndis_handle adapter; __stdcall ndis_halt_handler haltfunc; struct ifnet *ifp; + struct ndis_timer_entry *ne; + struct callout_handle *ch; sc = arg; ifp = &sc->arpcom.ac_if; adapter = sc->ndis_block.nmb_miniportadapterctx; if (adapter == NULL) return(EIO); + haltfunc = sc->ndis_chars.nmc_halt_func; if (haltfunc == NULL) @@ -774,6 +776,17 @@ sc->ndis_block.nmb_miniportadapterctx = NULL; + /* Clobber all the timers in case the driver left one running. */ + + while (!TAILQ_EMPTY(&sc->ndis_block.nmb_timerlist)) { + ne = TAILQ_FIRST(&sc->ndis_block.nmb_timerlist); + TAILQ_REMOVE(&sc->ndis_block.nmb_timerlist, ne, link); + ch = &ne->nte_ch; + if (ch->callout != NULL) + untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + free(ne, M_DEVBUF); + } + return(0); } @@ -821,6 +834,8 @@ block = &sc->ndis_block; initfunc = sc->ndis_chars.nmc_init_func; + TAILQ_INIT(&block->nmb_timerlist); + for (i = 0; i < NdisMediumMax; i++) mediumarray[i] = i; ==== //depot/projects/netperf/sys/compat/ndis/ndis_var.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.4 2003/12/23 18:31:04 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.6 2003/12/25 06:04:39 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -829,7 +829,6 @@ } np_macrsvd; } u; uint32_t *np_rsvd[2]; - uint8_t np_proto_rsvd[1]; /* * This next part is probably wrong, but we need some place @@ -838,6 +837,13 @@ ndis_packet_oob np_oob; ndis_packet_extension np_ext; ndis_sc_list np_sclist; + + /* BSD-specific stuff which should be invisible to drivers. */ + + uint32_t np_refcnt; + void *np_softc; + void *np_m0; + int np_txidx; }; typedef struct ndis_packet ndis_packet; @@ -994,6 +1000,14 @@ typedef struct ndis_reference ndis_reference; +struct ndis_timer_entry { + struct callout_handle nte_ch; + ndis_miniport_timer *nte_timer; + TAILQ_ENTRY(ndis_timer_entry) link; +}; + +TAILQ_HEAD(nte_head, ndis_timer_entry); + /* * The miniport block is basically the internal NDIS handle. We need * to define this because, unfortunately, it is not entirely opaque @@ -1116,6 +1130,7 @@ ndis_resource_list *nmb_rlist; ndis_status nmb_getstat; ndis_status nmb_setstat; + struct nte_head nmb_timerlist; }; typedef ndis_status (*ndis_init_handler)(ndis_status *, uint32_t *, ==== //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.11 2003/12/23 04:08:22 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.13 2003/12/25 00:40:02 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -225,6 +225,7 @@ __stdcall static uint8_t ndis_sync_with_intr(ndis_miniport_interrupt *, void *, void *); __stdcall static void ndis_time(uint64_t *); +__stdcall static void ndis_uptime(uint32_t *); __stdcall static void ndis_init_string(ndis_unicode_string **, char *); __stdcall static void ndis_init_ansi_string(ndis_ansi_string *, char *); __stdcall static void ndis_free_string(ndis_unicode_string *); @@ -236,6 +237,11 @@ void **, uint32_t *, uint32_t *); __stdcall static void ndis_firstbuf_safe(ndis_packet *, ndis_buffer **, void **, uint32_t *, uint32_t *, uint32_t); +__stdcall static void ndis_open_file(ndis_status *, ndis_handle *, uint32_t *, + ndis_unicode_string *, ndis_physaddr); +__stdcall static void ndis_map_file(ndis_status *, void **, ndis_handle); +__stdcall static void ndis_unmap_file(ndis_handle); +__stdcall static void ndis_close_file(ndis_handle); __stdcall static void dummy(void); @@ -872,10 +878,17 @@ ndis_timer_function func; void *ctx; { - struct callout_handle *ch; + struct ndis_timer_entry *ne = NULL; + ndis_miniport_block *block; + block = (ndis_miniport_block *)handle; + + ne = malloc(sizeof(struct ndis_timer_entry), M_DEVBUF, M_NOWAIT); + callout_handle_init(&ne->nte_ch); + TAILQ_INSERT_TAIL(&block->nmb_timerlist, ne, link); + ne->nte_timer = timer; - ch = (struct callout_handle *)&timer->nmt_dpc; - callout_handle_init(ch); + timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; + timer->nmt_dpc.nk_deferredctx = &ne->nte_ch; timer->nmt_timerfunc = func; timer->nmt_timerctx = ctx; @@ -896,6 +909,7 @@ timer = arg; + timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; timerfunc = timer->nmt_timerfunc; timerfunc(NULL, timer->nmt_timerctx, NULL, NULL); @@ -919,8 +933,9 @@ tv.tv_sec = 0; tv.tv_usec = msecs * 1000; - ch = (struct callout_handle *)&timer->nmt_dpc; + ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_dpc.nk_sysarg2 = ndis_timercall; + timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, (void *)timer, tvtohz(&tv)); @@ -938,6 +953,7 @@ timer = arg; + timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; timerfunc = timer->nmt_timerfunc; timerfunc(NULL, timer->nmt_timerctx, NULL, NULL); @@ -945,7 +961,8 @@ tv.tv_sec = 0; tv.tv_usec = timer->nmt_ktimer.nk_period * 1000; - ch = (struct callout_handle *)&timer->nmt_dpc; + ch = timer->nmt_dpc.nk_deferredctx; + timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; timer->nmt_dpc.nk_sysarg2 = ndis_tick; *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, tvtohz(&tv)); @@ -965,8 +982,9 @@ tv.tv_usec = msecs * 1000; timer->nmt_ktimer.nk_period = msecs; - ch = (struct callout_handle *)&timer->nmt_dpc; + ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_dpc.nk_sysarg2 = ndis_tick; + timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, tvtohz(&tv)); @@ -980,8 +998,9 @@ { struct callout_handle *ch; - ch = (struct callout_handle *)&timer->nmt_dpc; - untimeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, *ch); + ch = timer->nmt_dpc.nk_deferredctx; + untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + *cancelled = timer->nmt_ktimer.nk_header.dh_sigstate; return; } @@ -2062,10 +2081,23 @@ uint64_t *tval; { struct timespec ts; + nanotime(&ts); - *tval = (ts.tv_nsec / 100) + (ts.tv_nsec * 10000000); - *tval += 11644473600; - return; + *tval = (uint64_t)ts.tv_nsec / 100 + (uint64_t)ts.tv_sec * 10000000 + + 11644473600; +} + +/* + * Return the number of milliseconds since the system booted. + */ +__stdcall static void +ndis_uptime(tval) + uint32_t *tval; +{ + struct timespec ts; + + nanouptime(&ts); + *tval = ts.tv_nsec / 1000000 + ts.tv_sec * 1000; } __stdcall static void @@ -2176,7 +2208,51 @@ ndis_firstbuf(packet, buf, firstva, firstlen, totlen); } +/* can also return NDIS_STATUS_RESOURCES/NDIS_STATUS_ERROR_READING_FILE */ +__stdcall static void +ndis_open_file(status, filehandle, filelength, filename, highestaddr) + ndis_status *status; + ndis_handle *filehandle; + uint32_t *filelength; + ndis_unicode_string *filename; + ndis_physaddr highestaddr; +{ + char *afilename = NULL; + + ndis_unicode_to_ascii(filename->nus_buf, filename->nus_len, &afilename); + printf("ndis_open_file(\"%s\", %ju)\n", afilename, + highestaddr.np_quad); + free(afilename, M_DEVBUF); + *status = NDIS_STATUS_FILE_NOT_FOUND; + return; +} + +__stdcall static void +ndis_map_file(status, mappedbuffer, filehandle) + ndis_status *status; + void **mappedbuffer; + ndis_handle filehandle; +{ + + *status = NDIS_STATUS_ALREADY_MAPPED; + return; +} + +__stdcall static void +ndis_unmap_file(filehandle) + ndis_handle filehandle; +{ + return; +} + __stdcall static void +ndis_close_file(filehandle) + ndis_handle filehandle; +{ + return; +} + +__stdcall static void dummy() { printf ("NDIS dummy called...\n"); @@ -2199,6 +2275,7 @@ { "NdisInitializeString", (FUNC)ndis_init_string }, { "NdisFreeString", (FUNC)ndis_free_string }, { "NdisGetCurrentSystemTime", (FUNC)ndis_time }, + { "NdisGetSystemUpTime", (FUNC)ndis_uptime }, { "NdisMSynchronizeWithInterrupt", (FUNC)ndis_sync_with_intr }, { "NdisMAllocateSharedMemoryAsync", (FUNC)ndis_alloc_sharedmem_async }, { "NdisInterlockedInsertHeadList", (FUNC)ndis_insert_head }, @@ -2272,6 +2349,10 @@ { "NdisUnchainBufferAtFront", (FUNC)ndis_unchain_headbuf }, { "NdisReadPcmciaAttributeMemory", (FUNC)ndis_read_pccard_amem }, { "NdisWritePcmciaAttributeMemory", (FUNC)ndis_write_pccard_amem }, + { "NdisOpenFile", (FUNC)ndis_open_file }, + { "NdisMapFile", (FUNC)ndis_map_file }, + { "NdisUnmapFile", (FUNC)ndis_unmap_file }, + { "NdisCloseFile", (FUNC)ndis_close_file }, /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.3 2003/12/13 07:41:12 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.4 2003/12/25 00:40:02 wpaul Exp $"); #include #include @@ -63,6 +63,10 @@ __stdcall static uint32_t ntoskrnl_unicode_equal(ndis_unicode_string *, ndis_unicode_string *, uint32_t); +__stdcall static void ntoskrnl_unicode_copy(ndis_unicode_string *, + ndis_unicode_string *); +__stdcall static uint32_t ntoskrnl_unicode_to_ansi(ndis_ansi_string *, + ndis_unicode_string *, uint8_t); __stdcall static void *ntoskrnl_iobuildsynchfsdreq(uint32_t, void *, void *, uint32_t, uint32_t *, void *, void *); __stdcall static uint32_t ntoskrnl_iofcalldriver(void *, void *); @@ -142,8 +146,8 @@ ndis_unicode_string *str2; uint32_t casesensitive; { - char *astr1 = NULL, *astr2 = NULL; - int rval = 1; + char *astr1 = NULL, *astr2 = NULL; + int rval = 1; ndis_unicode_to_ascii(str1->nus_buf, str2->nus_len, &astr1); ndis_unicode_to_ascii(str2->nus_buf, str2->nus_len, &astr2); @@ -161,6 +165,42 @@ return(rval); } +__stdcall static void +ntoskrnl_unicode_copy(dest, src) + ndis_unicode_string *dest; + ndis_unicode_string *src; +{ + + if (dest->nus_maxlen >= src->nus_len) + dest->nus_len = src->nus_len; + else + dest->nus_len = dest->nus_maxlen; + memcpy(dest->nus_buf, src->nus_buf, dest->nus_len); + return; +} + +__stdcall static uint32_t +ntoskrnl_unicode_to_ansi(dest, src, allocate) + ndis_ansi_string *dest; + ndis_unicode_string *src; + uint8_t allocate; +{ + char *astr = NULL; + + if (allocate) { + ndis_unicode_to_ascii(src->nus_buf, src->nus_len, &astr); + dest->nas_buf = astr; + dest->nas_len = dest->nas_maxlen = strlen(astr); + } else { + dest->nas_len = src->nus_len / 2; /* XXX */ + if (dest->nas_maxlen < dest->nas_len) + dest->nas_len = dest->nas_maxlen; + ndis_unicode_to_ascii(src->nus_buf, dest->nas_len * 2, + &dest->nas_buf); + } + return (NDIS_STATUS_SUCCESS); +} + __stdcall static void * ntoskrnl_iobuildsynchfsdreq(func, dobj, buf, len, off, event, status) uint32_t func; @@ -523,6 +563,8 @@ image_patch_table ntoskrnl_functbl[] = { { "RtlEqualUnicodeString", (FUNC)ntoskrnl_unicode_equal }, + { "RtlCopyUnicodeString", (FUNC)ntoskrnl_unicode_copy }, + { "RtlUnicodeStringToAnsiString", (FUNC)ntoskrnl_unicode_to_ansi }, { "sprintf", (FUNC)sprintf }, { "DbgPrint", (FUNC)printf }, { "strncmp", (FUNC)strncmp }, ==== //depot/projects/netperf/sys/compat/ndis/subr_pe.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.1 2003/12/11 22:34:37 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.2 2003/12/24 21:21:18 wpaul Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -79,7 +79,7 @@ { uint16_t signature; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return (EINVAL); signature = *(uint16_t *)imgbase; @@ -102,7 +102,7 @@ uint32_t signature; image_dos_header *dos_hdr; - if (imgbase == NULL) + if (imgbase == 0) return (EINVAL); signature = *(uint16_t *)imgbase; @@ -130,7 +130,7 @@ image_dos_header *dos_hdr; image_nt_header *nt_hdr; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return(EINVAL); if (pe_is_nt_image(imgbase)) @@ -158,7 +158,7 @@ image_dos_header *dos_hdr; image_nt_header *nt_hdr; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return(EINVAL); if (pe_is_nt_image(imgbase)) @@ -187,7 +187,7 @@ image_nt_header *nt_hdr; image_section_header *sect_hdr; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return(EINVAL); if (pe_is_nt_image(imgbase)) @@ -327,7 +327,7 @@ int i, sections; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return(EINVAL); if (pe_is_nt_image(imgbase)) @@ -433,7 +433,7 @@ image_import_descriptor *imp_desc; char *modname; - if (imgbase == NULL || module == NULL || desc == NULL) + if (imgbase == 0 || module == NULL || desc == NULL) return(EINVAL); offset = pe_directory_offset(imgbase, IMAGE_DIRECTORY_ENTRY_IMPORT); @@ -509,7 +509,7 @@ vm_offset_t *nptr, *fptr; vm_offset_t func; - if (imgbase == NULL || module == NULL || functbl == NULL) + if (imgbase == 0 || module == NULL || functbl == NULL) return(EINVAL); if (pe_get_import_descriptor(imgbase, &imp_desc, module)) ==== //depot/projects/netperf/sys/conf/kmod.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.150 2003/11/19 05:08:26 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.151 2003/12/25 14:07:52 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -70,7 +70,7 @@ .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S -CFLAGS+= ${COPTS} -D_KERNEL ${CWARNFLAGS} +CFLAGS+= ${COPTS} -D_KERNEL CFLAGS+= -DKLD_MODULE # Don't use any standard or source-relative include directories. ==== //depot/projects/netperf/sys/dev/ata/ata-chipset.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.52 2003/12/18 17:36:41 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.53 2003/12/25 19:37:11 sos Exp $"); #include "opt_ata.h" #include @@ -1918,28 +1918,11 @@ { ATA_SIS963, 0x00, SIS133NEW, 0, ATA_UDMA6, "SiS 963" }, /* south */ { ATA_SIS962, 0x00, SIS133NEW, 0, ATA_UDMA6, "SiS 962" }, /* south */ - { ATA_SIS755, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 755" }, /* ext south */ - { ATA_SIS752, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 752" }, /* unknown */ - { ATA_SIS751, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 751" }, /* unknown */ - { ATA_SIS750, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 750" }, /* unknown */ - { ATA_SIS748, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 748" }, /* unknown */ - { ATA_SIS746, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 746" }, /* ext south */ { ATA_SIS745, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 745" }, /* 1chip */ - { ATA_SIS740, 0x00, SIS_SOUTH, 0, ATA_UDMA5, "SiS 740" }, /* ext south */ { ATA_SIS735, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 735" }, /* 1chip */ { ATA_SIS733, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 733" }, /* 1chip */ { ATA_SIS730, 0x00, SIS100OLD, 0, ATA_UDMA5, "SiS 730" }, /* 1chip */ - { ATA_SIS661, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 661" }, /* ext south */ - { ATA_SIS658, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 658" }, /* ext south */ - { ATA_SIS655, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 655" }, /* ext south */ - { ATA_SIS652, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 652" }, /* unknown */ - { ATA_SIS651, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 651" }, /* ext south */ - { ATA_SIS650, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 650" }, /* ext south */ - { ATA_SIS648, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 648" }, /* ext south */ - { ATA_SIS646, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 645DX"},/* ext south */ - { ATA_SIS645, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 645" }, /* ext south */ - { ATA_SIS640, 0x00, SIS_SOUTH, 0, ATA_UDMA4, "SiS 640" }, /* ext south */ { ATA_SIS635, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 635" }, /* 1chip */ { ATA_SIS633, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 633" }, /* unknown */ { ATA_SIS630, 0x30, SIS100OLD, 0, ATA_UDMA5, "SiS 630S"}, /* 1chip */ @@ -1951,29 +1934,33 @@ { ATA_SIS530, 0x00, SIS66, 0, ATA_UDMA4, "SiS 530" }, { ATA_SIS5513, 0xc2, SIS33, 0, ATA_UDMA2, "SiS 5513" }, - { ATA_SIS5513, 0x00, SIS33, 0, ATA_WDMA2, "SiS 5513" }, + { ATA_SIS5513, 0x00, SIS33, 1, ATA_WDMA2, "SiS 5513" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; if (!(idx = ata_find_chip(dev, ids, -pci_get_slot(dev)))) return ENXIO; - if (idx->cfg1 == SIS_SOUTH) { + if (idx->cfg2) { pci_write_config(dev, 0x57, pci_read_config(dev, 0x57, 1) & 0x7f, 1); if (pci_read_config(dev, 0x00, 4) == ATA_SIS5518) { idx->cfg1 = SIS133NEW; - sprintf(buffer, "SiS 96X %s controller",ata_mode2str(idx->max_dma)); + idx->max_dma = ATA_UDMA6; + sprintf(buffer, "SiS 962/963 %s controller", + ata_mode2str(idx->max_dma)); } else { struct ata_chip_id id[] = {{ ATA_SISSOUTH, 0x10, 0, 0, ATA_UDMA6, "SiS 961" }, { 0, 0, 0, 0, 0, 0 }}; - if (ata_find_chip(dev, id, pci_get_slot(dev))) + if (ata_find_chip(dev, id, pci_get_slot(dev))) { idx->cfg1 = SIS133OLD; + idx->max_dma = ATA_UDMA6; + } else { + idx->cfg1 = SIS100NEW; idx->max_dma = ATA_UDMA5; - idx->cfg1 = SIS100NEW; } sprintf(buffer, "SiS 961 %s controller",ata_mode2str(idx->max_dma)); } ==== //depot/projects/netperf/sys/dev/hifn/hifn7751.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.23 2003/10/08 20:25:47 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.24 2003/12/25 01:23:38 sam Exp $"); /* * Driver for various Hifn encryption processors. @@ -386,10 +386,10 @@ sc->sc_dma = (struct hifn_dma *)kva; bzero(sc->sc_dma, sizeof(*sc->sc_dma)); - KASSERT(sc->sc_st0 != NULL, ("hifn_attach: null bar0 tag!")); - KASSERT(sc->sc_sh0 != NULL, ("hifn_attach: null bar0 handle!")); - KASSERT(sc->sc_st1 != NULL, ("hifn_attach: null bar1 tag!")); - KASSERT(sc->sc_sh1 != NULL, ("hifn_attach: null bar1 handle!")); + KASSERT(sc->sc_st0 != 0, ("hifn_attach: null bar0 tag!")); + KASSERT(sc->sc_sh0 != 0, ("hifn_attach: null bar0 handle!")); + KASSERT(sc->sc_st1 != 0, ("hifn_attach: null bar1 tag!")); + KASSERT(sc->sc_sh1 != 0, ("hifn_attach: null bar1 handle!")); /* * Reset the board and do the ``secret handshake'' ==== //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.9 2003/12/23 18:41:34 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.13 2003/12/25 09:44:49 wpaul Exp $"); #include "opt_bdg.h" @@ -150,6 +150,7 @@ static devclass_t ndis_devclass; DRIVER_MODULE(ndis, pci, ndis_driver, ndis_devclass, 0, 0); +DRIVER_MODULE(ndis, cardbus, ndis_driver, ndis_devclass, 0, 0); /* * Program the 64-bit multicast hash filter. @@ -292,12 +293,12 @@ * Hook interrupt early, since calling the driver's * init routine may trigger an interrupt. */ + error = bus_setup_intr(dev, sc->ndis_irq, INTR_TYPE_NET, ndis_intr, sc, &sc->ndis_intrhand); if (error) { - printf("ndis%d: couldn't register interrupt\n", unit); - error = ENXIO; + printf("ndis%d: couldn't set up irq\n", unit); goto fail; } @@ -561,16 +562,13 @@ /* Override the status handler so we can detect link changes. */ sc->ndis_block.nmb_status_func = ndis_linksts; - if (error) { - printf("ndis%d: couldn't set up irq\n", unit); - ether_ifdetach(ifp); - goto fail; - } - fail: if (error) ndis_detach(dev); + /* We're done talking to the NIC for now; halt it. */ + ndis_halt_nic(sc); + return(error); } @@ -592,20 +590,19 @@ KASSERT(mtx_initialized(&sc->ndis_mtx), ("ndis mutex not initialized")); NDIS_LOCK(sc); ifp = &sc->arpcom.ac_if; + ifp->if_flags &= ~IFF_UP; if (device_is_attached(dev)) { if (sc->ndis_80211) { ifmedia_removeall(&sc->ic.ic_media); ieee80211_node_detach(ifp); } - ifp->if_flags &= ~IFF_UP; NDIS_UNLOCK(sc); ndis_stop(sc); ether_ifdetach(ifp); } else NDIS_UNLOCK(sc); - bus_generic_detach(dev); if (sc->ndis_intrhand) @@ -657,7 +654,7 @@ for (i = 0; i < pktcnt; i++) { p = packets[i]; /* Stash the softc here so ptom can use it. */ - p->np_rsvd[0] = (uint32_t *)sc; + p->np_softc = sc; if (ndis_ptom(&m0, p)) { printf ("ndis%d: ptom failed\n", sc->ndis_unit); ndis_return_packet(sc, p); @@ -692,13 +689,10 @@ sc = (struct ndis_softc *)block->nmb_ifp; ifp = block->nmb_ifp; - if (packet->np_rsvd[1] == NULL) - panic("NDIS driver corrupted reserved packet fields"); - NDIS_LOCK(sc); - m = (struct mbuf *)packet->np_rsvd[1]; - idx = (int)packet->np_rsvd[0]; + m = packet->np_m0; + idx = packet->np_txidx; ifp->if_opackets++; if (sc->ndis_sc) bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]); @@ -770,15 +764,11 @@ int call_isr = 0; sc = arg; - /*NDIS_LOCK(sc);*/ ifp = &sc->arpcom.ac_if; -/* - if (!(ifp->if_flags & IFF_UP)) { - NDIS_UNLOCK(sc); + if (!(ifp->if_flags & IFF_UP)) return; - } -*/ + ndis_isr(sc, &is_our_intr, &call_isr); if (is_our_intr || call_isr) @@ -787,8 +777,6 @@ if (ifp->if_snd.ifq_head != NULL) ndis_start(ifp); - /*NDIS_UNLOCK(sc);*/ - return; } @@ -906,9 +894,8 @@ * so we can free it later. */ - (sc->ndis_txarray[sc->ndis_txidx])->np_rsvd[0] = - (uint32_t *)sc->ndis_txidx; - (sc->ndis_txarray[sc->ndis_txidx])->np_rsvd[1] = (uint32_t *)m; + (sc->ndis_txarray[sc->ndis_txidx])->np_txidx = sc->ndis_txidx; + (sc->ndis_txarray[sc->ndis_txidx])->np_m0 = m; /* * Do scatter/gather processing, if driver requested it. @@ -1139,7 +1126,10 @@ len = sizeof(ssid); bzero((char *)&ssid, len); ssid.ns_ssidlen = ic->ic_des_esslen; - bcopy(ic->ic_des_essid, ssid.ns_ssid, ssid.ns_ssidlen); + if (ssid.ns_ssidlen == 0) { + ssid.ns_ssidlen = 1; + } else + bcopy(ic->ic_des_essid, ssid.ns_ssid, ssid.ns_ssidlen); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 25 11:46:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D861516A4D0; Thu, 25 Dec 2003 11:46: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 95A0916A4CE for ; Thu, 25 Dec 2003 11:46:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1682043D2F for ; Thu, 25 Dec 2003 11:46:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPJkD0B079975 for ; Thu, 25 Dec 2003 11:46:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPJkCHp079972 for perforce@freebsd.org; Thu, 25 Dec 2003 11:46:12 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 25 Dec 2003 11:46:12 -0800 (PST) Message-Id: <200312251946.hBPJkCHp079972@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 44311 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, 25 Dec 2003 19:46:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=44311 Change 44311 by sam@sam_ebb on 2003/12/25 11:46:12 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/netperf+sockets/sys/conf/kmod.mk#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_mbuf.c#4 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.44 2003/11/09 17:04:04 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.45 2003/12/25 09:59:02 bde Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -405,20 +405,20 @@ linux_check_hdrincl(struct thread *td, caddr_t *sg, int s) { struct getsockopt_args /* { - int s; - int level; - int name; - caddr_t val; - int *avalsize; + int s; + int level; + int name; + void * __restrict val; + socklen_t * __restrict avalsize; } */ bsd_args; - int error; - caddr_t val, valsize; - int size_val = sizeof val; - int optval; + void * __restrict val; + socklen_t * __restrict valsize; + int error, optval, size_val; - val = stackgap_alloc(sg, sizeof(int)); - valsize = stackgap_alloc(sg, sizeof(int)); + val = stackgap_alloc(sg, sizeof(size_val)); + valsize = stackgap_alloc(sg, sizeof(socklen_t)); + size_val = sizeof(val); if ((error = copyout(&size_val, valsize, sizeof(size_val)))) return (error); @@ -426,7 +426,7 @@ bsd_args.level = IPPROTO_IP; bsd_args.name = IP_HDRINCL; bsd_args.val = val; - bsd_args.avalsize = (int *)valsize; + bsd_args.avalsize = valsize; if ((error = getsockopt(td, &bsd_args))) return (error); @@ -701,17 +701,17 @@ { struct linux_accept_args linux_args; struct accept_args /* { - int s; - caddr_t name; - int *anamelen; + int s; + struct sockaddr * __restrict name; + socklen_t * __restrict anamelen; } */ bsd_args; struct close_args /* { int fd; } */ c_args; struct fcntl_args /* { - int fd; - int cmd; - long arg; + int fd; + int cmd; + long arg; } */ f_args; int error; @@ -719,8 +719,9 @@ return (error); bsd_args.s = linux_args.s; - bsd_args.name = (void *)linux_args.addr; - bsd_args.anamelen = linux_args.namelen; + /* XXX: */ + bsd_args.name = (struct sockaddr * __restrict)linux_args.addr; + bsd_args.anamelen = linux_args.namelen; /* XXX */ error = oaccept(td, &bsd_args); if (error) return (error); @@ -757,9 +758,9 @@ { struct linux_getsockname_args linux_args; struct getsockname_args /* { - int fdes; - caddr_t asa; - int *alen; + int fdes; + struct sockaddr * __restrict asa; + socklen_t * __restrict alen; } */ bsd_args; int error; @@ -767,8 +768,9 @@ return (error); bsd_args.fdes = linux_args.s; - bsd_args.asa = (void *) linux_args.addr; - bsd_args.alen = linux_args.namelen; + /* XXX: */ + bsd_args.asa = (struct sockaddr * __restrict)linux_args.addr; + bsd_args.alen = linux_args.namelen; /* XXX */ error = ogetsockname(td, &bsd_args); if (error) return (error); @@ -942,12 +944,12 @@ { struct linux_recvfrom_args linux_args; struct recvfrom_args /* { - int s; - caddr_t buf; - size_t len; - int flags; - caddr_t from; - int *fromlenaddr; + int s; + caddr_t buf; + size_t len; + int flags; + struct sockaddr * __restrict from; + socklen_t * __restrict fromlenaddr; } */ bsd_args; int error; @@ -958,8 +960,9 @@ bsd_args.buf = linux_args.buf; bsd_args.len = linux_args.len; bsd_args.flags = linux_to_bsd_msg_flags(linux_args.flags); - bsd_args.from = (void *)linux_args.from; - bsd_args.fromlenaddr = linux_args.fromlen; + /* XXX: */ + bsd_args.from = (struct sockaddr * __restrict)linux_args.from; + bsd_args.fromlenaddr = linux_args.fromlen; /* XXX */ error = orecvfrom(td, &bsd_args); if (error) return (error); ==== //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.9 2003/12/24 18:23:02 alfred Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.11 2003/12/25 06:04:39 wpaul Exp $"); #include #include @@ -328,8 +328,8 @@ } void -ndis_return_packet(packet, arg) - void *packet; +ndis_return_packet(buf, arg) + void *buf; /* not used */ void *arg; { struct ndis_softc *sc; @@ -337,25 +337,25 @@ ndis_packet *p; __stdcall ndis_return_handler returnfunc; - if (arg == NULL || packet == NULL) + if (arg == NULL) return; - p = packet; + p = arg; /* Decrement refcount. */ - p->np_private.npp_count--; + p->np_refcnt--; /* Release packet when refcount hits zero, otherwise return. */ - if (p->np_private.npp_count) + if (p->np_refcnt) return; - sc = arg; + sc = p->np_softc; returnfunc = sc->ndis_chars.nmc_return_packet_func; adapter = sc->ndis_block.nmb_miniportadapterctx; if (returnfunc == NULL) - ndis_free_packet((ndis_packet *)packet); + ndis_free_packet(p); else - returnfunc(adapter, (ndis_packet *)packet); + returnfunc(adapter, p); return; } @@ -474,7 +474,7 @@ priv = &p->np_private; buf = priv->npp_head; - priv->npp_count = 0; + p->np_refcnt = 0; for (buf = priv->npp_head; buf != NULL; buf = buf->nb_next) { if (buf == priv->npp_head) @@ -489,9 +489,8 @@ m->m_len = buf->nb_bytecount; m->m_data = MDL_VA(buf); MEXTADD(m, m->m_data, m->m_len, ndis_return_packet, - p->np_rsvd[0], 0, EXT_NDIS); - m->m_ext.ext_buf = (void *)p; /* XXX */ - priv->npp_count++; + p, 0, EXT_NDIS); + p->np_refcnt++; totlen += m->m_len; if (m->m_flags & MT_HEADER) *m0 = m; @@ -753,12 +752,15 @@ ndis_handle adapter; __stdcall ndis_halt_handler haltfunc; struct ifnet *ifp; + struct ndis_timer_entry *ne; + struct callout_handle *ch; sc = arg; ifp = &sc->arpcom.ac_if; adapter = sc->ndis_block.nmb_miniportadapterctx; if (adapter == NULL) return(EIO); + haltfunc = sc->ndis_chars.nmc_halt_func; if (haltfunc == NULL) @@ -774,6 +776,17 @@ sc->ndis_block.nmb_miniportadapterctx = NULL; + /* Clobber all the timers in case the driver left one running. */ + + while (!TAILQ_EMPTY(&sc->ndis_block.nmb_timerlist)) { + ne = TAILQ_FIRST(&sc->ndis_block.nmb_timerlist); + TAILQ_REMOVE(&sc->ndis_block.nmb_timerlist, ne, link); + ch = &ne->nte_ch; + if (ch->callout != NULL) + untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + free(ne, M_DEVBUF); + } + return(0); } @@ -821,6 +834,8 @@ block = &sc->ndis_block; initfunc = sc->ndis_chars.nmc_init_func; + TAILQ_INIT(&block->nmb_timerlist); + for (i = 0; i < NdisMediumMax; i++) mediumarray[i] = i; ==== //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.4 2003/12/23 18:31:04 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.6 2003/12/25 06:04:39 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -829,7 +829,6 @@ } np_macrsvd; } u; uint32_t *np_rsvd[2]; - uint8_t np_proto_rsvd[1]; /* * This next part is probably wrong, but we need some place @@ -838,6 +837,13 @@ ndis_packet_oob np_oob; ndis_packet_extension np_ext; ndis_sc_list np_sclist; + + /* BSD-specific stuff which should be invisible to drivers. */ + + uint32_t np_refcnt; + void *np_softc; + void *np_m0; + int np_txidx; }; typedef struct ndis_packet ndis_packet; @@ -994,6 +1000,14 @@ typedef struct ndis_reference ndis_reference; +struct ndis_timer_entry { + struct callout_handle nte_ch; + ndis_miniport_timer *nte_timer; + TAILQ_ENTRY(ndis_timer_entry) link; +}; + +TAILQ_HEAD(nte_head, ndis_timer_entry); + /* * The miniport block is basically the internal NDIS handle. We need * to define this because, unfortunately, it is not entirely opaque @@ -1116,6 +1130,7 @@ ndis_resource_list *nmb_rlist; ndis_status nmb_getstat; ndis_status nmb_setstat; + struct nte_head nmb_timerlist; }; typedef ndis_status (*ndis_init_handler)(ndis_status *, uint32_t *, ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.11 2003/12/23 04:08:22 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.13 2003/12/25 00:40:02 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -225,6 +225,7 @@ __stdcall static uint8_t ndis_sync_with_intr(ndis_miniport_interrupt *, void *, void *); __stdcall static void ndis_time(uint64_t *); +__stdcall static void ndis_uptime(uint32_t *); __stdcall static void ndis_init_string(ndis_unicode_string **, char *); __stdcall static void ndis_init_ansi_string(ndis_ansi_string *, char *); __stdcall static void ndis_free_string(ndis_unicode_string *); @@ -236,6 +237,11 @@ void **, uint32_t *, uint32_t *); __stdcall static void ndis_firstbuf_safe(ndis_packet *, ndis_buffer **, void **, uint32_t *, uint32_t *, uint32_t); +__stdcall static void ndis_open_file(ndis_status *, ndis_handle *, uint32_t *, + ndis_unicode_string *, ndis_physaddr); +__stdcall static void ndis_map_file(ndis_status *, void **, ndis_handle); +__stdcall static void ndis_unmap_file(ndis_handle); +__stdcall static void ndis_close_file(ndis_handle); __stdcall static void dummy(void); @@ -872,10 +878,17 @@ ndis_timer_function func; void *ctx; { - struct callout_handle *ch; + struct ndis_timer_entry *ne = NULL; + ndis_miniport_block *block; + block = (ndis_miniport_block *)handle; + + ne = malloc(sizeof(struct ndis_timer_entry), M_DEVBUF, M_NOWAIT); + callout_handle_init(&ne->nte_ch); + TAILQ_INSERT_TAIL(&block->nmb_timerlist, ne, link); + ne->nte_timer = timer; - ch = (struct callout_handle *)&timer->nmt_dpc; - callout_handle_init(ch); + timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; + timer->nmt_dpc.nk_deferredctx = &ne->nte_ch; timer->nmt_timerfunc = func; timer->nmt_timerctx = ctx; @@ -896,6 +909,7 @@ timer = arg; + timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; timerfunc = timer->nmt_timerfunc; timerfunc(NULL, timer->nmt_timerctx, NULL, NULL); @@ -919,8 +933,9 @@ tv.tv_sec = 0; tv.tv_usec = msecs * 1000; - ch = (struct callout_handle *)&timer->nmt_dpc; + ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_dpc.nk_sysarg2 = ndis_timercall; + timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, (void *)timer, tvtohz(&tv)); @@ -938,6 +953,7 @@ timer = arg; + timer->nmt_ktimer.nk_header.dh_sigstate = FALSE; timerfunc = timer->nmt_timerfunc; timerfunc(NULL, timer->nmt_timerctx, NULL, NULL); @@ -945,7 +961,8 @@ tv.tv_sec = 0; tv.tv_usec = timer->nmt_ktimer.nk_period * 1000; - ch = (struct callout_handle *)&timer->nmt_dpc; + ch = timer->nmt_dpc.nk_deferredctx; + timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; timer->nmt_dpc.nk_sysarg2 = ndis_tick; *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, tvtohz(&tv)); @@ -965,8 +982,9 @@ tv.tv_usec = msecs * 1000; timer->nmt_ktimer.nk_period = msecs; - ch = (struct callout_handle *)&timer->nmt_dpc; + ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_dpc.nk_sysarg2 = ndis_tick; + timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, tvtohz(&tv)); @@ -980,8 +998,9 @@ { struct callout_handle *ch; - ch = (struct callout_handle *)&timer->nmt_dpc; - untimeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, *ch); + ch = timer->nmt_dpc.nk_deferredctx; + untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + *cancelled = timer->nmt_ktimer.nk_header.dh_sigstate; return; } @@ -2062,10 +2081,23 @@ uint64_t *tval; { struct timespec ts; + nanotime(&ts); - *tval = (ts.tv_nsec / 100) + (ts.tv_nsec * 10000000); - *tval += 11644473600; - return; + *tval = (uint64_t)ts.tv_nsec / 100 + (uint64_t)ts.tv_sec * 10000000 + + 11644473600; +} + +/* + * Return the number of milliseconds since the system booted. + */ +__stdcall static void +ndis_uptime(tval) + uint32_t *tval; +{ + struct timespec ts; + + nanouptime(&ts); + *tval = ts.tv_nsec / 1000000 + ts.tv_sec * 1000; } __stdcall static void @@ -2176,7 +2208,51 @@ ndis_firstbuf(packet, buf, firstva, firstlen, totlen); } +/* can also return NDIS_STATUS_RESOURCES/NDIS_STATUS_ERROR_READING_FILE */ +__stdcall static void +ndis_open_file(status, filehandle, filelength, filename, highestaddr) + ndis_status *status; + ndis_handle *filehandle; + uint32_t *filelength; + ndis_unicode_string *filename; + ndis_physaddr highestaddr; +{ + char *afilename = NULL; + + ndis_unicode_to_ascii(filename->nus_buf, filename->nus_len, &afilename); + printf("ndis_open_file(\"%s\", %ju)\n", afilename, + highestaddr.np_quad); + free(afilename, M_DEVBUF); + *status = NDIS_STATUS_FILE_NOT_FOUND; + return; +} + +__stdcall static void +ndis_map_file(status, mappedbuffer, filehandle) + ndis_status *status; + void **mappedbuffer; + ndis_handle filehandle; +{ + + *status = NDIS_STATUS_ALREADY_MAPPED; + return; +} + +__stdcall static void +ndis_unmap_file(filehandle) + ndis_handle filehandle; +{ + return; +} + __stdcall static void +ndis_close_file(filehandle) + ndis_handle filehandle; +{ + return; +} + +__stdcall static void dummy() { printf ("NDIS dummy called...\n"); @@ -2199,6 +2275,7 @@ { "NdisInitializeString", (FUNC)ndis_init_string }, { "NdisFreeString", (FUNC)ndis_free_string }, { "NdisGetCurrentSystemTime", (FUNC)ndis_time }, + { "NdisGetSystemUpTime", (FUNC)ndis_uptime }, { "NdisMSynchronizeWithInterrupt", (FUNC)ndis_sync_with_intr }, { "NdisMAllocateSharedMemoryAsync", (FUNC)ndis_alloc_sharedmem_async }, { "NdisInterlockedInsertHeadList", (FUNC)ndis_insert_head }, @@ -2272,6 +2349,10 @@ { "NdisUnchainBufferAtFront", (FUNC)ndis_unchain_headbuf }, { "NdisReadPcmciaAttributeMemory", (FUNC)ndis_read_pccard_amem }, { "NdisWritePcmciaAttributeMemory", (FUNC)ndis_write_pccard_amem }, + { "NdisOpenFile", (FUNC)ndis_open_file }, + { "NdisMapFile", (FUNC)ndis_map_file }, + { "NdisUnmapFile", (FUNC)ndis_unmap_file }, + { "NdisCloseFile", (FUNC)ndis_close_file }, /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.3 2003/12/13 07:41:12 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.4 2003/12/25 00:40:02 wpaul Exp $"); #include #include @@ -63,6 +63,10 @@ __stdcall static uint32_t ntoskrnl_unicode_equal(ndis_unicode_string *, ndis_unicode_string *, uint32_t); +__stdcall static void ntoskrnl_unicode_copy(ndis_unicode_string *, + ndis_unicode_string *); +__stdcall static uint32_t ntoskrnl_unicode_to_ansi(ndis_ansi_string *, + ndis_unicode_string *, uint8_t); __stdcall static void *ntoskrnl_iobuildsynchfsdreq(uint32_t, void *, void *, uint32_t, uint32_t *, void *, void *); __stdcall static uint32_t ntoskrnl_iofcalldriver(void *, void *); @@ -142,8 +146,8 @@ ndis_unicode_string *str2; uint32_t casesensitive; { - char *astr1 = NULL, *astr2 = NULL; - int rval = 1; + char *astr1 = NULL, *astr2 = NULL; + int rval = 1; ndis_unicode_to_ascii(str1->nus_buf, str2->nus_len, &astr1); ndis_unicode_to_ascii(str2->nus_buf, str2->nus_len, &astr2); @@ -161,6 +165,42 @@ return(rval); } +__stdcall static void +ntoskrnl_unicode_copy(dest, src) + ndis_unicode_string *dest; + ndis_unicode_string *src; +{ + + if (dest->nus_maxlen >= src->nus_len) + dest->nus_len = src->nus_len; + else + dest->nus_len = dest->nus_maxlen; + memcpy(dest->nus_buf, src->nus_buf, dest->nus_len); + return; +} + +__stdcall static uint32_t +ntoskrnl_unicode_to_ansi(dest, src, allocate) + ndis_ansi_string *dest; + ndis_unicode_string *src; + uint8_t allocate; +{ + char *astr = NULL; + + if (allocate) { + ndis_unicode_to_ascii(src->nus_buf, src->nus_len, &astr); + dest->nas_buf = astr; + dest->nas_len = dest->nas_maxlen = strlen(astr); + } else { + dest->nas_len = src->nus_len / 2; /* XXX */ + if (dest->nas_maxlen < dest->nas_len) + dest->nas_len = dest->nas_maxlen; + ndis_unicode_to_ascii(src->nus_buf, dest->nas_len * 2, + &dest->nas_buf); + } + return (NDIS_STATUS_SUCCESS); +} + __stdcall static void * ntoskrnl_iobuildsynchfsdreq(func, dobj, buf, len, off, event, status) uint32_t func; @@ -523,6 +563,8 @@ image_patch_table ntoskrnl_functbl[] = { { "RtlEqualUnicodeString", (FUNC)ntoskrnl_unicode_equal }, + { "RtlCopyUnicodeString", (FUNC)ntoskrnl_unicode_copy }, + { "RtlUnicodeStringToAnsiString", (FUNC)ntoskrnl_unicode_to_ansi }, { "sprintf", (FUNC)sprintf }, { "DbgPrint", (FUNC)printf }, { "strncmp", (FUNC)strncmp }, ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.1 2003/12/11 22:34:37 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.2 2003/12/24 21:21:18 wpaul Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -79,7 +79,7 @@ { uint16_t signature; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return (EINVAL); signature = *(uint16_t *)imgbase; @@ -102,7 +102,7 @@ uint32_t signature; image_dos_header *dos_hdr; - if (imgbase == NULL) + if (imgbase == 0) return (EINVAL); signature = *(uint16_t *)imgbase; @@ -130,7 +130,7 @@ image_dos_header *dos_hdr; image_nt_header *nt_hdr; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return(EINVAL); if (pe_is_nt_image(imgbase)) @@ -158,7 +158,7 @@ image_dos_header *dos_hdr; image_nt_header *nt_hdr; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return(EINVAL); if (pe_is_nt_image(imgbase)) @@ -187,7 +187,7 @@ image_nt_header *nt_hdr; image_section_header *sect_hdr; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return(EINVAL); if (pe_is_nt_image(imgbase)) @@ -327,7 +327,7 @@ int i, sections; - if (imgbase == NULL || hdr == NULL) + if (imgbase == 0 || hdr == NULL) return(EINVAL); if (pe_is_nt_image(imgbase)) @@ -433,7 +433,7 @@ image_import_descriptor *imp_desc; char *modname; - if (imgbase == NULL || module == NULL || desc == NULL) + if (imgbase == 0 || module == NULL || desc == NULL) return(EINVAL); offset = pe_directory_offset(imgbase, IMAGE_DIRECTORY_ENTRY_IMPORT); @@ -509,7 +509,7 @@ vm_offset_t *nptr, *fptr; vm_offset_t func; - if (imgbase == NULL || module == NULL || functbl == NULL) + if (imgbase == 0 || module == NULL || functbl == NULL) return(EINVAL); if (pe_get_import_descriptor(imgbase, &imp_desc, module)) ==== //depot/projects/netperf+sockets/sys/conf/kmod.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.150 2003/11/19 05:08:26 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.151 2003/12/25 14:07:52 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -70,7 +70,7 @@ .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S -CFLAGS+= ${COPTS} -D_KERNEL ${CWARNFLAGS} +CFLAGS+= ${COPTS} -D_KERNEL CFLAGS+= -DKLD_MODULE # Don't use any standard or source-relative include directories. ==== //depot/projects/netperf+sockets/sys/dev/ata/ata-chipset.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.52 2003/12/18 17:36:41 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.53 2003/12/25 19:37:11 sos Exp $"); #include "opt_ata.h" #include @@ -1918,28 +1918,11 @@ { ATA_SIS963, 0x00, SIS133NEW, 0, ATA_UDMA6, "SiS 963" }, /* south */ { ATA_SIS962, 0x00, SIS133NEW, 0, ATA_UDMA6, "SiS 962" }, /* south */ - { ATA_SIS755, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 755" }, /* ext south */ - { ATA_SIS752, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 752" }, /* unknown */ - { ATA_SIS751, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 751" }, /* unknown */ - { ATA_SIS750, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 750" }, /* unknown */ - { ATA_SIS748, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 748" }, /* unknown */ - { ATA_SIS746, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 746" }, /* ext south */ { ATA_SIS745, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 745" }, /* 1chip */ - { ATA_SIS740, 0x00, SIS_SOUTH, 0, ATA_UDMA5, "SiS 740" }, /* ext south */ { ATA_SIS735, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 735" }, /* 1chip */ { ATA_SIS733, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 733" }, /* 1chip */ { ATA_SIS730, 0x00, SIS100OLD, 0, ATA_UDMA5, "SiS 730" }, /* 1chip */ - { ATA_SIS661, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 661" }, /* ext south */ - { ATA_SIS658, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 658" }, /* ext south */ - { ATA_SIS655, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 655" }, /* ext south */ - { ATA_SIS652, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 652" }, /* unknown */ - { ATA_SIS651, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 651" }, /* ext south */ - { ATA_SIS650, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 650" }, /* ext south */ - { ATA_SIS648, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 648" }, /* ext south */ - { ATA_SIS646, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 645DX"},/* ext south */ - { ATA_SIS645, 0x00, SIS_SOUTH, 0, ATA_UDMA6, "SiS 645" }, /* ext south */ - { ATA_SIS640, 0x00, SIS_SOUTH, 0, ATA_UDMA4, "SiS 640" }, /* ext south */ { ATA_SIS635, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 635" }, /* 1chip */ { ATA_SIS633, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 633" }, /* unknown */ { ATA_SIS630, 0x30, SIS100OLD, 0, ATA_UDMA5, "SiS 630S"}, /* 1chip */ @@ -1951,29 +1934,33 @@ { ATA_SIS530, 0x00, SIS66, 0, ATA_UDMA4, "SiS 530" }, { ATA_SIS5513, 0xc2, SIS33, 0, ATA_UDMA2, "SiS 5513" }, - { ATA_SIS5513, 0x00, SIS33, 0, ATA_WDMA2, "SiS 5513" }, + { ATA_SIS5513, 0x00, SIS33, 1, ATA_WDMA2, "SiS 5513" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; if (!(idx = ata_find_chip(dev, ids, -pci_get_slot(dev)))) return ENXIO; - if (idx->cfg1 == SIS_SOUTH) { + if (idx->cfg2) { pci_write_config(dev, 0x57, pci_read_config(dev, 0x57, 1) & 0x7f, 1); if (pci_read_config(dev, 0x00, 4) == ATA_SIS5518) { idx->cfg1 = SIS133NEW; - sprintf(buffer, "SiS 96X %s controller",ata_mode2str(idx->max_dma)); + idx->max_dma = ATA_UDMA6; + sprintf(buffer, "SiS 962/963 %s controller", + ata_mode2str(idx->max_dma)); } else { struct ata_chip_id id[] = {{ ATA_SISSOUTH, 0x10, 0, 0, ATA_UDMA6, "SiS 961" }, { 0, 0, 0, 0, 0, 0 }}; - if (ata_find_chip(dev, id, pci_get_slot(dev))) + if (ata_find_chip(dev, id, pci_get_slot(dev))) { idx->cfg1 = SIS133OLD; + idx->max_dma = ATA_UDMA6; + } else { + idx->cfg1 = SIS100NEW; idx->max_dma = ATA_UDMA5; - idx->cfg1 = SIS100NEW; } sprintf(buffer, "SiS 961 %s controller",ata_mode2str(idx->max_dma)); } ==== //depot/projects/netperf+sockets/sys/dev/hifn/hifn7751.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.23 2003/10/08 20:25:47 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.24 2003/12/25 01:23:38 sam Exp $"); /* * Driver for various Hifn encryption processors. @@ -386,10 +386,10 @@ sc->sc_dma = (struct hifn_dma *)kva; bzero(sc->sc_dma, sizeof(*sc->sc_dma)); - KASSERT(sc->sc_st0 != NULL, ("hifn_attach: null bar0 tag!")); - KASSERT(sc->sc_sh0 != NULL, ("hifn_attach: null bar0 handle!")); - KASSERT(sc->sc_st1 != NULL, ("hifn_attach: null bar1 tag!")); - KASSERT(sc->sc_sh1 != NULL, ("hifn_attach: null bar1 handle!")); + KASSERT(sc->sc_st0 != 0, ("hifn_attach: null bar0 tag!")); + KASSERT(sc->sc_sh0 != 0, ("hifn_attach: null bar0 handle!")); + KASSERT(sc->sc_st1 != 0, ("hifn_attach: null bar1 tag!")); + KASSERT(sc->sc_sh1 != 0, ("hifn_attach: null bar1 handle!")); /* * Reset the board and do the ``secret handshake'' ==== //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.9 2003/12/23 18:41:34 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.13 2003/12/25 09:44:49 wpaul Exp $"); #include "opt_bdg.h" @@ -150,6 +150,7 @@ static devclass_t ndis_devclass; DRIVER_MODULE(ndis, pci, ndis_driver, ndis_devclass, 0, 0); +DRIVER_MODULE(ndis, cardbus, ndis_driver, ndis_devclass, 0, 0); /* * Program the 64-bit multicast hash filter. @@ -292,12 +293,12 @@ * Hook interrupt early, since calling the driver's * init routine may trigger an interrupt. */ + error = bus_setup_intr(dev, sc->ndis_irq, INTR_TYPE_NET, ndis_intr, sc, &sc->ndis_intrhand); if (error) { - printf("ndis%d: couldn't register interrupt\n", unit); - error = ENXIO; + printf("ndis%d: couldn't set up irq\n", unit); goto fail; } @@ -561,16 +562,13 @@ /* Override the status handler so we can detect link changes. */ sc->ndis_block.nmb_status_func = ndis_linksts; - if (error) { - printf("ndis%d: couldn't set up irq\n", unit); - ether_ifdetach(ifp); - goto fail; - } - fail: if (error) ndis_detach(dev); + /* We're done talking to the NIC for now; halt it. */ + ndis_halt_nic(sc); + return(error); } @@ -592,20 +590,19 @@ KASSERT(mtx_initialized(&sc->ndis_mtx), ("ndis mutex not initialized")); NDIS_LOCK(sc); ifp = &sc->arpcom.ac_if; + ifp->if_flags &= ~IFF_UP; if (device_is_attached(dev)) { if (sc->ndis_80211) { ifmedia_removeall(&sc->ic.ic_media); ieee80211_node_detach(ifp); } - ifp->if_flags &= ~IFF_UP; NDIS_UNLOCK(sc); ndis_stop(sc); ether_ifdetach(ifp); } else NDIS_UNLOCK(sc); - bus_generic_detach(dev); if (sc->ndis_intrhand) @@ -657,7 +654,7 @@ for (i = 0; i < pktcnt; i++) { p = packets[i]; /* Stash the softc here so ptom can use it. */ - p->np_rsvd[0] = (uint32_t *)sc; + p->np_softc = sc; if (ndis_ptom(&m0, p)) { printf ("ndis%d: ptom failed\n", sc->ndis_unit); ndis_return_packet(sc, p); @@ -692,13 +689,10 @@ sc = (struct ndis_softc *)block->nmb_ifp; ifp = block->nmb_ifp; - if (packet->np_rsvd[1] == NULL) - panic("NDIS driver corrupted reserved packet fields"); - NDIS_LOCK(sc); - m = (struct mbuf *)packet->np_rsvd[1]; - idx = (int)packet->np_rsvd[0]; + m = packet->np_m0; + idx = packet->np_txidx; ifp->if_opackets++; if (sc->ndis_sc) bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]); @@ -770,15 +764,11 @@ int call_isr = 0; sc = arg; - /*NDIS_LOCK(sc);*/ ifp = &sc->arpcom.ac_if; -/* - if (!(ifp->if_flags & IFF_UP)) { - NDIS_UNLOCK(sc); + if (!(ifp->if_flags & IFF_UP)) return; - } -*/ + ndis_isr(sc, &is_our_intr, &call_isr); if (is_our_intr || call_isr) @@ -787,8 +777,6 @@ if (ifp->if_snd.ifq_head != NULL) ndis_start(ifp); - /*NDIS_UNLOCK(sc);*/ - return; } @@ -906,9 +894,8 @@ * so we can free it later. */ - (sc->ndis_txarray[sc->ndis_txidx])->np_rsvd[0] = - (uint32_t *)sc->ndis_txidx; - (sc->ndis_txarray[sc->ndis_txidx])->np_rsvd[1] = (uint32_t *)m; + (sc->ndis_txarray[sc->ndis_txidx])->np_txidx = sc->ndis_txidx; + (sc->ndis_txarray[sc->ndis_txidx])->np_m0 = m; /* * Do scatter/gather processing, if driver requested it. @@ -1139,7 +1126,10 @@ len = sizeof(ssid); bzero((char *)&ssid, len); ssid.ns_ssidlen = ic->ic_des_esslen; - bcopy(ic->ic_des_essid, ssid.ns_ssid, ssid.ns_ssidlen); + if (ssid.ns_ssidlen == 0) { + ssid.ns_ssidlen = 1; + } else + bcopy(ic->ic_des_essid, ssid.ns_ssid, ssid.ns_ssidlen); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 25 11:48:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15E2316A4D0; Thu, 25 Dec 2003 11:48:17 -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 E304C16A4CE for ; Thu, 25 Dec 2003 11:48:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C8C343D2D for ; Thu, 25 Dec 2003 11:48:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPJmG0B080019 for ; Thu, 25 Dec 2003 11:48:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPJmFA0080016 for perforce@freebsd.org; Thu, 25 Dec 2003 11:48:15 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 25 Dec 2003 11:48:15 -0800 (PST) Message-Id: <200312251948.hBPJmFA0080016@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 44312 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, 25 Dec 2003 19:48:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=44312 Change 44312 by sam@sam_ebb on 2003/12/25 11:47:52 NULL fallout Affected files ... .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#3 (text+ko) ==== @@ -520,7 +520,7 @@ fptr = (vm_offset_t *)pe_translate_addr(imgbase, imp_desc.iid_import_address_table_addr); - while (nptr != NULL && pe_translate_addr(imgbase, *nptr) != NULL) { + while (nptr != 0 && pe_translate_addr(imgbase, *nptr) != 0) { fname = (char *)pe_translate_addr(imgbase, (*nptr) + 2); func = pe_functbl_match(functbl, fname); if (func) From owner-p4-projects@FreeBSD.ORG Thu Dec 25 13:24:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7A2F16A4D0; Thu, 25 Dec 2003 13:24: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 770B716A4CE for ; Thu, 25 Dec 2003 13:24:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25D9E43D2D for ; Thu, 25 Dec 2003 13:24:37 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPLOa0B007715 for ; Thu, 25 Dec 2003 13:24:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPLOBf4007711 for perforce@freebsd.org; Thu, 25 Dec 2003 13:24:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 13:24:11 -0800 (PST) Message-Id: <200312252124.hBPLOBf4007711@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 44313 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, 25 Dec 2003 21:24:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=44313 Change 44313 by jmallett@jmallett_oingo on 2003/12/25 13:23:30 IFC... Affected files ... .. //depot/projects/mips/Makefile#8 integrate .. //depot/projects/mips/Makefile.inc1#18 integrate .. //depot/projects/mips/UPDATING#13 integrate .. //depot/projects/mips/bin/Makefile.inc#3 integrate .. //depot/projects/mips/bin/chmod/chmod.c#5 integrate .. //depot/projects/mips/bin/cp/utils.c#5 integrate .. //depot/projects/mips/bin/df/df.c#6 integrate .. //depot/projects/mips/bin/ls/ls.1#9 integrate .. //depot/projects/mips/bin/ls/ls.c#9 integrate .. //depot/projects/mips/bin/rm/rm.c#3 integrate .. //depot/projects/mips/contrib/bind/CHANGES#5 integrate .. //depot/projects/mips/contrib/bind/README#4 integrate .. //depot/projects/mips/contrib/bind/Version#4 integrate .. //depot/projects/mips/contrib/bind/bin/named/ns_init.c#3 integrate .. //depot/projects/mips/contrib/bind/bin/named/ns_resp.c#5 integrate .. //depot/projects/mips/contrib/bind/bin/nslookup/commands.l#2 integrate .. //depot/projects/mips/contrib/bsnmp/FREEBSD-upgrade#1 branch .. //depot/projects/mips/contrib/bsnmp/NEWS#1 branch .. //depot/projects/mips/contrib/bsnmp/README#1 branch .. //depot/projects/mips/contrib/bsnmp/TODO#1 branch .. //depot/projects/mips/contrib/bsnmp/VERSION#1 branch .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.1#1 branch .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.c#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/asn1.3#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/asn1.c#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/asn1.h#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpagent.3#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpclient.3#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/bsnmplib.3#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/snmp.c#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/snmp.h#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.c#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.h#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/snmpclient.c#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/snmpclient.h#1 branch .. //depot/projects/mips/contrib/bsnmp/lib/snmppriv.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ip.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_route.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_tcp.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_tree.def#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_udp.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.3#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/.gdbinit#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/FOKUS-MIB.txt#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/action.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/bsnmpd.1#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/config.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/export.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/main.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.config#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.sh#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.3#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trap.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/tree.def#1 branch .. //depot/projects/mips/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/mips/contrib/gcc/config/alpha/freebsd.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/freebsd-spec.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/i386/freebsd.h#6 integrate .. //depot/projects/mips/contrib/gcc/config/i386/freebsd64.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/sparc/freebsd.h#5 integrate .. //depot/projects/mips/contrib/gcc/gcc.c#7 integrate .. //depot/projects/mips/contrib/ipfilter/ipt.c#3 integrate .. //depot/projects/mips/contrib/ipfilter/kmem.c#3 integrate .. //depot/projects/mips/contrib/libreadline/readline.h#3 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_ttyconv.c#6 integrate .. //depot/projects/mips/etc/defaults/periodic.conf#6 integrate .. //depot/projects/mips/etc/defaults/rc.conf#14 integrate .. //depot/projects/mips/etc/devd.conf#5 integrate .. //depot/projects/mips/etc/mac.conf#3 integrate .. //depot/projects/mips/etc/mtree/BSD.include.dist#10 integrate .. //depot/projects/mips/etc/mtree/BSD.local.dist#8 integrate .. //depot/projects/mips/etc/mtree/BSD.sendmail.dist#2 integrate .. //depot/projects/mips/etc/mtree/BSD.usr.dist#10 integrate .. //depot/projects/mips/etc/mtree/BSD.var.dist#4 integrate .. //depot/projects/mips/etc/rc.d/Makefile#8 integrate .. //depot/projects/mips/etc/rc.d/cleartmp#3 integrate .. //depot/projects/mips/etc/rc.d/ike#1 branch .. //depot/projects/mips/etc/rc.d/jail#4 integrate .. //depot/projects/mips/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/mips/etc/rc.d/power_profile#1 branch .. //depot/projects/mips/etc/rc.d/root#4 integrate .. //depot/projects/mips/etc/rc.d/syscons#2 integrate .. //depot/projects/mips/etc/rc.subr#7 integrate .. //depot/projects/mips/etc/sendmail/freebsd.mc#4 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2#6 integrate .. //depot/projects/mips/games/fortune/strfile/Makefile#2 integrate .. //depot/projects/mips/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#3 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/auto-host.h#7 integrate .. //depot/projects/mips/gnu/usr.bin/cc/include/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/mips/gnu/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/man/manpath/manpath.config#4 integrate .. //depot/projects/mips/gnu/usr.bin/send-pr/send-pr.sh#4 integrate .. //depot/projects/mips/gnu/usr.bin/tar/Makefile#2 integrate .. //depot/projects/mips/include/Makefile#18 integrate .. //depot/projects/mips/include/dirent.h#2 integrate .. //depot/projects/mips/include/fnmatch.h#2 integrate .. //depot/projects/mips/include/ifaddrs.h#2 integrate .. //depot/projects/mips/include/locale.h#3 integrate .. //depot/projects/mips/include/regex.h#2 integrate .. //depot/projects/mips/include/resolv.h#3 integrate .. //depot/projects/mips/include/rpc/types.h#2 integrate .. //depot/projects/mips/include/stddef.h#2 integrate .. //depot/projects/mips/include/stdio.h#5 integrate .. //depot/projects/mips/include/stdlib.h#6 integrate .. //depot/projects/mips/include/string.h#4 integrate .. //depot/projects/mips/include/time.h#2 integrate .. //depot/projects/mips/include/unistd.h#7 integrate .. //depot/projects/mips/include/wchar.h#5 integrate .. //depot/projects/mips/kerberos5/Makefile.inc#5 integrate .. //depot/projects/mips/kerberos5/include/krb5-private.h#3 delete .. //depot/projects/mips/lib/Makefile#9 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/Makefile#4 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/Makefile#5 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libc.so.4.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/libedit.so.3.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libmp.so.3.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/libpam.so.1.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libperl.so.3.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu#2 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libskey.so.2.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/libutil.so.3.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#3 integrate .. //depot/projects/mips/lib/libbsnmp/Makefile#1 branch .. //depot/projects/mips/lib/libbsnmp/Makefile.inc#1 branch .. //depot/projects/mips/lib/libbsnmp/libbsnmp/Makefile#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/Makefile#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/Makefile.inc#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/Makefile#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/genfiles#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/Makefile#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/genfiles#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#1 branch .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h#1 branch .. //depot/projects/mips/lib/libc/Makefile#7 integrate .. //depot/projects/mips/lib/libc/alpha/gen/setjmp.S#3 integrate .. //depot/projects/mips/lib/libc/amd64/gen/makecontext.c#2 integrate .. //depot/projects/mips/lib/libc/gen/daemon.3#2 integrate .. //depot/projects/mips/lib/libc/gen/daemon.c#2 integrate .. //depot/projects/mips/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/mips/lib/libc/gen/sysconf.3#3 integrate .. //depot/projects/mips/lib/libc/locale/Makefile.inc#6 integrate .. //depot/projects/mips/lib/libc/locale/big5.5#2 integrate .. //depot/projects/mips/lib/libc/locale/euc.4#3 delete .. //depot/projects/mips/lib/libc/locale/euc.5#1 branch .. //depot/projects/mips/lib/libc/locale/gb18030.5#2 integrate .. //depot/projects/mips/lib/libc/locale/gb2312.5#2 integrate .. //depot/projects/mips/lib/libc/locale/gbk.5#2 integrate .. //depot/projects/mips/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/mips/lib/libc/locale/localeconv.3#1 branch .. //depot/projects/mips/lib/libc/locale/mblen.3#1 branch .. //depot/projects/mips/lib/libc/locale/mbrune.3#5 integrate .. //depot/projects/mips/lib/libc/locale/mbstowcs.3#1 branch .. //depot/projects/mips/lib/libc/locale/mbtowc.3#1 branch .. //depot/projects/mips/lib/libc/locale/mskanji.5#2 integrate .. //depot/projects/mips/lib/libc/locale/multibyte.3#5 integrate .. //depot/projects/mips/lib/libc/locale/rune.3#5 integrate .. //depot/projects/mips/lib/libc/locale/setlocale.3#5 integrate .. //depot/projects/mips/lib/libc/locale/setlocale.c#4 integrate .. //depot/projects/mips/lib/libc/locale/setrunelocale.c#4 integrate .. //depot/projects/mips/lib/libc/locale/utf2.4#4 delete .. //depot/projects/mips/lib/libc/locale/utf2.5#1 branch .. //depot/projects/mips/lib/libc/locale/utf8.5#4 integrate .. //depot/projects/mips/lib/libc/locale/utf8.c#4 integrate .. //depot/projects/mips/lib/libc/locale/wcstombs.3#1 branch .. //depot/projects/mips/lib/libc/locale/wctomb.3#1 branch .. //depot/projects/mips/lib/libc/net/Makefile.inc#7 integrate .. //depot/projects/mips/lib/libc/net/getifmaddrs.3#1 branch .. //depot/projects/mips/lib/libc/net/getifmaddrs.c#1 branch .. //depot/projects/mips/lib/libc/net/ip6opt.c#3 integrate .. //depot/projects/mips/lib/libc/net/res_init.c#2 integrate .. //depot/projects/mips/lib/libc/posix1e/mac.c#5 integrate .. //depot/projects/mips/lib/libc/posix1e/mac_get.3#5 integrate .. //depot/projects/mips/lib/libc/posix1e/mac_get.c#4 integrate .. //depot/projects/mips/lib/libc/posix1e/mac_set.3#5 integrate .. //depot/projects/mips/lib/libc/posix1e/mac_text.3#6 integrate .. //depot/projects/mips/lib/libc/powerpc/_fpmath.h#3 integrate .. //depot/projects/mips/lib/libc/sparc64/sys/__sparc_utrap_setup.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/getc.3#5 integrate .. //depot/projects/mips/lib/libc/stdio/vfwprintf.c#8 integrate .. //depot/projects/mips/lib/libc/stdlib/atexit.c#2 integrate .. //depot/projects/mips/lib/libc/stdlib/atexit.h#2 integrate .. //depot/projects/mips/lib/libc/stdlib/exit.c#2 integrate .. //depot/projects/mips/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/mips/lib/libc/stdlib/radixsort.c#2 integrate .. //depot/projects/mips/lib/libc/stdtime/strptime.c#6 integrate .. //depot/projects/mips/lib/libc/string/index.c#2 integrate .. //depot/projects/mips/lib/libc/string/rindex.c#2 integrate .. //depot/projects/mips/lib/libc/sys/Makefile.inc#7 integrate .. //depot/projects/mips/lib/libc/sys/accept.2#4 integrate .. //depot/projects/mips/lib/libc/sys/getfsstat.2#4 integrate .. //depot/projects/mips/lib/libc/sys/getpeername.2#3 integrate .. //depot/projects/mips/lib/libc/sys/getsockname.2#4 integrate .. //depot/projects/mips/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/mips/lib/libc/sys/jail.2#5 integrate .. //depot/projects/mips/lib/libc/sys/kqueue.2#5 integrate .. //depot/projects/mips/lib/libc/sys/kse.2#7 integrate .. //depot/projects/mips/lib/libc/sys/ktrace.2#4 integrate .. //depot/projects/mips/lib/libc/sys/msync.2#3 integrate .. //depot/projects/mips/lib/libc/sys/munmap.2#3 integrate .. //depot/projects/mips/lib/libc/sys/recv.2#4 integrate .. //depot/projects/mips/lib/libc/sys/sendfile.2#5 integrate .. //depot/projects/mips/lib/libc/sys/setgroups.2#4 integrate .. //depot/projects/mips/lib/libc/sys/stat.2#5 integrate .. //depot/projects/mips/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/mips/lib/libc/sys/utrace.2#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_create.c#5 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_init.c#4 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_sig.c#5 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_write.c#4 integrate .. //depot/projects/mips/lib/libdisk/create_chunk.c#12 integrate .. //depot/projects/mips/lib/libdisk/write_ia64_disk.c#7 integrate .. //depot/projects/mips/lib/libkiconv/Makefile#2 integrate .. //depot/projects/mips/lib/libkiconv/kiconv.3#2 integrate .. //depot/projects/mips/lib/libkiconv/xlat16_iconv.c#2 integrate .. //depot/projects/mips/lib/libnetgraph/internal.h#2 integrate .. //depot/projects/mips/lib/libnetgraph/msg.c#2 integrate .. //depot/projects/mips/lib/libnetgraph/netgraph.3#4 integrate .. //depot/projects/mips/lib/libnetgraph/sock.c#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_echo/pam_echo.c#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_group/pam_group.c#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_krb5/pam_krb5.c#7 integrate .. //depot/projects/mips/lib/libpam/modules/pam_ksu/pam_ksu.c#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_lastlog/pam_lastlog.c#4 integrate .. //depot/projects/mips/lib/libpam/modules/pam_login_access/pam_login_access.c#3 integrate .. //depot/projects/mips/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#5 integrate .. //depot/projects/mips/lib/libpam/modules/pam_radius/pam_radius.8#4 integrate .. //depot/projects/mips/lib/libpam/modules/pam_radius/pam_radius.c#4 integrate .. //depot/projects/mips/lib/libpam/modules/pam_rhosts/pam_rhosts.c#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_securetty/pam_securetty.c#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_unix/pam_unix.c#5 integrate .. //depot/projects/mips/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 integrate .. //depot/projects/mips/lib/libpthread/arch/i386/i386/thr_enter_uts.S#6 integrate .. //depot/projects/mips/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/mips/lib/libpthread/pthread.map#2 integrate .. //depot/projects/mips/lib/libpthread/thread/Makefile.inc#8 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_accept.c#1 branch .. //depot/projects/mips/lib/libpthread/thread/thr_aio_suspend.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_cancel.c#6 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_close.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_cond.c#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_connect.c#1 branch .. //depot/projects/mips/lib/libpthread/thread/thr_creat.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_fcntl.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_fsync.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_init.c#8 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_join.c#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_kern.c#10 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_msync.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_mutex.c#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_nanosleep.c#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_open.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_pause.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_poll.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_private.h#8 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_pselect.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_read.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_readv.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_select.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sem.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sigsuspend.c#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sigwait.c#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sleep.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_spinlock.c#6 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_system.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_tcdrain.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_wait.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_wait4.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_waitpid.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_write.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_writev.c#3 integrate .. //depot/projects/mips/lib/libsdp/util.c#2 integrate .. //depot/projects/mips/lib/libstand/Makefile#6 integrate .. //depot/projects/mips/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/mips/lib/libthr/arch/i386/i386/_setcurthread.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libthr/thread/thr_cond.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_create.c#5 integrate .. //depot/projects/mips/lib/libthr/thread/thr_kern.c#5 integrate .. //depot/projects/mips/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_resume_np.c#3 integrate .. //depot/projects/mips/lib/libthr/thread/thr_setschedparam.c#3 integrate .. //depot/projects/mips/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/mips/lib/libthr/thread/thr_spinlock.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_subr.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/mips/lib/libusbhid/usbhid.3#5 integrate .. //depot/projects/mips/lib/libutil/Makefile#3 integrate .. //depot/projects/mips/libexec/ftpd/ftpd.c#9 integrate .. //depot/projects/mips/libexec/pppoed/pppoed.c#2 integrate .. //depot/projects/mips/libexec/rshd/rshd.8#3 integrate .. //depot/projects/mips/libexec/rtld-elf/amd64/lockdflt.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/amd64/reloc.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/amd64/rtld_machdep.h#3 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.c#12 integrate .. //depot/projects/mips/libexec/tftpd/tftpd.c#4 integrate .. //depot/projects/mips/release/Makefile#21 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#8 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#12 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#15 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#7 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/install.sgml#6 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#6 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#25 integrate .. //depot/projects/mips/release/doc/share/sgml/release.ent#6 integrate .. //depot/projects/mips/release/i386/drivers.conf#15 integrate .. //depot/projects/mips/release/scripts/print-cdrom-packages.sh#9 integrate .. //depot/projects/mips/rescue/rescue/Makefile#2 integrate .. //depot/projects/mips/sbin/Makefile#10 integrate .. //depot/projects/mips/sbin/Makefile.inc#3 integrate .. //depot/projects/mips/sbin/atm/atm/Makefile#3 integrate .. //depot/projects/mips/sbin/atm/atm/atm_eni.c#3 delete .. //depot/projects/mips/sbin/atm/atm/atm_show.c#4 integrate .. //depot/projects/mips/sbin/atm/ilmid/ilmid.c#8 integrate .. //depot/projects/mips/sbin/ccdconfig/ccdconfig.8#5 integrate .. //depot/projects/mips/sbin/comcontrol/comcontrol.8#2 integrate .. //depot/projects/mips/sbin/cxconfig/Makefile#2 delete .. //depot/projects/mips/sbin/cxconfig/cxconfig.8#2 delete .. //depot/projects/mips/sbin/cxconfig/cxconfig.c#3 delete .. //depot/projects/mips/sbin/dhclient/Makefile.inc#4 integrate .. //depot/projects/mips/sbin/dump/Makefile#4 integrate .. //depot/projects/mips/sbin/dump/dump.8#7 integrate .. //depot/projects/mips/sbin/dump/dumprmt.c#3 integrate .. //depot/projects/mips/sbin/dump/main.c#7 integrate .. //depot/projects/mips/sbin/dumpfs/Makefile#4 integrate .. //depot/projects/mips/sbin/dumpfs/dumpfs.c#10 integrate .. //depot/projects/mips/sbin/fdisk/fdisk.c#7 integrate .. //depot/projects/mips/sbin/fsck_ffs/setup.c#6 integrate .. //depot/projects/mips/sbin/fsdb/Makefile#2 integrate .. //depot/projects/mips/sbin/fsdb/fsdb.c#2 integrate .. //depot/projects/mips/sbin/fsdb/fsdbutil.c#2 integrate .. //depot/projects/mips/sbin/gbde/gbde.8#7 integrate .. //depot/projects/mips/sbin/gpt/add.c#4 integrate .. //depot/projects/mips/sbin/gpt/migrate.c#5 integrate .. //depot/projects/mips/sbin/gpt/recover.c#3 integrate .. //depot/projects/mips/sbin/growfs/growfs.8#5 integrate .. //depot/projects/mips/sbin/idmapd/Makefile#1 branch .. //depot/projects/mips/sbin/idmapd/idmapd.8#1 branch .. //depot/projects/mips/sbin/idmapd/idmapd.c#1 branch .. //depot/projects/mips/sbin/init/Makefile#2 integrate .. //depot/projects/mips/sbin/init/init.8#5 integrate .. //depot/projects/mips/sbin/init/init.c#3 integrate .. //depot/projects/mips/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/mips/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/mips/sbin/mount/getmntopts.c#3 integrate .. //depot/projects/mips/sbin/mount/mount.c#5 integrate .. //depot/projects/mips/sbin/mount_cd9660/mount_cd9660.c#3 integrate .. //depot/projects/mips/sbin/mount_ext2fs/Makefile#2 integrate .. //depot/projects/mips/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate .. //depot/projects/mips/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/mips/sbin/mount_nfs4/Makefile#1 branch .. //depot/projects/mips/sbin/mount_nfs4/mount_nfs4.8#1 branch .. //depot/projects/mips/sbin/mount_nfs4/mount_nfs4.c#1 branch .. //depot/projects/mips/sbin/mount_ntfs/mount_ntfs.c#3 integrate .. //depot/projects/mips/sbin/mount_udf/mount_udf.c#3 integrate .. //depot/projects/mips/sbin/newfs/mkfs.c#11 integrate .. //depot/projects/mips/sbin/newfs/newfs.c#8 integrate .. //depot/projects/mips/sbin/newfs/newfs.h#5 integrate .. //depot/projects/mips/sbin/nologin/Makefile#2 integrate .. //depot/projects/mips/sbin/nologin/nologin.8#2 integrate .. //depot/projects/mips/sbin/nologin/nologin.c#1 branch .. //depot/projects/mips/sbin/nologin/nologin.sh#2 delete .. //depot/projects/mips/sbin/route/route.8#3 integrate .. //depot/projects/mips/sbin/route/route.c#5 integrate .. //depot/projects/mips/sbin/sconfig/Makefile#1 branch .. //depot/projects/mips/sbin/sconfig/sconfig.8#1 branch .. //depot/projects/mips/sbin/sconfig/sconfig.c#1 branch .. //depot/projects/mips/sbin/umount/umount.c#5 integrate .. //depot/projects/mips/sbin/vinum/commands.c#7 integrate .. //depot/projects/mips/sbin/vinum/vinum.8#5 integrate .. //depot/projects/mips/share/colldef/Makefile#6 integrate .. //depot/projects/mips/share/colldef/be_BY.CP1131.src#1 branch .. //depot/projects/mips/share/colldef/be_BY.CP1251.src#1 branch .. //depot/projects/mips/share/colldef/be_BY.ISO8859-5.src#1 branch .. //depot/projects/mips/share/colldef/map.CP1131#1 branch .. //depot/projects/mips/share/examples/cvsup/cvs-supfile#5 integrate .. //depot/projects/mips/share/examples/cvsup/ports-supfile#4 integrate .. //depot/projects/mips/share/examples/cvsup/refuse#6 integrate .. //depot/projects/mips/share/examples/cvsup/refuse.README#6 integrate .. //depot/projects/mips/share/examples/meteor/rgb16.c#2 integrate .. //depot/projects/mips/share/examples/meteor/rgb24.c#2 integrate .. //depot/projects/mips/share/examples/meteor/test-n.c#2 integrate .. //depot/projects/mips/share/examples/meteor/yuvpk.c#2 integrate .. //depot/projects/mips/share/examples/meteor/yuvpl.c#2 integrate .. //depot/projects/mips/share/examples/netgraph/ngctl#3 integrate .. //depot/projects/mips/share/man/man3/tree.3#3 integrate .. //depot/projects/mips/share/man/man4/Makefile#17 integrate .. //depot/projects/mips/share/man/man4/aac.4#4 integrate .. //depot/projects/mips/share/man/man4/acpi.4#6 integrate .. //depot/projects/mips/share/man/man4/aha.4#3 integrate .. //depot/projects/mips/share/man/man4/ahb.4#3 integrate .. //depot/projects/mips/share/man/man4/ahc.4#4 integrate .. //depot/projects/mips/share/man/man4/amr.4#4 integrate .. //depot/projects/mips/share/man/man4/an.4#5 integrate .. //depot/projects/mips/share/man/man4/ata.4#5 integrate .. //depot/projects/mips/share/man/man4/ath.4#2 integrate .. //depot/projects/mips/share/man/man4/dc.4#5 integrate .. //depot/projects/mips/share/man/man4/dcons.4#2 integrate .. //depot/projects/mips/share/man/man4/ddb.4#3 integrate .. //depot/projects/mips/share/man/man4/de.4#2 integrate .. //depot/projects/mips/share/man/man4/digi.4#1 branch .. //depot/projects/mips/share/man/man4/firewire.4#9 integrate .. //depot/projects/mips/share/man/man4/fpa.4#3 integrate .. //depot/projects/mips/share/man/man4/fwe.4#5 integrate .. //depot/projects/mips/share/man/man4/fwohci.4#7 integrate .. //depot/projects/mips/share/man/man4/gx.4#2 integrate .. //depot/projects/mips/share/man/man4/idt.4#1 branch .. //depot/projects/mips/share/man/man4/inet.4#6 integrate .. //depot/projects/mips/share/man/man4/intro.4#5 integrate .. //depot/projects/mips/share/man/man4/ips.4#1 branch .. //depot/projects/mips/share/man/man4/led.4#2 integrate .. //depot/projects/mips/share/man/man4/lmc.4#3 delete .. //depot/projects/mips/share/man/man4/man4.i386/CPU_ELAN.4#1 branch .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#7 integrate .. //depot/projects/mips/share/man/man4/man4.i386/aic.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/cx.4#4 integrate .. //depot/projects/mips/share/man/man4/man4.i386/dgb.4#3 delete .. //depot/projects/mips/share/man/man4/man4.i386/ex.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/lnc.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/meteor.4#2 delete .. //depot/projects/mips/share/man/man4/man4.i386/ndis.4#1 branch .. //depot/projects/mips/share/man/man4/man4.i386/svr4.4#3 integrate .. //depot/projects/mips/share/man/man4/man4.i386/wd.4#2 integrate .. //depot/projects/mips/share/man/man4/meteor.4#1 branch .. //depot/projects/mips/share/man/man4/miibus.4#5 integrate .. //depot/projects/mips/share/man/man4/ncr.4#2 integrate .. //depot/projects/mips/share/man/man4/ncv.4#1 branch .. //depot/projects/mips/share/man/man4/netgraph.4#4 integrate .. //depot/projects/mips/share/man/man4/ng_atm.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_bluetooth.4#5 integrate .. //depot/projects/mips/share/man/man4/ng_bpf.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_bt3c.4#5 integrate .. //depot/projects/mips/share/man/man4/ng_btsocket.4#5 integrate .. //depot/projects/mips/share/man/man4/ng_etf.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_h4.4#5 integrate .. //depot/projects/mips/share/man/man4/ng_hci.4#5 integrate .. //depot/projects/mips/share/man/man4/ng_iface.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_l2cap.4#5 integrate .. //depot/projects/mips/share/man/man4/ng_pppoe.4#3 integrate .. //depot/projects/mips/share/man/man4/ng_ubt.4#5 integrate .. //depot/projects/mips/share/man/man4/nsp.4#1 branch .. //depot/projects/mips/share/man/man4/pccbb.4#4 integrate .. //depot/projects/mips/share/man/man4/pcm.4#5 integrate .. //depot/projects/mips/share/man/man4/rl.4#5 integrate .. //depot/projects/mips/share/man/man4/rue.4#3 integrate .. //depot/projects/mips/share/man/man4/sbp.4#8 integrate .. //depot/projects/mips/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/mips/share/man/man4/sis.4#3 integrate .. //depot/projects/mips/share/man/man4/sk.4#3 integrate .. //depot/projects/mips/share/man/man4/stg.4#2 integrate .. //depot/projects/mips/share/man/man4/sym.4#3 integrate .. //depot/projects/mips/share/man/man4/uaudio.4#1 branch .. //depot/projects/mips/share/man/man4/umass.4#10 integrate .. //depot/projects/mips/share/man/man4/uplcom.4#2 integrate .. //depot/projects/mips/share/man/man4/uscanner.4#5 integrate .. //depot/projects/mips/share/man/man4/wi.4#12 integrate .. //depot/projects/mips/share/man/man4/xe.4#2 integrate .. //depot/projects/mips/share/man/man5/make.conf.5#13 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/mips/share/man/man5/resolver.5#2 integrate .. //depot/projects/mips/share/man/man7/build.7#3 integrate .. //depot/projects/mips/share/man/man7/hier.7#8 integrate .. //depot/projects/mips/share/man/man7/ports.7#6 integrate .. //depot/projects/mips/share/man/man9/BUS_SETUP_INTR.9#5 integrate .. //depot/projects/mips/share/man/man9/Makefile#11 integrate .. //depot/projects/mips/share/man/man9/alq.9#1 branch .. //depot/projects/mips/share/man/man9/bus_alloc_resource.9#4 integrate .. //depot/projects/mips/share/man/man9/cr_seeothergids.9#1 branch .. //depot/projects/mips/share/man/man9/cr_seeotheruids.9#1 branch .. //depot/projects/mips/share/man/man9/hexdump.9#1 branch .. //depot/projects/mips/share/man/man9/kobj.9#3 integrate .. //depot/projects/mips/share/man/man9/mbuf.9#8 integrate .. //depot/projects/mips/share/man/man9/mutex.9#5 integrate .. //depot/projects/mips/share/man/man9/p_candebug.9#1 branch .. //depot/projects/mips/share/man/man9/pfind.9#2 integrate .. //depot/projects/mips/share/man/man9/pgfind.9#2 integrate .. //depot/projects/mips/share/man/man9/prison_check.9#1 branch .. //depot/projects/mips/share/man/man9/style.9#9 integrate .. //depot/projects/mips/share/mk/bsd.libnames.mk#8 integrate .. //depot/projects/mips/share/mklocale/Makefile#6 integrate .. //depot/projects/mips/share/mklocale/be_BY.CP1131.src#1 branch .. //depot/projects/mips/share/mklocale/zh_HK.Big5HKSCS.src#1 branch .. //depot/projects/mips/share/monetdef/Makefile#6 integrate .. //depot/projects/mips/share/monetdef/be_BY.CP1131.src#1 branch .. //depot/projects/mips/share/monetdef/be_BY.CP1251.src#1 branch .. //depot/projects/mips/share/monetdef/be_BY.ISO8859-5.src#1 branch .. //depot/projects/mips/share/msgdef/Makefile#6 integrate .. //depot/projects/mips/share/msgdef/be_BY.CP1131.src#1 branch .. //depot/projects/mips/share/msgdef/be_BY.CP1251.src#1 branch .. //depot/projects/mips/share/msgdef/be_BY.ISO8859-5.src#1 branch .. //depot/projects/mips/share/numericdef/Makefile#6 integrate .. //depot/projects/mips/share/numericdef/be_BY.CP1251.src#1 branch .. //depot/projects/mips/share/security/Makefile#2 integrate .. //depot/projects/mips/share/security/Makefile.inc#2 delete .. //depot/projects/mips/share/syscons/fonts/INDEX.fonts#3 integrate .. //depot/projects/mips/share/syscons/fonts/Makefile#3 integrate .. //depot/projects/mips/share/syscons/fonts/swiss-1131-8x16.fnt#1 branch .. //depot/projects/mips/share/syscons/fonts/swiss-1251-8x16.fnt#1 branch .. //depot/projects/mips/share/syscons/keymaps/INDEX.keymaps#4 integrate .. //depot/projects/mips/share/syscons/keymaps/Makefile#5 integrate .. //depot/projects/mips/share/syscons/keymaps/by.cp1131.kbd#1 branch .. //depot/projects/mips/share/syscons/keymaps/by.cp1251.kbd#1 branch .. //depot/projects/mips/share/syscons/keymaps/by.iso5.kbd#1 branch .. //depot/projects/mips/share/timedef/Makefile#6 integrate .. //depot/projects/mips/share/timedef/be_BY.CP1131.src#1 branch .. //depot/projects/mips/share/timedef/be_BY.CP1251.src#1 branch .. //depot/projects/mips/share/timedef/be_BY.ISO8859-5.src#1 branch .. //depot/projects/mips/sys/alpha/alpha/clock.c#4 integrate .. //depot/projects/mips/sys/alpha/alpha/db_trace.c#3 integrate .. //depot/projects/mips/sys/alpha/alpha/dump_machdep.c#4 integrate .. //depot/projects/mips/sys/alpha/alpha/elf_machdep.c#5 integrate .. //depot/projects/mips/sys/alpha/alpha/interrupt.c#5 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#13 integrate .. //depot/projects/mips/sys/alpha/alpha/mp_machdep.c#5 integrate .. //depot/projects/mips/sys/alpha/alpha/vm_machdep.c#10 integrate .. //depot/projects/mips/sys/alpha/conf/GENERIC#12 integrate .. //depot/projects/mips/sys/alpha/conf/GENERIC.hints#4 integrate .. //depot/projects/mips/sys/alpha/include/intr.h#2 integrate .. //depot/projects/mips/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/mips/sys/alpha/include/kse.h#2 delete .. //depot/projects/mips/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/mips/sys/alpha/isa/isa.c#4 integrate .. //depot/projects/mips/sys/alpha/linux/linux_proto.h#4 integrate .. //depot/projects/mips/sys/alpha/linux/linux_syscall.h#4 integrate .. //depot/projects/mips/sys/alpha/linux/linux_sysent.c#4 integrate .. //depot/projects/mips/sys/alpha/linux/linux_sysvec.c#5 integrate .. //depot/projects/mips/sys/alpha/linux/syscalls.conf#2 integrate .. //depot/projects/mips/sys/alpha/linux/syscalls.master#4 integrate .. //depot/projects/mips/sys/alpha/mcbus/mcpcia.c#4 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_mount.c#5 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_proto.h#3 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_syscall.h#3 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_sysent.c#3 integrate .. //depot/projects/mips/sys/alpha/osf1/syscalls.conf#2 integrate .. //depot/projects/mips/sys/alpha/osf1/syscalls.master#3 integrate .. //depot/projects/mips/sys/alpha/pci/apecs.c#3 integrate .. //depot/projects/mips/sys/alpha/pci/cia.c#3 integrate .. //depot/projects/mips/sys/alpha/pci/t2.c#3 integrate .. //depot/projects/mips/sys/alpha/pci/tsunami.c#3 integrate .. //depot/projects/mips/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/mips/sys/amd64/amd64/amd64-gdbstub.c#2 integrate .. //depot/projects/mips/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/mips/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/mips/sys/amd64/amd64/autoconf.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/mips/sys/amd64/amd64/critical.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/mips/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/mips/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/mips/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/mips/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/mips/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/mips/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/mips/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/mips/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/mips/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/mips/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/mips/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/mips/sys/amd64/amd64/sys_machdep.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/mips/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/mips/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/mips/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/mips/sys/amd64/ia32/ia32_sigtramp.S#3 branch .. //depot/projects/mips/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/mips/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/mips/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/mips/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/mips/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/mips/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/mips/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/mips/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/mips/sys/amd64/include/bus_dma.h#3 integrate .. //depot/projects/mips/sys/amd64/include/clock.h#3 integrate .. //depot/projects/mips/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/mips/sys/amd64/include/critical.h#3 integrate .. //depot/projects/mips/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/mips/sys/amd64/include/kse.h#2 delete .. //depot/projects/mips/sys/amd64/include/limits.h#2 integrate .. //depot/projects/mips/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/mips/sys/amd64/include/mptable.h#1 branch .. //depot/projects/mips/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/mips/sys/amd64/include/param.h#3 integrate .. //depot/projects/mips/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/mips/sys/amd64/include/pcvt_ioctl.h#1 branch .. //depot/projects/mips/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/mips/sys/amd64/include/proc.h#2 integrate .. //depot/projects/mips/sys/amd64/include/runq.h#2 integrate .. //depot/projects/mips/sys/amd64/include/segments.h#3 integrate .. //depot/projects/mips/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/mips/sys/amd64/include/smp.h#2 integrate .. //depot/projects/mips/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/mips/sys/amd64/include/tss.h#2 integrate .. //depot/projects/mips/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/mips/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/mips/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/mips/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/mips/sys/amd64/isa/icu_ipl.S#2 delete .. //depot/projects/mips/sys/amd64/isa/icu_vector.S#2 delete .. //depot/projects/mips/sys/amd64/isa/intr_machdep.c#3 delete .. //depot/projects/mips/sys/amd64/isa/intr_machdep.h#2 delete .. //depot/projects/mips/sys/amd64/isa/isa.c#3 integrate .. //depot/projects/mips/sys/amd64/isa/isa_dma.c#3 integrate .. //depot/projects/mips/sys/amd64/isa/ithread.c#3 delete .. //depot/projects/mips/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/mips/sys/amd64/isa/vector.S#3 delete .. //depot/projects/mips/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/mips/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/mips/sys/boot/Makefile#5 integrate .. //depot/projects/mips/sys/boot/efi/include/efiapi.h#3 integrate .. //depot/projects/mips/sys/boot/ficl/Makefile#3 integrate .. //depot/projects/mips/sys/boot/ficl/loader.c#3 integrate .. //depot/projects/mips/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/mips/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/mips/sys/boot/i386/Makefile#3 integrate .. //depot/projects/mips/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/mips/sys/boot/i386/boot0/boot0.s#3 integrate .. //depot/projects/mips/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/mips/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/mips/sys/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/mips/sys/boot/i386/btx/btx/btx.s#3 integrate .. //depot/projects/mips/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/mips/sys/boot/i386/loader/loader.rc#2 integrate .. //depot/projects/mips/sys/boot/ia64/libski/acpi_stub.c#3 integrate .. //depot/projects/mips/sys/boot/ia64/libski/pal_stub.S#2 integrate .. //depot/projects/mips/sys/boot/ia64/skiload/Makefile#4 integrate .. //depot/projects/mips/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/devicename.c#5 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_disk.c#4 integrate .. //depot/projects/mips/sys/boot/pc98/btx/btxldr/btxldr.s#2 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/Makefile#3 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/mips/sys/boot/sparc64/loader/metadata.c#5 integrate .. //depot/projects/mips/sys/cam/cam_periph.c#8 integrate .. //depot/projects/mips/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/mips/sys/coda/coda_psdev.c#4 integrate .. //depot/projects/mips/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/mips/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/mips/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/mips/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/mips/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/mips/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/mips/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/mips/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/mips/sys/compat/ia32/ia32_sigtramp.S#2 delete .. //depot/projects/mips/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/mips/sys/compat/ia32/ia32_util.h#2 integrate .. //depot/projects/mips/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/mips/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/mips/sys/compat/linux/linux_getcwd.c#6 integrate .. //depot/projects/mips/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/mips/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/mips/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/mips/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/mips/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/mips/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/mips/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/mips/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/mips/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/mips/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/mips/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/mips/sys/compat/svr4/svr4_misc.c#8 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/mips/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/mips/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/mips/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/mips/sys/conf/NOTES#20 integrate .. //depot/projects/mips/sys/conf/files#24 integrate .. //depot/projects/mips/sys/conf/files.amd64#3 integrate .. //depot/projects/mips/sys/conf/files.i386#15 integrate .. //depot/projects/mips/sys/conf/files.ia64#12 integrate .. //depot/projects/mips/sys/conf/files.pc98#15 integrate .. //depot/projects/mips/sys/conf/files.sparc64#11 integrate .. //depot/projects/mips/sys/conf/kern.mk#6 integrate .. //depot/projects/mips/sys/conf/kern.post.mk#10 integrate .. //depot/projects/mips/sys/conf/kmod.mk#10 integrate .. //depot/projects/mips/sys/conf/ldscript.i386#5 integrate .. //depot/projects/mips/sys/conf/majors#12 integrate .. //depot/projects/mips/sys/conf/newvers.sh#6 integrate .. //depot/projects/mips/sys/conf/options#22 integrate .. //depot/projects/mips/sys/conf/options.amd64#3 integrate .. //depot/projects/mips/sys/conf/options.i386#11 integrate .. //depot/projects/mips/sys/conf/options.pc98#11 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acdisasm.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acevents.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acexcep.h#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acobject.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acstruct.h#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/actbl.h#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/actbl1.h#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/actypes.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acutils.h#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dbdisply.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dbfileio.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dbstats.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dbutils.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dmresrc.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dmresrcl.c#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsfield.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsinit.c#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsmethod.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsmthdat.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsopcode.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsutils.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dswexec.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dswload.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dswscope.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dswstate.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/evmisc.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/evregion.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/evrgnini.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/evxfregn.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/excreate.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exdump.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exfield.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exfldio.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exmisc.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exmutex.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exoparg1.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exoparg3.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exprep.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exregion.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exresnte.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exresolv.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exresop.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exstoren.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exsystem.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/exutils.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/hwacpi.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/hwsleep.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsaccess.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsalloc.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsdump.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsdumpdv.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsinit.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsobject.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nssearch.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsutils.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/nsxfname.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/psargs.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/psparse.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/psxface.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/rsaddr.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/rscalc.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/rscreate.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/rsdump.c#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/rsirq.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/rslist.c#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/tbconvrt.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/tbget.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/tbgetall.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/tbinstal.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/tbrsdt.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/tbxface.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/utdebug.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/utdelete.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/uteval.c#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/utobject.c#5 integrate .. //depot/projects/mips/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/mips/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 integrate .. //depot/projects/mips/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/mips/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/mips/sys/crypto/rijndael/rijndael-alg-fst.c#3 integrate .. //depot/projects/mips/sys/crypto/rijndael/rijndael-alg-fst.h#3 integrate .. //depot/projects/mips/sys/crypto/rijndael/rijndael-api-fst.c#4 integrate .. //depot/projects/mips/sys/crypto/rijndael/rijndael-api-fst.h#3 integrate .. //depot/projects/mips/sys/crypto/rijndael/rijndael-api.c#1 branch .. //depot/projects/mips/sys/crypto/rijndael/rijndael.h#2 integrate .. //depot/projects/mips/sys/dev/aac/aac.c#11 integrate .. //depot/projects/mips/sys/dev/aac/aac_cam.c#8 integrate .. //depot/projects/mips/sys/dev/acpica/Osd/OsdInterrupt.c#3 integrate .. //depot/projects/mips/sys/dev/acpica/acpi.c#12 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_cmbat.c#5 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_package.c#1 branch .. //depot/projects/mips/sys/dev/acpica/acpi_pci_link.c#7 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pcib.c#5 integrate .. //depot/projects/mips/sys/dev/acpica/acpivar.h#8 integrate .. //depot/projects/mips/sys/dev/acpica/madt.h#2 delete .. //depot/projects/mips/sys/dev/aha/aha.c#9 integrate .. //depot/projects/mips/sys/dev/aha/aha_isa.c#5 integrate .. //depot/projects/mips/sys/dev/aha/aha_mca.c#5 integrate .. //depot/projects/mips/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/mips/sys/dev/aic7xxx/ahc_eisa.c#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/ahc_pci.c#6 integrate .. //depot/projects/mips/sys/dev/aic7xxx/ahd_pci.c#7 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7770.c#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx.c#9 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx.seq#7 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx_inline.h#8 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx_osm.c#8 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx_pci.c#8 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx.c#6 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx.h#6 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx.reg#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx.seq#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx_93cx6.c#3 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx_inline.h#4 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx_osm.c#7 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic7xxx_pci.c#6 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic_osm_lib.c#1 branch .. //depot/projects/mips/sys/dev/aic7xxx/aic_osm_lib.h#1 branch .. //depot/projects/mips/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/mips/sys/dev/an/if_an.c#10 integrate .. //depot/projects/mips/sys/dev/an/if_anreg.h#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/mips/sys/dev/ata/ata-card.c#9 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/mips/sys/dev/ata/ata-disk.c#12 integrate .. //depot/projects/mips/sys/dev/ata/ata-dma.c#8 integrate .. //depot/projects/mips/sys/dev/ata/ata-isa.c#7 integrate .. //depot/projects/mips/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/mips/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/mips/sys/dev/ata/ata-raid.c#10 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cd.c#10 integrate .. //depot/projects/mips/sys/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/mips/sys/dev/ata/atapi-tape.c#9 integrate .. //depot/projects/mips/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/mips/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/mips/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/mips/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/mips/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/mips/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/mips/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_audio.c#4 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_card.c#4 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_core.c#5 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_os.h#2 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_reg.h#3 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_tuner.c#3 integrate .. //depot/projects/mips/sys/dev/bktr/ioctl_bt848.h#1 branch .. //depot/projects/mips/sys/dev/bktr/ioctl_meteor.h#1 branch .. //depot/projects/mips/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/mips/sys/dev/ciss/ciss.c#12 integrate .. //depot/projects/mips/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/mips/sys/dev/cx/cronyxfw.h#1 branch .. //depot/projects/mips/sys/dev/cx/csigma.c#1 branch .. //depot/projects/mips/sys/dev/cx/csigmafw.h#1 branch .. //depot/projects/mips/sys/dev/cx/cxddk.c#1 branch .. //depot/projects/mips/sys/dev/cx/cxddk.h#1 branch .. //depot/projects/mips/sys/dev/cx/cxreg.h#1 branch .. //depot/projects/mips/sys/dev/cx/if_cx.c#1 branch .. //depot/projects/mips/sys/dev/cx/machdep.h#1 branch .. //depot/projects/mips/sys/dev/cx/ng_cx.h#1 branch .. //depot/projects/mips/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/mips/sys/dev/dgb/dgb.c#5 delete .. //depot/projects/mips/sys/dev/dgb/dgbios.h#2 delete .. //depot/projects/mips/sys/dev/dgb/dgfep.h#2 delete .. //depot/projects/mips/sys/dev/dgb/dgreg.h#3 delete .. //depot/projects/mips/sys/dev/drm/drm.h#4 integrate .. //depot/projects/mips/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/mips/sys/dev/drm/drm_bufs.h#5 integrate .. //depot/projects/mips/sys/dev/drm/drm_dma.h#5 integrate .. //depot/projects/mips/sys/dev/drm/drm_drv.h#7 integrate .. //depot/projects/mips/sys/dev/drm/drm_fops.h#6 integrate .. //depot/projects/mips/sys/dev/drm/drm_ioctl.h#5 integrate .. //depot/projects/mips/sys/dev/drm/drm_irq.h#2 integrate .. //depot/projects/mips/sys/dev/drm/drm_os_freebsd.h#5 integrate .. //depot/projects/mips/sys/dev/drm/mga_dma.c#5 integrate .. //depot/projects/mips/sys/dev/drm/r128_cce.c#5 integrate .. //depot/projects/mips/sys/dev/drm/radeon.h#5 integrate .. //depot/projects/mips/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/mips/sys/dev/drm/radeon_drm.h#5 integrate .. //depot/projects/mips/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/mips/sys/dev/drm/radeon_state.c#5 integrate .. //depot/projects/mips/sys/dev/ed/if_ed.c#8 integrate .. //depot/projects/mips/sys/dev/em/if_em.c#11 integrate .. //depot/projects/mips/sys/dev/em/if_em.h#8 integrate .. //depot/projects/mips/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/mips/sys/dev/em/if_em_hw.h#7 integrate .. //depot/projects/mips/sys/dev/en/midway.c#9 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 25 13:45:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCE2216A4D0; Thu, 25 Dec 2003 13:45:07 -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 9654C16A4CE for ; Thu, 25 Dec 2003 13:45:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0ED2D43D49 for ; Thu, 25 Dec 2003 13:45:04 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPLj30B011828 for ; Thu, 25 Dec 2003 13:45:03 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPLj2UC011825 for perforce@freebsd.org; Thu, 25 Dec 2003 13:45:02 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 13:45:02 -0800 (PST) Message-Id: <200312252145.hBPLj2UC011825@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 44315 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, 25 Dec 2003 21:45:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=44315 Change 44315 by jmallett@jmallett_oingo on 2003/12/25 13:44:51 Sync with vendor... Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/5400.md#1 add .. //depot/projects/mips/contrib/gcc/config/mips/5500.md#1 add .. //depot/projects/mips/contrib/gcc/config/mips/_tilib.c#1 add .. //depot/projects/mips/contrib/gcc/config/mips/abi64.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/bsd-4.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/bsd-5.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/crtn.asm#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/dbxmdebug.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/dec-bsd.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/dec-osf1.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/ecoff.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/ecoffl.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/elf.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/elf64.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/elfl.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/elfl64.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/elflorion.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/iris3.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris4loser.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/iris5.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris5gas.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris6-o32-as.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/iris6-o32-gas.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/iris6-o32.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/iris6.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/iris6gld.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/isa32-linux.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/isa3264.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/linux.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/little.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/mips-5.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/mips-protos.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/mips.c#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/mips.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/mips.md#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/netbsd.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/news4.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/news5.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/nws3250v4.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/openbsd.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/osfrose.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/r3900.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/rtems.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/rtems64.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/sni-gas.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/sni-svr4.h#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/sr71k.md#1 add .. //depot/projects/mips/contrib/gcc/config/mips/svr3-4.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/svr3-5.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/svr4-4.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/svr4-5.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/svr4-t.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-bsd#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-bsd-gas#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-ecoff#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-elf#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-gofast#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-iris5-6#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-iris5-as#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-iris5-gas#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-iris6#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-isa3264#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-linux#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-mips#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-netbsd#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-r3900#3 edit .. //depot/projects/mips/contrib/gcc/config/mips/t-rtems#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-sr71k#1 add .. //depot/projects/mips/contrib/gcc/config/mips/t-svr3#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-svr3-gas#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-svr4#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-svr4-gas#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-ultrix#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/t-vr#1 add .. //depot/projects/mips/contrib/gcc/config/mips/ultrix.h#3 delete .. //depot/projects/mips/contrib/gcc/config/mips/vr.h#1 add .. //depot/projects/mips/contrib/gcc/config/mips/vxworks.h#3 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/crtn.asm#3 (text+ko) ==== @@ -1,39 +1,29 @@ /* 4 slots for argument spill area. 1 for cpreturn, 1 for stack. Return spill offset of 40 and 20. Aligned to 16 bytes for n32. */ - .section .init,"ax",@progbits #ifdef __mips16 -/* The mips16 uses $7 for a return address. We use that here too. */ - lw $7,20($sp) - addu $sp,$sp,32 +#define RA $7 +#else +#define RA $31 +#endif - j $7 -#else + .section .init,"ax",@progbits #ifdef __mips64 - ld $31,40($sp) + ld RA,40($sp) daddu $sp,$sp,48 #else - lw $31,20($sp) + lw RA,20($sp) addu $sp,$sp,32 #endif - j $31 + j RA -#endif - .section .fini,"ax",@progbits -#ifdef __mips16 -/* The mips16 uses $7 for a return address. We use that here too. */ - lw $7,20($sp) - addu $sp,$sp,32 - - j $7 -#else #ifdef __mips64 - ld $31,40($sp) + ld RA,40($sp) daddu $sp,$sp,48 #else - lw $31,20($sp) + lw RA,20($sp) addu $sp,$sp,32 #endif - j $31 -#endif + j RA + ==== //depot/projects/mips/contrib/gcc/config/mips/elf.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. MIPS R3000 version with GOFAST floating point library. - Copyright (C) 1994, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1994, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -20,59 +20,38 @@ Boston, MA 02111-1307, USA. */ /* Use ELF. */ -#define OBJECT_FORMAT_ELF +#undef OBJECT_FORMAT_COFF +#undef EXTENDED_COFF -/* All ELF targets can support DWARF-2. */ +/* ??? Move all SDB stuff into separate header file. */ +#undef SDB_DEBUGGING_INFO -#ifndef DWARF2_DEBUGGING_INFO +#define DBX_DEBUGGING_INFO 1 #define DWARF2_DEBUGGING_INFO 1 -#endif -/* Until we figure out what MIPS ELF targets normally use, just do - stabs in ELF. */ -#ifndef PREFERRED_DEBUGGING_TYPE -#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG -#endif +#undef PREFERRED_DEBUGGING_TYPE +#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -/* Mostly like ECOFF. */ -#include "gofast.h" -#include "mips/ecoff.h" - -/* We need to use .esize and .etype instead of .size and .type to - avoid conflicting with ELF directives. */ -#undef PUT_SDB_SIZE -#define PUT_SDB_SIZE(a) \ -do { \ - extern FILE *asm_out_text_file; \ - fprintf (asm_out_text_file, "\t.esize\t"); \ - fprintf (asm_out_text_file, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT) (a)); \ - fprintf (asm_out_text_file, ";"); \ -} while (0) - -#undef PUT_SDB_TYPE -#define PUT_SDB_TYPE(a) \ -do { \ - extern FILE *asm_out_text_file; \ - fprintf (asm_out_text_file, "\t.etype\t0x%x;", (a)); \ -} while (0) +#undef SUBTARGET_ASM_DEBUGGING_SPEC +#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0" /* Biggest alignment supported by the object file format of this machine. Use this macro to limit the alignment which can be specified using the `__attribute__ ((aligned (N)))' construct. If not defined, the default value is `BIGGEST_ALIGNMENT'. */ -#undef MAX_OFILE_ALIGNMENT +#undef MAX_OFILE_ALIGNMENT #define MAX_OFILE_ALIGNMENT (32768*8) /* Switch into a generic section. */ -#undef TARGET_ASM_NAMED_SECTION +#undef TARGET_ASM_NAMED_SECTION #define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section /* Given that Irix has it's own headers, not having TARGET_GAS here seems a mistake. If we actually need to be prepared for file switching, then we need a custom TARGET_ASM_NAMED_SECTION too. */ -#undef TEXT_SECTION +#undef TEXT_SECTION #define TEXT_SECTION() \ do { \ if (TARGET_FILE_SWITCHING) \ @@ -126,7 +105,7 @@ #ifndef ASM_OUTPUT_ALIGNED_BSS #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ do { \ - ASM_GLOBALIZE_LABEL (FILE, NAME); \ + (*targetm.asm_out.globalize_label) (FILE, NAME); \ if (SIZE > 0 && SIZE <= mips_section_threshold) \ sbss_section (); \ else \ @@ -145,24 +124,17 @@ /* Write the extra assembler code needed to declare an object properly. */ -#undef ASM_DECLARE_OBJECT_NAME +#undef ASM_DECLARE_OBJECT_NAME #define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL) \ do { \ - fprintf (FILE, "%s", TYPE_ASM_OP); \ - assemble_name (FILE, NAME); \ - putc (',', FILE); \ - fprintf (FILE, TYPE_OPERAND_FMT, "object"); \ - putc ('\n', FILE); \ + HOST_WIDE_INT size; \ + ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \ size_directive_output = 0; \ if (!flag_inhibit_size_directive && DECL_SIZE (DECL)) \ { \ size_directive_output = 1; \ - fprintf (FILE, "%s", SIZE_ASM_OP); \ - assemble_name (FILE, NAME); \ - fprintf (FILE, ","); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, \ - int_size_in_bytes (TREE_TYPE (DECL))); \ - fprintf (FILE, "\n"); \ + size = int_size_in_bytes (TREE_TYPE (DECL)); \ + ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size); \ } \ mips_declare_object (FILE, NAME, "", ":\n", 0); \ } while (0) @@ -173,22 +145,20 @@ size_directive_output was set by ASM_DECLARE_OBJECT_NAME when it was run for the same decl. */ -#undef ASM_FINISH_DECLARE_OBJECT +#undef ASM_FINISH_DECLARE_OBJECT #define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END) \ do { \ const char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0); \ + HOST_WIDE_INT size; \ + \ if (!flag_inhibit_size_directive && DECL_SIZE (DECL) \ && ! AT_END && TOP_LEVEL \ && DECL_INITIAL (DECL) == error_mark_node \ && !size_directive_output) \ { \ size_directive_output = 1; \ - fprintf (FILE, "%s", SIZE_ASM_OP); \ - assemble_name (FILE, name); \ - fprintf (FILE, ","); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, \ - int_size_in_bytes (TREE_TYPE (DECL))); \ - fprintf (FILE, "\n"); \ + size = int_size_in_bytes (TREE_TYPE (DECL)); \ + ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size); \ } \ } while (0) @@ -207,7 +177,7 @@ but until that support is generally available, the 'if' below should serve. */ -#undef ASM_WEAKEN_LABEL +#undef ASM_WEAKEN_LABEL #define ASM_WEAKEN_LABEL(FILE,NAME) ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,0) #define ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,VALUE) \ do { \ @@ -225,20 +195,18 @@ } while (0) #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) -#undef UNIQUE_SECTION -#define UNIQUE_SECTION(DECL,RELOC) \ - mips_unique_section ((DECL), (RELOC)) + +#define TARGET_ASM_UNIQUE_SECTION mips_unique_section /* A list of other sections which the compiler might be "in" at any given time. */ -#undef EXTRA_SECTIONS -#define EXTRA_SECTIONS in_sdata, in_sbss, in_rdata +#undef EXTRA_SECTIONS +#define EXTRA_SECTIONS in_sdata, in_sbss -#undef EXTRA_SECTION_FUNCTIONS +#undef EXTRA_SECTION_FUNCTIONS #define EXTRA_SECTION_FUNCTIONS \ SECTION_FUNCTION_TEMPLATE(sdata_section, in_sdata, SDATA_SECTION_ASM_OP) \ - SECTION_FUNCTION_TEMPLATE(sbss_section, in_sbss, SBSS_SECTION_ASM_OP) \ - SECTION_FUNCTION_TEMPLATE(rdata_section, in_rdata, RDATA_SECTION_ASM_OP) + SECTION_FUNCTION_TEMPLATE(sbss_section, in_sbss, SBSS_SECTION_ASM_OP) #define SECTION_FUNCTION_TEMPLATE(FN, ENUM, OP) \ void FN () \ @@ -262,11 +230,19 @@ #define FINI_SECTION_ASM_OP "\t.section\t.fini" /* Don't set the target flags, this is done by the linker script */ -#undef LIB_SPEC +#undef LIB_SPEC #define LIB_SPEC "" #undef STARTFILE_SPEC +#if defined(HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES) \ + || (MIPS_ABI_DEFAULT == ABI_MEABI) +#define STARTFILE_SPEC "crti%O%s crtbegin%O%s" +#else #define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0:crt0%O%s}" +#endif #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend%O%s crtn%O%s" + +/* We support #pragma. */ +#define HANDLE_SYSV_PRAGMA 1 ==== //depot/projects/mips/contrib/gcc/config/mips/elf64.h#3 (text+ko) ==== @@ -1,6 +1,7 @@ /* Definitions of target machine for GNU compiler. MIPS R4000 version with GOFAST floating point library. - Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2002 + Free Software Foundation, Inc. This file is part of GNU CC. @@ -19,38 +20,18 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define OBJECT_FORMAT_ELF +#undef OBJECT_FORMAT_COFF +#undef EXTENDED_COFF -/* Default to -mips3. */ -#define TARGET_DEFAULT MASK_FLOAT64|MASK_64BIT -#define MIPS_ISA_DEFAULT 3 +#undef SDB_DEBUGGING_INFO +#define DBX_DEBUGGING_INFO 1 +#define DWARF2_DEBUGGING_INFO 1 -/* This should change to n32 when it is supported in gas. */ -#define MIPS_ABI_DEFAULT ABI_O64 +#undef PREFERRED_DEBUGGING_TYPE +#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -/* Until we figure out what MIPS ELF targets normally use, just do - stabs in ELF. */ -#ifndef PREFERRED_DEBUGGING_TYPE -#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG -#endif - -/* US Software GOFAST library support. */ -#include "gofast.h" -#define INIT_SUBTARGET_OPTABS INIT_GOFAST_OPTABS - -#include "mips/mips.h" - -#undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Dmips -DMIPSEB -DR4000 -D_mips -D_MIPSEB -D_R4000" - -/* I would rather put this in CPP_PREDEFINES, but the gcc driver - doesn't handle -U options in CPP_PREDEFINES. */ -#undef SUBTARGET_CPP_SPEC -#define SUBTARGET_CPP_SPEC "\ -%{!mips1:%{!mips2:-U__mips -D__mips=3 -D__mips64}}" - -/* Use memcpy, et. al., rather than bcopy. */ -#define TARGET_MEM_FUNCTIONS +#undef SUBTARGET_ASM_DEBUGGING_SPEC +#define SUBTARGET_ASM_DEBUGGING_SPEC "-g0" /* Biggest alignment supported by the object file format of this machine. Use this macro to limit the alignment which can be @@ -60,24 +41,6 @@ #undef MAX_OFILE_ALIGNMENT #define MAX_OFILE_ALIGNMENT (32768*8) -/* We need to use .esize and .etype instead of .size and .type to - avoid conflicting with ELF directives. */ -#undef PUT_SDB_SIZE -#define PUT_SDB_SIZE(a) \ -do { \ - extern FILE *asm_out_text_file; \ - fprintf (asm_out_text_file, "\t.esize\t"); \ - fprintf (asm_out_text_file, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT) (a)); \ - fprintf (asm_out_text_file, ";"); \ -} while (0) - -#undef PUT_SDB_TYPE -#define PUT_SDB_TYPE(a) \ -do { \ - extern FILE *asm_out_text_file; \ - fprintf (asm_out_text_file, "\t.etype\t0x%x;", (a)); \ -} while (0) - /* Switch into a generic section. */ #undef TARGET_ASM_NAMED_SECTION #define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section @@ -124,21 +87,14 @@ #undef ASM_DECLARE_OBJECT_NAME #define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL) \ do { \ - fprintf (FILE, "%s", TYPE_ASM_OP); \ - assemble_name (FILE, NAME); \ - putc (',', FILE); \ - fprintf (FILE, TYPE_OPERAND_FMT, "object"); \ - putc ('\n', FILE); \ + HOST_WIDE_INT size; \ + ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \ size_directive_output = 0; \ if (!flag_inhibit_size_directive && DECL_SIZE (DECL)) \ { \ size_directive_output = 1; \ - fprintf (FILE, "%s", SIZE_ASM_OP); \ - assemble_name (FILE, NAME); \ - fprintf (FILE, ","); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, \ - int_size_in_bytes (TREE_TYPE (DECL))); \ - fprintf (FILE, "\n"); \ + size = int_size_in_bytes (TREE_TYPE (DECL)); \ + ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size); \ } \ mips_declare_object (FILE, NAME, "", ":\n", 0); \ } while (0) @@ -153,18 +109,15 @@ #define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END) \ do { \ const char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0); \ + HOST_WIDE_INT size; \ if (!flag_inhibit_size_directive && DECL_SIZE (DECL) \ && ! AT_END && TOP_LEVEL \ && DECL_INITIAL (DECL) == error_mark_node \ && !size_directive_output) \ { \ size_directive_output = 1; \ - fprintf (FILE, "%s", SIZE_ASM_OP); \ - assemble_name (FILE, name); \ - fprintf (FILE, ","); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, \ - int_size_in_bytes (TREE_TYPE (DECL))); \ - fprintf (FILE, "\n"); \ + size = int_size_in_bytes (TREE_TYPE (DECL)); \ + ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size); \ } \ } while (0) @@ -201,82 +154,17 @@ } while (0) #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) -#undef UNIQUE_SECTION -#define UNIQUE_SECTION(DECL,RELOC) \ -do { \ - int len, size, sec; \ - const char *name, *prefix; \ - char *string; \ - static const char *const prefixes[4][2] = { \ - { ".text.", ".gnu.linkonce.t." }, \ - { ".rodata.", ".gnu.linkonce.r." }, \ - { ".data.", ".gnu.linkonce.d." }, \ - { ".sdata.", ".gnu.linkonce.s." } \ - }; \ - \ - name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (DECL)); \ - size = int_size_in_bytes (TREE_TYPE (decl)); \ - \ - /* Determine the base section we are interested in: \ - 0=text, 1=rodata, 2=data, 3=sdata, [4=bss]. */ \ - if (TREE_CODE (DECL) == FUNCTION_DECL) \ - sec = 0; \ - else if (DECL_INITIAL (DECL) == 0 \ - || DECL_INITIAL (DECL) == error_mark_node) \ - sec = 2; \ - else if ((TARGET_EMBEDDED_PIC || TARGET_MIPS16) \ - && TREE_CODE (decl) == STRING_CST \ - && !flag_writable_strings) \ - { \ - /* For embedded position independent code, put constant strings \ - in the text section, because the data section is limited to \ - 64K in size. For mips16 code, put strings in the text \ - section so that a PC relative load instruction can be used to \ - get their address. */ \ - sec = 0; \ - } \ - else if (TARGET_EMBEDDED_DATA) \ - { \ - /* For embedded applications, always put an object in read-only data \ - if possible, in order to reduce RAM usage. */ \ - \ - if (DECL_READONLY_SECTION (DECL, RELOC)) \ - sec = 1; \ - else if (size > 0 && size <= mips_section_threshold) \ - sec = 3; \ - else \ - sec = 2; \ - } \ - else \ - { \ - /* For hosted applications, always put an object in small data if \ - possible, as this gives the best performance. */ \ - \ - if (size > 0 && size <= mips_section_threshold) \ - sec = 3; \ - else if (DECL_READONLY_SECTION (DECL, RELOC)) \ - sec = 1; \ - else \ - sec = 2; \ - } \ - \ - prefix = prefixes[sec][DECL_ONE_ONLY (DECL)]; \ - len = strlen (name) + strlen (prefix); \ - string = alloca (len + 1); \ - sprintf (string, "%s%s", prefix, name); \ - \ - DECL_SECTION_NAME (DECL) = build_string (len, string); \ -} while (0) + +#define TARGET_ASM_UNIQUE_SECTION mips_unique_section /* A list of other sections which the compiler might be "in" at any given time. */ #undef EXTRA_SECTIONS -#define EXTRA_SECTIONS in_sdata, in_rdata +#define EXTRA_SECTIONS in_sdata #undef EXTRA_SECTION_FUNCTIONS #define EXTRA_SECTION_FUNCTIONS \ - SECTION_FUNCTION_TEMPLATE(sdata_section, in_sdata, SDATA_SECTION_ASM_OP) \ - SECTION_FUNCTION_TEMPLATE(rdata_section, in_rdata, RDATA_SECTION_ASM_OP) + SECTION_FUNCTION_TEMPLATE(sdata_section, in_sdata, SDATA_SECTION_ASM_OP) #define SECTION_FUNCTION_TEMPLATE(FN, ENUM, OP) \ void FN () \ @@ -304,7 +192,15 @@ #define LIB_SPEC "" #undef STARTFILE_SPEC +#if defined(HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES) \ + || (MIPS_ABI_DEFAULT == ABI_MEABI) +#define STARTFILE_SPEC "crti%O%s crtbegin%O%s" +#else #define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0:crt0%O%s}" +#endif #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend%O%s crtn%O%s" + +/* We support #pragma. */ +#define HANDLE_SYSV_PRAGMA 1 ==== //depot/projects/mips/contrib/gcc/config/mips/iris3.h#3 (text+ko) ==== @@ -21,16 +21,16 @@ #define SGI_TARGET 1 /* inform other mips files this is SGI */ /* Names to predefine in the preprocessor for this target machine. */ - +/* Temporarily #if 0'd until Irix header consolidation. */ +#if 0 #define CPP_PREDEFINES "\ -Dunix -Dmips -Dsgi -DSVR3 -Dhost_mips -DMIPSEB -DSYSTYPE_SYSV \ -Asystem=unix -Asystem=svr3 -Acpu=mips -Amachine=mips" - -#define STARTFILE_SPEC "%{pg:gcrt1.o%s}%{!pg:%{p:mcrt1.o%s}%{!p:crt1.o%s}}" - #define SUBTARGET_CPP_SPEC "\ %{!ansi:-D__EXTENSIONS__} -D_MIPSEB -D_SYSTYPE_SYSV" +#endif +#define STARTFILE_SPEC "%{pg:gcrt1.o%s}%{!pg:%{p:mcrt1.o%s}%{!p:crt1.o%s}}" #define LIB_SPEC \ "%{!p:%{!pg:%{!static:%{!g*:-lc_s}} -lc}}%{p:-lc_p}%{pg:-lc_p} crtn.o%s" @@ -65,8 +65,5 @@ #define WCHAR_TYPE "unsigned char" #define WCHAR_TYPE_SIZE BITS_PER_UNIT -/* Generate calls to memcpy, etc., not bcopy, etc. */ -#define TARGET_MEM_FUNCTIONS - /* Plain char is unsigned in the SGI compiler. */ #define DEFAULT_SIGNED_CHAR 0 ==== //depot/projects/mips/contrib/gcc/config/mips/iris5.h#3 (text+ko) ==== @@ -62,30 +62,46 @@ (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) \ || !strcmp (STR, "rpath")) +#define TARGET_OS_CPP_BUILTINS() \ + do { \ + builtin_define_std ("host_mips"); \ + builtin_define_std ("sgi"); \ + builtin_define_std ("unix"); \ + builtin_define_std ("SYSTYPE_SVR4"); \ + builtin_define ("_MODERN_C"); \ + builtin_define ("_SVR4_SOURCE"); \ + builtin_define ("__DSO__"); \ + builtin_define ("_MIPS_SIM=_MIPS_SIM_ABI32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("system=svr4"); \ + builtin_assert ("machine=sgi"); \ + \ + if (!TARGET_FLOAT64) \ + builtin_define ("_MIPS_FPSET=16"); \ + else \ + builtin_define ("_MIPS_FPSET=32"); \ + \ + if (!TARGET_INT64) \ + builtin_define ("_MIPS_SZINT=32"); \ + else \ + builtin_define ("_MIPS_SZINT=64"); \ + \ + if (!TARGET_LONG64) \ + builtin_define ("_MIPS_SZLONG=32"); \ + else \ + builtin_define ("_MIPS_SZLONG=64"); \ + \ + if (!flag_iso) \ + { \ + builtin_define ("__EXTENSIONS__"); \ + builtin_define ("_SGI_SOURCE"); \ + } \ +} while (0); + #undef SUBTARGET_CC1_SPEC #define SUBTARGET_CC1_SPEC "%{static: -mno-abicalls}" -/* ??? _MIPS_SIM and _MIPS_SZPTR should eventually depend on options when - options for them exist. */ - -#undef CPP_PREDEFINES -#define CPP_PREDEFINES \ - "-Dunix -Dmips -Dsgi -Dhost_mips -DMIPSEB -D_MIPSEB -DSYSTYPE_SVR4 \ - -D_SVR4_SOURCE -D_MODERN_C -D__DSO__ \ - -D_MIPS_SIM=_MIPS_SIM_ABI32 -D_MIPS_SZPTR=32 \ - -Asystem=unix -Asystem=svr4 -Acpu=mips -Amachine=sgi" - -#undef SUBTARGET_CPP_SPEC -#define SUBTARGET_CPP_SPEC "\ -%{!ansi:-D__EXTENSIONS__ -D_SGI_SOURCE -D_LONGLONG} \ -%{!mfp64: -D_MIPS_FPSET=16}%{mfp64: -D_MIPS_FPSET=32} \ -%{mips1: -D_MIPS_ISA=_MIPS_ISA_MIPS1} \ -%{mips2: -D_MIPS_ISA=_MIPS_ISA_MIPS2} \ -%{mips3: -D_MIPS_ISA=_MIPS_ISA_MIPS3} \ -%{!mips1: %{!mips2: %{!mips3: -D_MIPS_ISA=_MIPS_ISA_MIPS1}}} \ -%{!mint64: -D_MIPS_SZINT=32}%{mint64: -D_MIPS_SZINT=64} \ -%{!mlong64: -D_MIPS_SZLONG=32}%{mlong64: -D_MIPS_SZLONG=64}" - #undef LINK_SPEC #define LINK_SPEC "\ %{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \ @@ -174,7 +190,7 @@ #define ASM_OUTPUT_WEAK_ALIAS(FILE, NAME, VALUE) \ do \ { \ - ASM_GLOBALIZE_LABEL (FILE, NAME); \ + (*targetm.asm_out.globalize_label) (FILE, NAME); \ fputs ("\t.weakext\t", FILE); \ assemble_name (FILE, NAME); \ if (VALUE) \ @@ -189,5 +205,4 @@ #define ASM_WEAKEN_LABEL(FILE, NAME) ASM_OUTPUT_WEAK_ALIAS(FILE, NAME, 0) /* Handle #pragma weak and #pragma pack. */ -#undef HANDLE_SYSV_PRAGMA #define HANDLE_SYSV_PRAGMA 1 ==== //depot/projects/mips/contrib/gcc/config/mips/iris5gas.h#3 (text+ko) ==== @@ -1,15 +1,50 @@ /* Definitions of target machine for GNU compiler. Irix version 5 with gas. */ /* Enable debugging. */ -#define DBX_DEBUGGING_INFO -#define SDB_DEBUGGING_INFO -#define MIPS_DEBUGGING_INFO -#define PREFERRED_DEBUGGING_TYPE SDB_DEBUG +#define DBX_DEBUGGING_INFO 1 +#define DWARF2_DEBUGGING_INFO 1 +#define SDB_DEBUGGING_INFO 1 +#define MIPS_DEBUGGING_INFO 1 +#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG /* GNU as does handle DWARF2 directives. */ #undef DWARF2_UNWIND_INFO #define DWARF2_UNWIND_INFO 1 +/* Override mips.h version to match DWARF 2 default. */ +#undef MDEBUG_ASM_SPEC +#define MDEBUG_ASM_SPEC "%{gstabs*|gcoff*:-mdebug} \ +%{!gstabs*:%{!gcoff*:-no-mdebug}}" + +/* Override iris5.h version to invoke [cd]tors and register eh frame + information. */ +#undef LINK_SPEC +#define LINK_SPEC "\ +%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \ +%{bestGnum} %{shared} %{non_shared} \ +%{call_shared} %{no_archive} %{exact_version} \ +%{static: -non_shared} \ +%{!static: \ + %{!shared:%{!non_shared:%{!call_shared: -call_shared -no_unresolved}}}} \ +%{rpath} -init __do_global_ctors -fini __do_global_dtors \ +%{shared:-hidden_symbol __do_global_ctors,__do_global_ctors_1,__do_global_dtors} \ +-_SYSTYPE_SVR4" + +/* Override iris5.h versions to include crtbegin.o and crtend.o. */ + +#undef STARTFILE_SPEC +#define STARTFILE_SPEC "\ +%{!static: \ + %{!shared:%{pg:gcrt1.o%s}%{!pg:%{p:mcrt1.o%s libprof1.a%s}%{!p:crt1.o%s}}}} \ +%{static: \ + %{pg:gcrt1.o%s} \ + %{!pg:%{p:/usr/lib/nonshared/mcrt1.o%s libprof1.a%s} \ + %{!p:/usr/lib/nonshared/crt1.o%s}}} \ +crtbegin.o%s" + +#undef ENDFILE_SPEC +#define ENDFILE_SPEC "crtend.o%s %{!shared:crtn.o%s}" + /* Irix 5 does not have some strange restrictions that Irix 3 had. */ #undef SET_FILE_NUMBER #define SET_FILE_NUMBER() ++num_source_filenames @@ -34,3 +69,16 @@ extern FILE *asm_out_text_file; \ fprintf (asm_out_text_file, "\t.etype\t0x%x;", (a)); \ } while (0) + +/* Switch into a generic section. */ +#undef TARGET_ASM_NAMED_SECTION +#define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section + +/* Add -g to mips.h default to avoid confusing gas with local symbols + generated from stabs info. */ +#undef NM_FLAGS +#define NM_FLAGS "-Bng" + +/* Disable SHF_MERGE support. Even if gas supports it, the IRIX ld does not + without a special elspec(5) file. */ +#undef HAVE_GAS_SHF_MERGE ==== //depot/projects/mips/contrib/gcc/config/mips/iris6.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /* Definitions of target machine for GNU compiler. Iris version 6. - Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. This file is part of GNU CC. @@ -31,7 +32,6 @@ #endif #include "mips/iris5.h" -#include "mips/abi64.h" /* Irix6 assembler does handle DWARF2 directives. Override setting in irix5.h file. */ @@ -44,8 +44,6 @@ /* wchar_t is defined differently with and without -mabi=64. */ -#define NO_BUILTIN_WCHAR_TYPE - #undef WCHAR_TYPE #define WCHAR_TYPE (Pmode == DImode ? "int" : "long int") @@ -54,8 +52,6 @@ /* Same for wint_t. */ -#define NO_BUILTIN_WINT_TYPE - #undef WINT_TYPE #define WINT_TYPE (Pmode == DImode ? "int" : "long int") @@ -72,73 +68,86 @@ system header files require it. This is OK, because gcc never warns when long long is used in system header files. Alternatively, we can add support for the SGI builtin type __long_long. */ -#undef CPP_PREDEFINES -#define CPP_PREDEFINES \ - "-Dunix -Dmips -Dsgi -Dhost_mips -DMIPSEB -D_MIPSEB -DSYSTYPE_SVR4 \ - -D_LONGLONG -D_SVR4_SOURCE -D_MODERN_C -D__DSO__ \ - -Asystem=unix -Asystem=svr4 -Acpu=mips -Amachine=sgi" -#undef SUBTARGET_CPP_SIZE_SPEC -#define SUBTARGET_CPP_SIZE_SPEC "\ -%{mabi=32|mabi=n32: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int \ --D__WCHAR_TYPE__=long\\ int -D__WINT_TYPE__=long\\ int} \ -%{mabi=64: -D__SIZE_TYPE__=long\\ unsigned\\ int -D__PTRDIFF_TYPE__=long\\ int \ --D__WCHAR_TYPE__=int -D__WINT_TYPE__=int} \ -%{!mabi*: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int \ --D__WCHAR_TYPE__=long\\ int -D__WINT_TYPE__=long\\ int}" +/* The GNU C++ standard library requires that __EXTENSIONS__ and + _SGI_SOURCE be defined on at least irix6.2 and probably all IRIX 6 + prior to 6.5. They normally get defined if !ansi, for g++ we want + them regardless. We don't need this on IRIX 6.5 itself, but it + shouldn't hurt other than the namespace pollution. */ -/* We must make -mips3 do what -mlong64 used to do. */ -/* ??? If no mipsX option given, but a mabi=X option is, then should set - _MIPS_ISA based on the mabi=X option. */ -/* ??? If no mabi=X option give, but a mipsX option is, then should set - _MIPS_SIM based on the mipsX option. */ -/* ??? Same for _MIPS_SZINT. */ -/* ??? Same for _MIPS_SZPTR. */ -/* ??? Same for __SIZE_TYPE and __PTRDIFF_TYPE. */ -#undef SUBTARGET_CPP_SPEC -#define SUBTARGET_CPP_SPEC "\ -%{!ansi:-D__EXTENSIONS__ -D_SGI_SOURCE} \ -%{mfp32: -D_MIPS_FPSET=16}%{!mfp32: -D_MIPS_FPSET=32} \ -%{mips1: -D_MIPS_ISA=_MIPS_ISA_MIPS1} \ -%{mips2: -D_MIPS_ISA=_MIPS_ISA_MIPS2} \ -%{mips3: -D_MIPS_ISA=_MIPS_ISA_MIPS3} \ -%{mips4: -D_MIPS_ISA=_MIPS_ISA_MIPS4} \ -%{!mips*: -D_MIPS_ISA=_MIPS_ISA_MIPS3} \ -%{mabi=32: -D_MIPS_SIM=_MIPS_SIM_ABI32} \ -%{mabi=n32: -D_ABIN32=2 -D_MIPS_SIM=_ABIN32} \ -%{mabi=64: -D_ABI64=3 -D_MIPS_SIM=_ABI64} \ -%{!mabi*: -D_ABIN32=2 -D_MIPS_SIM=_ABIN32} \ -%{!mint64: -D_MIPS_SZINT=32}%{mint64: -D_MIPS_SZINT=64} \ -%{mabi=32: -D_MIPS_SZLONG=32} \ -%{mabi=n32: -D_MIPS_SZLONG=32} \ -%{mabi=64: -D_MIPS_SZLONG=64} \ -%{!mabi*: -D_MIPS_SZLONG=32} \ -%{mabi=32: -D_MIPS_SZPTR=32} \ -%{mabi=n32: -D_MIPS_SZPTR=32} \ -%{mabi=64: -D_MIPS_SZPTR=64} \ -%{!mabi*: -D_MIPS_SZPTR=32} \ -%{!mips1:%{!mips2: -D_COMPILER_VERSION=601}} \ -%{!mips*: -U__mips -D__mips=3} \ -%{mabi=32: -U__mips64} \ -%{mabi=n32: -D__mips64} \ -%{mabi=64: -D__mips64} \ -%{!mabi*: -D__mips64}" +/* Undefine because this includes iris5.h. */ +#undef TARGET_OS_CPP_BUILTINS +#define TARGET_OS_CPP_BUILTINS() \ + do { \ + builtin_define_std ("host_mips"); \ + builtin_define ("_LONGLONG"); \ + builtin_define ("_MODERN_C"); \ + builtin_define ("_SVR4_SOURCE"); \ + builtin_define_std ("SYSTYPE_SVR4"); \ + builtin_define ("__DSO__"); \ + builtin_define_std ("unix"); \ + builtin_define_std ("sgi"); \ + builtin_assert ("system=svr4"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("machine=sgi"); \ + \ + if (mips_abi == ABI_32) \ + { \ + builtin_define ("_MIPS_SIM=_MIPS_SIM_ABI32"); \ + builtin_define ("_MIPS_SZLONG=32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + else if (mips_abi == ABI_64) \ + { \ + builtin_define ("_ABI64=3"); \ + builtin_define ("_MIPS_SIM=_ABI64"); \ + builtin_define ("_MIPS_SZLONG=64"); \ + builtin_define ("_MIPS_SZPTR=64"); \ + } \ + else \ + { \ + builtin_define ("_ABIN32=2"); \ + builtin_define ("_MIPS_SIM=_ABIN32"); \ + builtin_define ("_MIPS_SZLONG=32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + \ + if (!TARGET_FLOAT64) \ + builtin_define ("_MIPS_FPSET=16"); \ + else \ + builtin_define ("_MIPS_FPSET=32"); \ + \ + if (!TARGET_INT64) \ + builtin_define ("_MIPS_SZINT=32"); \ + else \ + builtin_define ("_MIPS_SZINT=64"); \ + \ + if (!ISA_MIPS1 && !ISA_MIPS2) \ + builtin_define ("_COMPILER_VERSION=601"); \ + \ + /* IRIX 6.5.18 and above provide many ISO C99 \ + features protected by the __c99 macro. \ + libstdc++ v3 needs them as well. */ \ + if ((c_language == clk_c && flag_isoc99) \ + || c_language == clk_cplusplus) \ + builtin_define ("__c99"); \ + \ + if (c_language == clk_cplusplus) \ + { \ + builtin_define ("__EXTENSIONS__"); \ + builtin_define ("_SGI_SOURCE"); \ + } \ + \ + if (!flag_iso) \ + { \ + builtin_define ("__EXTENSIONS__"); \ + builtin_define ("_SGI_SOURCE"); \ + } \ +} while (0) -/* The GNU C++ standard library requires that __EXTENSIONS__ and - _SGI_SOURCE be defined on at least irix6.2 and probably all irix6 - prior to 6.5. They normally get defined in SUBTARGET_CPP_SPEC if - !ansi, for g++ we want them regardless. We don't need this on - irix6.5 itself, but it shouldn't hurt other than the namespace - pollution. */ -#undef CPLUSPLUS_CPP_SPEC -#define CPLUSPLUS_CPP_SPEC "\ --D__LANGUAGE_C_PLUS_PLUS -D_LANGUAGE_C_PLUS_PLUS \ -%{ansi:-D__EXTENSIONS__ -D_SGI_SOURCE} %(cpp) \ -" - /* Irix 6 uses DWARF-2. */ -#define DWARF2_DEBUGGING_INFO -#define MIPS_DEBUGGING_INFO +#define DWARF2_DEBUGGING_INFO 1 +#define MIPS_DEBUGGING_INFO 1 #undef PREFERRED_DEBUGGING_TYPE #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG @@ -235,7 +244,7 @@ on the mipsX option. */ /* If no mips[3,4] option given, give the appropriate default for mabi=X */ #undef SUBTARGET_ASM_SPEC -#define SUBTARGET_ASM_SPEC "%{!mabi*:-n32} %{!mips*: %{!mabi*:-mips3} %{mabi=n32:-mips3} %{mabi=64:-mips4}}" +#define SUBTARGET_ASM_SPEC "%{!mabi*:-n32} %{!mips*: %{!mabi*:-mips3} %{mabi=n32|mabi=64:-mips3}}" /* Must pass -g0 to the assembler, otherwise it may overwrite our debug info with its own debug info. */ @@ -263,8 +272,14 @@ do_global_* functions instead of running collect2. */ #define BSS_SECTION_ASM_OP "\t.section\t.bss" -#define CONST_SECTION_ASM_OP_32 "\t.rdata" -#define CONST_SECTION_ASM_OP_64 "\t.section\t.rodata" + +#undef READONLY_DATA_SECTION_ASM_OP +#define READONLY_DATA_SECTION_ASM_OP_32 "\t.rdata" +#define READONLY_DATA_SECTION_ASM_OP_64 "\t.section\t.rodata" +#define READONLY_DATA_SECTION_ASM_OP \ + (mips_abi != ABI_32 && mips_abi != ABI_O64 \ + ? READONLY_DATA_SECTION_ASM_OP_64 \ + : READONLY_DATA_SECTION_ASM_OP_32) /* A default list of other sections which we might be "in" at any given time. For targets that use additional sections (e.g. .tdesc) you @@ -272,14 +287,12 @@ includes this file. */ #undef EXTRA_SECTIONS -#define EXTRA_SECTIONS in_sdata, in_rdata, in_const +#define EXTRA_SECTIONS in_sdata /* A default list of extra section function definitions. For targets that use additional sections (e.g. .tdesc) you should override this definition in the target-specific file which includes this file. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 25 14:22:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D35D516A4D0; Thu, 25 Dec 2003 14:22:51 -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 AE25016A4CE for ; Thu, 25 Dec 2003 14:22:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BBEB43D31 for ; Thu, 25 Dec 2003 14:22:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPMMo0B020603 for ; Thu, 25 Dec 2003 14:22:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPMMoTx020600 for perforce@freebsd.org; Thu, 25 Dec 2003 14:22:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 14:22:50 -0800 (PST) Message-Id: <200312252222.hBPMMoTx020600@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 44317 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, 25 Dec 2003 22:22:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=44317 Change 44317 by jmallett@jmallett_oingo on 2003/12/25 14:22:06 Detach buildy bits. Affected files ... .. //depot/projects/mips/lib/Makefile#10 edit .. //depot/projects/mips/lib/libstand/Makefile#7 edit Differences ... ==== //depot/projects/mips/lib/Makefile#10 (text+ko) ==== @@ -43,7 +43,7 @@ .endif # libc_r is obsolete on ia64. -.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" +.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "mips" .if !defined(NOLIBC_R) _libc_r= libc_r .endif @@ -88,19 +88,19 @@ _libsmb= libsmb .endif -.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "sparc64" +.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "sparc64" && ${MACHINE_ARCH} != "mips" .if !defined(NOLIBPTHREAD) _libpthread= libpthread .endif .endif -.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "powerpc" +.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "mips" .if !defined(NOLIBTHR) _libthr= libthr .endif .endif -.if ${MACHINE_ARCH} != "powerpc" +.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "mips" _libdisk= libdisk .endif ==== //depot/projects/mips/lib/libstand/Makefile#7 (text+ko) ==== @@ -54,7 +54,7 @@ # string functions from libc .PATH: ${.CURDIR}/../libc/string .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" \ + ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "mips" SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ memcpy.c memmove.c memset.c qdivrem.c rindex.c strcat.c strchr.c \ From owner-p4-projects@FreeBSD.ORG Thu Dec 25 14:23:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6938016A4D1; Thu, 25 Dec 2003 14:23:54 -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 43AFD16A4CE for ; Thu, 25 Dec 2003 14:23:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC66E43D31 for ; Thu, 25 Dec 2003 14:23:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPMNq0B020637 for ; Thu, 25 Dec 2003 14:23:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPMNq2d020634 for perforce@freebsd.org; Thu, 25 Dec 2003 14:23:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 14:23:52 -0800 (PST) Message-Id: <200312252223.hBPMNq2d020634@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 44319 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, 25 Dec 2003 22:23:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=44319 Change 44319 by jmallett@jmallett_oingo on 2003/12/25 14:23:28 Catch up to mips now liking included like other ports. Affected files ... .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#8 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#8 (text+ko) ==== @@ -160,9 +160,7 @@ # The list of headers to go into tconfig.h # TARGET_INC= ansidecl.h -.if ${TARGET_ARCH} != "mips" TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h -.endif .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h TARGET_INC+= ${GCC_CPU}/att.h From owner-p4-projects@FreeBSD.ORG Thu Dec 25 14:23:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 930B616A4ED; Thu, 25 Dec 2003 14:23:54 -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 6497116A4CF for ; Thu, 25 Dec 2003 14:23:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7494143D2D for ; Thu, 25 Dec 2003 14:23:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPMNq0B020631 for ; Thu, 25 Dec 2003 14:23:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPMNqCk020628 for perforce@freebsd.org; Thu, 25 Dec 2003 14:23:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 14:23:52 -0800 (PST) Message-Id: <200312252223.hBPMNqCk020628@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 44318 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, 25 Dec 2003 22:23:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=44318 Change 44318 by jmallett@jmallett_oingo on 2003/12/25 14:23:09 Catch up to config changes, I think this is more or less right. Now I can at least build gcc again. There's some very trivial warnings now, but I'm not going to take time for them. Don't know if they have any measurable effect, we'll see. Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#9 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#9 (text+ko) ==== @@ -20,31 +20,15 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* Override the defaults, which exist to force the proper definition. */ - -#undef CPP_OS_DEFAULT_SPEC -#define CPP_OS_DEFAULT_SPEC "%(cpp_os_freebsd)" - -#undef STARTFILE_DEFAULT_SPEC -#define STARTFILE_DEFAULT_SPEC "%(startfile_freebsd)" - -#undef ENDFILE_DEFAULT_SPEC -#define ENDFILE_DEFAULT_SPEC "%(endfile_freebsd)" +#undef FBSD_TARGET_CPU_CPP_BUILTINS +#define FBSD_TARGET_CPU_CPP_BUILTINS() \ + do \ + { \ + builtin_define ("__mips__"); \ + builtin_define ("__LP64__"); \ + } \ + while (0) -#undef LIB_DEFAULT_SPEC -#define LIB_DEFAULT_SPEC "%(lib_freebsd)" - -#undef LINK_START_DEFAULT_SPEC -#define LINK_START_DEFAULT_SPEC "%(link_start_freebsd)" - -#undef LINK_OS_DEFAULT_SPEC -#define LINK_OS_DEFAULT_SPEC "%(link_os_freebsd)" - -/* Define things to cpp common to all FreeBSD systems, and our arch. */ -#undef CPP_PREDEFINES -#define CPP_PREDEFINES FBSD_CPP_PREDEFINES "-D__mips__" - - /************************[ Target stuff ]***********************************/ /* Define the actual types of some ANSI-mandated types. @@ -65,12 +49,11 @@ /* Define the target in terms of a bitmask (see mips.h for MASK_ defns). */ #undef TARGET_ENDIAN_DEFAULT -#define TARGET_ENDIAN_DEFAULT MASK_BIG_ENDIAN +#define TARGET_ENDIAN_DEFAULT (MASK_BIG_ENDIAN) #undef TARGET_CPU_DEFAULT #define TARGET_CPU_DEFAULT (MASK_LONG64 | MASK_64BIT | MASK_GAS) - /* No mips-tfile. */ #undef ASM_FINAL_SPEC From owner-p4-projects@FreeBSD.ORG Thu Dec 25 14:39:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5E0B16A4D1; Thu, 25 Dec 2003 14:39: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 7DEEC16A4CE for ; Thu, 25 Dec 2003 14:39:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDDC743D1D for ; Thu, 25 Dec 2003 14:39:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPMdB0B022844 for ; Thu, 25 Dec 2003 14:39:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPMdBYf022841 for perforce@freebsd.org; Thu, 25 Dec 2003 14:39:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 14:39:11 -0800 (PST) Message-Id: <200312252239.hBPMdBYf022841@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 44320 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, 25 Dec 2003 22:39:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=44320 Change 44320 by jmallett@jmallett_oingo on 2003/12/25 14:38:35 Catch up with -current stuffs here. Affected files ... .. //depot/projects/mips/sys/mips/include/kse.h#2 delete .. //depot/projects/mips/sys/mips/include/sf_buf.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 25 14:39:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34E5016A4CE; Thu, 25 Dec 2003 14:39: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 80E3716A4CF for ; Thu, 25 Dec 2003 14:39:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 501DB43D1F for ; Thu, 25 Dec 2003 14:39:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBPMdC0B022850 for ; Thu, 25 Dec 2003 14:39:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBPMdB0G022847 for perforce@freebsd.org; Thu, 25 Dec 2003 14:39:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 14:39:11 -0800 (PST) Message-Id: <200312252239.hBPMdB0G022847@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 44321 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, 25 Dec 2003 22:39:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=44321 Change 44321 by jmallett@jmallett_oingo on 2003/12/25 14:39:05 Catch up with newer, cleverer, tastier ABI selection code. We default to 64-bit. Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#10 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#10 (text+ko) ==== @@ -20,6 +20,9 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +#undef MIPS_ABI_DEFAULT +#define MIPS_ABI_DEFAULT ABI_64 + #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ From owner-p4-projects@FreeBSD.ORG Thu Dec 25 18:16:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BCD616A4D0; Thu, 25 Dec 2003 18:16: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 6F2A116A4CE for ; Thu, 25 Dec 2003 18:16:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74A2843D1F for ; Thu, 25 Dec 2003 18:16:40 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBQ2Ge0B077621 for ; Thu, 25 Dec 2003 18:16:40 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBQ2Ge24077618 for perforce@freebsd.org; Thu, 25 Dec 2003 18:16:40 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 18:16:40 -0800 (PST) Message-Id: <200312260216.hBQ2Ge24077618@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 44332 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, 26 Dec 2003 02:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=44332 Change 44332 by jmallett@jmallett_oingo on 2003/12/25 18:16:29 Add my INDY kernel configuration for my R4400 Indigo2. There's something broken presently, possibly due to ABI changes, but it boots up to SI_SUB_CPU. Affected files ... .. //depot/projects/mips/sys/mips/conf/INDY#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 25 18:56:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E040916A4D0; Thu, 25 Dec 2003 18:56: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 B372E16A4CE for ; Thu, 25 Dec 2003 18:56:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44D4843D41 for ; Thu, 25 Dec 2003 18:56:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBQ2uU0B085728 for ; Thu, 25 Dec 2003 18:56:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBQ2uTCb085725 for perforce@freebsd.org; Thu, 25 Dec 2003 18:56:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 18:56:29 -0800 (PST) Message-Id: <200312260256.hBQ2uTCb085725@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 44335 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, 26 Dec 2003 02:56:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=44335 Change 44335 by jmallett@jmallett_oingo on 2003/12/25 18:56:15 Werror-able. Affected files ... .. //depot/projects/mips/sys/mips/conf/INDY#2 edit .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#8 edit Differences ... ==== //depot/projects/mips/sys/mips/conf/INDY#2 (text+ko) ==== @@ -8,7 +8,6 @@ ident INDY maxusers 0 -makeoptions WERROR=-Wno-error #XXX: We don't want -Werror just now makeoptions MIPSOPTS=-mips3 #Build for a MIPS III makeoptions TEXTADDR=0x88069000 #Indy ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#8 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Dec 25 18:56:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A240F16A4DD; Thu, 25 Dec 2003 18:56: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 20F3F16A4E5 for ; Thu, 25 Dec 2003 18:56:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1E5E43D31 for ; Thu, 25 Dec 2003 18:56:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBQ2uT0B085722 for ; Thu, 25 Dec 2003 18:56:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBQ2uTr5085719 for perforce@freebsd.org; Thu, 25 Dec 2003 18:56:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 25 Dec 2003 18:56:29 -0800 (PST) Message-Id: <200312260256.hBQ2uTr5085719@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 44334 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, 26 Dec 2003 02:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=44334 Change 44334 by jmallett@jmallett_oingo on 2003/12/25 18:55:59 Remove redundant indirections, etc. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#12 edit .. //depot/projects/mips/sys/mips/mips/cache_r4k.c#2 edit .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#14 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#12 (text+ko) ==== @@ -135,29 +135,4 @@ 9: .asciiz msg; \ .text -/* - * standard callframe { - * register_t cf_args[4]; arg0 - arg3 - * register_t cf_sp; frame pointer - * register_t cf_ra; return address - * }; - */ -#define CALLFRAME_SIZ (8 * (4 + 2)) -#define CALLFRAME_SP (8 * 4) -#define CALLFRAME_RA (8 * 5) - -/* - * While it would be nice to be compatible with the SGI - * REG_L and REG_S macros, because they do not take parameters, it - * is impossible to use them with the _MIPS_SIM_ABIX32 model. - * - * These macros hide the use of mips3 instructions from the - * assembler to prevent the assembler from generating 64-bit style - * ABI calls. - */ -#define REG_L ld -#define REG_S sd -#define REG_LI dli -#define SZREG 8 - #endif /* !_MACHINE_ASM_H_ */ ==== //depot/projects/mips/sys/mips/mips/cache_r4k.c#2 (text+ko) ==== @@ -57,8 +57,6 @@ #define round_line(x) (((x) + 15) & ~15) #define trunc_line(x) ((x) & ~15) -__asm(".set mips3"); - void r4k_icache_sync_all_16(void) { ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#14 (text+ko) ==== @@ -187,35 +187,35 @@ */ LEAF(setjmp) mfc0 v0, MIPS_COP_0_STATUS - REG_S s0, SF_REG_S0(a0) - REG_S s1, SF_REG_S1(a0) - REG_S s2, SF_REG_S2(a0) - REG_S s3, SF_REG_S3(a0) - REG_S s4, SF_REG_S4(a0) - REG_S s5, SF_REG_S5(a0) - REG_S s6, SF_REG_S6(a0) - REG_S s7, SF_REG_S7(a0) - REG_S sp, SF_REG_SP(a0) - REG_S s8, SF_REG_S8(a0) - REG_S ra, SF_REG_RA(a0) - REG_S v0, SF_REG_SR(a0) + sd s0, SF_REG_S0(a0) + sd s1, SF_REG_S1(a0) + sd s2, SF_REG_S2(a0) + sd s3, SF_REG_S3(a0) + sd s4, SF_REG_S4(a0) + sd s5, SF_REG_S5(a0) + sd s6, SF_REG_S6(a0) + sd s7, SF_REG_S7(a0) + sd sp, SF_REG_SP(a0) + sd s8, SF_REG_S8(a0) + sd ra, SF_REG_RA(a0) + sd v0, SF_REG_SR(a0) j ra move v0, zero END(setjmp) LEAF(longjmp) - REG_L v0, SF_REG_SR(a0) - REG_L ra, SF_REG_RA(a0) - REG_L s0, SF_REG_S0(a0) - REG_L s1, SF_REG_S1(a0) - REG_L s2, SF_REG_S2(a0) - REG_L s3, SF_REG_S3(a0) - REG_L s4, SF_REG_S4(a0) - REG_L s5, SF_REG_S5(a0) - REG_L s6, SF_REG_S6(a0) - REG_L s7, SF_REG_S7(a0) - REG_L sp, SF_REG_SP(a0) - REG_L s8, SF_REG_S8(a0) + ld v0, SF_REG_SR(a0) + ld ra, SF_REG_RA(a0) + ld s0, SF_REG_S0(a0) + ld s1, SF_REG_S1(a0) + ld s2, SF_REG_S2(a0) + ld s3, SF_REG_S3(a0) + ld s4, SF_REG_S4(a0) + ld s5, SF_REG_S5(a0) + ld s6, SF_REG_S6(a0) + ld s7, SF_REG_S7(a0) + ld sp, SF_REG_SP(a0) + ld s8, SF_REG_S8(a0) mtc0 v0, MIPS_COP_0_STATUS COP0_SYNC j ra From owner-p4-projects@FreeBSD.ORG Fri Dec 26 16:40:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 861EF16A4D0; Fri, 26 Dec 2003 16:40:17 -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 5FA1016A4CE for ; Fri, 26 Dec 2003 16:40:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 056D043D45 for ; Fri, 26 Dec 2003 16:40:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBR0eC0B097224 for ; Fri, 26 Dec 2003 16:40:12 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBR0eCHg097221 for perforce@freebsd.org; Fri, 26 Dec 2003 16:40:12 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 26 Dec 2003 16:40:12 -0800 (PST) Message-Id: <200312270040.hBR0eCHg097221@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 44377 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, 27 Dec 2003 00:40:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=44377 Change 44377 by sam@sam_ebb on 2003/12/26 16:40:03 IFC Affected files ... .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/netperf/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/netperf/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/bootsect.h#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/fat.h#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfsmount.h#4 integrate .. //depot/projects/netperf/sys/kern/kern_event.c#6 integrate .. //depot/projects/netperf/sys/kern/kern_subr.c#3 integrate .. //depot/projects/netperf/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/netperf/sys/kern/syscalls.master#12 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/netperf/sys/net/if.c#12 integrate .. //depot/projects/netperf/sys/netinet6/ip6_fw.c#7 integrate .. //depot/projects/netperf/sys/pc98/pc98/sio.c#7 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#21 integrate .. //depot/projects/netperf/sys/pci/if_sisreg.h#7 integrate .. //depot/projects/netperf/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/netperf/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/db_trace.c#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/dump_machdep.c#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/ofw_machdep.c#5 integrate .. //depot/projects/netperf/sys/sys/_null.h#4 integrate .. //depot/projects/netperf/sys/sys/sysproto.h#12 integrate .. //depot/projects/netperf/sys/sys/systm.h#5 integrate .. //depot/projects/netperf/sys/sys/uio.h#3 integrate .. //depot/projects/netperf/sys/vm/vm_fault.c#9 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#16 integrate Differences ... ==== //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.11 2003/12/25 06:04:39 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.15 2003/12/26 07:01:05 wpaul Exp $"); #include #include @@ -352,10 +352,9 @@ sc = p->np_softc; returnfunc = sc->ndis_chars.nmc_return_packet_func; adapter = sc->ndis_block.nmb_miniportadapterctx; - if (returnfunc == NULL) - ndis_free_packet(p); - else + if (returnfunc != NULL) returnfunc(adapter, p); + return; } @@ -654,12 +653,37 @@ struct ndis_softc *sc; ndis_handle adapter; __stdcall ndis_sendmulti_handler sendfunc; + int i, idx; + struct ifnet *ifp; + struct mbuf *m; + ndis_packet *p; sc = arg; adapter = sc->ndis_block.nmb_miniportadapterctx; sendfunc = sc->ndis_chars.nmc_sendmulti_func; sendfunc(adapter, packets, cnt); + for (i = 0; i < cnt; i++) { + p = packets[i]; + if (p->np_oob.npo_status == NDIS_STATUS_PENDING) + continue; + idx = p->np_txidx; + m = p->np_m0; + ifp = &sc->arpcom.ac_if; + if (sc->ndis_sc) + bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]); + sc->ndis_txarray[idx] = NULL; + sc->ndis_txpending++; + m_freem(m); + ndis_free_packet(p); + if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS) + ifp->if_opackets++; + else + ifp->if_oerrors++; + ifp->if_timer = 0; + ifp->if_flags &= ~IFF_OACTIVE; + } + return(0); } @@ -753,7 +777,6 @@ __stdcall ndis_halt_handler haltfunc; struct ifnet *ifp; struct ndis_timer_entry *ne; - struct callout_handle *ch; sc = arg; ifp = &sc->arpcom.ac_if; @@ -781,9 +804,7 @@ while (!TAILQ_EMPTY(&sc->ndis_block.nmb_timerlist)) { ne = TAILQ_FIRST(&sc->ndis_block.nmb_timerlist); TAILQ_REMOVE(&sc->ndis_block.nmb_timerlist, ne, link); - ch = &ne->nte_ch; - if (ch->callout != NULL) - untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + callout_stop(&ne->nte_ch); free(ne, M_DEVBUF); } ==== //depot/projects/netperf/sys/compat/ndis/ndis_var.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.6 2003/12/25 06:04:39 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.9 2003/12/26 03:31:34 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1001,7 +1001,7 @@ typedef struct ndis_reference ndis_reference; struct ndis_timer_entry { - struct callout_handle nte_ch; + struct callout nte_ch; ndis_miniport_timer *nte_timer; TAILQ_ENTRY(ndis_timer_entry) link; }; ==== //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.13 2003/12/25 00:40:02 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.16 2003/12/26 03:31:34 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -62,6 +62,7 @@ #include #include #include +#include #include #include @@ -150,6 +151,7 @@ uint32_t, uint32_t, void *); __stdcall static void ndis_read_netaddr(ndis_status *, void **, uint32_t *, ndis_handle); +__stdcall static ndis_status ndis_mapreg_cnt(uint32_t, uint32_t *); __stdcall static ndis_status ndis_alloc_mapreg(ndis_handle, uint32_t, uint8_t, uint32_t, uint32_t); __stdcall static void ndis_free_mapreg(ndis_handle); @@ -242,6 +244,7 @@ __stdcall static void ndis_map_file(ndis_status *, void **, ndis_handle); __stdcall static void ndis_unmap_file(ndis_handle); __stdcall static void ndis_close_file(ndis_handle); +__stdcall static u_int8_t ndis_cpu_cnt(void); __stdcall static void dummy(void); @@ -883,7 +886,7 @@ block = (ndis_miniport_block *)handle; ne = malloc(sizeof(struct ndis_timer_entry), M_DEVBUF, M_NOWAIT); - callout_handle_init(&ne->nte_ch); + callout_init(&ne->nte_ch, CALLOUT_MPSAFE); TAILQ_INSERT_TAIL(&block->nmb_timerlist, ne, link); ne->nte_timer = timer; @@ -927,7 +930,7 @@ ndis_miniport_timer *timer; uint32_t msecs; { - struct callout_handle *ch; + struct callout *ch; struct timeval tv; tv.tv_sec = 0; @@ -936,8 +939,7 @@ ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_dpc.nk_sysarg2 = ndis_timercall; timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; - *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, (void *)timer, - tvtohz(&tv)); + callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); return; } @@ -947,7 +949,7 @@ void *arg; { ndis_miniport_timer *timer; - struct callout_handle *ch; + struct callout *ch; __stdcall ndis_timer_function timerfunc; struct timeval tv; @@ -964,8 +966,7 @@ ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; timer->nmt_dpc.nk_sysarg2 = ndis_tick; - *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, - tvtohz(&tv)); + callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); return; } @@ -975,7 +976,7 @@ ndis_miniport_timer *timer; uint32_t msecs; { - struct callout_handle *ch; + struct callout *ch; struct timeval tv; tv.tv_sec = 0; @@ -985,8 +986,7 @@ ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_dpc.nk_sysarg2 = ndis_tick; timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; - *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, - tvtohz(&tv)); + callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); return; } @@ -996,10 +996,10 @@ ndis_miniport_timer *timer; uint8_t *cancelled; { - struct callout_handle *ch; + struct callout *ch; ch = timer->nmt_dpc.nk_deferredctx; - untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + callout_stop(ch); *cancelled = timer->nmt_ktimer.nk_header.dh_sigstate; return; @@ -1089,6 +1089,15 @@ } __stdcall static ndis_status +ndis_mapreg_cnt(bustype, cnt) + uint32_t bustype; + uint32_t *cnt; +{ + *cnt = 64; + return(NDIS_STATUS_SUCCESS); +} + +__stdcall static ndis_status ndis_alloc_mapreg(adapter, dmachannel, dmasize, physmapneeded, maxmap) ndis_handle adapter; uint32_t dmachannel; @@ -2252,6 +2261,16 @@ return; } +__stdcall static uint8_t +ndis_cpu_cnt() +{ +#ifdef SMP + return(mp_ncpus); +#else + return(1); +#endif +}; + __stdcall static void dummy() { @@ -2260,6 +2279,7 @@ } image_patch_table ndis_functbl[] = { + { "NdisSystemProcessorCount", (FUNC)ndis_cpu_cnt }, { "NdisUnchainBufferAtBack", (FUNC)ndis_unchain_tailbuf, }, { "NdisGetFirstBufferFromPacket", (FUNC)ndis_firstbuf }, { "NdisGetFirstBufferFromPacketSafe", (FUNC)ndis_firstbuf_safe }, @@ -2309,8 +2329,9 @@ { "NdisMRegisterIoPortRange", (FUNC)ndis_register_ioport }, { "NdisMDeregisterIoPortRange", (FUNC)ndis_deregister_ioport }, { "NdisReadNetworkAddress", (FUNC)ndis_read_netaddr }, + { "NdisQueryMapRegisterCount", (FUNC)ndis_mapreg_cnt }, { "NdisMAllocateMapRegisters", (FUNC)ndis_alloc_mapreg }, - { "NdisMFreeMapRegisters", (FUNC)ndis_free_mapreg }, + { "NdisMFreeMapRegisters", (FUNC)ndis_free_mapreg }, { "NdisMAllocateSharedMemory", (FUNC)ndis_alloc_sharedmem }, { "NdisMMapIoSpace", (FUNC)ndis_map_iospace }, { "NdisMUnmapIoSpace", (FUNC)ndis_unmap_iospace }, ==== //depot/projects/netperf/sys/compat/ndis/subr_pe.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.2 2003/12/24 21:21:18 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.3 2003/12/26 03:31:34 wpaul Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -520,7 +520,7 @@ fptr = (vm_offset_t *)pe_translate_addr(imgbase, imp_desc.iid_import_address_table_addr); - while (nptr != NULL && pe_translate_addr(imgbase, *nptr) != NULL) { + while (nptr != NULL && pe_translate_addr(imgbase, *nptr)) { fname = (char *)pe_translate_addr(imgbase, (*nptr) + 2); func = pe_functbl_match(functbl, fname); if (func) ==== //depot/projects/netperf/sys/dev/acpica/acpi.c#17 (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.111 2003/12/23 18:47:31 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.112 2003/12/26 15:42:13 jhb Exp $ */ #include "opt_acpi.h" @@ -1216,10 +1216,10 @@ return (FALSE); devinfo = (ACPI_DEVICE_INFO *)buf.Pointer; - if ((devinfo->Valid & ACPI_VALID_HID) != 0) { - if (strcmp(hid, devinfo->HardwareId.Value) == 0) + if ((devinfo->Valid & ACPI_VALID_HID) != 0 && + strcmp(hid, devinfo->HardwareId.Value) == 0) ret = TRUE; - } else if ((devinfo->Valid & ACPI_VALID_CID) != 0) { + else if ((devinfo->Valid & ACPI_VALID_CID) != 0) { for (i = 0; i < devinfo->CompatibilityId.Count; i++) { if (strcmp(hid, devinfo->CompatibilityId.Id[i].Value) == 0) { ret = TRUE; ==== //depot/projects/netperf/sys/dev/gem/if_gem_pci.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.12 2003/09/02 20:24:42 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.13 2003/12/26 05:36:08 obrien Exp $"); /* * PCI bindings for Sun GEM ethernet controllers. @@ -126,7 +126,7 @@ { 0x2bad108e, GEM_SUN_GEM, "Sun GEM Gigabit Ethernet Adaptor" }, { 0x0021106b, GEM_APPLE_GMAC, "Apple GMAC Ethernet Adaptor" }, { 0x0024106b, GEM_APPLE_GMAC, "Apple GMAC2 Ethernet Adaptor" }, - { 0, NULL } + { 0, 0, NULL } }; /* ==== //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.13 2003/12/25 09:44:49 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.15 2003/12/26 07:01:05 wpaul Exp $"); #include "opt_bdg.h" @@ -633,6 +633,21 @@ /* * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. + * + * When handling received NDIS packets, the 'status' field in the + * out-of-band portion of the ndis_packet has special meaning. In the + * most common case, the underlying NDIS driver will set this field + * to NDIS_STATUS_SUCCESS, which indicates that it's ok for us to + * take posession of it. We then change the status field to + * NDIS_STATUS_PENDING to tell the driver that we now own the packet, + * and that we will return it at some point in the future via the + * return packet handler. + * + * If the driver hands us a packet with a status of NDIS_STATUS_RESOURCES, + * this means the driver is running out of packet/buffer resources and + * wants to maintain ownership of the packet. In this case, we have to + * copy the packet data into local storage and let the driver keep the + * packet. */ __stdcall static void ndis_rxeof(adapter, packets, pktcnt) @@ -644,7 +659,7 @@ ndis_miniport_block *block; ndis_packet *p; struct ifnet *ifp; - struct mbuf *m0; + struct mbuf *m0, *m; int i; block = (ndis_miniport_block *)adapter; @@ -657,8 +672,18 @@ p->np_softc = sc; if (ndis_ptom(&m0, p)) { printf ("ndis%d: ptom failed\n", sc->ndis_unit); - ndis_return_packet(sc, p); + if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS) + ndis_return_packet(sc, p); } else { + if (p->np_oob.npo_status == NDIS_STATUS_RESOURCES) { + m = m_dup(m0, M_DONTWAIT); + m_freem(m0); + if (m == NULL) + ifp->if_ierrors++; + else + m0 = m; + } else + p->np_oob.npo_status = NDIS_STATUS_PENDING; m0->m_pkthdr.rcvif = ifp; ifp->if_ipackets++; (*ifp->if_input)(ifp, m0); @@ -1048,6 +1073,12 @@ ndis_media_state linkstate; int error, len; + ifmr->ifm_status = IFM_AVALID; + ifmr->ifm_active = IFM_ETHER; + + if (!(ifp->if_flags & IFF_UP)) + return; + sc = ifp->if_softc; len = sizeof(linkstate); @@ -1058,9 +1089,6 @@ error = ndis_get_info(sc, OID_GEN_LINK_SPEED, (void *)&media_info, &len); - ifmr->ifm_status = IFM_AVALID; - ifmr->ifm_active = IFM_ETHER; - if (linkstate == nmc_connected) ifmr->ifm_status |= IFM_ACTIVE; ==== //depot/projects/netperf/sys/dev/sio/sio_puc.c#3 (text+ko) ==== @@ -24,10 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.6 2003/08/24 18:03:44 obrien Exp $"); - -#include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.6 2003/08/24 18:03:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.7 2003/12/26 04:30:01 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/fs/msdosfs/bootsect.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/bootsect.h,v 1.10 2002/10/21 19:00:50 jhb Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/bootsect.h,v 1.11 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $ */ /* ==== //depot/projects/netperf/sys/fs/msdosfs/bpb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/bpb.h,v 1.9 2001/11/28 16:56:42 jhb Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/bpb.h,v 1.10 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $ */ /* ==== //depot/projects/netperf/sys/fs/msdosfs/denode.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/denode.h,v 1.25 2003/06/24 22:11:20 jmg Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/denode.h,v 1.27 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $ */ /*- @@ -160,6 +160,7 @@ u_long de_FileSize; /* size of file in bytes */ struct fatcache de_fc[FC_SIZE]; /* fat cache */ u_quad_t de_modrev; /* Revision level for lease. */ + struct lockf *de_lockf; /* lockf */ }; /* ==== //depot/projects/netperf/sys/fs/msdosfs/direntry.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/direntry.h,v 1.18 2003/09/27 01:18:27 bde Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/direntry.h,v 1.19 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $ */ /*- ==== //depot/projects/netperf/sys/fs/msdosfs/fat.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/fat.h,v 1.11 2002/03/19 22:20:10 alfred Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/fat.h,v 1.13 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $ */ /*- @@ -99,5 +99,6 @@ int freeclusterchain(struct msdosfsmount *pmp, u_long startchain); int extendfile(struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags); void fc_purge(struct denode *dep, u_int frcn); +int markvoldirty(struct msdosfsmount *pmp, int dirty); #endif /* _KERNEL */ ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfs_conv.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_conv.c,v 1.35 2003/12/08 08:32:20 fjoe Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_conv.c,v 1.36 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $ */ /*- ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfs_denode.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.71 2003/10/05 02:43:29 jeff Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.72 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */ /*- ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfs_fat.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_fat.c,v 1.32 2003/03/04 00:04:42 jeff Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_fat.c,v 1.34 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */ /*- @@ -1106,3 +1106,70 @@ return (0); } + +/* [2753891] + * Routine to mark a FAT16 or FAT32 volume as "clean" or "dirty" by manipulating the upper bit + * of the FAT entry for cluster 1. Note that this bit is not defined for FAT12 volumes, which + * are always assumed to be dirty. + * + * The fatentry() routine only works on cluster numbers that a file could occupy, so it won't + * manipulate the entry for cluster 1. So we have to do it here. The code is ripped from + * fatentry(), and tailored for cluster 1. + * + * Inputs: + * pmp The MS-DOS volume to mark + * dirty Non-zero if the volume should be marked dirty; zero if it should be marked clean. + * + * Result: + * 0 Success + * EROFS Volume is read-only + * ? (other errors from called routines) + */ +int markvoldirty(struct msdosfsmount *pmp, int dirty) +{ + int error; + u_long bn, bo, bsize, byteoffset; + u_long fatval; + struct buf *bp; + + /* FAT12 does not support a "clean" bit, so don't do anything */ + if (FAT12(pmp)) + return 0; + + /* Can't change the bit on a read-only filesystem */ + if (pmp->pm_flags & MSDOSFSMNT_RONLY) + return EROFS; + + /* Fetch the block containing the FAT entry */ + byteoffset = FATOFS(pmp, 1); /* Find the location of cluster 1 */ + fatblock(pmp, byteoffset, &bn, &bsize, &bo); + + error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp); + if (error) { + brelse(bp); + return (error); + } + + /* Get the current value of the FAT entry and set/clear the high bit */ + if (FAT32(pmp)) { + /* FAT32 uses bit 27 */ + fatval = getulong(&bp->b_data[bo]); + if (dirty) + fatval &= 0xF7FFFFFF; /* dirty means clear the "clean" bit */ + else + fatval |= 0x08000000; /* clean means set the "clean" bit */ + putulong(&bp->b_data[bo], fatval); + } + else { + /* Must be FAT16; use bit 15 */ + fatval = getushort(&bp->b_data[bo]); + if (dirty) + fatval &= 0x7FFF; /* dirty means clear the "clean" bit */ + else + fatval |= 0x8000; /* clean means set the "clean" bit */ + putushort(&bp->b_data[bo], fatval); + } + + /* Write out the modified FAT block immediately */ + return bwrite(bp); +} ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfs_iconv.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_iconv.c,v 1.1 2003/09/26 20:26:23 fjoe Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_iconv.c,v 1.2 2003/12/26 17:24:37 trhodes Exp $"); #include #include ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfs_lookup.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_lookup.c,v 1.39 2003/09/26 20:26:23 fjoe Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_lookup.c,v 1.40 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $ */ /*- ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.111 2003/11/05 04:30:06 kan Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.113 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -209,6 +209,11 @@ VOP_UNLOCK(devvp, 0, td); } pmp->pm_flags &= ~MSDOSFSMNT_RONLY; + + /* [2753891] Now that the volume is modifiable, mark it dirty */ + error = markvoldirty(pmp, 1); + if (error) + return error; } if (args.fspec == 0) { #ifdef __notyet__ /* doesn't work correctly with current mountd XXX */ @@ -609,8 +614,12 @@ */ if (ronly) pmp->pm_flags |= MSDOSFSMNT_RONLY; - else + else { + /* [2753891] Mark the volume dirty while it is mounted read/write */ + if ((error = markvoldirty(pmp, 1)) != 0) + goto error_exit; pmp->pm_fmod = 1; + } mp->mnt_data = (qaddr_t) pmp; mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; @@ -667,6 +676,13 @@ msdosfs_iconv->close(pmp->pm_u2d); } pmp->pm_devvp->v_rdev->si_mountpoint = NULL; + + /* [2753891] If the volume was mounted read/write, mark it clean now */ + if ((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0) { + error = markvoldirty(pmp, 0); + if (error && !(flags & FORCECLOSE)) + return (error); + } #ifdef MSDOSFS_DEBUG { struct vnode *vp = pmp->pm_devvp; ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vnops.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.143 2003/10/18 14:10:24 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.145 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -101,6 +102,7 @@ static int msdosfs_strategy(struct vop_strategy_args *); static int msdosfs_print(struct vop_print_args *); static int msdosfs_pathconf(struct vop_pathconf_args *ap); +static int msdosfs_advlock(struct vop_advlock_args *); /* * Some general notes: @@ -1836,6 +1838,23 @@ /* NOTREACHED */ } +/* + * Advisory record locking support + */ +static int +msdosfs_advlock(ap) + struct vop_advlock_args /* { + struct vnode *a_vp; + u_char a_id; + int a_op; + struct flock *a_fl; + int a_flags; + } */ *ap; +{ + struct denode *ip = VTODE(ap->a_vp); + + return (lf_advlock(ap, &(ip->de_lockf), ip->de_FileSize)); +} /* Global vfs data structures for msdosfs */ vop_t **msdosfs_vnodeop_p; @@ -1865,6 +1884,7 @@ { &vop_strategy_desc, (vop_t *) msdosfs_strategy }, { &vop_symlink_desc, (vop_t *) msdosfs_symlink }, { &vop_write_desc, (vop_t *) msdosfs_write }, + { &vop_advlock_desc, (vop_t *) msdosfs_advlock }, { NULL, NULL } }; static struct vnodeopv_desc msdosfs_vnodeop_opv_desc = ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfsmount.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.29 2003/09/26 20:26:23 fjoe Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.30 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $ */ /*- ==== //depot/projects/netperf/sys/kern/kern_event.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.65 2003/11/14 18:49:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.66 2003/12/25 23:42:36 dwmalone Exp $"); #include #include @@ -395,7 +395,6 @@ fp->f_flag = FREAD | FWRITE; fp->f_type = DTYPE_KQUEUE; fp->f_ops = &kqueueops; - TAILQ_INIT(&kq->kq_head); fp->f_data = kq; FILE_UNLOCK(fp); fdrop(fp, td); ==== //depot/projects/netperf/sys/kern/kern_subr.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.77 2003/10/02 15:00:55 nectar Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.78 2003/12/26 05:54:35 alfred Exp $"); #include "opt_zero.h" @@ -448,7 +448,8 @@ } int -copyinfrom(const void *src, void *dst, size_t len, int seg) +copyinfrom(const void * __restrict src, void * __restrict dst, size_t len, + int seg) { int error = 0; @@ -466,7 +467,8 @@ } int -copyinstrfrom(const void *src, void *dst, size_t len, size_t *copied, int seg) +copyinstrfrom(const void * __restrict src, void * __restrict dst, size_t len, + size_t * __restrict copied, int seg) { int error = 0; ==== //depot/projects/netperf/sys/kern/sched_4bsd.c#10 (text+ko) ==== @@ -37,13 +37,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.28 2003/11/09 13:45:54 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.29 2003/12/26 17:07:29 jhb Exp $"); #include #include #include #include #include +#include #include #include #include @@ -80,11 +81,11 @@ static int sched_quantum; /* Roundrobin scheduling quantum in ticks. */ #define SCHED_QUANTUM (hz / 10) /* Default sched quantum */ -static struct callout schedcpu_callout; static struct callout roundrobin_callout; static void roundrobin(void *arg); -static void schedcpu(void *arg); +static void schedcpu(void); +static void schedcpu_thread(void *dummy); static void sched_setup(void *dummy); static void maybe_resched(struct thread *td); static void updatepri(struct ksegrp *kg); @@ -244,7 +245,7 @@ */ /* ARGSUSED */ static void -schedcpu(void *arg) +schedcpu(void) { register fixpt_t loadfac = loadfactor(averunnable.ldavg[0]); struct thread *td; @@ -348,7 +349,20 @@ mtx_unlock_spin(&sched_lock); } /* end of process loop */ sx_sunlock(&allproc_lock); - callout_reset(&schedcpu_callout, hz, schedcpu, NULL); +} + +/* + * Main loop for a kthread that executes schedcpu once a second. + */ +static void +schedcpu_thread(void *dummy) +{ + int nowake; + + for (;;) { + schedcpu(); + tsleep(&nowake, curthread->td_priority, "-", hz); + } } /* @@ -407,12 +421,13 @@ sched_quantum = SCHED_QUANTUM; hogticks = 2 * sched_quantum; - callout_init(&schedcpu_callout, CALLOUT_MPSAFE); callout_init(&roundrobin_callout, 0); /* Kick off timeout driven events by calling first time. */ roundrobin(NULL); - schedcpu(NULL); + + /* Kick off schedcpu kernel process. */ + kthread_create(schedcpu_thread, NULL, NULL, 0, 0, "schedcpu"); } /* External interfaces start here */ ==== //depot/projects/netperf/sys/kern/syscalls.master#12 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.164 2003/12/24 19:09:45 alfred Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.165 2003/12/26 05:58:16 alfred Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -80,14 +80,14 @@ 27 MSTD { int recvmsg(int s, struct msghdr *msg, int flags); } 28 MSTD { int sendmsg(int s, struct msghdr *msg, int flags); } 29 MSTD { int recvfrom(int s, caddr_t buf, size_t len, int flags, \ - struct sockaddr * from, \ - __socklen_t * fromlenaddr); } -30 MSTD { int accept(int s, struct sockaddr * name, \ - __socklen_t *anamelen); } -31 MSTD { int getpeername(int fdes, struct sockaddr * asa, \ - __socklen_t *alen); } -32 MSTD { int getsockname(int fdes, struct sockaddr * asa, \ - __socklen_t *alen); } + struct sockaddr * __restrict from, \ + __socklen_t * __restrict fromlenaddr); } +30 MSTD { int accept(int s, struct sockaddr * __restrict name, \ + __socklen_t * __restrict anamelen); } +31 MSTD { int getpeername(int fdes, struct sockaddr * __restrict asa, \ + __socklen_t * __restrict alen); } +32 MSTD { int getsockname(int fdes, struct sockaddr * __restrict asa, \ + __socklen_t * __restrict alen); } 33 STD { int access(char *path, int flags); } 34 STD { int chflags(char *path, int flags); } 35 STD { int fchflags(int fd, int flags); } ==== //depot/projects/netperf/sys/kern/uipc_syscalls.c#10 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.160 2003/12/24 18:47:42 alfred Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.161 2003/12/25 23:44:38 dwmalone Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -112,14 +112,15 @@ struct file *fp; int fd, error; - mtx_lock(&Giant); fdp = td->td_proc->p_fd; error = falloc(td, &fp, &fd); if (error) goto done2; /* An extra reference on `fp' has been held for us by falloc(). */ + mtx_lock(&Giant); error = socreate(uap->domain, &so, uap->type, uap->protocol, td->td_ucred, td); + mtx_unlock(&Giant); FILEDESC_LOCK(fdp); if (error) { if (fdp->fd_ofiles[fd] == fp) { @@ -138,7 +139,6 @@ } fdrop(fp, td); done2: - mtx_unlock(&Giant); return (error); } ==== //depot/projects/netperf/sys/net/if.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.173 2003/10/31 18:32:08 brooks Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.174 2003/12/26 18:09:35 green Exp $ */ #include "opt_compat.h" @@ -1229,7 +1229,7 @@ struct ifnet * ifunit(const char *name) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 26 16:53:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43EB716A4D0; Fri, 26 Dec 2003 16:53: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 1C1E516A4CE for ; Fri, 26 Dec 2003 16:53:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2AEC43D1D for ; Fri, 26 Dec 2003 16:53:29 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBR0rT0B007008 for ; Fri, 26 Dec 2003 16:53:29 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBR0rTFg007005 for perforce@freebsd.org; Fri, 26 Dec 2003 16:53:29 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 26 Dec 2003 16:53:29 -0800 (PST) Message-Id: <200312270053.hBR0rTFg007005@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 44378 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, 27 Dec 2003 00:53:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=44378 Change 44378 by sam@sam_ebb on 2003/12/26 16:53:14 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/netperf+sockets/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/bootsect.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/fat.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_event.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/syscalls.master#6 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/netperf+sockets/sys/net/if.c#4 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_fw.c#3 integrate .. //depot/projects/netperf+sockets/sys/pc98/pc98/sio.c#3 integrate .. //depot/projects/netperf+sockets/sys/pci/if_sis.c#5 integrate .. //depot/projects/netperf+sockets/sys/pci/if_sisreg.h#3 integrate .. //depot/projects/netperf+sockets/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/netperf+sockets/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/netperf+sockets/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/netperf+sockets/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/sys/_null.h#4 integrate .. //depot/projects/netperf+sockets/sys/sys/sysproto.h#6 integrate .. //depot/projects/netperf+sockets/sys/sys/systm.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/uio.h#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_fault.c#3 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_map.c#3 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.11 2003/12/25 06:04:39 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.15 2003/12/26 07:01:05 wpaul Exp $"); #include #include @@ -352,10 +352,9 @@ sc = p->np_softc; returnfunc = sc->ndis_chars.nmc_return_packet_func; adapter = sc->ndis_block.nmb_miniportadapterctx; - if (returnfunc == NULL) - ndis_free_packet(p); - else + if (returnfunc != NULL) returnfunc(adapter, p); + return; } @@ -654,12 +653,37 @@ struct ndis_softc *sc; ndis_handle adapter; __stdcall ndis_sendmulti_handler sendfunc; + int i, idx; + struct ifnet *ifp; + struct mbuf *m; + ndis_packet *p; sc = arg; adapter = sc->ndis_block.nmb_miniportadapterctx; sendfunc = sc->ndis_chars.nmc_sendmulti_func; sendfunc(adapter, packets, cnt); + for (i = 0; i < cnt; i++) { + p = packets[i]; + if (p->np_oob.npo_status == NDIS_STATUS_PENDING) + continue; + idx = p->np_txidx; + m = p->np_m0; + ifp = &sc->arpcom.ac_if; + if (sc->ndis_sc) + bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]); + sc->ndis_txarray[idx] = NULL; + sc->ndis_txpending++; + m_freem(m); + ndis_free_packet(p); + if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS) + ifp->if_opackets++; + else + ifp->if_oerrors++; + ifp->if_timer = 0; + ifp->if_flags &= ~IFF_OACTIVE; + } + return(0); } @@ -753,7 +777,6 @@ __stdcall ndis_halt_handler haltfunc; struct ifnet *ifp; struct ndis_timer_entry *ne; - struct callout_handle *ch; sc = arg; ifp = &sc->arpcom.ac_if; @@ -781,9 +804,7 @@ while (!TAILQ_EMPTY(&sc->ndis_block.nmb_timerlist)) { ne = TAILQ_FIRST(&sc->ndis_block.nmb_timerlist); TAILQ_REMOVE(&sc->ndis_block.nmb_timerlist, ne, link); - ch = &ne->nte_ch; - if (ch->callout != NULL) - untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + callout_stop(&ne->nte_ch); free(ne, M_DEVBUF); } ==== //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.6 2003/12/25 06:04:39 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.9 2003/12/26 03:31:34 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1001,7 +1001,7 @@ typedef struct ndis_reference ndis_reference; struct ndis_timer_entry { - struct callout_handle nte_ch; + struct callout nte_ch; ndis_miniport_timer *nte_timer; TAILQ_ENTRY(ndis_timer_entry) link; }; ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.13 2003/12/25 00:40:02 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.16 2003/12/26 03:31:34 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -62,6 +62,7 @@ #include #include #include +#include #include #include @@ -150,6 +151,7 @@ uint32_t, uint32_t, void *); __stdcall static void ndis_read_netaddr(ndis_status *, void **, uint32_t *, ndis_handle); +__stdcall static ndis_status ndis_mapreg_cnt(uint32_t, uint32_t *); __stdcall static ndis_status ndis_alloc_mapreg(ndis_handle, uint32_t, uint8_t, uint32_t, uint32_t); __stdcall static void ndis_free_mapreg(ndis_handle); @@ -242,6 +244,7 @@ __stdcall static void ndis_map_file(ndis_status *, void **, ndis_handle); __stdcall static void ndis_unmap_file(ndis_handle); __stdcall static void ndis_close_file(ndis_handle); +__stdcall static u_int8_t ndis_cpu_cnt(void); __stdcall static void dummy(void); @@ -883,7 +886,7 @@ block = (ndis_miniport_block *)handle; ne = malloc(sizeof(struct ndis_timer_entry), M_DEVBUF, M_NOWAIT); - callout_handle_init(&ne->nte_ch); + callout_init(&ne->nte_ch, CALLOUT_MPSAFE); TAILQ_INSERT_TAIL(&block->nmb_timerlist, ne, link); ne->nte_timer = timer; @@ -927,7 +930,7 @@ ndis_miniport_timer *timer; uint32_t msecs; { - struct callout_handle *ch; + struct callout *ch; struct timeval tv; tv.tv_sec = 0; @@ -936,8 +939,7 @@ ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_dpc.nk_sysarg2 = ndis_timercall; timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; - *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, (void *)timer, - tvtohz(&tv)); + callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); return; } @@ -947,7 +949,7 @@ void *arg; { ndis_miniport_timer *timer; - struct callout_handle *ch; + struct callout *ch; __stdcall ndis_timer_function timerfunc; struct timeval tv; @@ -964,8 +966,7 @@ ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; timer->nmt_dpc.nk_sysarg2 = ndis_tick; - *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, - tvtohz(&tv)); + callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); return; } @@ -975,7 +976,7 @@ ndis_miniport_timer *timer; uint32_t msecs; { - struct callout_handle *ch; + struct callout *ch; struct timeval tv; tv.tv_sec = 0; @@ -985,8 +986,7 @@ ch = timer->nmt_dpc.nk_deferredctx; timer->nmt_dpc.nk_sysarg2 = ndis_tick; timer->nmt_ktimer.nk_header.dh_sigstate = TRUE; - *ch = timeout((timeout_t *)timer->nmt_dpc.nk_sysarg2, timer, - tvtohz(&tv)); + callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); return; } @@ -996,10 +996,10 @@ ndis_miniport_timer *timer; uint8_t *cancelled; { - struct callout_handle *ch; + struct callout *ch; ch = timer->nmt_dpc.nk_deferredctx; - untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + callout_stop(ch); *cancelled = timer->nmt_ktimer.nk_header.dh_sigstate; return; @@ -1089,6 +1089,15 @@ } __stdcall static ndis_status +ndis_mapreg_cnt(bustype, cnt) + uint32_t bustype; + uint32_t *cnt; +{ + *cnt = 64; + return(NDIS_STATUS_SUCCESS); +} + +__stdcall static ndis_status ndis_alloc_mapreg(adapter, dmachannel, dmasize, physmapneeded, maxmap) ndis_handle adapter; uint32_t dmachannel; @@ -2252,6 +2261,16 @@ return; } +__stdcall static uint8_t +ndis_cpu_cnt() +{ +#ifdef SMP + return(mp_ncpus); +#else + return(1); +#endif +}; + __stdcall static void dummy() { @@ -2260,6 +2279,7 @@ } image_patch_table ndis_functbl[] = { + { "NdisSystemProcessorCount", (FUNC)ndis_cpu_cnt }, { "NdisUnchainBufferAtBack", (FUNC)ndis_unchain_tailbuf, }, { "NdisGetFirstBufferFromPacket", (FUNC)ndis_firstbuf }, { "NdisGetFirstBufferFromPacketSafe", (FUNC)ndis_firstbuf_safe }, @@ -2309,8 +2329,9 @@ { "NdisMRegisterIoPortRange", (FUNC)ndis_register_ioport }, { "NdisMDeregisterIoPortRange", (FUNC)ndis_deregister_ioport }, { "NdisReadNetworkAddress", (FUNC)ndis_read_netaddr }, + { "NdisQueryMapRegisterCount", (FUNC)ndis_mapreg_cnt }, { "NdisMAllocateMapRegisters", (FUNC)ndis_alloc_mapreg }, - { "NdisMFreeMapRegisters", (FUNC)ndis_free_mapreg }, + { "NdisMFreeMapRegisters", (FUNC)ndis_free_mapreg }, { "NdisMAllocateSharedMemory", (FUNC)ndis_alloc_sharedmem }, { "NdisMMapIoSpace", (FUNC)ndis_map_iospace }, { "NdisMUnmapIoSpace", (FUNC)ndis_unmap_iospace }, ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.2 2003/12/24 21:21:18 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.3 2003/12/26 03:31:34 wpaul Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -520,7 +520,7 @@ fptr = (vm_offset_t *)pe_translate_addr(imgbase, imp_desc.iid_import_address_table_addr); - while (nptr != 0 && pe_translate_addr(imgbase, *nptr) != 0) { + while (nptr != NULL && pe_translate_addr(imgbase, *nptr)) { fname = (char *)pe_translate_addr(imgbase, (*nptr) + 2); func = pe_functbl_match(functbl, fname); if (func) ==== //depot/projects/netperf+sockets/sys/dev/acpica/acpi.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.111 2003/12/23 18:47:31 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.112 2003/12/26 15:42:13 jhb Exp $ */ #include "opt_acpi.h" @@ -1216,10 +1216,10 @@ return (FALSE); devinfo = (ACPI_DEVICE_INFO *)buf.Pointer; - if ((devinfo->Valid & ACPI_VALID_HID) != 0) { - if (strcmp(hid, devinfo->HardwareId.Value) == 0) + if ((devinfo->Valid & ACPI_VALID_HID) != 0 && + strcmp(hid, devinfo->HardwareId.Value) == 0) ret = TRUE; - } else if ((devinfo->Valid & ACPI_VALID_CID) != 0) { + else if ((devinfo->Valid & ACPI_VALID_CID) != 0) { for (i = 0; i < devinfo->CompatibilityId.Count; i++) { if (strcmp(hid, devinfo->CompatibilityId.Id[i].Value) == 0) { ret = TRUE; ==== //depot/projects/netperf+sockets/sys/dev/gem/if_gem_pci.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.12 2003/09/02 20:24:42 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.13 2003/12/26 05:36:08 obrien Exp $"); /* * PCI bindings for Sun GEM ethernet controllers. @@ -126,7 +126,7 @@ { 0x2bad108e, GEM_SUN_GEM, "Sun GEM Gigabit Ethernet Adaptor" }, { 0x0021106b, GEM_APPLE_GMAC, "Apple GMAC Ethernet Adaptor" }, { 0x0024106b, GEM_APPLE_GMAC, "Apple GMAC2 Ethernet Adaptor" }, - { 0, NULL } + { 0, 0, NULL } }; /* ==== //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.13 2003/12/25 09:44:49 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.15 2003/12/26 07:01:05 wpaul Exp $"); #include "opt_bdg.h" @@ -633,6 +633,21 @@ /* * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. + * + * When handling received NDIS packets, the 'status' field in the + * out-of-band portion of the ndis_packet has special meaning. In the + * most common case, the underlying NDIS driver will set this field + * to NDIS_STATUS_SUCCESS, which indicates that it's ok for us to + * take posession of it. We then change the status field to + * NDIS_STATUS_PENDING to tell the driver that we now own the packet, + * and that we will return it at some point in the future via the + * return packet handler. + * + * If the driver hands us a packet with a status of NDIS_STATUS_RESOURCES, + * this means the driver is running out of packet/buffer resources and + * wants to maintain ownership of the packet. In this case, we have to + * copy the packet data into local storage and let the driver keep the + * packet. */ __stdcall static void ndis_rxeof(adapter, packets, pktcnt) @@ -644,7 +659,7 @@ ndis_miniport_block *block; ndis_packet *p; struct ifnet *ifp; - struct mbuf *m0; + struct mbuf *m0, *m; int i; block = (ndis_miniport_block *)adapter; @@ -657,8 +672,18 @@ p->np_softc = sc; if (ndis_ptom(&m0, p)) { printf ("ndis%d: ptom failed\n", sc->ndis_unit); - ndis_return_packet(sc, p); + if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS) + ndis_return_packet(sc, p); } else { + if (p->np_oob.npo_status == NDIS_STATUS_RESOURCES) { + m = m_dup(m0, M_DONTWAIT); + m_freem(m0); + if (m == NULL) + ifp->if_ierrors++; + else + m0 = m; + } else + p->np_oob.npo_status = NDIS_STATUS_PENDING; m0->m_pkthdr.rcvif = ifp; ifp->if_ipackets++; (*ifp->if_input)(ifp, m0); @@ -1048,6 +1073,12 @@ ndis_media_state linkstate; int error, len; + ifmr->ifm_status = IFM_AVALID; + ifmr->ifm_active = IFM_ETHER; + + if (!(ifp->if_flags & IFF_UP)) + return; + sc = ifp->if_softc; len = sizeof(linkstate); @@ -1058,9 +1089,6 @@ error = ndis_get_info(sc, OID_GEN_LINK_SPEED, (void *)&media_info, &len); - ifmr->ifm_status = IFM_AVALID; - ifmr->ifm_active = IFM_ETHER; - if (linkstate == nmc_connected) ifmr->ifm_status |= IFM_ACTIVE; ==== //depot/projects/netperf+sockets/sys/dev/sio/sio_puc.c#2 (text+ko) ==== @@ -24,10 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.6 2003/08/24 18:03:44 obrien Exp $"); - -#include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.6 2003/08/24 18:03:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.7 2003/12/26 04:30:01 imp Exp $"); #include #include ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/bootsect.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/bootsect.h,v 1.10 2002/10/21 19:00:50 jhb Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/bootsect.h,v 1.11 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $ */ /* ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/bpb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/bpb.h,v 1.9 2001/11/28 16:56:42 jhb Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/bpb.h,v 1.10 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $ */ /* ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/denode.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/denode.h,v 1.25 2003/06/24 22:11:20 jmg Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/denode.h,v 1.27 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $ */ /*- @@ -160,6 +160,7 @@ u_long de_FileSize; /* size of file in bytes */ struct fatcache de_fc[FC_SIZE]; /* fat cache */ u_quad_t de_modrev; /* Revision level for lease. */ + struct lockf *de_lockf; /* lockf */ }; /* ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/direntry.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/direntry.h,v 1.18 2003/09/27 01:18:27 bde Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/direntry.h,v 1.19 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $ */ /*- ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/fat.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/fat.h,v 1.11 2002/03/19 22:20:10 alfred Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/fat.h,v 1.13 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $ */ /*- @@ -99,5 +99,6 @@ int freeclusterchain(struct msdosfsmount *pmp, u_long startchain); int extendfile(struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags); void fc_purge(struct denode *dep, u_int frcn); +int markvoldirty(struct msdosfsmount *pmp, int dirty); #endif /* _KERNEL */ ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_conv.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_conv.c,v 1.35 2003/12/08 08:32:20 fjoe Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_conv.c,v 1.36 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $ */ /*- ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_denode.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.71 2003/10/05 02:43:29 jeff Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.72 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */ /*- ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_fat.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_fat.c,v 1.32 2003/03/04 00:04:42 jeff Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_fat.c,v 1.34 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */ /*- @@ -1106,3 +1106,70 @@ return (0); } + +/* [2753891] + * Routine to mark a FAT16 or FAT32 volume as "clean" or "dirty" by manipulating the upper bit + * of the FAT entry for cluster 1. Note that this bit is not defined for FAT12 volumes, which + * are always assumed to be dirty. + * + * The fatentry() routine only works on cluster numbers that a file could occupy, so it won't + * manipulate the entry for cluster 1. So we have to do it here. The code is ripped from + * fatentry(), and tailored for cluster 1. + * + * Inputs: + * pmp The MS-DOS volume to mark + * dirty Non-zero if the volume should be marked dirty; zero if it should be marked clean. + * + * Result: + * 0 Success + * EROFS Volume is read-only + * ? (other errors from called routines) + */ +int markvoldirty(struct msdosfsmount *pmp, int dirty) +{ + int error; + u_long bn, bo, bsize, byteoffset; + u_long fatval; + struct buf *bp; + + /* FAT12 does not support a "clean" bit, so don't do anything */ + if (FAT12(pmp)) + return 0; + + /* Can't change the bit on a read-only filesystem */ + if (pmp->pm_flags & MSDOSFSMNT_RONLY) + return EROFS; + + /* Fetch the block containing the FAT entry */ + byteoffset = FATOFS(pmp, 1); /* Find the location of cluster 1 */ + fatblock(pmp, byteoffset, &bn, &bsize, &bo); + + error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp); + if (error) { + brelse(bp); + return (error); + } + + /* Get the current value of the FAT entry and set/clear the high bit */ + if (FAT32(pmp)) { + /* FAT32 uses bit 27 */ + fatval = getulong(&bp->b_data[bo]); + if (dirty) + fatval &= 0xF7FFFFFF; /* dirty means clear the "clean" bit */ + else + fatval |= 0x08000000; /* clean means set the "clean" bit */ + putulong(&bp->b_data[bo], fatval); + } + else { + /* Must be FAT16; use bit 15 */ + fatval = getushort(&bp->b_data[bo]); + if (dirty) + fatval &= 0x7FFF; /* dirty means clear the "clean" bit */ + else + fatval |= 0x8000; /* clean means set the "clean" bit */ + putushort(&bp->b_data[bo], fatval); + } + + /* Write out the modified FAT block immediately */ + return bwrite(bp); +} ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_iconv.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_iconv.c,v 1.1 2003/09/26 20:26:23 fjoe Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_iconv.c,v 1.2 2003/12/26 17:24:37 trhodes Exp $"); #include #include ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_lookup.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_lookup.c,v 1.39 2003/09/26 20:26:23 fjoe Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_lookup.c,v 1.40 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $ */ /*- ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_vfsops.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.111 2003/11/05 04:30:06 kan Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.113 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -209,6 +209,11 @@ VOP_UNLOCK(devvp, 0, td); } pmp->pm_flags &= ~MSDOSFSMNT_RONLY; + + /* [2753891] Now that the volume is modifiable, mark it dirty */ + error = markvoldirty(pmp, 1); + if (error) + return error; } if (args.fspec == 0) { #ifdef __notyet__ /* doesn't work correctly with current mountd XXX */ @@ -609,8 +614,12 @@ */ if (ronly) pmp->pm_flags |= MSDOSFSMNT_RONLY; - else + else { + /* [2753891] Mark the volume dirty while it is mounted read/write */ + if ((error = markvoldirty(pmp, 1)) != 0) + goto error_exit; pmp->pm_fmod = 1; + } mp->mnt_data = (qaddr_t) pmp; mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; @@ -667,6 +676,13 @@ msdosfs_iconv->close(pmp->pm_u2d); } pmp->pm_devvp->v_rdev->si_mountpoint = NULL; + + /* [2753891] If the volume was mounted read/write, mark it clean now */ + if ((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0) { + error = markvoldirty(pmp, 0); + if (error && !(flags & FORCECLOSE)) + return (error); + } #ifdef MSDOSFS_DEBUG { struct vnode *vp = pmp->pm_devvp; ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_vnops.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.143 2003/10/18 14:10:24 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.145 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -101,6 +102,7 @@ static int msdosfs_strategy(struct vop_strategy_args *); static int msdosfs_print(struct vop_print_args *); static int msdosfs_pathconf(struct vop_pathconf_args *ap); +static int msdosfs_advlock(struct vop_advlock_args *); /* * Some general notes: @@ -1836,6 +1838,23 @@ /* NOTREACHED */ } +/* + * Advisory record locking support + */ +static int +msdosfs_advlock(ap) + struct vop_advlock_args /* { + struct vnode *a_vp; + u_char a_id; + int a_op; + struct flock *a_fl; + int a_flags; + } */ *ap; +{ + struct denode *ip = VTODE(ap->a_vp); + + return (lf_advlock(ap, &(ip->de_lockf), ip->de_FileSize)); +} /* Global vfs data structures for msdosfs */ vop_t **msdosfs_vnodeop_p; @@ -1865,6 +1884,7 @@ { &vop_strategy_desc, (vop_t *) msdosfs_strategy }, { &vop_symlink_desc, (vop_t *) msdosfs_symlink }, { &vop_write_desc, (vop_t *) msdosfs_write }, + { &vop_advlock_desc, (vop_t *) msdosfs_advlock }, { NULL, NULL } }; static struct vnodeopv_desc msdosfs_vnodeop_opv_desc = ==== //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfsmount.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.29 2003/09/26 20:26:23 fjoe Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.30 2003/12/26 17:24:37 trhodes Exp $ */ /* $NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $ */ /*- ==== //depot/projects/netperf+sockets/sys/kern/kern_event.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.65 2003/11/14 18:49:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.66 2003/12/25 23:42:36 dwmalone Exp $"); #include #include @@ -395,7 +395,6 @@ fp->f_flag = FREAD | FWRITE; fp->f_type = DTYPE_KQUEUE; fp->f_ops = &kqueueops; - TAILQ_INIT(&kq->kq_head); fp->f_data = kq; FILE_UNLOCK(fp); fdrop(fp, td); ==== //depot/projects/netperf+sockets/sys/kern/kern_subr.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.77 2003/10/02 15:00:55 nectar Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.78 2003/12/26 05:54:35 alfred Exp $"); #include "opt_zero.h" @@ -448,7 +448,8 @@ } int -copyinfrom(const void *src, void *dst, size_t len, int seg) +copyinfrom(const void * __restrict src, void * __restrict dst, size_t len, + int seg) { int error = 0; @@ -466,7 +467,8 @@ } int -copyinstrfrom(const void *src, void *dst, size_t len, size_t *copied, int seg) +copyinstrfrom(const void * __restrict src, void * __restrict dst, size_t len, + size_t * __restrict copied, int seg) { int error = 0; ==== //depot/projects/netperf+sockets/sys/kern/sched_4bsd.c#3 (text+ko) ==== @@ -37,13 +37,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.28 2003/11/09 13:45:54 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.29 2003/12/26 17:07:29 jhb Exp $"); #include #include #include #include #include +#include #include #include #include @@ -80,11 +81,11 @@ static int sched_quantum; /* Roundrobin scheduling quantum in ticks. */ #define SCHED_QUANTUM (hz / 10) /* Default sched quantum */ -static struct callout schedcpu_callout; static struct callout roundrobin_callout; static void roundrobin(void *arg); -static void schedcpu(void *arg); +static void schedcpu(void); +static void schedcpu_thread(void *dummy); static void sched_setup(void *dummy); static void maybe_resched(struct thread *td); static void updatepri(struct ksegrp *kg); @@ -244,7 +245,7 @@ */ /* ARGSUSED */ static void -schedcpu(void *arg) +schedcpu(void) { register fixpt_t loadfac = loadfactor(averunnable.ldavg[0]); struct thread *td; @@ -348,7 +349,20 @@ mtx_unlock_spin(&sched_lock); } /* end of process loop */ sx_sunlock(&allproc_lock); - callout_reset(&schedcpu_callout, hz, schedcpu, NULL); +} + +/* + * Main loop for a kthread that executes schedcpu once a second. + */ +static void +schedcpu_thread(void *dummy) +{ + int nowake; + + for (;;) { + schedcpu(); + tsleep(&nowake, curthread->td_priority, "-", hz); + } } /* @@ -407,12 +421,13 @@ sched_quantum = SCHED_QUANTUM; hogticks = 2 * sched_quantum; - callout_init(&schedcpu_callout, CALLOUT_MPSAFE); callout_init(&roundrobin_callout, 0); /* Kick off timeout driven events by calling first time. */ roundrobin(NULL); - schedcpu(NULL); + + /* Kick off schedcpu kernel process. */ + kthread_create(schedcpu_thread, NULL, NULL, 0, 0, "schedcpu"); } /* External interfaces start here */ ==== //depot/projects/netperf+sockets/sys/kern/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.164 2003/12/24 19:09:45 alfred Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.165 2003/12/26 05:58:16 alfred Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -80,14 +80,14 @@ 27 MSTD { int recvmsg(int s, struct msghdr *msg, int flags); } 28 MSTD { int sendmsg(int s, struct msghdr *msg, int flags); } 29 MSTD { int recvfrom(int s, caddr_t buf, size_t len, int flags, \ - struct sockaddr * from, \ - __socklen_t * fromlenaddr); } -30 MSTD { int accept(int s, struct sockaddr * name, \ - __socklen_t *anamelen); } -31 MSTD { int getpeername(int fdes, struct sockaddr * asa, \ - __socklen_t *alen); } -32 MSTD { int getsockname(int fdes, struct sockaddr * asa, \ - __socklen_t *alen); } + struct sockaddr * __restrict from, \ + __socklen_t * __restrict fromlenaddr); } +30 MSTD { int accept(int s, struct sockaddr * __restrict name, \ + __socklen_t * __restrict anamelen); } +31 MSTD { int getpeername(int fdes, struct sockaddr * __restrict asa, \ + __socklen_t * __restrict alen); } +32 MSTD { int getsockname(int fdes, struct sockaddr * __restrict asa, \ + __socklen_t * __restrict alen); } 33 STD { int access(char *path, int flags); } 34 STD { int chflags(char *path, int flags); } 35 STD { int fchflags(int fd, int flags); } ==== //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#5 (text+ko) ==== ==== //depot/projects/netperf+sockets/sys/net/if.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.173 2003/10/31 18:32:08 brooks Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.174 2003/12/26 18:09:35 green Exp $ */ #include "opt_compat.h" @@ -1229,7 +1229,7 @@ struct ifnet * ifunit(const char *name) { - char namebuf[IFNAMSIZ + 1]; + char namebuf[IFNAMSIZ + sizeof("net")]; /* XXX net_cdevsw.d_name */ struct ifnet *ifp; dev_t dev; @@ -1241,7 +1241,7 @@ * XXX * Devices should really be known as /dev/fooN, not /dev/net/fooN. */ - snprintf(namebuf, IFNAMSIZ, "%s/%s", net_cdevsw.d_name, name); + snprintf(namebuf, sizeof(namebuf), "%s/%s", net_cdevsw.d_name, name); IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { dev = ifdev_byindex(ifp->if_index); ==== //depot/projects/netperf+sockets/sys/netinet6/ip6_fw.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.29 2003/10/31 18:32:12 brooks Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.30 2003/12/25 23:39:27 dwmalone Exp $ */ /* $KAME: ip6_fw.c,v 1.21 2001/01/24 01:25:32 itojun Exp $ */ /* @@ -810,6 +810,8 @@ *m = 0; break; } + if (tcp->th_flags & TH_SYN) + ack++; seq = 0; flags = TH_RST|TH_ACK; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 27 16:29:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBEA716A4D0; Sat, 27 Dec 2003 16:29: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 B664B16A4CE for ; Sat, 27 Dec 2003 16:29:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 736B643D1D for ; Sat, 27 Dec 2003 16:29:34 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBS0TY0B043044 for ; Sat, 27 Dec 2003 16:29:34 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBS0TYZW043041 for perforce@freebsd.org; Sat, 27 Dec 2003 16:29:34 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 27 Dec 2003 16:29:34 -0800 (PST) Message-Id: <200312280029.hBS0TYZW043041@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 44409 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: Sun, 28 Dec 2003 00:29:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=44409 Change 44409 by sam@sam_ebb on 2003/12/27 16:29:12 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#8 integrate .. //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/netperf/sys/dev/sio/sio_ebus.c#3 integrate .. //depot/projects/netperf/sys/dev/sio/sio_isa.c#4 integrate .. //depot/projects/netperf/sys/dev/sio/sio_puc.c#4 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi_pccard.c#8 integrate .. //depot/projects/netperf/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#10 integrate .. //depot/projects/netperf/sys/kern/kern_exec.c#9 integrate .. //depot/projects/netperf/sys/kern/subr_mbuf.c#9 integrate .. //depot/projects/netperf/sys/modules/sio/Makefile#1 branch .. //depot/projects/netperf/sys/netinet/ip_dummynet.c#21 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/vm_machdep.c#6 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/netperf/sys/sys/uio.h#4 integrate .. //depot/projects/netperf/sys/vm/vm_kern.c#9 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#8 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.96 2003/11/16 23:40:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.97 2003/12/27 07:52:46 silby Exp $"); #include "opt_kstack_pages.h" @@ -116,6 +116,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -428,6 +429,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); @@ -457,6 +460,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#10 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.224 2003/11/21 03:02:00 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.225 2003/12/27 07:52:46 silby Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -99,6 +99,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -473,6 +474,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); @@ -502,6 +505,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf/sys/dev/sio/sio_ebus.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.4 2003/08/23 00:11:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.5 2003/12/27 19:47:10 imp Exp $"); #include #include @@ -48,6 +48,7 @@ /* Device interface */ DEVMETHOD(device_probe, sio_ebus_probe), DEVMETHOD(device_attach, sio_ebus_attach), + DEVMETHOD(device_detach, siodetach), { 0, 0 } }; ==== //depot/projects/netperf/sys/dev/sio/sio_isa.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.13 2003/08/25 09:48:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.14 2003/12/27 19:47:10 imp Exp $"); #include #include @@ -51,6 +51,7 @@ /* Device interface */ DEVMETHOD(device_probe, sio_isa_probe), DEVMETHOD(device_attach, sio_isa_attach), + DEVMETHOD(device_detach, siodetach), { 0, 0 } }; ==== //depot/projects/netperf/sys/dev/sio/sio_puc.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.7 2003/12/26 04:30:01 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.8 2003/12/27 19:47:10 imp Exp $"); #include #include @@ -52,6 +52,7 @@ /* Device interface */ DEVMETHOD(device_probe, sio_puc_probe), DEVMETHOD(device_attach, sio_puc_attach), + DEVMETHOD(device_detach, siodetach), { 0, 0 } }; ==== //depot/projects/netperf/sys/dev/wi/if_wi_pccard.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.41 2003/09/22 05:33:22 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.42 2003/12/27 18:07:50 imp Exp $"); #include "opt_wi.h" @@ -136,8 +136,8 @@ PCMCIA_CARD(BROMAX, IWN, 0), PCMCIA_CARD(BROMAX, IWN3, 0), PCMCIA_CARD(BROMAX, WCF11, 0), + PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0), PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0), - PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0), PCMCIA_CARD(COMPAQ, NC5004, 0), PCMCIA_CARD(CONTEC, FX_DS110_PCC, 0), PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11, 0), @@ -155,16 +155,16 @@ PCMCIA_CARD(INTEL, PRO_WLAN_2011, 0), PCMCIA_CARD(INTERSIL, MA401RA, 0), PCMCIA_CARD(INTERSIL2, PRISM2, 0), + PCMCIA_CARD(IODATA2, WCF12, 0), PCMCIA_CARD(IODATA2, WNB11PCM, 0), - PCMCIA_CARD(IODATA2, WCF12, 0), PCMCIA_CARD(FUJITSU, WL110, 0), PCMCIA_CARD(LUCENT, WAVELAN_IEEE, 0), PCMCIA_CARD(MICROSOFT, MN_520, 0), PCMCIA_CARD(NOKIA, C020_WLAN, 0), PCMCIA_CARD(NOKIA, C110_WLAN, 0), PCMCIA_CARD(PLANEX_2, GWNS11H, 0), + PCMCIA_CARD(PROXIM, HARMONY, 0), PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0), - PCMCIA_CARD(PROXIM, HARMONY, 0), PCMCIA_CARD(SAMSUNG, SWL_2000N, 0), PCMCIA_CARD(SIEMENS, SS1021, 0), PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT, 0), ==== //depot/projects/netperf/sys/i386/i386/vm_machdep.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.220 2003/12/07 22:49:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.221 2003/12/27 07:52:47 silby Exp $"); #include "opt_npx.h" #ifdef PC98 @@ -112,6 +112,7 @@ static TAILQ_HEAD(, sf_buf) sf_buf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; /* * A lock used to synchronize access to the hash table and free list @@ -612,6 +613,10 @@ if (sf->ref_count == 0) TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); sf->ref_count++; + if (sf->ref_count == 1) { + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); + } goto done; } } @@ -633,6 +638,8 @@ LIST_INSERT_HEAD(hash_list, sf, list_entry); sf->ref_count = 1; sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); pmap_qenter(sf->kva, &sf->m, 1); done: mtx_unlock(&sf_buf_lock); @@ -653,6 +660,7 @@ m = sf->m; sf->ref_count--; if (sf->ref_count == 0) { + nsfbufsused--; TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry); if (sf_buf_alloc_want > 0) wakeup_one(&sf_buf_freelist); ==== //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.76 2003/11/16 23:40:06 alc Exp $ + * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.77 2003/12/27 07:52:47 silby Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -113,6 +113,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; void cpu_thread_exit(struct thread *td) @@ -365,6 +366,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); @@ -394,6 +397,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf/sys/kern/kern_exec.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.232 2003/11/12 03:14:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.233 2003/12/27 19:40:03 alc Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -795,7 +795,6 @@ exec_unmap_first_page(imgp) struct image_params *imgp; { - GIANT_REQUIRED; if (imgp->firstpage) { pmap_qremove((vm_offset_t)imgp->image_header, 1); ==== //depot/projects/netperf/sys/kern/subr_mbuf.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_mbuf.c,v 1.57 2003/12/07 21:53:41 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_mbuf.c,v 1.58 2003/12/27 07:52:47 silby Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -173,6 +173,8 @@ int nmbclusters; int nmbcnt; int nsfbufs; +int nsfbufspeak; +int nsfbufsused; /* * Sizes of objects per bucket. There are this size's worth of mbufs @@ -318,6 +320,10 @@ "Number used to scale kmem_map to ensure sufficient space for counters"); SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RDTUN, &nsfbufs, 0, "Maximum number of sendfile(2) sf_bufs available"); +SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufspeak, CTLFLAG_RD, &nsfbufspeak, 0, + "Number of sendfile(2) sf_bufs at peak usage"); +SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0, + "Number of sendfile(2) sf_bufs in use"); SYSCTL_INT(_kern_ipc, OID_AUTO, mbuf_wait, CTLFLAG_RW, &mbuf_wait, 0, "Sleep time of mbuf subsystem wait allocations during exhaustion"); SYSCTL_UINT(_kern_ipc, OID_AUTO, mbuf_hiwm, CTLFLAG_RW, &mbuf_hiwm, 0, ==== //depot/projects/netperf/sys/netinet/ip_dummynet.c#21 (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.75 2003/12/06 09:01:25 emax Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.76 2003/12/27 14:08:53 maxim Exp $ */ #define DUMMYNET_DEBUG @@ -79,7 +79,7 @@ /* * We keep a private variable for the simulation time, but we could - * probably use an existing one ("softticks" in sys/kern/kern_timer.c) + * probably use an existing one ("softticks" in sys/kern/kern_timeout.c) */ static dn_key curr_time = 0 ; /* current simulation time */ ==== //depot/projects/netperf/sys/powerpc/powerpc/vm_machdep.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.93 2003/11/16 23:40:06 alc Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.94 2003/12/27 07:52:47 silby Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -116,6 +116,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -282,6 +283,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); pmap_qenter(sf->kva, &sf->m, 1); } mtx_unlock(&sf_freelist.sf_lock); @@ -313,6 +316,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf/sys/sparc64/sparc64/vm_machdep.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * from: FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.167 2001/07/12 - * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.55 2003/11/16 23:40:06 alc Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.56 2003/12/27 07:52:47 silby Exp $ */ #include "opt_kstack_pages.h" @@ -100,6 +100,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; PMAP_STATS_VAR(uma_nsmall_alloc); PMAP_STATS_VAR(uma_nsmall_alloc_oc); @@ -409,6 +410,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); pmap_qenter(sf->kva, &sf->m, 1); } mtx_unlock(&sf_freelist.sf_lock); @@ -440,6 +443,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf/sys/sys/uio.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uio.h 8.5 (Berkeley) 2/22/94 - * $FreeBSD: src/sys/sys/uio.h,v 1.29 2003/12/26 05:54:35 alfred Exp $ + * $FreeBSD: src/sys/sys/uio.h,v 1.30 2003/12/27 10:30:43 bde Exp $ */ #ifndef _SYS_UIO_H_ @@ -85,14 +85,15 @@ struct vm_object; -void uio_yield(void); -int uiomove(void *, int, struct uio *); -int uiomove_frombuf(void *buf, int buflen, struct uio *uio); -int uiomoveco(void *, int, struct uio *, struct vm_object *, int); int copyinfrom(const void * __restrict src, void * __restrict dst, size_t len, int seg); int copyinstrfrom(const void * __restrict src, void * __restrict dst, size_t len, size_t * __restrict copied, int seg); +void uio_yield(void); +int uiomove(void *cp, int n, struct uio *uio); +int uiomove_frombuf(void *buf, int buflen, struct uio *uio); +int uiomoveco(void *cp, int n, struct uio *uio, struct vm_object *obj, + int disposable); #else /* !_KERNEL */ ==== //depot/projects/netperf/sys/vm/vm_kern.c#9 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.108 2003/11/10 00:44:00 mini Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.109 2003/12/28 00:10:48 alc Exp $"); #include #include @@ -261,8 +261,6 @@ int ret; vm_map_t result; - GIANT_REQUIRED; - size = round_page(size); *min = (vm_offset_t) vm_map_min(parent); From owner-p4-projects@FreeBSD.ORG Sat Dec 27 16:30:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D815516A4D0; Sat, 27 Dec 2003 16:30: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 B274916A4CE for ; Sat, 27 Dec 2003 16:30:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54C2C43D4C for ; Sat, 27 Dec 2003 16:30:36 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBS0Ua0B043148 for ; Sat, 27 Dec 2003 16:30:36 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBS0UZOL043145 for perforce@freebsd.org; Sat, 27 Dec 2003 16:30:35 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 27 Dec 2003 16:30:35 -0800 (PST) Message-Id: <200312280030.hBS0UZOL043145@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 44410 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: Sun, 28 Dec 2003 00:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=44410 Change 44410 by sam@sam_ebb on 2003/12/27 16:29:47 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/alpha/alpha/vm_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_exec.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_mbuf.c#3 integrate .. //depot/projects/netperf+sockets/sys/modules/sio/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/sys/uio.h#3 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_kern.c#3 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/alpha/alpha/vm_machdep.c#3 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.96 2003/11/16 23:40:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.97 2003/12/27 07:52:46 silby Exp $"); #include "opt_kstack_pages.h" @@ -116,6 +116,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -428,6 +429,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); @@ -457,6 +460,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf+sockets/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.224 2003/11/21 03:02:00 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.225 2003/12/27 07:52:46 silby Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -99,6 +99,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -473,6 +474,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); @@ -502,6 +505,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf+sockets/sys/dev/sio/sio_ebus.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.4 2003/08/23 00:11:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.5 2003/12/27 19:47:10 imp Exp $"); #include #include @@ -48,6 +48,7 @@ /* Device interface */ DEVMETHOD(device_probe, sio_ebus_probe), DEVMETHOD(device_attach, sio_ebus_attach), + DEVMETHOD(device_detach, siodetach), { 0, 0 } }; ==== //depot/projects/netperf+sockets/sys/dev/sio/sio_isa.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.13 2003/08/25 09:48:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.14 2003/12/27 19:47:10 imp Exp $"); #include #include @@ -51,6 +51,7 @@ /* Device interface */ DEVMETHOD(device_probe, sio_isa_probe), DEVMETHOD(device_attach, sio_isa_attach), + DEVMETHOD(device_detach, siodetach), { 0, 0 } }; ==== //depot/projects/netperf+sockets/sys/dev/sio/sio_puc.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.7 2003/12/26 04:30:01 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.8 2003/12/27 19:47:10 imp Exp $"); #include #include @@ -52,6 +52,7 @@ /* Device interface */ DEVMETHOD(device_probe, sio_puc_probe), DEVMETHOD(device_attach, sio_puc_attach), + DEVMETHOD(device_detach, siodetach), { 0, 0 } }; ==== //depot/projects/netperf+sockets/sys/dev/wi/if_wi_pccard.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.41 2003/09/22 05:33:22 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.42 2003/12/27 18:07:50 imp Exp $"); #include "opt_wi.h" @@ -136,8 +136,8 @@ PCMCIA_CARD(BROMAX, IWN, 0), PCMCIA_CARD(BROMAX, IWN3, 0), PCMCIA_CARD(BROMAX, WCF11, 0), + PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0), PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0), - PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0), PCMCIA_CARD(COMPAQ, NC5004, 0), PCMCIA_CARD(CONTEC, FX_DS110_PCC, 0), PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11, 0), @@ -155,16 +155,16 @@ PCMCIA_CARD(INTEL, PRO_WLAN_2011, 0), PCMCIA_CARD(INTERSIL, MA401RA, 0), PCMCIA_CARD(INTERSIL2, PRISM2, 0), + PCMCIA_CARD(IODATA2, WCF12, 0), PCMCIA_CARD(IODATA2, WNB11PCM, 0), - PCMCIA_CARD(IODATA2, WCF12, 0), PCMCIA_CARD(FUJITSU, WL110, 0), PCMCIA_CARD(LUCENT, WAVELAN_IEEE, 0), PCMCIA_CARD(MICROSOFT, MN_520, 0), PCMCIA_CARD(NOKIA, C020_WLAN, 0), PCMCIA_CARD(NOKIA, C110_WLAN, 0), PCMCIA_CARD(PLANEX_2, GWNS11H, 0), + PCMCIA_CARD(PROXIM, HARMONY, 0), PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0), - PCMCIA_CARD(PROXIM, HARMONY, 0), PCMCIA_CARD(SAMSUNG, SWL_2000N, 0), PCMCIA_CARD(SIEMENS, SS1021, 0), PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT, 0), ==== //depot/projects/netperf+sockets/sys/i386/i386/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.220 2003/12/07 22:49:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.221 2003/12/27 07:52:47 silby Exp $"); #include "opt_npx.h" #ifdef PC98 @@ -112,6 +112,7 @@ static TAILQ_HEAD(, sf_buf) sf_buf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; /* * A lock used to synchronize access to the hash table and free list @@ -612,6 +613,10 @@ if (sf->ref_count == 0) TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry); sf->ref_count++; + if (sf->ref_count == 1) { + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); + } goto done; } } @@ -633,6 +638,8 @@ LIST_INSERT_HEAD(hash_list, sf, list_entry); sf->ref_count = 1; sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); pmap_qenter(sf->kva, &sf->m, 1); done: mtx_unlock(&sf_buf_lock); @@ -653,6 +660,7 @@ m = sf->m; sf->ref_count--; if (sf->ref_count == 0) { + nsfbufsused--; TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry); if (sf_buf_alloc_want > 0) wakeup_one(&sf_buf_freelist); ==== //depot/projects/netperf+sockets/sys/ia64/ia64/vm_machdep.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.76 2003/11/16 23:40:06 alc Exp $ + * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.77 2003/12/27 07:52:47 silby Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -113,6 +113,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; void cpu_thread_exit(struct thread *td) @@ -365,6 +366,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); @@ -394,6 +397,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf+sockets/sys/kern/kern_exec.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.232 2003/11/12 03:14:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.233 2003/12/27 19:40:03 alc Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -795,7 +795,6 @@ exec_unmap_first_page(imgp) struct image_params *imgp; { - GIANT_REQUIRED; if (imgp->firstpage) { pmap_qremove((vm_offset_t)imgp->image_header, 1); ==== //depot/projects/netperf+sockets/sys/kern/subr_mbuf.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_mbuf.c,v 1.57 2003/12/07 21:53:41 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_mbuf.c,v 1.58 2003/12/27 07:52:47 silby Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -173,6 +173,8 @@ int nmbclusters; int nmbcnt; int nsfbufs; +int nsfbufspeak; +int nsfbufsused; /* * Sizes of objects per bucket. There are this size's worth of mbufs @@ -318,6 +320,10 @@ "Number used to scale kmem_map to ensure sufficient space for counters"); SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RDTUN, &nsfbufs, 0, "Maximum number of sendfile(2) sf_bufs available"); +SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufspeak, CTLFLAG_RD, &nsfbufspeak, 0, + "Number of sendfile(2) sf_bufs at peak usage"); +SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0, + "Number of sendfile(2) sf_bufs in use"); SYSCTL_INT(_kern_ipc, OID_AUTO, mbuf_wait, CTLFLAG_RW, &mbuf_wait, 0, "Sleep time of mbuf subsystem wait allocations during exhaustion"); SYSCTL_UINT(_kern_ipc, OID_AUTO, mbuf_hiwm, CTLFLAG_RW, &mbuf_hiwm, 0, ==== //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.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/netinet/ip_dummynet.c,v 1.75 2003/12/06 09:01:25 emax Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.76 2003/12/27 14:08:53 maxim Exp $ */ #define DUMMYNET_DEBUG @@ -79,7 +79,7 @@ /* * We keep a private variable for the simulation time, but we could - * probably use an existing one ("softticks" in sys/kern/kern_timer.c) + * probably use an existing one ("softticks" in sys/kern/kern_timeout.c) */ static dn_key curr_time = 0 ; /* current simulation time */ ==== //depot/projects/netperf+sockets/sys/powerpc/powerpc/vm_machdep.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.93 2003/11/16 23:40:06 alc Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.94 2003/12/27 07:52:47 silby Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -116,6 +116,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -282,6 +283,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); pmap_qenter(sf->kva, &sf->m, 1); } mtx_unlock(&sf_freelist.sf_lock); @@ -313,6 +316,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf+sockets/sys/sparc64/sparc64/vm_machdep.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * from: FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.167 2001/07/12 - * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.55 2003/11/16 23:40:06 alc Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.56 2003/12/27 07:52:47 silby Exp $ */ #include "opt_kstack_pages.h" @@ -100,6 +100,7 @@ } sf_freelist; static u_int sf_buf_alloc_want; +extern int nsfbufspeak, nsfbufsused; PMAP_STATS_VAR(uma_nsmall_alloc); PMAP_STATS_VAR(uma_nsmall_alloc_oc); @@ -409,6 +410,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = max(nsfbufspeak, nsfbufsused); pmap_qenter(sf->kva, &sf->m, 1); } mtx_unlock(&sf_freelist.sf_lock); @@ -440,6 +443,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/netperf+sockets/sys/sys/uio.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uio.h 8.5 (Berkeley) 2/22/94 - * $FreeBSD: src/sys/sys/uio.h,v 1.29 2003/12/26 05:54:35 alfred Exp $ + * $FreeBSD: src/sys/sys/uio.h,v 1.30 2003/12/27 10:30:43 bde Exp $ */ #ifndef _SYS_UIO_H_ @@ -85,14 +85,15 @@ struct vm_object; -void uio_yield(void); -int uiomove(void *, int, struct uio *); -int uiomove_frombuf(void *buf, int buflen, struct uio *uio); -int uiomoveco(void *, int, struct uio *, struct vm_object *, int); int copyinfrom(const void * __restrict src, void * __restrict dst, size_t len, int seg); int copyinstrfrom(const void * __restrict src, void * __restrict dst, size_t len, size_t * __restrict copied, int seg); +void uio_yield(void); +int uiomove(void *cp, int n, struct uio *uio); +int uiomove_frombuf(void *buf, int buflen, struct uio *uio); +int uiomoveco(void *cp, int n, struct uio *uio, struct vm_object *obj, + int disposable); #else /* !_KERNEL */ ==== //depot/projects/netperf+sockets/sys/vm/vm_kern.c#3 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.108 2003/11/10 00:44:00 mini Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.109 2003/12/28 00:10:48 alc Exp $"); #include #include @@ -261,8 +261,6 @@ int ret; vm_map_t result; - GIANT_REQUIRED; - size = round_page(size); *min = (vm_offset_t) vm_map_min(parent); From owner-p4-projects@FreeBSD.ORG Sat Dec 27 16:55:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67F0016A4D0; Sat, 27 Dec 2003 16:55:07 -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 4405516A4CE for ; Sat, 27 Dec 2003 16:55:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AEB343D55 for ; Sat, 27 Dec 2003 16:55:06 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBS0t60B054656 for ; Sat, 27 Dec 2003 16:55:06 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBS0t6DI054653 for perforce@freebsd.org; Sat, 27 Dec 2003 16:55:06 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 27 Dec 2003 16:55:06 -0800 (PST) Message-Id: <200312280055.hBS0t6DI054653@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 44411 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: Sun, 28 Dec 2003 00:55:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=44411 Change 44411 by sam@sam_ebb on 2003/12/27 16:54:28 diff reduction Affected files ... .. //depot/projects/netperf/sys/conf/files#31 edit Differences ... ==== //depot/projects/netperf/sys/conf/files#31 (text+ko) ==== @@ -485,7 +485,6 @@ dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard -dev/kttcp/kttcp.c optional kttcp dev/led/led.c optional cpu_soekris dev/lge/if_lge.c optional lge dev/lnc/if_lnc.c optional lnc