From owner-p4-projects@FreeBSD.ORG Sun May 30 15:50:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F142316A4CF; Sun, 30 May 2004 15:50:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8187216A4D1 for ; Sun, 30 May 2004 15:50:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C35443D55 for ; Sun, 30 May 2004 15:50:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4UMo8aQ099089 for ; Sun, 30 May 2004 15:50:08 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4UMo7Rl099086 for perforce@freebsd.org; Sun, 30 May 2004 15:50:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 15:50:07 -0700 (PDT) Message-Id: <200405302250.i4UMo7Rl099086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53819 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, 30 May 2004 22:50:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=53819 Change 53819 by marcel@marcel_nfs on 2004/05/30 15:49:49 Include . Affected files ... .. //depot/projects/gdb/sys/i386/i386/intr_machdep.c#4 edit Differences ... ==== //depot/projects/gdb/sys/i386/i386/intr_machdep.c#4 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #include #ifdef DDB #include From owner-p4-projects@FreeBSD.ORG Sun May 30 15:55:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F0A816A4D0; Sun, 30 May 2004 15:55:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD6EC16A4CE for ; Sun, 30 May 2004 15:55:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C38C343D4C for ; Sun, 30 May 2004 15:55:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4UMtFju001088 for ; Sun, 30 May 2004 15:55:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4UMtEPc001085 for perforce@freebsd.org; Sun, 30 May 2004 15:55:14 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 15:55:14 -0700 (PDT) Message-Id: <200405302255.i4UMtEPc001085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53820 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, 30 May 2004 22:55:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=53820 Change 53820 by marcel@marcel_nfs on 2004/05/30 15:54:16 Make DDB conditional code dependent upon KDB or GDB where appropriate. Remove unneeded DDB specific includes. Affected files ... .. //depot/projects/gdb/sys/kern/kern_clock.c#7 edit .. //depot/projects/gdb/sys/kern/kern_synch.c#10 edit .. //depot/projects/gdb/sys/kern/link_elf.c#4 edit .. //depot/projects/gdb/sys/kern/sched_ule.c#10 edit .. //depot/projects/gdb/sys/kern/subr_witness.c#7 edit Differences ... ==== //depot/projects/gdb/sys/kern/kern_clock.c#7 (text+ko) ==== @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.168 2004/05/03 00:48:11 cperciva Exp $"); #include "opt_ntp.h" -#include "opt_ddb.h" #include "opt_watchdog.h" #include @@ -70,10 +69,6 @@ #include #endif -#ifdef DDB -#include -#endif - #ifdef DEVICE_POLLING extern void hardclock_device_poll(void); #endif /* DEVICE_POLLING */ ==== //depot/projects/gdb/sys/kern/kern_synch.c#10 (text+ko) ==== @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.248 2004/05/14 20:51:42 bde Exp $"); -#include "opt_ddb.h" #include "opt_ktrace.h" #include @@ -58,9 +57,6 @@ #include #include #include -#ifdef DDB -#include -#endif #ifdef KTRACE #include #include ==== //depot/projects/gdb/sys/kern/link_elf.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.78 2004/05/19 14:36:38 bde Exp $"); -#include "opt_ddb.h" +#include "opt_gdb.h" #include "opt_mac.h" #include @@ -94,7 +94,7 @@ long ddbstrcnt; /* number of bytes in string table */ caddr_t symbase; /* malloc'ed symbold base */ caddr_t strbase; /* malloc'ed string base */ -#ifdef DDB +#ifdef GDB struct link_map gdb; /* hooks for gdb */ #endif } *elf_file_t; @@ -146,7 +146,7 @@ static int relocate_file(elf_file_t ef); static int link_elf_preload_parse_symbols(elf_file_t ef); -#ifdef DDB +#ifdef GDB static void r_debug_state(struct r_debug *dummy_one, struct link_map *dummy_two); @@ -199,7 +199,7 @@ l->l_next->l_prev = l->l_prev; } } -#endif /* DDB */ +#endif /* GDB */ #ifdef __ia64__ Elf_Addr link_elf_get_gp(linker_file_t); @@ -223,7 +223,7 @@ static int link_elf_link_common_finish(linker_file_t lf) { -#ifdef DDB +#ifdef GDB elf_file_t ef = (elf_file_t)lf; char *newfilename; #endif @@ -234,7 +234,7 @@ if (error) return (error); -#ifdef DDB +#ifdef GDB GDB_STATE(RT_ADD); ef->gdb.l_addr = lf->address; newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, M_WAITOK); @@ -295,7 +295,7 @@ } (void)link_elf_preload_parse_symbols(ef); -#ifdef DDB +#ifdef GDB r_debug.r_map = NULL; r_debug.r_brk = r_debug_state; r_debug.r_state = RT_CONSISTENT; @@ -423,7 +423,7 @@ if (plttype != DT_REL && plttype != DT_RELA) return ENOEXEC; break; -#ifdef DDB +#ifdef GDB case DT_DEBUG: dp->d_un.d_ptr = (Elf_Addr) &r_debug; break; @@ -862,7 +862,7 @@ { elf_file_t ef = (elf_file_t) file; -#ifdef DDB +#ifdef GDB if (ef->gdb.l_ld) { GDB_STATE(RT_DELETE); free((void *)(uintptr_t)ef->gdb.l_name, M_LINKER); ==== //depot/projects/gdb/sys/kern/sched_ule.c#10 (text+ko) ==== @@ -43,9 +43,6 @@ #include #include #include -#ifdef DDB -#include -#endif #ifdef KTRACE #include #include ==== //depot/projects/gdb/sys/kern/subr_witness.c#7 (text+ko) ==== @@ -715,7 +715,7 @@ printf(" 1st %s @ %s:%d\n", lock1->li_lock->lo_name, lock1->li_file, lock1->li_line); printf(" 2nd %s @ %s:%d\n", lock->lo_name, file, line); -#ifdef DDB +#ifdef KDB goto debugger; #else return; @@ -846,7 +846,7 @@ printf(" 3rd %p %s (%s) @ %s:%d\n", lock, lock->lo_name, lock->lo_type, file, line); } -#ifdef DDB +#ifdef KDB goto debugger; #else return; From owner-p4-projects@FreeBSD.ORG Sun May 30 17:04:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9188316A4D1; Sun, 30 May 2004 17:04:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4943116A4CF for ; Sun, 30 May 2004 17:04:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 428F443D2F for ; Sun, 30 May 2004 17:04:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V040nM023350 for ; Sun, 30 May 2004 17:04:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V03xSB023344 for perforce@freebsd.org; Sun, 30 May 2004 17:03:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 17:03:59 -0700 (PDT) Message-Id: <200405310003.i4V03xSB023344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53825 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, 31 May 2004 00:04:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=53825 Change 53825 by marcel@marcel_nfs on 2004/05/30 17:03:30 s/DDB/KDB/g Affected files ... .. //depot/projects/gdb/sys/ufs/ffs/ffs_subr.c#3 edit Differences ... ==== //depot/projects/gdb/sys/ufs/ffs/ffs_subr.c#3 (text+ko) ==== @@ -58,7 +58,7 @@ #include #include -#ifdef DDB +#ifdef KDB void ffs_checkoverlap(struct buf *, struct inode *); #endif @@ -168,7 +168,7 @@ } } -#ifdef DDB +#ifdef KDB void ffs_checkoverlap(bp, ip) struct buf *bp; @@ -197,7 +197,7 @@ panic("ffs_checkoverlap: Disk buffer overlap"); } } -#endif /* DDB */ +#endif /* KDB */ /* * block operations From owner-p4-projects@FreeBSD.ORG Sun May 30 17:21:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E59116A4D2; Sun, 30 May 2004 17:21:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0D9C16A4CE for ; Sun, 30 May 2004 17:21:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9895743D1D for ; Sun, 30 May 2004 17:21:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V0LqSd026826 for ; Sun, 30 May 2004 17:21:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V0LL1k026378 for perforce@freebsd.org; Sun, 30 May 2004 17:21:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 17:21:21 -0700 (PDT) Message-Id: <200405310021.i4V0LL1k026378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53826 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, 31 May 2004 00:21:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=53826 Change 53826 by marcel@marcel_nfs on 2004/05/30 17:20:53 IFC @53823 Affected files ... .. //depot/projects/gdb/etc/defaults/rc.conf#9 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_drv/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/cc/cccp/Makefile#3 delete .. //depot/projects/gdb/gnu/usr.bin/cc/cpp0/Makefile#3 delete .. //depot/projects/gdb/gnu/usr.bin/cc/tradcpp0/Makefile#3 delete .. //depot/projects/gdb/include/complex.h#2 integrate .. //depot/projects/gdb/lib/msun/Makefile#3 integrate .. //depot/projects/gdb/lib/msun/src/s_cimag.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_cimagf.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_cimagl.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_conj.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_conjf.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_conjl.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_creal.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_crealf.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_creall.c#1 branch .. //depot/projects/gdb/sbin/geom/class/nop/gnop.8#4 integrate .. //depot/projects/gdb/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/gdb/share/man/man4/bge.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_tee.4#2 integrate .. //depot/projects/gdb/share/man/man5/periodic.conf.5#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/gdb/sys/amd64/amd64/support.S#9 integrate .. //depot/projects/gdb/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/gdb/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/gdb/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/gdb/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/gdb/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/gdb/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/gdb/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/gdb/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#18 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_button.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_lid.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#9 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_thermal.c#8 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#14 integrate .. //depot/projects/gdb/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/gdb/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/gdb/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/gdb/sys/dev/amd/amd.c#4 integrate .. //depot/projects/gdb/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/gdb/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/ar/if_ar.c#4 integrate .. //depot/projects/gdb/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/asr/asr.c#9 integrate .. //depot/projects/gdb/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/gdb/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/gdb/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/gdb/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/gdb/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/gdb/sys/dev/cy/cy_isa.c#3 integrate .. //depot/projects/gdb/sys/dev/cy/cy_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/dcons/dcons.c#5 integrate .. //depot/projects/gdb/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#3 integrate .. //depot/projects/gdb/sys/dev/digi/digi_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/digi/digi_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/em/if_em.h#2 integrate .. //depot/projects/gdb/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/fb/splash.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/gdb/sys/dev/gx/if_gx.c#6 integrate .. //depot/projects/gdb/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/gdb/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/gdb/sys/dev/ida/ida_disk.c#3 integrate .. //depot/projects/gdb/sys/dev/ida/ida_eisa.c#3 integrate .. //depot/projects/gdb/sys/dev/ida/ida_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/gdb/sys/dev/ips/ips.c#4 integrate .. //depot/projects/gdb/sys/dev/ips/ips.h#5 integrate .. //depot/projects/gdb/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/gdb/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/gdb/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/gdb/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc_isa.c#3 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/dcphy.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/mii.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/ruephy.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/gdb/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/xmphy.c#3 integrate .. //depot/projects/gdb/sys/dev/mlx/mlx_disk.c#3 integrate .. //depot/projects/gdb/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/gdb/sys/dev/nge/if_nge.c#6 integrate .. //depot/projects/gdb/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/gdb/sys/dev/pci/eisa_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/pci/ignore_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/pci/isa_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/gdb/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/gdb/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/gdb/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/random/randomdev.c#8 integrate .. //depot/projects/gdb/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#4 integrate .. //depot/projects/gdb/sys/dev/re/if_re.c#5 integrate .. //depot/projects/gdb/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/safe/safe.c#4 integrate .. //depot/projects/gdb/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/gdb/sys/dev/si/si_eisa.c#3 integrate .. //depot/projects/gdb/sys/dev/si/si_isa.c#3 integrate .. //depot/projects/gdb/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#5 integrate .. //depot/projects/gdb/sys/dev/snp/snp.c#4 integrate .. //depot/projects/gdb/sys/dev/sr/if_sr.c#4 integrate .. //depot/projects/gdb/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/sx/sx_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/syscons/scterm-sc.c#3 integrate .. //depot/projects/gdb/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/gdb/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/trm/trm.c#6 integrate .. //depot/projects/gdb/sys/dev/twa/twa_includes.h#3 integrate .. //depot/projects/gdb/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/gdb/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/gdb/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/gdb/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/umct.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/usb_subr.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/gdb/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/gdb/sys/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/gdb/sys/dev/xe/if_xe_pccard.c#5 integrate .. //depot/projects/gdb/sys/geom/geom_disk.c#4 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_asus.c#3 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_toshiba.c#5 integrate .. //depot/projects/gdb/sys/i386/bios/apm.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/bios.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/gdb/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/gdb/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/mem.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/gdb/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/gdb/sys/i386/isa/atpic.c#7 integrate .. //depot/projects/gdb/sys/i386/isa/clock.c#10 integrate .. //depot/projects/gdb/sys/i386/isa/if_el.c#3 integrate .. //depot/projects/gdb/sys/i386/isa/mse.c#4 integrate .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_hdr.h#4 integrate .. //depot/projects/gdb/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/gdb/sys/i386/isa/spic.c#4 integrate .. //depot/projects/gdb/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/gdb/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/gdb/sys/i4b/driver/i4b_ing.c#2 integrate .. //depot/projects/gdb/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/gdb/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/gdb/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/gdb/sys/isa/atkbd_isa.c#3 integrate .. //depot/projects/gdb/sys/isa/atkbdc_isa.c#3 integrate .. //depot/projects/gdb/sys/isa/vga_isa.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_prof.c#5 integrate .. //depot/projects/gdb/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/gdb/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/gdb/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/gdb/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/gdb/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/gdb/sys/modules/splash/bmp/splash_bmp.c#2 integrate .. //depot/projects/gdb/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/gdb/sys/net/bpf.h#5 integrate .. //depot/projects/gdb/sys/net/bridge.c#5 integrate .. //depot/projects/gdb/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/gdb/sys/net/if_faith.c#5 integrate .. //depot/projects/gdb/sys/net/if_gif.c#5 integrate .. //depot/projects/gdb/sys/net/if_gre.c#5 integrate .. //depot/projects/gdb/sys/net/if_stf.c#6 integrate .. //depot/projects/gdb/sys/net/if_tap.c#5 integrate .. //depot/projects/gdb/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/gdb/sys/netgraph/atm/atmpif/ng_atmpif.c#2 integrate .. //depot/projects/gdb/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/gdb/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/gdb/sys/netgraph/atm/sscop/ng_sscop.c#2 integrate .. //depot/projects/gdb/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#5 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#4 integrate .. //depot/projects/gdb/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_cisco.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_device.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_echo.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_hole.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_ip_input.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_one2many.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_tee.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/gdb/sys/netinet/accf_data.c#2 integrate .. //depot/projects/gdb/sys/netinet/accf_http.c#2 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/gdb/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/gdb/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/gdb/sys/netncp/ncp_mod.c#3 integrate .. //depot/projects/gdb/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/gdb/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/gdb/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/gdb/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/gdb/sys/pc98/pc98/fd.c#6 integrate .. //depot/projects/gdb/sys/pci/agp.c#9 integrate .. //depot/projects/gdb/sys/pci/agp_ali.c#4 integrate .. //depot/projects/gdb/sys/pci/agp_amd.c#5 integrate .. //depot/projects/gdb/sys/pci/agp_i810.c#6 integrate .. //depot/projects/gdb/sys/pci/agp_intel.c#6 integrate .. //depot/projects/gdb/sys/pci/agp_nvidia.c#5 integrate .. //depot/projects/gdb/sys/pci/agp_sis.c#5 integrate .. //depot/projects/gdb/sys/pci/agp_via.c#5 integrate .. //depot/projects/gdb/sys/pci/if_dc.c#5 integrate .. //depot/projects/gdb/sys/pci/if_de.c#3 integrate .. //depot/projects/gdb/sys/pci/if_mn.c#3 integrate .. //depot/projects/gdb/sys/pci/if_pcn.c#3 integrate .. //depot/projects/gdb/sys/pci/if_rl.c#7 integrate .. //depot/projects/gdb/sys/pci/if_sf.c#3 integrate .. //depot/projects/gdb/sys/pci/if_sis.c#5 integrate .. //depot/projects/gdb/sys/pci/if_sk.c#7 integrate .. //depot/projects/gdb/sys/pci/if_ste.c#10 integrate .. //depot/projects/gdb/sys/pci/if_ti.c#4 integrate .. //depot/projects/gdb/sys/pci/if_tl.c#3 integrate .. //depot/projects/gdb/sys/pci/if_vr.c#5 integrate .. //depot/projects/gdb/sys/pci/if_wb.c#3 integrate .. //depot/projects/gdb/sys/pci/if_xl.c#4 integrate .. //depot/projects/gdb/sys/pci/ncr.c#4 integrate .. //depot/projects/gdb/sys/pci/xrpu.c#4 integrate .. //depot/projects/gdb/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/gdb/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#9 integrate .. //depot/projects/gdb/sys/sys/rman.h#2 integrate .. //depot/projects/gdb/sys/vm/vm_page.h#5 integrate .. //depot/projects/gdb/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/gdb/tools/tools/nanobsd/Makefile#3 integrate .. //depot/projects/gdb/tools/tools/nanobsd/i386.diskimage#6 integrate .. //depot/projects/gdb/usr.bin/calendar/calendar.h#2 integrate .. //depot/projects/gdb/usr.bin/find/extern.h#3 integrate .. //depot/projects/gdb/usr.bin/find/find.1#7 integrate .. //depot/projects/gdb/usr.bin/find/find.c#2 integrate .. //depot/projects/gdb/usr.bin/find/find.h#2 integrate .. //depot/projects/gdb/usr.bin/find/function.c#3 integrate .. //depot/projects/gdb/usr.bin/find/option.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#13 integrate .. //depot/projects/gdb/usr.bin/units/units.lib#2 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpi_user.c#6 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpidump.h#5 integrate .. //depot/projects/gdb/usr.sbin/fdwrite/fdwrite.c#2 integrate .. //depot/projects/gdb/usr.sbin/ifmcstat/ifmcstat.c#2 integrate .. //depot/projects/gdb/usr.sbin/jail/jail.8#5 integrate .. //depot/projects/gdb/usr.sbin/jail/jail.c#2 integrate .. //depot/projects/gdb/usr.sbin/kernbb/kernbb.c#2 integrate .. //depot/projects/gdb/usr.sbin/kgmon/kgmon.8#2 integrate .. //depot/projects/gdb/usr.sbin/mount_portalfs/activate.c#2 integrate .. //depot/projects/gdb/usr.sbin/mount_portalfs/conf.c#2 integrate .. //depot/projects/gdb/usr.sbin/mount_portalfs/mount_portalfs.c#2 integrate .. //depot/projects/gdb/usr.sbin/mount_portalfs/pt_conf.c#2 integrate .. //depot/projects/gdb/usr.sbin/mount_portalfs/pt_exec.c#2 integrate .. //depot/projects/gdb/usr.sbin/mount_portalfs/pt_file.c#2 integrate .. //depot/projects/gdb/usr.sbin/mount_portalfs/pt_tcp.c#2 integrate .. //depot/projects/gdb/usr.sbin/mount_portalfs/pt_tcplisten.c#2 integrate .. //depot/projects/gdb/usr.sbin/syslogd/syslog.conf.5#2 integrate .. //depot/projects/gdb/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/gdb/usr.sbin/watch/watch.c#3 integrate Differences ... ==== //depot/projects/gdb/etc/defaults/rc.conf#9 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.205 2004/04/10 22:13:27 green Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.206 2004/05/29 04:52:37 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -458,7 +458,7 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -performance_cx_lowest="HIGH" # Online CPU idle state +performance_cx_lowest="LOW" # 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 ==== //depot/projects/gdb/include/complex.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/complex.h,v 1.2 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/complex.h,v 1.4 2004/05/30 09:21:56 stefanf Exp $ */ #ifndef _COMPLEX_H @@ -41,20 +41,19 @@ __BEGIN_DECLS -double cabs(double complex); -float cabsf(float complex); -double cimag(double complex); -float cimagf(float complex); -double creal(double complex); -float crealf(float complex); +double cabs(double complex); +float cabsf(float complex); +double cimag(double complex); +float cimagf(float complex); +long double cimagl(long double complex); +double complex conj(double complex); +float complex conjf(float complex); +long double complex + conjl(long double complex); +double creal(double complex); +float crealf(float complex); +long double creall(long double complex); __END_DECLS -#ifdef __GNUC__ -#define cimag(z) (__imag__ (z)) -#define cimagf(z) (__imag__ (z)) -#define creal(z) (__real__ (z)) -#define crealf(z) (__real__ (z)) -#endif - #endif /* _COMPLEX_H */ ==== //depot/projects/gdb/lib/msun/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.39 2004/05/07 18:56:31 stefanf Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.40 2004/05/30 09:21:56 stefanf Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -104,6 +104,10 @@ # C99 long double functions COMMON_SRCS+= s_copysignl.c s_fabsl.c +# C99 complex functions +COMMON_SRCS+= s_cimag.c s_cimagf.c s_cimagl.c s_conj.c s_conjf.c s_conjl.c \ + s_creal.c s_crealf.c s_creall.c + # FreeBSD's C library supplies these functions: #COMMON_SRCS+= s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c ==== //depot/projects/gdb/sbin/geom/class/nop/gnop.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.5 2004/05/24 23:05:21 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.6 2004/05/30 17:40:39 le Exp $ .\" .Dd May 21, 2004 .Dt GNOP 8 @@ -62,7 +62,7 @@ .Nm utility is used for setting up transparent providers on existing ones. Its main purpose is testing other GEOM classes, as it allows force providers -removal and I/O errors symulation with a given probability. +removal and I/O errors simulation with a given probability. It is also a good starting point for implementing new GEOM classes. .Pp The first argument to ==== //depot/projects/gdb/sbin/kldstat/kldstat.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/kldstat/kldstat.c,v 1.13 2004/03/15 03:41:07 jmallett Exp $"); +__FBSDID("$FreeBSD: src/sbin/kldstat/kldstat.c,v 1.15 2004/05/30 10:10:41 dwmalone Exp $"); #include #include @@ -37,11 +37,7 @@ #include #include -#if defined(__alpha__) -#define POINTER_WIDTH 18 -#else -#define POINTER_WIDTH 10 -#endif +#define POINTER_WIDTH ((int)(sizeof(void *) * 2 + 2)) static void printmod(int modid) ==== //depot/projects/gdb/share/man/man4/bge.4#2 (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/share/man/man4/bge.4,v 1.9 2003/09/14 13:41:59 ru Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.10 2004/05/28 21:16:13 simon Exp $ .\" .Dd September 27, 2001 .Dt BGE 4 @@ -51,8 +51,12 @@ .It 3Com 3c996-T (10/100/1000baseTX) .It +Dell PowerEdge 1750 integrated BCM5704C NIC (10/100/1000baseTX) +.It Dell PowerEdge 2550 integrated BCM5700 NIC (10/100/1000baseTX) .It +Dell PowerEdge 2650 integrated BCM5703 NIC (10/100/1000baseTX) +.It IBM x235 server integrated BCM5703x NIC (10/100/1000baseTX) .It HP ProLiant NC7760 embedded Gigabit NIC (10/100/1000baseTX) ==== //depot/projects/gdb/share/man/man4/ng_tee.4#2 (text+ko) ==== @@ -32,10 +32,10 @@ .\" .\" Author: Archie Cobbs .\" -.\" $FreeBSD: src/share/man/man4/ng_tee.4,v 1.12 2001/10/01 16:09:21 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ng_tee.4,v 1.13 2004/05/29 07:21:45 julian Exp $ .\" $Whistle: ng_tee.8,v 1.4 1999/01/25 23:46:27 archie Exp $ .\" -.Dd January 19, 1999 +.Dd May 28, 2004 .Dt NG_TEE 4 .Os .Sh NAME @@ -108,9 +108,19 @@ Clear statistics. .El .Sh SHUTDOWN -This node shuts down upon receipt of a +This node shuts down upon receipt of an .Dv NGM_SHUTDOWN control message, or when all hooks have been disconnected. +If both +.Dv right +and +.Dv left +hooks are present, node removes itself from the chain gently, +connecting +.Dv right +and +.Dv left +together. .Sh SEE ALSO .Xr tee 1 , .Xr netgraph 4 , ==== //depot/projects/gdb/share/man/man5/periodic.conf.5#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.47 2003/02/24 22:53:23 ru Exp $ +.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.48 2004/05/30 20:32:00 brian Exp $ .\" .Dd June 22, 2000 .Dt PERIODIC.CONF 5 @@ -657,6 +657,27 @@ As an example, this variable might be set to .Dq portversion if the portupgrade port has been installed. +.It Va pkg_version_index +.Pq Vt string +This variable specifies the INDEX file from +.Pa /usr/ports +that should be used by +.Xr pkg_version 1 . +Because the dependency tree may be substantially different between versions of +.Fx , +there may be more than one INDEX file in +.Pa /usr/ports . +.Pp +Note, if the +.Va pkg_version +variable is set to +.Dq portversion , +it will also be neccessary to arrange that the correct INDEX file is specified +using environment variables and that +.Dq pkg_version_index +is cleared in +.Pa /etc/periodic.conf +.Pq pkg_version_index= . .It Va weekly_local .Pq Vt str Set to a list of extra scripts that should be run after all other ==== //depot/projects/gdb/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.5 2004/05/16 20:30:46 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.6 2004/05/30 04:49:39 alc Exp $ */ /* @@ -183,7 +183,6 @@ if (vector == 0) clkintr_pending = 1; - critical_enter(); if (ih != NULL && ih->ih_flags & IH_FAST) { /* * Execute fast interrupt handlers directly. @@ -191,6 +190,7 @@ * with a NULL argument, then we pass it a pointer to * a trapframe as its argument. */ + critical_enter(); TAILQ_FOREACH(ih, &it->it_handlers, ih_next) { MPASS(ih->ih_flags & IH_FAST); CTR3(KTR_INTR, "%s: executing handler %p(%p)", @@ -204,6 +204,7 @@ } isrc->is_pic->pic_eoi_source(isrc); error = 0; + critical_exit(); } else { /* * For stray and threaded interrupts, we mask and EOI the @@ -216,7 +217,6 @@ else error = ithread_schedule(it, !cold); } - critical_exit(); if (error == EINVAL) { atomic_add_long(isrc->is_straycount, 1); if (*isrc->is_straycount < MAX_STRAY_LOG) ==== //depot/projects/gdb/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.460 2004/05/19 21:55:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.461 2004/05/28 19:42:02 alc Exp $"); /* * Manages physical address maps. @@ -1892,14 +1892,6 @@ if (mpte) mpte->hold_count--; - if ((prot & VM_PROT_WRITE) && (origpte & PG_V)) { - if ((origpte & PG_RW) == 0) { - pte_store(pte, origpte | PG_RW); - pmap_invalidate_page(pmap, va); - } - return; - } - /* * We might be turning off write access to the page, * so we go ahead and sense modify status. ==== //depot/projects/gdb/sys/amd64/amd64/support.S#9 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.111 2004/05/23 14:56:02 bde Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.112 2004/05/29 01:13:28 tjr Exp $ */ #include "opt_ddb.h" @@ -651,3 +651,22 @@ xorl %eax,%eax /* return(1); */ incl %eax ret + +/* + * Support for BB-profiling (gcc -a). The kernbb program will extract + * the data from the kernel. + */ + + .data + ALIGN_DATA + .globl bbhead +bbhead: + .quad 0 + + .text +NON_GPROF_ENTRY(__bb_init_func) + movq $1,(%rdi) + movq bbhead,%rax + movq %rax,32(%rdi) + movq %rdi,bbhead + NON_GPROF_RET ==== //depot/projects/gdb/sys/coda/coda_fbsd.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.32 2004/02/21 21:10:39 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.33 2004/05/30 20:27:19 phk Exp $"); #include "vcoda.h" @@ -40,6 +40,7 @@ #include #include #include +#include #include #include ==== //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.56 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.58 2004/05/29 22:34:08 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -49,6 +49,7 @@ */ +#include #include #include #include @@ -129,6 +130,7 @@ struct sysctl_oid *, ndis_parm_type, ndis_config_parm **); static ndis_status ndis_decode_parm(ndis_miniport_block *, ndis_config_parm *, char *); +static int my_strcasecmp(const char *, const char *, int); __stdcall static void ndis_read_cfg(ndis_status *, ndis_config_parm **, ndis_handle, ndis_unicode_string *, ndis_parm_type); __stdcall static void ndis_write_cfg(ndis_status *, ndis_handle, @@ -554,6 +556,22 @@ return(NDIS_STATUS_SUCCESS); } +static int +my_strcasecmp(s1, s2, len) + const char *s1; + const char *s2; + int len; +{ + int i; + + for (i = 0; i < len; i++) { + if (toupper(s1[i]) != toupper(s2[i])) + return(1); + } + + return(0); +} + __stdcall static void ndis_read_cfg(status, parm, cfg, key, type) ndis_status *status; @@ -589,7 +607,8 @@ */ TAILQ_FOREACH(e, &sc->ndis_ctx, link) { oidp = e->entry; - if (strcmp(oidp->oid_name, keystr) == 0) { + if (my_strcasecmp(oidp->oid_name, + keystr, strlen(keystr)) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { free(keystr, M_DEVBUF); *status = NDIS_STATUS_FAILURE; @@ -685,7 +704,8 @@ TAILQ_FOREACH(e, &sc->ndis_ctx, link) { oidp = e->entry; - if (strcmp(oidp->oid_name, keystr) == 0) { + if (my_strcasecmp(oidp->oid_name, + keystr, strlen(keystr)) == 0) { /* Found it, set the value. */ strcpy((char *)oidp->oid_arg1, val); free(keystr, M_DEVBUF); ==== //depot/projects/gdb/sys/conf/ldscript.amd64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.8 2003/05/01 02:59:24 peter Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") OUTPUT_ARCH(i386:x86-64) ENTRY(btext) @@ -87,6 +87,8 @@ .eh_frame : { KEEP (*(.eh_frame)) } .gcc_except_table : { *(.gcc_except_table) } .dynamic : { *(.dynamic) } + _start_ctors = .; + PROVIDE (start_ctors = .); .ctors : { /* gcc uses crtbegin.o to find the start of @@ -107,6 +109,8 @@ KEEP (*(SORT(.ctors.*))) KEEP (*(.ctors)) } + _stop_ctors = .; + PROVIDE (stop_ctors = .); .dtors : { KEEP (*crtbegin.o(.dtors)) ==== //depot/projects/gdb/sys/contrib/dev/oltr/if_oltr.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.33 2004/03/29 21:10:05 imp Exp $ + * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.34 2004/05/30 20:34:56 phk Exp $ */ #include @@ -39,6 +39,7 @@ #include #include #include +#include #include #include ==== //depot/projects/gdb/sys/dev/aac/aac_cam.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.14 2003/12/03 15:42:12 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.15 2004/05/30 20:08:23 phk Exp $"); /* * CAM front-end for communicating with non-DASD devices @@ -38,6 +38,7 @@ #include #include #include +#include #include #include ==== //depot/projects/gdb/sys/dev/aac/aac_disk.c#3 (text+ko) ==== @@ -28,13 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.37 2004/02/18 21:36:51 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.38 2004/05/30 20:08:23 phk Exp $"); #include "opt_aac.h" #include #include #include +#include #include #include ==== //depot/projects/gdb/sys/dev/aac/aac_linux.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_linux.c,v 1.2 2003/08/24 17:48:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_linux.c,v 1.3 2004/05/30 20:08:23 phk Exp $"); /* * Linux ioctl handler for the aac device driver @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/gdb/sys/dev/aac/aac_pci.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.46 2004/05/13 19:15:21 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.47 2004/05/30 20:08:23 phk Exp $"); /* * PCI bus interface and resource allocation. @@ -39,6 +39,7 @@ #include #include #include +#include #include #include ==== //depot/projects/gdb/sys/dev/aac/aacvar.h#3 (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/aac/aacvar.h,v 1.41 2004/02/18 21:36:51 phk Exp $ + * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.42 2004/05/30 22:40:28 scottl Exp $ */ #include @@ -58,7 +58,7 @@ */ #define AAC_FIB_COUNT (PAGE_SIZE/sizeof(struct aac_fib)) #define AAC_PREALLOCATE_FIBS 128 -#define AAC_MAX_FIBS 512 +#define AAC_MAX_FIBS 504 /* * The controller reports status events in AIFs. We hang on to a number of ==== //depot/projects/gdb/sys/dev/acpica/acpi.c#18 (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.148 2004/05/28 02:50:43 marcel Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.155 2004/05/30 20:08:23 phk Exp $ */ #include "opt_acpi.h" @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -133,6 +134,8 @@ static ACPI_STATUS acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context, void **status); static int acpi_wake_limit_walk(int sstate); +static int acpi_wake_sysctl_walk(device_t dev); +static int acpi_wake_set_sysctl(SYSCTL_HANDLER_ARGS); static void acpi_system_eventhandler_sleep(void *arg, int state); static void acpi_system_eventhandler_wakeup(void *arg, int state); static int acpi_supported_sleep_state_sysctl(SYSCTL_HANDLER_ARGS); @@ -507,11 +510,11 @@ &sc->acpi_disable_on_poweroff, 0, "ACPI subsystem disable on poweroff"); /* - * Default to 5 seconds before sleeping to give some machines time to + * Default to 1 second before sleeping to give some machines time to * stabilize. */ - sc->acpi_sleep_delay = 5; - sc->acpi_disable_on_poweroff = 1; + sc->acpi_sleep_delay = 1; + sc->acpi_disable_on_poweroff = 0; if (bootverbose) sc->acpi_verbose = 1; if ((env = getenv("hw.acpi.verbose")) && strcmp(env, "0")) { @@ -1068,6 +1071,9 @@ ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "second bus_generic_attach\n")); bus_generic_attach(bus); + /* Attach wake sysctls. */ + acpi_wake_sysctl_walk(bus); + ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "done attaching children\n")); return_VOID; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 30 17:53:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7795116A4D0; Sun, 30 May 2004 17:53:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 488D616A4CE for ; Sun, 30 May 2004 17:53:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B2EF43D46 for ; Sun, 30 May 2004 17:53:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V0rVEE035373 for ; Sun, 30 May 2004 17:53:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V0rVfu035370 for perforce@freebsd.org; Sun, 30 May 2004 17:53:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 17:53:31 -0700 (PDT) Message-Id: <200405310053.i4V0rVfu035370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53827 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, 31 May 2004 00:53:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=53827 Change 53827 by marcel@marcel_nfs on 2004/05/30 17:52:44 Remove gdbconsdev, it's is unused. Affected files ... .. //depot/projects/gdb/sys/dev/dcons/dcons.c#6 edit Differences ... ==== //depot/projects/gdb/sys/dev/dcons/dcons.c#6 (text+ko) ==== @@ -76,7 +76,6 @@ #if __FreeBSD_version >= 500101 #define CONS_NODEV 1 /* for latest current */ -static struct consdev gdbconsdev; #endif From owner-p4-projects@FreeBSD.ORG Sun May 30 18:03:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE17B16A4D0; Sun, 30 May 2004 18:03:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B88D716A4CE for ; Sun, 30 May 2004 18:03:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ADD543D4C for ; Sun, 30 May 2004 18:03:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V13j7a038434 for ; Sun, 30 May 2004 18:03:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V13jpW038431 for perforce@freebsd.org; Sun, 30 May 2004 18:03:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 18:03:45 -0700 (PDT) Message-Id: <200405310103.i4V13jpW038431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53829 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, 31 May 2004 01:03:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=53829 Change 53829 by marcel@marcel_nfs on 2004/05/30 18:03:35 s/db_active/kdb_active/ Affected files ... .. //depot/projects/gdb/sys/kern/subr_witness.c#8 edit Differences ... ==== //depot/projects/gdb/sys/kern/subr_witness.c#8 (text+ko) ==== @@ -1797,7 +1797,7 @@ { KASSERT(!witness_cold, ("%s: witness_cold", __func__)); - KASSERT(db_active, ("%s: not in the debugger", __func__)); + KASSERT(kdb_active, ("%s: not in the debugger", __func__)); if (witness_watch == 0) return; From owner-p4-projects@FreeBSD.ORG Sun May 30 18:05:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5296816A4D0; Sun, 30 May 2004 18:05:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DA9416A4CE for ; Sun, 30 May 2004 18:05:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1115D43D4C for ; Sun, 30 May 2004 18:05:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V15mk5038515 for ; Sun, 30 May 2004 18:05:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V15mbN038512 for perforce@freebsd.org; Sun, 30 May 2004 18:05:48 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 18:05:48 -0700 (PDT) Message-Id: <200405310105.i4V15mbN038512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53830 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, 31 May 2004 01:05:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=53830 Change 53830 by marcel@marcel_sledge on 2004/05/30 18:05:47 amd64/amd64/amd64-gdbstub.c does not exist anymore. Affected files ... .. //depot/projects/gdb/sys/conf/files.amd64#10 edit Differences ... ==== //depot/projects/gdb/sys/conf/files.amd64#10 (text+ko) ==== @@ -39,7 +39,6 @@ amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi amd64/acpica/madt.c optional acpi -amd64/amd64/amd64-gdbstub.c optional gdb amd64/amd64/amd64_mem.c standard #amd64/amd64/apic_vector.S standard amd64/amd64/atomic.c standard From owner-p4-projects@FreeBSD.ORG Sun May 30 18:27:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C5E16A4D0; Sun, 30 May 2004 18:27:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 04DB216A4CE for ; Sun, 30 May 2004 18:27:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF6F843D45 for ; Sun, 30 May 2004 18:27:10 -0700 (PDT) (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.11/8.12.11) with ESMTP id i4V1R7Wf042542 for ; Sun, 30 May 2004 18:27:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V1QFmY042530 for perforce@freebsd.org; Sun, 30 May 2004 18:26:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 May 2004 18:26:15 -0700 (PDT) Message-Id: <200405310126.i4V1QFmY042530@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 53831 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, 31 May 2004 01:27:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=53831 Change 53831 by rwatson@rwatson_paprika on 2004/05/30 18:26:04 Integrate netperf_socket from CVS HEAD: cpu_sched_exit() gone. amd64 mirrors i386 ithread preemption fix. More fixes to amd64 profiling. More ACPI, update to 20040515, et al. Intel 10gig-e driver (ixgb). Various module.h include consistency fixes. Unneeded CTLFLAG_PRISON sysctls de-prison'd. ips device driver uses M_IPSBUF not M_DEVBUF. newbus gains a sysctl tree. if_vlan uses capabilities to store vlan mtu state, and properly references the parent interface for state information. Netgraph nodes gain a close method. Netgraph class definitions move to C99 sparse struct initialization. Ipfirewall control processing explicitly checks for privilege because raw sockets may now be (optionally) referenced in jail. Loop back of NFS Giant tweaks: missing Giant locking, VFS annotation on Giant lock/unlock. Don't need to optionally acquire Giant around socket operations, because we'll already hold it if we need it. Possibly gratuitous mbuf.h reformatting. Msync MS_INVALIDATE tweaks. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/netperf_socket/sys/conf/files#21 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#16 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#10 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#6 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#7 integrate .. //depot/projects/netperf_socket/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#7 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/aclocal.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acobject.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actypes.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbinput.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evevent.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpeblk.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxfevnt.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exmutex.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsaccess.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsalloc.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsparse.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/uteval.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/splash.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/README#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/netperf_socket/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/dcphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/mii.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/ruephy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/xmphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/nsp/nsp_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/Makefile.pccarddevs#2 delete .. //depot/projects/netperf_socket/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/devlist2h.awk#2 delete .. //depot/projects/netperf_socket/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs.h#6 delete .. //depot/projects/netperf_socket/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/pci/eisa_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/ignore_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/isa_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/safe/safe.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sn/if_sn_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scterm-sc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_includes.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umct.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/geom_disk.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_toshiba.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/bios/apm.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/bios.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/exception.s#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mem.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#7 integrate .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/if_el.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/mse.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_hdr.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spic.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_ing.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/isa/atkbd_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/isa/atkbdc_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/isa/vga_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prof.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/netperf_socket/sys/modules/aic/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/an/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/awi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/cs/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ed/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ep/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ex/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/exca/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/fe/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/if_ndis/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/ixgb/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/joy/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/oldcard/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/owi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pcic/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ray/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/sio/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/sn/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/splash/bmp/splash_bmp.c#2 integrate .. //depot/projects/netperf_socket/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/netperf_socket/sys/modules/stg/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/uart/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/wi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/xe/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/bpf.h#5 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/netperf_socket/sys/net/if_faith.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_gif.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_stf.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#5 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/atmpif/ng_atmpif.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/sscop/ng_sscop.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_cisco.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_echo.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_hole.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ip_input.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tee.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/accf_data.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/accf_http.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/netperf_socket/sys/netncp/ncp_mod.c#3 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/netperf_socket/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/agp_ali.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_amd.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/agp_i810.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/agp_intel.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/agp_nvidia.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_sis.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_via.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_mn.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#10 integrate .. //depot/projects/netperf_socket/sys/pci/if_sf.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#9 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#14 integrate .. //depot/projects/netperf_socket/sys/pci/if_ti.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_tl.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_wb.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/ncr.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/xrpu.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/vm_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/sys/bus.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/eui64.h#1 branch .. //depot/projects/netperf_socket/sys/sys/mbuf.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/rman.h#2 integrate .. //depot/projects/netperf_socket/sys/tools/devlist2h.awk#2 delete .. //depot/projects/netperf_socket/sys/tools/miidevs2h.awk#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.h#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#6 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.103 2004/04/18 06:24:51 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.104 2004/05/26 12:09:36 tmm Exp $"); #include #include @@ -240,12 +240,6 @@ } void -cpu_sched_exit(td) - register struct thread *td; -{ -} - -void cpu_thread_exit(struct thread *td) { } ==== //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.5 2004/05/16 20:30:46 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.6 2004/05/30 04:49:39 alc Exp $ */ /* @@ -183,7 +183,6 @@ if (vector == 0) clkintr_pending = 1; - critical_enter(); if (ih != NULL && ih->ih_flags & IH_FAST) { /* * Execute fast interrupt handlers directly. @@ -191,6 +190,7 @@ * with a NULL argument, then we pass it a pointer to * a trapframe as its argument. */ + critical_enter(); TAILQ_FOREACH(ih, &it->it_handlers, ih_next) { MPASS(ih->ih_flags & IH_FAST); CTR3(KTR_INTR, "%s: executing handler %p(%p)", @@ -204,6 +204,7 @@ } isrc->is_pic->pic_eoi_source(isrc); error = 0; + critical_exit(); } else { /* * For stray and threaded interrupts, we mask and EOI the @@ -216,7 +217,6 @@ else error = ithread_schedule(it, !cold); } - critical_exit(); if (error == EINVAL) { atomic_add_long(isrc->is_straycount, 1); if (*isrc->is_straycount < MAX_STRAY_LOG) ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.460 2004/05/19 21:55:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.461 2004/05/28 19:42:02 alc Exp $"); /* * Manages physical address maps. @@ -1892,14 +1892,6 @@ if (mpte) mpte->hold_count--; - if ((prot & VM_PROT_WRITE) && (origpte & PG_V)) { - if ((origpte & PG_RW) == 0) { - pte_store(pte, origpte | PG_RW); - pmap_invalidate_page(pmap, va); - } - return; - } - /* * We might be turning off write access to the page, * so we go ahead and sense modify status. ==== //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.20 2004/05/23 18:27:14 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.21 2004/05/26 09:43:37 bde Exp $"); #ifdef GUPROF #if 0 @@ -220,8 +220,15 @@ #ifndef SMP if (cputime_clock == CPUTIME_CLOCK_TSC) { - count = (u_int)rdtsc(); - delta = (int)(count - prev_count); + /* + * Scale the TSC a little to make cputime()'s frequency + * fit in an int, assuming that the TSC frequency fits + * in a u_int. Use a fixed scale since dynamic scaling + * would be slower and we can't really use the low bit + * of precision. + */ + count = (u_int)rdtsc() & ~1u; + delta = (int)(count - prev_count) >> 1; prev_count = count; return (delta); } @@ -330,7 +337,7 @@ gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT; #ifndef SMP if (cputime_clock == CPUTIME_CLOCK_TSC) - gp->profrate = tsc_freq; + gp->profrate = tsc_freq >> 1; #if defined(PERFMON) && defined(I586_PMC_GUPROF) else if (cputime_clock == CPUTIME_CLOCK_I586_PMC) { if (perfmon_avail() && ==== //depot/projects/netperf_socket/sys/amd64/amd64/support.S#6 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.111 2004/05/23 14:56:02 bde Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.112 2004/05/29 01:13:28 tjr Exp $ */ #include "opt_ddb.h" @@ -653,3 +653,22 @@ incl %eax ret #endif + +/* + * Support for BB-profiling (gcc -a). The kernbb program will extract + * the data from the kernel. + */ + + .data + ALIGN_DATA + .globl bbhead +bbhead: + .quad 0 + + .text +NON_GPROF_ENTRY(__bb_init_func) + movq $1,(%rdi) + movq bbhead,%rax + movq %rax,32(%rdi) + movq %rdi,bbhead + NON_GPROF_RET ==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.234 2004/04/18 05:36:37 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.235 2004/05/26 12:09:36 tmm Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -225,12 +225,6 @@ } void -cpu_sched_exit(td) - register struct thread *td; -{ -} - -void cpu_thread_setup(struct thread *td) { ==== //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#2 (text+ko) ==== @@ -81,7 +81,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.2 2004/05/26 12:09:37 tmm Exp $"); #include #include @@ -340,9 +340,3 @@ cpu_exit(struct thread *td) { } - -void -cpu_sched_exit(td) - register struct thread *td; -{ -} ==== //depot/projects/netperf_socket/sys/boot/i386/libi386/biosacpi.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.8 2004/05/14 01:29:21 jdp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.9 2004/05/25 05:51:35 njl Exp $"); #include #include @@ -84,22 +84,24 @@ } /* - * Find the RSDP in low memory. + * Find the RSDP in low memory. See section 5.2.2 of the ACPI spec. */ static RSDP_DESCRIPTOR * biosacpi_find_rsdp(void) { RSDP_DESCRIPTOR *rsdp; + uint16_t *addr; - /* search the EBDA */ - if ((rsdp = biosacpi_search_rsdp((char *)0, 0x400)) != NULL) - return(rsdp); + /* EBDA is the 1 KB addressed by the 16 bit pointer at 0x40E. */ + addr = (uint16_t *)0x40E; + if ((rsdp = biosacpi_search_rsdp((char *)(*addr << 4), 0x400)) != NULL) + return (rsdp); - /* search the BIOS space */ + /* Check the upper memory BIOS space, 0xe0000 - 0xfffff. */ if ((rsdp = biosacpi_search_rsdp((char *)0xe0000, 0x20000)) != NULL) - return(rsdp); + return (rsdp); - return(NULL); + return (NULL); } static RSDP_DESCRIPTOR * ==== //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.32 2004/02/21 21:10:39 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.33 2004/05/30 20:27:19 phk Exp $"); #include "vcoda.h" @@ -40,6 +40,7 @@ #include #include #include +#include #include #include ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.56 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.58 2004/05/29 22:34:08 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -49,6 +49,7 @@ */ +#include #include #include #include @@ -129,6 +130,7 @@ struct sysctl_oid *, ndis_parm_type, ndis_config_parm **); static ndis_status ndis_decode_parm(ndis_miniport_block *, ndis_config_parm *, char *); +static int my_strcasecmp(const char *, const char *, int); __stdcall static void ndis_read_cfg(ndis_status *, ndis_config_parm **, ndis_handle, ndis_unicode_string *, ndis_parm_type); __stdcall static void ndis_write_cfg(ndis_status *, ndis_handle, @@ -554,6 +556,22 @@ return(NDIS_STATUS_SUCCESS); } +static int +my_strcasecmp(s1, s2, len) + const char *s1; + const char *s2; + int len; +{ + int i; + + for (i = 0; i < len; i++) { + if (toupper(s1[i]) != toupper(s2[i])) + return(1); + } + + return(0); +} + __stdcall static void ndis_read_cfg(status, parm, cfg, key, type) ndis_status *status; @@ -589,7 +607,8 @@ */ TAILQ_FOREACH(e, &sc->ndis_ctx, link) { oidp = e->entry; - if (strcmp(oidp->oid_name, keystr) == 0) { + if (my_strcasecmp(oidp->oid_name, + keystr, strlen(keystr)) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { free(keystr, M_DEVBUF); *status = NDIS_STATUS_FAILURE; @@ -685,7 +704,8 @@ TAILQ_FOREACH(e, &sc->ndis_ctx, link) { oidp = e->entry; - if (strcmp(oidp->oid_name, keystr) == 0) { + if (my_strcasecmp(oidp->oid_name, + keystr, strlen(keystr)) == 0) { /* Found it, set the value. */ strcpy((char *)oidp->oid_arg1, val); free(keystr, M_DEVBUF); ==== //depot/projects/netperf_socket/sys/conf/files#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.894 2004/05/20 10:37:11 pjd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.898 2004/05/28 00:22:58 tackerman Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -30,16 +30,26 @@ aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local -miidevs.h standard \ - dependency "$S/tools/devlist2h.awk $S/dev/mii/miidevs" \ - compile-with "${AWK} -f $S/tools/devlist2h.awk $S/dev/mii/miidevs" \ - no-obj no-implicit-rule \ - clean "miidevs.h" emu10k1-alsa%diked.h optional pcm pci \ dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \ compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "emu10k1-alsa%diked.h" +miidevs.h standard \ + dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ + compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ + no-obj no-implicit-rule \ + clean "miidevs.h" +pccarddevs.h standard \ + dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ + compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ + no-obj no-implicit-rule \ + clean "pccarddevs.h" +usbdevs.h standard \ + dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ + compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ + no-obj no-implicit-rule \ + clean "usbdevs.h" kern/device_if.m standard kern/bus_if.m standard kern/clock_if.m optional genclock @@ -498,6 +508,9 @@ dev/isp/isp_pci.c optional isp pci dev/isp/isp_sbus.c optional isp sbus dev/ispfw/ispfw.c optional ispfw +dev/ixgb/ixgb_hw.c optional ixgb +dev/ixgb/ixgb_ee.c optional ixgb +dev/ixgb/if_ixgb.c optional ixgb dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard ==== //depot/projects/netperf_socket/sys/conf/files.i386#16 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.492 2004/05/17 08:15:59 rik Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.493 2004/05/26 07:43:40 bde Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -198,7 +198,7 @@ i386/bios/smapi_bios.S optional smapi i386/bios/smbios.c optional smbios i386/bios/vpd.c optional vpd -i386/i386/apic_vector.s optional apic +#i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard @@ -267,7 +267,7 @@ i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 i386/isa/atpic.c standard -i386/isa/atpic_vector.s standard +#i386/isa/atpic_vector.s standard i386/isa/clock.c standard i386/isa/elcr.c standard i386/isa/elink.c optional ep ==== //depot/projects/netperf_socket/sys/conf/files.pc98#10 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.298 2004/05/18 11:34:04 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.299 2004/05/26 13:10:37 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -132,7 +132,7 @@ geom/geom_pc98.c standard geom/geom_pc98_enc.c standard i386/bios/apm.c optional apm -i386/i386/apic_vector.s optional apic +#i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard @@ -195,7 +195,7 @@ i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 i386/isa/atpic.c standard -i386/isa/atpic_vector.s standard +#i386/isa/atpic_vector.s standard i386/isa/elink.c optional ep i386/isa/elink.c optional ie i386/isa/isa.c optional isa ==== //depot/projects/netperf_socket/sys/conf/kern.post.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.65 2004/03/22 15:45:17 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.66 2004/05/26 16:31:41 imp Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -77,8 +77,8 @@ ${SYSTEM_LD_TAIL} .if !exists(${.OBJDIR}/.depend) -${SYSTEM_OBJS}: assym.s miidevs.h vnode_if.h ${BEFORE_DEPEND:M*.h} \ - ${MFILES:T:S/.m$/.h/} +${SYSTEM_OBJS}: assym.s pccarddevs.h usbdevs.h miidevs.h vnode_if.h \ + ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} .endif LNFILES= ${CFILES:T:S/.c$/.ln/} @@ -136,9 +136,9 @@ # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s miidevs.h vnode_if.h ${BEFORE_DEPEND} \ - ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${GEN_M_CFILES} \ - ${SFILES} ${MFILES:T:S/.m$/.h/} +_kernel-depend: assym.s miidevs.h pccarddevs.h usbdevs.h vnode_if.h \ + ${BEFORE_DEPEND} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} \ + ${GEN_M_CFILES} ${SFILES} ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES -V GEN_M_CFILES | \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 30 18:28:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CFB316A4D0; Sun, 30 May 2004 18:28:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5870116A4CE for ; Sun, 30 May 2004 18:28:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5146643D5A for ; Sun, 30 May 2004 18:28:09 -0700 (PDT) (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.11/8.12.11) with ESMTP id i4V1S9U0042594 for ; Sun, 30 May 2004 18:28:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V1S8ot042591 for perforce@freebsd.org; Sun, 30 May 2004 18:28:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 May 2004 18:28:08 -0700 (PDT) Message-Id: <200405310128.i4V1S8ot042591@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 53832 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, 31 May 2004 01:28:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=53832 Change 53832 by rwatson@rwatson_paprika on 2004/05/30 18:27:17 Integrate netperf_socket from CVS HEAD: - Fix for NFS server system call running Giant-free. Affected files ... .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.127 2004/05/24 04:06:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.128 2004/05/31 00:59:10 rwatson Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -551,7 +551,7 @@ nfsrv_timer(0); nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg; - sysent[SYS_nfssvc].sy_narg = 2; + sysent[SYS_nfssvc].sy_narg = 2 | SYF_MPSAFE; nfs_prev_nfssvc_sy_call = sysent[SYS_nfssvc].sy_call; sysent[SYS_nfssvc].sy_call = (sy_call_t *)nfssvc; break; From owner-p4-projects@FreeBSD.ORG Sun May 30 19:29:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D322E16A4D0; Sun, 30 May 2004 19:29:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 910D016A4CE for ; Sun, 30 May 2004 19:29:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 749F843D2D for ; Sun, 30 May 2004 19:29:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V2SJRY055688 for ; Sun, 30 May 2004 19:28:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V2SI7u055685 for perforce@freebsd.org; Sun, 30 May 2004 19:28:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 19:28:18 -0700 (PDT) Message-Id: <200405310228.i4V2SI7u055685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53836 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, 31 May 2004 02:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=53836 Change 53836 by marcel@marcel_sledge on 2004/05/30 19:28:12 MFi386 Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/db_interface.c#8 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/db_interface.c#8 (text+ko) ==== @@ -32,6 +32,7 @@ */ #include #include +#include #include #include #include @@ -45,259 +46,95 @@ #include -#include - -static jmp_buf *db_nofault = 0; -extern jmp_buf db_jmpbuf; - -extern void gdb_handle_exception(db_regs_t *, int, int); - -#if 0 -int db_active; -db_regs_t ddb_regs; -static jmp_buf db_global_jmpbuf; - /* - * ddb_trap - field a TRACE or BPT trap + * Read bytes from kernel address space for debugger. */ int -ddb_trap(int type, int code, struct amd64_saved_state *regs) +db_read_bytes(vm_offset_t addr, size_t size, char *data) { - u_long ef; - volatile int ddb_mode = !(boothowto & RB_GDB); + jmp_buf jb; + void *prev_jb; + char *src; + int ret; - /* - * XXX try to do nothing if the console is in graphics mode. - * Handle trace traps (and hardware breakpoints...) by ignoring - * them except for forgetting about them. Return 0 for other - * traps to say that we haven't done anything. The trap handler - * will usually panic. We should handle breakpoint traps for - * our breakpoints by disarming our breakpoints and fixing up - * %eip. - */ - if (cnunavailable() != 0 && ddb_mode) { - if (type == T_TRCTRAP) { - regs->tf_rflags &= ~PSL_T; - return (1); - } - return (0); + prev_jb = kdb_jmpbuf(jb); + ret = setjmp(jb); + if (ret == 0) { + src = (char *)addr; + while (size-- > 0) + *data++ = *src++; } - - ef = read_rflags(); - disable_intr(); - -#ifdef SMP - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf("\nCPU%d stopping CPUs: 0x%08x...", PCPU_GET(cpuid), - PCPU_GET(other_cpus)); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - - /* We stop all CPUs except ourselves (obviously) */ - stop_cpus(PCPU_GET(other_cpus)); - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf(" stopped.\n"); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - -#endif /* SMP */ - - switch (type) { - case T_BPTFLT: /* breakpoint */ - case T_TRCTRAP: /* debug exception */ - break; - - default: - /* - * XXX this is almost useless now. In most cases, - * trap_fatal() has already printed a much more verbose - * message. However, it is dangerous to print things in - * trap_fatal() - printf() might be reentered and trap. - * The debugger should be given control first. - */ - if (ddb_mode) - db_printf("kernel: type %d trap, code=%x\n", type, code); - - if (db_nofault) { - jmp_buf *no_fault = db_nofault; - db_nofault = 0; - longjmp(*no_fault, 1); - } - } - - /* - * This handles unexpected traps in ddb commands, including calls to - * non-ddb functions. db_nofault only applies to memory accesses by - * internal ddb commands. - */ - if (db_active) - longjmp(db_global_jmpbuf, 1); - - /* - * XXX We really should switch to a local stack here. - */ - ddb_regs = *regs; - - /* - * If in kernel mode, esp and ss are not saved, so dummy them up. - */ - if (ISPL(regs->tf_cs) == 0) { - ddb_regs.tf_rsp = (long)®s->tf_rsp; - ddb_regs.tf_ss = rss(); - } - - (void) setjmp(db_global_jmpbuf); - if (ddb_mode) { - if (!db_active) - cndbctl(TRUE); - db_active = 1; - db_trap(type, code); - cndbctl(FALSE); - } else { - db_active = 1; - gdb_handle_exception(&ddb_regs, type, code); - } - db_active = 0; - - regs->tf_rip = ddb_regs.tf_rip; - regs->tf_rflags = ddb_regs.tf_rflags; - regs->tf_rax = ddb_regs.tf_rax; - regs->tf_rcx = ddb_regs.tf_rcx; - regs->tf_rdx = ddb_regs.tf_rdx; - regs->tf_rbx = ddb_regs.tf_rbx; - - /* - * If in user mode, the saved ESP and SS were valid, restore them. - */ - if (ISPL(regs->tf_cs)) { - regs->tf_rsp = ddb_regs.tf_rsp; - regs->tf_ss = ddb_regs.tf_ss & 0xffff; - } - - regs->tf_rbp = ddb_regs.tf_rbp; - regs->tf_rsi = ddb_regs.tf_rsi; - regs->tf_rdi = ddb_regs.tf_rdi; - - regs->tf_r8 = ddb_regs.tf_r8; - regs->tf_r9 = ddb_regs.tf_r9; - regs->tf_r10 = ddb_regs.tf_r10; - regs->tf_r11 = ddb_regs.tf_r11; - regs->tf_r12 = ddb_regs.tf_r12; - regs->tf_r13 = ddb_regs.tf_r13; - regs->tf_r14 = ddb_regs.tf_r14; - regs->tf_r15 = ddb_regs.tf_r15; - -#if 0 - regs->tf_es = ddb_regs.tf_es & 0xffff; - regs->tf_fs = ddb_regs.tf_fs & 0xffff; -#endif - regs->tf_cs = ddb_regs.tf_cs & 0xffff; -#if 0 - regs->tf_ds = ddb_regs.tf_ds & 0xffff; -#endif - -#ifdef SMP - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf("\nCPU%d restarting CPUs: 0x%08x...", PCPU_GET(cpuid), - stopped_cpus); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - - /* Restart all the CPUs we previously stopped */ - if (stopped_cpus != PCPU_GET(other_cpus) && smp_started != 0) { - db_printf("whoa, other_cpus: 0x%08x, stopped_cpus: 0x%08x\n", - PCPU_GET(other_cpus), stopped_cpus); - panic("stop_cpus() failed"); - } - restart_cpus(stopped_cpus); - -#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) - db_printf(" restarted.\n"); -#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ - -#endif /* SMP */ - - write_rflags(ef); - - return (1); + (void)kdb_jmpbuf(prev_jb); + return (ret); } -#endif /* - * Read bytes from kernel address space for debugger. - */ -void -db_read_bytes(vm_offset_t addr, size_t size, char *data) -{ - char *src; - - db_nofault = &db_jmpbuf; - - src = (char *)addr; - while (size-- > 0) - *data++ = *src++; - - db_nofault = 0; -} - -/* * Write bytes to kernel address space for debugger. */ -void +int db_write_bytes(vm_offset_t addr, size_t size, char *data) { - char *dst; - + jmp_buf jb; + void *prev_jb; + char *dst; pt_entry_t *ptep0 = NULL; pt_entry_t oldmap0 = 0; vm_offset_t addr1; pt_entry_t *ptep1 = NULL; pt_entry_t oldmap1 = 0; + int ret; - db_nofault = &db_jmpbuf; + prev_jb = kdb_jmpbuf(jb); + ret = setjmp(jb); + if (ret == 0) { + if (addr > trunc_page((vm_offset_t)btext) - size && + addr < round_page((vm_offset_t)etext)) { - if (addr > trunc_page((vm_offset_t)btext) - size && - addr < round_page((vm_offset_t)etext)) { + ptep0 = vtopte(addr); + oldmap0 = *ptep0; + *ptep0 |= PG_RW; - ptep0 = vtopte(addr); - oldmap0 = *ptep0; - *ptep0 |= PG_RW; + /* + * Map another page if the data crosses a page + * boundary. + */ + if ((*ptep0 & PG_PS) == 0) { + addr1 = trunc_page(addr + size - 1); + if (trunc_page(addr) != addr1) { + ptep1 = vtopte(addr1); + oldmap1 = *ptep1; + *ptep1 |= PG_RW; + } + } else { + addr1 = trunc_2mpage(addr + size - 1); + if (trunc_2mpage(addr) != addr1) { + ptep1 = vtopte(addr1); + oldmap1 = *ptep1; + *ptep1 |= PG_RW; + } + } - /* Map another page if the data crosses a page boundary. */ - if ((*ptep0 & PG_PS) == 0) { - addr1 = trunc_page(addr + size - 1); - if (trunc_page(addr) != addr1) { - ptep1 = vtopte(addr1); - oldmap1 = *ptep1; - *ptep1 |= PG_RW; - } - } else { - addr1 = trunc_2mpage(addr + size - 1); - if (trunc_2mpage(addr) != addr1) { - ptep1 = vtopte(addr1); - oldmap1 = *ptep1; - *ptep1 |= PG_RW; + invltlb(); } - } + + dst = (char *)addr; - invltlb(); + while (size-- > 0) + *dst++ = *data++; } - dst = (char *)addr; - - while (size-- > 0) - *dst++ = *data++; + (void)kdb_jmpbuf(prev_jb); - db_nofault = 0; - if (ptep0) { - *ptep0 = oldmap0; + *ptep0 = oldmap0; - if (ptep1) - *ptep1 = oldmap1; + if (ptep1) + *ptep1 = oldmap1; - invltlb(); + invltlb(); } + + return (ret); } void From owner-p4-projects@FreeBSD.ORG Sun May 30 20:37:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4431F16A4D0; Sun, 30 May 2004 20:37:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3D6B16A4CE for ; Sun, 30 May 2004 20:37:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6F5843D1F for ; Sun, 30 May 2004 20:37:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V3bTdO073047 for ; Sun, 30 May 2004 20:37:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V3bStZ073044 for perforce@freebsd.org; Sun, 30 May 2004 20:37:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 20:37:29 -0700 (PDT) Message-Id: <200405310337.i4V3bStZ073044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53842 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, 31 May 2004 03:37:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=53842 Change 53842 by marcel@marcel_nfs on 2004/05/30 20:36:38 Have get_esp() take a pointer to a trapframe so that it works with any thread, not just the one that entered the debugger. Affected files ... .. //depot/projects/gdb/sys/i386/i386/db_trace.c#5 edit Differences ... ==== //depot/projects/gdb/sys/i386/i386/db_trace.c#5 (text+ko) ==== @@ -59,10 +59,10 @@ static db_varfcn_t db_esp; static __inline int -get_esp(void) +get_esp(struct trapframe *tf) { - return ((ISPL(ddb_regs.tf_cs)) ? ddb_regs.tf_esp : - (db_expr_t)kdb_frame + offsetof(struct trapframe, tf_esp)); + return ((ISPL(tf->tf_cs)) ? tf->tf_esp : + (db_expr_t)tf + offsetof(struct trapframe, tf_esp)); } /* @@ -125,7 +125,7 @@ db_esp (struct db_variable *vp, db_expr_t *valuep, int op) { if (op == DB_VAR_GET) - *valuep = get_esp(); + *valuep = get_esp(kdb_frame); else if (ISPL(ddb_regs.tf_cs)) ddb_regs.tf_esp = *valuep; return (0); @@ -300,7 +300,7 @@ tf = (struct trapframe *)((int)*fp + 8); if (INKERNEL((int) tf)) { - esp = get_esp(); + esp = get_esp(tf); eip = tf->tf_eip; ebp = tf->tf_ebp; switch (frame_type) { @@ -366,20 +366,20 @@ instr = db_get_value(pc, 4, FALSE); if ((instr & 0xffffff) == 0x00e58955) { /* pushl %ebp; movl %esp, %ebp */ - actframe = (void *)(get_esp() - 4); + actframe = (void *)(get_esp(tf) - 4); } else if ((instr & 0xffff) == 0x0000e589) { /* movl %esp, %ebp */ - actframe = (void *)get_esp(); + actframe = (void *)get_esp(tf); if (ddb_regs.tf_ebp == 0) { /* Fake frame better. */ frame = actframe; } } else if ((instr & 0xff) == 0x000000c3) { /* ret */ - actframe = (void *)(get_esp() - 4); + actframe = (void *)(get_esp(tf) - 4); } else if (offset == 0) { /* Probably an assembler symbol. */ - actframe = (void *)(get_esp() - 4); + actframe = (void *)(get_esp(tf) - 4); } } else if (strcmp(name, "fork_trampoline") == 0) { /* From owner-p4-projects@FreeBSD.ORG Sun May 30 20:46:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E8FD16A4D0; Sun, 30 May 2004 20:46:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19F7A16A4CE for ; Sun, 30 May 2004 20:46:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 126C143D45 for ; Sun, 30 May 2004 20:46:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V3kftv075058 for ; Sun, 30 May 2004 20:46:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V3kfhK075055 for perforce@freebsd.org; Sun, 30 May 2004 20:46:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 20:46:41 -0700 (PDT) Message-Id: <200405310346.i4V3kfhK075055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53843 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, 31 May 2004 03:46:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=53843 Change 53843 by marcel@marcel_sledge on 2004/05/30 20:45:40 MFi386 Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/db_trace.c#3 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/db_trace.c#3 (text+ko) ==== @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -46,14 +47,23 @@ #include #include -db_varfcn_t db_dr0; -db_varfcn_t db_dr1; -db_varfcn_t db_dr2; -db_varfcn_t db_dr3; -db_varfcn_t db_dr4; -db_varfcn_t db_dr5; -db_varfcn_t db_dr6; -db_varfcn_t db_dr7; +static db_varfcn_t db_dr0; +static db_varfcn_t db_dr1; +static db_varfcn_t db_dr2; +static db_varfcn_t db_dr3; +static db_varfcn_t db_dr4; +static db_varfcn_t db_dr5; +static db_varfcn_t db_dr6; +static db_varfcn_t db_dr7; +static db_varfcn_t db_ss; +static db_varfcn_t db_rsp; + +static __inline long +get_rsp(struct trapframe *tf) +{ + return ((ISPL(tf->tf_cs)) ? tf->tf_rsp : + (db_expr_t)tf + offsetof(struct trapframe, tf_rsp)); +} /* * Machine register set. @@ -66,12 +76,12 @@ { "fs", &ddb_regs.tf_fs, FCN_NULL }, { "gs", &ddb_regs.tf_gs, FCN_NULL }, #endif - { "ss", &ddb_regs.tf_ss, FCN_NULL }, + { "ss", NULL, db_ss }, { "rax", &ddb_regs.tf_rax, FCN_NULL }, { "rcx", &ddb_regs.tf_rcx, FCN_NULL }, { "rdx", &ddb_regs.tf_rdx, FCN_NULL }, { "rbx", &ddb_regs.tf_rbx, FCN_NULL }, - { "rsp", &ddb_regs.tf_rsp, FCN_NULL }, + { "rsp", NULL, db_rsp }, { "rbp", &ddb_regs.tf_rbp, FCN_NULL }, { "rsi", &ddb_regs.tf_rsi, FCN_NULL }, { "rdi", &ddb_regs.tf_rdi, FCN_NULL }, @@ -96,6 +106,49 @@ }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); +#define DB_DRX_FUNC(reg) \ +static int \ +db_ ## reg (vp, valuep, op) \ + struct db_variable *vp; \ + db_expr_t * valuep; \ + int op; \ +{ \ + if (op == DB_VAR_GET) \ + *valuep = r ## reg (); \ + else \ + load_ ## reg (*valuep); \ + return (0); \ +} + +DB_DRX_FUNC(dr0) +DB_DRX_FUNC(dr1) +DB_DRX_FUNC(dr2) +DB_DRX_FUNC(dr3) +DB_DRX_FUNC(dr4) +DB_DRX_FUNC(dr5) +DB_DRX_FUNC(dr6) +DB_DRX_FUNC(dr7) + +static int +db_rsp (struct db_variable *vp, db_expr_t *valuep, int op) +{ + if (op == DB_VAR_GET) + *valuep = get_rsp(kdb_frame); + else if (ISPL(ddb_regs.tf_cs)) + ddb_regs.tf_rsp = *valuep; + return (0); +} + +static int +db_ss (struct db_variable *vp, db_expr_t *valuep, int op) +{ + if (op == DB_VAR_GET) + *valuep = (ISPL(ddb_regs.tf_cs)) ? ddb_regs.tf_ss : rss(); + else if (ISPL(ddb_regs.tf_cs)) + ddb_regs.tf_ss = *valuep; + return (0); +} + /* * Stack trace. */ @@ -112,13 +165,10 @@ #define INTERRUPT 2 #define SYSCALL 3 -static void db_nextframe(struct amd64_frame **, db_addr_t *, struct proc *); +static void db_nextframe(struct amd64_frame **, db_addr_t *, struct thread *); static int db_numargs(struct amd64_frame *); static void db_print_stack_entry(const char *, int, char **, long *, db_addr_t); -static void decode_syscall(int, struct proc *); -static void db_trace_one_stack(int count, boolean_t have_addr, - struct proc *p, struct amd64_frame *frame, db_addr_t callpc); - +static void decode_syscall(int, struct thread *); static char * watchtype_str(int type); int amd64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, @@ -189,16 +239,16 @@ } static void -decode_syscall(number, p) - int number; +decode_syscall(int number, struct thread *td) +{ struct proc *p; -{ c_db_sym_t sym; db_expr_t diff; sy_call_t *f; const char *symname; db_printf(" (%d", number); + p = (td != NULL) ? td->td_proc : NULL; if (p != NULL && 0 <= number && number < p->p_sysent->sv_size) { f = p->p_sysent->sv_table[number].sy_call; sym = db_search_symbol((db_addr_t)f, DB_STGY_ANY, &diff); @@ -214,10 +264,7 @@ * Figure out the next frame up in the call stack. */ static void -db_nextframe(fp, ip, p) - struct amd64_frame **fp; /* in/out */ - db_addr_t *ip; /* out */ - struct proc *p; /* in */ +db_nextframe(struct amd64_frame **fp, db_addr_t *ip, struct thread *td) { struct trapframe *tf; int frame_type; @@ -265,8 +312,7 @@ tf = (struct trapframe *)((long)*fp + 16); if (INKERNEL((long) tf)) { - rsp = (ISPL(tf->tf_cs) == SEL_UPL) ? - tf->tf_rsp : (long)&tf->tf_rsp; + rsp = get_rsp(tf); rip = tf->tf_rip; rbp = tf->tf_rbp; switch (frame_type) { @@ -275,7 +321,7 @@ break; case SYSCALL: db_printf("--- syscall"); - decode_syscall(tf->tf_rax, p); + decode_syscall(tf->tf_rax, td); break; case INTERRUPT: db_printf("--- interrupt"); @@ -291,135 +337,26 @@ *fp = (struct amd64_frame *) rbp; } -void -db_stack_trace_cmd(addr, have_addr, count, modif) - db_expr_t addr; - boolean_t have_addr; - db_expr_t count; - char *modif; +static int +db_backtrace(struct thread *td, struct trapframe *tf, + struct amd64_frame *frame, db_addr_t pc, int count) { - struct amd64_frame *frame; - struct proc *p; - struct pcb *pcb; - struct thread *td; - db_addr_t callpc; - pid_t pid; + struct amd64_frame *actframe; +#define MAXNARG 16 + char *argnames[MAXNARG], **argnp = NULL; + const char *name; + long *argp; + db_expr_t offset; + c_db_sym_t sym; + int narg; + boolean_t first; if (count == -1) count = 1024; - if (!have_addr) { - td = curthread; - p = td->td_proc; - frame = (struct amd64_frame *)ddb_regs.tf_rbp; - if (frame == NULL) - frame = (struct amd64_frame *)(ddb_regs.tf_rsp - 8); - callpc = (db_addr_t)ddb_regs.tf_rip; - } else if (!INKERNEL(addr)) { - pid = (addr % 16) + ((addr >> 4) % 16) * 10 + - ((addr >> 8) % 16) * 100 + ((addr >> 12) % 16) * 1000 + - ((addr >> 16) % 16) * 10000; - /* - * The pcb for curproc is not valid at this point, - * so fall back to the default case. - */ - if (pid == curthread->td_proc->p_pid) { - td = curthread; - p = td->td_proc; - frame = (struct amd64_frame *)ddb_regs.tf_rbp; - if (frame == NULL) - frame = (struct amd64_frame *) - (ddb_regs.tf_rsp - 8); - callpc = (db_addr_t)ddb_regs.tf_rip; - } else { - - /* sx_slock(&allproc_lock); */ - LIST_FOREACH(p, &allproc, p_list) { - if (p->p_pid == pid) - break; - } - /* sx_sunlock(&allproc_lock); */ - if (p == NULL) { - db_printf("pid %d not found\n", pid); - return; - } - if ((p->p_sflag & PS_INMEM) == 0) { - db_printf("pid %d swapped out\n", pid); - return; - } - pcb = FIRST_THREAD_IN_PROC(p)->td_pcb; /* XXXKSE */ - frame = (struct amd64_frame *)pcb->pcb_rbp; - if (frame == NULL) - frame = (struct amd64_frame *) - (pcb->pcb_rsp - 8); - callpc = (db_addr_t)pcb->pcb_rip; - } - } else { - p = NULL; - frame = (struct amd64_frame *)addr; - callpc = (db_addr_t)db_get_value((long)&frame->f_retaddr, 8, FALSE); - frame = frame->f_frame; - } - db_trace_one_stack(count, have_addr, p, frame, callpc); -} - -void -db_stack_thread(db_expr_t addr, boolean_t have_addr, - db_expr_t count, char *modif) -{ - struct amd64_frame *frame; - struct thread *td; - struct proc *p; - struct pcb *pcb; - db_addr_t callpc; - - if (!have_addr) - return; - if (!INKERNEL(addr)) { - printf("bad thread address"); - return; - } - td = (struct thread *)addr; - /* quick sanity check */ - if ((p = td->td_proc) != td->td_ksegrp->kg_proc) - return; - if (TD_IS_SWAPPED(td)) { - db_printf("thread at %p swapped out\n", td); - return; - } - if (td == curthread) { - frame = (struct amd64_frame *)ddb_regs.tf_rbp; - if (frame == NULL) - frame = (struct amd64_frame *)(ddb_regs.tf_rsp - 8); - callpc = (db_addr_t)ddb_regs.tf_rip; - } else { - pcb = td->td_pcb; - frame = (struct amd64_frame *)pcb->pcb_rbp; - if (frame == NULL) - frame = (struct amd64_frame *) (pcb->pcb_rsp - 8); - callpc = (db_addr_t)pcb->pcb_rip; - } - db_trace_one_stack(count, have_addr, p, frame, callpc); -} - -static void -db_trace_one_stack(int count, boolean_t have_addr, - struct proc *p, struct amd64_frame *frame, db_addr_t callpc) -{ - long *argp; - boolean_t first; - first = TRUE; while (count--) { - struct amd64_frame *actframe; - int narg; - const char * name; - db_expr_t offset; - c_db_sym_t sym; -#define MAXNARG 16 - char *argnames[MAXNARG], **argnp = NULL; - - sym = db_search_symbol(callpc, DB_STGY_ANY, &offset); + sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); /* @@ -435,37 +372,33 @@ */ actframe = frame; if (first) { - if (!have_addr) { + if (tf != NULL) { int instr; - instr = db_get_value(callpc, 4, FALSE); + instr = db_get_value(pc, 4, FALSE); if ((instr & 0xffffffff) == 0xe5894855) { /* pushq %rbp; movq %rsp, %rbp */ - actframe = (struct amd64_frame *) - (ddb_regs.tf_rsp - 8); - } else if ((instr & 0x00ffffff) == 0x00e58948) { + actframe = (void *)(get_rsp(tf) - 8); + } else if ((instr & 0xffffff) == 0xe58948) { /* movq %rsp, %rbp */ - actframe = (struct amd64_frame *) - ddb_regs.tf_rsp; - if (ddb_regs.tf_rbp == 0) { - /* Fake caller's frame better. */ + actframe = (void *)get_rsp(tf); + if (tf->tf_rbp == 0) { + /* Fake frame better. */ frame = actframe; } - } else if ((instr & 0x000000ff) == 0x000000c3) { + } else if ((instr & 0xff) == 0xc3) { /* ret */ - actframe = (struct amd64_frame *) - (ddb_regs.tf_rsp - 8); + actframe = (void *)(get_rsp(tf) - 8); } else if (offset == 0) { - /* Probably a symbol in assembler code. */ - actframe = (struct amd64_frame *) - (ddb_regs.tf_rsp - 8); + /* Probably an assembler symbol. */ + actframe = (void *)(get_rsp(tf) - 8); } } else if (strcmp(name, "fork_trampoline") == 0) { /* * Don't try to walk back on a stack for a * process that hasn't actually been run yet. */ - db_print_stack_entry(name, 0, 0, 0, callpc); + db_print_stack_entry(name, 0, 0, 0, pc); break; } first = FALSE; @@ -479,60 +412,71 @@ narg = db_numargs(frame); } - db_print_stack_entry(name, narg, argnp, argp, callpc); + db_print_stack_entry(name, narg, argnp, argp, pc); if (actframe != frame) { /* `frame' belongs to caller. */ - callpc = (db_addr_t) + pc = (db_addr_t) db_get_value((long)&actframe->f_retaddr, 8, FALSE); continue; } - db_nextframe(&frame, &callpc, p); + db_nextframe(&frame, &pc, td); - if (INKERNEL((long) callpc) && !INKERNEL((long) frame)) { - sym = db_search_symbol(callpc, DB_STGY_ANY, &offset); + if (INKERNEL((long)pc) && !INKERNEL((long)frame)) { + sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); - db_print_stack_entry(name, 0, 0, 0, callpc); + db_print_stack_entry(name, 0, 0, 0, pc); break; } if (!INKERNEL((long) frame)) { break; } } + + return (0); } void -db_print_backtrace(void) +db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, + char *modif) +{ + struct trapframe *tf; + struct thread *td; + + td = (have_addr) ? kdb_thr_lookup(addr) : kdb_thread; + if (td == NULL) { + db_printf("Thread %ld not found\n", addr); + return; + } + tf = td->td_last_frame; + db_backtrace(td, tf, (struct amd64_frame *)tf->tf_rbp, + (db_addr_t)tf->tf_rip, count); +} + +void +db_trace_self(void) { - register_t ebp; + struct amd64_frame *frame; + db_addr_t callpc; + register_t rbp; - __asm __volatile("movq %%rbp,%0" : "=r" (ebp)); - db_stack_trace_cmd(ebp, 1, -1, NULL); + __asm __volatile("movq %%rbp,%0" : "=r" (rbp)); + frame = (struct amd64_frame *)rbp; + callpc = (db_addr_t)db_get_value((long)&frame->f_retaddr, 8, FALSE); + frame = frame->f_frame; + db_backtrace(curthread, NULL, frame, callpc, -1); } -#define DB_DRX_FUNC(reg) \ -int \ -db_ ## reg (vp, valuep, op) \ - struct db_variable *vp; \ - db_expr_t * valuep; \ - int op; \ -{ \ - if (op == DB_VAR_GET) \ - *valuep = r ## reg (); \ - else \ - load_ ## reg (*valuep); \ - return (0); \ -} +int +db_trace_thread(struct thread *thr, int count) +{ + struct trapframe *tf; -DB_DRX_FUNC(dr0) -DB_DRX_FUNC(dr1) -DB_DRX_FUNC(dr2) -DB_DRX_FUNC(dr3) -DB_DRX_FUNC(dr4) -DB_DRX_FUNC(dr5) -DB_DRX_FUNC(dr6) -DB_DRX_FUNC(dr7) + tf = thr->td_last_frame; + return (db_backtrace(thr, tf, (struct amd64_frame *)tf->tf_rbp, + (db_addr_t)tf->tf_rip, count)); +} int amd64_set_watch(watchnum, watchaddr, size, access, d) From owner-p4-projects@FreeBSD.ORG Sun May 30 20:50:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C06116A4D0; Sun, 30 May 2004 20:50:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 564B316A4CE for ; Sun, 30 May 2004 20:50:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5004943D5A for ; Sun, 30 May 2004 20:50:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4V3olTb081194 for ; Sun, 30 May 2004 20:50:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4V3okhj081191 for perforce@freebsd.org; Sun, 30 May 2004 20:50:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 30 May 2004 20:50:46 -0700 (PDT) Message-Id: <200405310350.i4V3okhj081191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53844 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, 31 May 2004 03:50:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=53844 Change 53844 by marcel@marcel_sledge on 2004/05/30 20:50:43 ksym_start & ksym_end have type vm_offset_t. Give MD_FETCH an integral type the width of a pointer to avoid casting. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#12 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#12 (text+ko) ==== @@ -1140,8 +1140,8 @@ boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *) + KERNBASE; #ifdef DDB - ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, void *); - ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, void *); + ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); + ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t); #endif /* Init basic tunables, hz etc */ From owner-p4-projects@FreeBSD.ORG Mon May 31 11:01:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58F4A16A4D0; Mon, 31 May 2004 11:01:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E3F816A4CE for ; Mon, 31 May 2004 11:01:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1091543D45 for ; Mon, 31 May 2004 11:01:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4VI0LJf090566 for ; Mon, 31 May 2004 11:00:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VI0Lpi090563 for perforce@freebsd.org; Mon, 31 May 2004 11:00:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 31 May 2004 11:00:21 -0700 (PDT) Message-Id: <200405311800.i4VI0Lpi090563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53880 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, 31 May 2004 18:01:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=53880 Change 53880 by marcel@marcel_nfs on 2004/05/31 10:59:26 Remove option NO_SIO. It's gone. Affected files ... .. //depot/projects/gdb/sys/alpha/conf/NOTES#2 edit Differences ... ==== //depot/projects/gdb/sys/alpha/conf/NOTES#2 (text+ko) ==== @@ -40,9 +40,6 @@ options DEC_KN300 # AlphaServer 4100 (Rawhide), # AlphaServer 1200 (Tincup) -# Allow building a kernel without sio(4). -options NO_SIO - ##################################################################### # HARDWARE BUS CONFIGURATION From owner-p4-projects@FreeBSD.ORG Mon May 31 11:17:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C999016A4D0; Mon, 31 May 2004 11:17:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A11316A4CE for ; Mon, 31 May 2004 11:17:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8367A43D2F for ; Mon, 31 May 2004 11:17:05 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4VIGgvk095627 for ; Mon, 31 May 2004 11:16:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VIGgQR095624 for perforce@freebsd.org; Mon, 31 May 2004 11:16:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 31 May 2004 11:16:42 -0700 (PDT) Message-Id: <200405311816.i4VIGgQR095624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53882 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, 31 May 2004 18:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=53882 Change 53882 by marcel@marcel_nfs on 2004/05/31 11:15:59 Revert changes to the bmake stuff of binutils. It was forgotten when the import of binutils was reverted. The only change left is the exclusion of gdb. We build gdb independently of binutils. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc0#4 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#4 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#3 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/bfdver.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/Makefile#4 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/config.h#3 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc0#4 (text+ko) ==== @@ -17,6 +17,7 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} +CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I. .if exists(${.CURDIR}/${TARGET_ARCH}) CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#4 (text+ko) ==== @@ -9,11 +9,17 @@ coffgen.c corefile.c elf.c elf-eh-frame.c elf-strtab.c format.c \ hash.c ihex.c init.c libbfd.c linker.c merge.c opncls.c reloc.c \ section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ - targmatch.h dwarf1.c dwarf2.c -WARNS?=2 + targmatch.h dwarf1.c dwarf2.c config.h +WARNS?= 0 +.if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || \ + ${TARGET_ARCH} == "sparc64") +WARNS?= 2 +.endif CFLAGS+= -I${SRCDIR}/bfd +CFLAGS+= -DBFD_VERSION=\"${VERSION_DATE}\" -DBFD_VERSION_DATE=${VERSION_DATE} +CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" INTERNALLIB= true -CLEANFILES+= targmatch.h +CLEANFILES+= config.h targmatch.h SELARCH= .if ${TARGET_ARCH} == "amd64" @@ -44,5 +50,12 @@ targmatch.h: targmatch.sed config.bfd sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET} + +config.h: config.h.fbsd +.if ${TARGET_ARCH} == "i386" + sed -e 's,!!TRAD_HEADER!!,"hosts/i386bsd.h",g' ${.ALLSRC} > ${.TARGET} +.else + sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET} +.endif .include ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#3 (text+ko) ==== @@ -2,7 +2,7 @@ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c +SRCS+= cpu-i386.c elf32-i386-fbsd.c elf32-i386.c elf32-target.h elf32.c elflink.c VECS= ${DEFAULT_VECTOR} bfd_elf32_i386_vec .if ${TARGET_ARCH} == "i386" CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/Makefile#4 (text+ko) ==== @@ -5,15 +5,12 @@ .PATH: ${SRCDIR}/libiberty LIB= iberty -SRCS= argv.c choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \ - dyn-string.c fdmatch.c fibheap.c floatformat.c getpwd.c getruntime.c \ - hashtab.c hex.c lbasename.c lrealpath.c make-temp-file.c md5.c \ - objalloc.c obstack.c partition.c pex-unix.c physmem.c regex.c \ - safe-ctype.c sort.c spaces.c splay-tree.c stpncpy.c strerror.c \ - strsignal.c ternary.c xatexit.c xexit.c xmalloc.c xmemdup.c xstrdup.c \ - xstrerror.c - -WARNS= 1 +SRCS= argv.c choose-temp.c concat.c cp-demangle.c cplus-dem.c \ + dyn-string.c getpwd.c getruntime.c \ + hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ + objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ + xstrdup.c xstrerror.c +WARNS?= 1 CFLAGS+= -DHAVE_CONFIG_H INTERNALLIB= true ==== //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/config.h#3 (text+ko) ==== @@ -1,378 +1,257 @@ -/* $FreeBSD$ */ -/* config.h. Generated by configure. */ -/* config.in. Generated from configure.ac by autoheader. */ -/* Define to `unsigned long' if doesn't define. */ -/* #undef uintptr_t */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.5 2002/12/02 09:44:59 obrien Exp $ */ + +/* config.h. Generated automatically by configure. */ +/* config.in. Generated automatically from configure.in by autoheader 2.13. */ + +/* Define to empty if the keyword does not work. */ +/* #undef const */ + +/* Define if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define if you have . */ +/* #undef HAVE_VFORK_H */ + +/* Define as __inline if that's what the C compiler calls it. */ +/* #undef inline */ + +/* Define to `int' if doesn't define. */ +/* #undef pid_t */ + +/* Define if you need to in order for stat and other things to work. */ +/* #undef _POSIX_SOURCE */ +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 -/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ -#define BYTEORDER 1234 +/* Define if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Define vfork as fork if vfork does not work. */ +/* #undef vfork */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ALLOCA_H */ +/* Define if you have the _doprnt function. */ +/* #undef HAVE__DOPRNT */ -/* Define to 1 if you have the `asprintf' function. */ +/* Define if you have the asprintf function. */ #define HAVE_ASPRINTF 1 -/* Define to 1 if you have the `atexit' function. */ +/* Define if you have the atexit function. */ #define HAVE_ATEXIT 1 -/* Define to 1 if you have the `basename' function. */ +/* Define if you have the basename function. */ #define HAVE_BASENAME 1 -/* Define to 1 if you have the `bcmp' function. */ +/* Define if you have the bcmp function. */ #define HAVE_BCMP 1 -/* Define to 1 if you have the `bcopy' function. */ +/* Define if you have the bcopy function. */ #define HAVE_BCOPY 1 -/* Define to 1 if you have the `bsearch' function. */ +/* Define if you have the bsearch function. */ #define HAVE_BSEARCH 1 -/* Define to 1 if you have the `bzero' function. */ +/* Define if you have the bzero function. */ #define HAVE_BZERO 1 -/* Define to 1 if you have the `calloc' function. */ +/* Define if you have the calloc function. */ #define HAVE_CALLOC 1 -/* Define to 1 if you have the `canonicalize_file_name' function. */ -/* #undef HAVE_CANONICALIZE_FILE_NAME */ - -/* Define to 1 if you have the `clock' function. */ +/* Define if you have the clock function. */ #define HAVE_CLOCK 1 -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `ffs' function. */ +/* Define if you have the ffs function. */ #define HAVE_FFS 1 -/* Define to 1 if you have the `fork' function. */ -#define HAVE_FORK 1 - -/* Define to 1 if you have the `getcwd' function. */ +/* Define if you have the getcwd function. */ #define HAVE_GETCWD 1 -/* Define to 1 if you have the `getpagesize' function. */ +/* Define if you have the getpagesize function. */ #define HAVE_GETPAGESIZE 1 -/* Define to 1 if you have the `getrusage' function. */ +/* Define if you have the getrusage function. */ #define HAVE_GETRUSAGE 1 -/* Define to 1 if you have the `getsysinfo' function. */ -/* #undef HAVE_GETSYSINFO */ - -/* Define to 1 if you have the `gettimeofday' function. */ +/* Define if you have the gettimeofday function. */ #define HAVE_GETTIMEOFDAY 1 -/* Define to 1 if you have the `index' function. */ +/* Define if you have the index function. */ #define HAVE_INDEX 1 -/* Define to 1 if you have the `insque' function. */ +/* Define if you have the insque function. */ #define HAVE_INSQUE 1 -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MACHINE_HAL_SYSINFO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MALLOC_H */ - -/* Define to 1 if you have the `memchr' function. */ +/* Define if you have the memchr function. */ #define HAVE_MEMCHR 1 -/* Define to 1 if you have the `memcmp' function. */ +/* Define if you have the memcmp function. */ #define HAVE_MEMCMP 1 -/* Define to 1 if you have the `memcpy' function. */ +/* Define if you have the memcpy function. */ #define HAVE_MEMCPY 1 -/* Define to 1 if you have the `memmove' function. */ +/* Define if you have the memmove function. */ #define HAVE_MEMMOVE 1 -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mempcpy' function. */ -/* #undef HAVE_MEMPCPY */ - -/* Define to 1 if you have the `memset' function. */ +/* Define if you have the memset function. */ #define HAVE_MEMSET 1 -/* Define to 1 if you have the `mkstemps' function. */ +/* Define if you have the mkstemps function. */ #define HAVE_MKSTEMPS 1 -/* Define to 1 if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 - -/* Define to 1 if you have the `on_exit' function. */ +/* Define if you have the on_exit function. */ /* #undef HAVE_ON_EXIT */ -/* Define to 1 if you have the `psignal' function. */ +/* Define if you have the psignal function. */ #define HAVE_PSIGNAL 1 -/* Define to 1 if you have the `pstat_getdynamic' function. */ -/* #undef HAVE_PSTAT_GETDYNAMIC */ - -/* Define to 1 if you have the `pstat_getstatic' function. */ -/* #undef HAVE_PSTAT_GETSTATIC */ - -/* Define to 1 if you have the `putenv' function. */ +/* Define if you have the putenv function. */ #define HAVE_PUTENV 1 -/* Define to 1 if you have the `random' function. */ +/* Define if you have the random function. */ #define HAVE_RANDOM 1 -/* Define to 1 if you have the `realpath' function. */ -#define HAVE_REALPATH 1 - -/* Define to 1 if you have the `rename' function. */ +/* Define if you have the rename function. */ #define HAVE_RENAME 1 -/* Define to 1 if you have the `rindex' function. */ +/* Define if you have the rindex function. */ #define HAVE_RINDEX 1 -/* Define to 1 if you have the `sbrk' function. */ +/* Define if you have the sbrk function. */ #define HAVE_SBRK 1 -/* Define to 1 if you have the `setenv' function. */ +/* Define if you have the setenv function. */ #define HAVE_SETENV 1 -/* Define to 1 if you have the `sigsetmask' function. */ +/* Define if you have the sigsetmask function. */ #define HAVE_SIGSETMASK 1 -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `stpcpy' function. */ -#define HAVE_STPCPY 1 - -/* Define to 1 if you have the `stpncpy' function. */ -/* #undef HAVE_STPNCPY */ - -/* Define to 1 if you have the `strcasecmp' function. */ +/* Define if you have the strcasecmp function. */ #define HAVE_STRCASECMP 1 -/* Define to 1 if you have the `strchr' function. */ +/* Define if you have the strchr function. */ #define HAVE_STRCHR 1 -/* Define to 1 if you have the `strdup' function. */ +/* Define if you have the strdup function. */ #define HAVE_STRDUP 1 -/* Define to 1 if you have the `strerror' function. */ +/* Define if you have the strerror function. */ #define HAVE_STRERROR 1 -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strncasecmp' function. */ +/* Define if you have the strncasecmp function. */ #define HAVE_STRNCASECMP 1 -/* Define to 1 if you have the `strrchr' function. */ +/* Define if you have the strrchr function. */ #define HAVE_STRRCHR 1 -/* Define to 1 if you have the `strsignal' function. */ +/* Define if you have the strsignal function. */ #define HAVE_STRSIGNAL 1 -/* Define to 1 if you have the `strstr' function. */ +/* Define if you have the strstr function. */ #define HAVE_STRSTR 1 -/* Define to 1 if you have the `strtod' function. */ +/* Define if you have the strtod function. */ #define HAVE_STRTOD 1 -/* Define to 1 if you have the `strtol' function. */ +/* Define if you have the strtol function. */ #define HAVE_STRTOL 1 -/* Define to 1 if you have the `strtoul' function. */ +/* Define if you have the strtoul function. */ #define HAVE_STRTOUL 1 -/* Define to 1 if you have the `sysconf' function. */ +/* Define if you have the sysconf function. */ #define HAVE_SYSCONF 1 -/* Define to 1 if you have the `sysctl' function. */ -#define HAVE_SYSCTL 1 - -/* Define to 1 if you have the `sysmp' function. */ -/* #undef HAVE_SYSMP */ - -/* Define if you have the sys_errlist variable. */ -#define HAVE_SYS_ERRLIST 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_FILE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_MMAN_H 1 - -/* Define if you have the sys_nerr variable. */ -#define HAVE_SYS_NERR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PSTAT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 - -/* Define if you have the sys_siglist variable. */ -#define HAVE_SYS_SIGLIST 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SYSCTL_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SYSINFO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SYSMP_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SYSTEMCFG_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TABLE_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define to 1 if you have the `table' function. */ -/* #undef HAVE_TABLE */ - -/* Define to 1 if you have the `times' function. */ +/* Define if you have the times function. */ #define HAVE_TIMES 1 -/* Define to 1 if you have the header file. */ -#define HAVE_TIME_H 1 - -/* Define to 1 if you have the `tmpnam' function. */ +/* Define if you have the tmpnam function. */ #define HAVE_TMPNAM 1 -/* Define if you have the \`uintptr_t' type. */ -#define HAVE_UINTPTR_T 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `vasprintf' function. */ +/* Define if you have the vasprintf function. */ #define HAVE_VASPRINTF 1 -/* Define to 1 if you have the `vfork' function. */ -#define HAVE_VFORK 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_VFORK_H */ - -/* Define to 1 if you have the `vfprintf' function. */ +/* Define if you have the vfprintf function. */ #define HAVE_VFPRINTF 1 -/* Define to 1 if you have the `vprintf' function. */ +/* Define if you have the vprintf function. */ #define HAVE_VPRINTF 1 -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define to 1 if you have the `vsprintf' function. */ +/* Define if you have the vsprintf function. */ #define HAVE_VSPRINTF 1 -/* Define to 1 if you have the `waitpid' function. */ +/* Define if you have the waitpid function. */ #define HAVE_WAITPID 1 -/* Define to 1 if `fork' works. */ -#define HAVE_WORKING_FORK 1 +/* Define if you have the header file. */ +/* #undef HAVE_ALLOCA_H */ -/* Define to 1 if `vfork' works. */ -#define HAVE_WORKING_VFORK 1 +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 -/* Define to 1 if you have the `_doprnt' function. */ -/* #undef HAVE__DOPRNT */ +/* Define if you have the header file. */ +#define HAVE_LIMITS_H 1 -/* Define if you have the _system_configuration variable. */ -/* #undef HAVE__SYSTEM_CONFIGURATION */ +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 -/* Define if the host machine stores words of multi-word integers in - big-endian order. */ -/* #undef HOST_WORDS_BIG_ENDIAN */ +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 -/* Define if canonicalize_file_name is not declared in system header files. */ -#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1 +/* Define if you have the header file. */ +#define HAVE_STRINGS_H 1 -/* Define if errno must be declared even when is included. */ -/* #undef NEED_DECLARATION_ERRNO */ +/* Define if you have the header file. */ +#define HAVE_SYS_FILE_H 1 -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ +/* Define if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +/* Define if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" +/* Define if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +/* Define if you have the header file. */ +#define HAVE_SYS_STAT_H 1 -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +/* Define if you have the header file. */ +#define HAVE_SYS_TIME_H 1 -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" +/* Define if you have the header file. */ +#define HAVE_TIME_H 1 -/* Define if you know the direction of stack growth for your system; otherwise - it will be automatically deduced at run-time. STACK_DIRECTION > 0 => grows - toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#define STACK_DIRECTION -1 +/* Define if you have the header file. */ +#define HAVE_UNISTD_H 1 -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define if errno must be declared even when is included. */ +/* #undef NEED_DECLARATION_ERRNO */ -/* Define to 1 if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 +/* Define if you have the `uintptr_t' type. */ +#define HAVE_UINTPTR_T 1 -/* whether byteorder is bigendian */ -/* #undef WORDS_BIGENDIAN */ +/* Define if you have the sys_errlist variable. */ +#define HAVE_SYS_ERRLIST 1 -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ +/* Define if you have the sys_nerr variable. */ +#define HAVE_SYS_NERR 1 -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -/* #undef inline */ +/* Define if you have the sys_siglist variable. */ +#define HAVE_SYS_SIGLIST 1 -/* Define to `int' if does not define. */ -/* #undef pid_t */ +/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP + systems. This function is required for alloca.c support on those + systems. */ +/* #undef CRAY_STACKSEG_END */ -/* Define to `unsigned long' if does not define. */ -/* #undef uintptr_t */ +/* Define if you know the direction of stack growth for your system; + otherwise it will be automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#define STACK_DIRECTION -1 -/* Define as `fork' if `vfork' does not work. */ -/* #undef vfork */ From owner-p4-projects@FreeBSD.ORG Mon May 31 13:18:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3C3116A4D0; Mon, 31 May 2004 13:18:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DEAB16A4CF for ; Mon, 31 May 2004 13:18:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 671D943D4C for ; Mon, 31 May 2004 13:18:34 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4VKIFQE030684 for ; Mon, 31 May 2004 13:18:15 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VKIEOn030681 for perforce@freebsd.org; Mon, 31 May 2004 13:18:14 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 31 May 2004 13:18:14 -0700 (PDT) Message-Id: <200405312018.i4VKIEOn030681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 53890 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, 31 May 2004 20:18:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=53890 Change 53890 by julian@julian_ref on 2004/05/31 13:17:54 more work nm thread cleanup etc. Affected files ... .. //depot/projects/nsched/sys/kern/kern_thr.c#6 edit .. //depot/projects/nsched/sys/kern/kern_thread.c#17 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#10 edit .. //depot/projects/nsched/sys/sys/sched.h#5 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_thr.c#6 (text+ko) ==== @@ -79,11 +79,13 @@ /* Clean up cpu resources. */ cpu_thread_exit(td); + /* let the scheduler know we are dying.. */ + /* Lots in common with sched_thread_exit.. merge one day */ + sched_thr_exit(td); + /* Unlink the thread from the process and kseg. */ thread_unlink(td); - sched_thr_exit(td); - /* * If we were stopped while waiting for all threads to exit and this * is the last thread wakeup the exiting thread. @@ -98,7 +100,6 @@ td->td_proc = NULL; #endif td->td_ksegrp = NULL; - sched_exit_thread(p->p_pptr, td); thread_stash(td); cpu_throw(td, choosethread(SW_VOL)); ==== //depot/projects/nsched/sys/kern/kern_thread.c#17 (text+ko) ==== @@ -60,8 +60,6 @@ #include -/* extern void kse_initialise(void);*/ -extern void kse_GC(void); /* * KSEGRP related storage. */ @@ -559,11 +557,11 @@ p = td->td_proc; mtx_assert(&sched_lock, MA_OWNED); + mtx_assert(&Giant, MA_NOTOWNED); + PROC_LOCK_ASSERT(p, MA_OWNED); KASSERT(p != NULL, ("thread exiting without a process")); KASSERT(kg != NULL, ("thread exiting without a kse group")); - PROC_LOCK_ASSERT(p, MA_OWNED); CTR1(KTR_PROC, "thread_exit: thread %p", td); - mtx_assert(&Giant, MA_NOTOWNED); if (td->td_standin != NULL) { thread_stash(td->td_standin); @@ -572,6 +570,10 @@ /* drop FPU & debug register state */ cpu_thread_exit(td); /* XXXSMP */ + + /* The thread is exiting. scheduler can release its stuff. */ + sched_thread_exit(td); + /* * The last thread is left attached to the process * So that the whole bundle gets recycled. Skip @@ -580,6 +582,11 @@ if (p->p_flag & P_HADTHREADS) { if (p->p_numthreads > 1) { thread_unlink(td); + + /* + * as we are exiting there is room for another + * to be created. + */ if (p->p_maxthrwaits) wakeup(&p->p_numthreads); /* @@ -607,13 +614,17 @@ upcall_remove(td); if (kg->kg_numthreads == 0) { - /* This kseg is kaput */ + /* This kseg is kaput + * First allow teh scheduler to free anything + * it may have assigned to it. Then allow it + * to do scheduler accounting.. merge these + * eventually. + */ sched_set_concurrancy(kg, 0); sched_exit_ksegrp(p, td); /* XXX fix */ ksegrp_unlink(kg); } - sched_exit_thread(td->td_proc->p_pptr, td); td->td_state = TDS_INACTIVE; #if 0 td->td_proc = NULL; @@ -621,13 +632,10 @@ td->td_ksegrp = NULL; PCPU_SET(deadthread, td); } else { - if (p->p_numthreads == 1 ) { - sched_set_concurrancy(kg, 1); - } + sched_set_concurrancy(kg, 1); } } PROC_UNLOCK(p); - mtx_assert(&sched_lock, MA_OWNED); cpu_throw(td, choosethread(SW_VOL)); panic("I'm a teapot!"); /* NOTREACHED */ ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#10 (text+ko) ==== @@ -165,6 +165,9 @@ void kse_reassign(struct kse *ke); void sched_fork_kse(struct thread *parenttd, struct kse *newke); void sched_unrun_kse(struct proc *parent, struct thread *childtd); +static struct kse * kse_alloc(void); +static void kse_link(struct kse *ke, struct ksegrp *kg); +static void kse_unlink(struct kse *ke); #define KTR_4BSD 0x0 @@ -648,10 +651,16 @@ * aggregated all the estcpu into the 'built-in' ksegrp. */ void -sched_exit(struct proc *parent, struct thread *childtd) +sched_exit(struct proc *parent, struct thread *td) { - sched_exit_ksegrp(parent, childtd); - sched_exit_thread(parent, childtd); + struct ksegrp *kg; + + mtx_assert(&sched_lock, MA_OWNED); + + kg = FIRST_KSEGRP_IN_PROC(parent); /* XXXKSE */ + td->td_kse->ke_flags |= KEF_EXIT; + kg->kg_estcpu = ESTCPULIM(kg->kg_estcpu + + td->td_ksegrp->kg_estcpu); } /* @@ -661,21 +670,67 @@ void sched_exit_ksegrp(struct proc *parent, struct thread *child) { + +} + +/* + * XXX make sure that for the last thread we + * leave it linked to its kse.. + */ +void +sched_thread_exit(struct thread *td) +{ + struct kse *ke; +#if 0 struct ksegrp *kg; + struct proc *p; +#endif - mtx_assert(&sched_lock, MA_OWNED); - kg = FIRST_KSEGRP_IN_PROC(parent); /* XXXKSE */ - child->td_kse->ke_flags |= KEF_EXIT; - kg->kg_estcpu = ESTCPULIM(kg->kg_estcpu + child->td_ksegrp->kg_estcpu); + ke = td->td_kse; + + if ((td->td_proc->p_flag & P_SA) && ke != NULL) { + ke->ke_thread = NULL; + td->td_kse = NULL; + kse_reassign(ke); + } + if ((td->td_proc->p_flag & P_NOLOAD) == 0) + sched_tdcnt--; + +#if 0 /* need to account for kg_idleq etc. */ + p = td->td_proc; + if ((p->p_numthreads == 1) && + ((kg = td->td_ksegrp)->kg_numthreads == 1)) { + /* We are the last thread/kseg.. */ + proc_linkup(p, kg, td); + kse_link(ke, kg); + ke.ke_thread = td; + td.td_kse = ke; /* we are running */ + ke.ke_state = KES_THREAD; + } +#endif } +/* + * special version of the above for thr.. + * work towards merging them. + */ void -sched_exit_thread(struct proc *parent, struct thread *childtd) +sched_thr_exit(struct thread *td) { - if ((childtd->td_proc->p_flag & P_NOLOAD) == 0) + struct kse *ke; + + ke = td->td_kse; + + if ((td->td_proc->p_flag & P_NOLOAD) == 0) sched_tdcnt--; + + /* td is about to be freed, but keep it clean */ + td->td_kse = NULL; + td->td_last_kse = NULL; + kse_unlink(ke); /* also frees it */ } + void sched_fork(struct thread *parenttd, struct proc *child) { @@ -1003,9 +1058,6 @@ static struct kg_sched kg_sched0; static struct td_sched td_sched0; -static struct kse * kse_alloc(void); -static void kse_link(struct kse *ke, struct ksegrp *kg); -static void kse_unlink(struct kse *ke); extern struct mtx kse_zombie_lock; TAILQ_HEAD(, kse) zombie_kses = TAILQ_HEAD_INITIALIZER(zombie_kses); @@ -1090,21 +1142,6 @@ } #undef RANGEOF -void -sched_thr_exit(struct thread *td) -{ - struct kse *ke; - - ke = td->td_kse; - - ke->ke_state = KES_UNQUEUED; - ke->ke_thread = NULL; - kse_unlink(ke); - sched_unrun_kse(td->td_proc->p_pptr, td); - td->td_kse = NULL; - td->td_last_kse = NULL; -} - /* * Allocate a kse. */ @@ -1256,28 +1293,6 @@ void sched_unrun_kse(struct proc *parent, struct thread *childtd) { - struct ksegrp *kg; - struct kse *ke; - - kg = childtd->td_ksegrp; - ke = childtd->td_kse; - KASSERT((ke),("unexpected null KSE ptr in sched_unrun_kse()")); - ke->ke_state = KES_UNQUEUED; - ke->ke_thread = NULL; - /* - * Decide what to do with the KSE attached to this thread. - */ - if (ke->ke_flags & KEF_EXIT) { - kse_unlink(ke); - if (kg->kg_kses == 0) { - sched_exit_ksegrp(parent, childtd); /* XXXKSE */ - ksegrp_unlink(kg); - } - } else { - kse_reassign(ke); - } - childtd->td_kse = NULL; - childtd->td_last_kse = NULL; } /* ==== //depot/projects/nsched/sys/sys/sched.h#5 (text+ko) ==== @@ -47,6 +47,7 @@ * Supply the thread that is running abd the other process. */ void sched_exit(struct proc *parent, struct thread *child); +void sched_thread_exit(struct thread *td); void sched_fork(struct thread *td, struct proc *child); /* From owner-p4-projects@FreeBSD.ORG Mon May 31 13:50:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C75416A4D0; Mon, 31 May 2004 13:50:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1878716A4CE for ; Mon, 31 May 2004 13:50:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F75743D5C for ; Mon, 31 May 2004 13:50:14 -0700 (PDT) (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.11/8.12.11) with ESMTP id i4VKnu2Y036927 for ; Mon, 31 May 2004 13:49:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VKnuHX036924 for perforce@freebsd.org; Mon, 31 May 2004 13:49:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 31 May 2004 13:49:56 -0700 (PDT) Message-Id: <200405312049.i4VKnuHX036924@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 53894 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, 31 May 2004 20:50:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=53894 Change 53894 by rwatson@rwatson_tislabs on 2004/05/31 13:49:45 Integrate netperf_socket from FreeBSD CVS HEAD: pcf device driver printf output toned down, other resource allocation tweaks. Loops back of GIANT_REQUIRED for vrele(). Bosko's addition of conditional Giant release when returning EBUSY from loading NFS server as a module. Loop back of Giant assertions in NFS server system call code. Affected files ... .. //depot/projects/netperf_socket/sys/dev/pcf/pcf.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_syscalls.c#8 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/fs.h#4 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/pcf/pcf.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf.c,v 1.24 2004/05/25 07:42:45 joerg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf.c,v 1.25 2004/05/31 14:24:21 nsouch Exp $"); #include #include @@ -64,6 +64,10 @@ return (0); } +#ifdef PCFDEBUG + printf("pcf: timeout!\n"); +#endif + return (IIC_ETIMEOUT); } @@ -132,6 +136,9 @@ /* check for ack */ if (pcf_noack(sc, timeout)) { error = IIC_ENOACK; +#ifdef PCFDEBUG + printf("pcf: no ack on repeated_start!\n"); +#endif goto error; } @@ -151,8 +158,12 @@ #ifdef PCFDEBUG device_printf(dev, " >> start for slave %#x\n", (unsigned)slave); #endif - if ((pcf_get_S1(sc) & nBB) == 0) + if ((pcf_get_S1(sc) & nBB) == 0) { +#ifdef PCFDEBUG + printf("pcf: busy!\n"); +#endif return (IIC_EBUSBSY); + } /* set slave address to PCF. Last bit (LSB) must be set correctly * according to transfer direction */ @@ -170,6 +181,9 @@ /* check for ACK */ if (pcf_noack(sc, timeout)) { error = IIC_ENOACK; +#ifdef PCFDEBUG + printf("pcf: no ack on start!\n"); +#endif goto error; } @@ -183,23 +197,21 @@ void pcf_intr(void *arg) { - device_t dev = (device_t)arg; - struct pcf_softc *sc = DEVTOSOFTC(dev); - + struct pcf_softc *sc = arg; char data, status, addr; char error = 0; status = pcf_get_S1(sc); if (status & PIN) { - device_printf(dev, "spurious interrupt, status=0x%x\n", - status & 0xff); + printf("pcf: spurious interrupt, status=0x%x\n", + status & 0xff); goto error; } if (status & LAB) - device_printf(dev, "bus arbitration lost!\n"); + printf("pcf: bus arbitration lost!\n"); if (status & BER) { error = IIC_EBUSERR; ==== //depot/projects/netperf_socket/sys/dev/pcf/pcf_isa.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.1 2004/05/25 07:42:45 joerg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.2 2004/05/31 14:24:21 nsouch Exp $"); /* * Hardware driver for a Philips PCF8584 I2C bus controller sitting @@ -53,12 +53,16 @@ #include #include "iicbus_if.h" +#define PCF_NAME "pcf" + +static void pcf_identify(driver_t *, device_t); static int pcf_probe(device_t); static int pcf_attach(device_t); static int pcf_detach(device_t); static device_method_t pcf_methods[] = { /* device interface */ + DEVMETHOD(device_identify, pcf_identify), DEVMETHOD(device_probe, pcf_probe), DEVMETHOD(device_attach, pcf_attach), DEVMETHOD(device_detach, pcf_detach), @@ -77,16 +81,37 @@ static devclass_t pcf_devclass; static driver_t pcf_driver = { - "pcf", + PCF_NAME, pcf_methods, sizeof(struct pcf_softc), }; +static void +pcf_identify(driver_t *driver, device_t parent) +{ + BUS_ADD_CHILD(parent, ISA_ORDER_SPECULATIVE, PCF_NAME, 0); + + return; +} + static int pcf_probe(device_t dev) { + u_long start, count; + u_int rid = 0, port, error; + + bus_get_resource(dev, SYS_RES_IOPORT, rid, &start, &count); + + /* The port address must be explicitly specified */ + if ((error = resource_int_value(PCF_NAME, 0, "port", &port) != 0)) + return (error); + + /* Probe is only successfull for the specified base io */ + if (port != (u_int)start) + return (ENXIO); device_set_desc(dev, "PCF8584 I2C bus controller"); + return (0); } @@ -121,14 +146,16 @@ /* reset the chip */ pcf_rst_card(dev, IIC_FASTEST, PCF_DEFAULT_ADDR, NULL); - rv = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->res_irq, - INTR_TYPE_NET /* | INTR_ENTROPY */, - pcf_intr, sc, &sc->intr_cookie); - if (rv) { - device_printf(dev, "could not setup IRQ\n"); - goto error; + if (sc->res_irq) { + rv = BUS_SETUP_INTR(device_get_parent(dev), dev, sc->res_irq, + INTR_TYPE_NET /* | INTR_ENTROPY */, + pcf_intr, sc, &sc->intr_cookie); + if (rv) { + device_printf(dev, "could not setup IRQ\n"); + goto error; + } } - + if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); @@ -181,5 +208,6 @@ } DRIVER_MODULE(pcf, ebus, pcf_driver, pcf_devclass, 0, 0); +DRIVER_MODULE(pcf, isa, pcf_driver, pcf_devclass, 0, 0); MODULE_DEPEND(pcf, iicbus, PCF_MINVER, PCF_PREFVER, PCF_MAXVER); MODULE_VERSION(pcf, PCF_MODVER); ==== //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio_pcm.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.3 2003/07/01 15:52:02 scottl Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.4 2004/05/31 11:38:46 takawata Exp $ */ /* * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -373,7 +373,6 @@ PCM_SOFTC_SIZE, }; -static devclass_t pcm_devclass; DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, pcm_devclass, 0, 0); MODULE_DEPEND(ua_pcm, uaudio, 1, 1, 1); ==== //depot/projects/netperf_socket/sys/kern/vfs_subr.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.490 2004/04/11 21:09:22 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.491 2004/05/31 19:06:01 rwatson Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -1963,6 +1963,8 @@ { struct thread *td = curthread; /* XXX */ + GIANT_REQUIRED; + KASSERT(vp != NULL, ("vrele: null vp")); VI_LOCK(vp); ==== //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.145 2004/05/30 22:59:54 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.146 2004/05/31 19:08:22 rwatson Exp $"); /* * nfs version 2 and 3 server calls to vnode ops @@ -2349,7 +2349,11 @@ error = ESTALE; goto out1; } + NFSD_UNLOCK(); + mtx_lock(&Giant); (void) vn_start_write(NULL, &mp, V_WAIT); + mtx_unlock(&Giant); + NFSD_LOCK(); nfsm_srvnamesiz(len); /* * Remember our original uid so that we can reset cr_uid before ==== //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.128 2004/05/31 00:59:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.129 2004/05/31 20:21:06 bmilekic Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -557,8 +557,10 @@ break; case MOD_UNLOAD: - if (nfsrv_numnfsd != 0) + if (nfsrv_numnfsd != 0) { + NET_UNLOCK_GIANT(); return EBUSY; + } callout_stop(&nfsrv_callout); sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg; ==== //depot/projects/netperf_socket/sys/nfsserver/nfs_syscalls.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.99 2004/05/29 15:21:25 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.100 2004/05/31 16:32:49 rwatson Exp $"); #include "opt_inet6.h" #include "opt_mac.h" @@ -134,6 +134,8 @@ struct nfsd_args nfsdarg; int error; + KASSERT(!mtx_owned(&Giant), ("nfssvc(): called with Giant")); + #ifdef MAC error = mac_check_system_nfsd(td->td_ucred); if (error) @@ -550,8 +552,16 @@ nfsd->nfsd_slp = NULL; nfsrv_slpderef(slp); } + KASSERT(!(debug_mpsafenet == 0 && !mtx_owned(&Giant)), + ("nfssvc_nfsd(): debug.mpsafenet=0 && !Giant")); + KASSERT(!(debug_mpsafenet == 1 && mtx_owned(&Giant)), + ("nfssvc_nfsd(): debug.mpsafenet=1 && Giant")); } done: + KASSERT(!(debug_mpsafenet == 0 && !mtx_owned(&Giant)), + ("nfssvc_nfsd(): debug.mpsafenet=0 && !Giant")); + KASSERT(!(debug_mpsafenet == 1 && mtx_owned(&Giant)), + ("nfssvc_nfsd(): debug.mpsafenet=1 && Giant")); TAILQ_REMOVE(&nfsd_head, nfsd, nfsd_chain); splx(s); free((caddr_t)nfsd, M_NFSD); ==== //depot/projects/netperf_socket/sys/ufs/ffs/fs.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)fs.h 8.13 (Berkeley) 3/21/95 - * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.42 2004/04/07 03:47:20 imp Exp $ + * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.43 2004/05/31 16:53:46 krion Exp $ */ #ifndef _UFS_FFS_FS_H_ @@ -168,7 +168,7 @@ * which tell the system the average file size and the average number * of files per directory. These defaults are well selected for typical * filesystems, but may need to be tuned for odd cases like filesystems - * being used for sqiud caches or news spools. + * being used for squid caches or news spools. */ #define AVFILESIZ 16384 /* expected average file size */ #define AFPDIR 64 /* expected number of files per directory */ From owner-p4-projects@FreeBSD.ORG Mon May 31 14:22:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D1C016A4D0; Mon, 31 May 2004 14:22:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70BA216A4CE for ; Mon, 31 May 2004 14:22:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53C2843D2F for ; Mon, 31 May 2004 14:22:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4VLMeHN045906 for ; Mon, 31 May 2004 14:22:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VLMdYh045903 for perforce@freebsd.org; Mon, 31 May 2004 14:22:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 31 May 2004 14:22:39 -0700 (PDT) Message-Id: <200405312122.i4VLMdYh045903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53899 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, 31 May 2004 21:22:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=53899 Change 53899 by marcel@marcel_nfs on 2004/05/31 14:21:47 Remove 2 files from the branch I don't have in my workspace and which cause build breakages. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/init.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 31 15:05:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62F4A16A4D0; Mon, 31 May 2004 15:05:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F4D716A4CE for ; Mon, 31 May 2004 15:05:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26ABF43D48 for ; Mon, 31 May 2004 15:05:46 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4VM5gOU055717 for ; Mon, 31 May 2004 15:05:42 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VM5bKH055687 for perforce@freebsd.org; Mon, 31 May 2004 15:05:37 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 31 May 2004 15:05:37 -0700 (PDT) Message-Id: <200405312205.i4VM5bKH055687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 53902 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, 31 May 2004 22:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=53902 Change 53902 by julian@julian_ref on 2004/05/31 15:05:26 IFC Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/vm_machdep.c#4 integrate .. //depot/projects/nsched/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/nsched/sys/alpha/include/profile.h#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/nsched/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/nsched/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/nsched/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/nsched/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/nsched/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/nsched/sys/amd64/include/profile.h#3 integrate .. //depot/projects/nsched/sys/amd64/isa/atpic_vector.S#4 integrate .. //depot/projects/nsched/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/nsched/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/nsched/sys/arm/include/profile.h#2 integrate .. //depot/projects/nsched/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/nsched/sys/boot/pc98/boot2/serial_16550.S#4 integrate .. //depot/projects/nsched/sys/boot/pc98/boot2/serial_8251.S#4 integrate .. //depot/projects/nsched/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/nsched/sys/boot/pc98/btx/btxldr/btxldr.S#4 integrate .. //depot/projects/nsched/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/nsched/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/nsched/sys/conf/NOTES#3 integrate .. //depot/projects/nsched/sys/conf/files#8 integrate .. //depot/projects/nsched/sys/conf/files.amd64#4 integrate .. //depot/projects/nsched/sys/conf/files.i386#5 integrate .. //depot/projects/nsched/sys/conf/files.pc98#5 integrate .. //depot/projects/nsched/sys/conf/kern.post.mk#2 integrate .. //depot/projects/nsched/sys/conf/kmod.mk#3 integrate .. //depot/projects/nsched/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/nsched/sys/conf/options#5 integrate .. //depot/projects/nsched/sys/conf/options.pc98#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/CHANGES.txt#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acconfig.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acglobal.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/achware.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/aclocal.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/actypes.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dmwalk.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evmisc.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evxfevnt.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exstore.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/hwgpe.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/hwregs.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/hwsleep.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsaccess.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nseval.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsxfeval.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/uteval.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utglobal.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/nsched/sys/ddb/db_elf.c#2 integrate .. //depot/projects/nsched/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/nsched/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/nsched/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/nsched/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_lid.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_pci.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/nsched/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/nsched/sys/dev/amd/amd.c#2 integrate .. //depot/projects/nsched/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/nsched/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/an/if_an.c#2 integrate .. //depot/projects/nsched/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/nsched/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/nsched/sys/dev/asr/asr.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/nsched/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/nsched/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/nsched/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/nsched/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/nsched/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/nsched/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/nsched/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/nsched/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/nsched/sys/dev/cs/if_cs_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/nsched/sys/dev/cy/cy_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/nsched/sys/dev/digi/digi.c#2 integrate .. //depot/projects/nsched/sys/dev/digi/digi_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/nsched/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/em/if_em.c#3 integrate .. //depot/projects/nsched/sys/dev/em/if_em.h#2 integrate .. //depot/projects/nsched/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/nsched/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/nsched/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/fb/splash.c#2 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/nsched/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/nsched/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/nsched/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/iec68113.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/nsched/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/nsched/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/nsched/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/nsched/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/nsched/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/nsched/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/nsched/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/nsched/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/nsched/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/nsched/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/nsched/sys/dev/ida/ida_disk.c#2 integrate .. //depot/projects/nsched/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/nsched/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/nsched/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/nsched/sys/dev/iir/iir.c#2 integrate .. //depot/projects/nsched/sys/dev/iir/iir.h#2 integrate .. //depot/projects/nsched/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/nsched/sys/dev/ips/ips.c#2 integrate .. //depot/projects/nsched/sys/dev/ips/ips.h#2 integrate .. //depot/projects/nsched/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/nsched/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/nsched/sys/dev/isp/isp.c#2 integrate .. //depot/projects/nsched/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/nsched/sys/dev/isp/isp_inline.h#2 integrate .. //depot/projects/nsched/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/nsched/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/nsched/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/nsched/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/nsched/sys/dev/ixgb/README#1 branch .. //depot/projects/nsched/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/nsched/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/nsched/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/nsched/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/nsched/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/nsched/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/nsched/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/nsched/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/nsched/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/nsched/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/nsched/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/md/md.c#4 integrate .. //depot/projects/nsched/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/nsched/sys/dev/mii/dcphy.c#3 integrate .. //depot/projects/nsched/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/nsched/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/mii.c#3 integrate .. //depot/projects/nsched/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/nsched/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/nsched/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/ruephy.c#3 integrate .. //depot/projects/nsched/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/nsched/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/nsched/sys/dev/mii/xmphy.c#3 integrate .. //depot/projects/nsched/sys/dev/mlx/mlx_disk.c#2 integrate .. //depot/projects/nsched/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/nsched/sys/dev/my/if_my.c#2 integrate .. //depot/projects/nsched/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/nsched/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/nsched/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/nsched/sys/dev/ofw/openfirmio.h#3 integrate .. //depot/projects/nsched/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/nsched/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/pccard/Makefile.pccarddevs#2 delete .. //depot/projects/nsched/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/nsched/sys/dev/pccard/devlist2h.awk#2 delete .. //depot/projects/nsched/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/nsched/sys/dev/pccard/pccarddevs.h#5 delete .. //depot/projects/nsched/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/nsched/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/nsched/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/nsched/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/nsched/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/nsched/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/nsched/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/nsched/sys/dev/pci/eisa_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/pci/ignore_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/pci/pci.c#4 integrate .. //depot/projects/nsched/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/nsched/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/nsched/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/nsched/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/random/randomdev.c#4 integrate .. //depot/projects/nsched/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/nsched/sys/dev/rc/rc.c#2 integrate .. //depot/projects/nsched/sys/dev/re/if_re.c#3 integrate .. //depot/projects/nsched/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/safe/safe.c#2 integrate .. //depot/projects/nsched/sys/dev/sbni/if_sbni.c#3 integrate .. //depot/projects/nsched/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/nsched/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/nsched/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/nsched/sys/dev/sn/if_sn_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/nsched/sys/dev/snp/snp.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/nsched/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/nsched/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/nsched/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/sx/sx_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/nsched/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/nsched/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/trm/trm.c#3 integrate .. //depot/projects/nsched/sys/dev/twa/twa_includes.h#2 integrate .. //depot/projects/nsched/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/nsched/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/nsched/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/nsched/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/nsched/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/umass.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/umct.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/ums.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/usb.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/nsched/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/nsched/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/nsched/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/nsched/sys/dev/wl/if_wl.c#4 integrate .. //depot/projects/nsched/sys/dev/xe/if_xe.c#3 integrate .. //depot/projects/nsched/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/nsched/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/nsched/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/nsched/sys/geom/geom_disk.c#3 integrate .. //depot/projects/nsched/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/nsched/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/nsched/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/nsched/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/nsched/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_toshiba.c#4 integrate .. //depot/projects/nsched/sys/i386/bios/apm.c#2 integrate .. //depot/projects/nsched/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/nsched/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/nsched/sys/i386/i386/bios.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/exception.s#4 integrate .. //depot/projects/nsched/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/mem.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/support.s#4 integrate .. //depot/projects/nsched/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/nsched/sys/i386/include/_stdint.h#2 integrate .. //depot/projects/nsched/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/nsched/sys/i386/include/profile.h#3 integrate .. //depot/projects/nsched/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/nsched/sys/i386/isa/atpic_vector.s#5 integrate .. //depot/projects/nsched/sys/i386/isa/clock.c#5 integrate .. //depot/projects/nsched/sys/i386/isa/if_el.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/mse.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_hdr.h#2 integrate .. //depot/projects/nsched/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/spic.c#2 integrate .. //depot/projects/nsched/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/nsched/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/nsched/sys/i4b/driver/i4b_ing.c#2 integrate .. //depot/projects/nsched/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/nsched/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/nsched/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/nsched/sys/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/nsched/sys/ia64/include/_stdint.h#2 integrate .. //depot/projects/nsched/sys/ia64/include/profile.h#2 integrate .. //depot/projects/nsched/sys/isa/atkbd_isa.c#2 integrate .. //depot/projects/nsched/sys/isa/atkbdc_isa.c#2 integrate .. //depot/projects/nsched/sys/isa/vga_isa.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_exec.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_exit.c#8 integrate .. //depot/projects/nsched/sys/kern/kern_jail.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_kse.c#8 edit .. //depot/projects/nsched/sys/kern/kern_proc.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_sig.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#18 edit .. //depot/projects/nsched/sys/kern/link_elf.c#3 integrate .. //depot/projects/nsched/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#11 edit .. //depot/projects/nsched/sys/kern/subr_bus.c#2 integrate .. //depot/projects/nsched/sys/kern/subr_prof.c#3 integrate .. //depot/projects/nsched/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/nsched/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/nsched/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/nsched/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/nsched/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/nsched/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/nsched/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/nsched/sys/modules/aic/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/an/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/awi/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/cs/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ed/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ep/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ex/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/exca/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/fe/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/geom/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/geom/geom_nop/Makefile#1 branch .. //depot/projects/nsched/sys/modules/geom/geom_stripe/Makefile#1 branch .. //depot/projects/nsched/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ixgb/Makefile#1 branch .. //depot/projects/nsched/sys/modules/joy/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/oldcard/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/owi/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/pcic/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ray/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/sio/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/sn/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/splash/bmp/splash_bmp.c#2 integrate .. //depot/projects/nsched/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/nsched/sys/modules/stg/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/uart/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/wi/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/xe/Makefile#2 integrate .. //depot/projects/nsched/sys/net/bpf.h#3 integrate .. //depot/projects/nsched/sys/net/bridge.c#3 integrate .. //depot/projects/nsched/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/nsched/sys/net/if_ef.c#2 integrate .. //depot/projects/nsched/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/nsched/sys/net/if_faith.c#4 integrate .. //depot/projects/nsched/sys/net/if_gif.c#4 integrate .. //depot/projects/nsched/sys/net/if_gre.c#3 integrate .. //depot/projects/nsched/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/nsched/sys/net/if_stf.c#3 integrate .. //depot/projects/nsched/sys/net/if_tap.c#2 integrate .. //depot/projects/nsched/sys/net/if_vlan.c#3 integrate .. //depot/projects/nsched/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/nsched/sys/netgraph/atm/atmpif/ng_atmpif.c#2 integrate .. //depot/projects/nsched/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/nsched/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/nsched/sys/netgraph/atm/sscop/ng_sscop.c#2 integrate .. //depot/projects/nsched/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/nsched/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_echo.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_hole.h#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_ip_input.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/nsched/sys/netinet/accf_data.c#2 integrate .. //depot/projects/nsched/sys/netinet/accf_http.c#2 integrate .. //depot/projects/nsched/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/nsched/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/nsched/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/nsched/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/nsched/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/nsched/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/nsched/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/nsched/sys/nfsserver/nfsm_subs.h#3 integrate .. //depot/projects/nsched/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/nsched/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/nsched/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/nsched/sys/pc98/pc98/fd.c#3 integrate .. //depot/projects/nsched/sys/pci/agp.c#3 integrate .. //depot/projects/nsched/sys/pci/agp_ali.c#3 integrate .. //depot/projects/nsched/sys/pci/agp_amd.c#3 integrate .. //depot/projects/nsched/sys/pci/agp_i810.c#4 integrate .. //depot/projects/nsched/sys/pci/agp_intel.c#3 integrate .. //depot/projects/nsched/sys/pci/agp_nvidia.c#3 integrate .. //depot/projects/nsched/sys/pci/agp_sis.c#3 integrate .. //depot/projects/nsched/sys/pci/agp_via.c#4 integrate .. //depot/projects/nsched/sys/pci/agppriv.h#2 integrate .. //depot/projects/nsched/sys/pci/if_dc.c#3 integrate .. //depot/projects/nsched/sys/pci/if_de.c#2 integrate .. //depot/projects/nsched/sys/pci/if_mn.c#2 integrate .. //depot/projects/nsched/sys/pci/if_pcn.c#2 integrate .. //depot/projects/nsched/sys/pci/if_rl.c#4 integrate .. //depot/projects/nsched/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/nsched/sys/pci/if_sf.c#2 integrate .. //depot/projects/nsched/sys/pci/if_sis.c#3 integrate .. //depot/projects/nsched/sys/pci/if_sk.c#3 integrate .. //depot/projects/nsched/sys/pci/if_ste.c#5 integrate .. //depot/projects/nsched/sys/pci/if_ti.c#2 integrate .. //depot/projects/nsched/sys/pci/if_tl.c#2 integrate .. //depot/projects/nsched/sys/pci/if_vr.c#4 integrate .. //depot/projects/nsched/sys/pci/if_wb.c#2 integrate .. //depot/projects/nsched/sys/pci/if_xl.c#3 integrate .. //depot/projects/nsched/sys/pci/ncr.c#2 integrate .. //depot/projects/nsched/sys/pci/xrpu.c#2 integrate .. //depot/projects/nsched/sys/powerpc/include/_stdint.h#2 integrate .. //depot/projects/nsched/sys/powerpc/include/profile.h#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/nsched/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/nsched/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/nsched/sys/sparc64/include/_stdint.h#2 integrate .. //depot/projects/nsched/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/nsched/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/nsched/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/nsched/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/nsched/sys/sys/ata.h#2 integrate .. //depot/projects/nsched/sys/sys/bus.h#2 integrate .. //depot/projects/nsched/sys/sys/eui64.h#1 branch .. //depot/projects/nsched/sys/sys/gmon.h#3 integrate .. //depot/projects/nsched/sys/sys/mbuf.h#4 integrate .. //depot/projects/nsched/sys/sys/proc.h#11 integrate .. //depot/projects/nsched/sys/sys/rman.h#2 integrate .. //depot/projects/nsched/sys/sys/sysctl.h#3 integrate .. //depot/projects/nsched/sys/tools/devlist2h.awk#2 delete .. //depot/projects/nsched/sys/tools/miidevs2h.awk#1 branch .. //depot/projects/nsched/sys/tools/pccarddevs2h.awk#1 branch .. //depot/projects/nsched/sys/tools/usbdevs2h.awk#1 branch .. //depot/projects/nsched/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/fs.h#4 integrate .. //depot/projects/nsched/sys/vm/vm_extern.h#3 integrate .. //depot/projects/nsched/sys/vm/vm_fault.c#3 integrate .. //depot/projects/nsched/sys/vm/vm_map.c#4 integrate .. //depot/projects/nsched/sys/vm/vm_object.c#3 integrate .. //depot/projects/nsched/sys/vm/vm_page.c#5 integrate .. //depot/projects/nsched/sys/vm/vm_page.h#3 integrate .. //depot/projects/nsched/sys/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/vm_machdep.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.103 2004/04/18 06:24:51 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.104 2004/05/26 12:09:36 tmm Exp $"); #include #include @@ -240,12 +240,6 @@ } void -cpu_sched_exit(td) - register struct thread *td; -{ -} - -void cpu_thread_exit(struct thread *td) { } ==== //depot/projects/nsched/sys/alpha/include/_stdint.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/_stdint.h,v 1.1 2002/07/29 17:41:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/_stdint.h,v 1.2 2004/05/18 16:04:56 stefanf Exp $ */ #ifndef _MACHINE__STDINT_H_ @@ -160,11 +160,11 @@ /* Limits of wchar_t. */ #define WCHAR_MIN INT32_MIN #define WCHAR_MAX INT32_MAX +#endif /* Limits of wint_t. */ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif #endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ ==== //depot/projects/nsched/sys/alpha/include/profile.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.5 2002/03/20 18:58:45 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.6 2004/05/19 15:41:25 bde Exp $ */ /* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */ /* @@ -220,18 +220,6 @@ #define MCOUNT_EXIT(s) \ (void)_alpha_pal_swpipl(s); #define MCOUNT_DECL(s) u_long s; -#ifdef GUPROF -struct gmonparam; - -void nullfunc_loop_profiled(void); -void nullfunc_profiled(void); -void startguprof(struct gmonparam *p); -void stopguprof(struct gmonparam *p); -#else -#define startguprof(p) -#define stopguprof(p) -#endif /* GUPROF */ - #else /* !_KERNEL */ typedef u_long uintfptr_t; #endif ==== //depot/projects/nsched/sys/amd64/amd64/apic_vector.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.98 2004/05/16 22:11:49 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.100 2004/05/24 12:08:56 bde Exp $ */ /* @@ -100,7 +100,7 @@ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ PUSH_FRAME ; \ - FAKE_MCOUNT(13*4(%esp)) ; /* XXX avoid double count */ \ + FAKE_MCOUNT(TF_RIP(%rsp)) ; \ movq lapic, %rdx ; /* pointer to local APIC */ \ movl LA_ISR + 16 * (index)(%rdx), %eax ; /* load ISR */ \ bsrl %eax, %eax ; /* index of highset set bit in ISR */ \ @@ -129,7 +129,6 @@ iretq -MCOUNT_LABEL(bintr2) ISR_VEC(1, apic_isr1) ISR_VEC(2, apic_isr2) ISR_VEC(3, apic_isr3) @@ -137,7 +136,6 @@ ISR_VEC(5, apic_isr5) ISR_VEC(6, apic_isr6) ISR_VEC(7, apic_isr7) -MCOUNT_LABEL(eintr2) #ifdef SMP /* @@ -234,7 +232,7 @@ movq lapic, %rdx movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_RIP(%rsp)) call forwarded_statclock MEXITCOUNT @@ -256,7 +254,7 @@ movq lapic, %rdx movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_RIP(%rsp)) MEXITCOUNT jmp doreti ==== //depot/projects/nsched/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -27,9 +27,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.116 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.119 2004/05/24 12:42:16 bde Exp $ */ +#include "opt_atpic.h" +#include "opt_ia32.h" + #include #include #include @@ -163,8 +166,10 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) alltraps_with_regs_pushed: + FAKE_MCOUNT(TF_RIP(%rsp)) calltrap: call trap + MEXITCOUNT jmp doreti /* Handle any pending ASTs */ /* @@ -239,6 +244,7 @@ movq %r13,TF_R13(%rsp) /* C preserved */ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ + FAKE_MCOUNT(TF_RIP(%rsp)) call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) @@ -253,6 +259,7 @@ call ast jmp 1b 2: /* restore preserved registers */ + MEXITCOUNT movq TF_RDI(%rsp),%rdi /* bonus; preserve arg 1 */ movq TF_RSI(%rsp),%rsi /* bonus: preserve arg 2 */ movq TF_RDX(%rsp),%rdx /* return value 2 */ @@ -271,6 +278,7 @@ sysretq 3: /* Requested full context restore, use doreti for that */ andq $~PCB_FULLCTX,PCB_FLAGS(%rax) + MEXITCOUNT jmp doreti /* @@ -286,10 +294,47 @@ movq %rbx, %rsi /* arg1 */ movq %rsp, %rdx /* trapframe pointer */ call fork_exit + MEXITCOUNT jmp doreti /* Handle any ASTs */ +/* + * To efficiently implement classification of trap and interrupt handlers + * for profiling, there must be only trap handlers between the labels btrap + * and bintr, and only interrupt handlers between the labels bintr and + * eintr. This is implemented (partly) by including files that contain + * some of the handlers. Before including the files, set up a normal asm + * environment so that the included files doen't need to know that they are + * included. + */ + +#ifdef IA32 + .data + .p2align 4 + .text + SUPERALIGN_TEXT + +#include +#endif + + .data + .p2align 4 + .text + SUPERALIGN_TEXT +MCOUNT_LABEL(bintr) + +#include + +#ifdef DEV_ATPIC .data - ALIGN_DATA + .p2align 4 + .text + SUPERALIGN_TEXT + +#include +#endif + + .text +MCOUNT_LABEL(eintr) /* * void doreti(struct trapframe) @@ -298,9 +343,9 @@ */ .text SUPERALIGN_TEXT - .globl doreti .type doreti,@function doreti: + FAKE_MCOUNT($bintr) /* init "from" bintr -> doreti */ /* * Check if ASTs can be handled now. */ @@ -330,6 +375,7 @@ * registers. The fault is handled in trap.c. */ doreti_exit: + MEXITCOUNT movq TF_RDI(%rsp),%rdi movq TF_RSI(%rsp),%rsi movq TF_RDX(%rsp),%rdx ==== //depot/projects/nsched/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.5 2004/05/16 20:30:46 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.6 2004/05/30 04:49:39 alc Exp $ */ /* @@ -183,7 +183,6 @@ if (vector == 0) clkintr_pending = 1; - critical_enter(); if (ih != NULL && ih->ih_flags & IH_FAST) { /* * Execute fast interrupt handlers directly. @@ -191,6 +190,7 @@ * with a NULL argument, then we pass it a pointer to * a trapframe as its argument. */ + critical_enter(); TAILQ_FOREACH(ih, &it->it_handlers, ih_next) { MPASS(ih->ih_flags & IH_FAST); CTR3(KTR_INTR, "%s: executing handler %p(%p)", @@ -204,6 +204,7 @@ } isrc->is_pic->pic_eoi_source(isrc); error = 0; + critical_exit(); } else { /* * For stray and threaded interrupts, we mask and EOI the @@ -216,7 +217,6 @@ else error = ithread_schedule(it, !cold); } - critical_exit(); if (error == EINVAL) { atomic_add_long(isrc->is_straycount, 1); if (*isrc->is_straycount < MAX_STRAY_LOG) ==== //depot/projects/nsched/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.605 2004/03/08 00:16:52 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.607 2004/05/19 01:23:48 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -161,6 +161,10 @@ struct mtx icu_lock; +#ifdef DDB +void *ksym_start, *ksym_end; +#endif + static void cpu_startup(dummy) void *dummy; @@ -1134,6 +1138,10 @@ kmdp = preload_search_by_type("elf64 kernel"); boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *) + KERNBASE; +#ifdef DDB + ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, void *); + ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, void *); +#endif /* Init basic tunables, hz etc */ init_param1(); ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.459 2004/05/16 22:11:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.461 2004/05/28 19:42:02 alc Exp $"); /* * Manages physical address maps. @@ -1296,11 +1296,16 @@ LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); + m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I]); + + pmap->pm_pml4[KPML4I] = 0; /* KVA */ + pmap->pm_pml4[DMPML4I] = 0; /* Direct Map */ + pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ + vm_page_lock_queues(); - m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I]); m->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_free(m); + vm_page_free_zero(m); vm_page_unlock_queues(); } @@ -1887,14 +1892,6 @@ if (mpte) mpte->hold_count--; - if ((prot & VM_PROT_WRITE) && (origpte & PG_V)) { - if ((origpte & PG_RW) == 0) { - pte_store(pte, origpte | PG_RW); - pmap_invalidate_page(pmap, va); - } - return; - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 31 15:28:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC3E016A4D0; Mon, 31 May 2004 15:28:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACB7616A4CE for ; Mon, 31 May 2004 15:28:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A400B43D45 for ; Mon, 31 May 2004 15:28:11 -0700 (PDT) (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.11/8.12.11) with ESMTP id i4VMSBIt059779 for ; Mon, 31 May 2004 15:28:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VMSAT7059776 for perforce@freebsd.org; Mon, 31 May 2004 15:28:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 31 May 2004 15:28:10 -0700 (PDT) Message-Id: <200405312228.i4VMSAT7059776@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 53904 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, 31 May 2004 22:28:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=53904 Change 53904 by rwatson@rwatson_tislabs on 2004/05/31 15:27:44 Integrate HEAD into netperf_socket: - mbuma2 -- mbufs are now allocated by the UMA slab allocator. Sounds good on many fronts. Many things now tunable, etc. - UMA support for mbuma2 -- zone layering, etc. - Loop back Giant assertions for vn_start_write(), vn_finished_write(). Affected files ... .. //depot/projects/netperf_socket/sys/conf/files#22 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mbuf.c#1 branch .. //depot/projects/netperf_socket/sys/kern/subr_mbuf.c#3 delete .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf2.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#11 integrate .. //depot/projects/netperf_socket/sys/vm/uma.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/uma_int.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_kern.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/files#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.898 2004/05/28 00:22:58 tackerman Exp $ +# $FreeBSD: src/sys/conf/files,v 1.899 2004/05/31 21:46:03 bmilekic Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1075,6 +1075,7 @@ kern/kern_lockf.c standard kern/kern_mac.c standard kern/kern_malloc.c standard +kern/kern_mbuf.c standard kern/kern_mib.c standard kern/kern_module.c standard kern/kern_mutex.c standard @@ -1116,7 +1117,6 @@ kern/subr_kobj.c standard kern/subr_log.c standard kern/subr_mbpool.c optional libmbpool -kern/subr_mbuf.c standard kern/subr_mchain.c optional libmchain kern/subr_module.c standard kern/subr_msgbuf.c standard ==== //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#12 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.238 2004/05/30 17:57:42 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.239 2004/05/31 21:46:03 bmilekic Exp $"); #include "opt_isa.h" #include "opt_npx.h" @@ -95,6 +95,10 @@ #include #endif +#ifndef NSFBUFS +#define NSFBUFS (512 + maxusers * 16) +#endif + static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -584,6 +588,9 @@ vm_offset_t sf_base; int i; + nsfbufs = NSFBUFS; + TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs); + sf_buf_active = hashinit(nsfbufs, M_TEMP, &sf_buf_hashmask); TAILQ_INIT(&sf_buf_freelist); sf_base = kmem_alloc_nofault(kernel_map, nsfbufs * PAGE_SIZE); ==== //depot/projects/netperf_socket/sys/kern/kern_malloc.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.132 2004/04/05 21:03:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.133 2004/05/31 21:46:04 bmilekic Exp $"); #include "opt_vm.h" @@ -191,6 +191,7 @@ int indx; caddr_t va; uma_zone_t zone; + uma_keg_t keg; #ifdef DIAGNOSTIC unsigned long osize = size; #endif @@ -235,6 +236,7 @@ size = (size & ~KMEM_ZMASK) + KMEM_ZBASE; indx = kmemsize[size >> KMEM_ZSHIFT]; zone = kmemzones[indx].kz_zone; + keg = zone->uz_keg; #ifdef MALLOC_PROFILE krequests[size >> KMEM_ZSHIFT]++; #endif @@ -244,10 +246,11 @@ goto out; ksp->ks_size |= 1 << indx; - size = zone->uz_size; + size = keg->uk_size; } else { size = roundup(size, PAGE_SIZE); zone = NULL; + keg = NULL; va = uma_large_malloc(size, flags); mtx_lock(&ksp->ks_mtx); if (va == NULL) @@ -309,7 +312,7 @@ #ifdef INVARIANTS struct malloc_type **mtp = addr; #endif - size = slab->us_zone->uz_size; + size = slab->us_keg->uk_size; #ifdef INVARIANTS /* * Cache a pointer to the malloc_type that most recently freed @@ -325,7 +328,7 @@ sizeof(struct malloc_type *); *mtp = type; #endif - uma_zfree_arg(slab->us_zone, addr, slab); + uma_zfree_arg(LIST_FIRST(&slab->us_keg->uk_zones), addr, slab); } else { size = slab->us_size; uma_large_free(slab); @@ -364,8 +367,8 @@ ("realloc: address %p out of range", (void *)addr)); /* Get the size of the original block */ - if (slab->us_zone) - alloc = slab->us_zone->uz_size; + if (slab->us_keg) + alloc = slab->us_keg->uk_size; else alloc = slab->us_size; @@ -410,7 +413,6 @@ void *dummy; { u_int8_t indx; - u_long npg; u_long mem_size; int i; @@ -428,7 +430,7 @@ * Note that the kmem_map is also used by the zone allocator, * so make sure that there is enough space. */ - vm_kmem_size = VM_KMEM_SIZE; + vm_kmem_size = VM_KMEM_SIZE + nmbclusters * PAGE_SIZE; mem_size = cnt.v_page_count; #if defined(VM_KMEM_SIZE_SCALE) @@ -462,17 +464,8 @@ */ init_param3(vm_kmem_size / PAGE_SIZE); - /* - * In mbuf_init(), we set up submaps for mbufs and clusters, in which - * case we rounddown() (nmbufs * MSIZE) and (nmbclusters * MCLBYTES), - * respectively. Mathematically, this means that what we do here may - * amount to slightly more address space than we need for the submaps, - * but it never hurts to have an extra page in kmem_map. - */ - npg = (nmbufs*MSIZE + nmbclusters*MCLBYTES + vm_kmem_size) / PAGE_SIZE; - kmem_map = kmem_suballoc(kernel_map, (vm_offset_t *)&kmembase, - (vm_offset_t *)&kmemlimit, (vm_size_t)(npg * PAGE_SIZE)); + (vm_offset_t *)&kmemlimit, vm_kmem_size); kmem_map->system_map = 1; uma_startup2(); ==== //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.129 2004/04/18 13:01:28 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.130 2004/05/31 21:46:04 bmilekic Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -86,6 +86,161 @@ #endif /* + * Malloc-type for external ext_buf ref counts. + */ +MALLOC_DEFINE(M_MBUF, "mbextcnt", "mbuf external ref counts"); + +/* + * Allocate a given length worth of mbufs and/or clusters (whatever fits + * best) and return a pointer to the top of the allocated chain. If an + * existing mbuf chain is provided, then we will append the new chain + * to the existing one but still return the top of the newly allocated + * chain. + */ +struct mbuf * +m_getm(struct mbuf *m, int len, int how, short type) +{ + struct mbuf *mb, *top, *cur, *mtail; + int num, rem; + int i; + + KASSERT(len >= 0, ("m_getm(): len is < 0")); + + /* If m != NULL, we will append to the end of that chain. */ + if (m != NULL) + for (mtail = m; mtail->m_next != NULL; mtail = mtail->m_next); + else + mtail = NULL; + + /* + * Calculate how many mbufs+clusters ("packets") we need and how much + * leftover there is after that and allocate the first mbuf+cluster + * if required. + */ + num = len / MCLBYTES; + rem = len % MCLBYTES; + top = cur = NULL; + if (num > 0) { + if ((top = cur = m_getcl(how, type, 0)) == NULL) + goto failed; + } + num--; + top->m_len = 0; + + for (i = 0; i < num; i++) { + mb = m_getcl(how, type, 0); + if (mb == NULL) + goto failed; + mb->m_len = 0; + cur = (cur->m_next = mb); + } + if (rem > 0) { + mb = (rem > MINCLSIZE) ? + m_getcl(how, type, 0) : m_get(how, type); + if (mb == NULL) + goto failed; + mb->m_len = 0; + if (cur == NULL) + top = mb; + else + cur->m_next = mb; + } + + if (mtail != NULL) + mtail->m_next = top; + return top; +failed: + if (top != NULL) + m_freem(top); + return NULL; +} + +/* + * Free an entire chain of mbufs and associated external buffers, if + * applicable. + */ +void +m_freem(struct mbuf *mb) +{ + + while (mb != NULL) + mb = m_free(mb); +} + +/*- + * Configure a provided mbuf to refer to the provided external storage + * buffer and setup a reference count for said buffer. If the setting + * up of the reference count fails, the M_EXT bit will not be set. If + * successfull, the M_EXT bit is set in the mbuf's flags. + * + * Arguments: + * mb The existing mbuf to which to attach the provided buffer. + * buf The address of the provided external storage buffer. + * size The size of the provided buffer. + * freef A pointer to a routine that is responsible for freeing the + * provided external storage buffer. + * args A pointer to an argument structure (of any type) to be passed + * to the provided freef routine (may be NULL). + * flags Any other flags to be passed to the provided mbuf. + * type The type that the external storage buffer should be + * labeled with. + * + * Returns: + * Nothing. + */ +void +m_extadd(struct mbuf *mb, caddr_t buf, u_int size, + void (*freef)(void *, void *), void *args, int flags, int type) +{ + u_int *ref_cnt = NULL; + + /* XXX Shouldn't be adding EXT_CLUSTER with this API */ + if (type == EXT_CLUSTER) + ref_cnt = (u_int *)uma_find_refcnt(zone_clust, + mb->m_ext.ext_buf); + else if (type == EXT_EXTREF) + ref_cnt = mb->m_ext.ref_cnt; + mb->m_ext.ref_cnt = (ref_cnt == NULL) ? + malloc(sizeof(u_int), M_MBUF, M_NOWAIT) : (u_int *)ref_cnt; + if (mb->m_ext.ref_cnt != NULL) { + *(mb->m_ext.ref_cnt) = 1; + mb->m_flags |= (M_EXT | flags); + mb->m_ext.ext_buf = buf; + mb->m_data = mb->m_ext.ext_buf; + mb->m_ext.ext_size = size; + mb->m_ext.ext_free = freef; + mb->m_ext.ext_args = args; + mb->m_ext.ext_type = type; + } +} + +/* + * Non-directly-exported function to clean up after mbufs with M_EXT + * storage attached to them if the reference count hits 0. + */ +void +mb_free_ext(struct mbuf *m) +{ + + MEXT_REM_REF(m); + if (atomic_cmpset_int(m->m_ext.ref_cnt, 0, 1)) { + if (m->m_ext.ext_type == EXT_PACKET) { + uma_zfree(zone_pack, m); + return; + } else if (m->m_ext.ext_type == EXT_CLUSTER) { + uma_zfree(zone_clust, m->m_ext.ext_buf); + m->m_ext.ext_buf = NULL; + } else { + (*(m->m_ext.ext_free))(m->m_ext.ext_buf, + m->m_ext.ext_args); + if (m->m_ext.ext_type != EXT_EXTREF) + free(m->m_ext.ref_cnt, M_MBUF); + } + } + uma_zfree(zone_mbuf, m); +} + +/* * "Move" mbuf pkthdr from "from" to "to". * "from" must have M_PKTHDR set, and "to" must be empty. */ @@ -364,22 +519,22 @@ struct mbuf *n; /* Get the next new mbuf */ - MGET(n, how, m->m_type); + if (remain >= MINCLSIZE) { + n = m_getcl(how, m->m_type, 0); + nsize = MCLBYTES; + } else { + n = m_get(how, m->m_type); + nsize = MLEN; + } if (n == NULL) goto nospace; - if (top == NULL) { /* first one, must be PKTHDR */ - if (!m_dup_pkthdr(n, m, how)) + + if (top == NULL) { /* First one, must be PKTHDR */ + if (!m_dup_pkthdr(n, m, how)) { + m_free(n); goto nospace; + } nsize = MHLEN; - } else /* not the first one */ - nsize = MLEN; - if (remain >= MINCLSIZE) { - MCLGET(n, how); - if ((n->m_flags & M_EXT) == 0) { - (void)m_free(n); - goto nospace; - } - nsize = MCLBYTES; } n->m_len = 0; @@ -651,41 +806,44 @@ void (*copy)(char *from, caddr_t to, u_int len)) { struct mbuf *m; - struct mbuf *top = 0, **mp = ⊤ + struct mbuf *top = NULL, **mp = ⊤ int len; if (off < 0 || off > MHLEN) return (NULL); - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m == NULL) - return (NULL); - m->m_pkthdr.rcvif = ifp; - m->m_pkthdr.len = totlen; - len = MHLEN; + while (totlen > 0) { + if (top == NULL) { /* First one, must be PKTHDR */ + if (totlen + off >= MINCLSIZE) { + m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + len = MCLBYTES; + } else { + m = m_gethdr(M_DONTWAIT, MT_DATA); + len = MHLEN; - while (totlen > 0) { - if (top) { - MGET(m, M_DONTWAIT, MT_DATA); + /* Place initial small packet/header at end of mbuf */ + if (m && totlen + off + max_linkhdr <= MLEN) { + m->m_data += max_linkhdr; + len -= max_linkhdr; + } + } + if (m == NULL) + return NULL; + m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.len = totlen; + } else { + if (totlen + off >= MINCLSIZE) { + m = m_getcl(M_DONTWAIT, MT_DATA, 0); + len = MCLBYTES; + } else { + m = m_get(M_DONTWAIT, MT_DATA); + len = MLEN; + } if (m == NULL) { m_freem(top); - return (NULL); + return NULL; } - len = MLEN; } - if (totlen + off >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); - if (m->m_flags & M_EXT) - len = MCLBYTES; - } else { - /* - * Place initial small packet/header at end of mbuf. - */ - if (top == NULL && totlen + off + max_linkhdr <= len) { - m->m_data += max_linkhdr; - len -= max_linkhdr; - } - } if (off) { m->m_data += off; len -= off; @@ -722,9 +880,10 @@ off -= mlen; totlen += mlen; if (m->m_next == NULL) { - n = m_get_clrd(M_DONTWAIT, m->m_type); + n = m_get(M_DONTWAIT, m->m_type); if (n == NULL) goto out; + bzero(mtod(n, caddr_t), MLEN); n->m_len = min(MLEN, len + off); m->m_next = n; } ==== //depot/projects/netperf_socket/sys/kern/uipc_mbuf2.c#4 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.24 2004/05/09 05:57:58 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.25 2004/05/31 21:46:04 bmilekic Exp $"); /*#define PULLDOWN_DEBUG*/ @@ -230,14 +230,10 @@ * now, we need to do the hard way. don't m_copy as there's no room * on both end. */ - MGET(o, M_DONTWAIT, m->m_type); - if (o && len > MLEN) { - MCLGET(o, M_DONTWAIT); - if ((o->m_flags & M_EXT) == 0) { - m_free(o); - o = NULL; - } - } + if (len > MLEN) + o = m_getcl(M_DONTWAIT, m->m_type, 0); + else + o = m_get(M_DONTWAIT, m->m_type); if (!o) { m_freem(m); return NULL; /* ENOBUFS */ @@ -274,29 +270,27 @@ m_dup1(struct mbuf *m, int off, int len, int wait) { struct mbuf *n; - int l; int copyhdr; if (len > MCLBYTES) return NULL; - if (off == 0 && (m->m_flags & M_PKTHDR) != 0) { + if (off == 0 && (m->m_flags & M_PKTHDR) != 0) copyhdr = 1; - MGETHDR(n, wait, m->m_type); - l = MHLEN; + else + copyhdr = 0; + if (len >= MINCLSIZE) { + if (copyhdr == 1) + n = m_getcl(wait, m->m_type, M_PKTHDR); + else + n = m_getcl(wait, m->m_type, 0); } else { - copyhdr = 0; - MGET(n, wait, m->m_type); - l = MLEN; - } - if (n && len > l) { - MCLGET(n, wait); - if ((n->m_flags & M_EXT) == 0) { - m_free(n); - n = NULL; - } + if (copyhdr == 1) + n = m_gethdr(wait, m->m_type); + else + n = m_get(wait, m->m_type); } if (!n) - return NULL; + return NULL; /* ENOBUFS */ if (copyhdr && !m_dup_pkthdr(n, m, wait)) { m_free(n); ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.170 2004/04/09 13:23:51 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.171 2004/05/31 21:46:04 bmilekic Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -533,8 +533,8 @@ { struct mbuf **mp; struct mbuf *m; - long space, len, resid; - int clen = 0, error, dontroute, mlen; + long space, len = 0, resid; + int clen = 0, error, dontroute; int atomic = sosendallatonce(so) || top; #ifdef ZERO_COPY_SOCKETS int cow_send; @@ -626,27 +626,25 @@ cow_send = 0; #endif /* ZERO_COPY_SOCKETS */ SOCKBUF_UNLOCK(&so->so_snd); - if (top == 0) { - MGETHDR(m, M_TRYWAIT, MT_DATA); - if (m == NULL) { - error = ENOBUFS; - SOCKBUF_LOCK(&so->so_snd); /* XXX */ - goto release; - } - mlen = MHLEN; - m->m_pkthdr.len = 0; - m->m_pkthdr.rcvif = (struct ifnet *)0; - } else { - MGET(m, M_TRYWAIT, MT_DATA); - if (m == NULL) { - error = ENOBUFS; - SOCKBUF_LOCK(&so->so_snd); /* XXX */ - goto release; - } - mlen = MLEN; - } if (resid >= MINCLSIZE) { #ifdef ZERO_COPY_SOCKETS + if (top == NULL) { + MGETHDR(m, M_TRYWAIT, MT_DATA); + if (m == NULL) { + error = ENOBUFS; + SOCKBUF_LOCK(&so->so_snd); + goto release; + } + m->m_pkthdr.len = 0; + m->m_pkthdr.rcvif = (struct ifnet *)0; + } else { + MGET(m, M_TRYWAIT, MT_DATA); + if (m == NULL) { + error = ENOBUFS; + SOCKBUF_LOCK(&so->so_snd); + goto release; + } + } if (so_zero_copy_send && resid>=PAGE_SIZE && space>=PAGE_SIZE && @@ -658,29 +656,49 @@ cow_send = socow_setup(m, uio); } } - if (!cow_send){ + if (!cow_send) { + MCLGET(m, M_TRYWAIT); + if ((m->m_flags & M_EXT) == 0) { + m_free(m); + m = NULL; + } else { + len = min(min(MCLBYTES, resid), space); + } + } else + len = PAGE_SIZE; +#else /* ZERO_COPY_SOCKETS */ + if (top == NULL) { + m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR); + m->m_pkthdr.len = 0; + m->m_pkthdr.rcvif = (struct ifnet *)0; + } else + m = m_getcl(M_TRYWAIT, MT_DATA, 0); + len = min(min(MCLBYTES, resid), space); #endif /* ZERO_COPY_SOCKETS */ - MCLGET(m, M_TRYWAIT); - if ((m->m_flags & M_EXT) == 0) - goto nopages; - mlen = MCLBYTES; - len = min(min(mlen, resid), space); } else { -#ifdef ZERO_COPY_SOCKETS - len = PAGE_SIZE; + if (top == NULL) { + m = m_gethdr(M_TRYWAIT, MT_DATA); + m->m_pkthdr.len = 0; + m->m_pkthdr.rcvif = (struct ifnet *)0; + + len = min(min(MHLEN, resid), space); + /* + * For datagram protocols, leave room + * for protocol headers in first mbuf. + */ + if (atomic && m && len < MHLEN) + MH_ALIGN(m, len); + } else { + m = m_get(M_TRYWAIT, MT_DATA); + len = min(min(MLEN, resid), space); } + } + if (m == NULL) { + error = ENOBUFS; + SOCKBUF_LOCK(&so->so_snd); + goto release; + } - } else { -#endif /* ZERO_COPY_SOCKETS */ -nopages: - len = min(min(mlen, resid), space); - /* - * For datagram protocols, leave room - * for protocol headers in first mbuf. - */ - if (atomic && top == 0 && len < mlen) - MH_ALIGN(m, len); - } space -= len; #ifdef ZERO_COPY_SOCKETS if (cow_send) @@ -739,6 +757,7 @@ } while (resid); release: + SOCKBUF_LOCK_ASSERT(&so->so_snd); sbunlock(&so->so_snd); out: SOCKBUF_UNLOCK(&so->so_snd); ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.124 2004/05/19 00:22:10 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.125 2004/05/31 21:46:04 bmilekic Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -1203,15 +1203,12 @@ if (CMSG_SPACE((u_int)size) > MCLBYTES) return ((struct mbuf *) NULL); - if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL) + if (CMSG_SPACE((u_int)size > MLEN)) + m = m_getcl(M_DONTWAIT, MT_CONTROL, 0); + else + m = m_get(M_DONTWAIT, MT_CONTROL); + if (m == NULL) return ((struct mbuf *) NULL); - if (CMSG_SPACE((u_int)size) > MLEN) { - MCLGET(m, M_DONTWAIT); - if ((m->m_flags & M_EXT) == 0) { - m_free(m); - return ((struct mbuf *) NULL); - } - } cp = mtod(m, struct cmsghdr *); m->m_len = 0; KASSERT(CMSG_SPACE((u_int)size) <= M_TRAILINGSPACE(m), ==== //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.183 2004/05/08 02:24:21 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.184 2004/05/31 21:46:04 bmilekic Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #ifdef KTRACE @@ -85,6 +86,21 @@ int compat); /* + * NSFBUFS-related variables and associated sysctls + */ +int nsfbufs; +int nsfbufspeak; +int nsfbufsused; + +SYSCTL_DECL(_kern_ipc); +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"); + +/* * System call interface to the socket abstraction. */ #if defined(COMPAT_43) || defined(COMPAT_SUNOS) ==== //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.198 2004/04/05 21:03:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.199 2004/05/31 20:56:10 rwatson Exp $"); #include "opt_mac.h" @@ -929,6 +929,8 @@ struct mount *mp; int error; + GIANT_REQUIRED; + /* * If a vnode is provided, get and return the mount point that * to which it will write. @@ -1007,6 +1009,8 @@ struct mount *mp; { + GIANT_REQUIRED; + if (mp == NULL) return; mp->mnt_writeopcount--; ==== //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#8 (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.65 2004/05/26 12:09:39 tmm Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.66 2004/05/31 21:46:04 bmilekic Exp $ */ #include "opt_pmap.h" @@ -86,6 +86,10 @@ #include #include +#ifndef NSFBUFS +#define NSFBUFS (512 + maxusers * 16) +#endif + static void sf_buf_init(void *arg); SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) @@ -351,6 +355,9 @@ vm_offset_t sf_base; int i; + nsfbufs = NSFBUFS; + TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs); + mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); SLIST_INIT(&sf_freelist.sf_head); sf_base = kmem_alloc_nofault(kernel_map, nsfbufs * PAGE_SIZE); ==== //depot/projects/netperf_socket/sys/sys/mbuf.h#11 (text+ko) ==== @@ -10,7 +10,7 @@ * 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. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -27,13 +27,18 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.147 2004/05/29 05:36:43 maxim Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.148 2004/05/31 21:46:05 bmilekic Exp $ */ #ifndef _SYS_MBUF_H_ #define _SYS_MBUF_H_ +/* XXX: These includes suck. Sorry! */ #include +#ifdef _KERNEL +#include +#include +#endif /* * Mbufs are of a single size, MSIZE (sys/param.h), which @@ -57,6 +62,16 @@ */ #define mtod(m, t) ((t)((m)->m_data)) #define dtom(x) ((struct mbuf *)((intptr_t)(x) & ~(MSIZE-1))) + +/* + * Argument structure passed to UMA routines during mbuf and packet + * allocations. + */ +struct mb_args { + int flags; /* Flags for mbuf being allocated */ + int how; /* How to allocate: M_WAITOK or M_DONTWAIT */ + short type; /* Type of mbuf being allocated */ +}; #endif /* _KERNEL */ /* @@ -167,6 +182,7 @@ */ #define EXT_CLUSTER 1 /* mbuf cluster */ #define EXT_SFBUF 2 /* sendfile(2)'s sf_bufs */ +#define EXT_PACKET 3 /* came out of Packet zone */ #define EXT_NET_DRV 100 /* custom ext_buf provided by net driver(s) */ #define EXT_MOD_TYPE 200 /* custom module's ext_buf type */ #define EXT_DISPOSABLE 300 /* can throw this buffer away w/page flipping */ @@ -223,28 +239,12 @@ #define MT_NTYPES 16 /* number of mbuf types for mbtypes[] */ /* - * Mbuf and cluster allocation statistics PCPU structure. - */ -struct mbpstat { - u_long mb_mbfree; - u_long mb_mbbucks; - u_long mb_clfree; - u_long mb_clbucks; - long mb_mbtypes[MT_NTYPES]; - short mb_active; -}; - -/* * General mbuf allocator statistics structure. - * XXX: Modifications of these are not protected by any mutex locks nor by - * any atomic() manipulations. As a result, we may occasionally lose - * a count or two. Luckily, not all of these fields are modified at all - * and remain static, and those that are manipulated are only manipulated - * in failure situations, which do not occur (hopefully) very often. */ struct mbstat { - u_long m_drops; /* times failed to allocate */ - u_long m_wait; /* times succesfully returned from wait */ + u_long m_mbufs; /* XXX */ + u_long m_mclusts; /* XXX */ + u_long m_drain; /* times drained protocols for space */ u_long m_mcfail; /* XXX: times m_copym failed */ u_long m_mpfail; /* XXX: times m_pullup failed */ @@ -253,10 +253,10 @@ u_long m_minclsize; /* min length of data to allocate a cluster */ u_long m_mlen; /* length of data in an mbuf */ u_long m_mhlen; /* length of data in a header mbuf */ - u_int m_mbperbuck; /* number of mbufs per "bucket" */ - u_int m_clperbuck; /* number of clusters per "bucket" */ - /* Number of mbtypes (gives # elems in mbpstat's mb_mbtypes[] array: */ + + /* Number of mbtypes (gives # elems in mbtypes[] array: */ short m_numtypes; + /* XXX: Sendfile stats should eventually move to their own struct */ u_long sf_iocnt; /* times sendfile had to do disk I/O */ u_long sf_allocfail; /* times sfbuf allocation failed */ @@ -265,14 +265,23 @@ /* * Flags specifying how an allocation should be made. - * M_DONTWAIT means "don't block if nothing is available" whereas - * M_TRYWAIT means "block for mbuf_wait ticks at most if nothing is - * available." + * + * The flag to use is as follows: + * - M_DONTWAIT or M_NOWAIT from an interrupt handler to not block allocation. + * - M_WAIT or M_WAITOK or M_TRYWAIT from wherever it is safe to block. + * + * M_DONTWAIT/M_NOWAIT means that we will not block the thread explicitly + * and if we cannot allocate immediately we may return NULL, + * whereas M_WAIT/M_WAITOK/M_TRYWAIT means that if we cannot allocate + * resources we will block until they are available, and thus never + * return NULL. + * + * XXX Eventually just phase this out to use M_WAITOK/M_NOWAIT. */ -#define M_DONTWAIT 0x4 /* don't conflict with M_NOWAIT */ -#define M_TRYWAIT 0x8 /* or M_WAITOK */ -#define M_WAIT M_TRYWAIT /* XXX: deprecated */ -#define MBTOM(how) ((how) & M_TRYWAIT ? M_WAITOK : M_NOWAIT) +#define MBTOM(how) (how) +#define M_DONTWAIT M_NOWAIT +#define M_TRYWAIT M_WAITOK +#define M_WAIT M_WAITOK #ifdef _KERNEL /*- @@ -296,12 +305,114 @@ #define MEXT_ADD_REF(m) atomic_add_int((m)->m_ext.ref_cnt, 1) /* + * Network buffer allocation API + * + * The rest of it is defined in kern/subr_mbuf.c + */ + +extern uma_zone_t zone_mbuf; +extern uma_zone_t zone_clust; +extern uma_zone_t zone_pack; + +static __inline struct mbuf *m_get(int how, short type); +static __inline struct mbuf *m_gethdr(int how, short type); +static __inline struct mbuf *m_getcl(int how, short type, int flags); +static __inline struct mbuf *m_getclr(int how, short type); /* XXX */ +static __inline struct mbuf *m_free(struct mbuf *m); +static __inline void m_clget(struct mbuf *m, int how); +static __inline void m_chtype(struct mbuf *m, short new_type); +void mb_free_ext(struct mbuf *); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 31 16:23:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9560016A4D1; Mon, 31 May 2004 16:23:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A22316A4CF for ; Mon, 31 May 2004 16:23:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C40B43D1F for ; Mon, 31 May 2004 16:23:22 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4VNNMwK073105 for ; Mon, 31 May 2004 16:23:22 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VNNLCt073102 for perforce@freebsd.org; Mon, 31 May 2004 16:23:21 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 31 May 2004 16:23:21 -0700 (PDT) Message-Id: <200405312323.i4VNNLCt073102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 53910 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, 31 May 2004 23:23:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=53910 Change 53910 by julian@julian_ref on 2004/05/31 16:22:57 fix screwup in placement of a lock Affected files ... .. //depot/projects/nsched/sys/kern/sched_4bsd.c#12 edit Differences ... ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#12 (text+ko) ==== @@ -1072,12 +1072,12 @@ ke_first = TAILQ_FIRST(&zombie_kses); if (ke_first) TAILQ_INIT(&zombie_kses); + mtx_unlock_spin(&kse_zombie_lock); while (ke_first) { ke_next = TAILQ_NEXT(ke_first, ke_procq); kse_free(ke_first); ke_first = ke_next; } - mtx_unlock_spin(&kse_zombie_lock); } } From owner-p4-projects@FreeBSD.ORG Mon May 31 16:32:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56EC916A4D0; Mon, 31 May 2004 16:32:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E298E16A4CE for ; Mon, 31 May 2004 16:32:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB31E43D48 for ; Mon, 31 May 2004 16:32:49 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4VNWX1Z075162 for ; Mon, 31 May 2004 16:32:33 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VNWX8G075159 for perforce@freebsd.org; Mon, 31 May 2004 16:32:33 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 31 May 2004 16:32:33 -0700 (PDT) Message-Id: <200405312332.i4VNWX8G075159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 53911 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, 31 May 2004 23:32:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=53911 Change 53911 by julian@julian_desk on 2004/05/31 16:31:58 remove cruft Affected files ... .. //depot/projects/nsched/sys/conf/files#9 edit .. //depot/projects/nsched/sys/kern/scheduler/ule/sched_ule.c#3 delete .. //depot/projects/nsched/sys/kern/scheduler/ule/sched_ule_kse.c#2 delete .. //depot/projects/nsched/sys/kern/scheduler/ule/sched_ule_kse.h#2 delete .. //depot/projects/nsched/sys/kern/scheduler/ule/sched_ule_runq.c#2 delete Differences ... ==== //depot/projects/nsched/sys/conf/files#9 (text+ko) ==== @@ -1104,9 +1104,8 @@ kern/md4c.c optional netsmb kern/md5c.c standard kern/sched_4bsd.c optional sched_4bsd -kern/scheduler/ule/sched_ule.c optional sched_ule -kern/scheduler/ule/sched_ule_kse.c optional sched_ule -kern/scheduler/ule/sched_ule_runq.c optional sched_ule +kern/kern_switch.c optional sched_ule +kern/sched_ule.c optional sched_ule kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard From owner-p4-projects@FreeBSD.ORG Mon May 31 16:41:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C22816A4D0; Mon, 31 May 2004 16:41:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60BF916A4CE for ; Mon, 31 May 2004 16:41:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40B9043D45 for ; Mon, 31 May 2004 16:41:46 -0700 (PDT) (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.11/8.12.11) with ESMTP id i4VNfjlA076458 for ; Mon, 31 May 2004 16:41:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4VNfj67076448 for perforce@freebsd.org; Mon, 31 May 2004 16:41:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 31 May 2004 16:41:45 -0700 (PDT) Message-Id: <200405312341.i4VNfj67076448@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 53912 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, 31 May 2004 23:41:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=53912 Change 53912 by rwatson@rwatson_tislabs on 2004/05/31 16:41:26 Integrate netperf_socket from FreeBSD CVS HEAD: - module.h include fixes. Affected files ... .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.5 2004/04/14 00:57:49 brooks Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.6 2004/05/31 22:48:19 mlaier Exp $ */ /* $OpenBSD: if_pflog.c,v 1.9 2003/05/14 08:42:00 canacar Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -56,6 +56,7 @@ #ifdef __FreeBSD__ #include #include +#include #include #else #include ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.5 2004/04/14 00:57:49 brooks Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.6 2004/05/31 22:48:19 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.6 2003/06/21 09:07:01 djm Exp $ */ /* @@ -50,6 +50,7 @@ #ifdef __FreeBSD__ #include #include +#include #include #else #include ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.6 2004/05/02 20:47:24 dhartmei Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.7 2004/05/31 22:48:19 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.81.2.2 2004/04/30 23:28:58 brad Exp $ */ /* @@ -51,6 +51,7 @@ #include #include #ifdef __FreeBSD__ +#include #include #else #include From owner-p4-projects@FreeBSD.ORG Mon May 31 19:58:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3DE116A4D0; Mon, 31 May 2004 19:58:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D3CE16A4CE for ; Mon, 31 May 2004 19:58:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93C5743D31 for ; Mon, 31 May 2004 19:58:06 -0700 (PDT) (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.11/8.12.11) with ESMTP id i512vqp0025287 for ; Mon, 31 May 2004 19:57:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i512vqg8025284 for perforce@freebsd.org; Mon, 31 May 2004 19:57:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 31 May 2004 19:57:52 -0700 (PDT) Message-Id: <200406010257.i512vqg8025284@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 53924 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, 01 Jun 2004 02:58:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=53924 Change 53924 by rwatson@rwatson_tislabs on 2004/05/31 19:57:28 Integrate rwatson_netperf_merge: - More module.h cleanup - Don Lewis's introduction of MSG_NBIO to avoid frobbing SS_NBIO in fifofs resulting in races with other fifo consumers. - Loopback of so_qstate and SQ_INCOMP/SQ_COMP. Affected files ... .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#6 integrate .. //depot/projects/netperf_socket/sys/vm/uma.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.94 2004/05/17 20:16:40 truckman Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.95 2004/06/01 01:18:50 truckman Exp $ */ #include @@ -312,7 +312,7 @@ struct uio *uio = ap->a_uio; struct socket *rso = ap->a_vp->v_fifoinfo->fi_readsock; struct thread *td = uio->uio_td; - int error; + int error, flags; #ifdef DIAGNOSTIC if (uio->uio_rw != UIO_READ) @@ -320,14 +320,11 @@ #endif if (uio->uio_resid == 0) return (0); - if (ap->a_ioflag & IO_NDELAY) - rso->so_state |= SS_NBIO; VOP_UNLOCK(ap->a_vp, 0, td); + flags = (ap->a_ioflag & IO_NDELAY) ? MSG_NBIO : 0; error = soreceive(rso, (struct sockaddr **)0, uio, (struct mbuf **)0, - (struct mbuf **)0, (int *)0); + (struct mbuf **)0, &flags); vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, td); - if (ap->a_ioflag & IO_NDELAY) - rso->so_state &= ~SS_NBIO; return (error); } @@ -346,20 +343,17 @@ { struct socket *wso = ap->a_vp->v_fifoinfo->fi_writesock; struct thread *td = ap->a_uio->uio_td; - int error; + int error, flags; #ifdef DIAGNOSTIC if (ap->a_uio->uio_rw != UIO_WRITE) panic("fifo_write mode"); #endif - if (ap->a_ioflag & IO_NDELAY) - wso->so_state |= SS_NBIO; VOP_UNLOCK(ap->a_vp, 0, td); + flags = (ap->a_ioflag & IO_NDELAY) ? MSG_NBIO : 0; error = sosend(wso, (struct sockaddr *)0, ap->a_uio, 0, - (struct mbuf *)0, 0, td); + (struct mbuf *)0, flags, td); vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, td); - if (ap->a_ioflag & IO_NDELAY) - wso->so_state &= ~SS_NBIO; return (error); } ==== //depot/projects/netperf_socket/sys/i386/i386/nexus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/nexus.c,v 1.55 2004/05/04 21:02:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/nexus.c,v 1.56 2004/06/01 01:04:25 njl Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -519,8 +519,6 @@ struct resource_list_entry *rle; rle = resource_list_find(rl, type, rid); - device_printf(child, "type %d rid %d startp %p countp %p - got %p\n", - type, rid, startp, countp, rle); if (!rle) return(ENOENT); if (startp) ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.171 2004/05/31 21:46:04 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.173 2004/06/01 02:42:55 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -299,10 +299,10 @@ SOCKBUF_LOCK(&so->so_rcv); if (so->so_head != NULL) { head = so->so_head; - if (so->so_state & SS_INCOMP) { + if (so->so_qstate & SQ_INCOMP) { TAILQ_REMOVE(&head->so_incomp, so, so_list); head->so_incqlen--; - } else if (so->so_state & SS_COMP) { + } else if (so->so_qstate & SQ_COMP) { /* * We must not decommission a socket that's * on the accept(2) queue. If we do, then @@ -314,7 +314,7 @@ } else { panic("sofree: not queued"); } - so->so_state &= ~SS_INCOMP; + so->so_qstate &= ~SQ_INCOMP; so->so_head = NULL; } SOCKBUF_UNLOCK(&so->so_rcv); @@ -359,7 +359,7 @@ /* Dequeue from so_comp since sofree() won't do it */ TAILQ_REMOVE(&so->so_comp, sp, so_list); so->so_qlen--; - sp->so_state &= ~SS_COMP; + sp->so_qstate &= ~SQ_COMP; sp->so_head = NULL; (void) soabort(sp); } @@ -604,7 +604,7 @@ snderr(EMSGSIZE); if (space < resid + clen && (atomic || space < so->so_snd.sb_lowat || space < clen)) { - if (so->so_state & SS_NBIO) + if ((so->so_state & SS_NBIO) || (flags & MSG_NBIO)) snderr(EWOULDBLOCK); error = sbwait(&so->so_snd); if (error) @@ -903,7 +903,8 @@ } if (uio->uio_resid == 0) goto release; - if ((so->so_state & SS_NBIO) || (flags & MSG_DONTWAIT)) { + if ((so->so_state & SS_NBIO) || + (flags & (MSG_DONTWAIT|MSG_NBIO))) { error = EWOULDBLOCK; goto release; } ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.125 2004/05/31 21:46:04 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.126 2004/06/01 02:42:55 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -125,7 +125,7 @@ SOCK_LOCK(so); so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING); so->so_state |= SS_ISCONNECTED; - if (head && (so->so_state & SS_INCOMP)) { + if (head && (so->so_qstate & SQ_INCOMP)) { if ((so->so_options & SO_ACCEPTFILTER) == 0) { if (need_lock) SOCK_UNLOCK(so); @@ -242,7 +242,7 @@ SOCKBUF_LOCK(&head->so_rcv); if (connstatus) { TAILQ_INSERT_TAIL(&head->so_comp, so, so_list); - so->so_state |= SS_COMP; + so->so_qstate |= SQ_COMP; head->so_qlen++; } else { if (head->so_incqlen > head->so_qlimit) { @@ -251,7 +251,7 @@ (void) soabort(sp); } TAILQ_INSERT_TAIL(&head->so_incomp, so, so_list); - so->so_state |= SS_INCOMP; + so->so_qstate |= SQ_INCOMP; head->so_incqlen++; } SOCKBUF_UNLOCK(&head->so_rcv); ==== //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.184 2004/05/31 21:46:04 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.185 2004/06/01 02:42:55 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -346,7 +346,7 @@ /* connection has been removed from the listen queue */ KNOTE(&head->so_rcv.sb_sel.si_note, 0); - so->so_state &= ~SS_COMP; + so->so_qstate &= ~SQ_COMP; so->so_head = NULL; pgid = fgetown(&head->so_sigio); if (pgid != 0) ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.6 2004/04/27 16:38:15 emax Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.7 2004/06/01 02:42:56 rwatson Exp $ */ #include @@ -1369,7 +1369,7 @@ s0->l2so->so_qlen --; soref(l2so); - l2so->so_state &= ~SS_COMP; + l2so->so_qstate &= ~SQ_COMP; l2so->so_state |= SS_NBIO; l2so->so_head = NULL; ==== //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.40 2004/05/29 00:51:11 julian Exp $ + * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.41 2004/06/01 02:42:55 rwatson Exp $ * $Whistle: ng_ksocket.c,v 1.1 1999/11/16 20:04:40 archie Exp $ */ @@ -1204,7 +1204,7 @@ soref(so); - so->so_state &= ~SS_COMP; + so->so_qstate &= ~SQ_COMP; so->so_state |= SS_NBIO; so->so_head = NULL; ==== //depot/projects/netperf_socket/sys/sys/socket.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socket.h 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/sys/socket.h,v 1.79 2004/05/10 02:24:56 emax Exp $ + * $FreeBSD: src/sys/sys/socket.h,v 1.80 2004/06/01 01:18:51 truckman Exp $ */ #ifndef _SYS_SOCKET_H_ @@ -393,6 +393,7 @@ #if __BSD_VISIBLE #define MSG_DONTWAIT 0x80 /* this message should be nonblocking */ #define MSG_EOF 0x100 /* data completes connection */ +#define MSG_NBIO 0x4000 /* FIONBIO mode, used by fifofs */ #define MSG_COMPAT 0x8000 /* used in sendit() */ #endif ==== //depot/projects/netperf_socket/sys/sys/socketvar.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.111 2004/04/07 04:19:49 imp Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.112 2004/06/01 02:42:54 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -52,6 +52,7 @@ short so_options; /* from socket call, see socket.h */ short so_linger; /* time to linger while closing */ short so_state; /* internal state flags SS_*, below */ + int so_qstate; /* internal state flags SQ_* */ void *so_pcb; /* protocol control block */ struct protosw *so_proto; /* protocol handle */ /* @@ -163,11 +164,15 @@ #define SS_ASYNC 0x0200 /* async i/o notify */ #define SS_ISCONFIRMING 0x0400 /* deciding to accept connection req */ -#define SS_INCOMP 0x0800 /* unaccepted, incomplete connection */ -#define SS_COMP 0x1000 /* unaccepted, complete connection */ #define SS_ISDISCONNECTED 0x2000 /* socket disconnected from peer */ /* + * Socket state bits stored in so_qstate. + */ +#define SQ_INCOMP 0x0800 /* unaccepted, incomplete connection */ +#define SQ_COMP 0x1000 /* unaccepted, complete connection */ + +/* * Externalized form of struct socket used by the sysctl(3) interface. */ struct xsocket { ==== //depot/projects/netperf_socket/sys/vm/uma.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/vm/uma.h,v 1.17 2004/05/31 21:46:05 bmilekic Exp $ + * $FreeBSD: src/sys/vm/uma.h,v 1.18 2004/06/01 01:36:26 bmilekic Exp $ * */ @@ -185,9 +185,9 @@ * zinit/zfini (unset by default for master zone) with * uma_zone_set_zinit/zfini() (note subtle 'z' prefix). * - * align A bitmask that corisponds to the requested alignment - * eg 4 would be 0x3 - * flags A set of parameters that control the behavior of the zone + * master A reference to this zone's Master Zone (Primary Zone), + * which contains the backing Keg for the Secondary Zone + * being added. * * Returns: * A pointer to a structure which is intended to be opaque to users of From owner-p4-projects@FreeBSD.ORG Tue Jun 1 14:29:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CB7D16A4D0; Tue, 1 Jun 2004 14:29:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3122016A4CE for ; Tue, 1 Jun 2004 14:29:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D8D043D39 for ; Tue, 1 Jun 2004 14:29:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i51LTGc3003435 for ; Tue, 1 Jun 2004 14:29:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i51LT4Wt003432 for perforce@freebsd.org; Tue, 1 Jun 2004 14:29:04 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 1 Jun 2004 14:29:04 -0700 (PDT) Message-Id: <200406012129.i51LT4Wt003432@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 53977 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, 01 Jun 2004 21:29:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=53977 Change 53977 by peter@peter_daintree on 2004/06/01 14:28:23 IFC @53975 Affected files ... .. //depot/projects/hammer/MAINTAINERS#23 integrate .. //depot/projects/hammer/bin/df/Makefile#4 integrate .. //depot/projects/hammer/bin/df/df.c#16 integrate .. //depot/projects/hammer/bin/ls/Makefile#5 integrate .. //depot/projects/hammer/bin/ls/print.c#13 integrate .. //depot/projects/hammer/bin/ps/ps.1#16 integrate .. //depot/projects/hammer/bin/ps/ps.c#12 integrate .. //depot/projects/hammer/bin/sh/arith.y#5 integrate .. //depot/projects/hammer/contrib/cvs/src/server.c#7 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.8#2 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#27 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#18 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#21 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#8 integrate .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#24 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#11 integrate .. //depot/projects/hammer/etc/rc.d/netif#7 integrate .. //depot/projects/hammer/etc/rc.d/nisdomain#2 integrate .. //depot/projects/hammer/etc/rc.d/nsswitch#1 branch .. //depot/projects/hammer/etc/rc.firewall6#4 integrate .. //depot/projects/hammer/etc/services#8 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#22 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#14 integrate .. //depot/projects/hammer/games/fortune/datfiles/murphy#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_drv/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/cc/cccp/Makefile#3 delete .. //depot/projects/hammer/gnu/usr.bin/cc/cpp0/Makefile#3 delete .. //depot/projects/hammer/gnu/usr.bin/cc/tradcpp0/Makefile#3 delete .. //depot/projects/hammer/include/Makefile#22 integrate .. //depot/projects/hammer/include/complex.h#2 integrate .. //depot/projects/hammer/include/rpcsvc/yp_prot.h#2 integrate .. //depot/projects/hammer/include/stdio.h#8 integrate .. //depot/projects/hammer/include/wchar.h#13 integrate .. //depot/projects/hammer/include/wctype.h#3 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#8 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/hammer/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/hammer/lib/libarchive/tar.5#5 integrate .. //depot/projects/hammer/lib/libc/gen/ftok.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/euc.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/none.c#7 integrate .. //depot/projects/hammer/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/hammer/lib/libc/net/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/net/eui64.3#1 branch .. //depot/projects/hammer/lib/libc/net/eui64.c#1 branch .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#13 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetwc.c#6 integrate .. //depot/projects/hammer/lib/libc/stdio/findfp.c#7 integrate .. //depot/projects/hammer/lib/libc/stdio/fputwc.c#7 integrate .. //depot/projects/hammer/lib/libc/stdio/freopen.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fseek.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/getwc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/getwchar.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/local.h#10 integrate .. //depot/projects/hammer/lib/libc/stdio/putwc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/putwchar.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.c#7 integrate .. //depot/projects/hammer/lib/libc/sys/mlock.2#5 integrate .. //depot/projects/hammer/lib/libipx/ipx_ntoa.c#2 integrate .. //depot/projects/hammer/lib/libmilter/Makefile#3 integrate .. //depot/projects/hammer/lib/libsm/Makefile#3 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_barrier.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#11 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#11 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#18 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#15 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#5 integrate .. //depot/projects/hammer/lib/libutil/Makefile#7 integrate .. //depot/projects/hammer/lib/libutil/humanize_number.3#1 branch .. //depot/projects/hammer/lib/libutil/humanize_number.c#1 branch .. //depot/projects/hammer/lib/libutil/libutil.h#4 integrate .. //depot/projects/hammer/lib/liby/main.c#2 integrate .. //depot/projects/hammer/lib/msun/Makefile#8 integrate .. //depot/projects/hammer/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cimag.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_cimagf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_cimagl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_conj.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_conjf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_conjl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_creal.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_crealf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_creall.c#1 branch .. //depot/projects/hammer/libexec/rbootd/rmpproto.c#2 integrate .. //depot/projects/hammer/libexec/rbootd/utils.c#2 integrate .. //depot/projects/hammer/libexec/rexecd/rexecd.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#13 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#20 integrate .. //depot/projects/hammer/libexec/tftpd/tftpd.8#2 integrate .. //depot/projects/hammer/libexec/tftpd/tftpd.c#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#70 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/catalog#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl#1 branch .. //depot/projects/hammer/release/scripts/src-install.sh#2 integrate .. //depot/projects/hammer/sbin/Makefile#26 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#11 integrate .. //depot/projects/hammer/sbin/dump/optr.c#7 integrate .. //depot/projects/hammer/sbin/gbde/gbde.8#7 integrate .. //depot/projects/hammer/sbin/gconcat/Makefile#3 delete .. //depot/projects/hammer/sbin/gconcat/gconcat.8#3 delete .. //depot/projects/hammer/sbin/gconcat/gconcat.c#4 delete .. //depot/projects/hammer/sbin/geom/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/Makefile.inc#1 branch .. //depot/projects/hammer/sbin/geom/class/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/Makefile.inc#1 branch .. //depot/projects/hammer/sbin/geom/class/concat/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#1 branch .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#1 branch .. //depot/projects/hammer/sbin/geom/class/nop/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#1 branch .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#1 branch .. //depot/projects/hammer/sbin/geom/class/stripe/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#1 branch .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#1 branch .. //depot/projects/hammer/sbin/geom/core/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/core/geom.8#1 branch .. //depot/projects/hammer/sbin/geom/core/geom.c#1 branch .. //depot/projects/hammer/sbin/geom/core/geom.h#1 branch .. //depot/projects/hammer/sbin/geom/misc/subr.c#1 branch .. //depot/projects/hammer/sbin/geom/misc/subr.h#1 branch .. //depot/projects/hammer/sbin/ggate/Makefile.inc#1 branch .. //depot/projects/hammer/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/hammer/sbin/ggate/ggated/Makefile#2 integrate .. //depot/projects/hammer/sbin/ggate/ggatel/Makefile#2 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#22 integrate .. //depot/projects/hammer/sbin/kldstat/kldstat.c#5 integrate .. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.c#4 integrate .. //depot/projects/hammer/sbin/restore/dirs.c#5 integrate .. //depot/projects/hammer/sbin/restore/extern.h#3 integrate .. //depot/projects/hammer/sbin/restore/interactive.c#6 integrate .. //depot/projects/hammer/sbin/restore/tape.c#4 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.8#5 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.8#3 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#7 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#12 integrate .. //depot/projects/hammer/sbin/vinum/vinum.8#9 integrate .. //depot/projects/hammer/share/examples/cvsup/cvs-supfile#8 integrate .. //depot/projects/hammer/share/examples/cvsup/doc-supfile#3 integrate .. //depot/projects/hammer/share/examples/cvsup/gnats-supfile#3 integrate .. //depot/projects/hammer/share/examples/cvsup/ports-supfile#7 integrate .. //depot/projects/hammer/share/examples/cvsup/stable-supfile#3 integrate .. //depot/projects/hammer/share/examples/cvsup/standard-supfile#3 integrate .. //depot/projects/hammer/share/examples/cvsup/www-supfile#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#39 integrate .. //depot/projects/hammer/share/man/man4/bge.4#7 integrate .. //depot/projects/hammer/share/man/man4/bpf.4#4 integrate .. //depot/projects/hammer/share/man/man4/cy.4#1 branch .. //depot/projects/hammer/share/man/man4/ixgb.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#22 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cy.4#3 delete .. //depot/projects/hammer/share/man/man4/ng_tee.4#2 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#5 integrate .. //depot/projects/hammer/share/man/man5/Makefile#9 integrate .. //depot/projects/hammer/share/man/man5/eui64.5#1 branch .. //depot/projects/hammer/share/man/man5/libmap.conf.5#5 integrate .. //depot/projects/hammer/share/man/man5/periodic.conf.5#5 integrate .. //depot/projects/hammer/share/man/man7/hier.7#15 integrate .. //depot/projects/hammer/share/man/man9/Makefile#34 integrate .. //depot/projects/hammer/share/man/man9/bpf.9#1 branch .. //depot/projects/hammer/share/man/man9/mbuf.9#14 integrate .. //depot/projects/hammer/share/man/man9/mbuf_tags.9#1 branch .. //depot/projects/hammer/share/man/man9/zero_copy.9#5 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#16 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#17 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#69 integrate .. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/support.S#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#42 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_exception.S#4 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#17 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#19 integrate .. //depot/projects/hammer/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosacpi.c#6 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/serial_16550.S#4 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/serial_8251.S#4 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/btxldr.S#4 integrate .. //depot/projects/hammer/sys/coda/coda_fbsd.c#7 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/hammer/sys/conf/NOTES#44 integrate .. //depot/projects/hammer/sys/conf/files#58 integrate .. //depot/projects/hammer/sys/conf/files.amd64#47 integrate .. //depot/projects/hammer/sys/conf/files.i386#32 integrate .. //depot/projects/hammer/sys/conf/files.pc98#30 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#22 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#27 integrate .. //depot/projects/hammer/sys/conf/ldscript.amd64#6 integrate .. //depot/projects/hammer/sys/conf/options#39 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdebug.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdispat.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acefi.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acevents.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/achware.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acnamesp.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acparser.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpixf.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acstruct.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evevent.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfevnt.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfregn.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsparse.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfeval.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfname.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psxface.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsxface.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utxface.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#9 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#21 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#7 integrate .. //depot/projects/hammer/sys/dev/aac/aac_disk.c#8 integrate .. //depot/projects/hammer/sys/dev/aac/aac_linux.c#3 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/aac/aacvar.h#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#33 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_button.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#19 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_isab.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_lid.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#15 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#26 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/aic/aic_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.h#9 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#11 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#10 integrate .. //depot/projects/hammer/sys/dev/amr/amr_disk.c#10 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#17 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#10 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#5 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#26 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#12 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#19 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#31 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#16 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.c#10 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_mem.c#3 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#12 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#12 integrate .. //depot/projects/hammer/sys/dev/ciss/cissreg.h#7 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#9 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#12 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#3 integrate .. //depot/projects/hammer/sys/dev/cy/cy_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#4 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#7 integrate .. //depot/projects/hammer/sys/dev/digi/digi_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/digi/digi_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#17 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#25 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#17 integrate .. //depot/projects/hammer/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#13 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#10 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/fb/splash.c#3 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#12 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#26 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.h#8 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#15 integrate .. //depot/projects/hammer/sys/dev/firewire/fwcrom.c#8 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#14 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.h#6 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#23 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#23 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcireg.h#10 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#8 integrate .. //depot/projects/hammer/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/hammer/sys/dev/firewire/iec13213.h#7 integrate .. //depot/projects/hammer/sys/dev/firewire/iec68113.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#17 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#28 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.h#4 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#31 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#9 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#11 integrate .. //depot/projects/hammer/sys/dev/gx/if_gx.c#11 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#11 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#9 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_sbus.c#6 integrate .. //depot/projects/hammer/sys/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/hammer/sys/dev/ida/ida_disk.c#8 integrate .. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#8 integrate .. //depot/projects/hammer/sys/dev/ida/ida_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#16 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbus.c#5 integrate .. //depot/projects/hammer/sys/dev/ips/ips.c#9 integrate .. //depot/projects/hammer/sys/dev/ips/ips.h#9 integrate .. //depot/projects/hammer/sys/dev/ips/ips_commands.c#10 integrate .. //depot/projects/hammer/sys/dev/ips/ips_ioctl.c#5 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#12 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/hammer/sys/dev/isp/isp_inline.h#4 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.c#7 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#8 integrate .. //depot/projects/hammer/sys/dev/ispfw/ispfw.c#5 integrate .. //depot/projects/hammer/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/hammer/sys/dev/ixgb/README#1 branch .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/hammer/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/hammer/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/hammer/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/hammer/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/hammer/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/hammer/sys/dev/joy/joy_pccard.c#3 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#15 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#15 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/mii/acphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/amphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/bmtphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#14 integrate .. //depot/projects/hammer/sys/dev/mii/dcphy.c#8 integrate .. //depot/projects/hammer/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/exphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/inphy.c#5 integrate .. //depot/projects/hammer/sys/dev/mii/lxtphy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/mii.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/mii_physubr.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/nsgphy.c#8 integrate .. //depot/projects/hammer/sys/dev/mii/nsphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/pnaphy.c#8 integrate .. //depot/projects/hammer/sys/dev/mii/pnphy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/qsphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/hammer/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/ruephy.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/tdkphy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/tlphy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/ukphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/ukphy_subr.c#4 integrate .. //depot/projects/hammer/sys/dev/mii/xmphy.c#8 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_disk.c#7 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/musycc/musycc.c#8 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#14 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#17 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#9 integrate .. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#8 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirmio.c#8 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirmio.h#4 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#7 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/pccard/Makefile.pccarddevs#3 delete .. //depot/projects/hammer/sys/dev/pccard/card_if.m#5 integrate .. //depot/projects/hammer/sys/dev/pccard/devlist2h.awk#3 delete .. //depot/projects/hammer/sys/dev/pccard/pccard_cis_quirks.c#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#25 delete .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#11 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#27 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/hammer/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/hammer/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/hammer/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/hammer/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/hammer/sys/dev/pci/eisa_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/pci/fixup_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/pci/ignore_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/pci/isa_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#20 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#7 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/random/randomdev.c#14 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#10 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#7 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#13 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#8 integrate .. //depot/projects/hammer/sys/dev/rp/rp_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/rp/rp_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/safe/safe.c#5 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#12 integrate .. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/hammer/sys/dev/si/si.c#6 integrate .. //depot/projects/hammer/sys/dev/si/si_eisa.c#4 integrate .. //depot/projects/hammer/sys/dev/si/si_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/si/si_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#31 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#15 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#8 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/isa/emu8000.c#2 delete .. //depot/projects/hammer/sys/dev/sound/isa/gusmidi.c#3 delete .. //depot/projects/hammer/sys/dev/sound/isa/mpu.c#5 delete .. //depot/projects/hammer/sys/dev/sound/isa/opl.c#2 delete .. //depot/projects/hammer/sys/dev/sound/isa/uartsio.c#5 delete .. //depot/projects/hammer/sys/dev/sound/midi/midi.c#4 delete .. //depot/projects/hammer/sys/dev/sound/midi/midi.h#4 delete .. //depot/projects/hammer/sys/dev/sound/midi/midibuf.c#4 delete .. //depot/projects/hammer/sys/dev/sound/midi/midibuf.h#2 delete .. //depot/projects/hammer/sys/dev/sound/midi/midisynth.c#2 delete .. //depot/projects/hammer/sys/dev/sound/midi/midisynth.h#2 delete .. //depot/projects/hammer/sys/dev/sound/midi/miditypes.h#2 delete .. //depot/projects/hammer/sys/dev/sound/midi/sequencer.c#4 delete .. //depot/projects/hammer/sys/dev/sound/midi/sequencer.h#2 delete .. //depot/projects/hammer/sys/dev/sound/midi/timer.c#3 delete .. //depot/projects/hammer/sys/dev/sound/midi/timer.h#2 delete .. //depot/projects/hammer/sys/dev/sound/pci/csamidi.c#4 delete .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#11 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#9 integrate .. //depot/projects/hammer/sys/dev/sx/sx.c#2 integrate .. //depot/projects/hammer/sys/dev/sx/sx_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-sc.c#4 integrate .. //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#16 integrate .. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#5 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#15 integrate .. //depot/projects/hammer/sys/dev/twa/twa_includes.h#3 integrate .. //depot/projects/hammer/sys/dev/twe/twe_compat.h#7 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#15 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/if_auereg.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/if_cuereg.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/if_kuereg.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_ruereg.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/umct.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usb.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#34 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#33 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#33 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi_util.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#9 integrate .. //depot/projects/hammer/sys/dev/utopia/utopia.c#5 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#12 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#20 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#13 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#16 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#10 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#17 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.h#5 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#24 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel_enc.c#3 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/hammer/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/hammer/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_toshiba.c#6 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#11 integrate .. //depot/projects/hammer/sys/i386/bios/apm.c#7 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#23 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#10 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#8 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/mp_clock.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/mptable.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#33 integrate .. //depot/projects/hammer/sys/i386/i386/support.s#10 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#29 integrate .. //depot/projects/hammer/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/hammer/sys/i386/include/profile.h#9 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#11 integrate .. //depot/projects/hammer/sys/i386/isa/atpic_vector.s#9 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#17 integrate .. //depot/projects/hammer/sys/i386/isa/if_el.c#8 integrate .. //depot/projects/hammer/sys/i386/isa/mse.c#7 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#8 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_hdr.h#4 integrate .. //depot/projects/hammer/sys/i386/isa/pmtimer.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/spic.c#8 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#16 integrate .. //depot/projects/hammer/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ing.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_isa.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_pnp.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/isa/atkbd_isa.c#5 integrate .. //depot/projects/hammer/sys/isa/atkbdc_isa.c#6 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#1 branch .. //depot/projects/hammer/sys/kern/kern_proc.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#48 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#17 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#21 delete .. //depot/projects/hammer/sys/kern/subr_prof.c#9 integrate .. //depot/projects/hammer/sys/kern/sysv_msg.c#8 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#14 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#12 integrate .. //depot/projects/hammer/sys/kern/tty.c#13 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_accf.c#4 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#16 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#10 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#16 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#18 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#38 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#15 integrate .. //depot/projects/hammer/sys/modules/aic/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/an/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/awi/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/cs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ed/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ep/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/ex/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/exca/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/fdc/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/fe/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/geom/geom_nop/Makefile#1 branch .. //depot/projects/hammer/sys/modules/geom/geom_stripe/Makefile#1 branch .. //depot/projects/hammer/sys/modules/if_ndis/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ixgb/Makefile#1 branch .. //depot/projects/hammer/sys/modules/joy/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bt3c/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/oldcard/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/owi/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/pcic/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ray/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sio/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/sn/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/splash/bmp/splash_bmp.c#4 integrate .. //depot/projects/hammer/sys/modules/splash/pcx/splash_pcx.c#3 integrate .. //depot/projects/hammer/sys/modules/stg/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/uart/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/wi/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/xe/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bpf.h#10 integrate .. //depot/projects/hammer/sys/net/bridge.c#13 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#11 integrate .. //depot/projects/hammer/sys/net/if_ef.c#8 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/hammer/sys/net/if_faith.c#12 integrate .. //depot/projects/hammer/sys/net/if_gif.c#13 integrate .. //depot/projects/hammer/sys/net/if_gre.c#15 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#11 integrate .. //depot/projects/hammer/sys/net/if_stf.c#13 integrate .. //depot/projects/hammer/sys/net/if_tap.c#13 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/hammer/sys/netgraph/atm/atmpif/ng_atmpif.c#2 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#8 integrate .. //depot/projects/hammer/sys/netgraph/atm/sscfu/ng_sscfu.c#3 integrate .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop.c#2 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni.c#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/common/ng_bluetooth.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#11 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#9 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#9 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_UI.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_echo.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_etf.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_frame_relay.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif_demux.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_hole.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_ip_input.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_lmi.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_rfc1490.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_tee.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_vjc.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/hammer/sys/netinet/accf_data.c#2 integrate .. //depot/projects/hammer/sys/netinet/accf_http.c#2 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#24 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#27 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#15 integrate .. //depot/projects/hammer/sys/netinet6/ip6_fw.c#8 integrate .. //depot/projects/hammer/sys/netncp/ncp_mod.c#6 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#6 integrate .. //depot/projects/hammer/sys/netsmb/smb_rq.c#7 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#7 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#13 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvcache.c#5 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#9 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#11 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#12 integrate .. //depot/projects/hammer/sys/nfsserver/nfsm_subs.h#4 integrate .. //depot/projects/hammer/sys/opencrypto/crypto.c#9 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#11 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#17 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#20 integrate .. //depot/projects/hammer/sys/pci/agp.c#13 integrate .. //depot/projects/hammer/sys/pci/agp_ali.c#9 integrate .. //depot/projects/hammer/sys/pci/agp_amd.c#10 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#15 integrate .. //depot/projects/hammer/sys/pci/agp_intel.c#12 integrate .. //depot/projects/hammer/sys/pci/agp_nvidia.c#3 integrate .. //depot/projects/hammer/sys/pci/agp_sis.c#10 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#10 integrate .. //depot/projects/hammer/sys/pci/agppriv.h#2 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#33 integrate .. //depot/projects/hammer/sys/pci/if_de.c#14 integrate .. //depot/projects/hammer/sys/pci/if_mn.c#8 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#18 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#33 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#19 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#26 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#26 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#25 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#20 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#17 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#20 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#18 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#36 integrate .. //depot/projects/hammer/sys/pci/ncr.c#11 integrate .. //depot/projects/hammer/sys/pci/xrpu.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#18 integrate .. //depot/projects/hammer/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/hammer/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/hammer/sys/sparc64/include/atomic.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/cpufunc.h#5 integrate .. //depot/projects/hammer/sys/sparc64/include/pcpu.h#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#25 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/swtch.S#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#16 integrate .. //depot/projects/hammer/sys/sys/ata.h#8 integrate .. //depot/projects/hammer/sys/sys/bus.h#10 integrate .. //depot/projects/hammer/sys/sys/conf.h#11 integrate .. //depot/projects/hammer/sys/sys/eui64.h#1 branch .. //depot/projects/hammer/sys/sys/mbuf.h#23 integrate .. //depot/projects/hammer/sys/sys/proc.h#50 integrate .. //depot/projects/hammer/sys/sys/rman.h#3 integrate .. //depot/projects/hammer/sys/sys/socket.h#12 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#13 integrate .. //depot/projects/hammer/sys/sys/sun_disklabel.h#7 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#16 integrate .. //depot/projects/hammer/sys/sys/tty.h#5 integrate .. //depot/projects/hammer/sys/tools/devlist2h.awk#2 delete .. //depot/projects/hammer/sys/tools/miidevs2h.awk#1 branch .. //depot/projects/hammer/sys/tools/pccarddevs2h.awk#1 branch .. //depot/projects/hammer/sys/tools/usbdevs2h.awk#1 branch .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#21 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#7 integrate .. //depot/projects/hammer/sys/vm/uma.h#6 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#24 integrate .. //depot/projects/hammer/sys/vm/uma_dbg.c#7 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#10 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#12 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#19 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#19 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#35 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#38 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#27 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#15 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#7 integrate .. //depot/projects/hammer/tools/regression/geom_nop/Makefile#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/runtests.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/test-1.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/test-2.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/Makefile#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/runtests.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/test-1.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/test-2.sh#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/Makefile#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64.h#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_aton.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_line.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/net/test-eui64_ntoa.c#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#5 integrate .. //depot/projects/hammer/usr.bin/calendar/calendar.h#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.birthday#9 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag#1 branch .. //depot/projects/hammer/usr.bin/du/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/du/du.c#6 integrate .. //depot/projects/hammer/usr.bin/find/extern.h#4 integrate .. //depot/projects/hammer/usr.bin/find/find.1#10 integrate .. //depot/projects/hammer/usr.bin/find/find.c#4 integrate .. //depot/projects/hammer/usr.bin/find/find.h#2 integrate .. //depot/projects/hammer/usr.bin/find/function.c#5 integrate .. //depot/projects/hammer/usr.bin/find/option.c#6 integrate .. //depot/projects/hammer/usr.bin/gprof/aout.c#3 integrate .. //depot/projects/hammer/usr.bin/gprof/gprof.c#4 integrate .. //depot/projects/hammer/usr.bin/gprof/kernel.c#2 integrate .. //depot/projects/hammer/usr.bin/gprof/printgprof.c#3 integrate .. //depot/projects/hammer/usr.bin/gprof/printlist.c#3 integrate .. //depot/projects/hammer/usr.bin/id/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/id/id.c#4 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.8#2 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#5 integrate .. //depot/projects/hammer/usr.bin/lastcomm/lastcomm.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#8 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#7 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.1#9 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#7 integrate .. //depot/projects/hammer/usr.bin/rusers/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/rusers/rusers.c#3 integrate .. //depot/projects/hammer/usr.bin/systat/mbufs.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#5 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#7 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#5 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#5 integrate .. //depot/projects/hammer/usr.bin/units/units.lib#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#49 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi_user.c#7 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.h#7 integrate .. //depot/projects/hammer/usr.sbin/apm/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/apm/apm.c#6 integrate .. //depot/projects/hammer/usr.sbin/arlconfig/Makefile#3 delete .. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.8#4 delete .. //depot/projects/hammer/usr.sbin/arlconfig/arlconfig.c#4 delete .. //depot/projects/hammer/usr.sbin/arlcontrol/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/arlcontrol/arlcontrol.8#2 integrate .. //depot/projects/hammer/usr.sbin/atm/scspd/scspd.c#2 integrate .. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_aout.c#2 integrate .. //depot/projects/hammer/usr.sbin/dconschat/dconschat.8#3 integrate .. //depot/projects/hammer/usr.sbin/dconschat/dconschat.c#5 integrate .. //depot/projects/hammer/usr.sbin/diskinfo/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/hammer/usr.sbin/edquota/edquota.8#5 integrate .. //depot/projects/hammer/usr.sbin/eeprom/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/eeprom/eeprom.8#1 branch .. //depot/projects/hammer/usr.sbin/eeprom/eeprom.c#1 branch .. //depot/projects/hammer/usr.sbin/eeprom/ofw_options.c#1 branch .. //depot/projects/hammer/usr.sbin/eeprom/ofw_options.h#1 branch .. //depot/projects/hammer/usr.sbin/fdwrite/fdwrite.c#2 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#9 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.c#4 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#11 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.c#6 integrate .. //depot/projects/hammer/usr.sbin/kernbb/kernbb.c#6 integrate .. //depot/projects/hammer/usr.sbin/kgmon/kgmon.8#3 integrate .. //depot/projects/hammer/usr.sbin/kldxref/kldxref.8#4 integrate .. //depot/projects/hammer/usr.sbin/kldxref/kldxref.c#5 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/activate.c#2 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/conf.c#2 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.c#2 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_conf.c#2 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_exec.c#2 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_file.c#2 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_tcp.c#2 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_tcplisten.c#2 integrate .. //depot/projects/hammer/usr.sbin/mrouted/testrsrr/testrsrr.c#2 integrate .. //depot/projects/hammer/usr.sbin/ofwdump/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ofwdump/ofw_util.c#5 integrate .. //depot/projects/hammer/usr.sbin/ofwdump/ofw_util.h#3 integrate .. //depot/projects/hammer/usr.sbin/ofwdump/ofwdump.8#4 integrate .. //depot/projects/hammer/usr.sbin/ofwdump/ofwdump.c#2 integrate .. //depot/projects/hammer/usr.sbin/pccard/pccardd/pccard.conf.5#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#5 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/yp_dbupdate.c#3 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/ypupdated_main.c#3 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#3 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/sliplogin/sliplogin.c#2 integrate .. //depot/projects/hammer/usr.sbin/smbmsg/smbmsg.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#24 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslog.conf.5#5 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#13 integrate .. //depot/projects/hammer/usr.sbin/usbdevs/usbdevs.8#2 integrate .. //depot/projects/hammer/usr.sbin/usbdevs/usbdevs.c#2 integrate .. //depot/projects/hammer/usr.sbin/watch/watch.c#6 integrate .. //depot/projects/hammer/usr.sbin/yppoll/yppoll.c#3 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#23 (text+ko) ==== @@ -1,4 +1,4 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 1 15:08:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 256BF16A4D0; Tue, 1 Jun 2004 15:08:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC35C16A4CE for ; Tue, 1 Jun 2004 15:08:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA27443D1D for ; Tue, 1 Jun 2004 15:08:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i51M8Arc012513 for ; Tue, 1 Jun 2004 15:08:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i51M8A0v012510 for perforce@freebsd.org; Tue, 1 Jun 2004 15:08:10 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 1 Jun 2004 15:08:10 -0700 (PDT) Message-Id: <200406012208.i51M8A0v012510@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 53981 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, 01 Jun 2004 22:08:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=53981 Change 53981 by peter@peter_daintree on 2004/06/01 15:07:53 IFC @53975 Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#70 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#43 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#42 integrate .. //depot/projects/hammer/sys/amd64/include/_stdint.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#18 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#41 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#20 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#24 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#20 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#33 (text+ko) ==== @@ -67,8 +67,8 @@ struct lapic_info { u_int la_present:1; u_int la_enabled:1; - u_int la_apic_id:8; -} lapics[NLAPICS + 1]; + u_int la_acpi_id:8; +} lapics[NLAPICS]; static int madt_found_sci_override; static MULTIPLE_APIC_TABLE *madt; @@ -447,14 +447,14 @@ printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", proc->LocalApicId, proc->ProcessorId, proc->ProcessorEnabled ? "enabled" : "disabled"); - if (proc->ProcessorId > NLAPICS) + if (proc->LocalApicId >= NLAPICS) panic("%s: CPU ID %d too high", __func__, - proc->ProcessorId); - la = &lapics[proc->ProcessorId]; + proc->LocalApicId); + la = &lapics[proc->LocalApicId]; KASSERT(la->la_present == 0, - ("Duplicate local ACPI ID %d", proc->ProcessorId)); + ("Duplicate local APIC ID %d", proc->LocalApicId)); la->la_present = 1; - la->la_apic_id = proc->LocalApicId; + la->la_acpi_id = proc->ProcessorId; if (proc->ProcessorEnabled) { la->la_enabled = 1; lapic_create(proc->LocalApicId, 0); @@ -545,14 +545,20 @@ static int madt_find_cpu(u_int acpi_id, u_int *apic_id) { + int i; - if (!lapics[acpi_id].la_present) - return (ENOENT); - *apic_id = lapics[acpi_id].la_apic_id; - if (lapics[acpi_id].la_enabled) - return (0); - else - return (ENXIO); + for (i = 0; i < NLAPICS; i++) { + if (!lapics[i].la_present) + continue; + if (lapics[i].la_acpi_id != acpi_id) + continue; + *apic_id = i; + if (lapics[i].la_enabled) + return (0); + else + return (ENXIO); + } + return (ENOENT); } /* @@ -752,8 +758,9 @@ static void madt_set_ids(void *dummy) { + struct lapic_info *la; struct pcpu *pc; - u_int i, j; + u_int i; if (madt == NULL) return; @@ -762,19 +769,14 @@ continue; pc = pcpu_find(i); KASSERT(pc != NULL, ("no pcpu data for CPU %d", i)); - for (j = 0; j < NLAPICS + 1; j++) { - if (!lapics[j].la_present || !lapics[j].la_enabled) - continue; - if (lapics[j].la_apic_id == pc->pc_apic_id) { - pc->pc_acpi_id = j; - if (bootverbose) - printf("APIC: CPU %u has ACPI ID %u\n", - i, j); - break; - } - } - if (j == NLAPICS + 1) - panic("Unable to find ACPI ID for CPU %d", i); + la = &lapics[pc->pc_apic_id]; + if (!la->la_present || !la->la_enabled) + panic("APIC: CPU with APIC ID %u is not enabled", + pc->pc_apic_id); + pc->pc_acpi_id = la->la_acpi_id; + if (bootverbose) + printf("APIC: CPU %u has ACPI ID %u\n", i, + la->la_acpi_id); } } SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL) ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#22 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#30 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#35 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#29 (text+ko) ==== @@ -90,7 +90,10 @@ static char cpu_brand[48]; -static struct cpu_nameclass amd64_cpus[] = { +static struct { + char *cpu_name; + int cpu_class; +} amd64_cpus[] = { { "Clawhammer", CPUCLASS_K8 }, /* CPU_CLAWHAMMER */ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#20 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#26 (text+ko) ==== @@ -126,6 +126,7 @@ static void ioapic_suspend(struct intsrc *isrc); static void ioapic_resume(struct intsrc *isrc); static void ioapic_program_destination(struct ioapic_intsrc *intpin); +static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static void ioapic_setup_mixed_mode(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -135,7 +136,7 @@ ioapic_suspend, ioapic_resume, ioapic_config_intr }; -static int current_cluster, logical_clusters, next_ioapic_base; +static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; static u_int mixed_mode_enabled, next_id, program_logical_dest; #if defined(NO_MIXED_MODE) || !defined(DEV_ATPIC) static int mixed_mode_active = 0; @@ -208,13 +209,88 @@ } /* + * Completely program an intpin based on the data in its interrupt source + * structure. + */ +static void +ioapic_program_intpin(struct ioapic_intsrc *intpin) +{ + struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; + uint32_t low, high, value; + + /* + * For pins routed via mixed mode or disabled, just ensure that + * they are masked. + */ + if (intpin->io_dest == DEST_EXTINT || + intpin->io_vector == VECTOR_DISABLED) { + low = ioapic_read(io->io_addr, + IOAPIC_REDTBL_LO(intpin->io_intpin)); + if ((low & IOART_INTMASK) == IOART_INTMCLR) + ioapic_write(io->io_addr, + IOAPIC_REDTBL_LO(intpin->io_intpin), + low | IOART_INTMSET); + return; + } + + /* Set the destination. */ + if (intpin->io_dest == DEST_NONE) { + low = IOART_DESTPHY; + high = bsp_id << APIC_ID_SHIFT; + } else { + low = IOART_DESTLOG; + high = (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | + APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; + } + + /* Program the rest of the low word. */ + if (intpin->io_edgetrigger) + low |= IOART_TRGREDG; + else + low |= IOART_TRGRLVL; + if (intpin->io_activehi) + low |= IOART_INTAHI; + else + low |= IOART_INTALO; + if (intpin->io_masked) + low |= IOART_INTMSET; + switch (intpin->io_vector) { + case VECTOR_EXTINT: + KASSERT(intpin->io_edgetrigger, + ("EXTINT not edge triggered")); + low |= IOART_DELEXINT; + break; + case VECTOR_NMI: + KASSERT(intpin->io_edgetrigger, + ("NMI not edge triggered")); + low |= IOART_DELNMI; + break; + case VECTOR_SMI: + KASSERT(intpin->io_edgetrigger, + ("SMI not edge triggered")); + low |= IOART_DELSMI; + break; + default: + low |= IOART_DELLOPRI | apic_irq_to_idt(intpin->io_vector); + } + + /* Write the values to the APIC. */ + mtx_lock_spin(&icu_lock); + ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); + value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); + value &= ~IOART_DEST; + value |= high; + ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), value); + mtx_unlock_spin(&icu_lock); +} + +/* * Program an individual intpin's logical destination. */ static void ioapic_program_destination(struct ioapic_intsrc *intpin) { struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; - uint32_t value; KASSERT(intpin->io_dest != DEST_NONE, ("intpin not assigned to a cluster")); @@ -229,17 +305,7 @@ printf("IRQ %u", intpin->io_vector); printf(") to cluster %u\n", intpin->io_dest); } - mtx_lock_spin(&icu_lock); - value = ioapic_read(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin)); - value &= ~IOART_DESTMOD; - value |= IOART_DESTLOG; - ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), value); - value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); - value &= ~IOART_DEST; - value |= (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | - APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; - ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), value); - mtx_unlock_spin(&icu_lock); + ioapic_program_intpin(intpin); } static void @@ -339,7 +405,7 @@ ioapic_resume(struct intsrc *isrc) { - TODO; + ioapic_program_intpin((struct ioapic_intsrc *)isrc); } /* @@ -631,6 +697,7 @@ printf("ioapic%u irqs %u-%u on motherboard\n", io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); + bsp_id = PCPU_GET(apic_id); for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) { /* * Finish initializing the pins by programming the vectors @@ -638,63 +705,18 @@ */ if (pin->io_vector == VECTOR_DISABLED) continue; - flags = IOART_DESTPHY; - if (pin->io_edgetrigger) - flags |= IOART_TRGREDG; - else - flags |= IOART_TRGRLVL; - if (pin->io_activehi) - flags |= IOART_INTAHI; - else - flags |= IOART_INTALO; - if (pin->io_masked) - flags |= IOART_INTMSET; - switch (pin->io_vector) { - case VECTOR_EXTINT: - KASSERT(pin->io_edgetrigger, - ("EXTINT not edge triggered")); - flags |= IOART_DELEXINT; - break; - case VECTOR_NMI: - KASSERT(pin->io_edgetrigger, - ("NMI not edge triggered")); - flags |= IOART_DELNMI; - break; - case VECTOR_SMI: - KASSERT(pin->io_edgetrigger, - ("SMI not edge triggered")); - flags |= IOART_DELSMI; - break; - default: - flags |= IOART_DELLOPRI | - apic_irq_to_idt(pin->io_vector); - } - mtx_lock_spin(&icu_lock); - ioapic_write(apic, IOAPIC_REDTBL_LO(i), flags); - + ioapic_program_intpin(pin); + if (pin->io_vector >= NUM_IO_INTS) + continue; /* - * Route interrupts to the BSP by default using physical - * addressing. Vectored interrupts get readdressed using - * logical IDs to CPU clusters when they are enabled. + * Route IRQ0 via the 8259A using mixed mode if mixed mode + * is available and turned on. */ - flags = ioapic_read(apic, IOAPIC_REDTBL_HI(i)); - flags &= ~IOART_DEST; - flags |= PCPU_GET(apic_id) << APIC_ID_SHIFT; - ioapic_write(apic, IOAPIC_REDTBL_HI(i), flags); - mtx_unlock_spin(&icu_lock); - if (pin->io_vector < NUM_IO_INTS) { - - /* - * Route IRQ0 via the 8259A using mixed mode if - * mixed mode is available and turned on. - */ - if (pin->io_vector == 0 && mixed_mode_active && - mixed_mode_enabled) - ioapic_setup_mixed_mode(pin); - else - intr_register_source(&pin->io_intsrc); - } - + if (pin->io_vector == 0 && mixed_mode_active && + mixed_mode_enabled) + ioapic_setup_mixed_mode(pin); + else + intr_register_source(&pin->io_intsrc); } } ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#11 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -221,17 +222,19 @@ atdev = malloc(sizeof(struct legacy_device), M_LEGACYDEV, M_NOWAIT | M_ZERO); - if (!atdev) - return(0); + if (atdev == NULL) + return(NULL); resource_list_init(&atdev->lg_resources); atdev->lg_pcibus = -1; - child = device_add_child_ordered(bus, order, name, unit); + child = device_add_child_ordered(bus, order, name, unit); + if (child == NULL) + free(atdev, M_LEGACYDEV); + else + /* should we free this in legacy_child_detached? */ + device_set_ivars(child, atdev); - /* should we free this in legacy_child_detached? */ - device_set_ivars(child, atdev); - - return(child); + return (child); } static int ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#19 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#26 (text+ko) ==== @@ -544,15 +544,10 @@ KASSERT(src_bus <= mptable_maxbusid, ("bus id %d too large", src_bus)); switch (busses[src_bus].bus_type) { case ISA: + case EISA: return (INTR_POLARITY_HIGH); case PCI: return (INTR_POLARITY_LOW); - case EISA: - KASSERT(src_bus_irq < 16, ("Invalid EISA IRQ %d", src_bus_irq)); - if (elcr_read_trigger(src_bus_irq) == INTR_TRIGGER_LEVEL) - return (INTR_POLARITY_LOW); - else - return (INTR_POLARITY_HIGH); default: panic("%s: unknown bus type %d", __func__, busses[src_bus].bus_type); ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#23 (text+ko) ==== @@ -481,8 +481,6 @@ struct resource_list_entry *rle; rle = resource_list_find(rl, type, rid); - device_printf(child, "type %d rid %d startp %p countp %p - got %p\n", - type, rid, startp, countp, rle); if (!rle) return(ENOENT); if (startp) ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#70 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/support.S#24 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#43 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include +#include #include #include ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#42 (text+ko) ==== @@ -176,6 +176,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card +device ixgb # Intel PRO/10GbE Ethernet Card device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/hammer/sys/amd64/include/_stdint.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#7 (text+ko) ==== @@ -44,11 +44,6 @@ #define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ #ifndef LOCORE -struct cpu_nameclass { - char *cpu_name; - int cpu_class; -}; - extern int cpu; extern int cpu_class; #endif ==== //depot/projects/hammer/sys/amd64/include/profile.h#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#41 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#20 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#24 (text+ko) ==== @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#20 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Tue Jun 1 21:42:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4810D16A4D0; Tue, 1 Jun 2004 21:42:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FBDB16A4CE for ; Tue, 1 Jun 2004 21:42:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A67A43D41 for ; Tue, 1 Jun 2004 21:42:35 -0700 (PDT) (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.11/8.12.11) with ESMTP id i524gZPZ022328 for ; Tue, 1 Jun 2004 21:42:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i524gYQa022316 for perforce@freebsd.org; Tue, 1 Jun 2004 21:42:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 1 Jun 2004 21:42:34 -0700 (PDT) Message-Id: <200406020442.i524gYQa022316@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 54002 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, 02 Jun 2004 04:42:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=54002 Change 54002 by rwatson@rwatson_tislabs on 2004/06/01 21:42:06 Integrate netperf_socket: various changes, including removal of midi code, ttyioctl() centralization, fixups for vn_closefile(), but in particular, the loop back of accept locking from rwatson_netperf to CVS. This may leave netperf_socket in a somewhat less usable state as changes are merged that were made after netperf_socket was created. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#14 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#17 integrate .. //depot/projects/netperf_socket/sys/conf/files#23 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/emu8000.c#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/isa/gusmidi.c#3 delete .. //depot/projects/netperf_socket/sys/dev/sound/isa/mpu.c#3 delete .. //depot/projects/netperf_socket/sys/dev/sound/isa/opl.c#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/isa/uartsio.c#3 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/midi.c#3 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/midi.h#3 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/midibuf.c#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/midibuf.h#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/midisynth.c#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/midisynth.h#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/miditypes.h#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/sequencer.c#3 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/sequencer.h#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/timer.c#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/midi/timer.h#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/pci/csamidi.c#3 delete .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom_sunlabel_enc.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_drv.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_accf.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tee.c#5 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#7 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/sun_disklabel.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.36 2004/02/28 16:36:14 kensmith Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.37 2004/06/01 13:49:25 phk Exp $"); #include #include @@ -61,13 +61,11 @@ static d_open_t promopen; static d_close_t promclose; -static d_ioctl_t promioctl; static struct cdevsw prom_cdevsw = { .d_version = D_VERSION, .d_open = promopen, .d_close = promclose, - .d_ioctl = promioctl, .d_name = "prom", .d_flags = D_TTY | D_NEEDGIANT, }; @@ -156,31 +154,6 @@ } int -promioctl(dev, cmd, data, flag, td) - dev_t dev; - u_long cmd; - caddr_t data; - int flag; - struct thread *td; -{ - int unit = minor(dev); - struct tty *tp = prom_tp; - int error; - - if (unit != 0) - return ENXIO; - - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) - return error; - error = ttioctl(tp, cmd, data, flag); - if (error != ENOIOCTL) - return error; - - return ENOTTY; -} - -int promparam(tp, t) struct tty *tp; struct termios *t; ==== //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.42 2004/02/21 21:10:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.43 2004/06/01 13:49:26 phk Exp $"); #include "opt_ddb.h" @@ -68,13 +68,11 @@ static d_open_t zsopen; static d_close_t zsclose; -static d_ioctl_t zsioctl; static struct cdevsw zs_cdevsw = { .d_version = D_VERSION, .d_open = zsopen, .d_close = zsclose, - .d_ioctl = zsioctl, .d_name = "zs", .d_flags = D_TTY | D_NEEDGIANT, }; @@ -328,31 +326,6 @@ } static int -zsioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) -{ - struct zs_softc *sc = ZS_SOFTC(minor(dev)); - struct tty *tp; - int error; - - if (sc == NULL) - return (ENXIO); - - tp = ZS_SOFTC(minor(dev))->tp; - - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - - if (error != ENOIOCTL) - return (error); - - error = ttioctl(tp, cmd, data, flag); - - if (error != ENOIOCTL) - return (error); - else - return (ENOTTY); -} - -static int zsparam(struct tty *tp, struct termios *t) { return (0); ==== //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.53 2004/04/22 07:08:39 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.54 2004/06/01 23:24:17 wpaul Exp $"); #include #include @@ -49,6 +49,7 @@ #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/conf/NOTES#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1226 2004/05/20 10:37:10 pjd Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1227 2004/06/01 06:22:56 tanimura Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1801,30 +1801,6 @@ hint.pcm.0.drq="1" hint.pcm.0.flags="0x0" -# -# midi: MIDI interfaces and synthesizers -# - -device midi - -# For non-pnp sound cards with no bridge drivers: -hint.midi.0.at="isa" -hint.midi.0.irq="5" -hint.midi.0.flags="0x0" - -# For serial ports (this example configures port 2): -# TODO: implement generic tty-midi interface so that we can use -# other uarts. -hint.midi.0.at="isa" -hint.midi.0.port="0x2F8" -hint.midi.0.irq="3" - -# -# seq: MIDI sequencer -# - -device seq - # The bridge drivers for sound cards. These can be separately configured # for providing services to the likes of new-midi. # When used with 'device pcm' they also provide pcm sound services. ==== //depot/projects/netperf_socket/sys/conf/files#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.899 2004/05/31 21:46:03 bmilekic Exp $ +# $FreeBSD: src/sys/conf/files,v 1.900 2004/06/01 06:22:57 tanimura Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -663,33 +663,22 @@ dev/sn/if_sn_pccard.c optional sn pccard dev/snp/snp.c optional snp dev/sound/isa/ad1816.c optional pcm isa -dev/sound/isa/emu8000.c optional midi isa dev/sound/isa/es1888.c optional pcm isa dev/sound/isa/ess.c optional pcm isa dev/sound/isa/gusc.c optional gusc isa dev/sound/isa/gusc.c optional pcm isa -dev/sound/isa/gusmidi.c optional midi isa -dev/sound/isa/mpu.c optional midi isa dev/sound/isa/mss.c optional pcm isa -dev/sound/isa/opl.c optional midi isa dev/sound/isa/sb16.c optional pcm isa dev/sound/isa/sb8.c optional pcm isa dev/sound/isa/sbc.c optional pcm isa dev/sound/isa/sbc.c optional sbc isa dev/sound/isa/sndbuf_dma.c optional pcm isa -dev/sound/isa/uartsio.c optional midi isa -dev/sound/midi/midi.c optional midi -dev/sound/midi/midibuf.c optional midi -dev/sound/midi/midisynth.c optional midi -dev/sound/midi/sequencer.c optional seq midi -dev/sound/midi/timer.c optional seq midi dev/sound/pci/als4000.c optional pcm pci #dev/sound/pci/au88x0.c optional pcm pci dev/sound/pci/cmi.c optional pcm pci dev/sound/pci/cs4281.c optional pcm pci dev/sound/pci/csa.c optional csa pci dev/sound/pci/csa.c optional pcm pci -dev/sound/pci/csamidi.c optional midi csa dev/sound/pci/csapcm.c optional pcm pci dev/sound/pci/ds1.c optional pcm pci dev/sound/pci/emu10k1.c optional pcm pci dependency "emu10k1-alsa%diked.h" ==== //depot/projects/netperf_socket/sys/dev/aac/aac.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.91 2004/04/14 19:11:29 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.93 2004/06/01 15:50:11 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -68,7 +68,6 @@ /* Command Processing */ static void aac_timeout(struct aac_softc *sc); -static int aac_map_command(struct aac_command *cm); static void aac_complete(void *context, int pending); static int aac_bio_command(struct aac_softc *sc, struct aac_command **cmp); static void aac_bio_complete(struct aac_command *cm); @@ -654,13 +653,18 @@ aac_startio(struct aac_softc *sc) { struct aac_command *cm; + int error; debug_called(2); - if (sc->flags & AAC_QUEUE_FRZN) - return; + for (;;) { + /* + * This flag might be set if the card is out of resources. + * Checking it here prevents an infinite loop of deferrals. + */ + if (sc->flags & AAC_QUEUE_FRZN) + break; - for (;;) { /* * Try to get a command that's been put off for lack of * resources @@ -678,47 +682,30 @@ if (cm == NULL) break; + /* don't map more than once */ + if (cm->cm_flags & AAC_CMD_MAPPED) + panic("aac: command %p already mapped", cm); + /* - * Try to give the command to the controller. Any error is - * catastrophic since it means that bus_dmamap_load() failed. + * Set up the command to go to the controller. If there are no + * data buffers associated with the command then it can bypass + * busdma. */ - if (aac_map_command(cm) != 0) - panic("aac: error mapping command %p\n", cm); - } -} - -/* - * Deliver a command to the controller; allocate controller resources at the - * last moment when possible. - */ -static int -aac_map_command(struct aac_command *cm) -{ - struct aac_softc *sc; - int error; - - debug_called(2); - - sc = cm->cm_sc; - error = 0; - - /* don't map more than once */ - if (cm->cm_flags & AAC_CMD_MAPPED) - panic("aac: command %p already mapped", cm); - - if (cm->cm_datalen != 0) { - error = bus_dmamap_load(sc->aac_buffer_dmat, cm->cm_datamap, - cm->cm_data, cm->cm_datalen, - aac_map_command_sg, cm, 0); - if (error == EINPROGRESS) { - debug(1, "freezing queue\n"); - sc->flags |= AAC_QUEUE_FRZN; - error = 0; - } - } else { - aac_map_command_sg(cm, NULL, 0, 0); + if (cm->cm_datalen != 0) { + error = bus_dmamap_load(sc->aac_buffer_dmat, + cm->cm_datamap, cm->cm_data, + cm->cm_datalen, + aac_map_command_sg, cm, 0); + if (error == EINPROGRESS) { + debug(1, "freezing queue\n"); + sc->flags |= AAC_QUEUE_FRZN; + error = 0; + } else if (error != 0) + panic("aac_startio: unexpected error %d from " + "busdma\n", error); + } else + aac_map_command_sg(cm, NULL, 0, 0); } - return (error); } /* @@ -1285,9 +1272,10 @@ BUS_DMASYNC_PREWRITE); cm->cm_flags |= AAC_CMD_MAPPED; - /* put the FIB on the outbound queue */ + /* Put the FIB on the outbound queue */ if (aac_enqueue_fib(sc, cm->cm_queue, cm) == EBUSY) { aac_unmap_command(cm); + sc->flags |= AAC_QUEUE_FRZN; aac_requeue_ready(cm); } @@ -1827,6 +1815,12 @@ goto out; } + /* + * To avoid a race with its completion interrupt, place this command on + * the busy queue prior to advertising it to the controller. + */ + aac_enqueue_busy(cm); + /* populate queue entry */ (sc->aac_qentries[queue] + pi)->aq_fib_size = fib_size; (sc->aac_qentries[queue] + pi)->aq_fib_addr = fib_addr; @@ -1834,12 +1828,6 @@ /* update producer index */ sc->aac_queues->qt_qindex[queue][AAC_PRODUCER_INDEX] = pi + 1; - /* - * To avoid a race with its completion interrupt, place this command on - * the busy queue prior to advertising it to the controller. - */ - aac_enqueue_busy(cm); - /* notify the adapter if we know how */ if (aac_qinfo[queue].notify != 0) AAC_QNOTIFY(sc, aac_qinfo[queue].notify); ==== //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.36 2004/05/17 17:53:12 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.37 2004/06/01 11:34:46 sos Exp $"); #include "opt_ata.h" #include @@ -75,6 +75,7 @@ /* safetybelt for HW that went away */ if (!request->device->param || request->device->channel->flags&ATA_HWGONE) { + request->retries = 0; request->result = ENXIO; return ATA_OP_FINISHED; } @@ -531,7 +532,7 @@ ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); DELAY(10); ostat0 = ATA_IDX_INB(ch, ATA_STATUS); - if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5) { + if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5 && ostat0 != 0x7f) { stat0 = ATA_S_BUSY; mask |= 0x01; } @@ -542,7 +543,7 @@ /* in some setups we dont want to test for a slave */ if (!(ch->flags & ATA_NO_SLAVE)) { - if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5) { + if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5 && ostat1 != 0x7f) { stat1 = ATA_S_BUSY; mask |= 0x02; } ==== //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.27 2004/04/30 16:21:34 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.29 2004/06/01 12:26:08 sos Exp $"); #include "opt_ata.h" #include @@ -303,7 +303,7 @@ /* ATA errors */ default: - if (request->status & ATA_S_ERROR) { + if (!request->result && request->status & ATA_S_ERROR) { if (!(request->flags & ATA_R_QUIET)) { ata_prtdev(request->device, "FAILURE - %s status=%b error=%b", @@ -393,7 +393,8 @@ "\2NO_MEDIA\1ILLEGAL_LENGTH"); } - if (request->error & ATA_E_MASK) + if ((request->u.atapi.sense_key ? + request->u.atapi.sense_key : request->error) & ATA_E_MASK) request->result = EIO; } @@ -499,7 +500,7 @@ static char buffer[20]; if (request->flags & ATA_R_ATAPI) { - switch (request->u.atapi.sense_cmd ? + switch (request->u.atapi.sense_key ? request->u.atapi.sense_cmd : request->u.atapi.ccb[0]) { case 0x00: return ("TEST_UNIT_READY"); case 0x01: return ("REZERO"); ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.165 2004/03/02 14:03:43 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.166 2004/06/01 12:28:45 sos Exp $"); #include "opt_ata.h" #include @@ -488,17 +488,18 @@ if (!(request = ata_alloc_request())) return ENOMEM; - request->device = cdp->device; - request->driver = cdp; - bcopy(ccb, request->u.atapi.ccb, 16); - request->flags = ATA_R_ATAPI; - request->timeout = 5; - /* wait if drive is not finished loading the medium */ while (timeout--) { + bzero(request, sizeof(struct ata_request)); + request->device = cdp->device; + request->driver = cdp; + bcopy(ccb, request->u.atapi.ccb, 16); + request->flags = ATA_R_ATAPI; + request->timeout = 5; ata_queue_request(request); if (!request->error && - request->u.atapi.sense_data.sense_key == 2 && + (request->u.atapi.sense_data.sense_key == 2 || + request->u.atapi.sense_data.sense_key == 7) && request->u.atapi.sense_data.asc == 4 && request->u.atapi.sense_data.ascq == 1) tsleep(&timeout, PRIBIO, "acdld", hz / 2); ==== //depot/projects/netperf_socket/sys/dev/cy/cy.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.145 2004/05/16 21:22:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.146 2004/06/01 11:57:12 phk Exp $"); #include "opt_compat.h" @@ -795,7 +795,6 @@ cd_etc(com, CD1400_ETC_STOPBREAK); (*linesw[tp->t_line].l_close)(tp, flag); disc_optim(tp, &tp->t_termios, com); - comstop(tp, FREAD | FWRITE); comhardclose(com); ttyclose(tp); siosettimeout(); ==== //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $ - * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.6 2004/05/30 20:08:30 phk Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.9 2004/06/01 13:49:26 phk Exp $ */ #include @@ -85,14 +85,12 @@ static d_open_t dcons_open; static d_close_t dcons_close; -static d_ioctl_t dcons_ioctl; static struct cdevsw dcons_cdevsw = { #if __FreeBSD_version >= 500104 .d_version = D_VERSION, .d_open = dcons_open, .d_close = dcons_close, - .d_ioctl = dcons_ioctl, .d_name = "dcons", .d_flags = D_TTY | D_NEEDGIANT, #else @@ -219,29 +217,6 @@ } static int -dcons_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct THREAD *td) -{ - int unit; - struct tty *tp; - int error; - - unit = minor(dev); - if (unit != 0) - return (ENXIO); - - tp = dev->si_tty; - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) - return (error); - - error = ttioctl(tp, cmd, data, flag); - if (error != ENOIOCTL) - return (error); - - return (ENOTTY); -} - -static int dcons_tty_param(struct tty *tp, struct termios *t) { tp->t_ispeed = t->c_ispeed; @@ -586,10 +561,7 @@ if (tp->t_state & TS_ISOPEN) { printf("dcons: still opened\n"); (*linesw[tp->t_line].l_close)(tp, 0); - tp->t_gen++; ttyclose(tp); - ttwakeup(tp); - ttwwakeup(tp); } /* XXX * must wait until all device are closed. ==== //depot/projects/netperf_socket/sys/dev/digi/digi.c#4 (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/digi/digi.c,v 1.40 2004/05/30 20:08:30 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.41 2004/06/01 11:57:12 phk Exp $ */ /*- @@ -902,7 +902,6 @@ s = spltty(); linesw[tp->t_line].l_close(tp, flag); digi_disc_optim(tp, &tp->t_termios, port); - digistop(tp, FREAD | FWRITE); digihardclose(port); ttyclose(tp); if (--sc->opencnt == 0) ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#5 (text+ko) ==== @@ -31,12 +31,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.4 2004/03/21 19:56:41 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.5 2004/06/01 23:27:36 wpaul Exp $"); #include #include #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#6 (text+ko) ==== @@ -31,11 +31,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.5 2004/03/21 19:56:41 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.6 2004/06/01 23:27:36 wpaul Exp $"); #include #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.23 2004/05/30 20:08:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.25 2004/06/01 22:53:00 phk Exp $"); /* * Pseudo-nulmodem driver @@ -41,9 +41,6 @@ #include #include -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) -#include -#endif #include #include #include @@ -54,27 +51,21 @@ #include #include #include +#include MALLOC_DEFINE(M_NLMDM, "nullmodem", "nullmodem data structures"); static void nmdmstart(struct tty *tp); static void nmdmstop(struct tty *tp, int rw); -static void wakeup_other(struct tty *tp, int flag); static void nmdminit(dev_t dev); static d_open_t nmdmopen; static d_close_t nmdmclose; -static d_read_t nmdmread; -static d_write_t nmdmwrite; -static d_ioctl_t nmdmioctl; static struct cdevsw nmdm_cdevsw = { .d_version = D_VERSION, .d_open = nmdmopen, .d_close = nmdmclose, - .d_read = nmdmread, - .d_write = nmdmwrite, - .d_ioctl = nmdmioctl, .d_name = "nmdn", .d_flags = D_TTY | D_PSEUDO | D_NEEDGIANT, }; @@ -85,10 +76,11 @@ #define BFLAG CLONE_FLAG0 struct softpart { - struct tty nm_tty; + struct tty *nm_tty; dev_t dev; - int modemsignals; /* bits defined in sys/ttycom.h */ - int gotbreak; + int dcd; + struct task pt_task; + struct softpart *other; }; struct nm_softc { @@ -148,21 +140,40 @@ } static void -nmdm_crossover(struct nm_softc *pti, - struct softpart *ourpart, - struct softpart *otherpart); +nmdm_task_tty(void *arg, int pending __unused) +{ + struct tty *tp, *otp; + struct softpart *sp; + int c; -#define GETPARTS(tp, ourpart, otherpart) \ -do { \ - struct nm_softc *pti = tp->t_dev->si_drv1; \ - if (tp == &pti->part1.nm_tty) { \ - ourpart = &pti->part1; \ - otherpart = &pti->part2; \ - } else { \ - ourpart = &pti->part2; \ - otherpart = &pti->part1; \ - } \ -} while (0) + tp = arg; + sp = tp->t_sc; + otp = sp->other->nm_tty; + KASSERT(otp != NULL, ("NULL otp in nmdmstart")); + KASSERT(otp != tp, ("NULL otp == tp nmdmstart")); + if (sp->other->dcd) { + if (!(tp->t_state & TS_ISOPEN)) { + sp->other->dcd = 0; + (void)(*linesw[otp->t_line].l_modem)(otp, 0); + } + } else { + if (tp->t_state & TS_ISOPEN) { + sp->other->dcd = 1; + (void)(*linesw[otp->t_line].l_modem)(otp, 1); + } + } + if (tp->t_state & TS_TTSTOP) + return; + while (tp->t_outq.c_cc != 0) { + if (otp->t_state & TS_TBLOCK) + return; + c = getc(&tp->t_outq); + if (otp->t_state & TS_ISOPEN) + (*linesw[otp->t_line].l_rint)(c, otp); + } + if (tp->t_outq.c_cc == 0) + ttwwakeup(tp); +} /* * This function creates and initializes a pair of ttys. @@ -180,20 +191,34 @@ pt = malloc(sizeof(*pt), M_NLMDM, M_WAITOK | M_ZERO); TAILQ_INSERT_TAIL(&nmdmhead, pt, pt_list); + dev1->si_drv1 = dev2->si_drv1 = pt; pt->part1.dev = dev1; pt->part2.dev = dev2; - dev1->si_tty = &pt->part1.nm_tty; - dev2->si_tty = &pt->part2.nm_tty; - ttyregister(&pt->part1.nm_tty); - ttyregister(&pt->part2.nm_tty); - pt->part1.nm_tty.t_oproc = nmdmstart; - pt->part2.nm_tty.t_oproc = nmdmstart; - pt->part1.nm_tty.t_stop = nmdmstop; - pt->part2.nm_tty.t_stop = nmdmstop; - pt->part2.nm_tty.t_dev = dev1; - pt->part1.nm_tty.t_dev = dev2; + + pt->part1.nm_tty = ttymalloc(pt->part1.nm_tty); + pt->part1.nm_tty->t_oproc = nmdmstart; + pt->part1.nm_tty->t_stop = nmdmstop; + pt->part1.nm_tty->t_dev = dev1; + pt->part1.nm_tty->t_sc = &pt->part1; + TASK_INIT(&pt->part1.pt_task, 0, nmdm_task_tty, pt->part1.nm_tty); + + pt->part2.nm_tty = ttymalloc(pt->part2.nm_tty); + pt->part2.nm_tty->t_oproc = nmdmstart; + pt->part2.nm_tty->t_stop = nmdmstop; + pt->part2.nm_tty->t_dev = dev2; + pt->part2.nm_tty->t_sc = &pt->part2; + TASK_INIT(&pt->part2.pt_task, 0, nmdm_task_tty, pt->part2.nm_tty); + + pt->part1.other = &pt->part2; + pt->part2.other = &pt->part1; + + dev1->si_tty = pt->part1.nm_tty; + dev1->si_drv1 = pt; + + dev2->si_tty = pt->part2.nm_tty; + dev2->si_drv1 = pt; } /* @@ -202,381 +227,61 @@ static int nmdmopen(dev_t dev, int flag, int devtype, struct thread *td) { - register struct tty *tp, *tp2; + struct tty *tp, *tp2; int error; struct nm_softc *pti; - struct softpart *ourpart, *otherpart; + struct softpart *sp; if (dev->si_drv1 == NULL) nmdminit(dev); pti = dev->si_drv1; + if (pti->pt_prison != td->td_ucred->cr_prison) + return (EBUSY); - if (minor(dev) & BFLAG) - tp = &pti->part2.nm_tty; - else - tp = &pti->part1.nm_tty; - GETPARTS(tp, ourpart, otherpart); + tp = dev->si_tty; + sp = tp->t_sc; + tp2 = sp->other->nm_tty; - tp2 = &otherpart->nm_tty; - ourpart->modemsignals |= TIOCM_LE; - if ((tp->t_state & TS_ISOPEN) == 0) { ttychars(tp); /* Set up default chars */ tp->t_iflag = TTYDEF_IFLAG; tp->t_oflag = TTYDEF_OFLAG; tp->t_lflag = TTYDEF_LFLAG; + tp->t_lflag = 0; tp->t_cflag = TTYDEF_CFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttsetwater(tp); /* XXX ? */ } else if (tp->t_state & TS_XCLUDE && suser(td)) { return (EBUSY); - } else if (pti->pt_prison != td->td_ucred->cr_prison) { - return (EBUSY); } - /* - * If the other side is open we have carrier - */ - if (tp2->t_state & TS_ISOPEN) { - (void)(*linesw[tp->t_line].l_modem)(tp, 1); - } - - /* - * And the other side gets carrier as we are now open. - */ - (void)(*linesw[tp2->t_line].l_modem)(tp2, 1); - - /* External processing makes no sense here */ - tp->t_lflag &= ~EXTPROC; - - /* - * Wait here if we don't have carrier. - */ -#if 0 - while ((tp->t_state & TS_CARR_ON) == 0) { - if (flag & FNONBLOCK) - break; - error = ttysleep(tp, TSA_CARR_ON(tp), TTIPRI | PCATCH, - "nmdopn", 0); - if (error) - return (error); - } -#endif - - /* - * Give the line disciplin a chance to set this end up. - */ error = (*linesw[tp->t_line].l_open)(dev, tp); - - /* - * Wake up the other side. - * Theoretically not needed. - */ - ourpart->modemsignals |= TIOCM_DTR; - nmdm_crossover(pti, ourpart, otherpart); - if (error == 0) - wakeup_other(tp, FREAD|FWRITE); /* XXX */ return (error); } -/* - * Device closed again - */ -static int +static int nmdmclose(dev_t dev, int flag, int mode, struct thread *td) { - register struct tty *tp, *tp2; - int err; - struct softpart *ourpart, *otherpart; - /* - * let the other end know that the game is up - */ - tp = dev->si_tty; - GETPARTS(tp, ourpart, otherpart); - tp2 = &otherpart->nm_tty; - (void)(*linesw[tp2->t_line].l_modem)(tp2, 0); - - /* - * XXX MDMBUF makes no sense for nmdms but would inhibit the above - * l_modem(). CLOCAL makes sense but isn't supported. Special - * l_modem()s that ignore carrier drop make no sense for nmdms but - * may be in use because other parts of the line discipline make - * sense for nmdms. Recover by doing everything that a normal - * ttymodem() would have done except for sending a SIGHUP. - */ - if (tp2->t_state & TS_ISOPEN) { - tp2->t_state &= ~(TS_CARR_ON | TS_CONNECTED); - tp2->t_state |= TS_ZOMBIE; - ttyflush(tp2, FREAD | FWRITE); - } - - err = (*linesw[tp->t_line].l_close)(tp, flag); - ourpart->modemsignals &= ~TIOCM_DTR; - nmdm_crossover(dev->si_drv1, ourpart, otherpart); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 1 21:57:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F43516A4D0; Tue, 1 Jun 2004 21:57:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 789A116A4CE for ; Tue, 1 Jun 2004 21:57:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74D7943D2D for ; Tue, 1 Jun 2004 21:57:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i524vtRH024824 for ; Tue, 1 Jun 2004 21:57:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i524vs6J024821 for perforce@freebsd.org; Tue, 1 Jun 2004 21:57:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Tue, 1 Jun 2004 21:57:54 -0700 (PDT) Message-Id: <200406020457.i524vs6J024821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54004 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, 02 Jun 2004 04:57:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=54004 Change 54004 by marcel@marcel_nfs on 2004/06/01 21:57:18 Sync with dev/sio/sio.c Affected files ... .. //depot/projects/gdb/sys/pc98/pc98/sio.c#8 edit Differences ... ==== //depot/projects/gdb/sys/pc98/pc98/sio.c#8 (text+ko) ==== @@ -33,7 +33,8 @@ #include "opt_comconsole.h" #include "opt_compat.h" -#include "opt_ddb.h" +#include "opt_gdb.h" +#include "opt_kdb.h" #include "opt_sio.h" /* @@ -83,6 +84,7 @@ #include #include #include +#include #include #include #include @@ -99,9 +101,6 @@ #include #include #include -#if DDB > 0 -#include -#endif #include @@ -425,8 +424,6 @@ static u_int com_events; /* input chars + weighted output completions */ static Port_t siocniobase; static int siocnunit = -1; -static Port_t siogdbiobase; -static int siogdbunit = -1; static void *sio_slow_ih; static void *sio_fast_ih; static int sio_timeout; @@ -666,6 +663,10 @@ }; #endif /* PC98 */ +#ifdef GDB +static Port_t siogdbiobase = 0; +#endif + #ifdef COM_ESP #ifdef PC98 @@ -1835,7 +1836,7 @@ } if (ret) device_printf(dev, "could not activate interrupt\n"); -#if defined(DDB) && (defined(BREAK_TO_DEBUGGER) || \ +#if defined(KDB) && (defined(BREAK_TO_DEBUGGER) || \ defined(ALT_BREAK_TO_DEBUGGER)) /* * Enable interrupts for early break-to-debugger support @@ -2145,7 +2146,7 @@ sio_setreg(com, com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); tp = com->tp; -#if defined(DDB) && (defined(BREAK_TO_DEBUGGER) || \ +#if defined(KDB) && (defined(BREAK_TO_DEBUGGER) || \ defined(ALT_BREAK_TO_DEBUGGER)) /* * Leave interrupts enabled and don't clear DTR if this is the @@ -2673,13 +2674,13 @@ recv_data = 0; else recv_data = inb(com->data_port); -#ifdef DDB +#ifdef KDB #ifdef ALT_BREAK_TO_DEBUGGER if (com->unit == comconsole && - db_alt_break(recv_data, &com->alt_brk_state) != 0) - breakpoint(); + kdb_alt_break(recv_data, &com->alt_brk_state) != 0) + kdb_enter("Break sequence on console"); #endif /* ALT_BREAK_TO_DEBUGGER */ -#endif /* DDB */ +#endif /* KDB */ if (line_status & (LSR_BI | LSR_FE | LSR_PE)) { /* * Don't store BI if IGNBRK or FE/PE if IGNPAR. @@ -2694,9 +2695,9 @@ * Note: BI together with FE/PE means just BI. */ if (line_status & LSR_BI) { -#if defined(DDB) && defined(BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(BREAK_TO_DEBUGGER) if (com->unit == comconsole) { - breakpoint(); + kdb_enter("Line break on console"); goto cont; } #endif @@ -3948,36 +3949,21 @@ sprintf(cd->cn_name, "ttyd%d", unit); } -#ifndef __alpha__ static speed_t siocngetspeed(Port_t, u_long rclk); -#endif static void siocnclose(struct siocnstate *sp, Port_t iobase); static void siocnopen(struct siocnstate *sp, Port_t iobase, int speed); static void siocntxwait(Port_t iobase); -#ifdef __alpha__ -int siocnattach(int port, int speed); -int siogdbattach(int port, int speed); -int siogdbgetc(void); -void siogdbputc(int c); -#else static cn_probe_t siocnprobe; static cn_init_t siocninit; static cn_term_t siocnterm; -#endif static cn_checkc_t siocncheckc; static cn_getc_t siocngetc; static cn_putc_t siocnputc; -#ifndef __alpha__ CONS_DRIVER(sio, siocnprobe, siocninit, siocnterm, siocngetc, siocncheckc, siocnputc, NULL); -#endif -#if DDB > 0 -static struct consdev gdbconsdev; -#endif - static void siocntxwait(iobase) Port_t iobase; @@ -3995,8 +3981,6 @@ ; } -#ifndef __alpha__ - /* * Read the serial port specified and try to figure out what speed * it's currently running at. We're assuming the serial port has @@ -4032,8 +4016,6 @@ return (rclk / (16UL * divisor)); } -#endif - static void siocnopen(sp, iobase, speed) struct siocnstate *sp; @@ -4101,8 +4083,6 @@ outb(iobase + com_ier, sp->ier); } -#ifndef __alpha__ - static void siocnprobe(cp) struct consdev *cp; @@ -4178,40 +4158,12 @@ siocniobase = iobase; siocnunit = unit; } - if (COM_DEBUGGER(flags)) { - printf("sio%d: gdb debugging port\n", unit); +#ifdef GDB + if (COM_DEBUGGER(flags)) siogdbiobase = iobase; - siogdbunit = unit; -#if DDB > 0 - siocnset(&gdbconsdev, unit); - gdb_arg = &gdbconsdev; - gdb_getc = siocngetc; - gdb_putc = siocnputc; #endif - } } } -#ifdef __i386__ -#if DDB > 0 - /* - * XXX Ugly Compatability. - * If no gdb port has been specified, set it to be the console - * as some configuration files don't specify the gdb port. - */ - if (gdb_arg == NULL && (boothowto & RB_GDB)) { - printf("Warning: no GDB port specified. Defaulting to sio%d.\n", - siocnunit); - printf("Set flag 0x80 on desired GDB port in your\n"); - printf("configuration file (currently sio only).\n"); - siogdbiobase = siocniobase; - siogdbunit = siocnunit; - siocnset(&gdbconsdev, siocnunit); - gdb_arg = &gdbconsdev; - gdb_getc = siocngetc; - gdb_putc = siocnputc; - } -#endif -#endif } static void @@ -4228,103 +4180,6 @@ comconsole = -1; } -#endif - -#ifdef __alpha__ - -CONS_DRIVER(sio, NULL, NULL, NULL, siocngetc, siocncheckc, siocnputc, NULL); - -int -siocnattach(port, speed) - int port; - int speed; -{ - int s; - u_char cfcr; - u_int divisor; - struct siocnstate sp; - int unit = 0; /* XXX random value! */ - - siocniobase = port; - siocnunit = unit; - comdefaultrate = speed; - sio_consdev.cn_pri = CN_NORMAL; - siocnset(&sio_consdev, unit); - - s = spltty(); - - /* - * Initialize the divisor latch. We can't rely on - * siocnopen() to do this the first time, since it - * avoids writing to the latch if the latch appears - * to have the correct value. Also, if we didn't - * just read the speed from the hardware, then we - * need to set the speed in hardware so that - * switching it later is null. - */ - cfcr = inb(siocniobase + com_cfcr); - outb(siocniobase + com_cfcr, CFCR_DLAB | cfcr); - divisor = siodivisor(comdefaultrclk, comdefaultrate); - outb(siocniobase + com_dlbl, divisor & 0xff); - outb(siocniobase + com_dlbh, divisor >> 8); - outb(siocniobase + com_cfcr, cfcr); - - siocnopen(&sp, siocniobase, comdefaultrate); - splx(s); - - cnadd(&sio_consdev); - return (0); -} - -int -siogdbattach(port, speed) - int port; - int speed; -{ - int s; - u_char cfcr; - u_int divisor; - struct siocnstate sp; - int unit = 1; /* XXX random value! */ - - siogdbiobase = port; - gdbdefaultrate = speed; - - printf("sio%d: gdb debugging port\n", unit); - siogdbunit = unit; -#if DDB > 0 - siocnset(&gdbconsdev, unit); - gdb_arg = &gdbconsdev; - gdb_getc = siocngetc; - gdb_putc = siocnputc; -#endif - - s = spltty(); - - /* - * Initialize the divisor latch. We can't rely on - * siocnopen() to do this the first time, since it - * avoids writing to the latch if the latch appears - * to have the correct value. Also, if we didn't - * just read the speed from the hardware, then we - * need to set the speed in hardware so that - * switching it later is null. - */ - cfcr = inb(siogdbiobase + com_cfcr); - outb(siogdbiobase + com_cfcr, CFCR_DLAB | cfcr); - divisor = siodivisor(comdefaultrclk, gdbdefaultrate); - outb(siogdbiobase + com_dlbl, divisor & 0xff); - outb(siogdbiobase + com_dlbh, divisor >> 8); - outb(siogdbiobase + com_cfcr, cfcr); - - siocnopen(&sp, siogdbiobase, gdbdefaultrate); - splx(s); - - return (0); -} - -#endif - static int siocncheckc(struct consdev *cd) { @@ -4334,12 +4189,16 @@ struct siocnstate sp; speed_t speed; - if (cd->cn_unit == siocnunit) { + if (cd != NULL && cd->cn_unit == siocnunit) { iobase = siocniobase; speed = comdefaultrate; } else { +#ifdef GDB iobase = siogdbiobase; speed = gdbdefaultrate; +#else + return (-1); +#endif } s = spltty(); siocnopen(&sp, iobase, speed); @@ -4361,12 +4220,16 @@ struct siocnstate sp; speed_t speed; - if (cd->cn_unit == siocnunit) { + if (cd != NULL && cd->cn_unit == siocnunit) { iobase = siocniobase; speed = comdefaultrate; } else { +#ifdef GDB iobase = siogdbiobase; speed = gdbdefaultrate; +#else + return (-1); +#endif } s = spltty(); siocnopen(&sp, iobase, speed); @@ -4387,12 +4250,16 @@ Port_t iobase; speed_t speed; - if (cd->cn_unit == siocnunit) { + if (cd != NULL && cd->cn_unit == siocnunit) { iobase = siocniobase; speed = comdefaultrate; } else { +#ifdef GDB iobase = siogdbiobase; speed = gdbdefaultrate; +#else + return; +#endif } s = spltty(); need_unlock = 0; @@ -4409,58 +4276,58 @@ splx(s); } -#ifdef __alpha__ -int -siogdbgetc() +/* + * Remote gdb(1) support. + */ + +#if defined(GDB) + +#include + +static gdb_probe_f siogdbprobe; +static gdb_init_f siogdbinit; +static gdb_term_f siogdbterm; +static gdb_getc_f siogdbgetc; +static gdb_checkc_f siogdbcheckc; +static gdb_putc_f siogdbputc; + +GDB_DBGPORT(sio, siogdbprobe, siogdbinit, siogdbterm, siogdbcheckc, + siogdbgetc, siogdbputc); + +static int +siogdbprobe(void) { - int c; - Port_t iobase; - speed_t speed; - int s; - struct siocnstate sp; + return ((siogdbiobase != 0) ? 0 : -1); +} - if (siogdbunit == siocnunit) { - iobase = siocniobase; - speed = comdefaultrate; - } else { - iobase = siogdbiobase; - speed = gdbdefaultrate; - } +static void +siogdbinit(void) +{ +} - s = spltty(); - siocnopen(&sp, iobase, speed); - while (!(inb(iobase + com_lsr) & LSR_RXRDY)) - ; - c = inb(iobase + com_data); - siocnclose(&sp, iobase); - splx(s); - return (c); +static void +siogdbterm(void) +{ } -void -siogdbputc(c) - int c; +static void +siogdbputc(int c) { - Port_t iobase; - speed_t speed; - int s; - struct siocnstate sp; + siocnputc(NULL, c); +} - if (siogdbunit == siocnunit) { - iobase = siocniobase; - speed = comdefaultrate; - } else { - iobase = siogdbiobase; - speed = gdbdefaultrate; - } +static int +siogdbcheckc(void) +{ + return (siocncheckc(NULL)); +} - s = spltty(); - siocnopen(&sp, iobase, speed); - siocntxwait(siogdbiobase); - outb(siogdbiobase + com_data, c); - siocnclose(&sp, siogdbiobase); - splx(s); +static int +siogdbgetc(void) +{ + return (siocngetc(NULL)); } + #endif #ifdef PC98 From owner-p4-projects@FreeBSD.ORG Tue Jun 1 22:09:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAFAF16A4D0; Tue, 1 Jun 2004 22:09:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B88316A4CE for ; Tue, 1 Jun 2004 22:09:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 779F043D1F for ; Tue, 1 Jun 2004 22:09:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5259BDx027941 for ; Tue, 1 Jun 2004 22:09:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i52599fi027938 for perforce@freebsd.org; Tue, 1 Jun 2004 22:09:09 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Tue, 1 Jun 2004 22:09:09 -0700 (PDT) Message-Id: <200406020509.i52599fi027938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54006 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, 02 Jun 2004 05:09:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=54006 Change 54006 by marcel@marcel_nfs on 2004/06/01 22:08:53 IFC @54001 Affected files ... .. //depot/projects/gdb/bin/ps/ps.c#11 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/gdb/etc/mtree/BSD.local.dist#6 integrate .. //depot/projects/gdb/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes2#6 integrate .. //depot/projects/gdb/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/gdb/include/wctype.h#2 integrate .. //depot/projects/gdb/lib/libc/gen/ftok.c#2 integrate .. //depot/projects/gdb/lib/libc/net/eui64.3#2 integrate .. //depot/projects/gdb/lib/libc/net/eui64.c#2 integrate .. //depot/projects/gdb/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/gdb/lib/libmilter/Makefile#2 integrate .. //depot/projects/gdb/lib/libncp/ncpl_subr.c#2 integrate .. //depot/projects/gdb/lib/libsm/Makefile#2 integrate .. //depot/projects/gdb/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/gdb/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/Makefile#2 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml#1 branch .. //depot/projects/gdb/sbin/sunlabel/sunlabel.8#3 integrate .. //depot/projects/gdb/sbin/sunlabel/sunlabel.c#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/promcons.c#3 integrate .. //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#5 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#13 integrate .. //depot/projects/gdb/sys/conf/NOTES#21 integrate .. //depot/projects/gdb/sys/conf/files#26 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/gdb/sys/dev/aac/aac.c#5 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#10 integrate .. //depot/projects/gdb/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#4 integrate .. //depot/projects/gdb/sys/dev/dcons/dcons.c#7 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#4 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/gdb/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/gdb/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/gdb/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/gdb/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#5 integrate .. //depot/projects/gdb/sys/dev/rp/rp.c#3 integrate .. //depot/projects/gdb/sys/dev/si/si.c#3 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#11 integrate .. //depot/projects/gdb/sys/dev/sound/isa/emu8000.c#3 delete .. //depot/projects/gdb/sys/dev/sound/isa/gusmidi.c#3 delete .. //depot/projects/gdb/sys/dev/sound/isa/mpu.c#4 delete .. //depot/projects/gdb/sys/dev/sound/isa/opl.c#3 delete .. //depot/projects/gdb/sys/dev/sound/isa/uartsio.c#4 delete .. //depot/projects/gdb/sys/dev/sound/midi/midi.c#3 delete .. //depot/projects/gdb/sys/dev/sound/midi/midi.h#3 delete .. //depot/projects/gdb/sys/dev/sound/midi/midibuf.c#2 delete .. //depot/projects/gdb/sys/dev/sound/midi/midibuf.h#2 delete .. //depot/projects/gdb/sys/dev/sound/midi/midisynth.c#2 delete .. //depot/projects/gdb/sys/dev/sound/midi/midisynth.h#2 delete .. //depot/projects/gdb/sys/dev/sound/midi/miditypes.h#2 delete .. //depot/projects/gdb/sys/dev/sound/midi/sequencer.c#3 delete .. //depot/projects/gdb/sys/dev/sound/midi/sequencer.h#2 delete .. //depot/projects/gdb/sys/dev/sound/midi/timer.c#2 delete .. //depot/projects/gdb/sys/dev/sound/midi/timer.h#2 delete .. //depot/projects/gdb/sys/dev/sound/pci/csamidi.c#4 delete .. //depot/projects/gdb/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/gdb/sys/dev/sx/sx.c#2 integrate .. //depot/projects/gdb/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/gdb/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/gdb/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/gdb/sys/geom/geom_sunlabel_enc.c#2 integrate .. //depot/projects/gdb/sys/i386/acpica/madt.c#6 integrate .. //depot/projects/gdb/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate .. //depot/projects/gdb/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/gdb/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_conf.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_event.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_mbuf.c#1 branch .. //depot/projects/gdb/sys/kern/subr_mbuf.c#4 delete .. //depot/projects/gdb/sys/kern/tty.c#5 integrate .. //depot/projects/gdb/sys/kern/tty_pty.c#5 integrate .. //depot/projects/gdb/sys/kern/uipc_accf.c#3 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf2.c#4 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#7 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/gdb/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/gdb/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_tee.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#9 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/vm_machdep.c#8 integrate .. //depot/projects/gdb/sys/sys/conf.h#5 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#10 integrate .. //depot/projects/gdb/sys/sys/socket.h#6 integrate .. //depot/projects/gdb/sys/sys/socketvar.h#4 integrate .. //depot/projects/gdb/sys/sys/sun_disklabel.h#3 integrate .. //depot/projects/gdb/sys/sys/tty.h#3 integrate .. //depot/projects/gdb/sys/ufs/ffs/fs.h#4 integrate .. //depot/projects/gdb/sys/vm/uma.h#2 integrate .. //depot/projects/gdb/sys/vm/uma_core.c#6 integrate .. //depot/projects/gdb/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/gdb/sys/vm/uma_int.h#3 integrate .. //depot/projects/gdb/sys/vm/vm_kern.c#5 integrate .. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.birthday#3 integrate .. //depot/projects/gdb/usr.bin/netstat/main.c#4 integrate .. //depot/projects/gdb/usr.bin/netstat/mbuf.c#3 integrate .. //depot/projects/gdb/usr.bin/netstat/netstat.1#4 integrate .. //depot/projects/gdb/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/gdb/usr.bin/systat/mbufs.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#6 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#14 integrate .. //depot/projects/gdb/usr.sbin/Makefile#9 integrate .. //depot/projects/gdb/usr.sbin/arlconfig/Makefile#2 delete .. //depot/projects/gdb/usr.sbin/arlconfig/arlconfig.8#3 delete .. //depot/projects/gdb/usr.sbin/arlconfig/arlconfig.c#3 delete .. //depot/projects/gdb/usr.sbin/arlcontrol/Makefile#1 branch .. //depot/projects/gdb/usr.sbin/arlcontrol/arlcontrol.8#2 integrate .. //depot/projects/gdb/usr.sbin/jail/jail.8#6 integrate .. //depot/projects/gdb/usr.sbin/kldxref/kldxref.8#3 integrate .. //depot/projects/gdb/usr.sbin/kldxref/kldxref.c#4 integrate .. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/gdb/usr.sbin/sendmail/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/sysinstall/menus.c#5 integrate Differences ... ==== //depot/projects/gdb/bin/ps/ps.c#11 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.91 2004/05/23 21:35:35 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.98 2004/06/01 23:27:11 gad Exp $"); #include #include @@ -84,6 +84,12 @@ #define OPT_LAZY_f /* I.e., the `-f' option is not added. */ #endif +/* + * isdigit takes an `int', but expects values in the range of unsigned char. + * This wrapper ensures that values from a 'char' end up in the correct range. + */ +#define isdigitch(Anychar) isdigit((u_char)(Anychar)) + int cflag; /* -c */ int eval; /* Exit value */ time_t now; /* Current time(3) value */ @@ -134,7 +140,7 @@ KINFO *, char *, int); static void free_list(struct listinfo *); static void init_list(struct listinfo *, addelem_rtn, int, const char *); -static char *kludge_oldps_options(char *); +static char *kludge_oldps_options(const char *, char *, const char *); static int pscomp(const void *, const void *); static void saveuser(KINFO *); static void scanvars(void); @@ -162,10 +168,10 @@ struct kinfo_proc *kp; struct varent *vent; struct winsize ws; - const char *cp, *nlistf, *memf; + const char *nlistf, *memf; char *cols; int all, ch, dropgid, elem, flag, _fmt, i, lineno; - int nentries, nocludge, nkept, nselectors; + int nentries, nkept, nselectors; int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; @@ -183,24 +189,11 @@ termwidth = ws.ws_col - 1; /* - * Don't apply a kludge if the first argument is an option taking an - * argument + * Hide a number of option-processing kludges in a separate routine, + * to support some historical BSD behaviors, such as `ps axu'. */ - if (argc > 1) { - nocludge = 0; - if (argv[1][0] == '-') { - for (cp = PS_ARGS; *cp != '\0'; cp++) { - if (*cp != ':') - continue; - if (*(cp - 1) == argv[1][1]) { - nocludge = 1; - break; - } - } - } - if (nocludge == 0) - argv[1] = kludge_oldps_options(argv[1]); - } + if (argc > 1) + argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]); all = dropgid = _fmt = nselectors = optfatal = 0; prtheader = showthreads = wflag = xkeep_implied = 0; @@ -214,7 +207,7 @@ init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); memf = nlistf = _PATH_DEVNULL; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) - switch((char)ch) { + switch ((char)ch) { case 'A': /* * Exactly the same as `-ax'. This has been @@ -408,27 +401,34 @@ } argc -= optind; argv += optind; + + /* + * If there arguments after processing all the options, attempt + * to treat them as a list of process ids. + */ + while (*argv) { + if (!isdigitch(**argv)) + break; + add_list(&pidlist, *argv); + argv++; + } + if (*argv) { + fprintf(stderr, "%s: illegal argument: %s\n", + getprogname(), *argv); + usage(); + } if (optfatal) exit(1); /* Error messages already printed. */ if (xkeep < 0) /* Neither -X nor -x was specified. */ xkeep = xkeep_implied; -#define BACKWARD_COMPATIBILITY -#ifdef BACKWARD_COMPATIBILITY - if (*argv) { - nlistf = *argv; - if (*++argv) - memf = *argv; - } -#endif + /* * Discard setgid privileges if not the running kernel so that bad * guys can't print interesting stuff from kernel memory. */ - if (dropgid) { + if (dropgid) setgid(getgid()); - setuid(getuid()); - } kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf); if (kd == 0) @@ -656,9 +656,8 @@ if (grp == NULL) { warnx("No %s %s '%s'", inf->lname, nameorID, elem); optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } - if (inf->count >= inf->maxcount) expand_list(inf); inf->l.gids[(inf->count)++] = grp->gr_gid; @@ -672,24 +671,25 @@ char *endp; long tempid; - if (*elem == '\0') - tempid = 0L; - else { - errno = 0; - tempid = strtol(elem, &endp, 10); - if (*endp != '\0' || tempid < 0 || elem == endp) { - warnx("Invalid %s: %s", inf->lname, elem); - errno = ERANGE; - } else if (errno != 0 || tempid > BSD_PID_MAX) { - warnx("%s too large: %s", inf->lname, elem); - errno = ERANGE; - } - if (errno == ERANGE) { - optfatal = 1; - return (0); /* Do not add this value. */ - } + if (*elem == '\0') { + warnx("Invalid (zero-length) process id"); + optfatal = 1; + return (0); /* Do not add this value. */ } + errno = 0; + tempid = strtol(elem, &endp, 10); + if (*endp != '\0' || tempid < 0 || elem == endp) { + warnx("Invalid %s: %s", inf->lname, elem); + errno = ERANGE; + } else if (errno != 0 || tempid > BSD_PID_MAX) { + warnx("%s too large: %s", inf->lname, elem); + errno = ERANGE; + } + if (errno == ERANGE) { + optfatal = 1; + return (0); + } if (inf->count >= inf->maxcount) expand_list(inf); inf->l.pids[(inf->count)++] = tempid; @@ -717,14 +717,13 @@ if (stat(ttypath, &sb) == -1) { warn("%s", ttypath); optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } if (!S_ISCHR(sb.st_mode)) { warn("%s: Not a terminal", ttypath); optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } - if (inf->count >= inf->maxcount) expand_list(inf); inf->l.ttys[(inf->count)++] = sb.st_rdev; @@ -768,9 +767,8 @@ * errors (and the command will be aborted). */ optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } - if (inf->count >= inf->maxcount) expand_list(inf); inf->l.uids[(inf->count)++] = pwd->pw_uid; @@ -785,6 +783,8 @@ int toolong; char elemcopy[PATH_MAX]; + if (*argp == 0) + inf->addelem(inf, elemcopy); while (*argp != '\0') { while (*argp != '\0' && strchr(W_SEP, *argp) != NULL) argp++; @@ -801,35 +801,10 @@ } if (!toolong) { *cp = '\0'; -#ifndef ADD_PS_LISTRESET /* - * This is how the standard expects lists to - * be handled. + * Add this single element to the given list. */ inf->addelem(inf, elemcopy); -#else - /*- - * This would add a simple non-standard-but-convienent - * feature. - * - * XXX - The first time I tried to add this check, - * it increased the total size of `ps' by 3940 - * bytes on i386! That's 12% of the entire - * program! The `ps.o' file grew by only about - * 40 bytes, but the final (stripped) executable - * in /bin/ps grew by 12%. I have not had time - * to investigate, so skip the feature for now. - */ - /* - * We now have a single element. Add it to the - * list, unless the element is ":". In that case, - * reset the list so previous entries are ignored. - */ - if (strcmp(elemcopy, ":") == 0) - inf->count = 0; - else - inf->addelem(inf, elemcopy); -#endif } else { /* * The string is too long to copy. Find the end @@ -868,8 +843,7 @@ newlist = realloc(inf->l.ptr, newmax * inf->elemsize); if (newlist == NULL) { free(inf->l.ptr); - errx(1, "realloc to %d %ss failed", newmax, - inf->lname); + errx(1, "realloc to %d %ss failed", newmax, inf->lname); } inf->maxcount = newmax; inf->l.ptr = newlist; @@ -1075,31 +1049,29 @@ * feature is available with the option 'T', which takes no argument. */ static char * -kludge_oldps_options(char *s) +kludge_oldps_options(const char *optlist, char *origval, const char *nextarg) { - int have_fmt; size_t len; - char *newopts, *ns, *cp; + char *argp, *cp, *newopts, *ns, *optp, *pidp; /* - * If we have an 'o' option, then note it, since we don't want to do - * some types of munging. + * See if the original value includes any option which takes an + * argument (and will thus use up the remainder of the string). */ - have_fmt = index(s, 'o') != NULL; + argp = NULL; + if (optlist != NULL) { + for (cp = origval; *cp != '\0'; cp++) { + optp = strchr(optlist, *cp); + if ((optp != NULL) && *(optp + 1) == ':') { + argp = cp; + break; + } + } + } + if (argp != NULL && *origval == '-') + return (origval); - len = strlen(s); - if ((newopts = ns = malloc(len + 2)) == NULL) - errx(1, "malloc failed"); - /* - * options begin with '-' - */ - if (*s != '-') - *ns++ = '-'; /* add option flag */ /* - * gaze to end of argv[1] - */ - cp = s + len - 1; - /* * if last letter is a 't' flag with no argument (in the context * of the oldps options -- option string NOT starting with a '-' -- * then convert to 'T' (meaning *this* terminal, i.e. ttyname(0)). @@ -1107,30 +1079,60 @@ * However, if a flag accepting a string argument is found earlier * in the option string (including a possible `t' flag), then the * remainder of the string must be the argument to that flag; so - * do not modify that argument. + * do not modify that argument. Note that a trailing `t' would + * cause argp to be set, if argp was not already set by some + * earlier option. */ - if (*cp == 't' && *s != '-' && strcspn(s, "MNOoUt") == len - 1) - *cp = 'T'; - else { + len = strlen(origval); + cp = origval + len - 1; + pidp = NULL; + if (*cp == 't' && *origval != '-' && cp == argp) { + if (nextarg == NULL || *nextarg == '-' || isdigitch(*nextarg)) + *cp = 'T'; + } else if (argp == NULL) { /* - * otherwise check for trailing number, which *may* be a - * pid. + * The original value did not include any option which takes + * an argument (and that would include `p' and `t'), so check + * the value for trailing number, or comma-separated list of + * numbers, which we will treat as a pid request. */ - while (cp >= s && isdigit(*cp)) - --cp; + if (isdigitch(*cp)) { + while (cp >= origval && (*cp == ',' || isdigitch(*cp))) + --cp; + pidp = cp + 1; + } } - cp++; - memmove(ns, s, (size_t)(cp - s)); /* copy up to trailing number */ - ns += cp - s; + + /* + * If nothing needs to be added to the string, then return + * the "original" (although possibly modified) value. + */ + if (*origval == '-' && pidp == NULL) + return (origval); + /* - * if there's a trailing number, and not a preceding 'p' (pid) or - * 't' (tty) flag, then assume it's a pid and insert a 'p' flag. + * Create a copy of the string to add '-' and/or 'p' to the + * original value. */ - if (isdigit(*cp) && - (cp == s || (cp[-1] != 't' && cp[-1] != 'p')) && - (cp - 1 == s || cp[-2] != 't') && !have_fmt) + if ((newopts = ns = malloc(len + 3)) == NULL) + errx(1, "malloc failed"); + + if (*origval != '-') + *ns++ = '-'; /* add option flag */ + + if (pidp == NULL) + strcpy(ns, origval); + else { + /* + * Copy everything before the pid string, add the `p', + * and then copy the pid string. + */ + len = pidp - origval; + memcpy(ns, origval, len); + ns += len; *ns++ = 'p'; - (void)strcpy(ns, cp); /* and append the number */ + strcpy(ns, pidp); + } return (newopts); } ==== //depot/projects/gdb/contrib/libpcap/pcap-bpf.c#3 (text+ko) ==== @@ -17,6 +17,8 @@ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * + * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.2 2004/05/31 21:29:30 dwmalone Exp $ */ #ifndef lint static const char rcsid[] _U_ = @@ -467,7 +469,7 @@ */ do { (void)snprintf(device, sizeof(device), "/dev/bpf%d", n++); - fd = open(device, O_RDONLY); + fd = open(device, O_RDWR); } while (fd < 0 && errno == EBUSY); /* ==== //depot/projects/gdb/etc/mtree/BSD.local.dist#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.111 2004/04/21 15:28:21 tjr Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.112 2004/05/31 07:34:40 kris Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -268,6 +268,56 @@ classes .. .. + locale + bg + .. + da + .. + de + .. + en + .. + en_GB + .. + eo + .. + es + .. + et + .. + fr + .. + he + .. + hr + .. + hu + .. + id + .. + it + .. + ja + .. + lt + .. + ms + .. + nb + .. + nl + .. + pt_BR + .. + ru + .. + sv + .. + tr + .. + zh_TW.Big5 + .. + .. misc .. nls @@ -579,4 +629,6 @@ xml .. .. + www + .. .. ==== //depot/projects/gdb/etc/mtree/BSD.x11-4.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.23 2003/05/14 07:23:54 anholt Exp $ +# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.24 2004/05/31 07:34:40 kris Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -456,5 +456,129 @@ .. examples .. + locale + af + .. + am + .. + az + .. + be + .. + bg + .. + bs + .. + ca + .. + cs + .. + cy + .. + da + .. + de + .. + el + .. + en + .. + en_CA + .. + en_GB + .. + eo + .. + es + .. + es_ES + .. + es_MX + .. + et + .. + fa + .. + fi + .. + fr + .. + ga + .. + gl + .. + he + .. + hr + .. + hu + .. + id + .. + it + .. + ja + .. + kn + .. + ko + .. + lt + .. + lv + .. + mk + .. + ml + .. + ms + .. + nl + .. + nn + .. + no + .. + pl + .. + pt + .. + pt_BR + .. + pt_PT + .. + ro + .. + ru + .. + sk + .. + sl + .. + sq + .. + sr + .. + sr@Latn + .. + sv + .. + ta + .. + th + .. + tr + .. + uk + .. + vi + .. + zh_CN + .. + zh_TW + .. + zh_TW.Big5 + .. + .. .. .. ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#8 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.135 2004/05/25 19:15:02 wollman Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.137 2004/06/01 09:45:16 des Exp $ % -- Gifts for Children -- @@ -678,7 +678,7 @@ "Well, gee, doesn't Louise count?" "Only to ten, Mudhead." - -- Firesign Theater + -- Firesign Theater % GREAT MOMENTS IN AMERICAN HISTORY #21 -- July 30, 1917 @@ -1780,7 +1780,7 @@ A conclusion is simply the place where someone got tired of thinking. % A CONS is an object which cares. - -- Bernie Greenberg. + -- Bernie Greenberg % A consultant is a person who borrows your watch, tells you what time it is, pockets the watch, and sends you a bill for it. @@ -4475,7 +4475,7 @@ whether it is based upon deliberation or governed by passion, prejudice, and impulse, without restraint or regard to consequences. Result is demagogism, license, agitation, discontent, anarchy. - -- U. S. Army Training Manual No. 2000-25 (1928-1932), + -- U.S. Army Training Manual No. 2000-25 (1928-1932), since withdrawn. % Demographic polls show that you have lost credibility across the @@ -5431,7 +5431,7 @@ I'd not read Eliot, Auden or MacNiece. But now I think a thought that brings me hope: Neither had Chaucer, Shakespeare, Milton, Pope. - -- Justin Richardson. + -- Justin Richardson % For your penance, say five Hail Marys and one loud BLAH! % @@ -5720,7 +5720,7 @@ set off the flash bulb on your camera once. -- Peter Doms, manager of the Deep Space Network - systems program at JPL. + systems program at JPL % From the Pro 350 Pocket Service Guide, p. 49, Step 5 of the instructions on removing an I/O board from the card cage, comes a new @@ -5770,7 +5770,7 @@ % Gauls! We have nothing to fear; except perhaps that the sky may fall on our heads tomorrow. But as we all know, tomorrow never comes!! - -- Adventures of Asterix. + -- Adventures of Asterix % Gay shlafen: Yiddish for "go to sleep". @@ -6801,7 +6801,7 @@ "I can remember when a good politician had to be 75 percent ability and 25 percent actor, but I can well see the day when the reverse could be true." - -- Harry Truman + -- Harry S. Truman % "I can resist anything but temptation." % @@ -7013,7 +7013,7 @@ beefsteak and perhaps a supporter below. Westbrook Pegler, a guttersnipe, is a gentleman compared to you. You can take that as more of an insult than as a reflection on your ancestry." - -- President Harry S Truman + -- Harry S. Truman % I have learned To spell hors d'oeuvres @@ -7796,7 +7796,7 @@ If you can survive death, you can probably survive anything. % If you cannot convince them, confuse them. - -- Harry S Truman + -- Harry S. Truman % If you can't be good, be careful. If you can't be careful, give me a call. @@ -8456,7 +8456,7 @@ applauded. He repeated his warning, they shouted even louder. So I think the world will come to an end amid general applause from all the wits, who believe that it is a joke. - -- S. A. Kierkegaard (1813-1855) + -- S. A. Kierkegaard (1813-1855) % It has been observed that one's nose is never so happy as when it is thrust into the affairs of another, from which some physiologists have @@ -12839,7 +12839,7 @@ The assertion that "all men are created equal" was of no practical use in effecting our separation from Great Britain and it was placed in the Declaration not for that, but for future use. - -- Abraham Lincoln + -- Abraham Lincoln % The average income of the modern teenager is about 2 a.m. % @@ -13497,7 +13497,7 @@ % "The National Association of Theater Concessionaires reported that in 1986, 60% of all candy sold in movie theaters was sold to Roger Ebert." - -- D. Letterman + -- David Letterman % The National Short-Sleeved Shirt Association says: Support your right to bare arms! @@ -13764,7 +13764,7 @@ % The reason we come up with new versions is not to fix bugs. It's absolutely not. - -- Bill Gates + -- Bill Gates % The reasonable man adapts himself to the world; the unreasonable one persists in trying to adapt the world to himself. Therefore all @@ -13988,7 +13988,7 @@ % The United States also has its native Fascists who say that they are "100 percent American"... - -- U. S. Army (1945) + -- U.S. Army (1945) % The United States is like the guy at the party who gives cocaine to everybody and still nobody likes him. @@ -14098,7 +14098,7 @@ marginally competent physicist would immediately use this to run a heat engine and make some other part of hell comfortably cool. This is obviously impossible. - -- Richard Davisson + -- Richard Davisson % There are people so addicted to exaggeration that they can't tell the truth without lying. @@ -15291,12 +15291,12 @@ % Welcome thy neighbor into thy fallout shelter. He'll come in handy if you run out of food. - -- Dean McLaughlin. + -- Dean McLaughlin % "Well," Brahma said, "even after ten thousand explanations, a fool is no wiser, but an intelligent man requires only two thousand five hundred." - -- The Mahabharata. + -- The Mahabharata % "We'll cross out that bridge when we come back to it later." % @@ -15733,7 +15733,7 @@ When you don't know what you are doing, do it neatly. % When you have an efficient government, you have a dictatorship. - -- Harry Truman + -- Harry S. Truman % "When you have to kill a man it costs nothing to be polite." -- Winston Churchill, On formal declarations of war @@ -15762,7 +15762,7 @@ % Whenever I hear anyone arguing for slavery, I feel a strong impulse to see it tried on him personally. - -- A. Lincoln + -- Abraham Lincoln % Whenever people agree with me I always feel I must be wrong. -- Oscar Wilde @@ -16439,7 +16439,7 @@ % You probably wouldn't worry about what people think of you if you could know how seldom they do. - -- Olin Miller. + -- Olin Miller % You should emulate your heros, but don't carry it too far. Especially if they are dead. ==== //depot/projects/gdb/games/fortune/datfiles/fortunes2#6 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.70 2004/05/20 08:15:58 schweikh Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.74 2004/06/01 09:45:16 des Exp $ % ======================================================================= || || @@ -429,7 +429,7 @@ I found a thesis topic: How to keep people from hanging out in front of the Dover. -- Sister Mary Elephant, - "Student Statement for Black Friday" + "Student Statement for Black Friday" % 1/2 /\(3) @@ -1671,7 +1671,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 1 22:18:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9330416A4D0; Tue, 1 Jun 2004 22:18:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B50516A4CF for ; Tue, 1 Jun 2004 22:18:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F83643D5A for ; Tue, 1 Jun 2004 22:18:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i525IMia033058 for ; Tue, 1 Jun 2004 22:18:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i525IMTl033053 for perforce@freebsd.org; Tue, 1 Jun 2004 22:18:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Tue, 1 Jun 2004 22:18:22 -0700 (PDT) Message-Id: <200406020518.i525IMTl033053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54007 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, 02 Jun 2004 05:18:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=54007 Change 54007 by marcel@marcel_nfs on 2004/06/01 22:17:21 Remove *-gdbstub.c Affected files ... .. //depot/projects/gdb/sys/conf/files.pc98#13 edit Differences ... ==== //depot/projects/gdb/sys/conf/files.pc98#13 (text+ko) ==== @@ -146,7 +146,6 @@ i386/i386/dump_machdep.c standard i386/i386/elf_machdep.c standard i386/i386/exception.s standard -i386/i386/i386-gdbstub.c optional gdb i386/i386/i686_mem.c standard i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet From owner-p4-projects@FreeBSD.ORG Tue Jun 1 22:37:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CE7A16A4D0; Tue, 1 Jun 2004 22:37:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F86E16A4CE for ; Tue, 1 Jun 2004 22:37:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45E7043D58 for ; Tue, 1 Jun 2004 22:37:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i525bkPC038876 for ; Tue, 1 Jun 2004 22:37:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i525bkk0038873 for perforce@freebsd.org; Tue, 1 Jun 2004 22:37:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Tue, 1 Jun 2004 22:37:46 -0700 (PDT) Message-Id: <200406020537.i525bkk0038873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54008 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, 02 Jun 2004 05:37:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=54008 Change 54008 by marcel@marcel_nfs on 2004/06/01 22:37:18 Add i386/i386/gdb_machdep.c Affected files ... .. //depot/projects/gdb/sys/conf/files.pc98#14 edit Differences ... ==== //depot/projects/gdb/sys/conf/files.pc98#14 (text+ko) ==== @@ -146,6 +146,7 @@ i386/i386/dump_machdep.c standard i386/i386/elf_machdep.c standard i386/i386/exception.s standard +i386/i386/gdb_machdep.c optional gdb i386/i386/i686_mem.c standard i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet From owner-p4-projects@FreeBSD.ORG Wed Jun 2 13:12:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD30E16A4D0; Wed, 2 Jun 2004 13:12:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E0BE16A4CE for ; Wed, 2 Jun 2004 13:12:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 750BC43D54 for ; Wed, 2 Jun 2004 13:12:18 -0700 (PDT) (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.11/8.12.11) with ESMTP id i52KCHAt058437 for ; Wed, 2 Jun 2004 13:12:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i52KCHMG058418 for perforce@freebsd.org; Wed, 2 Jun 2004 13:12:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 2 Jun 2004 13:12:17 -0700 (PDT) Message-Id: <200406022012.i52KCHMG058418@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 54042 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, 02 Jun 2004 20:12:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=54042 Change 54042 by rwatson@rwatson_tislabs on 2004/06/02 13:11:44 Integrate FreeBSD CVS HEAD into netperf_socket to prepare for the next batch of netperf merging. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#4 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/trap.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_clock.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.276 2004/06/02 07:52:33 tjr Exp $"); /* * AMD64 Trap and System call handling @@ -262,7 +262,7 @@ break; case T_PAGEFLT: /* page fault */ - if (td->td_flags & TDF_SA) + if (td->td_pflags & TDP_SA) thread_user_enter(p, td); i = trap_pfault(&frame, TRUE); if (i == -1) ==== //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#4 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.27 2004/05/14 20:29:29 ru Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.28 2004/06/02 09:38:32 phk Exp $ */ /* Memory Locations */ @@ -197,13 +197,16 @@ xorb %al,%al # Zero assumed bss from rep # the end of boot2.bin stosb # up to 0x10000 - callw seta20 # Enable A20 - jmp start+MEM_JMP-MEM_ORG # Start BTX + /* * Enable A20 so we can access memory above 1 meg. + * Use the zero-valued %cx as a timeout for embedded hardware which do not + * have a keyboard controller. */ seta20: cli # Disable interrupts -seta20.1: inb $0x64,%al # Get status +seta20.1: dec %cx # Timeout? + jz seta20.3 # Yes + inb $0x64,%al # Get status testb $0x2,%al # Busy? jnz seta20.1 # Yes movb $0xd1,%al # Command: Write @@ -213,8 +216,12 @@ jnz seta20.2 # Yes movb $0xdf,%al # Enable outb %al,$0x60 # A20 +seta20.3: sti # Enable interrupts - retw # To caller + + jmp start+MEM_JMP-MEM_ORG # Start BTX + + /* * Trampoline used to call read from within boot1. */ ==== //depot/projects/netperf_socket/sys/dev/aac/aac.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.93 2004/06/01 15:50:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.94 2004/06/02 18:15:48 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -236,7 +236,6 @@ /* * Initialize locks */ - AAC_LOCK_INIT(&sc->aac_sync_lock, "AAC sync FIB lock"); AAC_LOCK_INIT(&sc->aac_aifq_lock, "AAC AIF lock"); AAC_LOCK_INIT(&sc->aac_io_lock, "AAC I/O lock"); AAC_LOCK_INIT(&sc->aac_container_lock, "AAC container lock"); @@ -316,7 +315,7 @@ /* disconnect ourselves from the intrhook chain */ config_intrhook_disestablish(&sc->aac_ich); - aac_alloc_sync_fib(sc, &fib, 0); + aac_alloc_sync_fib(sc, &fib); mi = (struct aac_mntinfo *)&fib->data[0]; /* loop over possible containers */ @@ -526,7 +525,7 @@ */ device_printf(sc->aac_dev, "shutting down controller..."); - aac_alloc_sync_fib(sc, &fib, AAC_SYNC_LOCK_FORCE); + aac_alloc_sync_fib(sc, &fib); cc = (struct aac_close_command *)&fib->data[0]; bzero(cc, sizeof(struct aac_close_command)); @@ -1690,39 +1689,7 @@ return(0); } -/* - * Grab the sync fib area. - */ int -aac_alloc_sync_fib(struct aac_softc *sc, struct aac_fib **fib, int flags) -{ - - /* - * If the force flag is set, the system is shutting down, or in - * trouble. Ignore the mutex. - */ - if (!(flags & AAC_SYNC_LOCK_FORCE)) - AAC_LOCK_ACQUIRE(&sc->aac_sync_lock); - - *fib = &sc->aac_common->ac_sync_fib; - - return (1); -} - -/* - * Release the sync fib area. - */ -void -aac_release_sync_fib(struct aac_softc *sc) -{ - - AAC_LOCK_RELEASE(&sc->aac_sync_lock); -} - -/* - * Send a synchronous FIB to the controller and wait for a result. - */ -int aac_sync_fib(struct aac_softc *sc, u_int32_t command, u_int32_t xferstate, struct aac_fib *fib, u_int16_t datasize) { @@ -2267,7 +2234,7 @@ debug_called(2); - aac_alloc_sync_fib(sc, &fib, 0); + aac_alloc_sync_fib(sc, &fib); fib->data[0] = 0; if (aac_sync_fib(sc, RequestAdapterInfo, 0, fib, 1)) { @@ -2588,7 +2555,7 @@ * doesn't tell us anything else! Re-enumerate the * containers and sort things out. */ - aac_alloc_sync_fib(sc, &fib, 0); + aac_alloc_sync_fib(sc, &fib); mi = (struct aac_mntinfo *)&fib->data[0]; do { /* @@ -2883,7 +2850,7 @@ device_t child; int i, found, error; - aac_alloc_sync_fib(sc, &fib, 0); + aac_alloc_sync_fib(sc, &fib); c_cmd = (struct aac_ctcfg *)&fib->data[0]; bzero(c_cmd, sizeof(struct aac_ctcfg)); ==== //depot/projects/netperf_socket/sys/dev/aac/aac_cam.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.15 2004/05/30 20:08:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.16 2004/06/02 18:15:48 scottl Exp $"); /* * CAM front-end for communicating with non-DASD devices @@ -523,7 +523,7 @@ return (CAM_REQ_ABORTED); } - aac_alloc_sync_fib(sc, &fib, 0); + aac_alloc_sync_fib(sc, &fib); vmi = (struct aac_vmioctl *)&fib->data[0]; bzero(vmi, sizeof(struct aac_vmioctl)); @@ -570,7 +570,7 @@ struct aac_vmi_devinfo_resp *vmi_resp; int error; - aac_alloc_sync_fib(sc, &fib, 0); + aac_alloc_sync_fib(sc, &fib); vmi = (struct aac_vmioctl *)&fib->data[0]; bzero(vmi, sizeof(struct aac_vmioctl)); ==== //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.38 2004/05/30 20:08:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.39 2004/06/02 18:15:48 scottl Exp $"); #include "opt_aac.h" @@ -246,7 +246,8 @@ } } - aac_alloc_sync_fib(sc, &fib, AAC_SYNC_LOCK_FORCE); + /* Skip aac_alloc_sync_fib(). We don't want to mess with sleep locks */ + fib = &sc->aac_common->ac_sync_fib; bw = (struct aac_blockwrite *)&fib->data[0]; while (length > 0) { ==== //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#4 (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/aac/aacvar.h,v 1.42 2004/05/30 22:40:28 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.43 2004/06/02 18:15:48 scottl Exp $ */ #include @@ -332,10 +332,10 @@ TAILQ_HEAD(,aac_container) aac_container_tqh; aac_lock_t aac_container_lock; - /* Protect the sync fib */ -#define AAC_SYNC_LOCK_FORCE (1 << 0) - aac_lock_t aac_sync_lock; - + /* + * The general I/O lock. This protects the sync fib, the lists, the + * queues, and the registers. + */ aac_lock_t aac_io_lock; /* delayed activity infrastructure */ @@ -395,9 +395,6 @@ extern int aac_alloc_command(struct aac_softc *sc, struct aac_command **cmp); extern void aac_release_command(struct aac_command *cm); -extern int aac_alloc_sync_fib(struct aac_softc *sc, - struct aac_fib **fib, int flags); -extern void aac_release_sync_fib(struct aac_softc *sc); extern int aac_sync_fib(struct aac_softc *sc, u_int32_t command, u_int32_t xferstate, struct aac_fib *fib, u_int16_t datasize); @@ -574,3 +571,20 @@ sc->aac_common->ac_printf[0] = 0; AAC_QNOTIFY(sc, AAC_DB_PRINTF); } + +static __inline int +aac_alloc_sync_fib(struct aac_softc *sc, struct aac_fib **fib) +{ + + AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + *fib = &sc->aac_common->ac_sync_fib; + return (0); +} + +static __inline void +aac_release_sync_fib(struct aac_softc *sc) +{ + + AAC_LOCK_RELEASE(&sc->aac_io_lock); +} + ==== //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#5 (text+ko) ==== @@ -3,7 +3,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.6 2004/05/23 16:11:45 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.7 2004/06/02 18:03:07 fjoe Exp $"); #include "opt_inet.h" @@ -404,7 +404,7 @@ { struct arl_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; - struct ieee80211req *ireq = (struct ieee80211req *)data;; + struct ieee80211req *ireq = (struct ieee80211req *)data; d_thread_t *td = _ARL_CURPROC; struct arl_req arlan_io; int count, s, error = 0; ==== //depot/projects/netperf_socket/sys/i386/i386/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.264 2004/03/11 00:17:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.265 2004/06/02 07:52:33 tjr Exp $"); /* * 386 Trap and System call handling @@ -313,7 +313,7 @@ break; case T_PAGEFLT: /* page fault */ - if (td->td_flags & TDF_SA) + if (td->td_pflags & TDP_SA) thread_user_enter(p, td); i = trap_pfault(&frame, TRUE, eva); ==== //depot/projects/netperf_socket/sys/kern/kern_clock.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.168 2004/05/03 00:48:11 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.169 2004/06/02 12:05:06 tjr Exp $"); #include "opt_ntp.h" #include "opt_ddb.h" @@ -458,7 +458,6 @@ * if there is no related user location yet, don't * bother trying to count it. */ - td = curthread; if (td->td_proc->p_flag & P_PROFIL) addupc_intr(td, CLKF_PC(frame), 1); } ==== //depot/projects/netperf_socket/sys/kern/kern_exec.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.244 2004/05/21 14:50:23 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.245 2004/06/02 07:52:34 tjr Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -266,9 +266,7 @@ */ p->p_flag &= ~P_SA; td->td_mailbox = NULL; - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_SA; - mtx_unlock_spin(&sched_lock); + td->td_pflags &= ~TDP_SA; thread_single_end(); } p->p_flag |= P_INEXEC; ==== //depot/projects/netperf_socket/sys/kern/kern_exit.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.232 2004/05/26 12:09:38 tmm Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.233 2004/06/02 07:52:34 tjr Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -162,9 +162,7 @@ * Turn off threading support. */ p->p_flag &= ~P_SA; - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_SA; - mtx_unlock_spin(&sched_lock); + td->td_pflags &= ~TDP_SA; thread_single_end(); /* Don't need this any more. */ } ==== //depot/projects/netperf_socket/sys/kern/kern_sig.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.278 2004/05/21 10:02:24 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.279 2004/06/02 07:52:35 tjr Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1490,7 +1490,7 @@ int error; p = td->td_proc; - if (td->td_flags & TDF_SA) { + if (td->td_pflags & TDP_SA) { if (td->td_mailbox == NULL) thread_user_enter(p, td); PROC_LOCK(p); @@ -1524,7 +1524,7 @@ ktrpsig(sig, ps->ps_sigact[_SIG_IDX(sig)], &td->td_sigmask, code); #endif - if (!(td->td_flags & TDF_SA)) + if (!(td->td_pflags & TDP_SA)) (*p->p_sysent->sv_sendsig)( ps->ps_sigact[_SIG_IDX(sig)], sig, &td->td_sigmask, code); @@ -2291,7 +2291,7 @@ mtx_lock(&ps->ps_mtx); } - if (!(td->td_flags & TDF_SA && td->td_mailbox) && + if (!(td->td_pflags & TDP_SA && td->td_mailbox) && action == SIG_DFL) { /* * Default action, where the default is to kill @@ -2301,7 +2301,7 @@ sigexit(td, sig); /* NOTREACHED */ } else { - if (td->td_flags & TDF_SA && td->td_mailbox) { + if (td->td_pflags & TDP_SA && td->td_mailbox) { if (sig == SIGKILL) { mtx_unlock(&ps->ps_mtx); sigexit(td, sig); @@ -2350,7 +2350,7 @@ p->p_code = 0; p->p_sig = 0; } - if (td->td_flags & TDF_SA && td->td_mailbox) + if (td->td_pflags & TDP_SA && td->td_mailbox) thread_signal_add(curthread, sig); else (*p->p_sysent->sv_sendsig)(action, sig, ==== //depot/projects/netperf_socket/sys/kern/kern_thread.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.177 2004/05/21 14:50:23 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.178 2004/06/02 07:52:35 tjr Exp $"); #include #include @@ -609,7 +609,7 @@ return (error); TIMESPEC_TO_TIMEVAL(&tv, &timeout); } - if (td->td_flags & TDF_SA) + if (td->td_pflags & TDP_SA) td->td_pflags |= TDP_UPCALLING; else { ku->ku_mflags = fuword(&ku->ku_mailbox->km_flags); @@ -748,7 +748,7 @@ if (virtual_cpu != 0) ncpus = virtual_cpu; if (!(mbx.km_flags & KMF_BOUND)) - sa = TDF_SA; + sa = TDP_SA; else ncpus = 1; PROC_LOCK(p); @@ -787,7 +787,7 @@ mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); } else { - if (!first && ((td->td_flags & TDF_SA) ^ sa) != 0) + if (!first && ((td->td_pflags & TDP_SA) ^ sa) != 0) return (EINVAL); newkg = kg; } @@ -891,14 +891,14 @@ } if (!sa) { newtd->td_mailbox = mbx.km_curthread; - newtd->td_flags &= ~TDF_SA; + newtd->td_pflags &= ~TDP_SA; if (newtd != td) { mtx_unlock_spin(&sched_lock); cpu_set_upcall_kse(newtd, newku); mtx_lock_spin(&sched_lock); } } else { - newtd->td_flags |= TDF_SA; + newtd->td_pflags |= TDP_SA; } if (newtd != td) setrunqueue(newtd); @@ -1263,7 +1263,7 @@ struct thread *td = curthread; struct ksegrp *kg = td->td_ksegrp; - if (kg->kg_numupcalls == 0 || !(td->td_flags & TDF_SA)) + if (kg->kg_numupcalls == 0 || !(td->td_pflags & TDP_SA)) return (0); if (user) { /* Current always do via ast() */ @@ -1621,8 +1621,8 @@ /* Let the new thread become owner of the upcall */ ku->ku_owner = td2; td2->td_upcall = ku; - td2->td_flags = TDF_SA; - td2->td_pflags = TDP_UPCALLING; + td2->td_flags = 0; + td2->td_pflags = TDP_SA|TDP_UPCALLING; td2->td_kse = NULL; td2->td_state = TDS_CAN_RUN; td2->td_inhibitors = 0; @@ -1729,7 +1729,7 @@ * but for now do it every time. */ kg = td->td_ksegrp; - if (td->td_flags & TDF_SA) { + if (td->td_pflags & TDP_SA) { ku = td->td_upcall; KASSERT(ku, ("%s: no upcall owned", __func__)); KASSERT((ku->ku_owner == td), ("%s: wrong owner", __func__)); @@ -1788,7 +1788,7 @@ ku = td->td_upcall; /* Nothing to do with bound thread */ - if (!(td->td_flags & TDF_SA)) + if (!(td->td_pflags & TDP_SA)) return (0); /* ==== //depot/projects/netperf_socket/sys/kern/sched_ule.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.105 2004/04/22 21:37:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.106 2004/06/02 05:46:48 jeff Exp $"); #include #include @@ -74,12 +74,6 @@ int realstathz; int tickincr = 1; -#ifdef SMP -/* Callouts to handle load balancing SMP systems. */ -static struct callout kseq_lb_callout; -static struct callout kseq_group_callout; -#endif - /* * These datastructures are allocated within their parent datastructure but * are scheduler specific. @@ -249,12 +243,16 @@ static int ksg_maxid; static struct kseq kseq_cpu[MAXCPU]; static struct kseq_group kseq_groups[MAXCPU]; +static int bal_tick; +static int gbal_tick; + #define KSEQ_SELF() (&kseq_cpu[PCPU_GET(cpuid)]) #define KSEQ_CPU(x) (&kseq_cpu[(x)]) #define KSEQ_ID(x) ((x) - kseq_cpu) #define KSEQ_GROUP(x) (&kseq_groups[(x)]) #else /* !SMP */ static struct kseq kseq_cpu; + #define KSEQ_SELF() (&kseq_cpu) #define KSEQ_CPU(x) (&kseq_cpu) #endif @@ -279,7 +277,8 @@ #ifdef SMP static int kseq_transfer(struct kseq *ksq, struct kse *ke, int class); static struct kse *runq_steal(struct runq *rq); -static void sched_balance(void *arg); +static void sched_balance(void); +static void sched_balance_groups(void); static void sched_balance_group(struct kseq_group *ksg); static void sched_balance_pair(struct kseq *high, struct kseq *low); static void kseq_move(struct kseq *from, int cpu); @@ -448,16 +447,14 @@ * */ static void -sched_balance(void *arg) +sched_balance(void) { struct kseq_group *high; struct kseq_group *low; struct kseq_group *ksg; - int timo; int cnt; int i; - mtx_lock_spin(&sched_lock); if (smp_started == 0) goto out; low = high = NULL; @@ -480,24 +477,19 @@ sched_balance_pair(LIST_FIRST(&high->ksg_members), LIST_FIRST(&low->ksg_members)); out: - mtx_unlock_spin(&sched_lock); - timo = random() % (hz * 2); - callout_reset(&kseq_lb_callout, timo, sched_balance, NULL); + bal_tick = ticks + (random() % (hz * 2)); } static void -sched_balance_groups(void *arg) +sched_balance_groups(void) { - int timo; int i; - mtx_lock_spin(&sched_lock); + mtx_assert(&sched_lock, MA_OWNED); if (smp_started) for (i = 0; i <= ksg_maxid; i++) sched_balance_group(KSEQ_GROUP(i)); - mtx_unlock_spin(&sched_lock); - timo = random() % (hz * 2); - callout_reset(&kseq_group_callout, timo, sched_balance_groups, NULL); + gbal_tick = ticks + (random() % (hz * 2)); } static void @@ -514,8 +506,6 @@ high = NULL; LIST_FOREACH(kseq, &ksg->ksg_members, ksq_siblings) { load = kseq->ksq_load; - if (kseq == KSEQ_CPU(0)) - load--; if (high == NULL || load > high->ksq_load) high = kseq; if (low == NULL || load < low->ksq_load) @@ -544,16 +534,6 @@ transferable = high->ksq_transferable; high_load = high->ksq_load; low_load = low->ksq_load; - /* - * XXX If we encounter cpu 0 we must remember to reduce it's - * load by 1 to reflect the swi that is running the callout. - * At some point we should really fix load balancing of the - * swi and then this wont matter. - */ - if (high == KSEQ_CPU(0)) - high_load--; - if (low == KSEQ_CPU(0)) - low_load--; } else { transferable = high->ksq_group->ksg_transferable; high_load = high->ksq_group->ksg_load; @@ -873,7 +853,7 @@ ksq = &kseq_cpu[i]; ksg = &kseq_groups[i]; /* - * Setup a kse group with one member. + * Setup a kseq group with one member. */ ksq->ksq_transferable = 0; ksq->ksq_group = ksg; @@ -920,16 +900,13 @@ } ksg_maxid = smp_topology->ct_count - 1; } - callout_init(&kseq_lb_callout, CALLOUT_MPSAFE); - callout_init(&kseq_group_callout, CALLOUT_MPSAFE); - sched_balance(NULL); /* * Stagger the group and global load balancer so they do not * interfere with each other. */ + bal_tick = ticks + hz; if (balance_groups) - callout_reset(&kseq_group_callout, hz / 2, - sched_balance_groups, NULL); + gbal_tick = ticks + (hz / 2); #else kseq_setup(KSEQ_SELF()); #endif @@ -1398,6 +1375,13 @@ struct ksegrp *kg; struct kse *ke; + mtx_assert(&sched_lock, MA_OWNED); +#ifdef SMP + if (ticks == bal_tick) + sched_balance(); + if (ticks == gbal_tick) + sched_balance_groups(); +#endif /* * sched_setup() apparently happens prior to stathz being set. We * need to resolve the timers earlier in the boot so we can avoid @@ -1417,7 +1401,6 @@ ke = td->td_kse; kg = ke->ke_ksegrp; - mtx_assert(&sched_lock, MA_OWNED); /* Adjust ticks for pctcpu */ ke->ke_ticks++; ke->ke_ltick = ticks; ==== //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.72 2004/04/07 20:46:15 imp Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.73 2004/06/02 15:41:18 ume Exp $ */ /* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $ */ /* @@ -1107,13 +1107,8 @@ struct mbuf *m, **mp; { #define IS2292(x, y) ((in6p->in6p_flags & IN6P_RFC2292) ? (x) : (y)) - struct thread *td = curthread; /* XXX */ - int privileged = 0; struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); - if (td && !suser(td)) - privileged++; - #ifdef SO_TIMESTAMP if ((in6p->in6p_socket->so_options & SO_TIMESTAMP) != 0) { struct timeval tv; @@ -1169,16 +1164,13 @@ } /* - * IPV6_HOPOPTS socket option. We require super-user privilege - * for the option, but it might be too strict, since there might - * be some hop-by-hop options which can be returned to normal user. - * See RFC 2292 section 6. + * IPV6_HOPOPTS socket option. Recall that we required super-user + * privilege for the option (see ip6_ctloutput), but it might be too + * strict, since there might be some hop-by-hop options which can be + * returned to normal user. + * See also RFC 2292 section 6 (or RFC 3542 section 8). */ if ((in6p->in6p_flags & IN6P_HOPOPTS) != 0) { -#ifdef DIAGNOSTIC - if (!privileged) - panic("IN6P_HOPOPTS is set for unprivileged socket"); -#endif /* * Check if a hop-by-hop options header is contatined in the * received packet, and if so, store the options as ancillary @@ -1294,13 +1286,6 @@ if (!(in6p->in6p_flags & IN6P_DSTOPTS)) break; - /* - * We also require super-user privilege for - * the option. See comments on IN6_HOPOPTS. - */ - if (!privileged) - break; - *mp = sbcreatecontrol((caddr_t)ip6e, elen, IS2292(IPV6_2292DSTOPTS, IPV6_DSTOPTS), IPPROTO_IPV6); ==== //depot/projects/netperf_socket/sys/sys/proc.h#9 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.376 2004/05/26 12:09:39 tmm Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.377 2004/06/02 07:52:36 tjr Exp $ */ #ifndef _SYS_PROC_H_ @@ -353,7 +353,6 @@ #define TDF_OWEUPC 0x008000 /* Owe thread an addupc() call at next AST. */ #define TDF_NEEDRESCHED 0x010000 /* Thread needs to yield. */ #define TDF_NEEDSIGCHK 0x020000 /* Thread may need signal delivery. */ -#define TDF_SA 0x040000 /* A scheduler activation based thread. */ #define TDF_UMTXWAKEUP 0x080000 /* Libthr thread must not sleep on a umtx. */ #define TDF_THRWAKEUP 0x100000 /* Libthr thread must not suspend itself. */ #define TDF_DEADLKTREAT 0x800000 /* Lock aquisition - deadlock treatment. */ @@ -365,6 +364,7 @@ #define TDP_UPCALLING 0x0008 /* This thread is doing an upcall. */ #define TDP_COWINPROGRESS 0x0010 /* Snapshot copy-on-write in progress. */ #define TDP_ALTSTACK 0x0020 /* Have alternate signal stack. */ +#define TDP_SA 0x0080 /* A scheduler activation based thread. */ #define TDI_SUSPENDED 0x0001 /* On suspension queue. */ #define TDI_SLEEPING 0x0002 /* Actually asleep! (tricky). */ From owner-p4-projects@FreeBSD.ORG Wed Jun 2 17:13:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB5B316A4D0; Wed, 2 Jun 2004 17:13:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A103E16A4CE for ; Wed, 2 Jun 2004 17:13:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97E1E43D58 for ; Wed, 2 Jun 2004 17:13:48 -0700 (PDT) (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.11/8.12.11) with ESMTP id i530Dmjm019039 for ; Wed, 2 Jun 2004 17:13:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i530DmSF019036 for perforce@freebsd.org; Wed, 2 Jun 2004 17:13:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 2 Jun 2004 17:13:48 -0700 (PDT) Message-Id: <200406030013.i530DmSF019036@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 54068 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, 03 Jun 2004 00:13:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=54068 Change 54068 by rwatson@rwatson_tislabs on 2004/06/02 17:13:24 Move the process audit state pointer out of the "copy on fork" region so as not to trash the pointer to the new child state structure with a copy of the parent's pointer. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/sys/proc.h#5 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/sys/proc.h#5 (text+ko) ==== @@ -601,7 +601,6 @@ struct sysentvec *p_sysent; /* (b) Syscall dispatch info. */ struct pargs *p_args; /* (c) Process arguments. */ rlim_t p_cpulimit; /* (j) Current CPU limit in seconds. */ - struct auditinfo *p_au; /* (c) Process audit properties. */ /* End area that is copied on creation. */ #define p_endcopy p_xstat @@ -618,6 +617,7 @@ void *p_emuldata; /* (c) Emulator state data. */ struct label *p_label; /* (*) Proc (not subject) MAC label. */ struct p_sched *p_sched; /* (*) Scheduler-specific data. */ + struct auditinfo *p_au; /* (c) Process audit properties. */ }; #define p_rlimit p_limit->pl_rlimit From owner-p4-projects@FreeBSD.ORG Thu Jun 3 12:41:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DA9D16A4D0; Thu, 3 Jun 2004 12:41:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1185A16A4CE for ; Thu, 3 Jun 2004 12:41:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0414F43D1D for ; Thu, 3 Jun 2004 12:41:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53Jfsr0001153 for ; Thu, 3 Jun 2004 12:41:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53JfjPS001010 for perforce@freebsd.org; Thu, 3 Jun 2004 12:41:45 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 12:41:45 -0700 (PDT) Message-Id: <200406031941.i53JfjPS001010@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 54095 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, 03 Jun 2004 19:41:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=54095 Change 54095 by peter@peter_daintree on 2004/06/03 12:41:36 IFC @54094 Affected files ... .. //depot/projects/hammer/bin/ls/ls.c#11 integrate .. //depot/projects/hammer/bin/ps/ps.c#13 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#28 integrate .. //depot/projects/hammer/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#9 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/projects/hammer/lib/libc/gen/dlopen.3#4 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#11 integrate .. //depot/projects/hammer/lib/libncp/ncpl_subr.c#6 integrate .. //depot/projects/hammer/lib/libusbhid/usbhid.h#4 integrate .. //depot/projects/hammer/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/hammer/lib/msun/src/k_tan.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/hammer/release/alpha/mkisoimages.sh#2 integrate .. //depot/projects/hammer/release/amd64/mkisoimages.sh#3 integrate .. //depot/projects/hammer/release/i386/mkisoimages.sh#3 integrate .. //depot/projects/hammer/release/ia64/mkisoimages.sh#3 integrate .. //depot/projects/hammer/release/sparc64/mkisoimages.sh#4 integrate .. //depot/projects/hammer/sbin/devfs/extern.h#2 integrate .. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#2 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#24 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.8#4 integrate .. //depot/projects/hammer/share/man/man7/ports.7#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/mem.c#9 integrate .. //depot/projects/hammer/sys/alpha/alpha/uio_machdep.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#42 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#25 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#21 integrate .. //depot/projects/hammer/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot1.S#4 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#16 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#22 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#8 integrate .. //depot/projects/hammer/sys/dev/aac/aac_disk.c#9 integrate .. //depot/projects/hammer/sys/dev/aac/aacvar.h#10 integrate .. //depot/projects/hammer/sys/dev/adlink/adlink.c#8 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/tga.c#3 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#32 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#10 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#12 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#10 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_sbus.c#7 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_cbus.c#7 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#10 integrate .. //depot/projects/hammer/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/hammer/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#11 integrate .. //depot/projects/hammer/sys/dev/tga/tga_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#4 integrate .. //depot/projects/hammer/sys/dev/zs/zs_sbus.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#25 integrate .. //depot/projects/hammer/sys/i386/i386/uio_machdep.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/mem.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/uio_machdep.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#49 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#31 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#18 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#27 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#23 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#17 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/net/ethernet.h#4 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#9 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#20 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#13 integrate .. //depot/projects/hammer/sys/pc98/pc98/pmc.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/uio_machdep.c#3 integrate .. //depot/projects/hammer/sys/sparc64/central/central.c#2 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#10 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc_nexus.c#2 integrate .. //depot/projects/hammer/sys/sparc64/pci/apb.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mem.c#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/uio_machdep.c#4 integrate .. //depot/projects/hammer/sys/sys/proc.h#51 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#14 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#9 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#19 integrate .. //depot/projects/hammer/usr.bin/du/du.1#3 integrate .. //depot/projects/hammer/usr.bin/du/du.c#7 integrate .. //depot/projects/hammer/usr.bin/netstat/inet.c#10 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#8 integrate .. //depot/projects/hammer/usr.bin/tar/matching.c#4 integrate .. //depot/projects/hammer/usr.sbin/daemon/daemon.8#3 integrate .. //depot/projects/hammer/usr.sbin/daemon/daemon.c#3 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#12 integrate Differences ... ==== //depot/projects/hammer/bin/ls/ls.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.76 2004/04/06 20:06:47 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.77 2004/06/03 15:04:00 le Exp $"); #include #include @@ -621,6 +621,7 @@ MAKENINES(maxblock); MAKENINES(maxnlink); MAKENINES(maxsize); + free(jinitmax); } bcfile = 0; flags = NULL; ==== //depot/projects/hammer/bin/ps/ps.c#13 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.96 2004/06/01 19:00:42 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.98 2004/06/01 23:27:11 gad Exp $"); #include #include @@ -85,10 +85,10 @@ #endif /* - * isdigit is defined to work on an 'int', in the range 0 to 255, plus EOF. - * Define a wrapper which can take 'char', either signed or unsigned. + * isdigit takes an `int', but expects values in the range of unsigned char. + * This wrapper ensures that values from a 'char' end up in the correct range. */ -#define isdigitch(Anychar) isdigit(((int) Anychar) & 255) +#define isdigitch(Anychar) isdigit((u_char)(Anychar)) int cflag; /* -c */ int eval; /* Exit value */ @@ -207,7 +207,7 @@ init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); memf = nlistf = _PATH_DEVNULL; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) - switch((char)ch) { + switch ((char)ch) { case 'A': /* * Exactly the same as `-ax'. This has been @@ -427,10 +427,8 @@ * Discard setgid privileges if not the running kernel so that bad * guys can't print interesting stuff from kernel memory. */ - if (dropgid) { + if (dropgid) setgid(getgid()); - setuid(getuid()); - } kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf); if (kd == 0) @@ -658,9 +656,8 @@ if (grp == NULL) { warnx("No %s %s '%s'", inf->lname, nameorID, elem); optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } - if (inf->count >= inf->maxcount) expand_list(inf); inf->l.gids[(inf->count)++] = grp->gr_gid; @@ -691,9 +688,8 @@ } if (errno == ERANGE) { optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } - if (inf->count >= inf->maxcount) expand_list(inf); inf->l.pids[(inf->count)++] = tempid; @@ -721,14 +717,13 @@ if (stat(ttypath, &sb) == -1) { warn("%s", ttypath); optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } if (!S_ISCHR(sb.st_mode)) { warn("%s: Not a terminal", ttypath); optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } - if (inf->count >= inf->maxcount) expand_list(inf); inf->l.ttys[(inf->count)++] = sb.st_rdev; @@ -772,9 +767,8 @@ * errors (and the command will be aborted). */ optfatal = 1; - return (0); /* Do not add this value. */ + return (0); } - if (inf->count >= inf->maxcount) expand_list(inf); inf->l.uids[(inf->count)++] = pwd->pw_uid; @@ -790,7 +784,7 @@ char elemcopy[PATH_MAX]; if (*argp == 0) - inf->addelem(inf, elemcopy); + inf->addelem(inf, elemcopy); while (*argp != '\0') { while (*argp != '\0' && strchr(W_SEP, *argp) != NULL) argp++; @@ -849,8 +843,7 @@ newlist = realloc(inf->l.ptr, newmax * inf->elemsize); if (newlist == NULL) { free(inf->l.ptr); - errx(1, "realloc to %d %ss failed", newmax, - inf->lname); + errx(1, "realloc to %d %ss failed", newmax, inf->lname); } inf->maxcount = newmax; inf->l.ptr = newlist; ==== //depot/projects/hammer/etc/defaults/rc.conf#28 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.206 2004/05/29 04:52:37 njl Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.208 2004/06/02 09:58:18 ume Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -340,6 +340,8 @@ ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter, # see /usr/src/contrib/ipfilter/rules # for examples +ip6addrctl_enable="NO" # Set to YES to enable default address selection +ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages ############################################################## ### System console options ################################# ==== //depot/projects/hammer/etc/rc.d/ip6addrctl#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.2 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.3 2004/06/02 09:39:49 ume Exp $ # # PROVIDE: ip6addrctl @@ -9,11 +9,37 @@ # KEYWORD: FreeBSD nojail . /etc/rc.subr -. /etc/network.subr name="ip6addrctl" +rcvar=`set_rcvar` start_cmd="ip6addrctl_start" -stop_cmd=':' +stop_cmd="ip6addrctl_stop" +extra_commands="status prefer_ipv6 prefer_ipv4" +status_cmd="ip6addrctl" +prefer_ipv6_cmd="ip6addrctl_prefer_ipv6" +prefer_ipv4_cmd="ip6addrctl_prefer_ipv4" + +ip6addrctl_prefer_ipv6() +{ + ip6addrctl flush >/dev/null 2>&1 + ip6addrctl add ::1/128 50 0 + ip6addrctl add ::/0 40 1 + ip6addrctl add 2002::/16 30 2 + ip6addrctl add ::/96 20 3 + ip6addrctl add ::ffff:0:0/96 10 4 + checkyesno ip6addrctl_verbose && ip6addrctl +} + +ip6addrctl_prefer_ipv4() +{ + ip6addrctl flush >/dev/null 2>&1 + ip6addrctl add ::ffff:0:0/96 50 0 + ip6addrctl add ::1/128 40 1 + ip6addrctl add ::/0 30 2 + ip6addrctl add 2002::/16 20 3 + ip6addrctl add ::/96 10 4 + checkyesno ip6addrctl_verbose && ip6addrctl +} ip6addrctl_start() { @@ -24,10 +50,24 @@ if [ -f /etc/ip6addrctl.conf ]; then ip6addrctl flush >/dev/null 2>&1 ip6addrctl install /etc/ip6addrctl.conf - ip6addrctl + checkyesno ip6addrctl_verbose && ip6addrctl + else + if checkyesno ipv6_enable; then + ip6addrctl_prefer_ipv6 + else + ip6addrctl_prefer_ipv4 + fi fi fi } +ip6addrctl_stop() +{ + if ifconfig lo0 inet6 >/dev/null 2>&1; then + # We have IPv6 support in kernel. + ip6addrctl flush >/dev/null 2>&1 + fi +} + load_rc_config $name run_rc_command "$1" ==== //depot/projects/hammer/lib/libarchive/Makefile#9 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.11 2004/05/27 23:57:45 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.12 2004/06/02 08:16:21 kientzle Exp $ LIB= archive SHLIB_MAJOR= 1 .if ${MACHINE_ARCH} == "arm" -WARNS?= 3 +WARNS?= 3 .else WARNS?= 6 .endif @@ -92,8 +92,9 @@ MLINKS+= archive_entry.3 archive_entry_uname.3 MLINKS+= archive_entry.3 archive_entry_uname_w.3 MLINKS+= archive_read.3 archive_read_data.3 +MLINKS+= archive_read.3 archive_read_data_block.3 MLINKS+= archive_read.3 archive_read_data_into_buffer.3 -MLINKS+= archive_read.3 archive_read_data_into_file.3 +MLINKS+= archive_read.3 archive_read_data_into_fd.3 MLINKS+= archive_read.3 archive_read_data_skip.3 MLINKS+= archive_read.3 archive_read_extract.3 MLINKS+= archive_read.3 archive_read_extract_set_progress_callback.3 ==== //depot/projects/hammer/lib/libarchive/archive.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h,v 1.10 2004/05/27 04:00:25 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.11 2004/06/02 08:14:43 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -166,6 +166,14 @@ /* Read data from the body of an entry. Similar to read(2). */ ssize_t archive_read_data(struct archive *, void *, size_t); +/* + * A zero-copy version of archive_read_data that also exposes the file offset + * of each returned block. Note that the client has no way to specify + * the desired size of the block. The API does gaurantee that offsets will + * be strictly increasing and that returned blocks will not overlap. + */ +int archive_read_data_block(struct archive *a, + const void **buff, size_t *size, off_t *offset); /*- * Some convenience functions that are built on archive_read_data: ==== //depot/projects/hammer/lib/libarchive/archive_private.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.10 2004/05/27 05:02:35 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.11 2004/06/02 08:14:43 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -54,12 +54,13 @@ size_t null_length; /* - * Used to limit reads of entry data. Eventually, each reader - * will be able to register it's own read_data routine and these - * will move into the per-format data for the formats that use them. + * Used by archive_read_data() to track blocks and copy + * data to client buffers, filling gaps with zero bytes. */ - off_t entry_bytes_remaining; - off_t entry_padding; /* Skip this much after entry data. */ + const char *read_data_block; + off_t read_data_offset; + off_t read_data_output_offset; + size_t read_data_remaining; uid_t user_uid; /* UID of current user. */ @@ -151,6 +152,7 @@ struct archive_format_descriptor { int (*bid)(struct archive *); int (*read_header)(struct archive *, struct archive_entry *); + int (*read_data)(struct archive *, const void **, size_t *, off_t *); int (*cleanup)(struct archive *); void *format_data; /* Format-specific data for readers. */ } formats[4]; @@ -168,9 +170,8 @@ void *format_data; /* Used by writers. */ /* - * Pointers to format-specific functions. On read, these are - * initialized in the bid process. On write, they're initialized by - * archive_write_set_format_XXX() calls. + * Pointers to format-specific functions for writing. They're + * initialized by archive_write_set_format_XXX() calls. */ int (*format_init)(struct archive *); /* Only used on write. */ int (*format_finish)(struct archive *); @@ -220,6 +221,7 @@ void *format_data, int (*bid)(struct archive *), int (*read_header)(struct archive *, struct archive_entry *), + int (*read_data)(struct archive *, const void **, size_t *, off_t *), int (*cleanup)(struct archive *)); int __archive_read_register_compression(struct archive *a, ==== //depot/projects/hammer/lib/libarchive/archive_read.3#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.5 2004/05/27 04:21:52 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.6 2004/06/02 08:14:43 kientzle Exp $ .\" .Dd October 1, 2003 .Dt archive_read 3 @@ -43,9 +43,10 @@ .Nm archive_read_open_file , .Nm archive_read_next_header , .Nm archive_read_data , +.Nm archive_read_data_block , .Nm archive_read_data_skip , .Nm archive_read_data_into_buffer , -.Nm archive_read_data_into_file , +.Nm archive_read_data_into_fd , .Nm archive_read_extract , .Nm archive_read_extract_set_progress_callback , .Nm archive_read_finish @@ -83,11 +84,13 @@ .Ft ssize_t .Fn archive_read_data "struct archive *" "void *buff" "size_t len" .Ft int +.Fn archive_read_data_block "struct archive *" "const void **buff" "size_t *len" "off_t *offset" +.Ft int .Fn archive_read_data_skip "struct archive *" .Ft int .Fn archive_read_data_into_buffer "struct archive *" "void *" .Ft int -.Fn archive_read_data_into_file "struct archive *" "int fd" +.Fn archive_read_data_into_fd "struct archive *" "int fd" .Ft int .Fn archive_read_extract "struct archive *" "int flags" .Ft void @@ -165,18 +168,30 @@ .Tn struct archive_entry . .It Fn archive_read_data Read data associated with the header just read. +Internally, this is a convenience function that uses +.Fn archive_read_data_block . +.It Fn archive_read_data_block +Return the next available block of data for this entry. +Unlike +.Fn archive_read_data , +the +.Fn archive_read_data_block +function avoids copying data and allows you to correctly handle +sparse files, as supported by some archive formats. +The library gaurantees that offsets will increase and that blocks +will not overlap. .It Fn archive_read_data_skip A convenience function that repeatedly calls -.Fn archive_read_data +.Fn archive_read_data_block to skip all of the data for this archive entry. .It Fn archive_read_data_into_buffer A convenience function that repeatedly calls -.Fn archive_read_data +.Fn archive_read_data_block to copy the entire entry into the client-supplied buffer. Note that the client is responsible for sizing the buffer appropriately. -.It Fn archive_read_data_into_file +.It Fn archive_read_data_into_fd A convenience function that repeatedly calls -.Fn archive_read_data +.Fn archive_read_data_block to copy the entire entry to the provided file descriptor. .It Fn archive_read_extract A convenience function that recreates the specified object on ==== //depot/projects/hammer/lib/libarchive/archive_read.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.6 2004/04/13 23:45:37 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.7 2004/06/02 08:14:43 kientzle Exp $"); #include #include @@ -319,42 +319,61 @@ } /* - * Read data from an archive entry. + * Read data from an archive entry, using a read(2)-style interface. + * This is a convenience routine that just calls + * archive_read_data_block and copies the results into the client + * buffer, filling any gaps with zero bytes. Clients using this + * API can be completely ignorant of sparse-file issues; sparse files + * will simply be padded with nulls. */ ssize_t archive_read_data(struct archive *a, void *buff, size_t s) { - const void *data; - ssize_t bytes_read; + off_t remaining; + char *dest; + size_t bytes_read; + size_t len; + int r; + + bytes_read = 0; + dest = buff; - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); - /* - * off_t is generally at least as wide as size_t, so widen for - * comparison and narrow for the assignment. Otherwise, on - * platforms with 32-bit size_t and 64-bit off_t, we won't be - * able to correctly read archives with entries larger than - * 4gig. - */ - if ((off_t)s > a->entry_bytes_remaining) - s = (size_t)a->entry_bytes_remaining; - if (s > 0) { - bytes_read = (a->compression_read_ahead)(a, &data, 1); - if (bytes_read < 0) { - a->state = ARCHIVE_STATE_FATAL; - return (bytes_read); + while (s > 0) { + if (a->read_data_remaining <= 0) { + r = archive_read_data_block(a, + (const void **)&a->read_data_block, + &a->read_data_remaining, + &a->read_data_offset); + if (r == ARCHIVE_EOF) + return (bytes_read); + if (r != ARCHIVE_OK) + return (r); } - if ((size_t)bytes_read > s) - bytes_read = s; - } else - bytes_read = 0; - if (bytes_read > 0) { - memcpy(buff, data, bytes_read); - (a->compression_read_consume)(a, bytes_read); + if (a->read_data_offset < a->read_data_output_offset) { + remaining = + a->read_data_output_offset - a->read_data_offset; + if (remaining > (off_t)s) + remaining = (off_t)s; + len = (size_t)remaining; + memset(dest, 0, len); + a->read_data_output_offset += len; + s -= len; + bytes_read += len; + } else { + len = a->read_data_remaining; + if (len > s) + len = s; + memcpy(dest, a->read_data_block, len); + s -= len; + a->read_data_remaining -= len; + a->read_data_output_offset += len; + a->read_data_offset += len; + dest += len; + bytes_read += len; + } } - - a->entry_bytes_remaining -= bytes_read; - return (bytes_read); + return (ARCHIVE_OK); } /* @@ -363,33 +382,46 @@ int archive_read_data_skip(struct archive *a) { + int r; const void *buff; - ssize_t bytes_read, to_skip; + ssize_t size; + off_t offset; archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); - to_skip = a->entry_bytes_remaining + a->entry_padding; - a->entry_bytes_remaining = 0; + while ((r = archive_read_data_block(a, &buff, &size, &offset)) == + ARCHIVE_OK) + ; + + if (r == ARCHIVE_EOF) + r = ARCHIVE_OK; + + a->state = ARCHIVE_STATE_HEADER; + return (r); +} + +/* + * Read the next block of entry data from the archive. + * This is a zero-copy interface; the client receives a pointer, + * size, and file offset of the next available block of data. + * + * Returns ARCHIVE_OK if the operation is successful, ARCHIVE_EOF if + * the end of entry is encountered. + */ +int +archive_read_data_block(struct archive *a, + const void **buff, size_t *size, off_t *offset) +{ + archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); - for (; to_skip > 0; to_skip -= bytes_read) { - /* TODO: Optimize skip in compression layer. */ - bytes_read = (a->compression_read_ahead)(a, &buff, to_skip); - if (bytes_read < 0) { - a->entry_padding = to_skip; - return (ARCHIVE_FATAL); - } - if (bytes_read == 0) { - archive_set_error(a, EIO, - "Premature end of archive entry"); - return (ARCHIVE_FATAL); - } - if (bytes_read > to_skip) - bytes_read = to_skip; - (a->compression_read_consume)(a, bytes_read); + if (a->format->read_data == NULL) { + archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, + "Internal error: " + "No format_read_data_block function registered"); + return (ARCHIVE_FATAL); } - a->entry_padding = 0; - a->state = ARCHIVE_STATE_HEADER; - return (ARCHIVE_OK); + + return (a->format->read_data)(a, buff, size, offset); } /* @@ -445,6 +477,7 @@ void *format_data, int (*bid)(struct archive *), int (*read_header)(struct archive *, struct archive_entry *), + int (*read_data)(struct archive *, const void **, size_t *, off_t *), int (*cleanup)(struct archive *)) { int i, number_slots; @@ -459,6 +492,7 @@ if (a->formats[i].bid == NULL) { a->formats[i].bid = bid; a->formats[i].read_header = read_header; + a->formats[i].read_data = read_data; a->formats[i].cleanup = cleanup; a->formats[i].format_data = format_data; return (ARCHIVE_OK); ==== //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.5 2004/05/13 06:01:14 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.6 2004/06/02 08:14:43 kientzle Exp $"); #include #include @@ -33,36 +33,49 @@ #include "archive.h" #include "archive_private.h" +/* Maximum amount of data to write at one time. */ +#define MAX_WRITE (1024 * 1024) + /* - * This implementation minimizes copying of data. + * This implementation minimizes copying of data and is sparse-file aware. */ ssize_t archive_read_data_into_fd(struct archive *a, int fd) { - ssize_t bytes_read, bytes_written, total_written; + int r; const void *buff; + ssize_t size, bytes_to_write; + ssize_t bytes_written, total_written; + off_t offset; + off_t output_offset; + + archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); total_written = 0; - while (a->entry_bytes_remaining > 0) { - /* Remember: '1' here is minimum, not maximum. */ - /* Read-ahead function will return as much as is convenient. */ - bytes_read = (a->compression_read_ahead)(a, &buff, 1); - if (bytes_read < 0) - return (-1); - if (bytes_read > a->entry_bytes_remaining) - bytes_read = (ssize_t)a->entry_bytes_remaining; - /* Don't copy more than 1 megabyte at a time. */ - if (bytes_read > (1024*1024)) - bytes_read = 1024*1024; + output_offset = 0; - bytes_written = write(fd, buff, bytes_read); - if (bytes_written < 0) - return (-1); - (a->compression_read_consume)(a, bytes_written); - total_written += bytes_written; - a->entry_bytes_remaining -= bytes_written; - if (a->extract_progress != NULL) - (*a->extract_progress)(a->extract_progress_user_data); + while ((r = archive_read_data_block(a, &buff, &size, &offset)) == + ARCHIVE_OK) { + if (offset > output_offset) { + lseek(fd, offset - output_offset, SEEK_CUR); + output_offset = offset; + } + while (size > 0) { + bytes_to_write = size; + if (bytes_to_write > MAX_WRITE) + bytes_to_write = MAX_WRITE; + bytes_written = write(fd, buff, bytes_to_write); + if (bytes_written < 0) + return (-1); + output_offset += bytes_written; + total_written += bytes_written; + size -= bytes_written; + if (a->extract_progress != NULL) + (*a->extract_progress)(a->extract_progress_user_data); + } } + + if (r != ARCHIVE_EOF) + return (-1); return (total_written); } ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.9 2004/05/03 01:40:34 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.10 2004/06/02 08:14:43 kientzle Exp $"); #include @@ -97,27 +97,32 @@ #define CPIO_MAGIC 0x13141516 struct cpio { int magic; - int (*read_header)(struct archive *, struct stat *, - size_t *, size_t *); + int (*read_header)(struct archive *, struct cpio *, + struct stat *, size_t *, size_t *); struct links_entry *links_head; struct archive_string entry_name; struct archive_string entry_linkname; + off_t entry_bytes_remaining; + off_t entry_offset; + off_t entry_padding; }; static int64_t atol16(const char *, unsigned); static int64_t atol8(const char *, unsigned); static int archive_read_format_cpio_bid(struct archive *); static int archive_read_format_cpio_cleanup(struct archive *); +static int archive_read_format_cpio_read_data(struct archive *, + const void **, size_t *, off_t *); static int archive_read_format_cpio_read_header(struct archive *, struct archive_entry *); static int be4(const unsigned char *); -static int header_bin_be(struct archive *, struct stat *, +static int header_bin_be(struct archive *, struct cpio *, struct stat *, size_t *, size_t *); -static int header_bin_le(struct archive *, struct stat *, +static int header_bin_le(struct archive *, struct cpio *, struct stat *, size_t *, size_t *); -static int header_newc(struct archive *, struct stat *, +static int header_newc(struct archive *, struct cpio *, struct stat *, size_t *, size_t *); -static int header_odc(struct archive *, struct stat *, +static int header_odc(struct archive *, struct cpio *, struct stat *, size_t *, size_t *); static int le4(const unsigned char *); static void record_hardlink(struct cpio *cpio, struct archive_entry *entry, @@ -137,6 +142,7 @@ cpio, archive_read_format_cpio_bid, archive_read_format_cpio_read_header, + archive_read_format_cpio_read_data, archive_read_format_cpio_cleanup); if (r != ARCHIVE_OK) @@ -216,7 +222,7 @@ memset(&st, 0, sizeof(st)); cpio = *(a->pformat_data); - r = (cpio->read_header(a, &st, &namelength, &name_pad)); + r = (cpio->read_header(a, cpio, &st, &namelength, &name_pad)); if (r != ARCHIVE_OK) return (r); @@ -231,18 +237,19 @@ (a->compression_read_consume)(a, namelength + name_pad); archive_strncpy(&cpio->entry_name, h, namelength); archive_entry_set_pathname(entry, cpio->entry_name.s); + cpio->entry_offset = 0; /* If this is a symlink, read the link contents. */ if (S_ISLNK(st.st_mode)) { bytes = (a->compression_read_ahead)(a, &h, - a->entry_bytes_remaining); - if ((off_t)bytes < a->entry_bytes_remaining) + cpio->entry_bytes_remaining); + if ((off_t)bytes < cpio->entry_bytes_remaining) return (ARCHIVE_FATAL); - (a->compression_read_consume)(a, a->entry_bytes_remaining); + (a->compression_read_consume)(a, cpio->entry_bytes_remaining); archive_strncpy(&cpio->entry_linkname, h, - a->entry_bytes_remaining); + cpio->entry_bytes_remaining); archive_entry_set_symlink(entry, cpio->entry_linkname.s); - a->entry_bytes_remaining = 0; + cpio->entry_bytes_remaining = 0; } /* Compare name to "TRAILER!!!" to test for end-of-archive. */ @@ -259,7 +266,44 @@ } static int -header_newc(struct archive *a, struct stat *st, +archive_read_format_cpio_read_data(struct archive *a, + const void **buff, size_t *size, off_t *offset) +{ + ssize_t bytes_read; + struct cpio *cpio; + + cpio = *(a->pformat_data); + if (cpio->entry_bytes_remaining > 0) { + bytes_read = (a->compression_read_ahead)(a, buff, 1); + if (bytes_read <= 0) + return (ARCHIVE_FATAL); + if (bytes_read > cpio->entry_bytes_remaining) + bytes_read = cpio->entry_bytes_remaining; + *size = bytes_read; + *offset = cpio->entry_offset; + cpio->entry_offset += bytes_read; + cpio->entry_bytes_remaining -= bytes_read; + (a->compression_read_consume)(a, bytes_read); + return (ARCHIVE_OK); + } else { + while (cpio->entry_padding > 0) { + bytes_read = (a->compression_read_ahead)(a, buff, 1); + if (bytes_read <= 0) + return (ARCHIVE_FATAL); + if (bytes_read > cpio->entry_padding) + bytes_read = cpio->entry_padding; + (a->compression_read_consume)(a, bytes_read); + cpio->entry_padding -= bytes_read; + } + *buff = NULL; + *size = 0; + *offset = cpio->entry_offset; + return (ARCHIVE_EOF); + } +} + +static int +header_newc(struct archive *a, struct cpio *cpio, struct stat *st, size_t *namelength, size_t *name_pad) { const void *h; @@ -293,16 +337,16 @@ * size. struct stat.st_size may only be 32 bits, so * assigning there first could lose information. */ - a->entry_bytes_remaining = + cpio->entry_bytes_remaining = atol16(header->c_filesize, sizeof(header->c_filesize)); - st->st_size = a->entry_bytes_remaining; + st->st_size = cpio->entry_bytes_remaining; /* Pad file contents to a multiple of 4. */ - a->entry_padding = 3 & -a->entry_bytes_remaining; + cpio->entry_padding = 3 & -cpio->entry_bytes_remaining; return (ARCHIVE_OK); } static int -header_odc(struct archive *a, struct stat *st, +header_odc(struct archive *a, struct cpio *cpio, struct stat *st, size_t *namelength, size_t *name_pad) { const void *h; @@ -338,15 +382,15 @@ * size. struct stat.st_size may only be 32 bits, so * assigning there first could lose information. */ - a->entry_bytes_remaining = + cpio->entry_bytes_remaining = atol8(header->c_filesize, sizeof(header->c_filesize)); - st->st_size = a->entry_bytes_remaining; - a->entry_padding = 0; + st->st_size = cpio->entry_bytes_remaining; + cpio->entry_padding = 0; return (ARCHIVE_OK); } static int -header_bin_le(struct archive *a, struct stat *st, +header_bin_le(struct archive *a, struct cpio *cpio, struct stat *st, size_t *namelength, size_t *name_pad) { const void *h; @@ -376,14 +420,14 @@ *namelength = header->c_namesize[0] + header->c_namesize[1] * 256; *name_pad = *namelength & 1; /* Pad to even. */ - a->entry_bytes_remaining = le4(header->c_filesize); - st->st_size = a->entry_bytes_remaining; - a->entry_padding = a->entry_bytes_remaining & 1; /* Pad to even. */ + cpio->entry_bytes_remaining = le4(header->c_filesize); + st->st_size = cpio->entry_bytes_remaining; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 3 12:47:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D8D516A4D0; Thu, 3 Jun 2004 12:47:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBD1E16A4CE for ; Thu, 3 Jun 2004 12:47:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA0D943D48 for ; Thu, 3 Jun 2004 12:47:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53Jl1Bd002465 for ; Thu, 3 Jun 2004 12:47:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53Jl1hZ002345 for perforce@freebsd.org; Thu, 3 Jun 2004 12:47:01 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 12:47:01 -0700 (PDT) Message-Id: <200406031947.i53Jl1hZ002345@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 54096 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, 03 Jun 2004 19:47:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=54096 Change 54096 by peter@peter_daintree on 2004/06/03 12:46:38 integrate -I -b i386_hammer (sync metadata in this case) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#47 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#47 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 3 13:13:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA18B16A4D0; Thu, 3 Jun 2004 13:13:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8681516A4CE for ; Thu, 3 Jun 2004 13:13:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ADFA43D41 for ; Thu, 3 Jun 2004 13:13:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53KDkBb015083 for ; Thu, 3 Jun 2004 13:13:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53KDkol015080 for perforce@freebsd.org; Thu, 3 Jun 2004 13:13:46 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 13:13:46 -0700 (PDT) Message-Id: <200406032013.i53KDkol015080@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 54101 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, 03 Jun 2004 20:13:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=54101 Change 54101 by peter@peter_daintree on 2004/06/03 13:13:01 IFC @54100 Affected files ... .. //depot/projects/hammer/sys/kern/subr_witness.c#28 integrate Differences ... ==== //depot/projects/hammer/sys/kern/subr_witness.c#28 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.172 2004/06/02 23:28:06 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.173 2004/06/03 20:07:44 jhb Exp $"); #include "opt_ddb.h" #include "opt_witness.h" @@ -283,8 +283,8 @@ { NULL, NULL }, /* * UNIX Domain Sockets + { NULL, NULL }, */ - { NULL, NULL }, /* * UDP/IP */ @@ -302,6 +302,7 @@ */ { "slip_mtx", &lock_class_mtx_sleep }, { "slip sc_mtx", &lock_class_mtx_sleep }, + { NULL, NULL }, /* * spin locks */ From owner-p4-projects@FreeBSD.ORG Thu Jun 3 14:17:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A7F116A4D0; Thu, 3 Jun 2004 14:17:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 13E6716A4CE for ; Thu, 3 Jun 2004 14:17:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E745E43D3F for ; Thu, 3 Jun 2004 14:17:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53LH8HX028753 for ; Thu, 3 Jun 2004 14:17:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53LH7rF028750 for perforce@freebsd.org; Thu, 3 Jun 2004 14:17:07 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 14:17:07 -0700 (PDT) Message-Id: <200406032117.i53LH7rF028750@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 54109 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, 03 Jun 2004 21:17:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=54109 Change 54109 by peter@peter_daintree on 2004/06/03 14:16:20 IFC @54108 Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#24 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#8 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#26 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#30 integrate .. //depot/projects/hammer/sys/i386/include/cputypes.h#3 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#34 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.12 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.13 2004/06/03 20:25:04 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#30 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.131 2004/04/07 00:44:15 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.132 2004/06/03 20:18:15 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#27 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.8 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.9 2004/06/03 20:25:05 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.54 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.55 2004/06/03 20:25:05 peter Exp $"); /* * This code implements a system driver for legacy systems that do not ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#27 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.230 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.231 2004/06/03 20:25:05 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#24 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.59 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.60 2004/06/03 20:22:48 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.17 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.18 2004/06/03 20:18:15 peter Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ ==== //depot/projects/hammer/sys/amd64/isa/clock.c#26 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.210 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.211 2004/06/03 20:21:30 peter Exp $"); /* * Routines to handle clock hardware. @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/hammer/sys/i386/i386/identcpu.c#16 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.138 2004/05/30 15:16:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.139 2004/06/03 21:14:53 phk Exp $"); #include "opt_cpu.h" @@ -570,6 +570,7 @@ switch (cpu_id & 0xfff) { case 0x540: strcpy(cpu_model, "Geode SC1100"); + cpu = CPU_GEODE1100; tsc_is_broken = 1; break; default: @@ -640,6 +641,7 @@ strcmp(cpu_vendor, "TransmetaCPU") == 0 || strcmp(cpu_vendor, "RiseRiseRise") == 0 || strcmp(cpu_vendor, "CentaurHauls") == 0 || + strcmp(cpu_vendor, "Geode by NSC") == 0 || ((strcmp(cpu_vendor, "CyrixInstead") == 0) && ((cpu_id & 0xf00) > 0x500))) { printf(" Stepping = %u", cpu_id & 0xf); ==== //depot/projects/hammer/sys/i386/i386/vm_machdep.c#30 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.239 2004/05/31 21:46:03 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.240 2004/06/03 21:14:53 phk Exp $"); #include "opt_isa.h" #include "opt_npx.h" @@ -545,6 +545,12 @@ elan_mmcr->RESCFG = 1; #endif + if (cpu == CPU_GEODE1100) { + /* Attempt Geode's own reset */ + outl(0xcf8, 0x80009044ul); + outl(0xcfc, 0xf); + } + #ifdef PC98 /* * Attempt to do a CPU reset via CPU reset port. ==== //depot/projects/hammer/sys/i386/include/cputypes.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cputypes.h,v 1.17 2004/05/30 15:16:07 phk Exp $ + * $FreeBSD: src/sys/i386/include/cputypes.h,v 1.18 2004/06/03 21:14:52 phk Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ @@ -59,6 +59,7 @@ #define CPU_PII 14 /* Intel Pentium II */ #define CPU_PIII 15 /* Intel Pentium III */ #define CPU_P4 16 /* Intel Pentium 4 */ +#define CPU_GEODE1100 17 /* NS Geode SC1100 */ #ifndef LOCORE extern int cpu; From owner-p4-projects@FreeBSD.ORG Thu Jun 3 14:18:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F3C716A4D0; Thu, 3 Jun 2004 14:18:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA4E216A4CE for ; Thu, 3 Jun 2004 14:18:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C681543D1D for ; Thu, 3 Jun 2004 14:18:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53LIAAt028789 for ; Thu, 3 Jun 2004 14:18:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53LIAWR028786 for perforce@freebsd.org; Thu, 3 Jun 2004 14:18:10 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 14:18:10 -0700 (PDT) Message-Id: <200406032118.i53LIAWR028786@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 54110 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, 03 Jun 2004 21:18:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=54110 Change 54110 by peter@peter_daintree on 2004/06/03 14:17:36 not needed here Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#44 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#44 (text+ko) ==== @@ -67,7 +67,6 @@ #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Jun 3 14:18:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1C6F16A4DB; Thu, 3 Jun 2004 14:18:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DCA716A4F0 for ; Thu, 3 Jun 2004 14:18:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A59843D2D for ; Thu, 3 Jun 2004 14:18:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53LIB7F028796 for ; Thu, 3 Jun 2004 14:18:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53LIA8Z028792 for perforce@freebsd.org; Thu, 3 Jun 2004 14:18:10 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 14:18:10 -0700 (PDT) Message-Id: <200406032118.i53LIA8Z028792@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 54111 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, 03 Jun 2004 21:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=54111 Change 54111 by peter@peter_daintree on 2004/06/03 14:17:57 de-dup Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mem.c#21 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#21 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Thu Jun 3 14:49:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CA6D16A4D0; Thu, 3 Jun 2004 14:49:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DDD116A4CE for ; Thu, 3 Jun 2004 14:49:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E043543D41 for ; Thu, 3 Jun 2004 14:49:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53Lno6A034992 for ; Thu, 3 Jun 2004 14:49:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53Lnocb034989 for perforce@freebsd.org; Thu, 3 Jun 2004 14:49:50 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 14:49:50 -0700 (PDT) Message-Id: <200406032149.i53Lnocb034989@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 54113 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, 03 Jun 2004 21:49:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=54113 Change 54113 by peter@peter_daintree on 2004/06/03 14:49:01 IFC @54112 Affected files ... .. //depot/projects/hammer/sys/amd64/conf/GENERIC#43 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#43 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.409 2004/05/17 22:13:14 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.410 2004/06/03 21:40:41 peter Exp $ machine amd64 cpu HAMMER From owner-p4-projects@FreeBSD.ORG Thu Jun 3 14:53:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4806F16A4D0; Thu, 3 Jun 2004 14:53:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2233216A4CF for ; Thu, 3 Jun 2004 14:53:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3FD943D45 for ; Thu, 3 Jun 2004 14:53:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53Lqsl2036832 for ; Thu, 3 Jun 2004 14:52:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53Lqs1w036829 for perforce@freebsd.org; Thu, 3 Jun 2004 14:52:54 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 14:52:54 -0700 (PDT) Message-Id: <200406032152.i53Lqs1w036829@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 54114 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, 03 Jun 2004 21:53:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=54114 Change 54114 by peter@peter_daintree on 2004/06/03 14:52:50 hack: dont hang at shutdown with acpi enabled. Affected files ... .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#20 edit Differences ... ==== //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#20 (text+ko) ==== @@ -377,8 +377,10 @@ /* Wait for all processors to exit acpi_cpu_idle(). */ smp_rendezvous(NULL, NULL, NULL, NULL); +#if 0 while (cpu_idle_busy > 0) DELAY(1); +#endif return_VALUE (0); } From owner-p4-projects@FreeBSD.ORG Thu Jun 3 16:12:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE68E16A4D0; Thu, 3 Jun 2004 16:12:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85C3B16A4CE for ; Thu, 3 Jun 2004 16:12:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6719743D41 for ; Thu, 3 Jun 2004 16:12:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53NCXMl055750 for ; Thu, 3 Jun 2004 16:12:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53NCWLq055737 for perforce@freebsd.org; Thu, 3 Jun 2004 16:12:32 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 3 Jun 2004 16:12:32 -0700 (PDT) Message-Id: <200406032312.i53NCWLq055737@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 54116 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, 03 Jun 2004 23:12:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=54116 Change 54116 by peter@peter_daintree on 2004/06/03 16:11:34 slight reorg. promote features bits to public interfaces, test cpuid for the NX bits and turn on EFER_NXE etc. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#31 edit .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#9 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#87 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#61 edit .. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#11 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#71 edit .. //depot/projects/hammer/sys/amd64/include/md_var.h#26 edit .. //depot/projects/hammer/sys/amd64/include/pmap.h#33 edit .. //depot/projects/hammer/sys/amd64/include/specialreg.h#15 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#31 (text+ko) ==== @@ -69,13 +69,10 @@ void earlysetcpuclass(void); void panicifcpuunsupported(void); -static void print_AMD_features(void); static void print_AMD_info(void); static void print_AMD_assoc(int i); -int cpu_feature2; /* XXX change cpu_feature to long? */ int cpu_class; -u_int cpu_exthigh; /* Highest arg to extended CPUID */ char machine[] = "amd64"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); @@ -109,26 +106,18 @@ strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model)); /* Check for extended CPUID information and a processor name. */ - if (cpu_high > 0 && - (strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0)) { - do_cpuid(0x80000000, regs); - if (regs[0] >= 0x80000000) { - cpu_exthigh = regs[0]; - if (cpu_exthigh >= 0x80000004) { - brand = cpu_brand; - for (i = 0x80000002; i < 0x80000005; i++) { - do_cpuid(i, regs); - memcpy(brand, regs, sizeof(regs)); - brand += sizeof(regs); - } - } + if (cpu_exthigh >= 0x80000004) { + brand = cpu_brand; + for (i = 0x80000002; i < 0x80000005; i++) { + do_cpuid(i, regs); + memcpy(brand, regs, sizeof(regs)); + brand += sizeof(regs); } } if (strcmp(cpu_vendor, "GenuineIntel") == 0) { - /* Better late than never I suppose.. */ - strcat(cpu_model, "IA-32e"); + /* Please make up your mind folks! */ + strcat(cpu_model, "EM64T"); } else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { /* * Values taken from AMD Processor Recognition @@ -259,6 +248,43 @@ "\040" ); } + if (amd_feature != 0) { + printf("\n AMD Features=0x%b", amd_feature, + "\020" /* in hex */ + "\001FPU" /* Integral FPU */ + "\002VME" /* Extended VM86 mode support */ + "\003DE" /* Debug extensions */ + "\004PSE" /* 4MByte page tables */ + "\005TSC" /* Timestamp counter */ + "\006MSR" /* Machine specific registers */ + "\007PAE" /* Physical address extension */ + "\010MCE" /* Machine Check support */ + "\011CX8" /* CMPEXCH8 instruction */ + "\012APIC" /* SMP local APIC */ + "\013" + "\014SYSCALL" /* SYSENTER/SYSEXIT instructions */ + "\015MTRR" /* Memory Type Range Registers */ + "\016PGE" /* PG_G (global bit) support */ + "\017MCA" /* Machine Check Architecture */ + "\020CMOV" /* CMOV instruction */ + "\021PAT" /* Page attributes table */ + "\022PGE36" /* 36 bit address space support */ + "\023RSVD" /* Reserved, unknown */ + "\024MP" /* Multiprocessor Capable */ + "\025NX" /* Has EFER.NXE, NX (no execute pte bit) */ + "\026" + "\027MMX+" /* AMD MMX Instruction Extensions */ + "\030MMX" + "\031FXSAVE" /* FXSAVE/FXRSTOR */ + "\032" + "\033" + "\034" + "\035" + "\036LM" /* Long mode */ + "\0373DNow!+" /* AMD 3DNow! Instruction Extensions */ + "\0403DNow!" /* AMD 3DNow! Instructions */ + ); + } /* * If this CPU supports hyperthreading then mention @@ -269,8 +295,6 @@ printf("\n Hyperthreading: %d logical CPUs", (cpu_procinfo & CPUID_HTT_CORES) >> 16); } - if (cpu_exthigh >= 0x80000001) - print_AMD_features(); } /* Avoid ugly blank lines: only print newline when we have to. */ if (*cpu_vendor || cpu_id) @@ -327,6 +351,16 @@ cpu_feature = regs[3]; cpu_feature2 = regs[2]; + if (strcmp(cpu_vendor, "GenuineIntel") == 0 || + strcmp(cpu_vendor, "AuthenticAMD") == 0) { + do_cpuid(0x80000000, regs); + cpu_exthigh = regs[0]; + } + if (cpu_exthigh >= 0x80000001) { + do_cpuid(0x80000001, regs); + amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff); + } + /* XXX */ cpu = CPU_CLAWHAMMER; } @@ -358,111 +392,64 @@ static void print_AMD_info(void) { + u_int regs[4]; - if (cpu_exthigh >= 0x80000005) { - u_int regs[4]; + if (cpu_exthigh < 0x80000005) + return; - do_cpuid(0x80000005, regs); - printf("L1 2MB data TLB: %d entries", (regs[0] >> 16) & 0xff); - print_AMD_assoc(regs[0] >> 24); + do_cpuid(0x80000005, regs); + printf("L1 2MB data TLB: %d entries", (regs[0] >> 16) & 0xff); + print_AMD_assoc(regs[0] >> 24); - printf("L1 2MB instruction TLB: %d entries", regs[0] & 0xff); - print_AMD_assoc((regs[0] >> 8) & 0xff); + printf("L1 2MB instruction TLB: %d entries", regs[0] & 0xff); + print_AMD_assoc((regs[0] >> 8) & 0xff); - printf("L1 4KB data TLB: %d entries", (regs[1] >> 16) & 0xff); - print_AMD_assoc(regs[1] >> 24); + printf("L1 4KB data TLB: %d entries", (regs[1] >> 16) & 0xff); + print_AMD_assoc(regs[1] >> 24); - printf("L1 4KB instruction TLB: %d entries", regs[1] & 0xff); - print_AMD_assoc((regs[1] >> 8) & 0xff); + printf("L1 4KB instruction TLB: %d entries", regs[1] & 0xff); + print_AMD_assoc((regs[1] >> 8) & 0xff); - printf("L1 data cache: %d kbytes", regs[2] >> 24); - printf(", %d bytes/line", regs[2] & 0xff); - printf(", %d lines/tag", (regs[2] >> 8) & 0xff); - print_AMD_assoc((regs[2] >> 16) & 0xff); + printf("L1 data cache: %d kbytes", regs[2] >> 24); + printf(", %d bytes/line", regs[2] & 0xff); + printf(", %d lines/tag", (regs[2] >> 8) & 0xff); + print_AMD_assoc((regs[2] >> 16) & 0xff); - printf("L1 instruction cache: %d kbytes", regs[3] >> 24); - printf(", %d bytes/line", regs[3] & 0xff); - printf(", %d lines/tag", (regs[3] >> 8) & 0xff); - print_AMD_assoc((regs[3] >> 16) & 0xff); + printf("L1 instruction cache: %d kbytes", regs[3] >> 24); + printf(", %d bytes/line", regs[3] & 0xff); + printf(", %d lines/tag", (regs[3] >> 8) & 0xff); + print_AMD_assoc((regs[3] >> 16) & 0xff); - if (cpu_exthigh >= 0x80000006) { - do_cpuid(0x80000006, regs); - if ((regs[0] >> 16) != 0) { - printf("L2 2MB data TLB: %d entries", - (regs[0] >> 16) & 0xfff); - print_AMD_l2_assoc(regs[0] >> 28); - printf("L2 2MB instruction TLB: %d entries", - regs[0] & 0xfff); - print_AMD_l2_assoc((regs[0] >> 28) & 0xf); - } else { - printf("L2 2MB unified TLB: %d entries", - regs[0] & 0xfff); - print_AMD_l2_assoc((regs[0] >> 28) & 0xf); - } - if ((regs[1] >> 16) != 0) { - printf("L2 4KB data TLB: %d entries", - (regs[1] >> 16) & 0xfff); - print_AMD_l2_assoc(regs[1] >> 28); + if (cpu_exthigh >= 0x80000006) { + do_cpuid(0x80000006, regs); + if ((regs[0] >> 16) != 0) { + printf("L2 2MB data TLB: %d entries", + (regs[0] >> 16) & 0xfff); + print_AMD_l2_assoc(regs[0] >> 28); + printf("L2 2MB instruction TLB: %d entries", + regs[0] & 0xfff); + print_AMD_l2_assoc((regs[0] >> 28) & 0xf); + } else { + printf("L2 2MB unified TLB: %d entries", + regs[0] & 0xfff); + print_AMD_l2_assoc((regs[0] >> 28) & 0xf); + } + if ((regs[1] >> 16) != 0) { + printf("L2 4KB data TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc(regs[1] >> 28); - printf("L2 4KB instruction TLB: %d entries", - (regs[1] >> 16) & 0xfff); - print_AMD_l2_assoc((regs[1] >> 28) & 0xf); - } else { - printf("L2 4KB unified TLB: %d entries", - (regs[1] >> 16) & 0xfff); - print_AMD_l2_assoc((regs[1] >> 28) & 0xf); - } - printf("L2 unified cache: %d kbytes", regs[2] >> 16); - printf(", %d bytes/line", regs[2] & 0xff); - printf(", %d lines/tag", (regs[2] >> 8) & 0x0f); - print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); + printf("L2 4KB instruction TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc((regs[1] >> 28) & 0xf); + } else { + printf("L2 4KB unified TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc((regs[1] >> 28) & 0xf); } + printf("L2 unified cache: %d kbytes", regs[2] >> 16); + printf(", %d bytes/line", regs[2] & 0xff); + printf(", %d lines/tag", (regs[2] >> 8) & 0x0f); + print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } - -static void -print_AMD_features(void) -{ - u_int regs[4]; - - /* - * Values taken from AMD Processor Recognition - * http://www.amd.com/products/cpg/athlon/techdocs/pdf/20734.pdf - */ - do_cpuid(0x80000001, regs); - printf("\n AMD Features=0x%b", regs[3] & ~(cpu_feature & 0x0183f3ff), - "\020" /* in hex */ - "\001FPU" /* Integral FPU */ - "\002VME" /* Extended VM86 mode support */ - "\003DE" /* Debug extensions */ - "\004PSE" /* 4MByte page tables */ - "\005TSC" /* Timestamp counter */ - "\006MSR" /* Machine specific registers */ - "\007PAE" /* Physical address extension */ - "\010MCE" /* Machine Check support */ - "\011CX8" /* CMPEXCH8 instruction */ - "\012APIC" /* SMP local APIC */ - "\013" - "\014SYSCALL" /* SYSENTER/SYSEXIT instructions */ - "\015MTRR" /* Memory Type Range Registers */ - "\016PGE" /* PG_G (global bit) support */ - "\017MCA" /* Machine Check Architecture */ - "\020CMOV" /* CMOV instruction */ - "\021PAT" /* Page attributes table */ - "\022PGE36" /* 36 bit address space support */ - "\023RSVD" /* Reserved, unknown */ - "\024MP" /* Multiprocessor Capable */ - "\025NX" /* Has EFER.NXE, NX (no execute pte bit) */ - "\026" - "\027MMX+" /* AMD MMX Instruction Extensions */ - "\030MMX" - "\031FXSAVE" /* FXSAVE/FXRSTOR */ - "\032" - "\033" - "\034" - "\035" - "\036LM" /* Long mode */ - "\0373DNow!+" /* AMD 3DNow! Instruction Extensions */ - "\0403DNow!" /* AMD 3DNow! Instructions */ - ); -} ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#9 (text+ko) ==== @@ -41,7 +41,8 @@ #include #include -void initializecpu(void); +#include +#include static int hw_instruction_sse; SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD, @@ -49,31 +50,30 @@ int cpu; /* Are we 386, 386sx, 486, etc? */ u_int cpu_feature; /* Feature flags */ +u_int cpu_feature2; /* Feature flags */ +u_int amd_feature; /* Feature flags */ u_int cpu_high; /* Highest arg to CPUID */ +u_int cpu_exthigh; /* Highest arg to extended CPUID */ u_int cpu_id; /* Stepping ID */ u_int cpu_procinfo; /* HyperThreading Info / Brand Index / CLFUSH */ char cpu_vendor[20]; /* CPU Origin code */ u_int cpu_fxsr; /* SSE enabled */ /* - * Initialize CR4 (Control register 4) to enable SSE instructions. + * Initialize CPU control registers */ void -enable_sse(void) +initializecpu(void) { + uint64_t msr; + if ((cpu_feature & CPUID_XMM) && (cpu_feature & CPUID_FXSR)) { load_cr4(rcr4() | CR4_FXSR | CR4_XMM); cpu_fxsr = hw_instruction_sse = 1; } -} - -void -initializecpu(void) -{ - - switch (cpu) { - default: - break; + if ((amd_feature & AMDID_NX) != 0) { + msr = rdmsr(MSR_EFER) | EFER_NXE; + wrmsr(MSR_EFER, msr); + pg_nx = PG_NX; } - enable_sse(); } ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#87 (text+ko) ==== @@ -130,7 +130,6 @@ extern void printcpuinfo(void); /* XXX header file */ extern void identify_cpu(void); extern void panicifcpuunsupported(void); -extern void initializecpu(void); #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) @@ -1108,12 +1107,6 @@ #error "have you forgotten the isa device?"; #endif -#if 0 /* Not till we test the features bit */ - /* Turn on PTE NX (no execute) bit */ - msr = rdmsr(MSR_EFER) | EFER_NXE; - wrmsr(MSR_EFER, msr); -#endif - proc0.p_uarea = (struct user *)(physfree + KERNBASE); bzero(proc0.p_uarea, UAREA_PAGES * PAGE_SIZE); physfree += UAREA_PAGES * PAGE_SIZE; ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#61 (text+ko) ==== @@ -432,8 +432,8 @@ /* set up FPU state on the AP */ fpuinit(); - /* set up SSE registers */ - enable_sse(); + /* set up SSE/NX registers */ + initializecpu(); /* A quick check from sanity claus */ if (PCPU_GET(apic_id) != lapic_id()) { ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#11 (text+ko) ==== @@ -102,11 +102,7 @@ */ movl $MSR_EFER, %ecx rdmsr -#if 0 /* not till we test the NX cpuid bits */ - orl $EFER_LME | EFER_SCE | EFER_NXE, %eax -#else orl $EFER_LME | EFER_SCE, %eax -#endif wrmsr /* ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#71 (text+ko) ==== @@ -174,6 +174,7 @@ static int ndmpdp; static vm_paddr_t dmaplimit; vm_offset_t kernel_vm_end; +pt_entry_t pg_nx; static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ @@ -1944,10 +1945,8 @@ newpte = (pt_entry_t)(pa | PG_V); if ((prot & VM_PROT_WRITE) != 0) newpte |= PG_RW; -#ifdef PG_NX if ((prot & VM_PROT_EXECUTE) == 0) - newpte |= PG_NX; -#endif + newpte |= pg_nx; if (wired) newpte |= PG_W; if (va < VM_MAXUSER_ADDRESS) ==== //depot/projects/hammer/sys/amd64/include/md_var.h#26 (text+ko) ==== @@ -42,6 +42,8 @@ extern int busdma_swi_pending; extern u_int cpu_exthigh; extern u_int cpu_feature; +extern u_int cpu_feature2; +extern u_int amd_feature; extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id; @@ -63,7 +65,7 @@ void cpu_setregs(void); void doreti_iret(void) __asm(__STRING(doreti_iret)); void doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault)); -void enable_sse(void); +void initializecpu(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); void fpstate_drop(struct thread *td); int is_physical_memory(vm_paddr_t addr); ==== //depot/projects/hammer/sys/amd64/include/pmap.h#33 (text+ko) ==== @@ -62,6 +62,7 @@ #define PG_AVAIL1 0x200 /* / Available for system */ #define PG_AVAIL2 0x400 /* < programmers use */ #define PG_AVAIL3 0x800 /* \ */ +#define PG_NX (1ul<<63) /* No-execute */ /* Our various interpretations of the above */ @@ -202,6 +203,8 @@ #define pde_store(pdep, pde) pte_store((pdep), (pde)) +extern pt_entry_t pg_nx; + #endif /* _KERNEL */ /* ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#15 (text+ko) ==== @@ -112,6 +112,22 @@ #define CPUID_B30 0x40000000 #define CPUID_PBE 0x80000000 +#define CPUID2_SSE3 0x00000001 +#define CPUID2_MON 0x00000008 +#define CPUID2_DS_CPL 0x00000010 +#define CPUID2_EST 0x00000080 +#define CPUID2_TM2 0x00000100 +#define CPUID2_CNTXID 0x00000400 +#define CPUID2_CX16 0x00002000 + +/* + * Important bits in the AMD extended cpuid flags + */ +#define AMDID_SYSCALL 0x00000800 +#define AMDID_MP 0x00080000 +#define AMDID_NX 0x00100000 +#define AMDID_LM 0x20000000 + /* * CPUID instruction 1 ebx info */ From owner-p4-projects@FreeBSD.ORG Thu Jun 3 20:52:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9D5016A4D0; Thu, 3 Jun 2004 20:52:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C5C116A4CE for ; Thu, 3 Jun 2004 20:52:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7110443D1D for ; Thu, 3 Jun 2004 20:52:19 -0700 (PDT) (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.11/8.12.11) with ESMTP id i543qJa6027966 for ; Thu, 3 Jun 2004 20:52:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i543qIWk027954 for perforce@freebsd.org; Thu, 3 Jun 2004 20:52:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 3 Jun 2004 20:52:18 -0700 (PDT) Message-Id: <200406040352.i543qIWk027954@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 54125 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, 04 Jun 2004 03:52:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=54125 Change 54125 by rwatson@rwatson_tislabs on 2004/06/03 20:51:24 Integrate netperf_socket from FreeBSD CVS head. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/uio_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fb/tga.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_sbus.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_cbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/tga/tga_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs_sbus.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/bios.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/geode.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/uio_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#13 integrate .. //depot/projects/netperf_socket/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/mem.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/uio_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_lock.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/subr_witness.c#4 integrate .. //depot/projects/netperf_socket/sys/net/ethernet.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/pmc.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/uio_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/central/central.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc_nexus.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/uio_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#10 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_rawread.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.48 2004/04/05 21:00:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.49 2004/06/03 05:58:27 phk Exp $"); /* * Memory special file @@ -48,9 +48,10 @@ #include #include #include -#include #include #include +#include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/alpha/alpha/uio_machdep.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.2 2004/04/05 21:00:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.4 2004/06/03 10:22:45 tjr Exp $"); #include #include @@ -70,12 +70,8 @@ ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); - if (td != NULL) { - mtx_lock_spin(&sched_lock); - save = td->td_flags & TDF_DEADLKTREAT; - td->td_flags |= TDF_DEADLKTREAT; - mtx_unlock_spin(&sched_lock); - } + save = td->td_pflags & TDP_DEADLKTREAT; + td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { iov = uio->uio_iov; cnt = iov->iov_len; @@ -119,10 +115,7 @@ n -= cnt; } out: - if (td != NULL && save == 0) { - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_DEADLKTREAT; - mtx_unlock_spin(&sched_lock); - } + if (save == 0) + td->td_pflags &= ~TDP_DEADLKTREAT; return (error); } ==== //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.12 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.13 2004/06/03 20:25:04 peter Exp $"); #include #include @@ -67,8 +67,8 @@ struct lapic_info { u_int la_present:1; u_int la_enabled:1; - u_int la_apic_id:8; -} lapics[NLAPICS + 1]; + u_int la_acpi_id:8; +} lapics[NLAPICS]; static int madt_found_sci_override; static MULTIPLE_APIC_TABLE *madt; @@ -447,14 +447,14 @@ printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", proc->LocalApicId, proc->ProcessorId, proc->ProcessorEnabled ? "enabled" : "disabled"); - if (proc->ProcessorId > NLAPICS) + if (proc->LocalApicId >= NLAPICS) panic("%s: CPU ID %d too high", __func__, - proc->ProcessorId); - la = &lapics[proc->ProcessorId]; + proc->LocalApicId); + la = &lapics[proc->LocalApicId]; KASSERT(la->la_present == 0, - ("Duplicate local ACPI ID %d", proc->ProcessorId)); + ("Duplicate local APIC ID %d", proc->LocalApicId)); la->la_present = 1; - la->la_apic_id = proc->LocalApicId; + la->la_acpi_id = proc->ProcessorId; if (proc->ProcessorEnabled) { la->la_enabled = 1; lapic_create(proc->LocalApicId, 0); @@ -545,14 +545,20 @@ static int madt_find_cpu(u_int acpi_id, u_int *apic_id) { + int i; - if (!lapics[acpi_id].la_present) - return (ENOENT); - *apic_id = lapics[acpi_id].la_apic_id; - if (lapics[acpi_id].la_enabled) - return (0); - else - return (ENXIO); + for (i = 0; i < NLAPICS; i++) { + if (!lapics[i].la_present) + continue; + if (lapics[i].la_acpi_id != acpi_id) + continue; + *apic_id = i; + if (lapics[i].la_enabled) + return (0); + else + return (ENXIO); + } + return (ENOENT); } /* @@ -752,8 +758,9 @@ static void madt_set_ids(void *dummy) { + struct lapic_info *la; struct pcpu *pc; - u_int i, j; + u_int i; if (madt == NULL) return; @@ -762,19 +769,14 @@ continue; pc = pcpu_find(i); KASSERT(pc != NULL, ("no pcpu data for CPU %d", i)); - for (j = 0; j < NLAPICS + 1; j++) { - if (!lapics[j].la_present || !lapics[j].la_enabled) - continue; - if (lapics[j].la_apic_id == pc->pc_apic_id) { - pc->pc_acpi_id = j; - if (bootverbose) - printf("APIC: CPU %u has ACPI ID %u\n", - i, j); - break; - } - } - if (j == NLAPICS + 1) - panic("Unable to find ACPI ID for CPU %d", i); + la = &lapics[pc->pc_apic_id]; + if (!la->la_present || !la->la_enabled) + panic("APIC: CPU with APIC ID %u is not enabled", + pc->pc_apic_id); + pc->pc_acpi_id = la->la_acpi_id; + if (bootverbose) + printf("APIC: CPU %u has ACPI ID %u\n", i, + la->la_acpi_id); } } SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL) ==== //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.131 2004/04/07 00:44:15 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.132 2004/06/03 20:18:15 peter Exp $"); #include "opt_cpu.h" @@ -90,7 +90,10 @@ static char cpu_brand[48]; -static struct cpu_nameclass amd64_cpus[] = { +static struct { + char *cpu_name; + int cpu_class; +} amd64_cpus[] = { { "Clawhammer", CPUCLASS_K8 }, /* CPU_CLAWHAMMER */ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; ==== //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.8 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.9 2004/06/03 20:25:05 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -126,6 +126,7 @@ static void ioapic_suspend(struct intsrc *isrc); static void ioapic_resume(struct intsrc *isrc); static void ioapic_program_destination(struct ioapic_intsrc *intpin); +static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static void ioapic_setup_mixed_mode(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -135,7 +136,7 @@ ioapic_suspend, ioapic_resume, ioapic_config_intr }; -static int current_cluster, logical_clusters, next_ioapic_base; +static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; static u_int mixed_mode_enabled, next_id, program_logical_dest; #if defined(NO_MIXED_MODE) || !defined(DEV_ATPIC) static int mixed_mode_active = 0; @@ -208,13 +209,88 @@ } /* + * Completely program an intpin based on the data in its interrupt source + * structure. + */ +static void +ioapic_program_intpin(struct ioapic_intsrc *intpin) +{ + struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; + uint32_t low, high, value; + + /* + * For pins routed via mixed mode or disabled, just ensure that + * they are masked. + */ + if (intpin->io_dest == DEST_EXTINT || + intpin->io_vector == VECTOR_DISABLED) { + low = ioapic_read(io->io_addr, + IOAPIC_REDTBL_LO(intpin->io_intpin)); + if ((low & IOART_INTMASK) == IOART_INTMCLR) + ioapic_write(io->io_addr, + IOAPIC_REDTBL_LO(intpin->io_intpin), + low | IOART_INTMSET); + return; + } + + /* Set the destination. */ + if (intpin->io_dest == DEST_NONE) { + low = IOART_DESTPHY; + high = bsp_id << APIC_ID_SHIFT; + } else { + low = IOART_DESTLOG; + high = (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | + APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; + } + + /* Program the rest of the low word. */ + if (intpin->io_edgetrigger) + low |= IOART_TRGREDG; + else + low |= IOART_TRGRLVL; + if (intpin->io_activehi) + low |= IOART_INTAHI; + else + low |= IOART_INTALO; + if (intpin->io_masked) + low |= IOART_INTMSET; + switch (intpin->io_vector) { + case VECTOR_EXTINT: + KASSERT(intpin->io_edgetrigger, + ("EXTINT not edge triggered")); + low |= IOART_DELEXINT; + break; + case VECTOR_NMI: + KASSERT(intpin->io_edgetrigger, + ("NMI not edge triggered")); + low |= IOART_DELNMI; + break; + case VECTOR_SMI: + KASSERT(intpin->io_edgetrigger, + ("SMI not edge triggered")); + low |= IOART_DELSMI; + break; + default: + low |= IOART_DELLOPRI | apic_irq_to_idt(intpin->io_vector); + } + + /* Write the values to the APIC. */ + mtx_lock_spin(&icu_lock); + ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); + value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); + value &= ~IOART_DEST; + value |= high; + ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), value); + mtx_unlock_spin(&icu_lock); +} + +/* * Program an individual intpin's logical destination. */ static void ioapic_program_destination(struct ioapic_intsrc *intpin) { struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; - uint32_t value; KASSERT(intpin->io_dest != DEST_NONE, ("intpin not assigned to a cluster")); @@ -229,17 +305,7 @@ printf("IRQ %u", intpin->io_vector); printf(") to cluster %u\n", intpin->io_dest); } - mtx_lock_spin(&icu_lock); - value = ioapic_read(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin)); - value &= ~IOART_DESTMOD; - value |= IOART_DESTLOG; - ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), value); - value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); - value &= ~IOART_DEST; - value |= (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | - APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; - ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), value); - mtx_unlock_spin(&icu_lock); + ioapic_program_intpin(intpin); } static void @@ -339,7 +405,7 @@ ioapic_resume(struct intsrc *isrc) { - TODO; + ioapic_program_intpin((struct ioapic_intsrc *)isrc); } /* @@ -631,6 +697,7 @@ printf("ioapic%u irqs %u-%u on motherboard\n", io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); + bsp_id = PCPU_GET(apic_id); for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) { /* * Finish initializing the pins by programming the vectors @@ -638,63 +705,18 @@ */ if (pin->io_vector == VECTOR_DISABLED) continue; - flags = IOART_DESTPHY; - if (pin->io_edgetrigger) - flags |= IOART_TRGREDG; - else - flags |= IOART_TRGRLVL; - if (pin->io_activehi) - flags |= IOART_INTAHI; - else - flags |= IOART_INTALO; - if (pin->io_masked) - flags |= IOART_INTMSET; - switch (pin->io_vector) { - case VECTOR_EXTINT: - KASSERT(pin->io_edgetrigger, - ("EXTINT not edge triggered")); - flags |= IOART_DELEXINT; - break; - case VECTOR_NMI: - KASSERT(pin->io_edgetrigger, - ("NMI not edge triggered")); - flags |= IOART_DELNMI; - break; - case VECTOR_SMI: - KASSERT(pin->io_edgetrigger, - ("SMI not edge triggered")); - flags |= IOART_DELSMI; - break; - default: - flags |= IOART_DELLOPRI | - apic_irq_to_idt(pin->io_vector); - } - mtx_lock_spin(&icu_lock); - ioapic_write(apic, IOAPIC_REDTBL_LO(i), flags); - + ioapic_program_intpin(pin); + if (pin->io_vector >= NUM_IO_INTS) + continue; /* - * Route interrupts to the BSP by default using physical - * addressing. Vectored interrupts get readdressed using - * logical IDs to CPU clusters when they are enabled. + * Route IRQ0 via the 8259A using mixed mode if mixed mode + * is available and turned on. */ - flags = ioapic_read(apic, IOAPIC_REDTBL_HI(i)); - flags &= ~IOART_DEST; - flags |= PCPU_GET(apic_id) << APIC_ID_SHIFT; - ioapic_write(apic, IOAPIC_REDTBL_HI(i), flags); - mtx_unlock_spin(&icu_lock); - if (pin->io_vector < NUM_IO_INTS) { - - /* - * Route IRQ0 via the 8259A using mixed mode if - * mixed mode is available and turned on. - */ - if (pin->io_vector == 0 && mixed_mode_active && - mixed_mode_enabled) - ioapic_setup_mixed_mode(pin); - else - intr_register_source(&pin->io_intsrc); - } - + if (pin->io_vector == 0 && mixed_mode_active && + mixed_mode_enabled) + ioapic_setup_mixed_mode(pin); + else + intr_register_source(&pin->io_intsrc); } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/legacy.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.53 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.55 2004/06/03 20:25:05 peter Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -221,17 +222,19 @@ atdev = malloc(sizeof(struct legacy_device), M_LEGACYDEV, M_NOWAIT | M_ZERO); - if (!atdev) - return(0); + if (atdev == NULL) + return(NULL); resource_list_init(&atdev->lg_resources); atdev->lg_pcibus = -1; - child = device_add_child_ordered(bus, order, name, unit); + child = device_add_child_ordered(bus, order, name, unit); + if (child == NULL) + free(atdev, M_LEGACYDEV); + else + /* should we free this in legacy_child_detached? */ + device_set_ivars(child, atdev); - /* should we free this in legacy_child_detached? */ - device_set_ivars(child, atdev); - - return(child); + return (child); } static int ==== //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.114 2004/04/05 21:25:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.115 2004/06/03 05:58:30 phk Exp $"); /* * Memory special file @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.230 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.231 2004/06/03 20:25:05 peter Exp $"); #include #include @@ -544,15 +544,10 @@ KASSERT(src_bus <= mptable_maxbusid, ("bus id %d too large", src_bus)); switch (busses[src_bus].bus_type) { case ISA: + case EISA: return (INTR_POLARITY_HIGH); case PCI: return (INTR_POLARITY_LOW); - case EISA: - KASSERT(src_bus_irq < 16, ("Invalid EISA IRQ %d", src_bus_irq)); - if (elcr_read_trigger(src_bus_irq) == INTR_TRIGGER_LEVEL) - return (INTR_POLARITY_LOW); - else - return (INTR_POLARITY_HIGH); default: panic("%s: unknown bus type %d", __func__, busses[src_bus].bus_type); ==== //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.59 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.60 2004/06/03 20:22:48 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -481,8 +481,6 @@ struct resource_list_entry *rle; rle = resource_list_find(rl, type, rid); - device_printf(child, "type %d rid %d startp %p countp %p - got %p\n", - type, rid, startp, countp, rle); if (!rle) return(ENOENT); if (startp) ==== //depot/projects/netperf_socket/sys/amd64/amd64/uio_machdep.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.3 2004/04/05 21:15:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.5 2004/06/03 10:22:45 tjr Exp $"); #include #include @@ -70,12 +70,8 @@ ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); - if (td != NULL) { - mtx_lock_spin(&sched_lock); - save = td->td_flags & TDF_DEADLKTREAT; - td->td_flags |= TDF_DEADLKTREAT; - mtx_unlock_spin(&sched_lock); - } + save = td->td_pflags & TDP_DEADLKTREAT; + td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { iov = uio->uio_iov; cnt = iov->iov_len; @@ -118,10 +114,7 @@ n -= cnt; } out: - if (td != NULL && save == 0) { - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_DEADLKTREAT; - mtx_unlock_spin(&sched_lock); - } + if (save == 0) + td->td_pflags &= ~TDP_DEADLKTREAT; return (error); } ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.409 2004/05/17 22:13:14 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.410 2004/06/03 21:40:41 peter Exp $ machine amd64 cpu HAMMER @@ -176,6 +176,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card +device ixgb # Intel PRO/10GbE Ethernet Card device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/netperf_socket/sys/amd64/include/cputypes.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.17 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.18 2004/06/03 20:18:15 peter Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ @@ -44,11 +44,6 @@ #define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ #ifndef LOCORE -struct cpu_nameclass { - char *cpu_name; - int cpu_class; -}; - extern int cpu; extern int cpu_class; #endif ==== //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.11 2004/05/16 20:30:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.12 2004/06/03 05:58:30 phk Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -43,6 +43,7 @@ #include #include #include +#include #include #include ==== //depot/projects/netperf_socket/sys/amd64/isa/clock.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.209 2004/05/16 20:30:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.211 2004/06/03 20:21:30 peter Exp $"); /* * Routines to handle clock hardware. @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.108 2004/05/16 20:30:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.109 2004/06/03 05:58:30 phk Exp $"); #include "opt_cpu.h" @@ -34,6 +34,7 @@ #include #include #include +#include #include #include ==== //depot/projects/netperf_socket/sys/arm/arm/uio_machdep.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.3 2004/06/03 10:22:46 tjr Exp $"); #include #include @@ -74,12 +74,8 @@ ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); - if (td != NULL) { - mtx_lock_spin(&sched_lock); - save = td->td_flags & TDF_DEADLKTREAT; - td->td_flags |= TDF_DEADLKTREAT; - mtx_unlock_spin(&sched_lock); - } + save = td->td_pflags & TDP_DEADLKTREAT; + td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { iov = uio->uio_iov; cnt = iov->iov_len; @@ -122,10 +118,7 @@ n -= cnt; } out: - if (td != NULL && save == 0) { - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_DEADLKTREAT; - mtx_unlock_spin(&sched_lock); - } + if (save == 0) + td->td_pflags &= ~TDP_DEADLKTREAT; return (error); } ==== //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#5 (text+ko) ==== @@ -28,13 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.9 2004/03/17 17:50:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.10 2004/06/03 06:09:58 phk Exp $"); #ifdef _KERNEL #include #include #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/dev/ata/ata-cbus.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.12 2004/04/13 09:44:20 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.13 2004/06/03 06:09:58 phk Exp $"); #include "opt_ata.h" #include @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/dev/fb/tga.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.4 2003/08/24 17:46:06 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.5 2004/06/03 06:09:58 phk Exp $"); /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. * All rights reserved. @@ -55,13 +55,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.4 2003/08/24 17:46:06 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.5 2004/06/03 06:09:58 phk Exp $"); #include #include #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.212 2004/05/30 20:08:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.214 2004/06/02 22:59:57 mux Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -281,13 +281,6 @@ DRIVER_MODULE(fxp, cardbus, fxp_driver, fxp_devclass, 0, 0); DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, 0, 0); -static int fxp_rnr; -SYSCTL_INT(_hw, OID_AUTO, fxp_rnr, CTLFLAG_RW, &fxp_rnr, 0, "fxp rnr events"); - -static int fxp_noflow; -SYSCTL_INT(_hw, OID_AUTO, fxp_noflow, CTLFLAG_RW, &fxp_noflow, 0, "fxp flow control disabled"); -TUNABLE_INT("hw.fxp_noflow", &fxp_noflow); - /* * Wait for the previous command to be accepted (but not necessarily * completed). @@ -412,7 +405,6 @@ sc->dev = dev; callout_init(&sc->stat_ch, CALLOUT_MPSAFE); - sysctl_ctx_init(&sc->sysctl_ctx); mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); ifmedia_init(&sc->sc_media, 0, fxp_serial_ifmedia_upd, @@ -496,34 +488,38 @@ (data & FXP_PHY_SERIAL_ONLY)) sc->flags |= FXP_FLAG_SERIAL_MEDIA; - /* - * Create the sysctl tree - */ - sc->sysctl_tree = SYSCTL_ADD_NODE(&sc->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_hw), OID_AUTO, - device_get_nameunit(dev), CTLFLAG_RD, 0, ""); - if (sc->sysctl_tree == NULL) { - error = ENXIO; - goto fail; - } - SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "int_delay", CTLTYPE_INT | CTLFLAG_RW, &sc->tunable_int_delay, 0, sysctl_hw_fxp_int_delay, "I", "FXP driver receive interrupt microcode bundling delay"); - SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "bundle_max", CTLTYPE_INT | CTLFLAG_RW, &sc->tunable_bundle_max, 0, sysctl_hw_fxp_bundle_max, "I", "FXP driver receive interrupt microcode bundle size limit"); + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "rnr", CTLFLAG_RD, &sc->rnr, 0, + "FXP RNR events"); + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "noflow", CTLFLAG_RW, &sc->tunable_noflow, 0, + "FXP flow control disabled"); /* * Pull in device tunables. */ sc->tunable_int_delay = TUNABLE_INT_DELAY; sc->tunable_bundle_max = TUNABLE_BUNDLE_MAX; + sc->tunable_noflow = 0; (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "int_delay", &sc->tunable_int_delay); (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "bundle_max", &sc->tunable_bundle_max); + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + "noflow", &sc->tunable_noflow); + sc->rnr = 0; /* * Find out the chip revision; lump all 82557 revs together. @@ -867,7 +863,7 @@ struct fxp_tx *txp; int i; - mtx_assert(&sc->sc_mtx, MA_NOTOWNED); + FXP_LOCK_ASSERT(sc, MA_NOTOWNED); KASSERT(sc->ih == NULL, ("fxp_release() called with intr handle still active")); if (sc->miibus) @@ -923,8 +919,6 @@ if (sc->mcs_tag) bus_dma_tag_destroy(sc->mcs_tag); - sysctl_ctx_free(&sc->sysctl_ctx); - mtx_destroy(&sc->sc_mtx); } @@ -1301,7 +1295,7 @@ struct mbuf *mb_head; int error; - mtx_assert(&sc->sc_mtx, MA_OWNED); + FXP_LOCK_ASSERT(sc, MA_OWNED); /* * See if we need to suspend xmit until the multicast filter * has been reprogrammed (which can only be done at the head @@ -1640,9 +1634,9 @@ struct fxp_rfa *rfa; int rnr = (statack & FXP_SCB_STATACK_RNR) ? 1 : 0; - mtx_assert(&sc->sc_mtx, MA_OWNED); + FXP_LOCK_ASSERT(sc, MA_OWNED); if (rnr) - fxp_rnr++; + sc->rnr++; #ifdef DEVICE_POLLING /* Pick up a deferred RNR condition if `count' ran out last time. */ if (sc->flags & FXP_FLAG_DEFERRED_RNR) { @@ -1999,7 +1993,7 @@ struct fxp_cb_mcs *mcsp; int i, prm, s; - mtx_assert(&sc->sc_mtx, MA_OWNED); + FXP_LOCK_ASSERT(sc, MA_OWNED); s = splimp(); /* * Cancel any pending I/O @@ -2129,7 +2123,7 @@ cbp->mc_all = sc->flags & FXP_FLAG_ALL_MCAST ? 1 : 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 3 21:16:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F7E016A4D0; Thu, 3 Jun 2004 21:16:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57DB416A4CE for ; Thu, 3 Jun 2004 21:16:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DA4343D2F for ; Thu, 3 Jun 2004 21:16:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i544GBOv033494 for ; Thu, 3 Jun 2004 21:16:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i544FwjT033487 for perforce@freebsd.org; Thu, 3 Jun 2004 21:15:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Thu, 3 Jun 2004 21:15:58 -0700 (PDT) Message-Id: <200406040415.i544FwjT033487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54131 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, 04 Jun 2004 04:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=54131 Change 54131 by marcel@marcel_nfs on 2004/06/03 21:15:36 IFC @54128 Affected files ... .. //depot/projects/gdb/bin/ls/ls.c#3 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#10 integrate .. //depot/projects/gdb/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/gdb/gnu/usr.bin/tar/Makefile#4 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#9 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#11 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_data_into_fd.c#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#12 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/projects/gdb/lib/libarchive/archive_write.c#7 integrate .. //depot/projects/gdb/lib/libc/gen/dlopen.3#2 integrate .. //depot/projects/gdb/lib/libc/net/name6.c#6 integrate .. //depot/projects/gdb/lib/libusbhid/usbhid.h#3 integrate .. //depot/projects/gdb/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/gdb/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/gdb/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/gdb/release/alpha/mkisoimages.sh#2 integrate .. //depot/projects/gdb/release/amd64/mkisoimages.sh#2 integrate .. //depot/projects/gdb/release/i386/mkisoimages.sh#2 integrate .. //depot/projects/gdb/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/gdb/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/gdb/sbin/devfs/extern.h#2 integrate .. //depot/projects/gdb/sbin/ggate/ggated/ggated.c#4 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/gdb/sbin/sunlabel/sunlabel.8#4 integrate .. //depot/projects/gdb/share/man/man7/ports.7#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/mem.c#4 integrate .. //depot/projects/gdb/sys/alpha/alpha/uio_machdep.c#3 integrate .. //depot/projects/gdb/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/gdb/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/gdb/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/gdb/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/gdb/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/gdb/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/gdb/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/gdb/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot2/boot1.S#4 integrate .. //depot/projects/gdb/sys/dev/aac/aac.c#6 integrate .. //depot/projects/gdb/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/gdb/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/gdb/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/gdb/sys/dev/adlink/adlink.c#4 integrate .. //depot/projects/gdb/sys/dev/arl/if_arl.c#5 integrate .. //depot/projects/gdb/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/gdb/sys/dev/fb/tga.c#2 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/gdb/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/gdb/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme_sbus.c#4 integrate .. //depot/projects/gdb/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc_cbus.c#3 integrate .. //depot/projects/gdb/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/gdb/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/gdb/sys/dev/sab/sab.c#6 integrate .. //depot/projects/gdb/sys/dev/tga/tga_pci.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/gdb/sys/dev/zs/zs_sbus.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/bios.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/geode.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/gdb/sys/i386/i386/trap.c#11 integrate .. //depot/projects/gdb/sys/i386/i386/uio_machdep.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#12 integrate .. //depot/projects/gdb/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/gdb/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/gdb/sys/ia64/ia64/mem.c#4 integrate .. //depot/projects/gdb/sys/ia64/ia64/uio_machdep.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_clock.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_exec.c#9 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#9 integrate .. //depot/projects/gdb/sys/kern/kern_lock.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_sig.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_subr.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#11 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#11 integrate .. //depot/projects/gdb/sys/kern/subr_blist.c#2 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#7 integrate .. //depot/projects/gdb/sys/kern/subr_witness.c#9 integrate .. //depot/projects/gdb/sys/net/ethernet.h#2 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/gdb/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/gdb/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/gdb/sys/pc98/pc98/pmc.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/uio_machdep.c#3 integrate .. //depot/projects/gdb/sys/sparc64/central/central.c#2 integrate .. //depot/projects/gdb/sys/sparc64/ebus/ebus.c#6 integrate .. //depot/projects/gdb/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/gdb/sys/sparc64/fhc/fhc_nexus.c#2 integrate .. //depot/projects/gdb/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/uio_machdep.c#4 integrate .. //depot/projects/gdb/sys/sys/blist.h#2 integrate .. //depot/projects/gdb/sys/sys/proc.h#14 integrate .. //depot/projects/gdb/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/gdb/sys/vm/vm_page.h#6 integrate .. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.freebsd#8 integrate .. //depot/projects/gdb/usr.bin/du/du.1#2 integrate .. //depot/projects/gdb/usr.bin/du/du.c#5 integrate .. //depot/projects/gdb/usr.bin/netstat/inet.c#5 integrate .. //depot/projects/gdb/usr.bin/sed/main.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/Makefile#5 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#15 integrate .. //depot/projects/gdb/usr.bin/tar/matching.c#4 integrate .. //depot/projects/gdb/usr.bin/tar/util.c#5 integrate .. //depot/projects/gdb/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/gdb/usr.sbin/daemon/daemon.c#2 integrate .. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.c#4 integrate .. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate Differences ... ==== //depot/projects/gdb/bin/ls/ls.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.76 2004/04/06 20:06:47 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.77 2004/06/03 15:04:00 le Exp $"); #include #include @@ -621,6 +621,7 @@ MAKENINES(maxblock); MAKENINES(maxnlink); MAKENINES(maxsize); + free(jinitmax); } bcfile = 0; flags = NULL; ==== //depot/projects/gdb/etc/defaults/rc.conf#10 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.206 2004/05/29 04:52:37 njl Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.208 2004/06/02 09:58:18 ume Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -340,6 +340,8 @@ ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter, # see /usr/src/contrib/ipfilter/rules # for examples +ip6addrctl_enable="NO" # Set to YES to enable default address selection +ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages ############################################################## ### System console options ################################# ==== //depot/projects/gdb/etc/rc.d/ip6addrctl#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.2 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.3 2004/06/02 09:39:49 ume Exp $ # # PROVIDE: ip6addrctl @@ -9,11 +9,37 @@ # KEYWORD: FreeBSD nojail . /etc/rc.subr -. /etc/network.subr name="ip6addrctl" +rcvar=`set_rcvar` start_cmd="ip6addrctl_start" -stop_cmd=':' +stop_cmd="ip6addrctl_stop" +extra_commands="status prefer_ipv6 prefer_ipv4" +status_cmd="ip6addrctl" +prefer_ipv6_cmd="ip6addrctl_prefer_ipv6" +prefer_ipv4_cmd="ip6addrctl_prefer_ipv4" + +ip6addrctl_prefer_ipv6() +{ + ip6addrctl flush >/dev/null 2>&1 + ip6addrctl add ::1/128 50 0 + ip6addrctl add ::/0 40 1 + ip6addrctl add 2002::/16 30 2 + ip6addrctl add ::/96 20 3 + ip6addrctl add ::ffff:0:0/96 10 4 + checkyesno ip6addrctl_verbose && ip6addrctl +} + +ip6addrctl_prefer_ipv4() +{ + ip6addrctl flush >/dev/null 2>&1 + ip6addrctl add ::ffff:0:0/96 50 0 + ip6addrctl add ::1/128 40 1 + ip6addrctl add ::/0 30 2 + ip6addrctl add 2002::/16 20 3 + ip6addrctl add ::/96 10 4 + checkyesno ip6addrctl_verbose && ip6addrctl +} ip6addrctl_start() { @@ -24,10 +50,24 @@ if [ -f /etc/ip6addrctl.conf ]; then ip6addrctl flush >/dev/null 2>&1 ip6addrctl install /etc/ip6addrctl.conf - ip6addrctl + checkyesno ip6addrctl_verbose && ip6addrctl + else + if checkyesno ipv6_enable; then + ip6addrctl_prefer_ipv6 + else + ip6addrctl_prefer_ipv4 + fi fi fi } +ip6addrctl_stop() +{ + if ifconfig lo0 inet6 >/dev/null 2>&1; then + # We have IPv6 support in kernel. + ip6addrctl flush >/dev/null 2>&1 + fi +} + load_rc_config $name run_rc_command "$1" ==== //depot/projects/gdb/gnu/usr.bin/tar/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.22 2004/03/03 17:04:49 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.23 2004/06/04 00:39:46 kientzle Exp $ TARDIR= ${.CURDIR}/../../../contrib/tar .PATH: ${TARDIR}/lib ${TARDIR}/src @@ -6,7 +6,7 @@ PROG= gtar .if !defined(WITH_BSDTAR) -LINKS= ${BINDIR}/gtar ${BINDIR}/tar +SYMLINKS= ${BINDIR}/gtar ${BINDIR}/tar MLINKS= gtar.1 tar.1 .endif ==== //depot/projects/gdb/lib/libarchive/Makefile#9 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.11 2004/05/27 23:57:45 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.12 2004/06/02 08:16:21 kientzle Exp $ LIB= archive SHLIB_MAJOR= 1 .if ${MACHINE_ARCH} == "arm" -WARNS?= 3 +WARNS?= 3 .else WARNS?= 6 .endif @@ -92,8 +92,9 @@ MLINKS+= archive_entry.3 archive_entry_uname.3 MLINKS+= archive_entry.3 archive_entry_uname_w.3 MLINKS+= archive_read.3 archive_read_data.3 +MLINKS+= archive_read.3 archive_read_data_block.3 MLINKS+= archive_read.3 archive_read_data_into_buffer.3 -MLINKS+= archive_read.3 archive_read_data_into_file.3 +MLINKS+= archive_read.3 archive_read_data_into_fd.3 MLINKS+= archive_read.3 archive_read_data_skip.3 MLINKS+= archive_read.3 archive_read_extract.3 MLINKS+= archive_read.3 archive_read_extract_set_progress_callback.3 ==== //depot/projects/gdb/lib/libarchive/archive.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h,v 1.10 2004/05/27 04:00:25 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.11 2004/06/02 08:14:43 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -166,6 +166,14 @@ /* Read data from the body of an entry. Similar to read(2). */ ssize_t archive_read_data(struct archive *, void *, size_t); +/* + * A zero-copy version of archive_read_data that also exposes the file offset + * of each returned block. Note that the client has no way to specify + * the desired size of the block. The API does gaurantee that offsets will + * be strictly increasing and that returned blocks will not overlap. + */ +int archive_read_data_block(struct archive *a, + const void **buff, size_t *size, off_t *offset); /*- * Some convenience functions that are built on archive_read_data: ==== //depot/projects/gdb/lib/libarchive/archive_private.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.10 2004/05/27 05:02:35 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.12 2004/06/03 23:29:47 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -54,12 +54,13 @@ size_t null_length; /* - * Used to limit reads of entry data. Eventually, each reader - * will be able to register it's own read_data routine and these - * will move into the per-format data for the formats that use them. + * Used by archive_read_data() to track blocks and copy + * data to client buffers, filling gaps with zero bytes. */ - off_t entry_bytes_remaining; - off_t entry_padding; /* Skip this much after entry data. */ + const char *read_data_block; + off_t read_data_offset; + off_t read_data_output_offset; + size_t read_data_remaining; uid_t user_uid; /* UID of current user. */ @@ -151,6 +152,7 @@ struct archive_format_descriptor { int (*bid)(struct archive *); int (*read_header)(struct archive *, struct archive_entry *); + int (*read_data)(struct archive *, const void **, size_t *, off_t *); int (*cleanup)(struct archive *); void *format_data; /* Format-specific data for readers. */ } formats[4]; @@ -168,9 +170,8 @@ void *format_data; /* Used by writers. */ /* - * Pointers to format-specific functions. On read, these are - * initialized in the bid process. On write, they're initialized by - * archive_write_set_format_XXX() calls. + * Pointers to format-specific functions for writing. They're + * initialized by archive_write_set_format_XXX() calls. */ int (*format_init)(struct archive *); /* Only used on write. */ int (*format_finish)(struct archive *); @@ -183,8 +184,7 @@ /* * Various information needed by archive_extract. */ - struct archive_string extract_mkdirpath; - struct archive_extract_fixup *archive_extract_fixup; + struct extract *extract; void (*extract_progress)(void *); void *extract_progress_user_data; void (*cleanup_archive_extract)(struct archive *); @@ -220,6 +220,7 @@ void *format_data, int (*bid)(struct archive *), int (*read_header)(struct archive *, struct archive_entry *), + int (*read_data)(struct archive *, const void **, size_t *, off_t *), int (*cleanup)(struct archive *)); int __archive_read_register_compression(struct archive *a, ==== //depot/projects/gdb/lib/libarchive/archive_read.3#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.5 2004/05/27 04:21:52 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.6 2004/06/02 08:14:43 kientzle Exp $ .\" .Dd October 1, 2003 .Dt archive_read 3 @@ -43,9 +43,10 @@ .Nm archive_read_open_file , .Nm archive_read_next_header , .Nm archive_read_data , +.Nm archive_read_data_block , .Nm archive_read_data_skip , .Nm archive_read_data_into_buffer , -.Nm archive_read_data_into_file , +.Nm archive_read_data_into_fd , .Nm archive_read_extract , .Nm archive_read_extract_set_progress_callback , .Nm archive_read_finish @@ -83,11 +84,13 @@ .Ft ssize_t .Fn archive_read_data "struct archive *" "void *buff" "size_t len" .Ft int +.Fn archive_read_data_block "struct archive *" "const void **buff" "size_t *len" "off_t *offset" +.Ft int .Fn archive_read_data_skip "struct archive *" .Ft int .Fn archive_read_data_into_buffer "struct archive *" "void *" .Ft int -.Fn archive_read_data_into_file "struct archive *" "int fd" +.Fn archive_read_data_into_fd "struct archive *" "int fd" .Ft int .Fn archive_read_extract "struct archive *" "int flags" .Ft void @@ -165,18 +168,30 @@ .Tn struct archive_entry . .It Fn archive_read_data Read data associated with the header just read. +Internally, this is a convenience function that uses +.Fn archive_read_data_block . +.It Fn archive_read_data_block +Return the next available block of data for this entry. +Unlike +.Fn archive_read_data , +the +.Fn archive_read_data_block +function avoids copying data and allows you to correctly handle +sparse files, as supported by some archive formats. +The library gaurantees that offsets will increase and that blocks +will not overlap. .It Fn archive_read_data_skip A convenience function that repeatedly calls -.Fn archive_read_data +.Fn archive_read_data_block to skip all of the data for this archive entry. .It Fn archive_read_data_into_buffer A convenience function that repeatedly calls -.Fn archive_read_data +.Fn archive_read_data_block to copy the entire entry into the client-supplied buffer. Note that the client is responsible for sizing the buffer appropriately. -.It Fn archive_read_data_into_file +.It Fn archive_read_data_into_fd A convenience function that repeatedly calls -.Fn archive_read_data +.Fn archive_read_data_block to copy the entire entry to the provided file descriptor. .It Fn archive_read_extract A convenience function that recreates the specified object on ==== //depot/projects/gdb/lib/libarchive/archive_read.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.6 2004/04/13 23:45:37 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.9 2004/06/04 01:36:10 kientzle Exp $"); #include #include @@ -103,7 +103,7 @@ archive_close_callback *closer) { const void *buffer; - size_t bytes_read; + ssize_t bytes_read; int high_bidder; int e; @@ -130,6 +130,17 @@ /* Read first block now for format detection. */ bytes_read = (a->client_reader)(a, a->client_data, &buffer); + /* client_reader should have already set error information. */ + if (bytes_read < 0) + return (ARCHIVE_FATAL); + + /* An empty archive is a serious error. */ + if (bytes_read == 0) { + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Empty input file"); + return (ARCHIVE_FATAL); + } + /* Select a decompression routine. */ high_bidder = choose_decompressor(a, buffer, bytes_read); if (high_bidder < 0) @@ -319,42 +330,61 @@ } /* - * Read data from an archive entry. + * Read data from an archive entry, using a read(2)-style interface. + * This is a convenience routine that just calls + * archive_read_data_block and copies the results into the client + * buffer, filling any gaps with zero bytes. Clients using this + * API can be completely ignorant of sparse-file issues; sparse files + * will simply be padded with nulls. */ ssize_t archive_read_data(struct archive *a, void *buff, size_t s) { - const void *data; - ssize_t bytes_read; + off_t remaining; + char *dest; + size_t bytes_read; + size_t len; + int r; + + bytes_read = 0; + dest = buff; - archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); - /* - * off_t is generally at least as wide as size_t, so widen for - * comparison and narrow for the assignment. Otherwise, on - * platforms with 32-bit size_t and 64-bit off_t, we won't be - * able to correctly read archives with entries larger than - * 4gig. - */ - if ((off_t)s > a->entry_bytes_remaining) - s = (size_t)a->entry_bytes_remaining; - if (s > 0) { - bytes_read = (a->compression_read_ahead)(a, &data, 1); - if (bytes_read < 0) { - a->state = ARCHIVE_STATE_FATAL; - return (bytes_read); + while (s > 0) { + if (a->read_data_remaining <= 0) { + r = archive_read_data_block(a, + (const void **)&a->read_data_block, + &a->read_data_remaining, + &a->read_data_offset); + if (r == ARCHIVE_EOF) + return (bytes_read); + if (r != ARCHIVE_OK) + return (r); } - if ((size_t)bytes_read > s) - bytes_read = s; - } else - bytes_read = 0; - if (bytes_read > 0) { - memcpy(buff, data, bytes_read); - (a->compression_read_consume)(a, bytes_read); + if (a->read_data_offset < a->read_data_output_offset) { + remaining = + a->read_data_output_offset - a->read_data_offset; + if (remaining > (off_t)s) + remaining = (off_t)s; + len = (size_t)remaining; + memset(dest, 0, len); + a->read_data_output_offset += len; + s -= len; + bytes_read += len; + } else { + len = a->read_data_remaining; + if (len > s) + len = s; + memcpy(dest, a->read_data_block, len); + s -= len; + a->read_data_remaining -= len; + a->read_data_output_offset += len; + a->read_data_offset += len; + dest += len; + bytes_read += len; + } } - - a->entry_bytes_remaining -= bytes_read; - return (bytes_read); + return (ARCHIVE_OK); } /* @@ -363,33 +393,46 @@ int archive_read_data_skip(struct archive *a) { + int r; const void *buff; - ssize_t bytes_read, to_skip; + ssize_t size; + off_t offset; archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); - to_skip = a->entry_bytes_remaining + a->entry_padding; - a->entry_bytes_remaining = 0; + while ((r = archive_read_data_block(a, &buff, &size, &offset)) == + ARCHIVE_OK) + ; + + if (r == ARCHIVE_EOF) + r = ARCHIVE_OK; + + a->state = ARCHIVE_STATE_HEADER; + return (r); +} + +/* + * Read the next block of entry data from the archive. + * This is a zero-copy interface; the client receives a pointer, + * size, and file offset of the next available block of data. + * + * Returns ARCHIVE_OK if the operation is successful, ARCHIVE_EOF if + * the end of entry is encountered. + */ +int +archive_read_data_block(struct archive *a, + const void **buff, size_t *size, off_t *offset) +{ + archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); - for (; to_skip > 0; to_skip -= bytes_read) { - /* TODO: Optimize skip in compression layer. */ - bytes_read = (a->compression_read_ahead)(a, &buff, to_skip); - if (bytes_read < 0) { - a->entry_padding = to_skip; - return (ARCHIVE_FATAL); - } - if (bytes_read == 0) { - archive_set_error(a, EIO, - "Premature end of archive entry"); - return (ARCHIVE_FATAL); - } - if (bytes_read > to_skip) - bytes_read = to_skip; - (a->compression_read_consume)(a, bytes_read); + if (a->format->read_data == NULL) { + archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, + "Internal error: " + "No format_read_data_block function registered"); + return (ARCHIVE_FATAL); } - a->entry_padding = 0; - a->state = ARCHIVE_STATE_HEADER; - return (ARCHIVE_OK); + + return (a->format->read_data)(a, buff, size, offset); } /* @@ -428,7 +471,6 @@ /* Casting a pointer to int allows us to remove 'const.' */ free((void *)(uintptr_t)(const void *)a->nulls); - archive_string_free(&a->extract_mkdirpath); archive_string_free(&a->error_string); if (a->entry) archive_entry_free(a->entry); @@ -445,6 +487,7 @@ void *format_data, int (*bid)(struct archive *), int (*read_header)(struct archive *, struct archive_entry *), + int (*read_data)(struct archive *, const void **, size_t *, off_t *), int (*cleanup)(struct archive *)) { int i, number_slots; @@ -459,6 +502,7 @@ if (a->formats[i].bid == NULL) { a->formats[i].bid = bid; a->formats[i].read_header = read_header; + a->formats[i].read_data = read_data; a->formats[i].cleanup = cleanup; a->formats[i].format_data = format_data; return (ARCHIVE_OK); ==== //depot/projects/gdb/lib/libarchive/archive_read_data_into_fd.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.5 2004/05/13 06:01:14 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.6 2004/06/02 08:14:43 kientzle Exp $"); #include #include @@ -33,36 +33,49 @@ #include "archive.h" #include "archive_private.h" +/* Maximum amount of data to write at one time. */ +#define MAX_WRITE (1024 * 1024) + /* - * This implementation minimizes copying of data. + * This implementation minimizes copying of data and is sparse-file aware. */ ssize_t archive_read_data_into_fd(struct archive *a, int fd) { - ssize_t bytes_read, bytes_written, total_written; + int r; const void *buff; + ssize_t size, bytes_to_write; + ssize_t bytes_written, total_written; + off_t offset; + off_t output_offset; + + archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA); total_written = 0; - while (a->entry_bytes_remaining > 0) { - /* Remember: '1' here is minimum, not maximum. */ - /* Read-ahead function will return as much as is convenient. */ - bytes_read = (a->compression_read_ahead)(a, &buff, 1); - if (bytes_read < 0) - return (-1); - if (bytes_read > a->entry_bytes_remaining) - bytes_read = (ssize_t)a->entry_bytes_remaining; - /* Don't copy more than 1 megabyte at a time. */ - if (bytes_read > (1024*1024)) - bytes_read = 1024*1024; + output_offset = 0; - bytes_written = write(fd, buff, bytes_read); - if (bytes_written < 0) - return (-1); - (a->compression_read_consume)(a, bytes_written); - total_written += bytes_written; - a->entry_bytes_remaining -= bytes_written; - if (a->extract_progress != NULL) - (*a->extract_progress)(a->extract_progress_user_data); + while ((r = archive_read_data_block(a, &buff, &size, &offset)) == + ARCHIVE_OK) { + if (offset > output_offset) { + lseek(fd, offset - output_offset, SEEK_CUR); + output_offset = offset; + } + while (size > 0) { + bytes_to_write = size; + if (bytes_to_write > MAX_WRITE) + bytes_to_write = MAX_WRITE; + bytes_written = write(fd, buff, bytes_to_write); + if (bytes_written < 0) + return (-1); + output_offset += bytes_written; + total_written += bytes_written; + size -= bytes_written; + if (a->extract_progress != NULL) + (*a->extract_progress)(a->extract_progress_user_data); + } } + + if (r != ARCHIVE_EOF) + return (-1); return (total_written); } ==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.13 2004/05/27 05:02:35 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.14 2004/06/03 23:29:47 kientzle Exp $"); #include #include @@ -42,7 +42,6 @@ #include #include #include -#include #include #ifdef LINUX #include @@ -54,6 +53,27 @@ #include "archive_entry.h" #include "archive_private.h" +struct fixup_entry { + struct fixup_entry *next; + mode_t mode; + int64_t mtime; + int64_t atime; + unsigned long mtime_nanos; + unsigned long atime_nanos; + unsigned long fflags_set; + int fixup; /* bitmask of what needs fixing */ + char *name; +}; + +#define FIXUP_MODE 1 +#define FIXUP_TIMES 2 +#define FIXUP_FFLAGS 4 + +struct extract { + struct archive_string mkdirpath; + struct fixup_entry *fixup_list; +}; + static void archive_extract_cleanup(struct archive *); static int archive_read_extract_block_device(struct archive *, struct archive_entry *, int); @@ -93,82 +113,41 @@ static int set_perm(struct archive *, struct archive_entry *, int mode, int flags); static int set_time(struct archive *, struct archive_entry *, int); -static struct archive_extract_fixup * - sort_dir_list(struct archive_extract_fixup *p); - +static struct fixup_entry *sort_dir_list(struct fixup_entry *p); -struct archive_extract_fixup { - struct archive_extract_fixup *next; - mode_t mode; - int64_t mtime; - int64_t atime; - unsigned long mtime_nanos; - unsigned long atime_nanos; - unsigned long fflags_set; - int fixup; /* bitmask of what needs fixing */ - char *name; -}; - -#define FIXUP_MODE 1 -#define FIXUP_TIMES 2 -#define FIXUP_FFLAGS 4 /* * Extract this entry to disk. * - * TODO: Validate hardlinks. Is there any way to validate hardlinks - * without keeping a complete list of filenames from the entire archive?? Ugh. + * TODO: Validate hardlinks. According to the standards, we're + * supposed to check each extracted hardlink and squawk if it refers + * to a file that we didn't restore. I'm not entirely convinced this + * is a good idea, but more importantly: Is there any way to validate + * hardlinks without keeping a complete list of filenames from the + * entire archive?? Ugh. * */ int archive_read_extract(struct archive *a, struct archive_entry *entry, int flags) { - mode_t writable_mode; - struct archive_extract_fixup *le; - const struct stat *st; + mode_t mode; + struct extract *extract; int ret; int restore_pwd; - restore_pwd = -1; - st = archive_entry_stat(entry); - if (S_ISDIR(st->st_mode)) { - /* - * TODO: Does this really work under all conditions? - * - * E.g., root restores a dir owned by someone else? - */ - writable_mode = st->st_mode | 0700; - - /* - * In order to correctly restore non-writable dirs or - * dir timestamps, we need to maintain a fix-up list. - */ - if (st->st_mode != writable_mode || - flags & ARCHIVE_EXTRACT_TIME) { - le = malloc(sizeof(struct archive_extract_fixup)); - le->fixup = 0; - le->next = a->archive_extract_fixup; - a->archive_extract_fixup = le; - le->name = strdup(archive_entry_pathname(entry)); - a->cleanup_archive_extract = archive_extract_cleanup; - - if (st->st_mode != writable_mode) { - le->mode = st->st_mode; - le->fixup |= FIXUP_MODE; - /* Make sure I can write to this directory. */ - archive_entry_set_mode(entry, writable_mode); - } - if (flags & ARCHIVE_EXTRACT_TIME) { - le->mtime = st->st_mtime; - le->mtime_nanos = ARCHIVE_STAT_MTIME_NANOS(st); - le->atime = st->st_atime; - le->atime_nanos = ARCHIVE_STAT_ATIME_NANOS(st); - le->fixup |= FIXUP_TIMES; - } - + if (a->extract == NULL) { + a->extract = malloc(sizeof(*a->extract)); + if (a->extract == NULL) { + archive_set_error(a, ENOMEM, "Can't extract"); + return (ARCHIVE_FATAL); } + a->cleanup_archive_extract = archive_extract_cleanup; + memset(a->extract, 0, sizeof(*a->extract)); } + extract = a->extract; + restore_pwd = -1; + if (archive_entry_hardlink(entry) != NULL) return (archive_read_extract_hard_link(a, entry, flags)); @@ -183,7 +162,8 @@ /* XXX Update pathname in 'entry' XXX */ } - switch (st->st_mode & S_IFMT) { + mode = archive_entry_mode(entry); + switch (mode & S_IFMT) { default: /* Fall through, as required by POSIX. */ case S_IFREG: @@ -235,10 +215,13 @@ static void archive_extract_cleanup(struct archive *a) { - struct archive_extract_fixup *next, *p; + struct fixup_entry *next, *p; + struct extract *extract; + /* Sort dir list so directories are fixed up in depth-first order. */ - p = sort_dir_list(a->archive_extract_fixup); + extract = a->extract; + p = sort_dir_list(extract->fixup_list); while (p != NULL) { if (p->fixup & FIXUP_TIMES) { @@ -260,17 +243,20 @@ free(p); p = next; } - a->archive_extract_fixup = NULL; + extract->fixup_list = NULL; + archive_string_free(&extract->mkdirpath); + free(a->extract); + a->extract = NULL; } /* * Simple O(n log n) merge sort to order the fixup list. In * particular, we want to restore dir timestamps depth-first. */ -static struct archive_extract_fixup * -sort_dir_list(struct archive_extract_fixup *p) +static struct fixup_entry * +sort_dir_list(struct fixup_entry *p) { - struct archive_extract_fixup *a, *b, *t; + struct fixup_entry *a, *b, *t; if (p == NULL) return (NULL); @@ -397,9 +383,44 @@ archive_read_extract_dir(struct archive *a, struct archive_entry *entry, int flags) { - int mode, ret, ret2; + struct extract *extract; + struct fixup_entry *le; + const struct stat *st; + mode_t mode, writable_mode; + int ret, ret2; + + extract = a->extract; + st = archive_entry_stat(entry); + mode = st->st_mode; + + /* + * XXX TODO: Does this really work under all conditions? + * E.g., root restores a dir owned by someone else? XXX + */ + /* Ensure we can write to this directory. */ + writable_mode = mode | 0700; + + if (mode != writable_mode || flags & ARCHIVE_EXTRACT_TIME) { + /* Add this dir to the fixup list. */ + le = malloc(sizeof(struct fixup_entry)); + le->fixup = 0; + le->next = extract->fixup_list; + extract->fixup_list = le; + le->name = strdup(archive_entry_pathname(entry)); - mode = archive_entry_stat(entry)->st_mode; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 4 09:14:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E9B716A4D0; Fri, 4 Jun 2004 09:14:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33F6016A4CE for ; Fri, 4 Jun 2004 09:14:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 184AC43D3F for ; Fri, 4 Jun 2004 09:14:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i54GDawh006485 for ; Fri, 4 Jun 2004 09:13:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i54GDZMl006482 for perforce@freebsd.org; Fri, 4 Jun 2004 09:13:35 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 4 Jun 2004 09:13:35 -0700 (PDT) Message-Id: <200406041613.i54GDZMl006482@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 54168 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, 04 Jun 2004 16:14:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=54168 Change 54168 by peter@peter_daintree on 2004/06/04 09:12:38 oops. If we have bit 63 set (PG_NX), then atop() in PHYS_TO_VM_PAGE() in vm/vm_page.h does very unhelpful things. If we extract a pa from a pte, then be sure to mask off the non-pa bits. I'm not sure if I've got them all yet, but here's a start. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#72 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#72 (text+ko) ==== @@ -808,7 +808,7 @@ m = NULL; mtx_lock(&Giant); if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); + m = PHYS_TO_VM_PAGE(pa & PG_FRAME); vm_page_lock_queues(); vm_page_hold(m); vm_page_unlock_queues(); @@ -972,7 +972,7 @@ /* We just released a PT, unhold the matching PD */ vm_page_t pdpg; - pdpg = PHYS_TO_VM_PAGE(*pmap_pdpe(pmap, va)); + pdpg = PHYS_TO_VM_PAGE(*pmap_pdpe(pmap, va) & PG_FRAME); vm_page_unhold(pdpg); if (pdpg->hold_count == 0) _pmap_unwire_pte_hold(pmap, va, pdpg); @@ -981,7 +981,7 @@ /* We just released a PD, unhold the matching PDP */ vm_page_t pdppg; - pdppg = PHYS_TO_VM_PAGE(*pmap_pml4e(pmap, va)); + pdppg = PHYS_TO_VM_PAGE(*pmap_pml4e(pmap, va) & PG_FRAME); vm_page_unhold(pdppg); if (pdppg->hold_count == 0) _pmap_unwire_pte_hold(pmap, va, pdppg); @@ -1163,7 +1163,7 @@ } } else { /* Add reference to pdp page */ - pdppg = PHYS_TO_VM_PAGE(*pml4); + pdppg = PHYS_TO_VM_PAGE(*pml4 & PG_FRAME); pdppg->hold_count++; } pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME); @@ -1210,7 +1210,7 @@ } } else { /* Add reference to the pd page */ - pdpg = PHYS_TO_VM_PAGE(*pdp); + pdpg = PHYS_TO_VM_PAGE(*pdp & PG_FRAME); pdpg->hold_count++; } } @@ -1260,7 +1260,7 @@ * hold count, and activate it. */ if (pd != 0 && (*pd & PG_V) != 0) { - m = PHYS_TO_VM_PAGE(*pd); + m = PHYS_TO_VM_PAGE(*pd & PG_FRAME); m->hold_count++; } else { /* @@ -1297,7 +1297,7 @@ LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); - m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I]); + m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I] & PG_FRAME); pmap->pm_pml4[KPML4I] = 0; /* KVA */ pmap->pm_pml4[DMPML4I] = 0; /* Direct Map */ @@ -1517,7 +1517,7 @@ pmap_invalidate_page(kernel_pmap, va); pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { - m = PHYS_TO_VM_PAGE(oldpte); + m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); if (oldpte & PG_M) { #if defined(PMAP_DIAGNOSTIC) if (pmap_nw_modified((pt_entry_t) oldpte)) { @@ -1533,7 +1533,7 @@ vm_page_flag_set(m, PG_REFERENCED); return pmap_remove_entry(pmap, m, va); } else { - mpte = PHYS_TO_VM_PAGE(*pmap_pde(pmap, va)); + mpte = PHYS_TO_VM_PAGE(*pmap_pde(pmap, va) & PG_FRAME); return pmap_unuse_pt(pmap, va, mpte); } } @@ -1772,14 +1772,14 @@ if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { - m = PHYS_TO_VM_PAGE(pbits); + m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); vm_page_flag_set(m, PG_REFERENCED); pbits &= ~PG_A; } if ((pbits & PG_M) != 0 && pmap_track_modified(sva)) { if (m == NULL) - m = PHYS_TO_VM_PAGE(pbits); + m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); vm_page_dirty(m); pbits &= ~PG_M; } @@ -1900,7 +1900,7 @@ if (origpte & PG_MANAGED) { if ((origpte & PG_M) && pmap_track_modified(va)) { vm_page_t om; - om = PHYS_TO_VM_PAGE(opa); + om = PHYS_TO_VM_PAGE(opa & PG_FRAME); vm_page_dirty(om); } pa |= PG_MANAGED; @@ -2011,7 +2011,7 @@ if (ptepa && (*ptepa & PG_V) != 0) { if (*ptepa & PG_PS) panic("pmap_enter_quick: unexpected mapping into 2MB page"); - mpte = PHYS_TO_VM_PAGE(*ptepa); + mpte = PHYS_TO_VM_PAGE(*ptepa & PG_FRAME); mpte->hold_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex); @@ -2249,7 +2249,7 @@ continue; } - srcmpte = PHYS_TO_VM_PAGE(srcptepaddr); + srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); if (srcmpte->hold_count == 0 || (srcmpte->flags & PG_BUSY)) continue; @@ -2277,7 +2277,7 @@ * accessed (referenced) bits * during the copy. */ - m = PHYS_TO_VM_PAGE(ptetemp); + m = PHYS_TO_VM_PAGE(ptetemp & PG_FRAME); *dst_pte = ptetemp & ~(PG_M | PG_A); dst_pmap->pm_stats.resident_count++; pmap_insert_entry(dst_pmap, addr, @@ -2443,7 +2443,7 @@ continue; } - m = PHYS_TO_VM_PAGE(tpte); + m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); KASSERT(m->phys_addr == (tpte & PG_FRAME), ("vm_page_t %p phys_addr mismatch %016jx %016jx", m, (uintmax_t)m->phys_addr, (uintmax_t)tpte)); From owner-p4-projects@FreeBSD.ORG Fri Jun 4 22:58:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD3E316A4D0; Fri, 4 Jun 2004 22:58:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A32B16A4CE for ; Fri, 4 Jun 2004 22:58:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61CEB43D48 for ; Fri, 4 Jun 2004 22:58:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i555vimV032613 for ; Fri, 4 Jun 2004 22:57:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i555vgcn032543 for perforce@freebsd.org; Fri, 4 Jun 2004 22:57:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 4 Jun 2004 22:57:42 -0700 (PDT) Message-Id: <200406050557.i555vgcn032543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54201 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, 05 Jun 2004 05:58:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=54201 Change 54201 by marcel@marcel_nfs on 2004/06/04 22:56:50 IFC @54199 Affected files ... .. //depot/projects/gdb/UPDATING#13 integrate .. //depot/projects/gdb/bin/cp/utils.c#3 integrate .. //depot/projects/gdb/bin/df/df.c#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#13 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/gdb/lib/libdisk/write_alpha_disk.c#2 integrate .. //depot/projects/gdb/lib/libdisk/write_amd64_disk.c#2 integrate .. //depot/projects/gdb/lib/libdisk/write_i386_disk.c#3 integrate .. //depot/projects/gdb/lib/libdisk/write_pc98_disk.c#3 integrate .. //depot/projects/gdb/share/man/man3/Makefile#3 integrate .. //depot/projects/gdb/share/man/man4/screen.4#2 integrate .. //depot/projects/gdb/share/man/man5/libmap.conf.5#4 integrate .. //depot/projects/gdb/share/man/man5/periodic.conf.5#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/promcons.c#4 integrate .. //depot/projects/gdb/sys/alpha/linux/linux_proto.h#5 integrate .. //depot/projects/gdb/sys/alpha/linux/linux_syscall.h#5 integrate .. //depot/projects/gdb/sys/alpha/linux/linux_sysent.c#5 integrate .. //depot/projects/gdb/sys/alpha/linux/syscalls.master#5 integrate .. //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#14 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#11 integrate .. //depot/projects/gdb/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/gdb/sys/dev/ciss/cissreg.h#6 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#5 integrate .. //depot/projects/gdb/sys/dev/dcons/dcons.c#8 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#5 integrate .. //depot/projects/gdb/sys/dev/em/if_em.c#7 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#18 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/gdb/sys/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/gdb/sys/dev/ofw/ofw_console.c#5 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#6 integrate .. //depot/projects/gdb/sys/dev/rp/rp.c#4 integrate .. //depot/projects/gdb/sys/dev/sab/sab.c#7 integrate .. //depot/projects/gdb/sys/dev/si/si.c#4 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#12 integrate .. //depot/projects/gdb/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/gdb/sys/dev/sx/sx.c#3 integrate .. //depot/projects/gdb/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/gdb/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/gdb/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/umass.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#11 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#11 integrate .. //depot/projects/gdb/sys/dev/zs/zs.c#6 integrate .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_ext.c#3 integrate .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_hdr.h#5 integrate .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_sup.c#2 integrate .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_vtf.c#2 integrate .. //depot/projects/gdb/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/gdb/sys/ia64/ia64/ssc.c#4 integrate .. //depot/projects/gdb/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/gdb/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#8 integrate .. //depot/projects/gdb/sys/kern/tty.c#6 integrate .. //depot/projects/gdb/sys/kern/tty_pty.c#6 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/gdb/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/gdb/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/gdb/sys/pc98/pc98/scgdcrndr.c#2 integrate .. //depot/projects/gdb/sys/pc98/pc98/scterm-sck.c#2 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#10 integrate .. //depot/projects/gdb/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/gdb/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/eeprom_ebus.c#4 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/eeprom_fhc.c#4 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/eeprom_sbus.c#4 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/gdb/sys/sys/bus.h#4 integrate .. //depot/projects/gdb/sys/sys/conf.h#6 integrate .. //depot/projects/gdb/sys/sys/linedisc.h#1 branch .. //depot/projects/gdb/sys/sys/param.h#12 integrate .. //depot/projects/gdb/sys/sys/socketvar.h#5 integrate .. //depot/projects/gdb/sys/sys/tty.h#4 integrate .. //depot/projects/gdb/sys/sys/vnode.h#5 integrate .. //depot/projects/gdb/usr.bin/calendar/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpiconf/acpiconf.8#3 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpidump.8#2 integrate .. //depot/projects/gdb/usr.sbin/adduser/adduser.8#4 integrate .. //depot/projects/gdb/usr.sbin/bluetooth/bcmfw/bcmfw.8#2 integrate .. //depot/projects/gdb/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#3 integrate .. //depot/projects/gdb/usr.sbin/boot0cfg/boot0cfg.8#2 integrate .. //depot/projects/gdb/usr.sbin/cron/crontab/crontab.1#3 integrate .. //depot/projects/gdb/usr.sbin/cron/crontab/crontab.5#2 integrate .. //depot/projects/gdb/usr.sbin/faithd/faithd.8#2 integrate .. //depot/projects/gdb/usr.sbin/fdcontrol/fdcontrol.8#3 integrate .. //depot/projects/gdb/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/gdb/usr.sbin/gstat/gstat.8#3 integrate .. //depot/projects/gdb/usr.sbin/gstat/gstat.c#6 integrate .. //depot/projects/gdb/usr.sbin/mountd/mountd.8#3 integrate .. //depot/projects/gdb/usr.sbin/mtree/mtree.8#2 integrate .. //depot/projects/gdb/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/gdb/usr.sbin/ndp/ndp.8#2 integrate .. //depot/projects/gdb/usr.sbin/wicontrol/wicontrol.8#2 integrate Differences ... ==== //depot/projects/gdb/UPDATING#13 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20040601: + The MIDI drivers have been removed. Until the new module-friendly + ones are merged, remove or comment out midi and seq from your + kernel configuration. + 20040423: Due to a new option in ipfw (versrcreach) the ipfw(8) command needs to be recompiled. Normal accept/reject rules without @@ -1602,4 +1607,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.307 2004/04/23 14:33:30 andre Exp $ +$FreeBSD: src/UPDATING,v 1.308 2004/06/04 15:24:12 tanimura Exp $ ==== //depot/projects/gdb/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.43 2004/04/06 20:06:44 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.44 2004/06/05 02:32:21 tjr Exp $"); #include #include @@ -88,6 +88,7 @@ if (nflag) { if (vflag) printf("%s not overwritten\n", to.p_path); + (void)close(from_fd); return (0); } else if (iflag) { (void)fprintf(stderr, "overwrite %s? %s", ==== //depot/projects/gdb/bin/df/df.c#9 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.61 2004/05/24 22:21:49 pjd Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.62 2004/06/04 09:30:51 das Exp $"); #include #include @@ -81,6 +81,7 @@ static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); static void prthumanval(int64_t); +static intmax_t fsbtoblk(int64_t, uint64_t, u_long); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); static void update_maxwidths(struct maxwidths *, const struct statfs *); @@ -345,10 +346,15 @@ * Convert statfs returned file system size into BLOCKSIZE units. * Attempts to avoid overflow for large file systems. */ -#define fsbtoblk(num, fsbs, bs) \ - (((fsbs) != 0 && (fsbs) < (bs)) ? \ - (num) / (intmax_t)((bs) / (fsbs)) : \ - (num) * (intmax_t)((fsbs) / (bs))) +static intmax_t +fsbtoblk(int64_t num, uint64_t fsbs, u_long bs) +{ + + if (fsbs != 0 && fsbs < bs) + return (num / (intmax_t)(bs / fsbs)); + else + return (num * (intmax_t)(fsbs / bs)); +} /* * Print out status about a file system. @@ -392,11 +398,10 @@ prthuman(sfsp, used); } else { (void)printf(" %*jd %*jd %*jd", - mwp->total, (intmax_t)fsbtoblk(sfsp->f_blocks, + mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, (intmax_t)fsbtoblk(used, sfsp->f_bsize, - blocksize), - mwp->avail, (intmax_t)fsbtoblk(sfsp->f_bavail, + mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", ==== //depot/projects/gdb/lib/libarchive/archive_read.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.9 2004/06/04 01:36:10 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.10 2004/06/04 23:25:20 kientzle Exp $"); #include #include @@ -263,6 +263,8 @@ } *entryp = entry; + a->read_data_output_offset = 0; + a->read_data_remaining = 0; return (ret); } @@ -336,6 +338,9 @@ * buffer, filling any gaps with zero bytes. Clients using this * API can be completely ignorant of sparse-file issues; sparse files * will simply be padded with nulls. + * + * DO NOT intermingle calls to this function and archive_read_data_block + * to read a single entry body. */ ssize_t archive_read_data(struct archive *a, void *buff, size_t s) ==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.14 2004/06/03 23:29:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.16 2004/06/05 05:34:45 kientzle Exp $"); #include #include @@ -423,7 +423,7 @@ } if (archive_read_extract_dir_create(a, archive_entry_pathname(entry), - mode, flags)) { + writable_mode, flags)) { /* Unable to create directory; just use the existing dir. */ return (ARCHIVE_WARN); } @@ -502,6 +502,18 @@ mkdirpath(a, name); if (mkdir(name, mode) == 0) return (ARCHIVE_OK); + /* + * Yes, people really do type "tar -cf - foo/." for + * reasons that I cannot fathom. When they do, the + * dir "foo" gets created in mkdirpath() and the + * mkdir("foo/.") just above still fails. So, I've + * added yet another check here to catch this + * particular case. + * + * There must be a better way ... + */ + if (stat(name, &st) == 0 && S_ISDIR(st.st_mode)) + return (ARCHIVE_OK); } else { /* Stat failed? */ archive_set_error(a, errno, "Can't test directory"); ==== //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.15 2004/06/02 08:14:43 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.17 2004/06/04 23:24:21 kientzle Exp $"); #include #include @@ -201,8 +201,19 @@ /* Now let's look at the actual header and see if it matches. */ bytes_read = (a->compression_read_ahead)(a, &h, 512); - if (bytes_read < 512) + if (bytes_read < 0) + return (ARCHIVE_FATAL); + if (bytes_read == 0 && bid > 0) { + /* An archive without a proper end-of-archive marker. */ + /* Hold our nose and bid 1 anyway. */ + return (1); + } + if (bytes_read < 512) { + if (bid > 0) + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Truncated tar archive"); return (ARCHIVE_FATAL); + } /* If it's an end-of-archive mark, we can handle it. */ if ((*(const char *)h) == 0 && archive_block_is_null(h)) @@ -325,13 +336,21 @@ /* Read 512-byte header record */ bytes = (a->compression_read_ahead)(a, &h, 512); if (bytes < 512) { - /* TODO: Set error values */ - return (-1); + /* + * If we're here, it's becase the _bid function accepted + * this file. So just call a short read end-of-archive + * and be done with it. + */ + return (ARCHIVE_EOF); } (a->compression_read_consume)(a, 512); /* Check for end-of-archive mark. */ if (((*(const char *)h)==0) && archive_block_is_null(h)) { + /* Try to consume a second all-null record, as well. */ + bytes = (a->compression_read_ahead)(a, &h, 512); + if (bytes > 0) + (a->compression_read_consume)(a, bytes); archive_set_error(a, 0, NULL); return (ARCHIVE_EOF); } @@ -561,30 +580,37 @@ read_body_to_string(struct archive *a, struct tar *tar, struct archive_string *as, const void *h) { + off_t size, padded_size; + ssize_t bytes_read, bytes_to_copy; const struct archive_entry_header_ustar *header; - off_t size; - unsigned oldstate; - int err, err2; + const void *src; + char *dest; + (void)tar; /* UNUSED */ header = h; size = tar_atol(header->size, sizeof(header->size)); - /* Temporarily fudge internal state for read_data call. */ - oldstate = a->state; - a->state = ARCHIVE_STATE_DATA; - /* Read the body into the string. */ - tar->entry_bytes_remaining = size; - tar->entry_padding = 0x1ff & -size; archive_string_ensure(as, size+1); - err = archive_read_data_into_buffer(a, as->s, size); - as->s[size] = 0; /* Null terminate name! */ - err2 = archive_read_data_skip(a); /* Resync for next header. */ - - /* Restore the state. */ - a->state = oldstate; - - return (err_combine(err, err2)); + padded_size = (size + 511) & ~ 511; + dest = as->s; + while (padded_size > 0) { + bytes_read = (a->compression_read_ahead)(a, &src, padded_size); + if (bytes_read < 0) + return (ARCHIVE_FATAL); + if (bytes_read > padded_size) + bytes_read = padded_size; + (a->compression_read_consume)(a, bytes_read); + bytes_to_copy = bytes_read; + if ((off_t)bytes_to_copy > size) + bytes_to_copy = (ssize_t)size; + memcpy(dest, src, bytes_to_copy); + dest += bytes_to_copy; + size -= bytes_to_copy; + padded_size -= bytes_read; + } + *dest = '\0'; + return (ARCHIVE_OK); } /* ==== //depot/projects/gdb/lib/libdisk/write_alpha_disk.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/write_alpha_disk.c,v 1.11 2003/04/04 16:59:39 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_alpha_disk.c,v 1.12 2004/06/04 11:49:11 brian Exp $"); #include #include @@ -51,7 +51,10 @@ } for (i = 0; i < BBSIZE/512; i++) { - p = read_block(fd, i + c1->offset, 512); + if (!(p = read_block(fd, i + c1->offset, 512))) { + close (fd); + return (1); + } memcpy(buf + 512 * i, p, 512); free(p); } ==== //depot/projects/gdb/lib/libdisk/write_amd64_disk.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/write_amd64_disk.c,v 1.7 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_amd64_disk.c,v 1.8 2004/06/04 11:49:11 brian Exp $"); #include #include @@ -35,7 +35,8 @@ u_char buf[BBSIZE]; for (i = 0; i < BBSIZE/512; i++) { - p = read_block(fd, i + c1->offset, 512); + if (!(p = read_block(fd, i + c1->offset, 512))) + return (1); memcpy(buf + 512 * i, p, 512); free(p); } @@ -101,7 +102,10 @@ return 1; memset(s, 0, sizeof s); - mbr = read_block(fd, 0, d1->sector_size); + if (!(mbr = read_block(fd, 0, d1->sector_size))) { + close (fd); + return (1); + } dp = (struct dos_partition *)(mbr + DOSPARTOFF); memcpy(work, dp, sizeof work); dp = work; @@ -178,7 +182,10 @@ if (dp[i].dp_typ == 0xa5) dp[i].dp_flag = 0x80; - mbr = read_block(fd, 0, d1->sector_size); + if (!(mbr = read_block(fd, 0, d1->sector_size))) { + close (fd); + return (1); + } if (d1->bootmgr) { memcpy(mbr, d1->bootmgr, DOSPARTOFF); Cfg_Boot_Mgr(mbr, need_edd); ==== //depot/projects/gdb/lib/libdisk/write_i386_disk.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.8 2004/03/30 01:39:00 kuriyama Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.9 2004/06/04 11:49:11 brian Exp $"); #include #include @@ -35,7 +35,8 @@ u_char buf[BBSIZE]; for (i = 0; i < BBSIZE/512; i++) { - p = read_block(fd, i + c1->offset, 512); + if (!(p = read_block(fd, i + c1->offset, 512))) + return (1); memcpy(buf + 512 * i, p, 512); free(p); } @@ -101,7 +102,10 @@ return 1; memset(s, 0, sizeof s); - mbrblk = read_block(fd, 0, d1->sector_size); + if (!(mbrblk = read_block(fd, 0, d1->sector_size))) { + close (fd); + return (1); + } dp = (struct dos_partition *)(mbrblk + DOSPARTOFF); memcpy(work, dp, sizeof work); dp = work; @@ -178,7 +182,10 @@ if (dp[i].dp_typ == 0xa5) dp[i].dp_flag = 0x80; - mbrblk = read_block(fd, 0, d1->sector_size); + if (!(mbrblk = read_block(fd, 0, d1->sector_size))) { + close (fd); + return (1); + } if (d1->bootmgr) { memcpy(mbrblk, d1->bootmgr, DOSPARTOFF); Cfg_Boot_Mgr(mbrblk, need_edd); ==== //depot/projects/gdb/lib/libdisk/write_pc98_disk.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/write_pc98_disk.c,v 1.10 2004/03/30 12:22:31 nyan Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_pc98_disk.c,v 1.11 2004/06/04 11:49:11 brian Exp $"); #include #include @@ -37,7 +37,8 @@ u_char buf[BBSIZE]; for (i = 0; i < BBSIZE / 512; i++) { - p = read_block(fd, i + c1->offset, 512); + if (!(p = read_block(fd, i + c1->offset, 512))) + return (1); memcpy(buf + 512 * i, p, 512); free(p); } @@ -87,7 +88,10 @@ } memset(s, 0, sizeof s); - mbrblk = read_block(fd, 1, d1->sector_size); + if (!(mbrblk = read_block(fd, 1, d1->sector_size))) { + close (fd); + return (1); + } dp = (struct pc98_partition *)(mbrblk + DOSPARTOFF); memcpy(work, dp, sizeof work); dp = work; @@ -151,7 +155,10 @@ if (d1->bootipl) write_block(fd, 0, d1->bootipl, d1->sector_size); - mbrblk = read_block(fd, 1, d1->sector_size); + if (!(mbrblk = read_block(fd, 1, d1->sector_size))) { + close (fd); + return (1); + } memcpy(mbrblk + DOSPARTOFF, dp, sizeof *dp * NDOSPART); /* XXX - for entire FreeBSD(98) */ for (c1 = d1->chunks->part; c1; c1 = c1->next) ==== //depot/projects/gdb/share/man/man3/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/13/93 -# $FreeBSD: src/share/man/man3/Makefile,v 1.30 2004/02/19 13:51:52 mtm Exp $ +# $FreeBSD: src/share/man/man3/Makefile,v 1.31 2004/06/04 10:14:55 pjd Exp $ MAN= assert.3 \ bitstring.3 \ @@ -38,6 +38,7 @@ queue.3 LIST_ENTRY.3 \ queue.3 LIST_FIRST.3 \ queue.3 LIST_FOREACH.3 \ + queue.3 LIST_FOREACH_SAFE.3 \ queue.3 LIST_HEAD.3 \ queue.3 LIST_HEAD_INITIALIZER.3 \ queue.3 LIST_INIT.3 \ @@ -50,6 +51,7 @@ queue.3 SLIST_ENTRY.3 \ queue.3 SLIST_FIRST.3 \ queue.3 SLIST_FOREACH.3 \ + queue.3 SLIST_FOREACH_SAFE.3 \ queue.3 SLIST_HEAD.3 \ queue.3 SLIST_HEAD_INITIALIZER.3 \ queue.3 SLIST_INIT.3 \ @@ -63,6 +65,7 @@ queue.3 STAILQ_ENTRY.3 \ queue.3 STAILQ_FIRST.3 \ queue.3 STAILQ_FOREACH.3 \ + queue.3 STAILQ_FOREACH_SAFE.3 \ queue.3 STAILQ_HEAD.3 \ queue.3 STAILQ_HEAD_INITIALIZER.3 \ queue.3 STAILQ_INIT.3 \ @@ -79,6 +82,8 @@ queue.3 TAILQ_FIRST.3 \ queue.3 TAILQ_FOREACH.3 \ queue.3 TAILQ_FOREACH_REVERSE.3 \ + queue.3 TAILQ_FOREACH_REVERSE_SAFE.3 \ + queue.3 TAILQ_FOREACH_SAFE.3 \ queue.3 TAILQ_HEAD.3 \ queue.3 TAILQ_HEAD_INITIALIZER.3 \ queue.3 TAILQ_INIT.3 \ ==== //depot/projects/gdb/share/man/man4/screen.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/screen.4,v 1.26 2001/10/01 13:47:40 ru Exp $ +.\" $FreeBSD: src/share/man/man4/screen.4,v 1.27 2004/06/04 15:20:12 roam Exp $ .\" .Dd October 6, 2000 .Dt SCREEN 4 @@ -56,7 +56,7 @@ The console understands a subset of the ANSI x3.64 character sequences. For compatibility with the old pccons, the PC3 character -sequences is also supported. +sequences are also supported. .Pp .Bd -literal ANSI Seq Function Termcap entry ==== //depot/projects/gdb/share/man/man5/libmap.conf.5#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/libmap.conf.5,v 1.6 2004/05/24 01:24:13 mdodd Exp $ +.\" $FreeBSD: src/share/man/man5/libmap.conf.5,v 1.7 2004/06/05 02:47:08 ceri Exp $ .\" .Dd January 31, 2004 .Dt LIBMAP.CONF 5 @@ -55,7 +55,7 @@ .Pa /usr/bin/foo will not match a constraint for .Pa /usr/bin/./foo -and vise-versa. +and vice-versa. This is the default constraint type. .It Basename A constraint with no path is matched against the basename of the ==== //depot/projects/gdb/share/man/man5/periodic.conf.5#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.48 2004/05/30 20:32:00 brian Exp $ +.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.49 2004/06/05 03:01:20 ceri Exp $ .\" .Dd June 22, 2000 .Dt PERIODIC.CONF 5 @@ -456,7 +456,7 @@ .Dq YES if you want to ignore .Xr amd 8 -mounts when comparing against yesterdays file system mounts in the +mounts when comparing against yesterday's file system mounts in the .Va daily_status_security_chkmounts_enable check. .It Va daily_status_security_chkuid0_enable @@ -672,7 +672,7 @@ .Va pkg_version variable is set to .Dq portversion , -it will also be neccessary to arrange that the correct INDEX file is specified +it will also be necessary to arrange that the correct INDEX file is specified using environment variables and that .Dq pkg_version_index is cleared in ==== //depot/projects/gdb/sys/alpha/alpha/promcons.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.37 2004/06/01 13:49:25 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.38 2004/06/04 16:02:48 phk Exp $"); #include #include @@ -124,7 +124,7 @@ splx(s); - error = (*linesw[tp->t_line].l_open)(dev, tp); + error = ttyld_open(tp, dev); if (error == 0 && setuptimeout) { polltime = hz / PROM_POLL_HZ; @@ -148,7 +148,7 @@ return ENXIO; untimeout(promtimeout, tp, promtimeouthandle); - (*linesw[tp->t_line].l_close)(tp, flag); + ttyld_close(tp, flag); ttyclose(tp); return 0; } @@ -211,7 +211,7 @@ while ((c = promcncheckc(NULL)) != -1) { if (tp->t_state & TS_ISOPEN) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); } promtimeouthandle = timeout(promtimeout, tp, polltime); } ==== //depot/projects/gdb/sys/alpha/linux/linux_proto.h#5 (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.17 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.18 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/gdb/sys/alpha/linux/linux_syscall.h#5 (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.15 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.16 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/gdb/sys/alpha/linux/linux_sysent.c#5 (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.15 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.16 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #include "opt_compat.h" @@ -382,7 +382,7 @@ { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer }, /* 362 = linux_setitimer */ { AS(linux_utimes_args), (sy_call_t *)linux_utimes }, /* 363 = linux_utimes */ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage }, /* 364 = getrusage */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */ { 0, (sy_call_t *)linux_adjtimex }, /* 366 = linux_adjtimex */ { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd }, /* 367 = linux_getcwd */ { 0, (sy_call_t *)linux_capget }, /* 368 = linux_capget */ ==== //depot/projects/gdb/sys/alpha/linux/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.57 2004/03/29 02:19:43 bms Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -445,7 +445,7 @@ struct l_itimerval *oitv); } 363 STD { int linux_utimes(char *fname, struct l_timeval *times); } 364 MNOPROTO { int getrusage(int who, struct rusage *rusage); } -365 STD { int linux_wait4(l_pid_t pid, l_uint *status, l_int options, \ +365 MSTD { int linux_wait4(l_pid_t pid, l_uint *status, l_int options, \ struct l_rusage *rusage); } 366 STD { int linux_adjtimex(void); } 367 STD { int linux_getcwd(char *buf, l_ulong bufsize); } ==== //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.43 2004/06/01 13:49:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.44 2004/06/04 16:02:48 phk Exp $"); #include "opt_ddb.h" @@ -292,7 +292,7 @@ splx(s); - error = (*linesw[tp->t_line].l_open)(dev, tp); + error = ttyld_open(tp, dev); if (error == 0 && setuptimeout) { zspolltime = hz / 50; @@ -319,7 +319,7 @@ s = spltty(); untimeout(zs_poll_intr, sc, sc->zst); - (*linesw[tp->t_line].l_close)(tp, flag); + ttyld_close(tp, flag); ttyclose(tp); splx(s); @@ -503,7 +503,7 @@ kdb_enter("manual escape to debugger"); #endif if (tp && (tp->t_state & TS_ISOPEN)) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); DELAY(5); } } @@ -518,7 +518,7 @@ kdb_enter("manual escape to debugger"); #endif if (tp && (tp->t_state & TS_ISOPEN)) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); DELAY(5); } } ==== //depot/projects/gdb/sys/amd64/amd64/fpu.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.149 2004/04/05 21:25:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.150 2004/06/05 03:13:39 das Exp $"); #include #include @@ -73,6 +73,7 @@ #define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) +#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : : "m" (r)) #define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") @@ -111,6 +112,7 @@ fpuinit(void) { register_t savecrit; + u_int mxcsr; u_short control; savecrit = intr_disable(); @@ -119,6 +121,8 @@ fninit(); control = __INITIAL_FPUCW__; fldcw(&control); + mxcsr = __INITIAL_MXCSR__; + ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); start_emulating(); fpu_cleanstate_ready = 1; ==== //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.54 2004/06/01 23:24:17 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.55 2004/06/04 22:24:46 des Exp $"); #include #include @@ -611,6 +611,7 @@ TAILQ_INIT(&sc->ndis_cfglist_head); +#if __FreeBSD_version < 502113 /* Create the sysctl tree. */ sc->ndis_tree = SYSCTL_ADD_NODE(&sc->ndis_ctx, @@ -618,6 +619,7 @@ device_get_nameunit(sc->ndis_dev), CTLFLAG_RD, 0, device_get_desc(sc->ndis_dev)); +#endif /* Add the driver-specific registry keys. */ vals = sc->ndis_regvals; @@ -628,8 +630,13 @@ vals++; continue; } +#if __FreeBSD_version < 502113 SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), +#else + SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)), +#endif OID_AUTO, vals->nc_cfgkey, CTLFLAG_RW, vals->nc_val, sizeof(vals->nc_val), @@ -698,7 +705,12 @@ TAILQ_INSERT_TAIL(&sc->ndis_cfglist_head, cfg, link); +#if __FreeBSD_version < 502113 SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), +#else + SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)), +#endif OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), cfg->ndis_cfg.nc_cfgdesc); ==== //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.58 2004/05/29 22:34:08 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.60 2004/06/04 22:24:46 des Exp $"); /* * This file implements a translation layer between the BSD networking @@ -130,7 +130,7 @@ struct sysctl_oid *, ndis_parm_type, ndis_config_parm **); static ndis_status ndis_decode_parm(ndis_miniport_block *, ndis_config_parm *, char *); -static int my_strcasecmp(const char *, const char *, int); +static int my_strcasecmp(const char *, const char *); __stdcall static void ndis_read_cfg(ndis_status *, ndis_config_parm **, ndis_handle, ndis_unicode_string *, ndis_parm_type); __stdcall static void ndis_write_cfg(ndis_status *, ndis_handle, @@ -557,19 +557,27 @@ } static int -my_strcasecmp(s1, s2, len) +my_strcasecmp(s1, s2) const char *s1; const char *s2; - int len; { - int i; + char a, b; + + /* + * In the kernel, toupper() is a macro. Have to be careful + * not to use pointer arithmetic when passing it arguments. + */ - for (i = 0; i < len; i++) { - if (toupper(s1[i]) != toupper(s2[i])) - return(1); - } + while(1) { + a = *s1; + b = *s2++; + if (toupper(a) != toupper(b)) + break; + if (*s1++ == 0) + return(0); + } - return(0); + return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1)); } __stdcall static void @@ -605,10 +613,13 @@ * See if registry key is already in a list of known keys * included with the driver. */ +#if __FreeBSD_version < 502113 TAILQ_FOREACH(e, &sc->ndis_ctx, link) { +#else + TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { +#endif oidp = e->entry; - if (my_strcasecmp(oidp->oid_name, - keystr, strlen(keystr)) == 0) { + if (my_strcasecmp(oidp->oid_name, keystr) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { free(keystr, M_DEVBUF); *status = NDIS_STATUS_FAILURE; @@ -702,10 +713,13 @@ /* See if the key already exists. */ +#if __FreeBSD_version < 502113 TAILQ_FOREACH(e, &sc->ndis_ctx, link) { +#else + TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { +#endif oidp = e->entry; - if (my_strcasecmp(oidp->oid_name, - keystr, strlen(keystr)) == 0) { + if (my_strcasecmp(oidp->oid_name, keystr) == 0) { /* Found it, set the value. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 4 23:27:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A54416A4D0; Fri, 4 Jun 2004 23:27:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 116F016A4CE for ; Fri, 4 Jun 2004 23:27:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 082CF43D48 for ; Fri, 4 Jun 2004 23:27:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i556Ra9q040264 for ; Fri, 4 Jun 2004 23:27:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i556RFhx039834 for perforce@freebsd.org; Fri, 4 Jun 2004 23:27:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 4 Jun 2004 23:27:15 -0700 (PDT) Message-Id: <200406050627.i556RFhx039834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54203 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, 05 Jun 2004 06:27:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=54203 Change 54203 by marcel@marcel_nfs on 2004/06/04 23:26:17 IFC @54199 Affected files ... .. //depot/projects/ia64/MAINTAINERS#40 integrate .. //depot/projects/ia64/Makefile.inc1#91 integrate .. //depot/projects/ia64/UPDATING#64 integrate .. //depot/projects/ia64/bin/cp/utils.c#12 integrate .. //depot/projects/ia64/bin/date/date.1#7 integrate .. //depot/projects/ia64/bin/dd/dd.1#7 integrate .. //depot/projects/ia64/bin/df/Makefile#6 integrate .. //depot/projects/ia64/bin/df/df.1#8 integrate .. //depot/projects/ia64/bin/df/df.c#21 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.1#6 integrate .. //depot/projects/ia64/bin/ls/Makefile#8 integrate .. //depot/projects/ia64/bin/ls/extern.h#8 integrate .. //depot/projects/ia64/bin/ls/ls.1#21 integrate .. //depot/projects/ia64/bin/ls/ls.c#20 integrate .. //depot/projects/ia64/bin/ls/print.c#17 integrate .. //depot/projects/ia64/bin/ls/util.c#9 integrate .. //depot/projects/ia64/bin/pax/Makefile#6 integrate .. //depot/projects/ia64/bin/ps/ps.1#22 integrate .. //depot/projects/ia64/bin/ps/ps.c#16 integrate .. //depot/projects/ia64/bin/rmdir/rmdir.c#6 integrate .. //depot/projects/ia64/bin/sh/arith.y#8 integrate .. //depot/projects/ia64/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/amd/FREEBSD-upgrade#4 integrate .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#2 delete .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#3 delete .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#2 delete .. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#2 delete .. //depot/projects/ia64/contrib/cvs/src/server.c#7 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.c#5 integrate .. //depot/projects/ia64/contrib/pf/ftp-proxy/ftp-proxy.8#2 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#12 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#49 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#24 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#23 integrate .. //depot/projects/ia64/etc/mtree/BSD.root.dist#11 integrate .. //depot/projects/ia64/etc/mtree/BSD.x11-4.dist#6 integrate .. //depot/projects/ia64/etc/periodic/weekly/400.status-pkg#3 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#27 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#12 integrate .. //depot/projects/ia64/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/ia64/etc/rc.d/netif#7 integrate .. //depot/projects/ia64/etc/rc.d/nisdomain#2 integrate .. //depot/projects/ia64/etc/rc.d/nsswitch#1 branch .. //depot/projects/ia64/etc/rc.d/power_profile#3 integrate .. //depot/projects/ia64/etc/rc.firewall6#5 integrate .. //depot/projects/ia64/etc/services#13 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#38 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#23 integrate .. //depot/projects/ia64/games/fortune/datfiles/murphy#5 integrate .. //depot/projects/ia64/games/morse/morse.6#4 integrate .. //depot/projects/ia64/games/morse/morse.c#4 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_drv/Makefile#3 delete .. //depot/projects/ia64/gnu/usr.bin/cc/cccp/Makefile#6 delete .. //depot/projects/ia64/gnu/usr.bin/cc/cpp0/Makefile#4 delete .. //depot/projects/ia64/gnu/usr.bin/cc/tradcpp0/Makefile#4 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gzip/gzip.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gzip/unzip.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/tar/Makefile#6 integrate .. //depot/projects/ia64/include/Makefile#37 integrate .. //depot/projects/ia64/include/complex.h#3 integrate .. //depot/projects/ia64/include/fts.h#4 integrate .. //depot/projects/ia64/include/rpcsvc/yp_prot.h#3 integrate .. //depot/projects/ia64/include/stdio.h#18 integrate .. //depot/projects/ia64/include/wchar.h#18 integrate .. //depot/projects/ia64/include/wctype.h#5 integrate .. //depot/projects/ia64/lib/Makefile#44 integrate .. //depot/projects/ia64/lib/csu/arm/Makefile#1 branch .. //depot/projects/ia64/lib/csu/arm/crt1.c#1 branch .. //depot/projects/ia64/lib/csu/arm/crti.S#1 branch .. //depot/projects/ia64/lib/csu/arm/crtn.S#1 branch .. //depot/projects/ia64/lib/libarchive/Makefile#4 integrate .. //depot/projects/ia64/lib/libarchive/archive.h#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_all.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_compress.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/ia64/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/ia64/lib/libarchive/tar.5#4 integrate .. //depot/projects/ia64/lib/libatm/Makefile#6 integrate .. //depot/projects/ia64/lib/libc/Makefile#15 integrate .. //depot/projects/ia64/lib/libc/arm/SYS.h#1 branch .. //depot/projects/ia64/lib/libc/arm/_fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/arm/arith.h#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/_ctx_start.S#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/_setjmp.S#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/alloca.S#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/divsi3.S#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/fabs.c#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/frexp.c#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/infinity.c#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/isinf.c#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/ldexp.c#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/makecontext.c#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/modf.c#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/setjmp.S#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/signalcontext.c#1 branch .. //depot/projects/ia64/lib/libc/arm/gen/sigsetjmp.S#1 branch .. //depot/projects/ia64/lib/libc/arm/net/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/arm/net/htonl.S#1 branch .. //depot/projects/ia64/lib/libc/arm/net/htons.S#1 branch .. //depot/projects/ia64/lib/libc/arm/net/ntohl.S#1 branch .. //depot/projects/ia64/lib/libc/arm/net/ntohs.S#1 branch .. //depot/projects/ia64/lib/libc/arm/softfloat/arm-gcc.h#1 branch .. //depot/projects/ia64/lib/libc/arm/softfloat/milieu.h#1 branch .. //depot/projects/ia64/lib/libc/arm/softfloat/softfloat.h#1 branch .. //depot/projects/ia64/lib/libc/arm/stdlib/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/arm/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64/lib/libc/arm/string/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/arm/string/bcopy.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/bzero.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/ffs.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/memcmp.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/memcpy.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/memcpy_arm.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/memcpy_xscale.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/memmove.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/memset.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/strcmp.S#1 branch .. //depot/projects/ia64/lib/libc/arm/string/strncmp.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/Ovfork.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/brk.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/cerror.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/fork.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/getcontext.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/pipe.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/ptrace.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/sbrk.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/shmat.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/sigreturn.S#1 branch .. //depot/projects/ia64/lib/libc/arm/sys/syscall.S#1 branch .. //depot/projects/ia64/lib/libc/gen/dlopen.3#10 integrate .. //depot/projects/ia64/lib/libc/gen/fmtcheck.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/ftok.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/fts.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#11 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.3#8 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.c#18 integrate .. //depot/projects/ia64/lib/libc/gen/lockf.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/syslog.c#8 integrate .. //depot/projects/ia64/lib/libc/gen/ualarm.3#4 integrate .. //depot/projects/ia64/lib/libc/gmon/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/locale/big5.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/btowc.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/euc.c#8 integrate .. //depot/projects/ia64/lib/libc/locale/gb18030.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/gb2312.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/gbk.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/mblen.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/mblocal.h#1 branch .. //depot/projects/ia64/lib/libc/locale/mbrlen.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/mbrtowc.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/mbsinit.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/mbsrtowcs.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/mbstowcs.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/mbtowc.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/mskanji.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/none.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/runetype.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#12 integrate .. //depot/projects/ia64/lib/libc/locale/srune.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/table.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/tolower.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/toupper.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/utf2.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/utf8.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/wcrtomb.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/wcsrtombs.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/wcstombs.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/wctob.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/wctomb.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/ia64/lib/libc/net/Makefile.inc#8 integrate .. //depot/projects/ia64/lib/libc/net/eui64.3#1 branch .. //depot/projects/ia64/lib/libc/net/eui64.c#1 branch .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#16 integrate .. //depot/projects/ia64/lib/libc/net/name6.c#12 integrate .. //depot/projects/ia64/lib/libc/softfloat/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/softfloat/README.NetBSD#1 branch .. //depot/projects/ia64/lib/libc/softfloat/README.txt#1 branch .. //depot/projects/ia64/lib/libc/softfloat/bits32/softfloat-macros#1 branch .. //depot/projects/ia64/lib/libc/softfloat/bits32/softfloat.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/bits64/softfloat-macros#1 branch .. //depot/projects/ia64/lib/libc/softfloat/bits64/softfloat.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/eqdf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/eqsf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/fpgetmask.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/fpgetround.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/fpgetsticky.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/fpsetmask.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/fpsetround.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/fpsetsticky.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/gedf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/gesf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/gtdf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/gtsf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/ledf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/lesf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/ltdf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/ltsf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/nedf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/negdf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/negsf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/nesf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/softfloat-for-gcc.h#1 branch .. //depot/projects/ia64/lib/libc/softfloat/softfloat-history.txt#1 branch .. //depot/projects/ia64/lib/libc/softfloat/softfloat-source.txt#1 branch .. //depot/projects/ia64/lib/libc/softfloat/softfloat-specialize#1 branch .. //depot/projects/ia64/lib/libc/softfloat/softfloat.txt#1 branch .. //depot/projects/ia64/lib/libc/softfloat/templates/milieu.h#1 branch .. //depot/projects/ia64/lib/libc/softfloat/templates/softfloat-specialize#1 branch .. //depot/projects/ia64/lib/libc/softfloat/templates/softfloat.h#1 branch .. //depot/projects/ia64/lib/libc/softfloat/timesoftfloat.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/timesoftfloat.txt#1 branch .. //depot/projects/ia64/lib/libc/softfloat/unorddf2.c#1 branch .. //depot/projects/ia64/lib/libc/softfloat/unordsf2.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fgetwc.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/findfp.c#9 integrate .. //depot/projects/ia64/lib/libc/stdio/fputwc.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/freopen.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/fseek.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getwc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getwchar.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/local.h#8 integrate .. //depot/projects/ia64/lib/libc/stdio/putwc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/putwchar.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetwc.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#21 integrate .. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#15 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#12 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwscanf.c#9 integrate .. //depot/projects/ia64/lib/libc/stdlib/Makefile.inc#15 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#25 integrate .. //depot/projects/ia64/lib/libc/stdlib/radixsort.3#2 integrate .. //depot/projects/ia64/lib/libc/sys/fcntl.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/flock.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/mlock.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/nfssvc.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/send.2#6 integrate .. //depot/projects/ia64/lib/libc/xdr/xdr_float.c#5 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#23 integrate .. //depot/projects/ia64/lib/libdisk/write_alpha_disk.c#7 integrate .. //depot/projects/ia64/lib/libdisk/write_amd64_disk.c#2 integrate .. //depot/projects/ia64/lib/libdisk/write_i386_disk.c#7 integrate .. //depot/projects/ia64/lib/libdisk/write_pc98_disk.c#9 integrate .. //depot/projects/ia64/lib/libipx/ipx_ntoa.c#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_amd64.c#2 integrate .. //depot/projects/ia64/lib/libkvm/kvm_arm.c#1 branch .. //depot/projects/ia64/lib/libmilter/Makefile#4 integrate .. //depot/projects/ia64/lib/libncp/ncpl_subr.c#6 integrate .. //depot/projects/ia64/lib/libpthread/arch/arm/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/arm/arm/context.S#1 branch .. //depot/projects/ia64/lib/libpthread/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/ia64/lib/libpthread/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libradius/Makefile#6 integrate .. //depot/projects/ia64/lib/libsm/Makefile#4 integrate .. //depot/projects/ia64/lib/libstand/arm/_setjmp.S#1 branch .. //depot/projects/ia64/lib/libstand/zalloc_defs.h#6 integrate .. //depot/projects/ia64/lib/libthr/thread/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_barrier.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cancel.c#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#10 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_create.c#12 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_detach.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_exit.c#11 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#12 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_join.c#11 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#18 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#14 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_resume_np.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_setschedparam.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_sig.c#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_syscalls.c#5 integrate .. //depot/projects/ia64/lib/libusbhid/usbhid.h#4 integrate .. //depot/projects/ia64/lib/libutil/Makefile#11 integrate .. //depot/projects/ia64/lib/libutil/humanize_number.3#1 branch .. //depot/projects/ia64/lib/libutil/humanize_number.c#1 branch .. //depot/projects/ia64/lib/libutil/libutil.h#6 integrate .. //depot/projects/ia64/lib/libutil/login_cap.3#5 integrate .. //depot/projects/ia64/lib/libutil/login_cap.c#8 integrate .. //depot/projects/ia64/lib/libutil/login_class.3#4 integrate .. //depot/projects/ia64/lib/libutil/pw_util.c#10 integrate .. //depot/projects/ia64/lib/libvgl/vgl.3#3 integrate .. //depot/projects/ia64/lib/liby/main.c#2 integrate .. //depot/projects/ia64/lib/msun/Makefile#9 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/b_exp.c#3 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/mathimpl.h#3 integrate .. //depot/projects/ia64/lib/msun/man/hypot.3#3 integrate .. //depot/projects/ia64/lib/msun/man/ieee.3#2 integrate .. //depot/projects/ia64/lib/msun/src/e_atan2f.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_pow.c#4 integrate .. //depot/projects/ia64/lib/msun/src/e_powf.c#4 integrate .. //depot/projects/ia64/lib/msun/src/k_tan.c#4 integrate .. //depot/projects/ia64/lib/msun/src/k_tanf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/math.h#18 integrate .. //depot/projects/ia64/lib/msun/src/s_cimag.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_cimagf.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_cimagl.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_conj.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_conjf.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_conjl.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_copysignl.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_creal.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_crealf.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_creall.c#1 branch .. //depot/projects/ia64/libexec/bootpd/bootpd.8#5 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#16 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#26 integrate .. //depot/projects/ia64/libexec/makekey/makekey.8#4 integrate .. //depot/projects/ia64/libexec/rbootd/rmpproto.c#3 integrate .. //depot/projects/ia64/libexec/rbootd/utils.c#3 integrate .. //depot/projects/ia64/libexec/rexecd/rexecd.c#6 integrate .. //depot/projects/ia64/libexec/rshd/rshd.8#6 integrate .. //depot/projects/ia64/libexec/rtld-elf/Makefile#10 integrate .. //depot/projects/ia64/libexec/rtld-elf/arm/Makefile.inc#1 branch .. //depot/projects/ia64/libexec/rtld-elf/arm/lockdflt.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/arm/reloc.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/arm/rtld_machdep.h#1 branch .. //depot/projects/ia64/libexec/rtld-elf/arm/rtld_start.S#1 branch .. //depot/projects/ia64/libexec/rtld-elf/libmap.c#12 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#25 integrate .. //depot/projects/ia64/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/ia64/libexec/tftpd/tftpd.c#10 integrate .. //depot/projects/ia64/release/Makefile#78 integrate .. //depot/projects/ia64/release/alpha/mkisoimages.sh#3 integrate .. //depot/projects/ia64/release/amd64/mkisoimages.sh#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#35 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#79 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#140 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/share/sgml/catalog#1 branch .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl#1 branch .. //depot/projects/ia64/release/i386/mkisoimages.sh#5 integrate .. //depot/projects/ia64/release/ia64/mkisoimages.sh#4 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#34 integrate .. //depot/projects/ia64/release/scripts/src-install.sh#2 integrate .. //depot/projects/ia64/release/sparc64/mkisoimages.sh#4 integrate .. //depot/projects/ia64/sbin/Makefile#37 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#16 integrate .. //depot/projects/ia64/sbin/atm/atm/Makefile#7 integrate .. //depot/projects/ia64/sbin/atm/atmconfig/Makefile#4 integrate .. //depot/projects/ia64/sbin/atm/atmconfig/atmconfig.8#2 integrate .. //depot/projects/ia64/sbin/atm/ilmid/Makefile#7 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#7 integrate .. //depot/projects/ia64/sbin/camcontrol/Makefile#8 integrate .. //depot/projects/ia64/sbin/conscontrol/conscontrol.8#4 integrate .. //depot/projects/ia64/sbin/devfs/extern.h#3 integrate .. //depot/projects/ia64/sbin/dump/dump.8#22 integrate .. //depot/projects/ia64/sbin/dump/optr.c#14 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#15 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/fsck_msdosfs.8#9 integrate .. //depot/projects/ia64/sbin/gbde/gbde.8#8 integrate .. //depot/projects/ia64/sbin/gconcat/Makefile#2 delete .. //depot/projects/ia64/sbin/gconcat/gconcat.8#2 delete .. //depot/projects/ia64/sbin/gconcat/gconcat.c#4 delete .. //depot/projects/ia64/sbin/geom/Makefile#1 branch .. //depot/projects/ia64/sbin/geom/Makefile.inc#1 branch .. //depot/projects/ia64/sbin/geom/class/Makefile#1 branch .. //depot/projects/ia64/sbin/geom/class/Makefile.inc#1 branch .. //depot/projects/ia64/sbin/geom/class/concat/Makefile#1 branch .. //depot/projects/ia64/sbin/geom/class/concat/gconcat.8#1 branch .. //depot/projects/ia64/sbin/geom/class/concat/geom_concat.c#1 branch .. //depot/projects/ia64/sbin/geom/class/nop/Makefile#1 branch .. //depot/projects/ia64/sbin/geom/class/nop/geom_nop.c#1 branch .. //depot/projects/ia64/sbin/geom/class/nop/gnop.8#1 branch .. //depot/projects/ia64/sbin/geom/class/stripe/Makefile#1 branch .. //depot/projects/ia64/sbin/geom/class/stripe/geom_stripe.c#1 branch .. //depot/projects/ia64/sbin/geom/class/stripe/gstripe.8#1 branch .. //depot/projects/ia64/sbin/geom/core/Makefile#1 branch .. //depot/projects/ia64/sbin/geom/core/geom.8#1 branch .. //depot/projects/ia64/sbin/geom/core/geom.c#1 branch .. //depot/projects/ia64/sbin/geom/core/geom.h#1 branch .. //depot/projects/ia64/sbin/geom/misc/subr.c#1 branch .. //depot/projects/ia64/sbin/geom/misc/subr.h#1 branch .. //depot/projects/ia64/sbin/ggate/Makefile.inc#1 branch .. //depot/projects/ia64/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/ia64/sbin/ggate/ggatec/ggatec.8#2 integrate .. //depot/projects/ia64/sbin/ggate/ggatec/ggatec.c#2 integrate .. //depot/projects/ia64/sbin/ggate/ggated/Makefile#2 integrate .. //depot/projects/ia64/sbin/ggate/ggated/ggated.8#2 integrate .. //depot/projects/ia64/sbin/ggate/ggated/ggated.c#2 integrate .. //depot/projects/ia64/sbin/ggate/ggatel/Makefile#2 integrate .. //depot/projects/ia64/sbin/ggate/ggatel/ggatel.8#2 integrate .. //depot/projects/ia64/sbin/ggate/ggatel/ggatel.c#2 integrate .. //depot/projects/ia64/sbin/ggate/shared/ggate.c#2 integrate .. //depot/projects/ia64/sbin/idmapd/idmapd.8#3 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#24 integrate .. //depot/projects/ia64/sbin/init/init.8#11 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#33 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#33 integrate .. //depot/projects/ia64/sbin/kldstat/kldstat.c#5 integrate .. //depot/projects/ia64/sbin/md5/md5.1#4 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.8#13 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#12 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#11 integrate .. //depot/projects/ia64/sbin/mknod/mknod.8#10 integrate .. //depot/projects/ia64/sbin/mount/mount.8#17 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.8#8 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.8#9 integrate .. //depot/projects/ia64/sbin/mount_nfs4/mount_nfs4.8#4 integrate .. //depot/projects/ia64/sbin/mount_ntfs/mount_ntfs.8#7 integrate .. //depot/projects/ia64/sbin/mount_ntfs/mount_ntfs.c#6 integrate .. //depot/projects/ia64/sbin/natd/natd.c#10 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#21 integrate .. //depot/projects/ia64/sbin/ping6/ping6.8#6 integrate .. //depot/projects/ia64/sbin/restore/dirs.c#8 integrate .. //depot/projects/ia64/sbin/restore/extern.h#4 integrate .. //depot/projects/ia64/sbin/restore/interactive.c#7 integrate .. //depot/projects/ia64/sbin/restore/restore.8#11 integrate .. //depot/projects/ia64/sbin/restore/tape.c#11 integrate .. //depot/projects/ia64/sbin/route/route.8#7 integrate .. //depot/projects/ia64/sbin/route/route.c#13 integrate .. //depot/projects/ia64/sbin/routed/routed.8#8 integrate .. //depot/projects/ia64/sbin/sconfig/sconfig.8#3 integrate .. //depot/projects/ia64/sbin/sunlabel/sunlabel.8#2 integrate .. //depot/projects/ia64/sbin/sunlabel/sunlabel.c#8 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#13 integrate .. //depot/projects/ia64/sbin/vinum/vinum.8#13 integrate .. //depot/projects/ia64/secure/Makefile#6 integrate .. //depot/projects/ia64/secure/lib/libcrypto/opensslconf-arm.h#1 branch .. //depot/projects/ia64/secure/lib/libssl/Makefile#9 integrate .. //depot/projects/ia64/share/examples/cvsup/cvs-supfile#9 integrate .. //depot/projects/ia64/share/examples/cvsup/doc-supfile#4 integrate .. //depot/projects/ia64/share/examples/cvsup/gnats-supfile#5 integrate .. //depot/projects/ia64/share/examples/cvsup/ports-supfile#8 integrate .. //depot/projects/ia64/share/examples/cvsup/stable-supfile#4 integrate .. //depot/projects/ia64/share/examples/cvsup/standard-supfile#4 integrate .. //depot/projects/ia64/share/examples/cvsup/www-supfile#4 integrate .. //depot/projects/ia64/share/examples/diskless/README.TEMPLATING#3 integrate .. //depot/projects/ia64/share/examples/etc/README.examples#4 integrate .. //depot/projects/ia64/share/man/man3/Makefile#8 integrate .. //depot/projects/ia64/share/man/man3/fpgetround.3#2 integrate .. //depot/projects/ia64/share/man/man4/Makefile#70 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#20 integrate .. //depot/projects/ia64/share/man/man4/asr.4#6 integrate .. //depot/projects/ia64/share/man/man4/atapicam.4#4 integrate .. //depot/projects/ia64/share/man/man4/aue.4#6 integrate .. //depot/projects/ia64/share/man/man4/bge.4#8 integrate .. //depot/projects/ia64/share/man/man4/bktr.4#6 integrate .. //depot/projects/ia64/share/man/man4/bpf.4#7 integrate .. //depot/projects/ia64/share/man/man4/ch.4#5 integrate .. //depot/projects/ia64/share/man/man4/cy.4#1 branch .. //depot/projects/ia64/share/man/man4/digi.4#3 integrate .. //depot/projects/ia64/share/man/man4/fxp.4#8 integrate .. //depot/projects/ia64/share/man/man4/geom.4#9 integrate .. //depot/projects/ia64/share/man/man4/hme.4#2 integrate .. //depot/projects/ia64/share/man/man4/icmp.4#4 integrate .. //depot/projects/ia64/share/man/man4/ixgb.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#21 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cp.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/cy.4#4 delete .. //depot/projects/ia64/share/man/man4/man4.i386/ichwd.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_ether.4#4 integrate .. //depot/projects/ia64/share/man/man4/ng_hole.4#2 integrate .. //depot/projects/ia64/share/man/man4/ng_one2many.4#5 integrate .. //depot/projects/ia64/share/man/man4/ng_sppp.4#2 integrate .. //depot/projects/ia64/share/man/man4/ng_tee.4#2 integrate .. //depot/projects/ia64/share/man/man4/null.4#2 integrate .. //depot/projects/ia64/share/man/man4/rl.4#10 integrate .. //depot/projects/ia64/share/man/man4/route.4#5 integrate .. //depot/projects/ia64/share/man/man4/screen.4#2 integrate .. //depot/projects/ia64/share/man/man4/sio.4#9 integrate .. //depot/projects/ia64/share/man/man4/smb.4#2 integrate .. //depot/projects/ia64/share/man/man4/smbus.4#2 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#17 integrate .. //depot/projects/ia64/share/man/man4/ttcp.4#3 integrate .. //depot/projects/ia64/share/man/man4/tun.4#4 integrate .. //depot/projects/ia64/share/man/man4/vlan.4#7 integrate .. //depot/projects/ia64/share/man/man5/Makefile#18 integrate .. //depot/projects/ia64/share/man/man5/config.5#3 integrate .. //depot/projects/ia64/share/man/man5/elf.5#7 integrate .. //depot/projects/ia64/share/man/man5/eui64.5#1 branch .. //depot/projects/ia64/share/man/man5/libmap.conf.5#5 integrate .. //depot/projects/ia64/share/man/man5/link.5#4 integrate .. //depot/projects/ia64/share/man/man5/periodic.conf.5#12 integrate .. //depot/projects/ia64/share/man/man5/style.Makefile.5#5 integrate .. //depot/projects/ia64/share/man/man7/hier.7#26 integrate .. //depot/projects/ia64/share/man/man7/ports.7#11 integrate .. //depot/projects/ia64/share/man/man7/release.7#30 integrate .. //depot/projects/ia64/share/man/man7/security.7#9 integrate .. //depot/projects/ia64/share/man/man9/BUS_ADD_CHILD.9#1 branch .. //depot/projects/ia64/share/man/man9/DEVICE_IDENTIFY.9#5 integrate .. //depot/projects/ia64/share/man/man9/Makefile#41 integrate .. //depot/projects/ia64/share/man/man9/VOP_OPENCLOSE.9#7 integrate .. //depot/projects/ia64/share/man/man9/bpf.9#1 branch .. //depot/projects/ia64/share/man/man9/buf.9#6 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#8 integrate .. //depot/projects/ia64/share/man/man9/cd.9#5 integrate .. //depot/projects/ia64/share/man/man9/device_add_child.9#4 integrate .. //depot/projects/ia64/share/man/man9/g_access.9#3 integrate .. //depot/projects/ia64/share/man/man9/g_attach.9#4 integrate .. //depot/projects/ia64/share/man/man9/g_bio.9#3 integrate .. //depot/projects/ia64/share/man/man9/g_consumer.9#4 integrate .. //depot/projects/ia64/share/man/man9/g_data.9#3 integrate .. //depot/projects/ia64/share/man/man9/g_event.9#3 integrate .. //depot/projects/ia64/share/man/man9/g_geom.9#4 integrate .. //depot/projects/ia64/share/man/man9/g_provider.9#4 integrate .. //depot/projects/ia64/share/man/man9/g_provider_by_name.9#3 integrate .. //depot/projects/ia64/share/man/man9/g_wither_geom.9#3 integrate .. //depot/projects/ia64/share/man/man9/hexdump.9#3 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#16 integrate .. //depot/projects/ia64/share/man/man9/mbuf_tags.9#1 branch .. //depot/projects/ia64/share/man/man9/rman.9#3 integrate .. //depot/projects/ia64/share/man/man9/rtentry.9#5 integrate .. //depot/projects/ia64/share/man/man9/time.9#3 integrate .. //depot/projects/ia64/share/man/man9/timeout.9#4 integrate .. //depot/projects/ia64/share/man/man9/vm_map_remove.9#2 integrate .. //depot/projects/ia64/share/man/man9/vm_page_io.9#2 integrate .. //depot/projects/ia64/share/man/man9/zero_copy.9#5 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#17 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#21 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#30 integrate .. //depot/projects/ia64/share/mk/sys.mk#15 integrate .. //depot/projects/ia64/sys/Makefile#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/fp_emulate.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/ieee_float.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/mem.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/promcons.c#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/uio_machdep.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#31 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#29 integrate .. //depot/projects/ia64/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/fpu.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/profile.h#3 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_proto.h#10 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_syscall.h#9 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysent.c#9 integrate .. //depot/projects/ia64/sys/alpha/linux/syscalls.master#9 integrate .. //depot/projects/ia64/sys/alpha/tlsb/zs_tlsb.c#11 integrate .. //depot/projects/ia64/sys/amd64/acpica/OsdEnvironment.c#5 integrate .. //depot/projects/ia64/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/elf_machdep.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/exception.S#10 integrate .. //depot/projects/ia64/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/genassym.c#11 integrate .. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#22 integrate .. //depot/projects/ia64/sys/amd64/amd64/mem.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#36 integrate .. //depot/projects/ia64/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/support.S#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#15 integrate .. //depot/projects/ia64/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#17 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/ia64/sys/amd64/include/_stdint.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/acpica_machdep.h#5 integrate .. //depot/projects/ia64/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/legacyvar.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/pcb.h#7 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/profile.h#5 integrate .. //depot/projects/ia64/sys/amd64/include/smp.h#4 integrate .. //depot/projects/ia64/sys/amd64/isa/atpic.c#6 integrate .. //depot/projects/ia64/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/ia64/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/ia64/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/ia64/sys/amd64/isa/icu.h#5 integrate .. //depot/projects/ia64/sys/amd64/isa/nmi.c#3 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#9 integrate .. //depot/projects/ia64/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/ia64/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/ia64/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/ia64/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/ia64/sys/arm/arm/blockio.S#1 branch .. //depot/projects/ia64/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/ia64/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/ia64/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/ia64/sys/arm/arm/copystr.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/ia64/sys/arm/arm/critical.c#1 branch .. //depot/projects/ia64/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/ia64/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/ia64/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/ia64/sys/arm/arm/disassem.c#1 branch .. //depot/projects/ia64/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/ia64/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/ia64/sys/arm/arm/exception.S#1 branch .. //depot/projects/ia64/sys/arm/arm/fiq.c#1 branch .. //depot/projects/ia64/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/ia64/sys/arm/arm/fusu.S#1 branch .. //depot/projects/ia64/sys/arm/arm/genassym.c#1 branch .. //depot/projects/ia64/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/ia64/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/ia64/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/ia64/sys/arm/arm/intr.c#1 branch .. //depot/projects/ia64/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/ia64/sys/arm/arm/locore.S#1 branch .. //depot/projects/ia64/sys/arm/arm/machdep.c#1 branch .. //depot/projects/ia64/sys/arm/arm/nexus.c#1 branch .. //depot/projects/ia64/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/ia64/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/ia64/sys/arm/arm/pmap.c#1 branch .. //depot/projects/ia64/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/ia64/sys/arm/arm/setstack.s#1 branch .. //depot/projects/ia64/sys/arm/arm/support.S#1 branch .. //depot/projects/ia64/sys/arm/arm/swtch.S#1 branch .. //depot/projects/ia64/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/ia64/sys/arm/arm/trap.c#1 branch .. //depot/projects/ia64/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/ia64/sys/arm/arm/undefined.c#1 branch .. //depot/projects/ia64/sys/arm/arm/vectors.S#1 branch .. //depot/projects/ia64/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/ia64/sys/arm/conf/SIMICS#1 branch .. //depot/projects/ia64/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/ia64/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/ia64/sys/arm/include/_types.h#4 integrate .. //depot/projects/ia64/sys/arm/include/armreg.h#1 branch .. //depot/projects/ia64/sys/arm/include/asm.h#1 branch .. //depot/projects/ia64/sys/arm/include/asmacros.h#1 branch .. //depot/projects/ia64/sys/arm/include/atomic.h#1 branch .. //depot/projects/ia64/sys/arm/include/blockio.h#1 branch .. //depot/projects/ia64/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/ia64/sys/arm/include/bus.h#1 branch .. //depot/projects/ia64/sys/arm/include/clock.h#1 branch .. //depot/projects/ia64/sys/arm/include/cpu.h#1 branch .. //depot/projects/ia64/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/ia64/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/ia64/sys/arm/include/critical.h#1 branch .. //depot/projects/ia64/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/ia64/sys/arm/include/disassem.h#1 branch .. //depot/projects/ia64/sys/arm/include/elf.h#3 integrate .. //depot/projects/ia64/sys/arm/include/endian.h#3 integrate .. //depot/projects/ia64/sys/arm/include/fiq.h#1 branch .. //depot/projects/ia64/sys/arm/include/float.h#1 branch .. //depot/projects/ia64/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/ia64/sys/arm/include/fp.h#1 branch .. //depot/projects/ia64/sys/arm/include/frame.h#1 branch .. //depot/projects/ia64/sys/arm/include/ieee.h#1 branch .. //depot/projects/ia64/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/ia64/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/ia64/sys/arm/include/intr.h#1 branch .. //depot/projects/ia64/sys/arm/include/katelib.h#1 branch .. //depot/projects/ia64/sys/arm/include/machdep.h#1 branch .. //depot/projects/ia64/sys/arm/include/md_var.h#1 branch .. //depot/projects/ia64/sys/arm/include/metadata.h#1 branch .. //depot/projects/ia64/sys/arm/include/mutex.h#1 branch .. //depot/projects/ia64/sys/arm/include/param.h#4 integrate .. //depot/projects/ia64/sys/arm/include/pcb.h#1 branch .. //depot/projects/ia64/sys/arm/include/pcpu.h#1 branch .. //depot/projects/ia64/sys/arm/include/pmap.h#1 branch .. //depot/projects/ia64/sys/arm/include/proc.h#1 branch .. //depot/projects/ia64/sys/arm/include/profile.h#1 branch .. //depot/projects/ia64/sys/arm/include/psl.h#1 branch .. //depot/projects/ia64/sys/arm/include/pte.h#1 branch .. //depot/projects/ia64/sys/arm/include/ptrace.h#1 branch .. //depot/projects/ia64/sys/arm/include/reg.h#1 branch .. //depot/projects/ia64/sys/arm/include/reloc.h#1 branch .. //depot/projects/ia64/sys/arm/include/resource.h#1 branch .. //depot/projects/ia64/sys/arm/include/runq.h#1 branch .. //depot/projects/ia64/sys/arm/include/setjmp.h#1 branch .. //depot/projects/ia64/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/ia64/sys/arm/include/sigframe.h#1 branch .. //depot/projects/ia64/sys/arm/include/signal.h#4 integrate .. //depot/projects/ia64/sys/arm/include/smp.h#1 branch .. //depot/projects/ia64/sys/arm/include/stdarg.h#1 branch .. //depot/projects/ia64/sys/arm/include/swi.h#1 branch .. //depot/projects/ia64/sys/arm/include/trap.h#1 branch .. //depot/projects/ia64/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/ia64/sys/arm/include/undefined.h#1 branch .. //depot/projects/ia64/sys/arm/include/utrap.h#1 branch .. //depot/projects/ia64/sys/arm/include/vmparam.h#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/ia64/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/ia64/sys/boot/Makefile#11 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#21 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf.5#7 integrate .. //depot/projects/ia64/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/boot1.S#3 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/sio.S#3 integrate .. //depot/projects/ia64/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/ia64/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/amd64_tramp.S#4 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#7 integrate .. //depot/projects/ia64/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/serial_16550.S#6 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/serial_8251.S#3 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#57 integrate .. //depot/projects/ia64/sys/coda/coda_fbsd.c#9 integrate .. //depot/projects/ia64/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#18 integrate .. //depot/projects/ia64/sys/conf/Makefile.alpha#12 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#7 integrate .. //depot/projects/ia64/sys/conf/Makefile.arm#1 branch .. //depot/projects/ia64/sys/conf/Makefile.i386#10 integrate .. //depot/projects/ia64/sys/conf/Makefile.ia64#19 integrate .. //depot/projects/ia64/sys/conf/Makefile.pc98#10 integrate .. //depot/projects/ia64/sys/conf/Makefile.powerpc#15 integrate .. //depot/projects/ia64/sys/conf/Makefile.sparc64#17 integrate .. //depot/projects/ia64/sys/conf/NOTES#77 integrate .. //depot/projects/ia64/sys/conf/files#114 integrate .. //depot/projects/ia64/sys/conf/files.alpha#27 integrate .. //depot/projects/ia64/sys/conf/files.amd64#18 integrate .. //depot/projects/ia64/sys/conf/files.arm#1 branch .. //depot/projects/ia64/sys/conf/files.i386#55 integrate .. //depot/projects/ia64/sys/conf/files.ia64#54 integrate .. //depot/projects/ia64/sys/conf/files.pc98#45 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#38 integrate .. //depot/projects/ia64/sys/conf/kern.mk#12 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#43 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#33 integrate .. //depot/projects/ia64/sys/conf/ldscript.amd64#3 integrate .. //depot/projects/ia64/sys/conf/ldscript.arm#1 branch .. //depot/projects/ia64/sys/conf/majors#35 integrate .. //depot/projects/ia64/sys/conf/options#74 integrate .. //depot/projects/ia64/sys/conf/options.arm#1 branch .. //depot/projects/ia64/sys/conf/options.pc98#26 integrate .. //depot/projects/ia64/sys/conf/options.sparc64#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#16 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdebug.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdispat.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acefi.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acenv.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acexcep.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#16 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/achware.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/aclocal.h#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acnamesp.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acparser.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpixf.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acstruct.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#18 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/common/adisasm.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisply.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbinput.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmwalk.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsopcode.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswstate.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evevent.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpe.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpeblk.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evmisc.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evregion.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxface.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfevnt.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfregn.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconfig.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmutex.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg2.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresolv.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwgpe.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#16 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsalloc.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nseval.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsinit.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsparse.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfeval.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfname.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psxface.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsutils.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsxface.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/uteval.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#15 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utxface.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/oltr/if_oltr.c#12 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src.diff#1 branch .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx.h#4 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_context.c#4 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_env.c#3 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_env.h#4 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#4 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_self.c#4 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_self.h#3 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_step.c#4 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_step.h#3 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_str.c#3 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#4 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#3 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#5 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_utable.c#3 integrate .. //depot/projects/ia64/sys/contrib/ia64/libuwx/src/uwx_utable.h#3 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/ia64/sys/ddb/db_elf.c#6 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#38 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#13 integrate .. //depot/projects/ia64/sys/dev/aac/aac_disk.c#20 integrate .. //depot/projects/ia64/sys/dev/aac/aac_linux.c#3 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#27 integrate .. //depot/projects/ia64/sys/dev/aac/aacvar.h#20 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#51 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_acad.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_button.c#14 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#19 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#17 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#23 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_isab.c#6 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_lid.c#12 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#24 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#15 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#18 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#18 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#27 integrate .. //depot/projects/ia64/sys/dev/adlink/adlink.c#9 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_isa.c#7 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/aic/aic_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#19 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#16 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#14 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#13 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#13 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#13 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#17 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#16 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#14 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#12 integrate .. //depot/projects/ia64/sys/dev/amr/amr_disk.c#13 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#30 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pccard.c#12 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar.c#14 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#24 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#51 integrate .. //depot/projects/ia64/sys/dev/ata/ata-card.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-cbus.c#12 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#34 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#39 integrate .. //depot/projects/ia64/sys/dev/ata/ata-queue.c#12 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#39 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#12 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#49 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#24 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#17 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_mem.c#4 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#20 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#20 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#33 integrate .. //depot/projects/ia64/sys/dev/ciss/cissreg.h#6 integrate .. //depot/projects/ia64/sys/dev/cnw/if_cnw.c#13 integrate .. //depot/projects/ia64/sys/dev/cp/cpddk.c#1 branch .. //depot/projects/ia64/sys/dev/cp/cpddk.h#1 branch .. //depot/projects/ia64/sys/dev/cp/if_cp.c#1 branch .. //depot/projects/ia64/sys/dev/cp/ng_cp.h#1 branch .. //depot/projects/ia64/sys/dev/cs/if_cs.c#10 integrate .. //depot/projects/ia64/sys/dev/cs/if_cs_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/ia64/sys/dev/cy/cy.c#2 integrate .. //depot/projects/ia64/sys/dev/cy/cy_isa.c#2 integrate .. //depot/projects/ia64/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/cy/cyvar.h#1 branch .. //depot/projects/ia64/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/ia64/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/ia64/sys/dev/digi/digi.c#18 integrate .. //depot/projects/ia64/sys/dev/digi/digi_isa.c#8 integrate .. //depot/projects/ia64/sys/dev/digi/digi_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed.c#18 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#21 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#35 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#23 integrate .. //depot/projects/ia64/sys/dev/en/if_en_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#16 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_pccard.c#13 integrate .. //depot/projects/ia64/sys/dev/ex/if_ex.c#11 integrate .. //depot/projects/ia64/sys/dev/ex/if_ex_pccard.c#6 integrate .. //depot/projects/ia64/sys/dev/fb/splash.c#3 integrate .. //depot/projects/ia64/sys/dev/fb/tga.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 5 01:30:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C59016A4D0; Sat, 5 Jun 2004 01:30:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB06116A4CE for ; Sat, 5 Jun 2004 01:30:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3E2543D1F for ; Sat, 5 Jun 2004 01:30:03 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i558Tqu4022825 for ; Sat, 5 Jun 2004 08:29:52 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i558TCVV022807 for perforce@freebsd.org; Sat, 5 Jun 2004 08:29:12 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 5 Jun 2004 08:29:12 GMT Message-Id: <200406050829.i558TCVV022807@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 54210 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, 05 Jun 2004 08:30:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=54210 Change 54210 by jmallett@jmallett_oingo on 2004/06/05 08:28:15 IFC. Affected files ... .. //depot/projects/mips/MAINTAINERS#15 integrate .. //depot/projects/mips/Makefile#11 integrate .. //depot/projects/mips/Makefile.inc1#27 integrate .. //depot/projects/mips/UPDATING#18 integrate .. //depot/projects/mips/bin/cat/cat.1#2 integrate .. //depot/projects/mips/bin/cat/cat.c#4 integrate .. //depot/projects/mips/bin/chflags/chflags.1#4 integrate .. //depot/projects/mips/bin/chflags/chflags.c#4 integrate .. //depot/projects/mips/bin/chmod/chmod.1#4 integrate .. //depot/projects/mips/bin/chmod/chmod.c#6 integrate .. //depot/projects/mips/bin/cp/cp.1#4 integrate .. //depot/projects/mips/bin/cp/cp.c#6 integrate .. //depot/projects/mips/bin/cp/extern.h#4 integrate .. //depot/projects/mips/bin/cp/utils.c#6 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.1#3 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.2#2 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.3#2 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.4#2 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.a#2 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.g#3 integrate .. //depot/projects/mips/bin/csh/USD.doc/tabs#2 integrate .. //depot/projects/mips/bin/csh/host.defs#2 integrate .. //depot/projects/mips/bin/date/date.1#4 integrate .. //depot/projects/mips/bin/date/date.c#6 integrate .. //depot/projects/mips/bin/date/extern.h#2 integrate .. //depot/projects/mips/bin/date/netdate.c#3 integrate .. //depot/projects/mips/bin/dd/Makefile#6 integrate .. //depot/projects/mips/bin/dd/args.c#5 integrate .. //depot/projects/mips/bin/dd/conv.c#3 integrate .. //depot/projects/mips/bin/dd/conv_tab.c#2 integrate .. //depot/projects/mips/bin/dd/dd.1#4 integrate .. //depot/projects/mips/bin/dd/dd.c#6 integrate .. //depot/projects/mips/bin/dd/dd.h#4 integrate .. //depot/projects/mips/bin/dd/extern.h#3 integrate .. //depot/projects/mips/bin/dd/misc.c#3 integrate .. //depot/projects/mips/bin/dd/position.c#3 integrate .. //depot/projects/mips/bin/df/Makefile#3 integrate .. //depot/projects/mips/bin/df/df.1#4 integrate .. //depot/projects/mips/bin/df/df.c#10 integrate .. //depot/projects/mips/bin/domainname/domainname.1#2 integrate .. //depot/projects/mips/bin/domainname/domainname.c#3 integrate .. //depot/projects/mips/bin/echo/echo.1#4 integrate .. //depot/projects/mips/bin/echo/echo.c#5 integrate .. //depot/projects/mips/bin/ed/cbc.c#3 integrate .. //depot/projects/mips/bin/getfacl/getfacl.1#5 integrate .. //depot/projects/mips/bin/hostname/hostname.1#2 integrate .. //depot/projects/mips/bin/hostname/hostname.c#3 integrate .. //depot/projects/mips/bin/kenv/kenv.c#3 integrate .. //depot/projects/mips/bin/kill/kill.1#2 integrate .. //depot/projects/mips/bin/kill/kill.c#5 integrate .. //depot/projects/mips/bin/ln/ln.1#2 integrate .. //depot/projects/mips/bin/ln/ln.c#3 integrate .. //depot/projects/mips/bin/ln/symlink.7#2 integrate .. //depot/projects/mips/bin/ls/Makefile#5 integrate .. //depot/projects/mips/bin/ls/cmp.c#3 integrate .. //depot/projects/mips/bin/ls/extern.h#5 integrate .. //depot/projects/mips/bin/ls/ls.1#10 integrate .. //depot/projects/mips/bin/ls/ls.c#10 integrate .. //depot/projects/mips/bin/ls/ls.h#4 integrate .. //depot/projects/mips/bin/ls/print.c#11 integrate .. //depot/projects/mips/bin/ls/util.c#5 integrate .. //depot/projects/mips/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/mips/bin/mkdir/mkdir.c#3 integrate .. //depot/projects/mips/bin/mv/mv.1#2 integrate .. //depot/projects/mips/bin/mv/mv.c#3 integrate .. //depot/projects/mips/bin/pax/Makefile#4 integrate .. //depot/projects/mips/bin/pax/ar_io.c#5 integrate .. //depot/projects/mips/bin/pax/ar_subs.c#3 integrate .. //depot/projects/mips/bin/pax/buf_subs.c#3 integrate .. //depot/projects/mips/bin/pax/cache.c#5 integrate .. //depot/projects/mips/bin/pax/cache.h#2 integrate .. //depot/projects/mips/bin/pax/cpio.c#5 integrate .. //depot/projects/mips/bin/pax/cpio.h#2 integrate .. //depot/projects/mips/bin/pax/extern.h#3 integrate .. //depot/projects/mips/bin/pax/file_subs.c#2 integrate .. //depot/projects/mips/bin/pax/ftree.c#3 integrate .. //depot/projects/mips/bin/pax/ftree.h#2 integrate .. //depot/projects/mips/bin/pax/gen_subs.c#4 integrate .. //depot/projects/mips/bin/pax/options.c#5 integrate .. //depot/projects/mips/bin/pax/options.h#2 integrate .. //depot/projects/mips/bin/pax/pat_rep.c#4 integrate .. //depot/projects/mips/bin/pax/pat_rep.h#2 integrate .. //depot/projects/mips/bin/pax/pax.1#4 integrate .. //depot/projects/mips/bin/pax/pax.c#3 integrate .. //depot/projects/mips/bin/pax/pax.h#4 integrate .. //depot/projects/mips/bin/pax/sel_subs.c#3 integrate .. //depot/projects/mips/bin/pax/sel_subs.h#2 integrate .. //depot/projects/mips/bin/pax/tables.c#3 integrate .. //depot/projects/mips/bin/pax/tables.h#2 integrate .. //depot/projects/mips/bin/pax/tar.c#3 integrate .. //depot/projects/mips/bin/pax/tar.h#2 integrate .. //depot/projects/mips/bin/pax/tty_subs.c#3 integrate .. //depot/projects/mips/bin/ps/extern.h#6 integrate .. //depot/projects/mips/bin/ps/fmt.c#4 integrate .. //depot/projects/mips/bin/ps/keyword.c#8 integrate .. //depot/projects/mips/bin/ps/nlist.c#4 integrate .. //depot/projects/mips/bin/ps/print.c#8 integrate .. //depot/projects/mips/bin/ps/ps.1#8 integrate .. //depot/projects/mips/bin/ps/ps.c#8 integrate .. //depot/projects/mips/bin/ps/ps.h#4 integrate .. //depot/projects/mips/bin/pwd/pwd.1#4 integrate .. //depot/projects/mips/bin/pwd/pwd.c#4 integrate .. //depot/projects/mips/bin/rcp/extern.h#2 integrate .. //depot/projects/mips/bin/rcp/rcp.1#2 integrate .. //depot/projects/mips/bin/rcp/util.c#3 integrate .. //depot/projects/mips/bin/realpath/realpath.1#2 integrate .. //depot/projects/mips/bin/realpath/realpath.c#3 integrate .. //depot/projects/mips/bin/rm/rm.1#3 integrate .. //depot/projects/mips/bin/rm/rm.c#5 integrate .. //depot/projects/mips/bin/rmail/Makefile#4 integrate .. //depot/projects/mips/bin/rmdir/rmdir.1#3 integrate .. //depot/projects/mips/bin/rmdir/rmdir.c#4 integrate .. //depot/projects/mips/bin/sh/alias.c#3 integrate .. //depot/projects/mips/bin/sh/alias.h#2 integrate .. //depot/projects/mips/bin/sh/arith.h#3 integrate .. //depot/projects/mips/bin/sh/arith.y#4 integrate .. //depot/projects/mips/bin/sh/arith_lex.l#4 integrate .. //depot/projects/mips/bin/sh/bltin/bltin.h#2 integrate .. //depot/projects/mips/bin/sh/bltin/echo.1#3 integrate .. //depot/projects/mips/bin/sh/bltin/echo.c#4 integrate .. //depot/projects/mips/bin/sh/builtins.def#3 integrate .. //depot/projects/mips/bin/sh/cd.c#3 integrate .. //depot/projects/mips/bin/sh/cd.h#2 integrate .. //depot/projects/mips/bin/sh/error.c#2 integrate .. //depot/projects/mips/bin/sh/error.h#2 integrate .. //depot/projects/mips/bin/sh/eval.c#6 integrate .. //depot/projects/mips/bin/sh/eval.h#2 integrate .. //depot/projects/mips/bin/sh/exec.c#3 integrate .. //depot/projects/mips/bin/sh/exec.h#3 integrate .. //depot/projects/mips/bin/sh/expand.c#6 integrate .. //depot/projects/mips/bin/sh/expand.h#3 integrate .. //depot/projects/mips/bin/sh/funcs/cmv#2 integrate .. //depot/projects/mips/bin/sh/funcs/dirs#2 integrate .. //depot/projects/mips/bin/sh/funcs/kill#2 integrate .. //depot/projects/mips/bin/sh/funcs/login#2 integrate .. //depot/projects/mips/bin/sh/funcs/newgrp#2 integrate .. //depot/projects/mips/bin/sh/funcs/popd#2 integrate .. //depot/projects/mips/bin/sh/funcs/pushd#2 integrate .. //depot/projects/mips/bin/sh/funcs/suspend#2 integrate .. //depot/projects/mips/bin/sh/histedit.c#3 integrate .. //depot/projects/mips/bin/sh/init.h#2 integrate .. //depot/projects/mips/bin/sh/input.c#4 integrate .. //depot/projects/mips/bin/sh/input.h#2 integrate .. //depot/projects/mips/bin/sh/jobs.c#7 integrate .. //depot/projects/mips/bin/sh/jobs.h#2 integrate .. //depot/projects/mips/bin/sh/mail.c#2 integrate .. //depot/projects/mips/bin/sh/mail.h#2 integrate .. //depot/projects/mips/bin/sh/main.c#2 integrate .. //depot/projects/mips/bin/sh/main.h#2 integrate .. //depot/projects/mips/bin/sh/memalloc.c#6 integrate .. //depot/projects/mips/bin/sh/memalloc.h#2 integrate .. //depot/projects/mips/bin/sh/miscbltin.c#2 integrate .. //depot/projects/mips/bin/sh/mkbuiltins#4 integrate .. //depot/projects/mips/bin/sh/mkinit.c#2 integrate .. //depot/projects/mips/bin/sh/mknodes.c#3 integrate .. //depot/projects/mips/bin/sh/mksyntax.c#3 integrate .. //depot/projects/mips/bin/sh/mktokens#2 integrate .. //depot/projects/mips/bin/sh/myhistedit.h#2 integrate .. //depot/projects/mips/bin/sh/mystring.c#2 integrate .. //depot/projects/mips/bin/sh/mystring.h#2 integrate .. //depot/projects/mips/bin/sh/nodes.c.pat#6 integrate .. //depot/projects/mips/bin/sh/nodetypes#2 integrate .. //depot/projects/mips/bin/sh/options.c#2 integrate .. //depot/projects/mips/bin/sh/options.h#2 integrate .. //depot/projects/mips/bin/sh/output.c#3 integrate .. //depot/projects/mips/bin/sh/output.h#2 integrate .. //depot/projects/mips/bin/sh/parser.c#5 integrate .. //depot/projects/mips/bin/sh/parser.h#2 integrate .. //depot/projects/mips/bin/sh/redir.c#4 integrate .. //depot/projects/mips/bin/sh/redir.h#3 integrate .. //depot/projects/mips/bin/sh/sh.1#7 integrate .. //depot/projects/mips/bin/sh/shell.h#3 integrate .. //depot/projects/mips/bin/sh/show.c#3 integrate .. //depot/projects/mips/bin/sh/show.h#2 integrate .. //depot/projects/mips/bin/sh/trap.c#3 integrate .. //depot/projects/mips/bin/sh/trap.h#2 integrate .. //depot/projects/mips/bin/sh/var.c#4 integrate .. //depot/projects/mips/bin/sh/var.h#2 integrate .. //depot/projects/mips/bin/sleep/sleep.1#2 integrate .. //depot/projects/mips/bin/sleep/sleep.c#4 integrate .. //depot/projects/mips/bin/stty/cchar.c#2 integrate .. //depot/projects/mips/bin/stty/extern.h#2 integrate .. //depot/projects/mips/bin/stty/gfmt.c#3 integrate .. //depot/projects/mips/bin/stty/key.c#2 integrate .. //depot/projects/mips/bin/stty/modes.c#2 integrate .. //depot/projects/mips/bin/stty/print.c#2 integrate .. //depot/projects/mips/bin/stty/stty.1#2 integrate .. //depot/projects/mips/bin/stty/stty.c#3 integrate .. //depot/projects/mips/bin/stty/stty.h#2 integrate .. //depot/projects/mips/bin/stty/util.c#2 integrate .. //depot/projects/mips/bin/sync/sync.8#2 integrate .. //depot/projects/mips/bin/sync/sync.c#3 integrate .. //depot/projects/mips/bin/test/test.1#2 integrate .. //depot/projects/mips/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/mips/contrib/amd/FREEBSD-upgrade#3 integrate .. //depot/projects/mips/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#2 delete .. //depot/projects/mips/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#3 delete .. //depot/projects/mips/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#2 delete .. //depot/projects/mips/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#2 delete .. //depot/projects/mips/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/mips/contrib/bsnmp/NEWS#3 integrate .. //depot/projects/mips/contrib/bsnmp/VERSION#3 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmpdef/gensnmpdef.1#1 branch .. //depot/projects/mips/contrib/bsnmp/gensnmpdef/gensnmpdef.c#1 branch .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.3#3 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpagent.3#3 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpclient.3#3 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmplib.3#3 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.h#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.3#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/action.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/bsnmpd.1#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/main.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.config#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.3#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_lsock.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/trap.c#3 integrate .. //depot/projects/mips/contrib/com_err/ChangeLog#2 integrate .. //depot/projects/mips/contrib/com_err/Makefile.am#2 integrate .. //depot/projects/mips/contrib/com_err/Makefile.in#2 integrate .. //depot/projects/mips/contrib/com_err/com_err.c#2 integrate .. //depot/projects/mips/contrib/com_err/com_err.h#2 integrate .. //depot/projects/mips/contrib/com_err/com_right.h#2 integrate .. //depot/projects/mips/contrib/com_err/compile_et.c#2 integrate .. //depot/projects/mips/contrib/com_err/compile_et.h#2 integrate .. //depot/projects/mips/contrib/com_err/error.c#2 integrate .. //depot/projects/mips/contrib/com_err/lex.h#1 branch .. //depot/projects/mips/contrib/com_err/lex.l#2 integrate .. //depot/projects/mips/contrib/com_err/parse.y#2 integrate .. //depot/projects/mips/contrib/com_err/roken_rename.h#2 integrate .. //depot/projects/mips/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/mips/contrib/cvs/BUGS#2 integrate .. //depot/projects/mips/contrib/cvs/ChangeLog#4 integrate .. //depot/projects/mips/contrib/cvs/FAQ#3 integrate .. //depot/projects/mips/contrib/cvs/INSTALL#4 integrate .. //depot/projects/mips/contrib/cvs/Makefile.am#3 integrate .. //depot/projects/mips/contrib/cvs/Makefile.in#3 integrate .. //depot/projects/mips/contrib/cvs/NEWS#4 integrate .. //depot/projects/mips/contrib/cvs/README#2 integrate .. //depot/projects/mips/contrib/cvs/TESTS#2 integrate .. //depot/projects/mips/contrib/cvs/TODO#3 integrate .. //depot/projects/mips/contrib/cvs/acinclude.m4#3 integrate .. //depot/projects/mips/contrib/cvs/aclocal.m4#3 integrate .. //depot/projects/mips/contrib/cvs/config.h.in#4 integrate .. //depot/projects/mips/contrib/cvs/configure#4 integrate .. //depot/projects/mips/contrib/cvs/configure.in#4 integrate .. //depot/projects/mips/contrib/cvs/contrib/ChangeLog#4 integrate .. //depot/projects/mips/contrib/cvs/contrib/Makefile.am#4 integrate .. //depot/projects/mips/contrib/cvs/contrib/Makefile.in#4 integrate .. //depot/projects/mips/contrib/cvs/contrib/check_cvs.in#2 integrate .. //depot/projects/mips/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/mips/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/mips/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/mips/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/mips/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/mips/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/mips/contrib/cvs/depcomp#2 integrate .. //depot/projects/mips/contrib/cvs/diff/ChangeLog#3 integrate .. //depot/projects/mips/contrib/cvs/diff/Makefile.in#3 integrate .. //depot/projects/mips/contrib/cvs/diff/diff.c#3 integrate .. //depot/projects/mips/contrib/cvs/diff/diff3.c#2 integrate .. //depot/projects/mips/contrib/cvs/diff/diffrun.h#2 integrate .. //depot/projects/mips/contrib/cvs/diff/io.c#2 integrate .. //depot/projects/mips/contrib/cvs/diff/system.h#3 integrate .. //depot/projects/mips/contrib/cvs/diff/util.c#2 integrate .. //depot/projects/mips/contrib/cvs/doc/ChangeLog#4 integrate .. //depot/projects/mips/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/mips/contrib/cvs/doc/Makefile.in#3 integrate .. //depot/projects/mips/contrib/cvs/doc/cvs.texinfo#3 integrate .. //depot/projects/mips/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/mips/contrib/cvs/doc/stamp-1#4 integrate .. //depot/projects/mips/contrib/cvs/doc/stamp-vti#4 integrate .. //depot/projects/mips/contrib/cvs/doc/version-client.texi#4 integrate .. //depot/projects/mips/contrib/cvs/doc/version.texi#4 integrate .. //depot/projects/mips/contrib/cvs/lib/ChangeLog#4 integrate .. //depot/projects/mips/contrib/cvs/lib/Makefile.am#3 integrate .. //depot/projects/mips/contrib/cvs/lib/Makefile.in#3 integrate .. //depot/projects/mips/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/mips/contrib/cvs/lib/getdate.y#3 integrate .. //depot/projects/mips/contrib/cvs/lib/getpass.c#1 branch .. //depot/projects/mips/contrib/cvs/lib/mkdir.c#2 integrate .. //depot/projects/mips/contrib/cvs/lib/regex.c#3 integrate .. //depot/projects/mips/contrib/cvs/lib/system.h#3 integrate .. //depot/projects/mips/contrib/cvs/lib/wait.h#2 integrate .. //depot/projects/mips/contrib/cvs/man/ChangeLog#3 integrate .. //depot/projects/mips/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/mips/contrib/cvs/man/Makefile.in#3 integrate .. //depot/projects/mips/contrib/cvs/man/cvs.1#3 integrate .. //depot/projects/mips/contrib/cvs/man/cvs.5#2 integrate .. //depot/projects/mips/contrib/cvs/mktemp.sh#1 branch .. //depot/projects/mips/contrib/cvs/noautomake.sh#3 delete .. //depot/projects/mips/contrib/cvs/src/ChangeLog#4 integrate .. //depot/projects/mips/contrib/cvs/src/Makefile.am#4 integrate .. //depot/projects/mips/contrib/cvs/src/Makefile.in#4 integrate .. //depot/projects/mips/contrib/cvs/src/add.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/admin.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/annotate.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/buffer.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/buffer.h#3 integrate .. //depot/projects/mips/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/checkout.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/classify.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/client.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/client.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/commit.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/create_adm.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/cvs.h#4 integrate .. //depot/projects/mips/contrib/cvs/src/cvsbug.in#3 integrate .. //depot/projects/mips/contrib/cvs/src/cvsrc.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/diff.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/edit.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/edit.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/error.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/fileattr.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/filesubr.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/history.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/history.h#1 branch .. //depot/projects/mips/contrib/cvs/src/ignore.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/import.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/lock.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/log.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/login.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/logmsg.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/main.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/modules.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/myndbm.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/parseinfo.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/patch.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/rcs.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/rcscmds.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/recurse.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/release.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/remove.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/root.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/root.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/run.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/sanity.sh#4 integrate .. //depot/projects/mips/contrib/cvs/src/server.c#5 integrate .. //depot/projects/mips/contrib/cvs/src/server.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/stack.c#1 branch .. //depot/projects/mips/contrib/cvs/src/stack.h#1 branch .. //depot/projects/mips/contrib/cvs/src/status.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/subr.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/tag.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/update.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/update.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/vers_ts.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/watch.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/watch.h#2 integrate .. //depot/projects/mips/contrib/cvs/src/wrapper.c#3 integrate .. //depot/projects/mips/contrib/cvs/src/zlib.c#3 integrate .. //depot/projects/mips/contrib/cvs/tools/ChangeLog#3 integrate .. //depot/projects/mips/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/mips/contrib/cvs/tools/Makefile.in#3 integrate .. //depot/projects/mips/contrib/groff/tmac/doc-common#6 integrate .. //depot/projects/mips/contrib/groff/tmac/doc-syms#5 integrate .. //depot/projects/mips/contrib/less/LICENSE#2 integrate .. //depot/projects/mips/contrib/less/Makefile.aut#2 integrate .. //depot/projects/mips/contrib/less/Makefile.dsg#2 integrate .. //depot/projects/mips/contrib/less/Makefile.in#2 integrate .. //depot/projects/mips/contrib/less/NEWS#2 integrate .. //depot/projects/mips/contrib/less/README#2 integrate .. //depot/projects/mips/contrib/less/acconfig.h#2 delete .. //depot/projects/mips/contrib/less/brac.c#2 integrate .. //depot/projects/mips/contrib/less/ch.c#2 integrate .. //depot/projects/mips/contrib/less/charset.c#2 integrate .. //depot/projects/mips/contrib/less/cmd.h#2 integrate .. //depot/projects/mips/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/mips/contrib/less/command.c#2 integrate .. //depot/projects/mips/contrib/less/configure#2 integrate .. //depot/projects/mips/contrib/less/configure.ac#1 branch .. //depot/projects/mips/contrib/less/configure.in#2 delete .. //depot/projects/mips/contrib/less/decode.c#2 integrate .. //depot/projects/mips/contrib/less/defines.ds#2 integrate .. //depot/projects/mips/contrib/less/defines.h.in#2 integrate .. //depot/projects/mips/contrib/less/defines.h.top#2 delete .. //depot/projects/mips/contrib/less/defines.o2#2 integrate .. //depot/projects/mips/contrib/less/defines.wn#2 integrate .. //depot/projects/mips/contrib/less/edit.c#2 integrate .. //depot/projects/mips/contrib/less/filename.c#2 integrate .. //depot/projects/mips/contrib/less/forwback.c#2 integrate .. //depot/projects/mips/contrib/less/funcs.h#2 integrate .. //depot/projects/mips/contrib/less/help.c#2 integrate .. //depot/projects/mips/contrib/less/ifile.c#2 integrate .. //depot/projects/mips/contrib/less/input.c#2 integrate .. //depot/projects/mips/contrib/less/jump.c#2 integrate .. //depot/projects/mips/contrib/less/less.h#2 integrate .. //depot/projects/mips/contrib/less/less.hlp#2 integrate .. //depot/projects/mips/contrib/less/less.man#2 integrate .. //depot/projects/mips/contrib/less/less.nro#2 integrate .. //depot/projects/mips/contrib/less/lessecho.c#2 integrate .. //depot/projects/mips/contrib/less/lesskey.c#2 integrate .. //depot/projects/mips/contrib/less/lesskey.h#2 integrate .. //depot/projects/mips/contrib/less/lesskey.man#2 integrate .. //depot/projects/mips/contrib/less/lesskey.nro#2 integrate .. //depot/projects/mips/contrib/less/lglob.h#2 integrate .. //depot/projects/mips/contrib/less/line.c#2 integrate .. //depot/projects/mips/contrib/less/linenum.c#2 integrate .. //depot/projects/mips/contrib/less/lsystem.c#2 integrate .. //depot/projects/mips/contrib/less/main.c#2 integrate .. //depot/projects/mips/contrib/less/mark.c#2 integrate .. //depot/projects/mips/contrib/less/mkhelp.c#2 integrate .. //depot/projects/mips/contrib/less/optfunc.c#2 integrate .. //depot/projects/mips/contrib/less/option.c#2 integrate .. //depot/projects/mips/contrib/less/option.h#2 integrate .. //depot/projects/mips/contrib/less/opttbl.c#2 integrate .. //depot/projects/mips/contrib/less/os.c#2 integrate .. //depot/projects/mips/contrib/less/output.c#2 integrate .. //depot/projects/mips/contrib/less/pckeys.h#2 integrate .. //depot/projects/mips/contrib/less/position.c#2 integrate .. //depot/projects/mips/contrib/less/position.h#2 integrate .. //depot/projects/mips/contrib/less/prompt.c#2 integrate .. //depot/projects/mips/contrib/less/screen.c#2 integrate .. //depot/projects/mips/contrib/less/scrsize.c#2 integrate .. //depot/projects/mips/contrib/less/search.c#2 integrate .. //depot/projects/mips/contrib/less/signal.c#2 integrate .. //depot/projects/mips/contrib/less/tags.c#2 integrate .. //depot/projects/mips/contrib/less/ttyin.c#2 integrate .. //depot/projects/mips/contrib/less/version.c#2 integrate .. //depot/projects/mips/contrib/libpcap/.cvsignore#2 integrate .. //depot/projects/mips/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/mips/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/mips/contrib/libpcap/FILES#2 integrate .. //depot/projects/mips/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/mips/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/mips/contrib/libpcap/README#2 integrate .. //depot/projects/mips/contrib/libpcap/README.Win32#1 branch .. //depot/projects/mips/contrib/libpcap/README.aix#2 integrate .. //depot/projects/mips/contrib/libpcap/README.dag#1 branch .. //depot/projects/mips/contrib/libpcap/README.hpux#1 branch .. //depot/projects/mips/contrib/libpcap/VERSION#3 integrate .. //depot/projects/mips/contrib/libpcap/atmuni31.h#1 branch .. //depot/projects/mips/contrib/libpcap/bpf/net/bpf.h#2 delete .. //depot/projects/mips/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/mips/contrib/libpcap/bpf_dump.c#2 integrate .. //depot/projects/mips/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/mips/contrib/libpcap/config.guess#2 integrate .. //depot/projects/mips/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/mips/contrib/libpcap/config.sub#2 integrate .. //depot/projects/mips/contrib/libpcap/configure#2 integrate .. //depot/projects/mips/contrib/libpcap/configure.in#2 integrate .. //depot/projects/mips/contrib/libpcap/etherent.c#2 integrate .. //depot/projects/mips/contrib/libpcap/fad-getad.c#1 branch .. //depot/projects/mips/contrib/libpcap/fad-gifc.c#1 branch .. //depot/projects/mips/contrib/libpcap/fad-glifc.c#1 branch .. //depot/projects/mips/contrib/libpcap/fad-null.c#1 branch .. //depot/projects/mips/contrib/libpcap/fad-win32.c#1 branch .. //depot/projects/mips/contrib/libpcap/gencode.c#4 integrate .. //depot/projects/mips/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/mips/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/mips/contrib/libpcap/inet.c#2 integrate .. //depot/projects/mips/contrib/libpcap/lbl/os-aix4.h#1 branch .. //depot/projects/mips/contrib/libpcap/lbl/os-hpux11.h#1 branch .. //depot/projects/mips/contrib/libpcap/lbl/os-osf5.h#1 branch .. //depot/projects/mips/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/mips/contrib/libpcap/nlpid.h#2 integrate .. //depot/projects/mips/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/mips/contrib/libpcap/pcap-bpf.h#1 branch .. //depot/projects/mips/contrib/libpcap/pcap-dag.c#1 branch .. //depot/projects/mips/contrib/libpcap/pcap-dag.h#1 branch .. //depot/projects/mips/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-enet.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/mips/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-nit.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-null.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-pf.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-snit.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-snoop.c#2 integrate .. //depot/projects/mips/contrib/libpcap/pcap-stdinc.h#1 branch .. //depot/projects/mips/contrib/libpcap/pcap-win32.c#1 branch .. //depot/projects/mips/contrib/libpcap/pcap.3#4 integrate .. //depot/projects/mips/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/mips/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/mips/contrib/libpcap/pf.h#1 branch .. //depot/projects/mips/contrib/libpcap/rawss7.h#1 branch .. //depot/projects/mips/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/mips/contrib/libpcap/scanner.l#3 integrate .. //depot/projects/mips/contrib/libpcap/sll.h#2 integrate .. //depot/projects/mips/contrib/libpcap/snprintf.c#1 branch .. //depot/projects/mips/contrib/libpcap/sunatmpos.h#1 branch .. //depot/projects/mips/contrib/lukemftp/src/fetch.c#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/ftp.1#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/ftp.c#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/progressbar.c#2 integrate .. //depot/projects/mips/contrib/lukemftp/src/progressbar.h#2 integrate .. //depot/projects/mips/contrib/lukemftp/src/util.c#3 integrate .. //depot/projects/mips/contrib/lukemftp/src/version.h#3 integrate .. //depot/projects/mips/contrib/patch/COPYING#2 delete .. //depot/projects/mips/contrib/patch/ChangeLog#2 delete .. //depot/projects/mips/contrib/patch/FREEBSD-upgrade#2 delete .. //depot/projects/mips/contrib/patch/INSTALL#2 delete .. //depot/projects/mips/contrib/patch/Makefile.in#2 delete .. //depot/projects/mips/contrib/patch/NEWS#2 delete .. //depot/projects/mips/contrib/patch/README#2 delete .. //depot/projects/mips/contrib/patch/acconfig.h#2 delete .. //depot/projects/mips/contrib/patch/addext.c#2 delete .. //depot/projects/mips/contrib/patch/argmatch.c#2 delete .. //depot/projects/mips/contrib/patch/argmatch.h#2 delete .. //depot/projects/mips/contrib/patch/backupfile.c#2 delete .. //depot/projects/mips/contrib/patch/backupfile.h#2 delete .. //depot/projects/mips/contrib/patch/basename.c#2 delete .. //depot/projects/mips/contrib/patch/common.h#2 delete .. //depot/projects/mips/contrib/patch/config.hin#2 delete .. //depot/projects/mips/contrib/patch/configure#2 delete .. //depot/projects/mips/contrib/patch/configure.in#2 delete .. //depot/projects/mips/contrib/patch/getopt.c#2 delete .. //depot/projects/mips/contrib/patch/getopt.h#2 delete .. //depot/projects/mips/contrib/patch/getopt1.c#2 delete .. //depot/projects/mips/contrib/patch/inp.c#2 delete .. //depot/projects/mips/contrib/patch/inp.h#2 delete .. //depot/projects/mips/contrib/patch/install-sh#2 delete .. //depot/projects/mips/contrib/patch/maketime.c#2 delete .. //depot/projects/mips/contrib/patch/maketime.h#2 delete .. //depot/projects/mips/contrib/patch/partime.c#2 delete .. //depot/projects/mips/contrib/patch/partime.h#2 delete .. //depot/projects/mips/contrib/patch/patch.1#2 delete .. //depot/projects/mips/contrib/patch/patch.c#2 delete .. //depot/projects/mips/contrib/patch/pch.c#2 delete .. //depot/projects/mips/contrib/patch/pch.h#2 delete .. //depot/projects/mips/contrib/patch/quotearg.c#2 delete .. //depot/projects/mips/contrib/patch/quotearg.h#2 delete .. //depot/projects/mips/contrib/patch/util.c#2 delete .. //depot/projects/mips/contrib/patch/util.h#2 delete .. //depot/projects/mips/contrib/patch/version.c#2 delete .. //depot/projects/mips/contrib/patch/version.h#2 delete .. //depot/projects/mips/contrib/pf/ftp-proxy/ftp-proxy.8#2 integrate .. //depot/projects/mips/contrib/pf/man/pf.4#2 integrate .. //depot/projects/mips/contrib/pf/man/pflog.4#2 integrate .. //depot/projects/mips/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/mips/contrib/sendmail/FREEBSD-upgrade#7 integrate .. //depot/projects/mips/contrib/smbfs/mount_smbfs/mount_smbfs.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/mips/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/mips/contrib/tcpdump/FILES#3 integrate .. //depot/projects/mips/contrib/tcpdump/INSTALL#3 integrate .. //depot/projects/mips/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/mips/contrib/tcpdump/README#3 integrate .. //depot/projects/mips/contrib/tcpdump/Readme.Win32#1 branch .. //depot/projects/mips/contrib/tcpdump/VERSION#4 integrate .. //depot/projects/mips/contrib/tcpdump/acconfig.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/aodv.h#1 branch .. //depot/projects/mips/contrib/tcpdump/appletalk.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/arcnet.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/atm.h#1 branch .. //depot/projects/mips/contrib/tcpdump/atmuni31.h#1 branch .. //depot/projects/mips/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/bpf_dump.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/config.guess#2 integrate .. //depot/projects/mips/contrib/tcpdump/config.h.in#3 integrate .. //depot/projects/mips/contrib/tcpdump/config.sub#2 integrate .. //depot/projects/mips/contrib/tcpdump/configure#3 integrate .. //depot/projects/mips/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/mips/contrib/tcpdump/decnet.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/enc.h#1 branch .. //depot/projects/mips/contrib/tcpdump/ether.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/ethertype.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/extract.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/fddi.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/gmpls.c#1 branch .. //depot/projects/mips/contrib/tcpdump/gmpls.h#1 branch .. //depot/projects/mips/contrib/tcpdump/gmt2local.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/icmp6.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/igrp.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/interface.h#3 integrate .. //depot/projects/mips/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/ip6.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/ipfc.h#1 branch .. //depot/projects/mips/contrib/tcpdump/ipproto.h#1 branch .. //depot/projects/mips/contrib/tcpdump/ipsec_doi.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/ipx.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/isakmp.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/lane.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/lbl/os-osf4.h#1 branch .. //depot/projects/mips/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/machdep.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/addrinfo.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/addrsize.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/bittypes.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/datalinks.c#1 branch .. //depot/projects/mips/contrib/tcpdump/missing/dlnames.c#1 branch .. //depot/projects/mips/contrib/tcpdump/missing/getaddrinfo.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/getnameinfo.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/inet_aton.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/inet_ntop.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/inet_pton.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/resolv6.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/resolv_ext.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/snprintf.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/sockstorage.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/strlcat.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/strlcpy.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/missing/strsep.c#1 branch .. //depot/projects/mips/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/netbios.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/nfs.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/nfsfh.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/ntp.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/oakley.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/ospf6.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/oui.c#1 branch .. //depot/projects/mips/contrib/tcpdump/oui.h#1 branch .. //depot/projects/mips/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/pcap-missing.h#1 branch .. //depot/projects/mips/contrib/tcpdump/pf.h#1 branch .. //depot/projects/mips/contrib/tcpdump/ppp.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-ah.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-aodv.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-ap1394.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-arcnet.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-arp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-atalk.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-beep.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-bfd.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-bootp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-cdp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-cip.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-cnfp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-decnet.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-dhcp6.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-dvmrp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-egp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-enc.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-esp.c#4 integrate .. //depot/projects/mips/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-frag6.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-gre.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-hsrp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-icmp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-icmp6.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-igmp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-igrp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-ip6opts.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-ipcomp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-ipfc.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-ipx.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-isakmp.c#4 integrate .. //depot/projects/mips/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-krb.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-l2tp.c#4 integrate .. //depot/projects/mips/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-lcp.c#2 delete .. //depot/projects/mips/contrib/tcpdump/print-ldp.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-lwres.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-mobile.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-mobility.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-mpls.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-msdp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-netbios.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-nfs.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-ntp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-ospf6.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-pflog.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-pppoe.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-radius.c#4 integrate .. //depot/projects/mips/contrib/tcpdump/print-raw.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-rip.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-ripng.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-rsvp.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-rt6.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-rx.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-sctp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-sl.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-smb.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-snmp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-stp.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-sunatm.c#1 branch .. //depot/projects/mips/contrib/tcpdump/print-sunrpc.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-telnet.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-timed.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-vjc.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-vrrp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-wb.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/print-zephyr.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/route6d.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/rx.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/sctpConstants.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/sctpHeader.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/setsignal.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/sll.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/smb.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/smbutil.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/strcasecmp.c#2 integrate .. //depot/projects/mips/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/tcpdump-stdinc.h#1 branch .. //depot/projects/mips/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/mips/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/telnet.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/timed.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/token.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/mips/contrib/tcpdump/util.c#3 integrate .. //depot/projects/mips/contrib/tcpdump/vfprintf.c#2 integrate .. //depot/projects/mips/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/mips/crypto/heimdal/ChangeLog#4 integrate .. //depot/projects/mips/crypto/heimdal/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/NEWS#4 integrate .. //depot/projects/mips/crypto/heimdal/TODO#2 delete .. //depot/projects/mips/crypto/heimdal/acinclude.m4#2 delete .. //depot/projects/mips/crypto/heimdal/aclocal.m4#4 integrate .. //depot/projects/mips/crypto/heimdal/admin/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/admin/ktutil.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/appl/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/afsutil/ChangeLog#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/afsutil/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/afsutil/afslog.c#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ChangeLog#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/common/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftp/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftp/ftp.1#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftp/ftp.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftp/gssapi.c#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftp/main.c#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftp/security.h#2 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/ftpd.8#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/ftpd.c#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#3 delete .. //depot/projects/mips/crypto/heimdal/appl/kf/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/kf/kf.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/appl/kf/kfd.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/appl/login/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/push/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/push/pfrom.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/appl/push/push.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/appl/rcp/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/rsh/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/rsh/rshd.c#3 integrate .. //depot/projects/mips/crypto/heimdal/appl/su/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/ChangeLog#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnet/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnet/main.c#2 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnet/telnet.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnetd/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/mips/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/appl/test/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/cf/ChangeLog#3 integrate .. //depot/projects/mips/crypto/heimdal/cf/Makefile.am.common#3 integrate .. //depot/projects/mips/crypto/heimdal/cf/aix.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/auth-modules.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/broken-getaddrinfo.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/broken-getnameinfo.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/broken-glob.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/broken-realloc.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/broken-snprintf.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/c-attribute.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/c-function.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/capabilities.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/check-compile-et.m4#3 integrate .. //depot/projects/mips/crypto/heimdal/cf/check-declaration.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/check-getpwnam_r-posix.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/check-man.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/check-type-extra.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/check-x.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/check-xau.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/find-func-no-libs.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/find-func-no-libs2.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/find-func.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/find-if-not-broken.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/have-pragma-weak.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/have-struct-field.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/have-type.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/have-types.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-bigendian.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-func-getcwd-broken.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-func-getlogin.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-ipv6.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-prog-ln-s.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-prog-ranlib.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-prog-yacc.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-readline.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-struct-spwd.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-struct-winsize.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-sys-aix.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-sys-nextstep.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/krb-version.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/mips-abi.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/need-proto.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/osfc2.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/proto-compat.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/retsigtype.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/roken-frag.m4#3 integrate .. //depot/projects/mips/crypto/heimdal/cf/roken.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/test-package.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/cf/wflags.m4#2 integrate .. //depot/projects/mips/crypto/heimdal/config.guess#3 integrate .. //depot/projects/mips/crypto/heimdal/config.sub#3 integrate .. //depot/projects/mips/crypto/heimdal/configure#4 integrate .. //depot/projects/mips/crypto/heimdal/configure.in#4 integrate .. //depot/projects/mips/crypto/heimdal/doc/Makefile.am#2 integrate .. //depot/projects/mips/crypto/heimdal/doc/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/doc/ack.texi#3 integrate .. //depot/projects/mips/crypto/heimdal/doc/setup.texi#3 integrate .. //depot/projects/mips/crypto/heimdal/include/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/include/config.h.in#2 integrate .. //depot/projects/mips/crypto/heimdal/include/kadm5/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/install-sh#3 integrate .. //depot/projects/mips/crypto/heimdal/kadmin/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/kadmin/kadmin.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/kadmin/kadmind.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/kdc/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/kdc/config.c#3 integrate .. //depot/projects/mips/crypto/heimdal/kdc/connect.c#4 integrate .. //depot/projects/mips/crypto/heimdal/kdc/hprop.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/kdc/hpropd.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/kdc/kaserver.c#4 integrate .. //depot/projects/mips/crypto/heimdal/kdc/kdc.8#3 integrate .. //depot/projects/mips/crypto/heimdal/kdc/kdc.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/kdc/kdc_locl.h#3 integrate .. //depot/projects/mips/crypto/heimdal/kdc/kerberos4.c#3 integrate .. //depot/projects/mips/crypto/heimdal/kdc/kerberos5.c#3 integrate .. //depot/projects/mips/crypto/heimdal/kdc/kstash.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/kdc/string2key.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/kpasswd/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/kpasswd/kpasswd.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/kpasswd/kpasswdd.cat8#3 delete .. //depot/projects/mips/crypto/heimdal/kuser/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/kuser/kdestroy.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/kuser/kgetcred.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/kuser/kinit.c#3 integrate .. //depot/projects/mips/crypto/heimdal/kuser/kinit.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/kuser/klist.c#4 integrate .. //depot/projects/mips/crypto/heimdal/kuser/klist.cat1#3 delete .. //depot/projects/mips/crypto/heimdal/lib/45/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/Makefile.am#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/der_free.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/der_length.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/der_locl.h#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/gen_free.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/asn1/gen_length.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/pam/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/auth/sia/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/com_err/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/8003.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/ChangeLog#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/Makefile.am#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/accept_sec_context.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/acquire_cred.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/add_cred.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/arcfour.c#1 branch .. //depot/projects/mips/crypto/heimdal/lib/gssapi/arcfour.h#1 branch .. //depot/projects/mips/crypto/heimdal/lib/gssapi/context_time.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/decapsulate.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/encapsulate.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/get_mic.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/gssapi_locl.h#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/init_sec_context.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/release_cred.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/unwrap.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/verify_mic.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/gssapi/wrap.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/hdb/Makefile.am#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/hdb/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/hdb/db3.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/hdb/hdb-ldap.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/hdb/hdb_locl.h#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/kadm5/ChangeLog#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/kadm5/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/kadm5/chpass_s.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/kadm5/init_c.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/kadm5/ipropd_slave.c#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/kadm5/truncate_log.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/kafs/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/kafs/kafs.cat3#3 delete .. //depot/projects/mips/crypto/heimdal/lib/krb5/Makefile.am#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/config_file.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/crypto.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/eai_to_heim_errno.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/fcache.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/get_cred.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/get_for_creds.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/get_in_tkt.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/krb5-private.h#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/krb5-protos.h#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/krb5.conf.5#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/krb5.h#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/mcache.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/mk_req_ext.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/mk_safe.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/parse-name-test.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/principal.c#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/rd_req.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/store.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/ticket.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/transited.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/krb5/verify_krb5_conf.c#3 integrate .. //depot/projects/mips/crypto/heimdal/lib/roken/ChangeLog#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/roken/Makefile.am#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/roken/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/roken/config.h.in#2 delete .. //depot/projects/mips/crypto/heimdal/lib/roken/gai_strerror.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/roken/ndbm_wrap.c#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/roken/roken-common.h#2 integrate .. //depot/projects/mips/crypto/heimdal/lib/sl/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/vers/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/lib/vers/print_version.c#3 integrate .. //depot/projects/mips/crypto/heimdal/ltconfig#2 integrate .. //depot/projects/mips/crypto/heimdal/ltmain.sh#2 integrate .. //depot/projects/mips/crypto/heimdal/missing#3 integrate .. //depot/projects/mips/crypto/heimdal/mkinstalldirs#3 integrate .. //depot/projects/mips/crypto/heimdal/tools/Makefile.in#4 integrate .. //depot/projects/mips/crypto/heimdal/tools/krb5-config.cat1#3 delete .. //depot/projects/mips/crypto/openssh/.cvsignore#1 branch .. //depot/projects/mips/crypto/openssh/ChangeLog#6 integrate .. //depot/projects/mips/crypto/openssh/README#4 integrate .. //depot/projects/mips/crypto/openssh/acconfig.h#7 integrate .. //depot/projects/mips/crypto/openssh/auth-krb5.c#6 integrate .. //depot/projects/mips/crypto/openssh/auth-pam.c#7 integrate .. //depot/projects/mips/crypto/openssh/auth-pam.h#6 integrate .. //depot/projects/mips/crypto/openssh/auth-passwd.c#6 integrate .. //depot/projects/mips/crypto/openssh/auth-sia.c#5 integrate .. //depot/projects/mips/crypto/openssh/auth-sia.h#4 integrate .. //depot/projects/mips/crypto/openssh/auth-skey.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth.h#6 integrate .. //depot/projects/mips/crypto/openssh/auth1.c#7 integrate .. //depot/projects/mips/crypto/openssh/auth2.c#7 integrate .. //depot/projects/mips/crypto/openssh/canohost.c#7 integrate .. //depot/projects/mips/crypto/openssh/config.h#6 integrate .. //depot/projects/mips/crypto/openssh/configure.ac#6 integrate .. //depot/projects/mips/crypto/openssh/contrib/Makefile#1 branch .. //depot/projects/mips/crypto/openssh/contrib/README#1 branch .. //depot/projects/mips/crypto/openssh/contrib/aix/README#1 branch .. //depot/projects/mips/crypto/openssh/contrib/aix/buildbff.sh#1 branch .. //depot/projects/mips/crypto/openssh/contrib/aix/inventory.sh#1 branch .. //depot/projects/mips/crypto/openssh/contrib/aix/pam.conf#1 branch .. //depot/projects/mips/crypto/openssh/contrib/caldera/openssh.spec#1 branch .. //depot/projects/mips/crypto/openssh/contrib/caldera/ssh-host-keygen#1 branch .. //depot/projects/mips/crypto/openssh/contrib/caldera/sshd.init#1 branch .. //depot/projects/mips/crypto/openssh/contrib/caldera/sshd.pam#1 branch .. //depot/projects/mips/crypto/openssh/contrib/cygwin/Makefile#1 branch .. //depot/projects/mips/crypto/openssh/contrib/cygwin/README#1 branch .. //depot/projects/mips/crypto/openssh/contrib/cygwin/ssh-host-config#1 branch .. //depot/projects/mips/crypto/openssh/contrib/cygwin/ssh-user-config#1 branch .. //depot/projects/mips/crypto/openssh/contrib/findssl.sh#1 branch .. //depot/projects/mips/crypto/openssh/contrib/gnome-ssh-askpass1.c#1 branch .. //depot/projects/mips/crypto/openssh/contrib/gnome-ssh-askpass2.c#1 branch .. //depot/projects/mips/crypto/openssh/contrib/hpux/README#1 branch .. //depot/projects/mips/crypto/openssh/contrib/hpux/egd#1 branch .. //depot/projects/mips/crypto/openssh/contrib/hpux/egd.rc#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 5 02:02:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FDE816A4D0; Sat, 5 Jun 2004 02:02:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1791916A4CE for ; Sat, 5 Jun 2004 02:02:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F00543D1F for ; Sat, 5 Jun 2004 02:02:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i55920Ue036129 for ; Sat, 5 Jun 2004 09:02:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5590Lsp035018 for perforce@freebsd.org; Sat, 5 Jun 2004 09:00:21 GMT (envelope-from marcel@freebsd.org) Date: Sat, 5 Jun 2004 09:00:21 GMT Message-Id: <200406050900.i5590Lsp035018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54212 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, 05 Jun 2004 09:02:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=54212 Change 54212 by marcel@marcel_nfs on 2004/06/05 08:58:43 IFC @54199 Affected files ... .. //depot/projects/tty/COPYRIGHT#2 integrate .. //depot/projects/tty/MAINTAINERS#6 integrate .. //depot/projects/tty/Makefile#8 integrate .. //depot/projects/tty/Makefile.inc1#12 integrate .. //depot/projects/tty/UPDATING#10 integrate .. //depot/projects/tty/UPDATING.64BTT#1 branch .. //depot/projects/tty/bin/Makefile#3 integrate .. //depot/projects/tty/bin/cat/cat.1#2 integrate .. //depot/projects/tty/bin/cat/cat.c#3 integrate .. //depot/projects/tty/bin/chflags/chflags.1#4 integrate .. //depot/projects/tty/bin/chflags/chflags.c#3 integrate .. //depot/projects/tty/bin/chmod/chmod.1#2 integrate .. //depot/projects/tty/bin/chmod/chmod.c#5 integrate .. //depot/projects/tty/bin/cp/cp.1#4 integrate .. //depot/projects/tty/bin/cp/cp.c#4 integrate .. //depot/projects/tty/bin/cp/extern.h#3 integrate .. //depot/projects/tty/bin/cp/utils.c#5 integrate .. //depot/projects/tty/bin/csh/Makefile#4 integrate .. //depot/projects/tty/bin/csh/USD.doc/csh.1#2 integrate .. //depot/projects/tty/bin/csh/USD.doc/csh.2#2 integrate .. //depot/projects/tty/bin/csh/USD.doc/csh.3#2 integrate .. //depot/projects/tty/bin/csh/USD.doc/csh.4#2 integrate .. //depot/projects/tty/bin/csh/USD.doc/csh.a#2 integrate .. //depot/projects/tty/bin/csh/USD.doc/csh.g#2 integrate .. //depot/projects/tty/bin/csh/USD.doc/tabs#2 integrate .. //depot/projects/tty/bin/csh/host.defs#2 integrate .. //depot/projects/tty/bin/date/date.1#3 integrate .. //depot/projects/tty/bin/date/date.c#4 integrate .. //depot/projects/tty/bin/date/extern.h#2 integrate .. //depot/projects/tty/bin/date/netdate.c#3 integrate .. //depot/projects/tty/bin/dd/Makefile#4 integrate .. //depot/projects/tty/bin/dd/args.c#4 integrate .. //depot/projects/tty/bin/dd/conv.c#3 integrate .. //depot/projects/tty/bin/dd/conv_tab.c#2 integrate .. //depot/projects/tty/bin/dd/dd.1#2 integrate .. //depot/projects/tty/bin/dd/dd.c#5 integrate .. //depot/projects/tty/bin/dd/dd.h#3 integrate .. //depot/projects/tty/bin/dd/extern.h#3 integrate .. //depot/projects/tty/bin/dd/gen.c#1 branch .. //depot/projects/tty/bin/dd/misc.c#3 integrate .. //depot/projects/tty/bin/dd/position.c#3 integrate .. //depot/projects/tty/bin/dd/ref.ascii#1 branch .. //depot/projects/tty/bin/dd/ref.ebcdic#1 branch .. //depot/projects/tty/bin/dd/ref.ibm#1 branch .. //depot/projects/tty/bin/dd/ref.lcase#1 branch .. //depot/projects/tty/bin/dd/ref.oldascii#1 branch .. //depot/projects/tty/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/tty/bin/dd/ref.oldibm#1 branch .. //depot/projects/tty/bin/dd/ref.pareven#1 branch .. //depot/projects/tty/bin/dd/ref.parnone#1 branch .. //depot/projects/tty/bin/dd/ref.parodd#1 branch .. //depot/projects/tty/bin/dd/ref.parset#1 branch .. //depot/projects/tty/bin/dd/ref.swab#1 branch .. //depot/projects/tty/bin/dd/ref.ucase#1 branch .. //depot/projects/tty/bin/df/Makefile#3 integrate .. //depot/projects/tty/bin/df/df.1#4 integrate .. //depot/projects/tty/bin/df/df.c#5 integrate .. //depot/projects/tty/bin/domainname/domainname.1#2 integrate .. //depot/projects/tty/bin/domainname/domainname.c#3 integrate .. //depot/projects/tty/bin/echo/echo.1#4 integrate .. //depot/projects/tty/bin/echo/echo.c#4 integrate .. //depot/projects/tty/bin/ed/cbc.c#3 integrate .. //depot/projects/tty/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/tty/bin/hostname/hostname.1#2 integrate .. //depot/projects/tty/bin/hostname/hostname.c#3 integrate .. //depot/projects/tty/bin/kenv/kenv.c#2 integrate .. //depot/projects/tty/bin/kill/kill.1#2 integrate .. //depot/projects/tty/bin/kill/kill.c#3 integrate .. //depot/projects/tty/bin/ln/ln.1#2 integrate .. //depot/projects/tty/bin/ln/ln.c#3 integrate .. //depot/projects/tty/bin/ln/symlink.7#2 integrate .. //depot/projects/tty/bin/ls/Makefile#4 integrate .. //depot/projects/tty/bin/ls/cmp.c#3 integrate .. //depot/projects/tty/bin/ls/extern.h#4 integrate .. //depot/projects/tty/bin/ls/ls.1#6 integrate .. //depot/projects/tty/bin/ls/ls.c#5 integrate .. //depot/projects/tty/bin/ls/ls.h#3 integrate .. //depot/projects/tty/bin/ls/print.c#5 integrate .. //depot/projects/tty/bin/ls/util.c#5 integrate .. //depot/projects/tty/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/tty/bin/mkdir/mkdir.c#3 integrate .. //depot/projects/tty/bin/mv/mv.1#2 integrate .. //depot/projects/tty/bin/mv/mv.c#4 integrate .. //depot/projects/tty/bin/pax/Makefile#3 integrate .. //depot/projects/tty/bin/pax/ar_io.c#3 integrate .. //depot/projects/tty/bin/pax/ar_subs.c#3 integrate .. //depot/projects/tty/bin/pax/buf_subs.c#2 integrate .. //depot/projects/tty/bin/pax/cache.c#3 integrate .. //depot/projects/tty/bin/pax/cache.h#2 integrate .. //depot/projects/tty/bin/pax/cpio.c#3 integrate .. //depot/projects/tty/bin/pax/cpio.h#2 integrate .. //depot/projects/tty/bin/pax/extern.h#3 integrate .. //depot/projects/tty/bin/pax/file_subs.c#2 integrate .. //depot/projects/tty/bin/pax/ftree.c#2 integrate .. //depot/projects/tty/bin/pax/ftree.h#2 integrate .. //depot/projects/tty/bin/pax/gen_subs.c#3 integrate .. //depot/projects/tty/bin/pax/options.c#3 integrate .. //depot/projects/tty/bin/pax/options.h#2 integrate .. //depot/projects/tty/bin/pax/pat_rep.c#3 integrate .. //depot/projects/tty/bin/pax/pat_rep.h#2 integrate .. //depot/projects/tty/bin/pax/pax.1#2 integrate .. //depot/projects/tty/bin/pax/pax.c#3 integrate .. //depot/projects/tty/bin/pax/pax.h#3 integrate .. //depot/projects/tty/bin/pax/sel_subs.c#2 integrate .. //depot/projects/tty/bin/pax/sel_subs.h#2 integrate .. //depot/projects/tty/bin/pax/tables.c#2 integrate .. //depot/projects/tty/bin/pax/tables.h#2 integrate .. //depot/projects/tty/bin/pax/tar.c#3 integrate .. //depot/projects/tty/bin/pax/tar.h#2 integrate .. //depot/projects/tty/bin/pax/tty_subs.c#2 integrate .. //depot/projects/tty/bin/ps/Makefile#4 integrate .. //depot/projects/tty/bin/ps/extern.h#3 integrate .. //depot/projects/tty/bin/ps/fmt.c#4 integrate .. //depot/projects/tty/bin/ps/keyword.c#5 integrate .. //depot/projects/tty/bin/ps/nlist.c#3 integrate .. //depot/projects/tty/bin/ps/print.c#5 integrate .. //depot/projects/tty/bin/ps/ps.1#4 integrate .. //depot/projects/tty/bin/ps/ps.c#4 integrate .. //depot/projects/tty/bin/ps/ps.h#3 integrate .. //depot/projects/tty/bin/pwd/pwd.1#4 integrate .. //depot/projects/tty/bin/pwd/pwd.c#4 integrate .. //depot/projects/tty/bin/rcp/extern.h#2 integrate .. //depot/projects/tty/bin/rcp/rcp.1#2 integrate .. //depot/projects/tty/bin/rcp/util.c#2 integrate .. //depot/projects/tty/bin/realpath/realpath.1#2 integrate .. //depot/projects/tty/bin/realpath/realpath.c#2 integrate .. //depot/projects/tty/bin/rm/rm.1#3 integrate .. //depot/projects/tty/bin/rm/rm.c#4 integrate .. //depot/projects/tty/bin/rmail/Makefile#3 integrate .. //depot/projects/tty/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/tty/bin/rmdir/rmdir.c#3 integrate .. //depot/projects/tty/bin/sh/Makefile#3 integrate .. //depot/projects/tty/bin/sh/alias.c#3 integrate .. //depot/projects/tty/bin/sh/alias.h#2 integrate .. //depot/projects/tty/bin/sh/arith.h#3 integrate .. //depot/projects/tty/bin/sh/arith.y#4 integrate .. //depot/projects/tty/bin/sh/arith_lex.l#4 integrate .. //depot/projects/tty/bin/sh/bltin/bltin.h#2 integrate .. //depot/projects/tty/bin/sh/bltin/echo.1#2 integrate .. //depot/projects/tty/bin/sh/bltin/echo.c#3 integrate .. //depot/projects/tty/bin/sh/builtins.def#2 integrate .. //depot/projects/tty/bin/sh/cd.c#3 integrate .. //depot/projects/tty/bin/sh/cd.h#2 integrate .. //depot/projects/tty/bin/sh/error.c#2 integrate .. //depot/projects/tty/bin/sh/error.h#2 integrate .. //depot/projects/tty/bin/sh/eval.c#2 integrate .. //depot/projects/tty/bin/sh/eval.h#2 integrate .. //depot/projects/tty/bin/sh/exec.c#3 integrate .. //depot/projects/tty/bin/sh/exec.h#3 integrate .. //depot/projects/tty/bin/sh/expand.c#5 integrate .. //depot/projects/tty/bin/sh/expand.h#2 integrate .. //depot/projects/tty/bin/sh/funcs/cmv#2 integrate .. //depot/projects/tty/bin/sh/funcs/dirs#2 integrate .. //depot/projects/tty/bin/sh/funcs/kill#2 integrate .. //depot/projects/tty/bin/sh/funcs/login#2 integrate .. //depot/projects/tty/bin/sh/funcs/newgrp#2 integrate .. //depot/projects/tty/bin/sh/funcs/popd#2 integrate .. //depot/projects/tty/bin/sh/funcs/pushd#2 integrate .. //depot/projects/tty/bin/sh/funcs/suspend#2 integrate .. //depot/projects/tty/bin/sh/histedit.c#2 integrate .. //depot/projects/tty/bin/sh/init.h#2 integrate .. //depot/projects/tty/bin/sh/input.c#3 integrate .. //depot/projects/tty/bin/sh/input.h#2 integrate .. //depot/projects/tty/bin/sh/jobs.c#5 integrate .. //depot/projects/tty/bin/sh/jobs.h#2 integrate .. //depot/projects/tty/bin/sh/mail.c#2 integrate .. //depot/projects/tty/bin/sh/mail.h#2 integrate .. //depot/projects/tty/bin/sh/main.c#2 integrate .. //depot/projects/tty/bin/sh/main.h#2 integrate .. //depot/projects/tty/bin/sh/memalloc.c#4 integrate .. //depot/projects/tty/bin/sh/memalloc.h#2 integrate .. //depot/projects/tty/bin/sh/miscbltin.c#2 integrate .. //depot/projects/tty/bin/sh/mkbuiltins#3 integrate .. //depot/projects/tty/bin/sh/mkinit.c#2 integrate .. //depot/projects/tty/bin/sh/mknodes.c#3 integrate .. //depot/projects/tty/bin/sh/mksyntax.c#3 integrate .. //depot/projects/tty/bin/sh/mktokens#2 integrate .. //depot/projects/tty/bin/sh/myhistedit.h#2 integrate .. //depot/projects/tty/bin/sh/mystring.c#2 integrate .. //depot/projects/tty/bin/sh/mystring.h#2 integrate .. //depot/projects/tty/bin/sh/nodes.c.pat#4 integrate .. //depot/projects/tty/bin/sh/nodetypes#2 integrate .. //depot/projects/tty/bin/sh/options.c#2 integrate .. //depot/projects/tty/bin/sh/options.h#2 integrate .. //depot/projects/tty/bin/sh/output.c#3 integrate .. //depot/projects/tty/bin/sh/output.h#2 integrate .. //depot/projects/tty/bin/sh/parser.c#3 integrate .. //depot/projects/tty/bin/sh/parser.h#2 integrate .. //depot/projects/tty/bin/sh/redir.c#3 integrate .. //depot/projects/tty/bin/sh/redir.h#2 integrate .. //depot/projects/tty/bin/sh/sh.1#6 integrate .. //depot/projects/tty/bin/sh/shell.h#3 integrate .. //depot/projects/tty/bin/sh/show.c#2 integrate .. //depot/projects/tty/bin/sh/show.h#2 integrate .. //depot/projects/tty/bin/sh/trap.c#2 integrate .. //depot/projects/tty/bin/sh/trap.h#2 integrate .. //depot/projects/tty/bin/sh/var.c#4 integrate .. //depot/projects/tty/bin/sh/var.h#2 integrate .. //depot/projects/tty/bin/sleep/sleep.1#2 integrate .. //depot/projects/tty/bin/sleep/sleep.c#3 integrate .. //depot/projects/tty/bin/stty/cchar.c#2 integrate .. //depot/projects/tty/bin/stty/extern.h#2 integrate .. //depot/projects/tty/bin/stty/gfmt.c#3 integrate .. //depot/projects/tty/bin/stty/key.c#2 integrate .. //depot/projects/tty/bin/stty/modes.c#2 integrate .. //depot/projects/tty/bin/stty/print.c#2 integrate .. //depot/projects/tty/bin/stty/stty.1#2 integrate .. //depot/projects/tty/bin/stty/stty.c#3 integrate .. //depot/projects/tty/bin/stty/stty.h#2 integrate .. //depot/projects/tty/bin/stty/util.c#2 integrate .. //depot/projects/tty/bin/sync/sync.8#2 integrate .. //depot/projects/tty/bin/sync/sync.c#3 integrate .. //depot/projects/tty/bin/test/test.1#2 integrate .. //depot/projects/tty/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/amd/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#2 delete .. //depot/projects/tty/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#3 delete .. //depot/projects/tty/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#2 delete .. //depot/projects/tty/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#2 delete .. //depot/projects/tty/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/tty/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/tty/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/bc/bc/main.c#2 integrate .. //depot/projects/tty/contrib/bc/h/getopt.h#2 delete .. //depot/projects/tty/contrib/bc/lib/getopt.c#2 delete .. //depot/projects/tty/contrib/bc/lib/getopt1.c#2 delete .. //depot/projects/tty/contrib/binutils/include/getopt.h#2 delete .. //depot/projects/tty/contrib/binutils/libiberty/getopt.c#2 delete .. //depot/projects/tty/contrib/binutils/libiberty/getopt1.c#2 delete .. //depot/projects/tty/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/tty/contrib/bsnmp/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/tty/contrib/bsnmp/README#2 integrate .. //depot/projects/tty/contrib/bsnmp/TODO#2 integrate .. //depot/projects/tty/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.1#1 branch .. //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.c#1 branch .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/tty/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/tty/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/tty/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/tty/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/tty/contrib/com_err/ChangeLog#2 integrate .. //depot/projects/tty/contrib/com_err/Makefile.am#2 integrate .. //depot/projects/tty/contrib/com_err/Makefile.in#2 integrate .. //depot/projects/tty/contrib/com_err/com_err.c#2 integrate .. //depot/projects/tty/contrib/com_err/com_err.h#2 integrate .. //depot/projects/tty/contrib/com_err/com_right.h#2 integrate .. //depot/projects/tty/contrib/com_err/compile_et.c#2 integrate .. //depot/projects/tty/contrib/com_err/compile_et.h#2 integrate .. //depot/projects/tty/contrib/com_err/error.c#2 integrate .. //depot/projects/tty/contrib/com_err/lex.h#1 branch .. //depot/projects/tty/contrib/com_err/lex.l#2 integrate .. //depot/projects/tty/contrib/com_err/parse.y#2 integrate .. //depot/projects/tty/contrib/com_err/roken_rename.h#2 integrate .. //depot/projects/tty/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/cpio/getopt.c#2 delete .. //depot/projects/tty/contrib/cpio/getopt.h#2 delete .. //depot/projects/tty/contrib/cpio/getopt1.c#2 delete .. //depot/projects/tty/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/tty/contrib/cvs/BUGS#2 integrate .. //depot/projects/tty/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cvs/FAQ#2 integrate .. //depot/projects/tty/contrib/cvs/INSTALL#2 integrate .. //depot/projects/tty/contrib/cvs/Makefile.am#2 integrate .. //depot/projects/tty/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/tty/contrib/cvs/NEWS#2 integrate .. //depot/projects/tty/contrib/cvs/README#2 integrate .. //depot/projects/tty/contrib/cvs/TESTS#2 integrate .. //depot/projects/tty/contrib/cvs/TODO#2 integrate .. //depot/projects/tty/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/tty/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/cvs/config.h.in#2 integrate .. //depot/projects/tty/contrib/cvs/configure#2 integrate .. //depot/projects/tty/contrib/cvs/configure.in#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/check_cvs.in#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/tty/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/tty/contrib/cvs/depcomp#2 integrate .. //depot/projects/tty/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/tty/contrib/cvs/diff/diff.c#2 integrate .. //depot/projects/tty/contrib/cvs/diff/diff3.c#2 integrate .. //depot/projects/tty/contrib/cvs/diff/diffrun.h#2 integrate .. //depot/projects/tty/contrib/cvs/diff/io.c#2 integrate .. //depot/projects/tty/contrib/cvs/diff/system.h#2 integrate .. //depot/projects/tty/contrib/cvs/diff/util.c#2 integrate .. //depot/projects/tty/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/tty/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/tty/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/tty/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/tty/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/tty/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/tty/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/tty/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/tty/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/tty/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/tty/contrib/cvs/lib/getdate.y#2 integrate .. //depot/projects/tty/contrib/cvs/lib/getpass.c#1 branch .. //depot/projects/tty/contrib/cvs/lib/mkdir.c#2 integrate .. //depot/projects/tty/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/tty/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/tty/contrib/cvs/lib/wait.h#2 integrate .. //depot/projects/tty/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/tty/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/tty/contrib/cvs/man/cvs.1#3 integrate .. //depot/projects/tty/contrib/cvs/man/cvs.5#2 integrate .. //depot/projects/tty/contrib/cvs/mktemp.sh#1 branch .. //depot/projects/tty/contrib/cvs/noautomake.sh#2 delete .. //depot/projects/tty/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/tty/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/tty/contrib/cvs/src/add.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/client.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/client.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/cvsbug.in#2 integrate .. //depot/projects/tty/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/edit.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/error.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/fileattr.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/history.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/history.h#1 branch .. //depot/projects/tty/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/import.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/log.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/login.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/main.c#3 integrate .. //depot/projects/tty/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/parseinfo.c#3 integrate .. //depot/projects/tty/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/release.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/root.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/root.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/run.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/tty/contrib/cvs/src/server.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/server.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/stack.c#1 branch .. //depot/projects/tty/contrib/cvs/src/stack.h#1 branch .. //depot/projects/tty/contrib/cvs/src/status.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/update.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/update.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/watch.h#2 integrate .. //depot/projects/tty/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/tty/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/tty/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/tty/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/diff/diff.h#2 integrate .. //depot/projects/tty/contrib/diff/getopt.c#2 delete .. //depot/projects/tty/contrib/diff/getopt.h#2 delete .. //depot/projects/tty/contrib/diff/getopt1.c#2 delete .. //depot/projects/tty/contrib/gcc/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/gcc/FREEBSD-deletelist#2 integrate .. //depot/projects/tty/contrib/gcc/c-lex.h#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/freebsd.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/linux-ecoff.h#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/osf12.h#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/osf2or3.h#2 delete .. //depot/projects/tty/contrib/gcc/config/arm/arm-wince-pe.h#2 delete .. //depot/projects/tty/contrib/gcc/config/arm/riscix.h#2 delete .. //depot/projects/tty/contrib/gcc/config/arm/riscix1-1.h#2 delete .. //depot/projects/tty/contrib/gcc/config/arm/rix-gas.h#2 delete .. //depot/projects/tty/contrib/gcc/config/arm/t-riscix#2 delete .. //depot/projects/tty/contrib/gcc/config/float-c4x.h#2 delete .. //depot/projects/tty/contrib/gcc/config/float-i128.h#2 delete .. //depot/projects/tty/contrib/gcc/config/float-i32.h#2 delete .. //depot/projects/tty/contrib/gcc/config/float-i386.h#2 delete .. //depot/projects/tty/contrib/gcc/config/float-i64.h#2 delete .. //depot/projects/tty/contrib/gcc/config/float-m68k.h#2 delete .. //depot/projects/tty/contrib/gcc/config/float-sh.h#2 delete .. //depot/projects/tty/contrib/gcc/config/float-sparc.h#2 delete .. //depot/projects/tty/contrib/gcc/config/float-vax.h#2 delete .. //depot/projects/tty/contrib/gcc/config/freebsd-spec.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/386bsd.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/aix386.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/aix386ng.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/bsd386.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/dgux.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/djgpp-rtems.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/freebsd.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/freebsd64.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/interix.c#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/isc.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/isccoff.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/iscdbx.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/linux-oldld.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/next.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/osf1-ci.asm#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/osf1-cn.asm#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/osf1elf.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/osf1elfgdb.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/osfelf.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/osfrose.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/rtems.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/seq-gas.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/seq-sysv3.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/seq2-sysv3.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/sequent.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/sol2gas.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/sun.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/sun386.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/t-dgux#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/t-next#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/t-osf#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/t-osf1elf#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/t-sco5gas#3 delete .. //depot/projects/tty/contrib/gcc/config/i386/v3gas.h#2 delete .. //depot/projects/tty/contrib/gcc/config/nextstep-protos.h#2 delete .. //depot/projects/tty/contrib/gcc/config/nextstep.c#2 delete .. //depot/projects/tty/contrib/gcc/config/nextstep.h#2 delete .. //depot/projects/tty/contrib/gcc/config/nextstep21.h#2 delete .. //depot/projects/tty/contrib/gcc/config/rs6000/softfloat.h#2 delete .. //depot/projects/tty/contrib/gcc/config/s390/t-linux#2 delete .. //depot/projects/tty/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/rtems.h#2 delete .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-g1.asm#2 delete .. //depot/projects/tty/contrib/gcc/config/sparc/sol27-sld.h#2 delete .. //depot/projects/tty/contrib/gcc/config/t-install-cpp#2 delete .. //depot/projects/tty/contrib/gcc/cp/mpw-config.in#2 delete .. //depot/projects/tty/contrib/gcc/cp/mpw-make.sed#2 delete .. //depot/projects/tty/contrib/gcc/dependence.c#2 delete .. //depot/projects/tty/contrib/gcc/doc/vms.texi#2 delete .. //depot/projects/tty/contrib/gcc/enquire.c#2 delete .. //depot/projects/tty/contrib/gcc/f/version.c#3 delete .. //depot/projects/tty/contrib/gcc/f/version.h#2 delete .. //depot/projects/tty/contrib/gcc/function.c#5 integrate .. //depot/projects/tty/contrib/gcc/getopt.c#3 delete .. //depot/projects/tty/contrib/gcc/getopt.h#3 delete .. //depot/projects/tty/contrib/gcc/getopt1.c#2 delete .. //depot/projects/tty/contrib/gcc/ggc-callbacks.c#2 delete .. //depot/projects/tty/contrib/gcc/halfpic.c#2 delete .. //depot/projects/tty/contrib/gcc/halfpic.h#2 delete .. //depot/projects/tty/contrib/gcc/hash.c#2 delete .. //depot/projects/tty/contrib/gcc/hash.h#2 delete .. //depot/projects/tty/contrib/gcc/tradcif.y#2 delete .. //depot/projects/tty/contrib/gcc/tradcpp.c#3 delete .. //depot/projects/tty/contrib/gcc/tradcpp.h#2 delete .. //depot/projects/tty/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/tty/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/tty/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/tty/contrib/gnu-sort/lib/getopt.c#3 delete .. //depot/projects/tty/contrib/gnu-sort/lib/getopt.h#3 delete .. //depot/projects/tty/contrib/gnu-sort/lib/getopt1.c#3 delete .. //depot/projects/tty/contrib/gperf/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/gperf/lib/getopt.c#2 delete .. //depot/projects/tty/contrib/gperf/lib/getopt.c.patch#2 delete .. //depot/projects/tty/contrib/gperf/lib/getopt.h#2 delete .. //depot/projects/tty/contrib/gperf/lib/getopt.h.patch#2 delete .. //depot/projects/tty/contrib/gperf/lib/getopt1.c#2 delete .. //depot/projects/tty/contrib/groff/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/groff/src/include/getopt.h#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/getopt.c#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/getopt1.c#2 delete .. //depot/projects/tty/contrib/groff/tmac/doc-common#7 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-syms#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipmon.c#3 integrate .. //depot/projects/tty/contrib/isc-dhcp/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/isc-dhcp/client/dhclient.c#4 integrate .. //depot/projects/tty/contrib/isc-dhcp/common/convert.c#2 delete .. //depot/projects/tty/contrib/isc-dhcp/common/errwarn.c#2 delete .. //depot/projects/tty/contrib/isc-dhcp/common/hash.c#2 delete .. //depot/projects/tty/contrib/isc-dhcp/common/inet_addr.c#2 delete .. //depot/projects/tty/contrib/isc-dhcp/includes/hash.h#2 delete .. //depot/projects/tty/contrib/isc-dhcp/includes/sysconf.h#2 delete .. //depot/projects/tty/contrib/less/LICENSE#2 integrate .. //depot/projects/tty/contrib/less/Makefile.aut#2 integrate .. //depot/projects/tty/contrib/less/Makefile.dsg#2 integrate .. //depot/projects/tty/contrib/less/Makefile.in#2 integrate .. //depot/projects/tty/contrib/less/NEWS#2 integrate .. //depot/projects/tty/contrib/less/README#2 integrate .. //depot/projects/tty/contrib/less/acconfig.h#2 delete .. //depot/projects/tty/contrib/less/brac.c#2 integrate .. //depot/projects/tty/contrib/less/ch.c#2 integrate .. //depot/projects/tty/contrib/less/charset.c#2 integrate .. //depot/projects/tty/contrib/less/cmd.h#2 integrate .. //depot/projects/tty/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/tty/contrib/less/command.c#2 integrate .. //depot/projects/tty/contrib/less/configure#2 integrate .. //depot/projects/tty/contrib/less/configure.ac#1 branch .. //depot/projects/tty/contrib/less/configure.in#2 delete .. //depot/projects/tty/contrib/less/decode.c#2 integrate .. //depot/projects/tty/contrib/less/defines.ds#2 integrate .. //depot/projects/tty/contrib/less/defines.h.in#2 integrate .. //depot/projects/tty/contrib/less/defines.h.top#2 delete .. //depot/projects/tty/contrib/less/defines.o2#2 integrate .. //depot/projects/tty/contrib/less/defines.wn#2 integrate .. //depot/projects/tty/contrib/less/edit.c#2 integrate .. //depot/projects/tty/contrib/less/filename.c#2 integrate .. //depot/projects/tty/contrib/less/forwback.c#2 integrate .. //depot/projects/tty/contrib/less/funcs.h#2 integrate .. //depot/projects/tty/contrib/less/help.c#2 integrate .. //depot/projects/tty/contrib/less/ifile.c#2 integrate .. //depot/projects/tty/contrib/less/input.c#2 integrate .. //depot/projects/tty/contrib/less/jump.c#2 integrate .. //depot/projects/tty/contrib/less/less.h#2 integrate .. //depot/projects/tty/contrib/less/less.hlp#2 integrate .. //depot/projects/tty/contrib/less/less.man#2 integrate .. //depot/projects/tty/contrib/less/less.nro#2 integrate .. //depot/projects/tty/contrib/less/lessecho.c#2 integrate .. //depot/projects/tty/contrib/less/lesskey.c#2 integrate .. //depot/projects/tty/contrib/less/lesskey.h#2 integrate .. //depot/projects/tty/contrib/less/lesskey.man#2 integrate .. //depot/projects/tty/contrib/less/lesskey.nro#2 integrate .. //depot/projects/tty/contrib/less/lglob.h#2 integrate .. //depot/projects/tty/contrib/less/line.c#2 integrate .. //depot/projects/tty/contrib/less/linenum.c#2 integrate .. //depot/projects/tty/contrib/less/lsystem.c#2 integrate .. //depot/projects/tty/contrib/less/main.c#2 integrate .. //depot/projects/tty/contrib/less/mark.c#2 integrate .. //depot/projects/tty/contrib/less/mkhelp.c#2 integrate .. //depot/projects/tty/contrib/less/optfunc.c#2 integrate .. //depot/projects/tty/contrib/less/option.c#2 integrate .. //depot/projects/tty/contrib/less/option.h#2 integrate .. //depot/projects/tty/contrib/less/opttbl.c#2 integrate .. //depot/projects/tty/contrib/less/os.c#2 integrate .. //depot/projects/tty/contrib/less/output.c#2 integrate .. //depot/projects/tty/contrib/less/pckeys.h#2 integrate .. //depot/projects/tty/contrib/less/position.c#2 integrate .. //depot/projects/tty/contrib/less/position.h#2 integrate .. //depot/projects/tty/contrib/less/prompt.c#2 integrate .. //depot/projects/tty/contrib/less/screen.c#2 integrate .. //depot/projects/tty/contrib/less/scrsize.c#2 integrate .. //depot/projects/tty/contrib/less/search.c#2 integrate .. //depot/projects/tty/contrib/less/signal.c#2 integrate .. //depot/projects/tty/contrib/less/tags.c#2 integrate .. //depot/projects/tty/contrib/less/ttyin.c#2 integrate .. //depot/projects/tty/contrib/less/version.c#2 integrate .. //depot/projects/tty/contrib/libf2c/ChangeLog.egcs#2 delete .. //depot/projects/tty/contrib/libf2c/libI77/rawio.h#2 delete .. //depot/projects/tty/contrib/libobjc/objc-features.texi#2 delete .. //depot/projects/tty/contrib/libpcap/.cvsignore#2 integrate .. //depot/projects/tty/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/tty/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/tty/contrib/libpcap/FILES#2 integrate .. //depot/projects/tty/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/tty/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/tty/contrib/libpcap/README#2 integrate .. //depot/projects/tty/contrib/libpcap/README.Win32#1 branch .. //depot/projects/tty/contrib/libpcap/README.aix#2 integrate .. //depot/projects/tty/contrib/libpcap/README.dag#1 branch .. //depot/projects/tty/contrib/libpcap/README.hpux#1 branch .. //depot/projects/tty/contrib/libpcap/VERSION#3 integrate .. //depot/projects/tty/contrib/libpcap/atmuni31.h#1 branch .. //depot/projects/tty/contrib/libpcap/bpf/net/bpf.h#2 delete .. //depot/projects/tty/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/tty/contrib/libpcap/bpf_dump.c#2 integrate .. //depot/projects/tty/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/tty/contrib/libpcap/config.guess#2 integrate .. //depot/projects/tty/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/tty/contrib/libpcap/config.sub#2 integrate .. //depot/projects/tty/contrib/libpcap/configure#2 integrate .. //depot/projects/tty/contrib/libpcap/configure.in#2 integrate .. //depot/projects/tty/contrib/libpcap/etherent.c#2 integrate .. //depot/projects/tty/contrib/libpcap/fad-getad.c#1 branch .. //depot/projects/tty/contrib/libpcap/fad-gifc.c#1 branch .. //depot/projects/tty/contrib/libpcap/fad-glifc.c#1 branch .. //depot/projects/tty/contrib/libpcap/fad-null.c#1 branch .. //depot/projects/tty/contrib/libpcap/fad-win32.c#1 branch .. //depot/projects/tty/contrib/libpcap/gencode.c#4 integrate .. //depot/projects/tty/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/tty/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/tty/contrib/libpcap/inet.c#2 integrate .. //depot/projects/tty/contrib/libpcap/lbl/os-aix4.h#1 branch .. //depot/projects/tty/contrib/libpcap/lbl/os-hpux11.h#1 branch .. //depot/projects/tty/contrib/libpcap/lbl/os-osf5.h#1 branch .. //depot/projects/tty/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/tty/contrib/libpcap/nlpid.h#2 integrate .. //depot/projects/tty/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.h#1 branch .. //depot/projects/tty/contrib/libpcap/pcap-dag.c#1 branch .. //depot/projects/tty/contrib/libpcap/pcap-dag.h#1 branch .. //depot/projects/tty/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-enet.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-nit.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-null.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-pf.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-snit.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-snoop.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-stdinc.h#1 branch .. //depot/projects/tty/contrib/libpcap/pcap-win32.c#1 branch .. //depot/projects/tty/contrib/libpcap/pcap.3#4 integrate .. //depot/projects/tty/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/tty/contrib/libpcap/pf.h#1 branch .. //depot/projects/tty/contrib/libpcap/rawss7.h#1 branch .. //depot/projects/tty/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/tty/contrib/libpcap/scanner.l#3 integrate .. //depot/projects/tty/contrib/libpcap/sll.h#2 integrate .. //depot/projects/tty/contrib/libpcap/snprintf.c#1 branch .. //depot/projects/tty/contrib/libpcap/sunatmpos.h#1 branch .. //depot/projects/tty/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/libreadline/bind.c#3 integrate .. //depot/projects/tty/contrib/libreadline/complete.c#3 integrate .. //depot/projects/tty/contrib/libreadline/display.c#3 integrate .. //depot/projects/tty/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/tty/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/tty/contrib/libreadline/readline.c#3 integrate .. //depot/projects/tty/contrib/libreadline/readline.h#3 integrate .. //depot/projects/tty/contrib/libreadline/rlconf.h#3 integrate .. //depot/projects/tty/contrib/libreadline/shell.c#3 integrate .. //depot/projects/tty/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/tty/contrib/libreadline/util.c#3 integrate .. //depot/projects/tty/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/tty/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#2 delete .. //depot/projects/tty/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#2 delete .. //depot/projects/tty/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/generic/bits/limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/aix/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/aix/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/aix/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/generic/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/generic/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/hpux/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/newlib/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#2 delete .. //depot/projects/tty/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#2 delete .. //depot/projects/tty/contrib/libstdc++/configure.host#2 delete .. //depot/projects/tty/contrib/libstdc++/include/backward/strstream.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/bits/generic_shadow.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/bits/slice.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/assert.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_climits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/ctype.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/errno.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/fcntl.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/features.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/float.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/iconv.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/iolibio.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/langinfo.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/libio.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/libioP.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/limits.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/locale.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/math.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/pthread.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/setjmp.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/signal.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/stdarg.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/stddef.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/stdio.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/stdlib.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/string.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/sys/cdefs.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/time.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/unistd.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/wchar.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/c_shadow/wctype.h#2 delete .. //depot/projects/tty/contrib/libstdc++/mkcshadow#2 delete .. //depot/projects/tty/contrib/libstdc++/mkinclosure#2 delete .. //depot/projects/tty/contrib/lukemftp/src/fetch.c#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/ftp.1#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/ftp.c#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/progressbar.c#3 integrate .. //depot/projects/tty/contrib/lukemftp/src/progressbar.h#2 integrate .. //depot/projects/tty/contrib/lukemftp/src/util.c#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/version.h#4 integrate .. //depot/projects/tty/contrib/one-true-awk/FIXES#4 integrate .. //depot/projects/tty/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/one-true-awk/b.c#4 integrate .. //depot/projects/tty/contrib/one-true-awk/lex.c#3 integrate .. //depot/projects/tty/contrib/one-true-awk/main.c#4 integrate .. //depot/projects/tty/contrib/one-true-awk/run.c#4 integrate .. //depot/projects/tty/contrib/openpam/CREDITS#4 integrate .. //depot/projects/tty/contrib/openpam/HISTORY#5 integrate .. //depot/projects/tty/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/RELNOTES#5 integrate .. //depot/projects/tty/contrib/openpam/configure#2 integrate .. //depot/projects/tty/contrib/openpam/configure.in#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_borrow_cred.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_free_data.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_get_option.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_log.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_nullconv.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_restore_cred.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_set_option.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_authenticate.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_close_session.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_conv.3#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_end.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_error.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_authtok.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_data.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_item.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_user.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_getenv.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_getenvlist.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_info.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_open_session.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_prompt.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_putenv.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_set_data.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_set_item.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_setcred.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_setenv.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_start.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_strerror.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_verror.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_vinfo.3#5 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_vprompt.3#5 integrate .. //depot/projects/tty/contrib/openpam/include/security/openpam.h#4 integrate .. //depot/projects/tty/contrib/openpam/include/security/openpam_version.h#5 integrate .. //depot/projects/tty/contrib/openpam/include/security/pam_appl.h#4 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_borrow_cred.c#5 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_impl.h#6 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_restore_cred.c#5 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_ttyconv.c#5 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_authtok.c#5 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_data.c#4 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_user.c#5 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_vprompt.c#4 integrate .. //depot/projects/tty/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/tty/contrib/openpam/stamp-h.in#2 integrate .. //depot/projects/tty/contrib/patch/COPYING#2 delete .. //depot/projects/tty/contrib/patch/ChangeLog#2 delete .. //depot/projects/tty/contrib/patch/FREEBSD-upgrade#2 delete .. //depot/projects/tty/contrib/patch/INSTALL#2 delete .. //depot/projects/tty/contrib/patch/Makefile.in#2 delete .. //depot/projects/tty/contrib/patch/NEWS#2 delete .. //depot/projects/tty/contrib/patch/README#2 delete .. //depot/projects/tty/contrib/patch/acconfig.h#2 delete .. //depot/projects/tty/contrib/patch/addext.c#2 delete .. //depot/projects/tty/contrib/patch/argmatch.c#2 delete .. //depot/projects/tty/contrib/patch/argmatch.h#2 delete .. //depot/projects/tty/contrib/patch/backupfile.c#2 delete .. //depot/projects/tty/contrib/patch/backupfile.h#2 delete .. //depot/projects/tty/contrib/patch/basename.c#2 delete .. //depot/projects/tty/contrib/patch/common.h#2 delete .. //depot/projects/tty/contrib/patch/config.hin#2 delete .. //depot/projects/tty/contrib/patch/configure#2 delete .. //depot/projects/tty/contrib/patch/configure.in#2 delete .. //depot/projects/tty/contrib/patch/getopt.c#2 delete .. //depot/projects/tty/contrib/patch/getopt.h#2 delete .. //depot/projects/tty/contrib/patch/getopt1.c#2 delete .. //depot/projects/tty/contrib/patch/inp.c#2 delete .. //depot/projects/tty/contrib/patch/inp.h#2 delete .. //depot/projects/tty/contrib/patch/install-sh#2 delete .. //depot/projects/tty/contrib/patch/maketime.c#2 delete .. //depot/projects/tty/contrib/patch/maketime.h#2 delete .. //depot/projects/tty/contrib/patch/partime.c#2 delete .. //depot/projects/tty/contrib/patch/partime.h#2 delete .. //depot/projects/tty/contrib/patch/patch.1#2 delete .. //depot/projects/tty/contrib/patch/patch.c#2 delete .. //depot/projects/tty/contrib/patch/pch.c#2 delete .. //depot/projects/tty/contrib/patch/pch.h#2 delete .. //depot/projects/tty/contrib/patch/quotearg.c#2 delete .. //depot/projects/tty/contrib/patch/quotearg.h#2 delete .. //depot/projects/tty/contrib/patch/util.c#2 delete .. //depot/projects/tty/contrib/patch/util.h#2 delete .. //depot/projects/tty/contrib/patch/version.c#2 delete .. //depot/projects/tty/contrib/patch/version.h#2 delete .. //depot/projects/tty/contrib/pf/authpf/authpf.8#1 branch .. //depot/projects/tty/contrib/pf/authpf/authpf.c#1 branch .. //depot/projects/tty/contrib/pf/authpf/pathnames.h#1 branch .. //depot/projects/tty/contrib/pf/ftp-proxy/ftp-proxy.8#1 branch .. //depot/projects/tty/contrib/pf/ftp-proxy/ftp-proxy.c#1 branch .. //depot/projects/tty/contrib/pf/ftp-proxy/getline.c#1 branch .. //depot/projects/tty/contrib/pf/ftp-proxy/util.c#1 branch .. //depot/projects/tty/contrib/pf/ftp-proxy/util.h#1 branch .. //depot/projects/tty/contrib/pf/man/pf.4#1 branch .. //depot/projects/tty/contrib/pf/man/pf.conf.5#1 branch .. //depot/projects/tty/contrib/pf/man/pf.os.5#1 branch .. //depot/projects/tty/contrib/pf/man/pflog.4#1 branch .. //depot/projects/tty/contrib/pf/man/pfsync.4#1 branch .. //depot/projects/tty/contrib/pf/pfctl/parse.y#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pf_print_state.c#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl.8#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl.c#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl.h#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl_altq.c#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl_osfp.c#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl_parser.c#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl_parser.h#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl_qstats.c#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl_radix.c#1 branch .. //depot/projects/tty/contrib/pf/pfctl/pfctl_table.c#1 branch .. //depot/projects/tty/contrib/pf/pflogd/pflogd.8#1 branch .. //depot/projects/tty/contrib/pf/pflogd/pflogd.c#1 branch .. //depot/projects/tty/contrib/pf/pflogd/pidfile.c#1 branch .. //depot/projects/tty/contrib/pf/pflogd/pidfile.h#1 branch .. //depot/projects/tty/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#6 integrate .. //depot/projects/tty/contrib/sendmail/PGPKEYS#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 5 12:17:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95E9C16A4D0; Sat, 5 Jun 2004 12:17:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6FFE316A4CE for ; Sat, 5 Jun 2004 12:17:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6998243D4C for ; Sat, 5 Jun 2004 12:17:51 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i55JHhIe084860 for ; Sat, 5 Jun 2004 19:17:43 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i55JHhPj084857 for perforce@freebsd.org; Sat, 5 Jun 2004 19:17:43 GMT (envelope-from scottl@freebsd.org) Date: Sat, 5 Jun 2004 19:17:43 GMT Message-Id: <200406051917.i55JHhPj084857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54235 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, 05 Jun 2004 19:17:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=54235 Change 54235 by scottl@scottl-esp-sparc64 on 2004/06/05 19:17:16 Create a parent DMA tag for the lsi64854 attachment. These are mostly all dummy values. busdma should really learn about newbus and be able to pass bus/parent contraints through it via an inherited parent tag. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#10 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#10 (text+ko) ==== @@ -199,6 +199,22 @@ lsc->sc_regt = rman_get_bustag(lsc->sc_res); lsc->sc_regh = rman_get_bushandle(lsc->sc_res); + /* Create a parent DMA tag based on this bus */ + if (bus_dma_tag_create(NULL, /* parent */ + PAGE_SIZE, 0, /* algnmnt, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + BUS_SPACE_MAXSIZE_32BIT,/* maxsize */ + 0, /* nsegments */ + BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* No locking */ + &lsc->sc_parent_dmat)) { + device_printf(dev, "cannot allocate parent DMA tag\n"); + free(lsc, M_DEVBUF); + return (ENOMEM); + } burst = sbus_get_burstsz(dev); #if ESP_SBUS_DEBUG From owner-p4-projects@FreeBSD.ORG Sat Jun 5 12:20:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 639C116A4D0; Sat, 5 Jun 2004 12:20:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BACE16A4CE for ; Sat, 5 Jun 2004 12:20:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33F4143D2F for ; Sat, 5 Jun 2004 12:20:05 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i55JJlCv084895 for ; Sat, 5 Jun 2004 19:19:47 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i55JJknq084892 for perforce@freebsd.org; Sat, 5 Jun 2004 19:19:46 GMT (envelope-from scottl@freebsd.org) Date: Sat, 5 Jun 2004 19:19:46 GMT Message-Id: <200406051919.i55JJknq084892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54236 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, 05 Jun 2004 19:20:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=54236 Change 54236 by scottl@scottl-esp-sparc64 on 2004/06/05 19:19:04 Convert the lsi64854 driver to busdma. This covers both the parallel port and the scsi sides. Completely untested, but it compiles cleanly =-) Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#4 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#5 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#4 (text+ko) ==== @@ -80,8 +80,6 @@ /* * Finish attaching this DMA device. * Front-end must fill in these fields: - * sc_bustag - * sc_dmatag * sc_regs * sc_burst * sc_channel (one of SCSI, ENET, PP) @@ -113,8 +111,22 @@ sc->reset = lsi64854_reset; /* Allocate a dmamap */ - if (bus_dmamap_create(sc->sc_dmatag, MAX_DMA_SZ, 1, MAX_DMA_SZ, - 0, BUS_DMA_WAITOK, &sc->sc_dmamap) != 0) { + if (bus_dma_tag_create(sc->sc_parent_dmat, /* parent */ + 1, 0, /* algnment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + MAX_DMA_SZ, /* maxsize */ + 1, /* nsegments */ + MAX_DMA_SZ, /* maxsegsize */ + BUS_DMA_ALLOCNOW, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->sc_buffer_dmat)) { + printf("%s: can't allocate buffer DMA tag\n", sc->dv_name); + return; + } + + if (bus_dmamap_create(sc->sc_buffer_dmat, 0, &sc->sc_dmamap) != 0) { printf("%s: DMA map create failed\n", sc->dv_name); return; } @@ -222,9 +234,9 @@ /* * XXX is sync needed? + if (sc->sc_dmamap->dm_nsegs > 0) + bus_dmamap_unload(sc->sc_buffer_dmat, sc->sc_dmamap); */ - if (sc->sc_dmamap->dm_nsegs > 0) - bus_dmamap_unload(sc->sc_dmatag, sc->sc_dmamap); if (sc->sc_rev == DMAREV_HME) L64854_SCSR(sc, csr | D_HW_RESET_FAS366); @@ -283,6 +295,22 @@ DPRINTF(LDB_ANY, ("lsi64854_reset: done, csr 0x%x\n", csr)); } +static void +lsi64854_map_scsi(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct lsi64854_softc *sc; + + sc = (struct lsi64854_softc *)arg; + + if (nseg != 1) + panic("%s: cannot map %d segments\n", sc->dv_name, nseg); + + bus_dmamap_sync(sc->sc_buffer_dmat, sc->sc_dmamap, sc->sc_datain ? + BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, + segs[0].ds_addr); +} + #define DMAMAX(a) (MAX_DMA_SZ - ((a) & (MAX_DMA_SZ-1))) /* @@ -305,6 +333,7 @@ #endif sc->sc_dmaaddr = addr; sc->sc_dmalen = len; + sc->sc_datain = datain; /* * the rules say we cannot transfer more than the limit @@ -329,26 +358,18 @@ /* Program the DMA address */ if (sc->sc_dmasize) { - sc->sc_dvmaaddr = *sc->sc_dmaaddr; - if (bus_dmamap_load(sc->sc_dmatag, sc->sc_dmamap, + if (bus_dmamap_load(sc->sc_buffer_dmat, sc->sc_dmamap, *sc->sc_dmaaddr, sc->sc_dmasize, - NULL /* kernel address */, - BUS_DMA_NOWAIT | BUS_DMA_STREAMING)) + lsi64854_map_scsi, sc, 0) != 0) panic("%s: cannot allocate DVMA address", sc->dv_name); - bus_dmamap_sync(sc->sc_dmatag, sc->sc_dmamap, 0, sc->sc_dmasize, - datain - ? BUS_DMASYNC_PREREAD - : BUS_DMASYNC_PREWRITE); - bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, - sc->sc_dmamap->dm_segs[0].ds_addr); } if (sc->sc_rev == DMAREV_ESC) { /* DMA ESC chip bug work-around */ long bcnt = sc->sc_dmasize; long eaddr = bcnt + (long)*sc->sc_dmaaddr; - if ((eaddr & PGOFSET) != 0) - bcnt = roundup(bcnt, PAGE_SIZE); + if ((eaddr & PAGE_MASK_8K) != 0) + bcnt = roundup(bcnt, PAGE_SIZE_8K); bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, bcnt); } @@ -384,19 +405,17 @@ { struct lsi64854_softc *sc = arg; struct ncr53c9x_softc *nsc = sc->sc_client; - char bits[64]; int trans, resid; u_int32_t csr; csr = L64854_GCSR(sc); - DPRINTF(LDB_SCSI, ("%s: dmaintr: addr 0x%x, csr %s\n", sc->dv_name, + DPRINTF(LDB_SCSI, ("%s: dmaintr: addr 0x%x, csr %b\n", sc->dv_name, bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR), - bitmask_snprintf(csr, DDMACSR_BITS, bits, sizeof(bits)))); + csr, DDMACSR_BITS)); if (csr & (D_ERR_PEND|D_SLAVE_ERR)) { - printf("%s: error: csr=%s\n", sc->dv_name, - bitmask_snprintf(csr, DDMACSR_BITS, bits,sizeof(bits))); + printf("%s: error: csr=%b\n", sc->dv_name, csr, DDMACSR_BITS); csr &= ~D_EN_DMA; /* Stop DMA */ /* Invalidate the queue; SLAVE_ERR bit is write-to-clear */ csr |= D_INVALIDATE|D_SLAVE_ERR; @@ -478,13 +497,15 @@ ? NCR_READ_REG(nsc, NCR_TCH) : 0, trans, resid)); +#if 0 /* XXX */ if (sc->sc_dmamap->dm_nsegs > 0) { - bus_dmamap_sync(sc->sc_dmatag, sc->sc_dmamap, 0, sc->sc_dmasize, + bus_dmamap_sync(sc->sc_buffer_dmat, sc->sc_dmamap, (csr & D_WRITE) != 0 ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->sc_dmatag, sc->sc_dmamap); + bus_dmamap_unload(sc->sc_buffer_dmat, sc->sc_dmamap); } +#endif *sc->sc_dmalen -= trans; *sc->sc_dmaaddr += trans; @@ -509,7 +530,6 @@ void *arg; { struct lsi64854_softc *sc = arg; - char bits[64]; u_int32_t csr; static int dodrain = 0; int rv; @@ -520,8 +540,7 @@ rv = ((csr & E_INT_PEND) != 0) ? 1 : 0; if (csr & (E_ERR_PEND|E_SLAVE_ERR)) { - printf("%s: error: csr=%s\n", sc->dv_name, - bitmask_snprintf(csr, EDMACSR_BITS, bits,sizeof(bits))); + printf("%s: error: csr=%b\n", sc->dv_name, csr, EDMACSR_BITS); csr &= ~L64854_EN_DMA; /* Stop DMA */ /* Invalidate the queue; SLAVE_ERR bit is write-to-clear */ csr |= E_INVALIDATE|E_SLAVE_ERR; @@ -536,12 +555,32 @@ csr |= E_DRAIN; L64854_SCSR(sc, csr); while (i-- > 0 && (L64854_GCSR(sc) & D_DRAINING)) - delay(1); + DELAY(1); } return (rv | (*sc->sc_intrchain)(sc->sc_intrchainarg)); } +static void +lsi64854_map_pp(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct lsi64854_softc *sc; + + sc = (struct lsi64854_softc *)arg; + + if (nsegs != 1) + panic("%s: cannot map %d segments\n", sc->dv_name, nsegs); + + bus_dmamap_sync(sc->sc_buffer_dmat, sc->sc_dmamap, sc->sc_datain + ? BUS_DMASYNC_PREREAD + : BUS_DMASYNC_PREWRITE); + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, + segs[0].ds_addr); + + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, + sc->sc_dmasize); +} + /* * setup a DMA transfer */ @@ -559,6 +598,7 @@ sc->sc_dmaaddr = addr; sc->sc_dmalen = len; + sc->sc_datain = datain; DPRINTF(LDB_PP, ("%s: pp start %ld@%p,%d\n", sc->dv_name, (long)*sc->sc_dmalen, *sc->sc_dmaaddr, datain ? 1 : 0)); @@ -575,22 +615,11 @@ /* Program the DMA address */ if (sc->sc_dmasize) { - sc->sc_dvmaaddr = *sc->sc_dmaaddr; - if (bus_dmamap_load(sc->sc_dmatag, sc->sc_dmamap, + if (bus_dmamap_load(sc->sc_buffer_dmat, sc->sc_dmamap, *sc->sc_dmaaddr, sc->sc_dmasize, - NULL /* kernel address */, - BUS_DMA_NOWAIT/*|BUS_DMA_COHERENT*/)) + lsi64854_map_pp, sc, 0) != 0) panic("%s: pp cannot allocate DVMA address", sc->dv_name); - bus_dmamap_sync(sc->sc_dmatag, sc->sc_dmamap, 0, sc->sc_dmasize, - datain - ? BUS_DMASYNC_PREREAD - : BUS_DMASYNC_PREWRITE); - bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, - sc->sc_dmamap->dm_segs[0].ds_addr); - - bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, - sc->sc_dmasize); } /* Setup DMA control register */ @@ -623,21 +652,20 @@ void *arg; { struct lsi64854_softc *sc = arg; - char bits[64]; int ret, trans, resid = 0; u_int32_t csr; csr = L64854_GCSR(sc); - DPRINTF(LDB_PP, ("%s: pp intr: addr 0x%x, csr %s\n", sc->dv_name, + DPRINTF(LDB_PP, ("%s: pp intr: addr 0x%x, csr %b\n", sc->dv_name, bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR), - bitmask_snprintf(csr, PDMACSR_BITS, bits, sizeof(bits)))); + csr, PDMACSR_BITS)); if (csr & (P_ERR_PEND|P_SLAVE_ERR)) { resid = bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT); - printf("%s: pp error: resid %d csr=%s\n", sc->dv_name, resid, - bitmask_snprintf(csr, PDMACSR_BITS, bits,sizeof(bits))); + printf("%s: pp error: resid %d csr=%b\n", sc->dv_name, resid, + csr, PDMACSR_BITS); csr &= ~P_EN_DMA; /* Stop DMA */ /* Invalidate the queue; SLAVE_ERR bit is write-to-clear */ csr |= P_INVALIDATE|P_SLAVE_ERR; @@ -665,13 +693,15 @@ *sc->sc_dmalen -= trans; *sc->sc_dmaaddr += trans; +#if 0 /* XXX */ if (sc->sc_dmamap->dm_nsegs > 0) { - bus_dmamap_sync(sc->sc_dmatag, sc->sc_dmamap, 0, sc->sc_dmasize, + bus_dmamap_sync(sc->sc_buffer_dmat, sc->sc_dmamap, (csr & D_WRITE) != 0 ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->sc_dmatag, sc->sc_dmamap); + bus_dmamap_unload(sc->sc_buffer_dmat, sc->sc_dmamap); } +#endif return (ret != 0); } ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#5 (text+ko) ==== @@ -55,9 +55,10 @@ int sc_active; /* DMA active ? */ bus_dmamap_t sc_dmamap; /* DMA map for bus_dma_* */ -#ifdef NOT_NEEDED - caddr_t sc_dvmaaddr; /* DVMA cookie */ -#endif + + bus_dma_tag_t sc_parent_dmat; + bus_dma_tag_t sc_buffer_dmat; + int sc_datain; size_t sc_dmasize; caddr_t *sc_dmaaddr; size_t *sc_dmalen; From owner-p4-projects@FreeBSD.ORG Sat Jun 5 13:47:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54A2316A4D0; Sat, 5 Jun 2004 13:47:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E4FF16A4CE for ; Sat, 5 Jun 2004 13:47:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24DC943D39 for ; Sat, 5 Jun 2004 13:47:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i55KlY1p010832 for ; Sat, 5 Jun 2004 20:47:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i55KlXLj010829 for perforce@freebsd.org; Sat, 5 Jun 2004 20:47:33 GMT (envelope-from marcel@freebsd.org) Date: Sat, 5 Jun 2004 20:47:33 GMT Message-Id: <200406052047.i55KlXLj010829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 54238 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, 05 Jun 2004 20:47:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=54238 Change 54238 by marcel@marcel_nfs on 2004/06/05 20:46:41 Import of gdb 6.1 release. Functionally this is a complete and utter no-op. I'm still waiting for gdb 6.1.1 to arrive. Affected files ... .. //depot/projects/gdb/contrib/gdb6/bfd/configure#2 edit .. //depot/projects/gdb/contrib/gdb6/bfd/configure.in#2 edit .. //depot/projects/gdb/contrib/gdb6/djunpack.bat#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/ada-tasks.c#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/doc/GDBvn.texi#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/doc/agentexpr.texi#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-1#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-2#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-3#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdbint.texinfo#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/doc/stabs.texinfo#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/gdb.1#2 edit .. //depot/projects/gdb/contrib/gdb6/gdb/version.in#2 edit .. //depot/projects/gdb/contrib/gdb6/md5.sum#2 edit .. //depot/projects/gdb/contrib/gdb6/mpw-README#2 delete .. //depot/projects/gdb/contrib/gdb6/mpw-build.in#2 delete .. //depot/projects/gdb/contrib/gdb6/mpw-config.in#2 delete .. //depot/projects/gdb/contrib/gdb6/mpw-configure#2 delete .. //depot/projects/gdb/contrib/gdb6/mpw-install#2 delete Differences ... ==== //depot/projects/gdb/contrib/gdb6/bfd/configure#2 (text+ko) ==== @@ -930,7 +930,7 @@ PACKAGE=bfd -VERSION=6.1.0.90_20040413 +VERSION=2.15.90 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } ==== //depot/projects/gdb/contrib/gdb6/bfd/configure.in#2 (text+ko) ==== @@ -7,7 +7,7 @@ AC_CANONICAL_SYSTEM AC_ISC_POSIX -AM_INIT_AUTOMAKE(bfd, 6.1.0.90_20040413) +AM_INIT_AUTOMAKE(bfd, 2.15.90) # Uncomment the next line to remove the date from the reported bfd version #is_release=y ==== //depot/projects/gdb/contrib/gdb6/djunpack.bat#2 (text+ko) ==== @@ -17,8 +17,8 @@ Rem The following 2 lines need to be changed with each new GDB release, to Rem be identical to the name of the top-level directory where the GDB Rem distribution unpacks itself. -set GDBVER=gdb+dejagnu-6.1.0.90_20040413 -if "%GDBVER%"=="gdb+dejagnu-6.1.0.90_20040413" GoTo EnvOk +set GDBVER=gdb-6.1 +if "%GDBVER%"=="gdb-6.1" GoTo EnvOk Rem If their environment space is too small, re-exec with a larger one command.com /e:4096 /c %0 %1 GoTo End ==== //depot/projects/gdb/contrib/gdb6/gdb/ada-tasks.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ . This file is part of GDB. - [$Id: ada-tasks.c,v 1.1.1.1 2004/03/26 02:54:41 marcel Exp $] + [$Id: ada-tasks.c,v 1.7 2003/06/17 20:58:32 ciceron Exp $] Authors: Roch-Alexandre Nomine Beguin, Arnaud Charlet This program is free software; you can redistribute it and/or modify ==== //depot/projects/gdb/contrib/gdb6/gdb/doc/GDBvn.texi#2 (text+ko) ==== @@ -1,1 +1,1 @@ -@set GDBVN 6.1.0.90_20040413 +@set GDBVN 6.1 ==== //depot/projects/gdb/contrib/gdb6/gdb/doc/agentexpr.texi#2 (text+ko) ==== @@ -5,7 +5,7 @@ @c @setchapternewpage off @c %**end of header -@c Revision: $Id: agentexpr.texi,v 1.1.1.1 2004/03/26 02:54:45 marcel Exp $ +@c Revision: $Id: agentexpr.texi,v 1.2 1998/12/09 21:23:46 jimb Exp $ @node Agent Expressions @appendix The GDB Agent Expression Mechanism ==== //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info#2 (text+ko) ==== @@ -8,7 +8,7 @@ This file documents the GNU debugger GDB. This is the Ninth Edition, of `Debugging with GDB: the GNU -Source-Level Debugger' for GDB Version 6.1.0.90_20040413. +Source-Level Debugger' for GDB Version 6.1. Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, @@ -28,352 +28,352 @@  Indirect: -gdb.info-1: 1139 -gdb.info-2: 300395 -gdb.info-3: 599662 +gdb.info-1: 1125 +gdb.info-2: 300353 +gdb.info-3: 599606  Tag Table: (Indirect) -Node: Top1139 -Node: Summary3579 -Node: Free Software5203 -Node: Contributors10771 -Node: Sample Session17225 -Node: Invocation24105 -Node: Invoking GDB24642 -Node: File Options26886 -Node: Mode Options30518 -Ref: Mode Options-Footnote-136386 -Node: Quitting GDB36532 -Node: Shell Commands37415 -Node: Logging output38249 -Node: Commands39083 -Node: Command Syntax39717 -Node: Completion41793 -Node: Help46120 -Node: Running51366 -Node: Compilation52472 -Node: Starting54805 -Node: Arguments57979 -Node: Environment59241 -Node: Working Directory62501 -Node: Input/Output63238 -Node: Attach64840 -Node: Kill Process67268 -Node: Threads68226 -Node: Processes74112 -Node: Stopping77138 -Node: Breakpoints78281 -Node: Set Breaks81548 -Node: Set Watchpoints92890 -Node: Set Catchpoints98966 -Node: Delete Breaks102432 -Node: Disabling104111 -Node: Conditions106795 -Node: Break Commands111731 -Node: Breakpoint Menus114604 -Node: Error in Breakpoints116324 -Node: Breakpoint related warnings117890 -Node: Continuing and Stepping120203 -Node: Signals129408 -Node: Thread Stops133533 -Node: Stack138130 -Node: Frames139601 -Node: Backtrace142321 -Node: Selection145008 -Node: Frame Info147864 -Node: Source150187 -Node: List151187 -Node: Edit154708 -Ref: Edit-Footnote-1156417 -Node: Search156623 -Node: Source Path157423 -Node: Machine Code160237 -Node: Data163229 -Node: Expressions165480 -Node: Variables167440 -Node: Arrays171069 -Node: Output Formats173590 -Ref: Output Formats-Footnote-1175601 -Node: Memory175758 -Node: Auto Display180031 -Node: Print Settings183795 -Node: Value History193887 -Node: Convenience Vars196295 -Node: Registers199278 -Ref: Registers-Footnote-1202971 -Node: Floating Point Hardware203366 -Node: Vector Unit203886 -Node: Auxiliary Vector204263 -Node: Memory Region Attributes205437 -Node: Dump/Restore Files208718 -Node: Character Sets210996 -Node: Macros217798 -Node: Tracepoints224635 -Node: Set Tracepoints226362 -Node: Create and Delete Tracepoints227551 -Node: Enable and Disable Tracepoints229231 -Node: Tracepoint Passcounts229916 -Node: Tracepoint Actions231336 -Node: Listing Tracepoints234342 -Node: Starting and Stopping Trace Experiment235449 -Node: Analyze Collected Data236613 -Node: tfind237908 -Node: tdump242297 -Node: save-tracepoints243962 -Node: Tracepoint Variables244367 -Node: Overlays245377 -Node: How Overlays Work246091 -Ref: A code overlay248646 -Node: Overlay Commands252084 -Node: Automatic Overlay Debugging256260 -Node: Overlay Sample Program258421 -Node: Languages260171 -Node: Setting261328 -Node: Filenames263020 -Node: Manually263743 -Node: Automatically264938 -Node: Show265985 -Node: Checks267280 -Node: Type Checking268636 -Node: Range Checking271331 -Node: Support273694 -Node: C274716 -Node: C Operators275921 -Node: C Constants280284 -Node: C plus plus expressions282753 -Node: C Defaults286278 -Node: C Checks286943 -Node: Debugging C287648 -Node: Debugging C plus plus288150 -Node: Objective-C291136 -Node: Method Names in Commands291441 -Node: The Print Command with Objective-C293138 -Node: Modula-2293771 -Node: M2 Operators294666 -Node: Built-In Func/Proc297635 -Node: M2 Constants300395 -Node: M2 Defaults301981 -Node: Deviations302572 -Node: M2 Checks303655 -Node: M2 Scope304455 -Node: GDB/M2305461 -Node: Unsupported languages306355 -Node: Symbols307023 -Node: Altering318941 -Node: Assignment319904 -Node: Jumping322999 -Node: Signaling325146 -Node: Returning326267 -Node: Calling327459 -Node: Patching327933 -Node: GDB Files329000 -Node: Files329535 -Node: Separate Debug Files347464 -Node: Symbol Errors355799 -Node: Targets359392 -Node: Active Targets360397 -Node: Target Commands361966 -Node: Byte Order366325 -Node: Remote367307 -Node: KOD368227 -Node: Remote Debugging369615 -Node: Connecting370062 -Node: Server373295 -Ref: Server-Footnote-1377318 -Node: NetWare377438 -Node: Remote configuration378901 -Ref: set remote hardware-watchpoint-limit379133 -Ref: set remote hardware-breakpoint-limit379133 -Node: remote stub379359 -Node: Stub Contents382246 -Node: Bootstrapping384343 -Node: Debug Session388138 -Node: Configurations389684 -Node: Native390447 -Node: HP-UX390843 -Node: SVR4 Process Information391122 -Node: DJGPP Native392026 -Node: Cygwin Native397524 -Node: Non-debug DLL symbols400023 -Node: Embedded OS404529 -Node: VxWorks404995 -Node: VxWorks Connection407198 -Node: VxWorks Download408114 -Node: VxWorks Attach409831 -Node: Embedded Processors410211 -Node: ARM411085 -Node: H8/300411430 -Node: Renesas Boards412915 -Node: Renesas ICE417344 -Node: Renesas Special418121 -Node: H8/500418553 -Node: M32R/D418914 -Node: M68K419179 -Node: MIPS Embedded419799 -Node: OpenRISC 1000424290 -Node: PowerPC427129 -Node: PA427444 -Node: SH427710 -Node: Sparclet428155 -Node: Sparclet File429611 -Node: Sparclet Connection430473 -Node: Sparclet Download430933 -Node: Sparclet Execution431964 -Node: Sparclite432537 -Node: ST2000432897 -Node: Z8000434421 -Node: Architectures435774 -Node: A29K436061 -Node: Alpha436873 -Node: MIPS436992 -Node: Controlling GDB437959 -Node: Prompt438714 -Node: Editing439483 -Node: History440249 -Node: Screen Size442979 -Node: Numbers444437 -Node: ABI445822 -Node: Messages/Warnings448646 -Node: Debugging Output450674 -Node: Sequences452930 -Node: Define453505 -Node: Hooks456911 -Node: Command Files459110 -Ref: Command Files-Footnote-1461733 -Ref: Command Files-Footnote-2461861 -Node: Output461970 -Node: Interpreters464374 -Node: TUI466459 -Node: TUI Overview467147 -Node: TUI Keys470222 -Node: TUI Single Key Mode472713 -Node: TUI Commands473551 -Node: TUI Configuration475414 -Node: Emacs476882 -Node: GDB/MI481982 -Node: GDB/MI Command Syntax483593 -Node: GDB/MI Input Syntax483823 -Node: GDB/MI Output Syntax485363 -Node: GDB/MI Simple Examples488798 -Node: GDB/MI Compatibility with CLI489949 -Node: GDB/MI Output Records490670 -Node: GDB/MI Result Records490949 -Node: GDB/MI Stream Records491566 -Node: GDB/MI Out-of-band Records492693 -Node: GDB/MI Command Description Format493186 -Node: GDB/MI Breakpoint Table Commands494154 -Node: GDB/MI Data Manipulation509302 -Node: GDB/MI Program Control528612 -Node: GDB/MI Miscellaneous Commands541209 -Node: GDB/MI Stack Manipulation543585 -Node: GDB/MI Symbol Query551562 -Node: GDB/MI Target Manipulation554843 -Node: GDB/MI Thread Commands561930 -Node: GDB/MI Tracepoint Commands564002 -Node: GDB/MI Variable Objects564236 -Node: Annotations572619 -Node: Annotations Overview573525 -Node: Server Prefix575810 -Node: Prompting576448 -Node: Errors577955 -Node: Invalidation578841 -Node: Annotations for Running579308 -Node: Source Annotations580818 -Node: GDB Bugs581733 -Node: Bug Criteria582453 -Node: Bug Reporting583320 -Node: Command Line Editing590559 -Node: Introduction and Notation591221 -Node: Readline Interaction592831 -Node: Readline Bare Essentials594010 -Node: Readline Movement Commands595783 -Node: Readline Killing Commands596732 -Node: Readline Arguments598634 -Node: Searching599662 -Node: Readline Init File601797 -Node: Readline Init File Syntax602850 -Node: Conditional Init Constructs613728 -Node: Sample Init File616245 -Node: Bindable Readline Commands619421 -Node: Commands For Moving620466 -Node: Commands For History621311 -Node: Commands For Text624165 -Node: Commands For Killing626875 -Node: Numeric Arguments628821 -Node: Commands For Completion629944 -Node: Keyboard Macros631472 -Node: Miscellaneous Commands632027 -Node: Readline vi Mode635372 -Node: Using History Interactively636279 -Node: History Interaction636672 -Node: Event Designators638084 -Node: Word Designators639005 -Node: Modifiers640628 -Node: Formatting Documentation641760 -Ref: Formatting Documentation-Footnote-1645114 -Node: Installing GDB645206 -Node: Separate Objdir649124 -Node: Config Names652058 -Node: Configure Options653523 -Node: Maintenance Commands655852 -Ref: maint info breakpoints656161 -Node: Remote Protocol660106 -Node: Overview660431 -Node: Packets663533 -Ref: read registers packet666551 -Ref: cycle step packet667770 -Ref: write register packet669758 -Ref: general query packet669991 -Ref: step with signal packet671106 -Ref: insert breakpoint or watchpoint packet673674 -Node: Stop Reply Packets676568 -Node: General Query Packets678776 -Node: Register Packet Format687229 -Node: Examples688125 -Node: File-I/O remote protocol extension688742 -Node: File-I/O Overview689226 -Node: Protocol basics691295 -Node: The F request packet693515 -Node: The F reply packet694408 -Node: Memory transfer695323 -Node: The Ctrl-C message695902 -Node: Console I/O697582 -Node: The isatty call698758 -Node: The system call699273 -Node: List of supported calls700262 -Node: open700614 -Node: close702823 -Node: read703193 -Node: write703777 -Node: lseek704503 -Node: rename705321 -Node: unlink706572 -Node: stat/fstat707433 -Node: gettimeofday708253 -Node: isatty708678 -Node: system709007 -Node: Protocol specific representation of datatypes709578 -Node: Integral datatypes709921 -Node: Pointer values710720 -Node: struct stat711417 -Node: struct timeval713809 -Node: Constants714327 -Node: Open flags714758 -Node: mode_t values715099 -Node: Errno values715591 -Node: Lseek flags716399 -Node: Limits716584 -Node: File-I/O Examples716944 -Node: Agent Expressions718038 -Node: General Bytecode Design720937 -Node: Bytecode Descriptions725725 -Node: Using Agent Expressions736403 -Node: Varying Target Capabilities737928 -Node: Tracing on Symmetrix739093 -Node: Rationale744911 -Node: Copying752282 -Node: GNU Free Documentation License771493 -Node: Index793897 +Node: Top1125 +Node: Summary3551 +Node: Free Software5175 +Node: Contributors10743 +Node: Sample Session17197 +Node: Invocation24063 +Node: Invoking GDB24600 +Node: File Options26844 +Node: Mode Options30476 +Ref: Mode Options-Footnote-136344 +Node: Quitting GDB36490 +Node: Shell Commands37373 +Node: Logging output38207 +Node: Commands39041 +Node: Command Syntax39675 +Node: Completion41751 +Node: Help46078 +Node: Running51324 +Node: Compilation52430 +Node: Starting54763 +Node: Arguments57937 +Node: Environment59199 +Node: Working Directory62459 +Node: Input/Output63196 +Node: Attach64798 +Node: Kill Process67226 +Node: Threads68184 +Node: Processes74070 +Node: Stopping77096 +Node: Breakpoints78239 +Node: Set Breaks81506 +Node: Set Watchpoints92848 +Node: Set Catchpoints98924 +Node: Delete Breaks102390 +Node: Disabling104069 +Node: Conditions106753 +Node: Break Commands111689 +Node: Breakpoint Menus114562 +Node: Error in Breakpoints116282 +Node: Breakpoint related warnings117848 +Node: Continuing and Stepping120161 +Node: Signals129366 +Node: Thread Stops133491 +Node: Stack138088 +Node: Frames139559 +Node: Backtrace142279 +Node: Selection144966 +Node: Frame Info147822 +Node: Source150145 +Node: List151145 +Node: Edit154666 +Ref: Edit-Footnote-1156375 +Node: Search156581 +Node: Source Path157381 +Node: Machine Code160195 +Node: Data163187 +Node: Expressions165438 +Node: Variables167398 +Node: Arrays171027 +Node: Output Formats173548 +Ref: Output Formats-Footnote-1175559 +Node: Memory175716 +Node: Auto Display179989 +Node: Print Settings183753 +Node: Value History193845 +Node: Convenience Vars196253 +Node: Registers199236 +Ref: Registers-Footnote-1202929 +Node: Floating Point Hardware203324 +Node: Vector Unit203844 +Node: Auxiliary Vector204221 +Node: Memory Region Attributes205395 +Node: Dump/Restore Files208676 +Node: Character Sets210954 +Node: Macros217756 +Node: Tracepoints224593 +Node: Set Tracepoints226320 +Node: Create and Delete Tracepoints227509 +Node: Enable and Disable Tracepoints229189 +Node: Tracepoint Passcounts229874 +Node: Tracepoint Actions231294 +Node: Listing Tracepoints234300 +Node: Starting and Stopping Trace Experiment235407 +Node: Analyze Collected Data236571 +Node: tfind237866 +Node: tdump242255 +Node: save-tracepoints243920 +Node: Tracepoint Variables244325 +Node: Overlays245335 +Node: How Overlays Work246049 +Ref: A code overlay248604 +Node: Overlay Commands252042 +Node: Automatic Overlay Debugging256218 +Node: Overlay Sample Program258379 +Node: Languages260129 +Node: Setting261286 +Node: Filenames262978 +Node: Manually263701 +Node: Automatically264896 +Node: Show265943 +Node: Checks267238 +Node: Type Checking268594 +Node: Range Checking271289 +Node: Support273652 +Node: C274674 +Node: C Operators275879 +Node: C Constants280242 +Node: C plus plus expressions282711 +Node: C Defaults286236 +Node: C Checks286901 +Node: Debugging C287606 +Node: Debugging C plus plus288108 +Node: Objective-C291094 +Node: Method Names in Commands291399 +Node: The Print Command with Objective-C293096 +Node: Modula-2293729 +Node: M2 Operators294624 +Node: Built-In Func/Proc297593 +Node: M2 Constants300353 +Node: M2 Defaults301939 +Node: Deviations302530 +Node: M2 Checks303613 +Node: M2 Scope304413 +Node: GDB/M2305419 +Node: Unsupported languages306313 +Node: Symbols306981 +Node: Altering318899 +Node: Assignment319862 +Node: Jumping322957 +Node: Signaling325104 +Node: Returning326225 +Node: Calling327417 +Node: Patching327891 +Node: GDB Files328958 +Node: Files329493 +Node: Separate Debug Files347422 +Node: Symbol Errors355757 +Node: Targets359350 +Node: Active Targets360355 +Node: Target Commands361924 +Node: Byte Order366283 +Node: Remote367265 +Node: KOD368185 +Node: Remote Debugging369573 +Node: Connecting370020 +Node: Server373253 +Ref: Server-Footnote-1377276 +Node: NetWare377396 +Node: Remote configuration378859 +Ref: set remote hardware-watchpoint-limit379091 +Ref: set remote hardware-breakpoint-limit379091 +Node: remote stub379317 +Node: Stub Contents382204 +Node: Bootstrapping384301 +Node: Debug Session388096 +Node: Configurations389642 +Node: Native390405 +Node: HP-UX390801 +Node: SVR4 Process Information391080 +Node: DJGPP Native391984 +Node: Cygwin Native397482 +Node: Non-debug DLL symbols399981 +Node: Embedded OS404487 +Node: VxWorks404953 +Node: VxWorks Connection407156 +Node: VxWorks Download408072 +Node: VxWorks Attach409789 +Node: Embedded Processors410169 +Node: ARM411043 +Node: H8/300411388 +Node: Renesas Boards412873 +Node: Renesas ICE417288 +Node: Renesas Special418065 +Node: H8/500418497 +Node: M32R/D418858 +Node: M68K419123 +Node: MIPS Embedded419743 +Node: OpenRISC 1000424234 +Node: PowerPC427073 +Node: PA427388 +Node: SH427654 +Node: Sparclet428099 +Node: Sparclet File429555 +Node: Sparclet Connection430417 +Node: Sparclet Download430877 +Node: Sparclet Execution431908 +Node: Sparclite432481 +Node: ST2000432841 +Node: Z8000434365 +Node: Architectures435718 +Node: A29K436005 +Node: Alpha436817 +Node: MIPS436936 +Node: Controlling GDB437903 +Node: Prompt438658 +Node: Editing439427 +Node: History440193 +Node: Screen Size442923 +Node: Numbers444381 +Node: ABI445766 +Node: Messages/Warnings448590 +Node: Debugging Output450618 +Node: Sequences452874 +Node: Define453449 +Node: Hooks456855 +Node: Command Files459054 +Ref: Command Files-Footnote-1461677 +Ref: Command Files-Footnote-2461805 +Node: Output461914 +Node: Interpreters464318 +Node: TUI466403 +Node: TUI Overview467091 +Node: TUI Keys470166 +Node: TUI Single Key Mode472657 +Node: TUI Commands473495 +Node: TUI Configuration475358 +Node: Emacs476826 +Node: GDB/MI481926 +Node: GDB/MI Command Syntax483537 +Node: GDB/MI Input Syntax483767 +Node: GDB/MI Output Syntax485307 +Node: GDB/MI Simple Examples488742 +Node: GDB/MI Compatibility with CLI489893 +Node: GDB/MI Output Records490614 +Node: GDB/MI Result Records490893 +Node: GDB/MI Stream Records491510 +Node: GDB/MI Out-of-band Records492637 +Node: GDB/MI Command Description Format493130 +Node: GDB/MI Breakpoint Table Commands494098 +Node: GDB/MI Data Manipulation509246 +Node: GDB/MI Program Control528556 +Node: GDB/MI Miscellaneous Commands541153 +Node: GDB/MI Stack Manipulation543529 +Node: GDB/MI Symbol Query551506 +Node: GDB/MI Target Manipulation554787 +Node: GDB/MI Thread Commands561874 +Node: GDB/MI Tracepoint Commands563946 +Node: GDB/MI Variable Objects564180 +Node: Annotations572563 +Node: Annotations Overview573469 +Node: Server Prefix575754 +Node: Prompting576392 +Node: Errors577899 +Node: Invalidation578785 +Node: Annotations for Running579252 +Node: Source Annotations580762 +Node: GDB Bugs581677 +Node: Bug Criteria582397 +Node: Bug Reporting583264 +Node: Command Line Editing590503 +Node: Introduction and Notation591165 +Node: Readline Interaction592775 +Node: Readline Bare Essentials593954 +Node: Readline Movement Commands595727 +Node: Readline Killing Commands596676 +Node: Readline Arguments598578 +Node: Searching599606 +Node: Readline Init File601741 +Node: Readline Init File Syntax602794 +Node: Conditional Init Constructs613672 +Node: Sample Init File616189 +Node: Bindable Readline Commands619365 +Node: Commands For Moving620410 +Node: Commands For History621255 +Node: Commands For Text624109 +Node: Commands For Killing626819 +Node: Numeric Arguments628765 +Node: Commands For Completion629888 +Node: Keyboard Macros631416 +Node: Miscellaneous Commands631971 +Node: Readline vi Mode635316 +Node: Using History Interactively636223 +Node: History Interaction636616 +Node: Event Designators638028 +Node: Word Designators638949 +Node: Modifiers640572 +Node: Formatting Documentation641704 +Ref: Formatting Documentation-Footnote-1645002 +Node: Installing GDB645066 +Node: Separate Objdir648774 +Node: Config Names651624 +Node: Configure Options653061 +Node: Maintenance Commands655390 +Ref: maint info breakpoints655699 +Node: Remote Protocol659644 +Node: Overview659969 +Node: Packets663071 +Ref: read registers packet666089 +Ref: cycle step packet667308 +Ref: write register packet669296 +Ref: general query packet669529 +Ref: step with signal packet670644 +Ref: insert breakpoint or watchpoint packet673212 +Node: Stop Reply Packets676106 +Node: General Query Packets678314 +Node: Register Packet Format686767 +Node: Examples687663 +Node: File-I/O remote protocol extension688280 +Node: File-I/O Overview688764 +Node: Protocol basics690833 +Node: The F request packet693053 +Node: The F reply packet693946 +Node: Memory transfer694861 +Node: The Ctrl-C message695440 +Node: Console I/O697120 +Node: The isatty call698296 +Node: The system call698811 +Node: List of supported calls699800 +Node: open700152 +Node: close702361 +Node: read702731 +Node: write703315 +Node: lseek704041 +Node: rename704859 +Node: unlink706110 +Node: stat/fstat706971 +Node: gettimeofday707791 +Node: isatty708216 +Node: system708545 +Node: Protocol specific representation of datatypes709116 +Node: Integral datatypes709459 +Node: Pointer values710258 +Node: struct stat710955 +Node: struct timeval713347 +Node: Constants713865 +Node: Open flags714296 +Node: mode_t values714637 +Node: Errno values715129 +Node: Lseek flags715937 +Node: Limits716122 +Node: File-I/O Examples716482 +Node: Agent Expressions717576 +Node: General Bytecode Design720475 +Node: Bytecode Descriptions725263 +Node: Using Agent Expressions735941 +Node: Varying Target Capabilities737466 +Node: Tracing on Symmetrix738631 +Node: Rationale744449 +Node: Copying751820 +Node: GNU Free Documentation License771031 +Node: Index793435  End Tag Table ==== //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-1#2 (text+ko) ==== @@ -8,7 +8,7 @@ This file documents the GNU debugger GDB. This is the Ninth Edition, of `Debugging with GDB: the GNU -Source-Level Debugger' for GDB Version 6.1.0.90_20040413. +Source-Level Debugger' for GDB Version 6.1. Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, @@ -34,7 +34,7 @@ This file describes GDB, the GNU symbolic debugger. - This is the Ninth Edition, for GDB Version 6.1.0.90_20040413. + This is the Ninth Edition, for GDB Version 6.1. Copyright (C) 1988-2004 Free Software Foundation, Inc. @@ -422,7 +422,7 @@ There is absolutely no warranty for GDB; type "show warranty" for details. - GDB 6.1.0.90_20040413, Copyright 1999 Free Software Foundation, Inc... + GDB 6.1, Copyright 1999 Free Software Foundation, Inc... (gdb) GDB reads only enough symbol data to know where to find the rest when ==== //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-2#2 (text+ko) ==== @@ -8,7 +8,7 @@ This file documents the GNU debugger GDB. This is the Ninth Edition, of `Debugging with GDB: the GNU -Source-Level Debugger' for GDB Version 6.1.0.90_20040413. +Source-Level Debugger' for GDB Version 6.1. Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, @@ -2823,7 +2823,7 @@ the conditions. There is absolutely no warranty for GDB; type "show warranty" for details. - GDB 6.1.0.90_20040413, Copyright 1992 Free Software Foundation, Inc... + GDB 6.1, Copyright 1992 Free Software Foundation, Inc... (gdb) target hms Connected to remote H8/300 HMS system. (gdb) load t.x ==== //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-3#2 (text+ko) ==== @@ -8,7 +8,7 @@ This file documents the GNU debugger GDB. This is the Ninth Edition, of `Debugging with GDB: the GNU -Source-Level Debugger' for GDB Version 6.1.0.90_20040413. +Source-Level Debugger' for GDB Version 6.1. Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, @@ -1210,19 +1210,18 @@ GDB includes an already formatted copy of the on-line Info version of this manual in the `gdb' subdirectory. The main Info file is -`gdb-6.1.0.90_20040413/gdb/gdb.info', and it refers to subordinate -files matching `gdb.info*' in the same directory. If necessary, you -can print out these files, or read them with any editor; but they are -easier to read using the `info' subsystem in GNU Emacs or the -standalone `info' program, available as part of the GNU Texinfo -distribution. +`gdb-6.1/gdb/gdb.info', and it refers to subordinate files matching +`gdb.info*' in the same directory. If necessary, you can print out +these files, or read them with any editor; but they are easier to read +using the `info' subsystem in GNU Emacs or the standalone `info' +program, available as part of the GNU Texinfo distribution. If you want to format these Info files yourself, you need one of the Info formatting programs, such as `texinfo-format-buffer' or `makeinfo'. If you have `makeinfo' installed, and are in the top level GDB -source directory (`gdb-6.1.0.90_20040413', in the case of version -6.1.0.90_20040413), you can make the Info file by typing: +source directory (`gdb-6.1', in the case of version 6.1), you can make +the Info file by typing: cd gdb make gdb.info @@ -1247,8 +1246,7 @@ If you have TeX and a DVI printer program installed, you can typeset and print this manual. First switch to the the `gdb' subdirectory of -the main source directory (for example, to `gdb-6.1.0.90_20040413/gdb') -and type: +the main source directory (for example, to `gdb-6.1/gdb') and type: make gdb.dvi @@ -1256,8 +1254,7 @@ ---------- Footnotes ---------- - (1) In `gdb-6.1.0.90_20040413/gdb/refcard.ps' of the version -6.1.0.90_20040413 release. + (1) In `gdb-6.1/gdb/refcard.ps' of the version 6.1 release.  File: gdb.info, Node: Installing GDB, Next: Maintenance Commands, Prev: Using History Interactively, Up: Top @@ -1273,39 +1270,39 @@ in a single directory, whose name is usually composed by appending the version number to `gdb'. - For example, the GDB version 6.1.0.90_20040413 distribution is in the -`gdb-6.1.0.90_20040413' directory. That directory contains: + For example, the GDB version 6.1 distribution is in the `gdb-6.1' +directory. That directory contains: -`gdb-6.1.0.90_20040413/configure (and supporting files)' +`gdb-6.1/configure (and supporting files)' script for configuring GDB and all its supporting libraries -`gdb-6.1.0.90_20040413/gdb' +`gdb-6.1/gdb' the source specific to GDB itself -`gdb-6.1.0.90_20040413/bfd' +`gdb-6.1/bfd' source for the Binary File Descriptor library -`gdb-6.1.0.90_20040413/include' +`gdb-6.1/include' GNU include files -`gdb-6.1.0.90_20040413/libiberty' +`gdb-6.1/libiberty' source for the `-liberty' free software library -`gdb-6.1.0.90_20040413/opcodes' +`gdb-6.1/opcodes' source for the library of opcode tables and disassemblers -`gdb-6.1.0.90_20040413/readline' +`gdb-6.1/readline' source for the GNU command-line interface -`gdb-6.1.0.90_20040413/glob' +`gdb-6.1/glob' source for the GNU filename pattern-matching subroutine -`gdb-6.1.0.90_20040413/mmalloc' +`gdb-6.1/mmalloc' source for the GNU memory-mapped malloc package The simplest way to configure and build GDB is to run `configure' from the `gdb-VERSION-NUMBER' source directory, which in this example -is the `gdb-6.1.0.90_20040413' directory. +is the `gdb-6.1' directory. First switch to the `gdb-VERSION-NUMBER' source directory if you are not already in it; then run `configure'. Pass the identifier for the @@ -1313,7 +1310,7 @@ For example: - cd gdb-6.1.0.90_20040413 + cd gdb-6.1 ./configure HOST make @@ -1334,10 +1331,10 @@ sh configure HOST If you run `configure' from a directory that contains source -directories for multiple libraries or programs, such as the -`gdb-6.1.0.90_20040413' source directory for version 6.1.0.90_20040413, -`configure' creates configuration files for every directory level -underneath (unless you tell it not to, with the `--norecursion' option). +directories for multiple libraries or programs, such as the `gdb-6.1' +source directory for version 6.1, `configure' creates configuration +files for every directory level underneath (unless you tell it not to, +with the `--norecursion' option). You should run the `configure' script from the top directory in the source tree, the `gdb-VERSION-NUMBER' directory. If you run @@ -1382,13 +1379,13 @@ argument to `--srcdir', you can leave out the `--srcdir' option; it is assumed.) - For example, with version 6.1.0.90_20040413, you can build GDB in a -separate directory for a Sun 4 like this: + For example, with version 6.1, you can build GDB in a separate +directory for a Sun 4 like this: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 5 17:08:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E271D16A4D0; Sat, 5 Jun 2004 17:08:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDD9116A4CE for ; Sat, 5 Jun 2004 17:08:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7B8A43D1D for ; Sat, 5 Jun 2004 17:08:38 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5608cMj056987 for ; Sun, 6 Jun 2004 00:08:38 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5608c8T056984 for perforce@freebsd.org; Sun, 6 Jun 2004 00:08:38 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 00:08:38 GMT Message-Id: <200406060008.i5608c8T056984@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 54243 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, 06 Jun 2004 00:08:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=54243 Change 54243 by jmallett@jmallett_oingo on 2004/06/06 00:08:18 Remove kend calculation...at least until mips64emul can grow LoadedProgram stuff... Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#28 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#28 (text+ko) ==== @@ -86,9 +86,6 @@ struct machine_type *mtp; const char *cpufreq; int first, i, j, last, size; - vm_offset_t kend; - - kend = 0; /* * Initialise the ARCS stuff. @@ -137,18 +134,6 @@ arcsmem += btoc(size); break; case ARCS_Mem_Type_LoadedProgram: - /* XXX does not allow for kernels loaded - * at the very end of the available space. - * XXX assumes sorted memory, but it is? - */ - /* - * If this kend is higher than the - * current kend, and we have memory - * before it, then mark the end of - * kernel memory. - */ - if (j > 0 && phys_avail[j - 1] >= kend) - kend = MIPS_PHYS_TO_KSEG1(last); lpmem += btoc(size); break; case ARCS_Mem_Type_FreeContiguous: @@ -165,8 +150,6 @@ } physsz += size; } - if (kend == 0) - panic("End of kernel should not be 0"); init_param2(btoc(physsz)); mips_init(); From owner-p4-projects@FreeBSD.ORG Sat Jun 5 17:09:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E52416A4D0; Sat, 5 Jun 2004 17:09:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E344A16A4CE for ; Sat, 5 Jun 2004 17:09:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C719643D2F for ; Sat, 5 Jun 2004 17:09:40 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5609eM5057004 for ; Sun, 6 Jun 2004 00:09:40 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5609eCj057001 for perforce@freebsd.org; Sun, 6 Jun 2004 00:09:40 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 00:09:40 GMT Message-Id: <200406060009.i5609eCj057001@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 54244 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, 06 Jun 2004 00:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=54244 Change 54244 by jmallett@jmallett_oingo on 2004/06/06 00:08:43 Catch up with the wide world of current. Affected files ... .. //depot/projects/mips/sys/conf/Makefile.mips#14 edit .. //depot/projects/mips/sys/conf/files.mips#31 edit .. //depot/projects/mips/sys/mips/include/pmap.h#14 edit .. //depot/projects/mips/sys/mips/mips/elf_machdep.c#3 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#35 edit .. //depot/projects/mips/sys/mips/mips/uio_machdep.c#1 add .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#14 edit Differences ... ==== //depot/projects/mips/sys/conf/Makefile.mips#14 (text+ko) ==== @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500012 +%VERSREQ= 500013 # We support multiple platforms, and would do well to have a variable for # the platform we are building for. ==== //depot/projects/mips/sys/conf/files.mips#31 (text+ko) ==== @@ -26,6 +26,7 @@ mips/mips/syscall.c standard mips/mips/tlb.c standard mips/mips/trap.c standard +mips/mips/uio_machdep.c standard mips/mips/vm_machdep.c standard # XXX cache code needs to be split up per CPU type, but yuck. mips/mips/cache.c standard ==== //depot/projects/mips/sys/mips/include/pmap.h#14 (text+ko) ==== @@ -68,6 +68,8 @@ vm_page_t pv_ptem; /* VM page for pte */ } *pv_entry_t; +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) + extern pmap_t kernel_pmap; extern vm_offset_t avail_start; extern vm_offset_t avail_end; ==== //depot/projects/mips/sys/mips/mips/elf_machdep.c#3 (text+ko) ==== @@ -46,14 +46,14 @@ } int -elf_reloc(linker_file_t fil, const void *data, int rmode) +elf_reloc(linker_file_t fil, Elf_Addr relocbase, const void *data, int type, elf_lookup_fn lookup) { printf("%s unimplemented at %s:%d, returning error.\n", __func__, __FILE__, __LINE__); return (ENXIO); } int -elf_reloc_local(linker_file_t fil, const void *data, int rmode) +elf_reloc_local(linker_file_t fil, Elf_Addr relocbase, const void *data, int type, elf_lookup_fn lookup) { printf("%s unimplemented at %s:%d, returning error.\n", __func__, __FILE__, __LINE__); return (ENXIO); ==== //depot/projects/mips/sys/mips/mips/pmap.c#35 (text+ko) ==== @@ -359,8 +359,7 @@ * way, discontiguous physical memory. */ void -pmap_init(phys_start, phys_end) - vm_offset_t phys_start, phys_end; +pmap_init(void) { int i; int initial_pvs; @@ -1176,16 +1175,6 @@ tlb_enter(pmap, va, pa, PG_V | wired); } -/* - * Make temporary mapping for a physical address. This is called - * during dump. - */ -void * -pmap_kenter_temporary(vm_offset_t pa, int i) -{ - return (void *) MIPS_PHYS_TO_KSEG1(pa - (i * PAGE_SIZE)); -} - vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#14 (text+ko) ==== @@ -94,12 +94,6 @@ } void -cpu_sched_exit(struct thread *td) -{ - panic("%s", __func__); -} - -void cpu_switch(struct thread *old, struct thread *new) { if (!savectx(old->td_pcb)) { @@ -162,7 +156,7 @@ } struct sf_buf * -sf_buf_alloc(struct vm_page *m) +sf_buf_alloc(struct vm_page *m, int pri) { panic("%s", __func__); return (NULL); From owner-p4-projects@FreeBSD.ORG Sat Jun 5 18:42:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A40D616A4D0; Sat, 5 Jun 2004 18:42:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76D8516A4CE for ; Sat, 5 Jun 2004 18:42:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7079143D5C for ; Sat, 5 Jun 2004 18:42:33 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i561gXfq084419 for ; Sun, 6 Jun 2004 01:42:33 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i561gXn8084416 for perforce@freebsd.org; Sun, 6 Jun 2004 01:42:33 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 01:42:33 GMT Message-Id: <200406060142.i561gXn8084416@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 54246 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, 06 Jun 2004 01:42:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=54246 Change 54246 by jmallett@jmallett_oingo on 2004/06/06 01:41:37 Catching up with changed code. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.S#12 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.S#12 (text+ko) ==== @@ -61,9 +61,8 @@ li t0, MIPS_SR_KX | MIPS_SR_COP_1_BIT /* - * Read coprocessor 0 status register, clear bits not - * preserved (namely, clearing interrupt bits), and set - * bits we want to explicitly set. + * Read coprocessor 0 status register, and set bits we want to + * explicitly set. */ mfc0 t1, MIPS_COP_0_STATUS or t1, t0 From owner-p4-projects@FreeBSD.ORG Sat Jun 5 18:47:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7610716A4D0; Sat, 5 Jun 2004 18:47:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50CB416A4CE for ; Sat, 5 Jun 2004 18:47:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3399D43D2F for ; Sat, 5 Jun 2004 18:47:40 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i561lefq084787 for ; Sun, 6 Jun 2004 01:47:40 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i561ldaS084784 for perforce@freebsd.org; Sun, 6 Jun 2004 01:47:39 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 01:47:39 GMT Message-Id: <200406060147.i561ldaS084784@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 54247 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, 06 Jun 2004 01:47:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=54247 Change 54247 by jmallett@jmallett_oingo on 2004/06/06 01:46:48 Integ from alpha. (untested.) Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#36 integrate Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#36 (text+ko) ==== @@ -162,8 +162,6 @@ pmap_t kernel_pmap = &kernel_pmap_store; vm_offset_t phys_avail[10]; -vm_offset_t avail_start; /* PA of first available physical page */ -vm_offset_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ static boolean_t pmap_initialized = FALSE; /* Has pmap_init completed? */ @@ -281,12 +279,12 @@ */ tlb_bootstrap(physsz >> PAGE_SHIFT, pmap_steal_memory); - avail_start = phys_avail[0]; - for (i = 0; phys_avail[i+2]; i+= 2) ; - avail_end = phys_avail[i+1]; + } + + for (i = 0; phys_avail[i+2]; i+= 2) /* find non-empty ones */; virtual_avail = VM_MIN_KERNEL_ADDRESS; - virtual_end = virtual_avail + (avail_end - avail_start); + virtual_end = virtual_avail + (phys_avail[i+1] - phys_avail[0]); kernel_vm_end = virtual_end; /* @@ -692,7 +690,7 @@ */ VM_OBJECT_LOCK(pmap->pm_pteobj); lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); vm_page_lock_queues(); vm_page_flag_clear(lev1pg, PG_BUSY); @@ -701,10 +699,7 @@ VM_OBJECT_UNLOCK(pmap->pm_pteobj); pmap->pm_lev1 = (pt_entry_t*) MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(lev1pg)); - if ((lev1pg->flags & PG_ZERO) == 0) - bzero(pmap->pm_lev1, PAGE_SIZE); - /* install self-referential address mapping entry (not PG_ASM) */ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) | PG_V | PG_KRE | PG_KWE; @@ -1160,7 +1155,8 @@ * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) { + if (pmap_initialized && + (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, mpte, m); } From owner-p4-projects@FreeBSD.ORG Sat Jun 5 18:48:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2672016A4D0; Sat, 5 Jun 2004 18:48:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01AA616A4CE for ; Sat, 5 Jun 2004 18:48:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D81BA43D49 for ; Sat, 5 Jun 2004 18:48:44 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i561mfTZ084819 for ; Sun, 6 Jun 2004 01:48:41 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i561mfAF084816 for perforce@freebsd.org; Sun, 6 Jun 2004 01:48:41 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 01:48:41 GMT Message-Id: <200406060148.i561mfAF084816@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 54248 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, 06 Jun 2004 01:48:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=54248 Change 54248 by jmallett@jmallett_oingo on 2004/06/06 01:47:51 Snip. Affected files ... .. //depot/projects/mips/sys/mips/include/pmap.h#15 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pmap.h#15 (text+ko) ==== @@ -71,8 +71,6 @@ #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) extern pmap_t kernel_pmap; -extern vm_offset_t avail_start; -extern vm_offset_t avail_end; extern vm_offset_t phys_avail[]; extern vm_size_t physsz; extern vm_offset_t virtual_avail; From owner-p4-projects@FreeBSD.ORG Sat Jun 5 20:11:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B3F516A4D0; Sat, 5 Jun 2004 20:11:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 309DC16A4CE for ; Sat, 5 Jun 2004 20:11:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 125ED43D53 for ; Sat, 5 Jun 2004 20:11:22 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i563BLEM005125 for ; Sun, 6 Jun 2004 03:11:21 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i563BL64005089 for perforce@freebsd.org; Sun, 6 Jun 2004 03:11:21 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 03:11:21 GMT Message-Id: <200406060311.i563BL64005089@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 54249 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, 06 Jun 2004 03:11:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=54249 Change 54249 by jmallett@jmallett_oingo on 2004/06/06 03:10:35 Integ fatfingering fix. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#37 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#37 (text+ko) ==== @@ -279,8 +279,6 @@ */ tlb_bootstrap(physsz >> PAGE_SHIFT, pmap_steal_memory); - } - for (i = 0; phys_avail[i+2]; i+= 2) /* find non-empty ones */; virtual_avail = VM_MIN_KERNEL_ADDRESS; From owner-p4-projects@FreeBSD.ORG Sat Jun 5 20:22:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 867B116A4D0; Sat, 5 Jun 2004 20:22:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6070B16A4CE for ; Sat, 5 Jun 2004 20:22:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43B4343D3F for ; Sat, 5 Jun 2004 20:22:49 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i563MaYg008247 for ; Sun, 6 Jun 2004 03:22:36 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i563MZ7e008244 for perforce@freebsd.org; Sun, 6 Jun 2004 03:22:35 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 03:22:35 GMT Message-Id: <200406060322.i563MZ7e008244@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 54250 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, 06 Jun 2004 03:22:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=54250 Change 54250 by jmallett@jmallett_oingo on 2004/06/06 03:22:15 Allow MIPS4. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#43 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#43 (text+ko) ==== @@ -702,6 +702,7 @@ */ switch (cpu_arch) { case CPU_ARCH_MIPS3: + case CPU_ARCH_MIPS4: case CPU_ARCH_MIPS64: break; default: From owner-p4-projects@FreeBSD.ORG Sat Jun 5 20:45:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0325516A4D0; Sat, 5 Jun 2004 20:45:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1E0316A4CE for ; Sat, 5 Jun 2004 20:45:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA9BB43D2F for ; Sat, 5 Jun 2004 20:45:03 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i563j3MP012288 for ; Sun, 6 Jun 2004 03:45:03 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i563j3wI012285 for perforce@freebsd.org; Sun, 6 Jun 2004 03:45:03 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 03:45:03 GMT Message-Id: <200406060345.i563j3wI012285@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 54251 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, 06 Jun 2004 03:45:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=54251 Change 54251 by jmallett@jmallett_oingo on 2004/06/06 03:45:00 Kill code I want to factor out. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/ip22.c#7 edit .. //depot/projects/mips/sys/mips/sgimips/sysconf.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/ip22.c#7 (text+ko) ==== @@ -41,30 +41,10 @@ #include #include -u_int32_t next_clk_intr; -u_int32_t missed_clk_intrs; -static unsigned long last_clk_intr; - -#if notyet -static struct evcnt mips_int5_evcnt = - EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "mips", "int 5 (clock)"); - -static struct evcnt mips_spurint_evcnt = - EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "mips", "spurious interrupts"); -#endif - static u_int32_t iocwrite; /* IOC write register: read-only */ static u_int32_t iocreset; /* IOC reset register: read-only */ -void ip22_bus_reset(void); -int ip22_local0_intr(void); -int ip22_local1_intr(void); -int ip22_mappable_intr(void *); -void ip22_intr(u_int, u_int, u_int, u_int); -void ip22_intr_establish(int, int, int (*)(void *), void *); void ip22_watchdog(int); - -unsigned long ip22_clkread(void); unsigned long ip22_cal_timer(u_int32_t, u_int32_t); /* ip22_cache.S */ @@ -136,18 +116,8 @@ *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd984c) = 0xff; } - platform.iointr = ip22_intr; - platform.bus_reset = ip22_bus_reset; - platform.intr_establish = ip22_intr_establish; platform.watchdog = ip22_watchdog; - /* Hardcode interrupts 7, 11 to mappable interrupt 0,1 handlers */ - intrtab[7].ih_fun = ip22_mappable_intr; - intrtab[7].ih_arg = (void*) 0; - - intrtab[11].ih_fun = ip22_mappable_intr; - intrtab[11].ih_arg = (void*) 1; - /* Prime cache */ ip22_cal_timer(int23addr + 0x3c, int23addr + 0x38); @@ -166,273 +136,17 @@ printf("Timer calibration, got %lu cycles (%lu, %lu, %lu)\n", cps, ctrdiff[0], ctrdiff[1], ctrdiff[2]); - platform.clkread = ip22_clkread; - /* Counter on R4k/R4400/R4600/R5k counts at half the CPU frequency */ curcpu()->ci_cpu_freq = 2 * cps * hz; curcpu()->ci_cycles_per_hz = curcpu()->ci_cpu_freq / (2 * hz); curcpu()->ci_divisor_delay = curcpu()->ci_cpu_freq / (2 * 1000000); MIPS_SET_CI_RECIPRICAL(curcpu()); -#if notyet - evcnt_attach_static(&mips_int5_evcnt); - evcnt_attach_static(&mips_spurint_evcnt); -#endif - printf("CPU clock speed = %lu.%02luMhz\n", curcpu()->ci_cpu_freq / 1000000, (curcpu()->ci_cpu_freq / 10000) % 100); } -void -ip22_bus_reset(void) -{ - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000ec) = 0; - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000fc) = 0; -} - -/* - * NB: Do not re-enable interrupts here -- reentrancy here can cause all - * sorts of Bad Things(tm) to happen, including kernel stack overflows. - */ -void -ip22_intr(status, cause, pc, ipending) - u_int32_t status; - u_int32_t cause; - u_int32_t pc; - u_int32_t ipending; -{ - u_int32_t newcnt; - struct clockframe cf; - - /* Tickle Indy/I2 MC watchdog timer */ - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa00014) = 0; - - if (ipending & MIPS_INT_MASK_5) { - last_clk_intr = mips_rd_count(); - - next_clk_intr += curcpu()->ci_cycles_per_hz; - mips_wr_compare(next_clk_intr); - newcnt = mips_rd_count(); - - /* - * Missed one or more clock interrupts, so let's start - * counting again from the current value. - */ - if ((next_clk_intr - newcnt) & 0x80000000) { - missed_clk_intrs++; - - next_clk_intr = newcnt + curcpu()->ci_cycles_per_hz; - mips_wr_compare(next_clk_intr); - } - - cf.pc = pc; - cf.sr = status; - - hardclock(&cf); -#if notyet - mips_int5_evcnt.ev_count++; -#endif - - cause &= ~MIPS_INT_MASK_5; - } - - if (ipending & MIPS_INT_MASK_0) { - if (ip22_local0_intr()) - cause &= ~MIPS_INT_MASK_0; - } - - if (ipending & MIPS_INT_MASK_1) { - if (ip22_local1_intr()) - cause &= ~MIPS_INT_MASK_1; - } - - if (ipending & MIPS_INT_MASK_4) { - printf("IP22 bus error: cpu_stat %08x addr %08x, " - "gio_stat %08x addr %08x\n", - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000ec), - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000e4), - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000fc), - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000f4)); - ip22_bus_reset(); - cause &= ~MIPS_INT_MASK_4; - } - -#if notyet - if (cause & status & MIPS_HARD_INT_MASK) - mips_spurint_evcnt.ev_count++; -#endif -} - -int -ip22_mappable_intr(void* arg) -{ - int i; - int ret; - int intnum; - u_int32_t mstat; - u_int32_t mmask; - u_int32_t int23addr; - uintptr_t which; - - which = (uintptr_t)arg; - - if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) - int23addr = 0x1fbd9000; - else - int23addr = 0x1fbd9880; - - ret = 0; - mstat = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x10); - mmask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x14 + - (which * 4)); - - mstat &= mmask; - - for (i = 0; i < 8; i++) { - intnum = i + 16 + (which * 8); - if (mstat & (1 << i)) { - if (intrtab[intnum].ih_fun != NULL) - ret |= (intrtab[intnum].ih_fun) - (intrtab[intnum].ih_arg); - else - printf("Unexpected mappable interrupt %d\n", - intnum); - } - } - - return ret; -} - -int -ip22_local0_intr() -{ - int i; - int ret; - u_int32_t l0stat; - u_int32_t l0mask; - u_int32_t int23addr; - - if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) - int23addr = 0x1fbd9000; - else - int23addr = 0x1fbd9880; - - ret = 0; - l0stat = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x00); - l0mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x04); - - l0stat &= l0mask; - - for (i = 0; i < 8; i++) { - if (l0stat & (1 << i)) { - if (intrtab[i].ih_fun != NULL) - ret |= (intrtab[i].ih_fun)(intrtab[i].ih_arg); - else - printf("Unexpected local0 interrupt %d\n", i); - } - } - - return ret; -} - -int -ip22_local1_intr() -{ - int i; - int ret; - u_int32_t l1stat; - u_int32_t l1mask; - u_int32_t int23addr; - - if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) - int23addr = 0x1fbd9000; - else - int23addr = 0x1fbd9880; - - l1stat = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x08); - l1mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x0c); - - l1stat &= l1mask; - - ret = 0; - for (i = 0; i < 8; i++) { - if (l1stat & (1 << i)) { - if (intrtab[8 + i].ih_fun != NULL) - ret |= (intrtab[8 + i].ih_fun) - (intrtab[8 + i].ih_arg); - else - printf("Unexpected local1 interrupt %x\n", - 8 + i ); - } - } - - return ret; -} - -void -ip22_intr_establish(level, ipl, handler, arg) - int level; - int ipl; - int (*handler) __P((void *)); - void *arg; -{ - u_int32_t mask; - u_int32_t int23addr; - - if (level < 0 || level >= NINTR) - panic("invalid interrupt level"); - - if (intrtab[level].ih_fun != NULL) - panic("cannot share CPU interrupts"); - - intrtab[level].ih_fun = handler; - intrtab[level].ih_arg = arg; - - if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) - int23addr = 0x1fbd9000; - else - int23addr = 0x1fbd9880; - - if (level < 8) { - mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x4); - mask |= (1 << level); - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x4) = mask; - } else if (level < 16) { - mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0xc); - mask |= (1 << (level - 8)); - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0xc) = mask; - } else if (level < 24) { - /* Map0 interrupt maps to l0 interrupt bit 7, so turn that on too */ - mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x4); - mask |= (1 << 7); - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x4) = mask; - - mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x14); - mask |= (1 << (level - 16)); - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x14) = mask; - } else { - /* Map1 interrupt maps to l1 interrupt bit 3, so turn that on too */ - mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0xc); - mask |= (1 << 3); - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0xc) = mask; - - mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x18); - mask |= (1 << (level - 24)); - *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x18) = mask; - } -} - -unsigned long -ip22_clkread(void) -{ - uint32_t res, count; - - count = mips_rd_count() - last_clk_intr; - MIPS_COUNT_TO_MHZ(curcpu(), count, res); - return (res); -} - unsigned long ip22_cal_timer(u_int32_t tctrl, u_int32_t tcount) { ==== //depot/projects/mips/sys/mips/sgimips/sysconf.h#3 (text+ko) ==== @@ -56,20 +56,8 @@ struct platform { /* * Platform Specific Function Hooks - * bus_reset - clear memory error condition - * cons_init - console initialization - * iointr - I/O interrupt handler - * intr_establish - establish interrupt handler - * intr_disestablish - disestablish interrupt handler - * clkread - interporate HZ with hi-resolution timer * watchdog - toggle watchdog */ - - void (*bus_reset)(void); - void (*cons_init)(void); - void (*iointr)(unsigned, unsigned, unsigned, unsigned); - void (*intr_establish)(int , int, int (*)(void *), void *); - unsigned long (*clkread) __P((void)); void (*watchdog)(int); }; From owner-p4-projects@FreeBSD.ORG Sat Jun 5 20:53:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9068C16A4D0; Sat, 5 Jun 2004 20:53:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6839816A4CE for ; Sat, 5 Jun 2004 20:53:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 611E843D31 for ; Sat, 5 Jun 2004 20:53:14 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i563rECt014255 for ; Sun, 6 Jun 2004 03:53:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i563rDKq014252 for perforce@freebsd.org; Sun, 6 Jun 2004 03:53:13 GMT (envelope-from scottl@freebsd.org) Date: Sun, 6 Jun 2004 03:53:13 GMT Message-Id: <200406060353.i563rDKq014252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54252 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, 06 Jun 2004 03:53:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=54252 Change 54252 by scottl@scottl-esp-sparc64 on 2004/06/06 03:52:13 set the device description in esp_probe. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#11 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#11 (text+ko) ==== @@ -69,9 +69,6 @@ struct esp_softc { struct ncr53c9x_softc sc_ncr53c9x; /* glue to MI code */ struct device *sc_dev; -#if 0 - struct sbusdev sc_sd; /* sbus device */ -#endif int sc_rid; struct resource *sc_res; @@ -145,8 +142,10 @@ char *name; name = sbus_get_name(dev); - if (strcmp("SUNW,fas", name) == 0) + if (strcmp("SUNW,fas", name) == 0) { + device_set_desc(dev, "Sun FAS366 Fast-Wide SCSI"); return (-10); + } return (ENXIO); } @@ -403,7 +402,6 @@ /* Do the common parts of attachment. */ ncr53c9x_attach(sc); - } /* From owner-p4-projects@FreeBSD.ORG Sat Jun 5 20:53:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6079D16A4D8; Sat, 5 Jun 2004 20:53:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A1EF16A4D3 for ; Sat, 5 Jun 2004 20:53:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 227EA43D1F for ; Sat, 5 Jun 2004 20:53:15 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i563rEvS014262 for ; Sun, 6 Jun 2004 03:53:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i563rEUT014258 for perforce@freebsd.org; Sun, 6 Jun 2004 03:53:14 GMT (envelope-from scottl@freebsd.org) Date: Sun, 6 Jun 2004 03:53:14 GMT Message-Id: <200406060353.i563rEUT014258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54253 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, 06 Jun 2004 03:53:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=54253 Change 54253 by scottl@scottl-esp-sparc64 on 2004/06/06 03:52:58 Use basic #include set, static-ize a bunch of functions, and remove the ioctl handler. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#4 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#4 (text+ko) ==== @@ -77,71 +77,61 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.106 2003/04/16 18:53:50 petrov Exp $"); #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include int ncr53c9x_debug = NCR_SHOWMISC; /*NCR_SHOWPHASE|NCR_SHOWMISC|NCR_SHOWTRAC|NCR_SHOWCMDS;*/ #ifdef DEBUG int ncr53c9x_notag = 0; #endif -/*static*/ void ncr53c9x_readregs(struct ncr53c9x_softc *); -/*static*/ void ncr53c9x_select(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); -/*static*/ int ncr53c9x_reselect(struct ncr53c9x_softc *, int, int, int); -/*static*/ void ncr53c9x_scsi_reset(struct ncr53c9x_softc *); -/*static*/ int ncr53c9x_poll(struct ncr53c9x_softc *, +static void ncr53c9x_select(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); +static int ncr53c9x_reselect(struct ncr53c9x_softc *, int, int, int); +static void ncr53c9x_scsi_reset(struct ncr53c9x_softc *); +static int ncr53c9x_poll(struct ncr53c9x_softc *, struct scsipi_xfer *, int); -/*static*/ void ncr53c9x_sched(struct ncr53c9x_softc *); -/*static*/ void ncr53c9x_done(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); -/*static*/ void ncr53c9x_msgin(struct ncr53c9x_softc *); -/*static*/ void ncr53c9x_msgout(struct ncr53c9x_softc *); -/*static*/ void ncr53c9x_timeout(void *arg); -/*static*/ void ncr53c9x_watch(void *arg); -/*static*/ void ncr53c9x_abort(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); -/*static*/ void ncr53c9x_dequeue(struct ncr53c9x_softc *, +static void ncr53c9x_sched(struct ncr53c9x_softc *); +static void ncr53c9x_done(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); +static void ncr53c9x_msgin(struct ncr53c9x_softc *); +static void ncr53c9x_msgout(struct ncr53c9x_softc *); +static void ncr53c9x_timeout(void *arg); +static void ncr53c9x_watch(void *arg); +static void ncr53c9x_abort(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); +static void ncr53c9x_dequeue(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); -/*static*/ int ncr53c9x_ioctl(struct scsipi_channel *, u_long, - caddr_t, int, struct proc *); +static void ncr53c9x_sense(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); +static void ncr53c9x_free_ecb(struct ncr53c9x_softc *, + struct ncr53c9x_ecb *); +static void ncr53c9x_wrfifo(struct ncr53c9x_softc *, u_char *, int); +static int ncr53c9x_rdfifo(struct ncr53c9x_softc *, int); +static void ncr53c9x_update_xfer_mode(struct ncr53c9x_softc *, int); -void ncr53c9x_sense(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); -void ncr53c9x_free_ecb(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); -struct ncr53c9x_ecb *ncr53c9x_get_ecb(struct ncr53c9x_softc *, int); - -static inline int ncr53c9x_stp2cpb(struct ncr53c9x_softc *, int); -static inline void ncr53c9x_setsync(struct ncr53c9x_softc *, - struct ncr53c9x_tinfo *); -void ncr53c9x_update_xfer_mode (struct ncr53c9x_softc *, int); +static struct ncr53c9x_ecb *ncr53c9x_get_ecb(struct ncr53c9x_softc *, int); static struct ncr53c9x_linfo *ncr53c9x_lunsearch(struct ncr53c9x_tinfo *, int64_t lun); -static void ncr53c9x_wrfifo(struct ncr53c9x_softc *, u_char *, int); +static __inline void ncr53c9x_readregs(struct ncr53c9x_softc *); +static __inline int ncr53c9x_stp2cpb(struct ncr53c9x_softc *, int); +static __inline void ncr53c9x_setsync(struct ncr53c9x_softc *, + struct ncr53c9x_tinfo *); -static int ncr53c9x_rdfifo(struct ncr53c9x_softc *, int); #define NCR_RDFIFO_START 0 #define NCR_RDFIFO_CONTINUE 1 - #define NCR_SET_COUNT(sc, size) do { \ NCR_WRITE_REG((sc), NCR_TCL, (size)); \ NCR_WRITE_REG((sc), NCR_TCM, (size) >> 8); \ @@ -274,7 +264,6 @@ adapt->adapt_nchannels = 1; adapt->adapt_openings = 256; adapt->adapt_max_periph = 256; - adapt->adapt_ioctl = ncr53c9x_ioctl; /* adapt_request initialized by front-end */ /* adapt_minphys initialized by front-end */ @@ -415,7 +404,7 @@ /* * Reset the SCSI bus, but not the chip */ -void +static void ncr53c9x_scsi_reset(sc) struct ncr53c9x_softc *sc; { @@ -532,7 +521,7 @@ * only make sense when he DMA CSR has an interrupt showing. Call only * if an interrupt is pending. */ -__inline__ void +static __inline void ncr53c9x_readregs(sc) struct ncr53c9x_softc *sc; { @@ -564,7 +553,7 @@ /* * Convert Synchronous Transfer Period to chip register Clock Per Byte value. */ -static inline int +static __inline int ncr53c9x_stp2cpb(sc, period) struct ncr53c9x_softc *sc; int period; @@ -577,7 +566,7 @@ return (v); } -static inline void +static __inline void ncr53c9x_setsync(sc, ti) struct ncr53c9x_softc *sc; struct ncr53c9x_tinfo *ti; @@ -630,7 +619,7 @@ * Keeping this as a function allows me to say that this may be done * by DMA instead of programmed I/O soon. */ -void +static void ncr53c9x_select(sc, ecb) struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; @@ -780,7 +769,7 @@ NCRCMD(sc, NCRCMD_SELATN); } -void +static void ncr53c9x_free_ecb(sc, ecb) struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; @@ -794,7 +783,7 @@ return; } -struct ncr53c9x_ecb * +static struct ncr53c9x_ecb * ncr53c9x_get_ecb(sc, flags) struct ncr53c9x_softc *sc; int flags; @@ -948,7 +937,7 @@ splx(s); } -void +static void ncr53c9x_update_xfer_mode(sc, target) struct ncr53c9x_softc *sc; int target; @@ -978,7 +967,7 @@ /* * Used when interrupt driven I/O isn't allowed, e.g. during boot. */ -int +static int ncr53c9x_poll(sc, xs, count) struct ncr53c9x_softc *sc; struct scsipi_xfer *xs; @@ -1008,33 +997,6 @@ return (1); } -int -ncr53c9x_ioctl(chan, cmd, arg, flag, p) - struct scsipi_channel *chan; - u_long cmd; - caddr_t arg; - int flag; - struct proc *p; -{ - struct ncr53c9x_softc *sc = (void *)chan->chan_adapter->adapt_dev; - int s, error = 0; - - switch (cmd) { - case SCBUSIORESET: - s = splbio(); - simple_lock(&sc->sc_lock); - ncr53c9x_init(sc, 1); - simple_unlock(&sc->sc_lock); - splx(s); - break; - default: - error = ENOTTY; - break; - } - return (error); -} - - /* * LOW LEVEL SCSI UTILITIES */ @@ -1045,7 +1007,7 @@ * ncr53c9x_done. This may save us an unecessary interrupt just to get * things going. Should only be called when state == NCR_IDLE and at bio pl. */ -void +static void ncr53c9x_sched(sc) struct ncr53c9x_softc *sc; { @@ -1142,7 +1104,7 @@ } } -void +static void ncr53c9x_sense(sc, ecb) struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; @@ -1185,7 +1147,7 @@ /* * POST PROCESSING OF SCSI_CMD (usually current) */ -void +static void ncr53c9x_done(sc, ecb) struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; @@ -1267,7 +1229,7 @@ simple_lock(&sc->sc_lock); } -void +static void ncr53c9x_dequeue(sc, ecb) struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; @@ -1423,7 +1385,7 @@ } } -int +static int ncr53c9x_reselect(sc, message, tagtype, tagid) struct ncr53c9x_softc *sc; int message; @@ -1534,7 +1496,7 @@ * The SCSI bus must already be in MESSAGE_IN_PHASE and there is a * byte in the FIFO */ -void +static void ncr53c9x_msgin(sc) struct ncr53c9x_softc *sc; { @@ -1888,7 +1850,7 @@ /* * Send the highest priority, scheduled message */ -void +static void ncr53c9x_msgout(sc) struct ncr53c9x_softc *sc; { @@ -2838,7 +2800,7 @@ goto out; } -void +static void ncr53c9x_abort(sc, ecb) struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; @@ -2872,7 +2834,7 @@ } } -void +static void ncr53c9x_timeout(arg) void *arg; { @@ -2930,7 +2892,7 @@ splx(s); } -void +static void ncr53c9x_watch(arg) void *arg; { From owner-p4-projects@FreeBSD.ORG Sat Jun 5 21:12:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E1A316A4D0; Sat, 5 Jun 2004 21:12:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 295DB16A4CE for ; Sat, 5 Jun 2004 21:12:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B75243D1F for ; Sat, 5 Jun 2004 21:12:39 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i564CcuV019514 for ; Sun, 6 Jun 2004 04:12:38 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i564Cccr019511 for perforce@freebsd.org; Sun, 6 Jun 2004 04:12:38 GMT (envelope-from scottl@freebsd.org) Date: Sun, 6 Jun 2004 04:12:38 GMT Message-Id: <200406060412.i564Cccr019511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54254 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, 06 Jun 2004 04:12:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=54254 Change 54254 by scottl@scottl-esp-sparc64 on 2004/06/06 04:11:53 Add a Makefile for esp. Affected files ... .. //depot/projects/scottl-esp/src/sys/modules/esp/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 5 22:22:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10CA816A4D0; Sat, 5 Jun 2004 22:22:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDDB716A4CE for ; Sat, 5 Jun 2004 22:22:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1C3843D31 for ; Sat, 5 Jun 2004 22:22:03 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i565M32v040349 for ; Sun, 6 Jun 2004 05:22:03 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i565M3lH040343 for perforce@freebsd.org; Sun, 6 Jun 2004 05:22:03 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 05:22:03 GMT Message-Id: <200406060522.i565M3lH040343@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 54256 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, 06 Jun 2004 05:22:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=54256 Change 54256 by jmallett@jmallett_oingo on 2004/06/06 05:21:29 Remove code I plan to factor out. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/intr.h#4 edit .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#29 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/intr.h#4 (text+ko) ==== @@ -1,7 +1,5 @@ -/* $NetBSD: intr.h,v 1.12 2002/03/13 13:12:28 simonb Exp $ */ - -/* - * Copyright (c) 2000 Soren S. Jorvang +/*- + * Copyright (c) 2004 Juli Mallett * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,90 +10,27 @@ * 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 for the - * NetBSD Project. See http://www.netbsd.org/ for - * information about NetBSD. - * 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 AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * $P4: //depot/projects/mips/sys/mips/sgimips/intr.h#4 $ */ #ifndef _SGIMIPS_INTR_H_ #define _SGIMIPS_INTR_H_ -#define IPL_NONE 0 /* Disable only this interrupt. */ -#define IPL_BIO 1 /* Disable block I/O interrupts. */ -#define IPL_NET 2 /* Disable network interrupts. */ -#define IPL_TTY 3 /* Disable terminal interrupts. */ -#define IPL_CLOCK 4 /* Disable clock interrupts. */ -#define IPL_STATCLOCK 5 /* Disable profiling interrupts. */ -#ifndef __NO_SOFT_SERIAL_INTERRUPT -#define IPL_SERIAL 6 /* Disable serial hardware interrupts. */ -#endif -#define IPL_HIGH 7 /* Disable all interrupts. */ -#define NIPL 8 +/* + * Nothing to see here. + */ -/* Interrupt sharing types. */ -#define IST_NONE 0 /* none */ -#define IST_PULSE 1 /* pulsed */ -#define IST_EDGE 2 /* edge-triggered */ -#define IST_LEVEL 3 /* level-triggered */ - -/* Soft interrupt numbers */ -#define IPL_SOFTSERIAL 0 /* serial software interrupts */ -#define IPL_SOFTNET 1 /* network software interrupts */ -#define IPL_SOFTCLOCK 2 /* clock software interrupts */ -#define IPL_NSOFT 3 - -#define IPL_SOFTNAMES { \ - "serial", \ - "net", \ - "clock", \ -} - -#ifdef _KERNEL -#ifndef LOCORE - -#include -#include -#include - -#define NINTR 32 - -struct sgimips_intrhand { - LIST_ENTRY(sgimips_intrhand) - ih_q; - int (*ih_fun) __P((void *)); - void *ih_arg; - struct sgimips_intr *ih_intrhead; - int ih_pending; -}; - -struct sgimips_intr { - LIST_HEAD(,sgimips_intrhand) - intr_q; -#if notyet - struct evcnt ih_evcnt; -#endif - unsigned long intr_ipl; -}; - -extern struct sgimips_intrhand intrtab[]; - -#endif /* LOCORE */ -#endif /* !_KERNEL */ - -#endif /* !_SGIMIPS_INTR_H_ */ - +#endif /* _SGIMIPS_INTR_H_ */ ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#29 (text+ko) ==== @@ -65,8 +65,6 @@ struct platform platform; -struct sgimips_intrhand intrtab[NINTR]; - void platform_halt(void) {