From owner-p4-projects@FreeBSD.ORG Sun Jan 4 00:45:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEEE016A4D0; Sun, 4 Jan 2004 00:45:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B398216A4CE for ; Sun, 4 Jan 2004 00:45:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E22143D1D for ; Sun, 4 Jan 2004 00:45:46 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i048jk0B014046 for ; Sun, 4 Jan 2004 00:45:46 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i048jjjJ014043 for perforce@freebsd.org; Sun, 4 Jan 2004 00:45:45 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 00:45:45 -0800 (PST) Message-Id: <200401040845.i048jjjJ014043@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 44757 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, 04 Jan 2004 08:45:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=44757 Change 44757 by jmallett@jmallett_oingo on 2004/01/04 00:45:40 Skeleton platform code to make an SB1 kernel come up into a tight loop. Symbol resolution isn't quite right in the GDB simulator, I'm looking in to it. Affected files ... .. //depot/projects/mips/sys/boot/sbmips/KEEP-ME#1 add .. //depot/projects/mips/sys/conf/files.mips#25 edit .. //depot/projects/mips/sys/conf/kern.sbmips.mk#1 add .. //depot/projects/mips/sys/conf/options.mips#13 edit .. //depot/projects/mips/sys/mips/sbmips/clock.c#1 add .. //depot/projects/mips/sys/mips/sbmips/endian.h#1 add .. //depot/projects/mips/sys/mips/sbmips/machdep_sbmips.c#1 add .. //depot/projects/mips/sys/mips/sbmips/param.h#1 add .. //depot/projects/mips/sys/mips/sbmips/vmparam.h#1 add Differences ... ==== //depot/projects/mips/sys/conf/files.mips#25 (text+ko) ==== @@ -42,6 +42,9 @@ mips/sgimips/clock.c optional sgimips mips/sgimips/machdep_sgimips.c optional sgimips +mips/sbmips/clock.c optional sbmips +mips/sbmips/machdep_sbmips.c optional sbmips + # This stanza is model files, per platform then per model. mips/sgimips/ip22.c optional sgimips ip22 mips/sgimips/ip22_cache.S optional sgimips ip22 ==== //depot/projects/mips/sys/conf/options.mips#13 (text+ko) ==== @@ -8,7 +8,9 @@ R4600 opt_global.h R5000 opt_global.h R10000 opt_global.h +SB1 opt_global.h +SBMIPS opt_platform.h SGIMIPS opt_platform.h _BYTE_ORDER opt_endian.h From owner-p4-projects@FreeBSD.ORG Sun Jan 4 02:11:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9883316A4D0; Sun, 4 Jan 2004 02:11:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5CBB216A4CE for ; Sun, 4 Jan 2004 02:11:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AFF043D54 for ; Sun, 4 Jan 2004 02:11:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i04ABT0B038581 for ; Sun, 4 Jan 2004 02:11:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i04ABT4Y038575 for perforce@freebsd.org; Sun, 4 Jan 2004 02:11:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 02:11:29 -0800 (PST) Message-Id: <200401041011.i04ABT4Y038575@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 44758 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, 04 Jan 2004 10:11:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=44758 Change 44758 by jmallett@jmallett_oingo on 2004/01/04 02:11:15 Simplify, silence warnings now that we can use the right include order in the build. Doesn't seem to change anyting. Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#11 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#11 (text+ko) ==== @@ -60,27 +60,10 @@ /* No mips-tfile. */ #undef ASM_FINAL_SPEC -/* - * Things assembled are horribly broken with the default of using $ as the - * local label prefix, because that isn't what we use, consistently, so we - * need to hardcode '.' - */ +/* Get the local label prefix right for the ABI or things break bad. */ #undef LOCAL_LABEL_PREFIX -#define LOCAL_LABEL_PREFIX "." - -/* - * Use Dwarf2 for FreeBSD/MIPS. - */ -#define DWARF2_DEBUGGING_INFO -#define MIPS_DEBUGGING_INFO -#undef PREFERRED_DEBUGGING_TYPE -#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG - -/* - * Be explicit about the object format we don't want. - */ -#undef OBJECT_FORMAT_COFF - +#define LOCAL_LABEL_PREFIX ((mips_abi == ABI_32 || mips_abi == ABI_O64) \ + ? "$" : ".") /* -G is incompatible with -KPIC which is the default, so only allow objects in the small data section if the user explicitly asks for it. */ From owner-p4-projects@FreeBSD.ORG Sun Jan 4 15:16:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D47616A4D0; Sun, 4 Jan 2004 15:16:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7054E16A4CE for ; Sun, 4 Jan 2004 15:16:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 616DC43D1F for ; Sun, 4 Jan 2004 15:16:46 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i04NGk0B028020 for ; Sun, 4 Jan 2004 15:16:46 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i04NGjnU028017 for perforce@freebsd.org; Sun, 4 Jan 2004 15:16:45 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 15:16:45 -0800 (PST) Message-Id: <200401042316.i04NGjnU028017@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 44777 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, 04 Jan 2004 23:16:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=44777 Change 44777 by jmallett@jmallett_oingo on 2004/01/04 15:16:41 minor diff reduce with alpha, very incomplete. revert change to use xkphys in pmap_map until that's being consistently used, and the arcs code knows how to deal with those addresses. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#26 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#26 (text+ko) ==== @@ -358,7 +358,7 @@ } va = (void *)MIPS_PHYS_TO_KSEG0(m->phys_addr); - if ((m->flags & PG_ZERO) == 0) + if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) bzero(va, PAGE_SIZE); return (va); } @@ -411,7 +411,7 @@ if (initial_pvs < MINPV) initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); uma_prealloc(pvzone, initial_pvs); /* @@ -674,7 +674,10 @@ vm_offset_t pmap_map(vm_offset_t *virt, vm_offset_t start, vm_offset_t end, int prot) { +#if 0 /* XXX notyet, need pmap_extract etc., to love us. */ return MIPS_PHYS_TO_XKPHYS(MIPS_XKPHYS_UC, start); +#endif + return MIPS_PHYS_TO_KSEG0(start); } void @@ -798,7 +801,6 @@ panic("pmap_growkernel to %lx unimplemented\n", addr); } - /*************************************************** * page management routines. ***************************************************/ @@ -892,10 +894,11 @@ pv->pv_pmap = pmap; pv->pv_ptem = mpte; + vm_page_lock_queues(); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; - + vm_page_unlock_queues(); splx(s); } @@ -1525,7 +1528,6 @@ return (TRUE); } - /* * Clear the modify bits on the specified physical page. */ From owner-p4-projects@FreeBSD.ORG Sun Jan 4 16:32:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7770416A4D1; Sun, 4 Jan 2004 16:32:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52FDF16A4CE for ; Sun, 4 Jan 2004 16:32:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3908743D1D for ; Sun, 4 Jan 2004 16:32:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i050WO0B045467 for ; Sun, 4 Jan 2004 16:32:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i050WNwL045464 for perforce@freebsd.org; Sun, 4 Jan 2004 16:32:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 16:32:23 -0800 (PST) Message-Id: <200401050032.i050WNwL045464@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 44788 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, 05 Jan 2004 00:32:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=44788 Change 44788 by jmallett@jmallett_oingo on 2004/01/04 16:31:24 un-if0 something that should be OK now? Affected files ... .. //depot/projects/mips/sys/mips/mips/db_interface.c#11 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/db_interface.c#11 (text+ko) ==== @@ -164,7 +164,6 @@ *(struct frame *)curthread->td_md.md_regs = *f; else { /* Synthetic full scale register context when trap happens */ -#if 0 kdbaux[0] = f->f_regs[S0]; kdbaux[1] = f->f_regs[S1]; kdbaux[2] = f->f_regs[S2]; @@ -176,7 +175,6 @@ kdbaux[8] = f->f_regs[SP]; kdbaux[9] = f->f_regs[S8]; kdbaux[10] = f->f_regs[GP]; -#endif } return (1); From owner-p4-projects@FreeBSD.ORG Sun Jan 4 16:32:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FD5316A4EC; Sun, 4 Jan 2004 16:32:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 731DE16A4CF for ; Sun, 4 Jan 2004 16:32:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F5D743D3F for ; Sun, 4 Jan 2004 16:32:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i050WO0B045473 for ; Sun, 4 Jan 2004 16:32:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i050WO6u045470 for perforce@freebsd.org; Sun, 4 Jan 2004 16:32:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 16:32:24 -0800 (PST) Message-Id: <200401050032.i050WO6u045470@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 44789 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, 05 Jan 2004 00:32:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=44789 Change 44789 by jmallett@jmallett_oingo on 2004/01/04 16:31:46 Clarity. Affected files ... .. //depot/projects/mips/sys/mips/include/pte.h#18 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pte.h#18 (text+ko) ==== @@ -55,16 +55,17 @@ #define MIPS_HI_R_USER (0x00 << MIPS_HI_R_SHIFT) #define MIPS_HI_R_SUPERVISOR (0x01 << MIPS_HI_R_SHIFT) #define MIPS_HI_R_KERNEL (0x03 << MIPS_HI_R_SHIFT) +#define MIPS_HI_R_MASK (0x03 << MIPS_HI_R_SHIFT) #else #define MIPS_HI_R_USER (0x00UL << MIPS_HI_R_SHIFT) #define MIPS_HI_R_SUPERVISOR (0x01UL << MIPS_HI_R_SHIFT) #define MIPS_HI_R_KERNEL (0x03UL << MIPS_HI_R_SHIFT) +#define MIPS_HI_R_MASK (0x03UL << MIPS_HI_R_SHIFT) #endif -#define MIPS_HI_R_MASK (MIPS_HI_R_USER | MIPS_HI_R_SUPERVISOR | MIPS_HI_R_KERNEL) #define MIPS_HI_VA_R(va) ((va) & MIPS_HI_R_MASK) #define MIPS_HI_FILL_SHIFT 40 -#define MIPS_HI_FILL_MASK ((0x800000UL - 1) << MIPS_HI_FILL_SHIFT) -#define MIPS_HI_VA_FILL(va) ((((va) & (1ULL << 63)) != 0 ? MIPS_HI_FILL_MASK : 0)) +#define MIPS_HI_FILL_MASK ((0x7FFFFFUL) << MIPS_HI_FILL_SHIFT) +#define MIPS_HI_VA_FILL(va) ((((va) & (1UL << 63)) != 0 ? MIPS_HI_FILL_MASK : 0)) #define MIPS_HI_VPN2_SHIFT (PAGE_SHIFT + 1) /* XXX VPN2 masking is wrong. Should trim off below VPN2_SHIFT, and from FILL_SHIFT up. */ #ifdef LOCORE From owner-p4-projects@FreeBSD.ORG Sun Jan 4 16:55:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B4F616A4D1; Sun, 4 Jan 2004 16:55:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5523916A4CF for ; Sun, 4 Jan 2004 16:55:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 735DA43D49 for ; Sun, 4 Jan 2004 16:54:53 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i050sr0B055270 for ; Sun, 4 Jan 2004 16:54:53 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i050sqmf055267 for perforce@freebsd.org; Sun, 4 Jan 2004 16:54:52 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sun, 4 Jan 2004 16:54:52 -0800 (PST) Message-Id: <200401050054.i050sqmf055267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44791 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, 05 Jan 2004 00:55:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=44791 Change 44791 by sam@sam_ebb on 2004/01/04 16:54:10 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/db_trace.c#5 integrate .. //depot/projects/netperf/sys/alpha/alpha/machdep.c#9 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/netperf/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/netperf/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/abort.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/arcconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/delay.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/devicename.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/setjmperr.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/lib/time.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/netperf/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/netperf/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/netperf/sys/boot/efi/libefi/devicename.c#2 integrate .. //depot/projects/netperf/sys/boot/efi/libefi/efifpswa.c#2 integrate .. //depot/projects/netperf/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/netperf/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/devicename.c#3 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/netperf/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/netperf/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/netperf/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/netperf/sys/boot/powerpc/loader/start.c#3 integrate .. //depot/projects/netperf/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/netperf/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/netperf/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/netperf/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/netperf/sys/conf/kern.post.mk#7 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dsmthdat.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/netperf/sys/dev/fb/creator.c#3 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/netperf/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/netperf/sys/dev/pccbb/pccbbdevid.h#3 integrate .. //depot/projects/netperf/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/umass.c#7 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs.h#10 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#10 integrate .. //depot/projects/netperf/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/netperf/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/netperf/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/netperf/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/netperf/sys/i386/conf/NOTES#13 integrate .. //depot/projects/netperf/sys/i386/i386/machdep.c#15 integrate .. //depot/projects/netperf/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/netperf/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#23 integrate .. //depot/projects/netperf/sys/kern/kern_fork.c#7 integrate .. //depot/projects/netperf/sys/kern/kern_sig.c#10 integrate .. //depot/projects/netperf/sys/kern/subr_power.c#2 integrate .. //depot/projects/netperf/sys/kern/uipc_mbuf2.c#4 integrate .. //depot/projects/netperf/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/netperf/sys/net/if_vlan.c#8 integrate .. //depot/projects/netperf/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/netperf/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/netperf/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/netperf/sys/netsmb/smb_crypt.c#2 integrate .. //depot/projects/netperf/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/netperf/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/netperf/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/netperf/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/netperf/sys/netsmb/smb_subr.h#3 integrate .. //depot/projects/netperf/sys/pc98/i386/machdep.c#11 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#17 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/netperf/sys/sys/mbuf.h#12 integrate .. //depot/projects/netperf/sys/sys/proc.h#16 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/netperf/sys/vm/device_pager.c#5 integrate .. //depot/projects/netperf/sys/vm/phys_pager.c#3 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#14 integrate .. //depot/projects/netperf/sys/vm/vm_meter.c#2 integrate .. //depot/projects/netperf/sys/vm/vm_object.c#13 integrate .. //depot/projects/netperf/sys/vm/vnode_pager.c#12 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/db_instruction.h#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -25,6 +24,8 @@ * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. + * + * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.6 2004/01/04 23:30:47 obrien Exp $ */ /* ==== //depot/projects/netperf/sys/alpha/alpha/db_trace.c#5 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -42,8 +41,8 @@ */ #include /* RCS ID & Copyright macro defns */ - /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.18 2004/01/04 23:30:47 obrien Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/alpha/machdep.c#9 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.215 2003/11/14 04:04:14 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1163,12 +1163,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); @@ -1263,8 +1263,8 @@ /* save user context */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1287,12 +1287,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe4 *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe4 *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize); @@ -1386,8 +1386,8 @@ /* save user context */ bzero(&sf, sizeof(struct sigframe)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1411,12 +1411,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); @@ -1535,9 +1535,9 @@ * Restore the user-supplied information */ if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif /* @@ -1622,9 +1622,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; @@ -1698,9 +1698,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; ==== //depot/projects/netperf/sys/alpha/osf1/osf1_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.35 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.36 2004/01/03 23:36:31 davidxu Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 @@ -485,11 +485,11 @@ * and the useracc() check will fail if the process has not already * allocated the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); - p->p_sigstk.ss_flags |= SS_ONSTACK; + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); + td->td_sigstk.ss_flags |= SS_ONSTACK; } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); mtx_unlock(&psp->ps_mtx); @@ -588,9 +588,9 @@ */ PROC_LOCK(p); if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; /* * longjmp is still implemented by calling osigreturn. The new ==== //depot/projects/netperf/sys/amd64/amd64/machdep.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.601 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.602 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -246,8 +246,8 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; bcopy(regs, &sf.sf_uc.uc_mcontext.mc_rdi, sizeof(*regs)); @@ -256,12 +256,12 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(struct sigframe); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(struct sigframe); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128; @@ -403,9 +403,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (ucp->uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = ucp->uc_sigmask; ==== //depot/projects/netperf/sys/amd64/ia32/ia32_signal.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.7 2003/12/03 07:00:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.8 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" @@ -194,9 +194,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -220,10 +220,10 @@ sf.sf_uc.uc_mcontext.mc_ss = regs->tf_ss; /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct ia32_sigframe4 *)(p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf)); + sfp = (struct ia32_sigframe4 *)(td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf)); } else sfp = (struct ia32_sigframe4 *)regs->tf_rsp - 1; PROC_UNLOCK(p); @@ -308,9 +308,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -337,10 +337,10 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf); } else sp = (char *)regs->tf_rsp - sizeof(sf); /* Align to 16 bytes. */ ==== //depot/projects/netperf/sys/boot/alpha/common/conf.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include "libalpha/libalpha.h" #ifdef LOADER_NET_SUPPORT ==== //depot/projects/netperf/sys/boot/alpha/common/main.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/common/main.c,v 1.13 2000/10/25 23:36:01 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/main.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/OSFpal.c#2 (text+ko) ==== @@ -1,8 +1,6 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.3 2000/06/03 08:24:37 dfr Exp $ - * From $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ + * $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ */ - /* * Copyright (c) 1994, 1996 Carnegie-Mellon University. * All rights reserved. @@ -30,6 +28,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/alpha_copy.c#2 (text+ko) ==== @@ -22,9 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.5 2000/08/03 09:49:44 jhb Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.6 2004/01/04 23:21:01 obrien Exp $"); + /* * MD primitives supporting placement of module data * ==== //depot/projects/netperf/sys/boot/alpha/libalpha/alpha_module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.3 1999/08/28 00:39:26 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + /* * alpha-specific module functionality. * ==== //depot/projects/netperf/sys/boot/alpha/libalpha/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.13 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.2 1999/08/28 00:39:27 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.4 1999/08/28 00:39:27 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.12 2003/05/01 03:56:28 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/getsecs.c#2 (text+ko) ==== @@ -1,8 +1,10 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.2 1999/08/28 00:39:27 peter Exp $ - * From: $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ + * $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/prom.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.3 1999/08/28 00:39:28 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/reboot.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.2 1999/08/28 00:39:29 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/srmdisk.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.12 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + /* * SRM disk device handling. * @@ -34,7 +35,6 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/srmnet.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.4 1999/09/06 18:32:40 dfr Exp $ - * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ + * $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ */ /* @@ -35,6 +34,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/alpha/libalpha/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.2 1999/08/28 00:39:30 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include /* ==== //depot/projects/netperf/sys/boot/arc/lib/abort.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.2 1999/08/28 00:39:35 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/netperf/sys/boot/arc/lib/arcconsole.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.2 1999/08/28 00:39:36 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include "bootstrap.h" ==== //depot/projects/netperf/sys/boot/arc/lib/arcdisk.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.6 2003/04/16 21:09:41 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.7 2004/01/04 23:28:01 obrien Exp $"); + /* * ARC disk device handling. * @@ -34,12 +35,10 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include - #include #include "bootstrap.h" ==== //depot/projects/netperf/sys/boot/arc/lib/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.6 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf/sys/boot/arc/lib/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.2 1999/08/28 00:39:37 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/netperf/sys/boot/arc/lib/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.3 2003/04/16 21:09:41 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.4 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "bootstrap.h" ==== //depot/projects/netperf/sys/boot/arc/lib/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.4 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf/sys/boot/arc/lib/module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/module.c,v 1.2 1999/08/28 00:39:38 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/module.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + /* * alpha-specific module functionality. * ==== //depot/projects/netperf/sys/boot/arc/lib/prom.c#2 (text+ko) ==== @@ -22,11 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/prom.c,v 1.2 1999/08/28 00:39:38 peter Exp $ - * */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/prom.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #define PROM_E_BOOTED_DEV "XXX1" #define PROM_E_BOOTED_FILE "XXX2" #define PROM_E_BOOTED_OSFLAGS "XXX3" ==== //depot/projects/netperf/sys/boot/arc/lib/setjmperr.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/setjmperr.c,v 1.2 1999/08/28 00:39:39 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/setjmperr.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/netperf/sys/boot/arc/lib/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/time.c,v 1.2 1999/08/28 00:39:39 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/time.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/netperf/sys/boot/arc/loader/conf.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ - * From $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ + * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ /* @@ -34,6 +33,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); #include #include "libarc.h" ==== //depot/projects/netperf/sys/boot/arc/loader/main.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/loader/main.c,v 1.3 1999/08/28 00:39:42 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/loader/main.c,v 1.4 2004/01/04 23:28:01 obrien Exp $"); #include #include ==== //depot/projects/netperf/sys/boot/efi/libefi/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.9 2003/02/20 06:47:54 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf/sys/boot/efi/libefi/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/efi/libefi/devicename.c,v 1.2 2001/09/07 08:49:47 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/devicename.c,v 1.3 2004/01/04 23:28:16 obrien Exp $"); + #include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 4 17:00:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C004D16A4D1; Sun, 4 Jan 2004 17:00:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 835D416A4CF for ; Sun, 4 Jan 2004 17:00:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF34443D2D for ; Sun, 4 Jan 2004 17:00:00 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i051000B055472 for ; Sun, 4 Jan 2004 17:00:00 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i050xxTG055469 for perforce@freebsd.org; Sun, 4 Jan 2004 16:59:59 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sun, 4 Jan 2004 16:59:59 -0800 (PST) Message-Id: <200401050059.i050xxTG055469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44792 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, 05 Jan 2004 01:00:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=44792 Change 44792 by sam@sam_ebb on 2004/01/04 16:59:24 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/abort.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/arcconsole.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/delay.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/devicename.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/setjmperr.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/lib/time.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/efi/libefi/devicename.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/efi/libefi/efifpswa.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/devicename.c#3 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/netperf+sockets/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.post.mk#4 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dsmthdat.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/fb/creator.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/netperf+sockets/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/umass.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#5 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#5 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/netperf+sockets/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/netperf+sockets/sys/i386/conf/NOTES#5 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/netperf+sockets/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_fork.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_sig.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_power.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_mbuf2.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/netperf+sockets/sys/net/if_vlan.c#4 integrate .. //depot/projects/netperf+sockets/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/netperf+sockets/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/netperf+sockets/sys/netsmb/smb_crypt.c#2 integrate .. //depot/projects/netperf+sockets/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/netperf+sockets/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/netperf+sockets/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/netperf+sockets/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/netperf+sockets/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/netperf+sockets/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/pci/if_rl.c#4 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/sys/mbuf.h#6 integrate .. //depot/projects/netperf+sockets/sys/sys/proc.h#4 integrate .. //depot/projects/netperf+sockets/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/netperf+sockets/sys/vm/device_pager.c#2 integrate .. //depot/projects/netperf+sockets/sys/vm/phys_pager.c#2 integrate .. //depot/projects/netperf+sockets/sys/vm/swap_pager.c#5 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_meter.c#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_object.c#5 integrate .. //depot/projects/netperf+sockets/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/alpha/alpha/db_instruction.h#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -25,6 +24,8 @@ * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. + * + * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.6 2004/01/04 23:30:47 obrien Exp $ */ /* ==== //depot/projects/netperf+sockets/sys/alpha/alpha/db_trace.c#4 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -42,8 +41,8 @@ */ #include /* RCS ID & Copyright macro defns */ - /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.18 2004/01/04 23:30:47 obrien Exp $"); #include #include ==== //depot/projects/netperf+sockets/sys/alpha/alpha/machdep.c#3 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.215 2003/11/14 04:04:14 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1163,12 +1163,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); @@ -1263,8 +1263,8 @@ /* save user context */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1287,12 +1287,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe4 *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe4 *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize); @@ -1386,8 +1386,8 @@ /* save user context */ bzero(&sf, sizeof(struct sigframe)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1411,12 +1411,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); @@ -1535,9 +1535,9 @@ * Restore the user-supplied information */ if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif /* @@ -1622,9 +1622,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; @@ -1698,9 +1698,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; ==== //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.35 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.36 2004/01/03 23:36:31 davidxu Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 @@ -485,11 +485,11 @@ * and the useracc() check will fail if the process has not already * allocated the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); - p->p_sigstk.ss_flags |= SS_ONSTACK; + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); + td->td_sigstk.ss_flags |= SS_ONSTACK; } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); mtx_unlock(&psp->ps_mtx); @@ -588,9 +588,9 @@ */ PROC_LOCK(p); if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; /* * longjmp is still implemented by calling osigreturn. The new ==== //depot/projects/netperf+sockets/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.601 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.602 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -246,8 +246,8 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; bcopy(regs, &sf.sf_uc.uc_mcontext.mc_rdi, sizeof(*regs)); @@ -256,12 +256,12 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(struct sigframe); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(struct sigframe); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128; @@ -403,9 +403,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (ucp->uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = ucp->uc_sigmask; ==== //depot/projects/netperf+sockets/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.7 2003/12/03 07:00:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.8 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" @@ -194,9 +194,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -220,10 +220,10 @@ sf.sf_uc.uc_mcontext.mc_ss = regs->tf_ss; /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct ia32_sigframe4 *)(p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf)); + sfp = (struct ia32_sigframe4 *)(td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf)); } else sfp = (struct ia32_sigframe4 *)regs->tf_rsp - 1; PROC_UNLOCK(p); @@ -308,9 +308,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -337,10 +337,10 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf); } else sp = (char *)regs->tf_rsp - sizeof(sf); /* Align to 16 bytes. */ ==== //depot/projects/netperf+sockets/sys/boot/alpha/common/conf.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include "libalpha/libalpha.h" #ifdef LOADER_NET_SUPPORT ==== //depot/projects/netperf+sockets/sys/boot/alpha/common/main.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/common/main.c,v 1.13 2000/10/25 23:36:01 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/main.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/OSFpal.c#2 (text+ko) ==== @@ -1,8 +1,6 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.3 2000/06/03 08:24:37 dfr Exp $ - * From $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ + * $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ */ - /* * Copyright (c) 1994, 1996 Carnegie-Mellon University. * All rights reserved. @@ -30,6 +28,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/alpha_copy.c#2 (text+ko) ==== @@ -22,9 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.5 2000/08/03 09:49:44 jhb Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.6 2004/01/04 23:21:01 obrien Exp $"); + /* * MD primitives supporting placement of module data * ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/alpha_module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.3 1999/08/28 00:39:26 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + /* * alpha-specific module functionality. * ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.13 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.2 1999/08/28 00:39:27 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.4 1999/08/28 00:39:27 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.12 2003/05/01 03:56:28 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/getsecs.c#2 (text+ko) ==== @@ -1,8 +1,10 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.2 1999/08/28 00:39:27 peter Exp $ - * From: $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ + * $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/prom.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.3 1999/08/28 00:39:28 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/reboot.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.2 1999/08/28 00:39:29 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/srmdisk.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.12 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + /* * SRM disk device handling. * @@ -34,7 +35,6 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/srmnet.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.4 1999/09/06 18:32:40 dfr Exp $ - * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ + * $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ */ /* @@ -35,6 +34,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf+sockets/sys/boot/alpha/libalpha/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.2 1999/08/28 00:39:30 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include /* ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/abort.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.2 1999/08/28 00:39:35 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/arcconsole.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.2 1999/08/28 00:39:36 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include "bootstrap.h" ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/arcdisk.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.6 2003/04/16 21:09:41 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.7 2004/01/04 23:28:01 obrien Exp $"); + /* * ARC disk device handling. * @@ -34,12 +35,10 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include - #include #include "bootstrap.h" ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.6 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.2 1999/08/28 00:39:37 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.3 2003/04/16 21:09:41 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.4 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "bootstrap.h" ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.4 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); + #include #include ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/module.c,v 1.2 1999/08/28 00:39:38 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/module.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + /* * alpha-specific module functionality. * ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/prom.c#2 (text+ko) ==== @@ -22,11 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/prom.c,v 1.2 1999/08/28 00:39:38 peter Exp $ - * */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/prom.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #define PROM_E_BOOTED_DEV "XXX1" #define PROM_E_BOOTED_FILE "XXX2" #define PROM_E_BOOTED_OSFLAGS "XXX3" ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/setjmperr.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/setjmperr.c,v 1.2 1999/08/28 00:39:39 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/setjmperr.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/netperf+sockets/sys/boot/arc/lib/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/time.c,v 1.2 1999/08/28 00:39:39 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/time.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/netperf+sockets/sys/boot/arc/loader/conf.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ - * From $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ + * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ /* @@ -34,6 +33,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); #include #include "libarc.h" ==== //depot/projects/netperf+sockets/sys/boot/arc/loader/main.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/loader/main.c,v 1.3 1999/08/28 00:39:42 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/loader/main.c,v 1.4 2004/01/04 23:28:01 obrien Exp $"); #include #include ==== //depot/projects/netperf+sockets/sys/boot/efi/libefi/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.9 2003/02/20 06:47:54 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $"); + #include #include #include ==== //depot/projects/netperf+sockets/sys/boot/efi/libefi/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/efi/libefi/devicename.c,v 1.2 2001/09/07 08:49:47 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/devicename.c,v 1.3 2004/01/04 23:28:16 obrien Exp $"); + #include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 4 17:01:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB30316A4D0; Sun, 4 Jan 2004 17:01:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B611916A4CE for ; Sun, 4 Jan 2004 17:01:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AAB643D5E for ; Sun, 4 Jan 2004 17:01:02 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i051120B055569 for ; Sun, 4 Jan 2004 17:01:02 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i05112YI055566 for perforce@freebsd.org; Sun, 4 Jan 2004 17:01:02 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 17:01:02 -0800 (PST) Message-Id: <200401050101.i05112YI055566@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 44793 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, 05 Jan 2004 01:01:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=44793 Change 44793 by jmallett@jmallett_oingo on 2004/01/04 17:00:32 Remove crap from before I had 64-bit gcc working happy. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#26 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#26 (text+ko) ==== @@ -54,10 +54,5 @@ dev/arcs/arcs_console.c optional arcs libkern/bcmp.c standard -libkern/divdi3.c standard libkern/ffs.c standard -libkern/moddi3.c standard -libkern/qdivrem.c standard nowerror libkern/ucmpdi2.c standard -libkern/udivdi3.c standard -libkern/umoddi3.c standard From owner-p4-projects@FreeBSD.ORG Sun Jan 4 17:29:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1738616A4D0; Sun, 4 Jan 2004 17:29:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBADD16A4CE for ; Sun, 4 Jan 2004 17:29:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFAF943D1D for ; Sun, 4 Jan 2004 17:29:43 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i051Th0B062307 for ; Sun, 4 Jan 2004 17:29:43 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i051TcaU062304 for perforce@freebsd.org; Sun, 4 Jan 2004 17:29:38 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 17:29:38 -0800 (PST) Message-Id: <200401050129.i051TcaU062304@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 44795 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, 05 Jan 2004 01:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=44795 Change 44795 by jmallett@jmallett_oingo on 2004/01/04 17:29:33 IFC. Affected files ... .. //depot/projects/mips/COPYRIGHT#2 integrate .. //depot/projects/mips/bin/rm/rm.c#4 integrate .. //depot/projects/mips/bin/sh/eval.c#3 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsinfo.8#4 integrate .. //depot/projects/mips/contrib/ipfilter/ipmon.c#3 integrate .. //depot/projects/mips/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/mips/contrib/tcp_wrappers/socket.c#2 integrate .. //depot/projects/mips/etc/apmd.conf#2 integrate .. //depot/projects/mips/etc/defaults/rc.conf#15 integrate .. //depot/projects/mips/etc/periodic/daily/150.clean-hoststat#3 integrate .. //depot/projects/mips/etc/rc.d/cron#3 integrate .. //depot/projects/mips/etc/rc.resume#2 integrate .. //depot/projects/mips/etc/rc.suspend#2 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2#7 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2-o#5 integrate .. //depot/projects/mips/games/fortune/datfiles/murphy#4 integrate .. //depot/projects/mips/games/fortune/datfiles/startrek#5 integrate .. //depot/projects/mips/games/fortune/fortune/fortune.c#3 integrate .. //depot/projects/mips/include/paths.h#5 integrate .. //depot/projects/mips/lib/libc/gen/opendir.c#4 integrate .. //depot/projects/mips/lib/libc/sys/sendfile.2#6 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_init.3#3 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_join.c#3 integrate .. //depot/projects/mips/lib/libpthread/man/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_attr.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_equal.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_exit.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_getspecific.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_join.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_key_create.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_key_delete.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_kill.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_init.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_mutexattr.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_once.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlock_wrlock.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_schedparam.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_self.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_setspecific.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_sigmask.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/pthread_testcancel.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sem_destroy.3#3 integrate .. //depot/projects/mips/lib/libpthread/man/sem_getvalue.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sem_init.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sem_post.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sem_wait.3#2 integrate .. //depot/projects/mips/lib/libpthread/man/sigwait.3#2 integrate .. //depot/projects/mips/lib/libpthread/pthread.map#3 integrate .. //depot/projects/mips/lib/libpthread/thread/Makefile.inc#9 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_create.c#6 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_private.h#9 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sig.c#7 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sigaltstack.c#1 branch .. //depot/projects/mips/lib/libthr/thread/thr_create.c#6 integrate .. //depot/projects/mips/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_kern.c#6 integrate .. //depot/projects/mips/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/mips/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/early-adopter/article.sgml#7 integrate .. //depot/projects/mips/release/scripts/mkpkgindex.sh#1 branch .. //depot/projects/mips/sbin/dump/main.c#8 integrate .. //depot/projects/mips/sbin/fsck/fsutil.c#2 integrate .. //depot/projects/mips/sbin/fsck/fsutil.h#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/Makefile#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/check.c#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/dir.c#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/dosfs.h#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/ext.h#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/fsck_msdosfs.8#3 integrate .. //depot/projects/mips/sbin/fsck_msdosfs/main.c#2 integrate .. //depot/projects/mips/sbin/growfs/growfs.8#6 integrate .. //depot/projects/mips/sbin/ip6fw/ip6fw.8#5 integrate .. //depot/projects/mips/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/mips/sbin/mknod/mknod.8#4 integrate .. //depot/projects/mips/share/man/man3/Makefile#2 integrate .. //depot/projects/mips/share/man/man3/pthread.3#3 integrate .. //depot/projects/mips/share/man/man3/pthread_mutex_timedlock.3#1 branch .. //depot/projects/mips/share/man/man4/Makefile#18 integrate .. //depot/projects/mips/share/man/man4/acpi.4#7 integrate .. //depot/projects/mips/share/man/man4/acpi_thermal.4#1 branch .. //depot/projects/mips/share/man/man4/crypto.4#3 integrate .. //depot/projects/mips/share/man/man4/dcons.4#3 integrate .. //depot/projects/mips/share/man/man4/dcons_crom.4#2 integrate .. //depot/projects/mips/share/man/man4/digi.4#2 integrate .. //depot/projects/mips/share/man/man4/ef.4#2 integrate .. //depot/projects/mips/share/man/man4/gdb.4#1 branch .. //depot/projects/mips/share/man/man4/harp.4#2 integrate .. //depot/projects/mips/share/man/man4/mac_stub.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/cx.4#5 integrate .. //depot/projects/mips/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/mips/share/man/man4/matcd.4#2 integrate .. //depot/projects/mips/share/man/man4/meteor.4#2 integrate .. //depot/projects/mips/share/man/man4/miibus.4#6 integrate .. //depot/projects/mips/share/man/man4/ng_atm.4#3 integrate .. //depot/projects/mips/share/man/man4/ng_atmpif.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_sscfu.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_sscop.4#2 integrate .. //depot/projects/mips/share/man/man4/ng_uni.4#2 integrate .. //depot/projects/mips/share/man/man4/rndtest.4#3 integrate .. //depot/projects/mips/share/man/man4/safe.4#2 integrate .. //depot/projects/mips/share/man/man4/ste.4#3 integrate .. //depot/projects/mips/share/man/man4/utopia.4#2 integrate .. //depot/projects/mips/share/man/man4/vinumdebug.4#1 branch .. //depot/projects/mips/share/man/man4/vpo.4#4 integrate .. //depot/projects/mips/share/man/man4/xe.4#3 integrate .. //depot/projects/mips/share/man/man5/devfs.5#3 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/mips/share/man/man7/release.7#11 integrate .. //depot/projects/mips/share/man/man9/mutex.9#6 integrate .. //depot/projects/mips/share/man/man9/sx.9#3 integrate .. //depot/projects/mips/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/mips/share/mk/bsd.obj.mk#2 integrate .. //depot/projects/mips/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/mips/sys/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#14 integrate .. //depot/projects/mips/sys/alpha/alpha/vm_machdep.c#11 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_signal.c#9 integrate .. //depot/projects/mips/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/mips/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/mips/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/mips/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/mips/sys/boot/alpha/common/conf.c#3 integrate .. //depot/projects/mips/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/bootinfo.c#3 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/elf_freebsd.c#3 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/srmdisk.c#3 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/mips/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/mips/sys/boot/arc/lib/abort.c#3 integrate .. //depot/projects/mips/sys/boot/arc/lib/arcconsole.c#3 integrate .. //depot/projects/mips/sys/boot/arc/lib/arcdisk.c#5 integrate .. //depot/projects/mips/sys/boot/arc/lib/bootinfo.c#4 integrate .. //depot/projects/mips/sys/boot/arc/lib/delay.c#3 integrate .. //depot/projects/mips/sys/boot/arc/lib/devicename.c#4 integrate .. //depot/projects/mips/sys/boot/arc/lib/elf_freebsd.c#4 integrate .. //depot/projects/mips/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/mips/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/mips/sys/boot/arc/lib/setjmperr.c#3 integrate .. //depot/projects/mips/sys/boot/arc/lib/time.c#3 integrate .. //depot/projects/mips/sys/boot/arc/loader/conf.c#3 integrate .. //depot/projects/mips/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/bootinfo.c#5 integrate .. //depot/projects/mips/sys/boot/efi/libefi/devicename.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/efifpswa.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/mips/sys/boot/efi/libefi/elf_freebsd.c#5 integrate .. //depot/projects/mips/sys/boot/ofw/common/main.c#4 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/devicename.c#6 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/conf.c#4 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/metadata.c#4 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/start.c#3 integrate .. //depot/projects/mips/sys/boot/sparc64/boot1/boot1.c#4 integrate .. //depot/projects/mips/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/mips/sys/boot/sparc64/loader/metadata.c#6 integrate .. //depot/projects/mips/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/mips/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/mips/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/mips/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/mips/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/mips/sys/conf/Makefile.alpha#4 integrate .. //depot/projects/mips/sys/conf/kern.post.mk#11 integrate .. //depot/projects/mips/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/mips/sys/conf/options.i386#12 integrate .. //depot/projects/mips/sys/conf/options.pc98#12 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/dsmthdat.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/mips/sys/dev/an/if_aironet_ieee.h#4 integrate .. //depot/projects/mips/sys/dev/an/if_an.c#11 integrate .. //depot/projects/mips/sys/dev/an/if_an_isa.c#7 integrate .. //depot/projects/mips/sys/dev/an/if_an_pccard.c#8 integrate .. //depot/projects/mips/sys/dev/an/if_an_pci.c#9 integrate .. //depot/projects/mips/sys/dev/an/if_anreg.h#6 integrate .. //depot/projects/mips/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/mips/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/mips/sys/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/mips/sys/dev/fb/creator.c#3 integrate .. //depot/projects/mips/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/mips/sys/dev/iicbus/if_ic.c#8 integrate .. //depot/projects/mips/sys/dev/ips/ips_commands.c#4 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs#11 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs.h#11 integrate .. //depot/projects/mips/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/mips/sys/dev/pccbb/pccbbdevid.h#5 integrate .. //depot/projects/mips/sys/dev/ppbus/if_plip.c#7 integrate .. //depot/projects/mips/sys/dev/puc/pucdata.c#10 integrate .. //depot/projects/mips/sys/dev/sio/sio_ebus.c#3 integrate .. //depot/projects/mips/sys/dev/sio/sio_isa.c#5 integrate .. //depot/projects/mips/sys/dev/sio/sio_puc.c#4 integrate .. //depot/projects/mips/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/mips/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/mips/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/mips/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/mips/sys/dev/usb/umass.c#13 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#13 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#13 integrate .. //depot/projects/mips/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/mips/sys/dev/usb/uvisor.c#8 integrate .. //depot/projects/mips/sys/dev/usb/uvscom.c#10 integrate .. //depot/projects/mips/sys/dev/wi/if_wi.c#14 integrate .. //depot/projects/mips/sys/dev/wi/if_wi_pccard.c#10 integrate .. //depot/projects/mips/sys/dev/wi/if_wireg.h#5 integrate .. //depot/projects/mips/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/mips/sys/fs/msdosfs/bootsect.h#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/mips/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/mips/sys/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/fat.h#2 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_conv.c#6 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/mips/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/mips/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/mips/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/mips/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/mips/sys/i386/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#16 integrate .. //depot/projects/mips/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#15 integrate .. //depot/projects/mips/sys/i386/linux/linux_sysvec.c#13 integrate .. //depot/projects/mips/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/mips/sys/i386/svr4/svr4_machdep.c#7 integrate .. //depot/projects/mips/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/mips/sys/ia64/ia64/vm_machdep.c#11 integrate .. //depot/projects/mips/sys/kern/kern_descrip.c#14 integrate .. //depot/projects/mips/sys/kern/kern_event.c#9 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#18 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#18 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#15 integrate .. //depot/projects/mips/sys/kern/kern_subr.c#10 integrate .. //depot/projects/mips/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/mips/sys/kern/subr_mbuf.c#12 integrate .. //depot/projects/mips/sys/kern/subr_power.c#3 integrate .. //depot/projects/mips/sys/kern/sys_pipe.c#11 integrate .. //depot/projects/mips/sys/kern/syscalls.master#15 integrate .. //depot/projects/mips/sys/kern/uipc_mbuf2.c#8 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/mips/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/mips/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/mips/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/mips/sys/modules/cam/Makefile#5 integrate .. //depot/projects/mips/sys/modules/raidframe/Makefile#2 integrate .. //depot/projects/mips/sys/modules/sio/Makefile#1 branch .. //depot/projects/mips/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/mips/sys/net/bpf.c#11 integrate .. //depot/projects/mips/sys/net/bpf.h#6 integrate .. //depot/projects/mips/sys/net/if.c#9 integrate .. //depot/projects/mips/sys/net/if_disc.c#7 integrate .. //depot/projects/mips/sys/net/if_ef.c#8 integrate .. //depot/projects/mips/sys/net/if_faith.c#9 integrate .. //depot/projects/mips/sys/net/if_gif.c#8 integrate .. //depot/projects/mips/sys/net/if_gre.c#10 integrate .. //depot/projects/mips/sys/net/if_gre.h#3 integrate .. //depot/projects/mips/sys/net/if_loop.c#10 integrate .. //depot/projects/mips/sys/net/if_stf.c#9 integrate .. //depot/projects/mips/sys/net/if_tun.c#10 integrate .. //depot/projects/mips/sys/net/if_vlan.c#10 integrate .. //depot/projects/mips/sys/net/if_vlan_var.h#7 integrate .. //depot/projects/mips/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/mips/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/mips/sys/netinet/in.c#6 integrate .. //depot/projects/mips/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/mips/sys/netinet/ip_gre.c#6 integrate .. //depot/projects/mips/sys/netinet6/ip6_fw.c#5 integrate .. //depot/projects/mips/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/mips/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/mips/sys/netsmb/smb_crypt.c#5 integrate .. //depot/projects/mips/sys/netsmb/smb_iod.c#6 integrate .. //depot/projects/mips/sys/netsmb/smb_rq.c#6 integrate .. //depot/projects/mips/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/mips/sys/netsmb/smb_smb.c#6 integrate .. //depot/projects/mips/sys/netsmb/smb_subr.h#5 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/mips/sys/pc98/i386/machdep.c#17 integrate .. //depot/projects/mips/sys/pc98/pc98/sio.c#12 integrate .. //depot/projects/mips/sys/pc98/pc98/sio_cbus.c#2 integrate .. //depot/projects/mips/sys/pci/if_rl.c#13 integrate .. //depot/projects/mips/sys/pci/if_sis.c#12 integrate .. //depot/projects/mips/sys/pci/if_sisreg.h#7 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#14 integrate .. //depot/projects/mips/sys/powerpc/powerpc/vm_machdep.c#10 integrate .. //depot/projects/mips/sys/sparc64/pci/psycho.c#13 integrate .. //depot/projects/mips/sys/sparc64/sbus/sbus.c#10 integrate .. //depot/projects/mips/sys/sparc64/sparc64/bus_machdep.c#11 integrate .. //depot/projects/mips/sys/sparc64/sparc64/db_trace.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/dump_machdep.c#6 integrate .. //depot/projects/mips/sys/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/mips/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/vm_machdep.c#12 integrate .. //depot/projects/mips/sys/sys/_null.h#2 integrate .. //depot/projects/mips/sys/sys/copyright.h#3 integrate .. //depot/projects/mips/sys/sys/mbuf.h#13 integrate .. //depot/projects/mips/sys/sys/proc.h#21 integrate .. //depot/projects/mips/sys/sys/sf_buf.h#2 integrate .. //depot/projects/mips/sys/sys/sysproto.h#14 integrate .. //depot/projects/mips/sys/sys/systm.h#9 integrate .. //depot/projects/mips/sys/sys/uio.h#7 integrate .. //depot/projects/mips/sys/sys/vnode.h#11 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/mips/sys/vm/device_pager.c#6 integrate .. //depot/projects/mips/sys/vm/phys_pager.c#4 integrate .. //depot/projects/mips/sys/vm/swap_pager.c#9 integrate .. //depot/projects/mips/sys/vm/vm_fault.c#11 integrate .. //depot/projects/mips/sys/vm/vm_kern.c#6 integrate .. //depot/projects/mips/sys/vm/vm_map.c#16 integrate .. //depot/projects/mips/sys/vm/vm_meter.c#5 integrate .. //depot/projects/mips/sys/vm/vm_object.c#18 integrate .. //depot/projects/mips/sys/vm/vm_page.c#18 integrate .. //depot/projects/mips/sys/vm/vnode_pager.c#13 integrate .. //depot/projects/mips/tools/debugscripts/dot.gdbinit#2 integrate .. //depot/projects/mips/tools/debugscripts/gdbinit.i386#2 integrate .. //depot/projects/mips/tools/debugscripts/gdbinit.kernel#2 integrate .. //depot/projects/mips/tools/debugscripts/gdbinit.vinum#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.birthday#8 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#3 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan#2 integrate .. //depot/projects/mips/usr.bin/netstat/Makefile#3 integrate .. //depot/projects/mips/usr.bin/netstat/mbuf.c#5 integrate .. //depot/projects/mips/usr.bin/netstat/netstat.h#5 integrate .. //depot/projects/mips/usr.bin/sed/sed.1#4 integrate .. //depot/projects/mips/usr.bin/truss/main.c#6 integrate .. //depot/projects/mips/usr.bin/usbhidctl/usbhidctl.1#2 integrate .. //depot/projects/mips/usr.sbin/acpi/acpiconf/acpiconf.8#4 integrate .. //depot/projects/mips/usr.sbin/acpi/acpiconf/acpiconf.c#4 integrate .. //depot/projects/mips/usr.sbin/acpi/acpidump/acpi.c#5 integrate .. //depot/projects/mips/usr.sbin/apmd/apmd.8#4 integrate .. //depot/projects/mips/usr.sbin/burncd/burncd.c#8 integrate .. //depot/projects/mips/usr.sbin/devinfo/devinfo.c#3 integrate .. //depot/projects/mips/usr.sbin/ip6addrctl/ip6addrctl.c#3 integrate .. //depot/projects/mips/usr.sbin/ip6addrctl/ip6addrctl.conf.sample#2 integrate .. //depot/projects/mips/usr.sbin/mergemaster/mergemaster.sh#8 integrate .. //depot/projects/mips/usr.sbin/mountd/exports.5#3 integrate .. //depot/projects/mips/usr.sbin/mrouted/mtrace.c#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf-parse.y#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf-token.l#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf.c#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/ndiscvt.c#2 integrate .. //depot/projects/mips/usr.sbin/ngctl/main.c#3 integrate .. //depot/projects/mips/usr.sbin/pccard/pccardd/pccardd.c#2 integrate .. //depot/projects/mips/usr.sbin/pciconf/pciconf.c#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/mips/usr.sbin/sysinstall/config.c#8 integrate .. //depot/projects/mips/usr.sbin/sysinstall/devices.c#11 integrate .. //depot/projects/mips/usr.sbin/sysinstall/doc.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/mips/usr.sbin/sysinstall/package.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/sysinstall.h#12 integrate Differences ... ==== //depot/projects/mips/COPYRIGHT#2 (text+ko) ==== @@ -1,6 +1,35 @@ -# $FreeBSD: src/COPYRIGHT,v 1.4 1999/09/05 21:33:47 obrien Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.5 2003/12/31 22:35:22 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 +The compilation of software known as FreeBSD is distributed under the +following terms: + +Copyright (C) 1992-2004 The FreeBSD Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +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. + +THIS SOFTWARE IS PROVIDED BY 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 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. + +The 4.4BSD and 4.4BSD-Lite software is distributed under the following +terms: + All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite Releases is copyrighted by The Regents of the University of California. ==== //depot/projects/mips/bin/rm/rm.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.45 2003/11/10 09:40:18 guido Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.46 2004/01/01 10:26:43 kuriyama Exp $"); #include #include @@ -199,8 +199,8 @@ errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno)); case FTS_NS: /* - * FTS_NS: assume that if can't stat the file, it - * can't be unlinked. + * Assume that since fts_read() couldn't stat the + * file, it can't be unlinked. */ if (!needstat) break; @@ -269,6 +269,14 @@ } break; + case FTS_NS: + /* + * Assume that since fts_read() couldn't stat + * the file, it can't be unlinked. + */ + if (fflag) + continue; + /* FALLTHROUGH */ default: if (Pflag) if (!rm_overwrite(p->fts_accpath, NULL)) ==== //depot/projects/mips/bin/sh/eval.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.37 2003/01/21 10:06:04 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.39 2003/12/30 15:39:33 maxim Exp $"); #include #include @@ -205,7 +205,6 @@ case NAND: evaltree(n->nbinary.ch1, EV_TESTED); if (evalskip || exitstatus != 0) { - flags |= EV_TESTED; goto out; } evaltree(n->nbinary.ch2, flags); @@ -246,25 +245,9 @@ break; case NFOR: evalfor(n); - /* - * The 'for' command does not set exitstatus, so the value - * now in exitstatus is from the last command executed in - * the 'for' loop. That exit value had been tested (wrt - * 'sh -e' checking) while processing that command, and - * it should not be re-tested here. - */ - flags |= EV_TESTED; break; case NCASE: evalcase(n, flags); - /* - * The 'case' command does not set exitstatus, so the value - * now in exitstatus is from the last command executed in - * the 'case' block. That exit value had been tested (wrt - * 'sh -e' checking) while processing that command, and - * it should not be re-tested here. - */ - flags |= EV_TESTED; break; case NDEFUN: defun(n->narg.text, n->narg.next); @@ -289,14 +272,8 @@ out: if (pendingsigs) dotrap(); - /* - * XXX - Like "!(n->type == NSEMI)", more types will probably - * need to be excluded from this test. It's probably better - * to set or unset EV_TESTED in the loop above than to bloat - * the conditional here. - */ if ((flags & EV_EXIT) || (eflag && exitstatus - && !(flags & EV_TESTED) && !(n->type == NSEMI))) + && !(flags & EV_TESTED) && (n->type == NCMD))) exitshell(exitstatus); } @@ -711,7 +688,7 @@ * the command runs. Partly deleting like * changepatch() does doesn't seem worth the * bookinging effort, since most such runs add - * diretories in front of the new PATH. + * directories in front of the new PATH. */ clearcmdentry(0); do_clearcmdentry = 1; ==== //depot/projects/mips/contrib/amd/fsinfo/fsinfo.8#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 .\" $Id: fsinfo.8,v 1.3.2.4 2003/03/31 20:09:02 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.8 2003/09/02 15:42:56 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.9 2004/01/04 10:56:22 charnier Exp $ .\" .Dd June 26, 1999 .Dt FSINFO 8 @@ -68,7 +68,7 @@ , .I mount and -.Xr mountd +.Xr mountd 8 configuration files. .Pp The following options are available: ==== //depot/projects/mips/contrib/ipfilter/ipmon.c#3 (text+ko) ==== @@ -70,7 +70,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.12.2.13 2001/07/19 12:24:59 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.16 2003/02/15 06:32:47 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.17 2004/01/02 13:10:47 guido Exp $"; #endif @@ -922,6 +922,7 @@ } #if (SOLARIS || \ (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \ (defined(OpenBSD) && (OpenBSD >= 199603))) || defined(linux) { char ifname[sizeof(ipf->fl_ifname) + 1]; ==== //depot/projects/mips/contrib/pnpinfo/pnpinfo.c#2 (text+ko) ==== @@ -22,12 +22,14 @@ * 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. - * - * $FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.8 2002/08/09 22:04:54 iedowse Exp $ */ +#include +__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.9 2004/01/04 11:11:02 charnier Exp $"); + #include +#include #include #include #include @@ -588,10 +590,8 @@ #ifdef __i386__ /* Hey what about a i386_iopl() call :) */ - if (open("/dev/io", O_RDONLY) < 0) { - fprintf (stderr, "pnpinfo: Can't get I/O privilege.\n"); - exit (1); - } + if (open("/dev/io", O_RDONLY) < 0) + errx(1, "can't get I/O privilege"); #endif #ifdef __alpha__ ioperm(0x203, 0x400 - 0x203, 1); @@ -608,6 +608,7 @@ } if (!num_pnp_devs) { printf("No Plug-n-Play devices were found\n"); - return 0; + return (0); } + return (0); } ==== //depot/projects/mips/contrib/tcp_wrappers/socket.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * - * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.6 2001/07/04 20:16:18 kris Exp $ + * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.7 2003/12/27 14:58:00 ceri Exp $ */ #ifndef lint @@ -114,7 +114,7 @@ return; /* give up */ } #ifdef really_paranoid - memset(buf, 0 sizeof(buf)); + memset(buf, 0, sizeof(buf)); #endif } #ifdef INET6 ==== //depot/projects/mips/etc/apmd.conf#2 (text+ko) ==== @@ -1,10 +1,10 @@ # apmd Configuration File # -# $FreeBSD: src/etc/apmd.conf,v 1.7 2001/08/06 15:52:42 nsayer Exp $ +# $FreeBSD: src/etc/apmd.conf,v 1.9 2003/12/30 17:40:28 njl Exp $ # apm_event SUSPENDREQ { - exec "/etc/rc.suspend"; + exec "/etc/rc.suspend apm suspend"; } apm_event USERSUSPENDREQ { @@ -13,8 +13,12 @@ exec "apm -z"; } -apm_event NORMRESUME, STANDBYRESUME { - exec "/etc/rc.resume"; +apm_event NORMRESUME { + exec "/etc/rc.resume apm suspend"; +} + +apm_event STANDBYRESUME { + exec "/etc/rc.resume apm standby"; } # resume event configuration for serial mouse users by ==== //depot/projects/mips/etc/defaults/rc.conf#15 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.194 2003/12/18 04:39:57 njl Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.195 2003/12/25 23:29:19 babkin Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -398,6 +398,7 @@ cron_enable="YES" # Run the periodic job daemon. cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). +cron_dst="YES" # Handle DST transitions intelligently (YES/NO) cron_flags="" # Which options to pass to the cron daemon. lpd_enable="NO" # Run the line printer daemon. lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one. ==== //depot/projects/mips/etc/periodic/daily/150.clean-hoststat#3 (text+ko) ==== @@ -1,8 +1,8 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.7 2003/01/08 18:51:45 wollman Exp $ +# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.8 2004/01/02 18:50:22 gshapiro Exp $ # -# Remove stale files in /var/spool/.hoststat +# Remove stale persistent host status files # # If there is a global system configuration file, suck it in. @@ -14,13 +14,13 @@ case "$daily_clean_hoststat_enable" in [Yy][Ee][Ss]) - if [ -z "$(sendmail -bh 2>&1)" ]; then + if [ -z "$(hoststat 2>&1)" ]; then rc=2 else echo "" echo "Removing stale entries from sendmail host status cache:" rc=0 - sendmail -bH || rc=1 + purgestat || rc=1 fi;; *) rc=0;; ==== //depot/projects/mips/etc/rc.d/cron#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.4 2003/12/25 23:29:19 babkin Exp $ # # PROVIDE: cron @@ -17,4 +17,8 @@ pidfile="/var/run/${name}.pid" load_rc_config $name +if checkyesno cron_dst +then + cron_flags="$cron_flags -s" +fi run_rc_command "$1" ==== //depot/projects/mips/etc/rc.resume#2 (text+ko) ==== @@ -24,15 +24,23 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.resume,v 1.5 2000/12/17 08:15:57 dougb Exp $ +# $FreeBSD: src/etc/rc.resume,v 1.7 2003/12/30 17:30:39 njl Exp $ # # sample run command file for APM Resume Event +if [ $# -ne 2 ]; then + echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + exit 1 +fi + +subsystem=$1 +state=$2 + if [ -r /var/run/rc.suspend.pid ]; then kill -9 `cat /var/run/rc.suspend.pid` rm -f /var/run/rc.suspend.pid - echo 'rc.suspend is killed' + echo 'rc.resume: killed rc.suspend that was still around' fi # Turns on a power supply of a card in the slot inactivated. @@ -40,7 +48,11 @@ # pccardq | awk -F '~' '$5 == "inactive" \ # { printf("pccardc power %d 1", $1); }' | sh -logger -t apmd resumed at `date +'%Y%m%d %H:%M:%S'` +# UHCI has trouble resuming so we just load/unload it. You +# should add any other kernel modules you want reloaded here. +# kldload usb + +logger -t $subsystem resumed at `date +'%Y%m%d %H:%M:%S'` sync && sync && sync exit 0 ==== //depot/projects/mips/etc/rc.suspend#2 (text+ko) ==== @@ -24,11 +24,19 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.suspend,v 1.4 2000/10/08 19:18:24 obrien Exp $ +# $FreeBSD: src/etc/rc.suspend,v 1.5 2003/12/30 17:28:06 njl Exp $ # # sample run command file for APM Suspend Event +if [ $# -ne 2 ]; then + echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + exit 1 +fi + +subsystem=$1 +state=$2 + if [ -r /var/run/rc.suspend.pid ]; then exit 1 fi @@ -40,11 +48,15 @@ # pccardq | awk -F '~' '$5 == "filled" && $4 ~ /sio/ \ # { printf("pccardc power %d 0", $1); }' | sh -logger -t apmd suspend at `date +'%Y%m%d %H:%M:%S'` +# UHCI has trouble resuming so we just load/unload it. You +# should add any other kernel modules you want unloaded here. +# kldunload usb + +logger -t $subsystem suspend at `date +'%Y%m%d %H:%M:%S'` sync && sync && sync -sleep 3 +[ $subsystem = "apm" ] && sleep 3 rm -f /var/run/rc.suspend.pid -zzz +[ $subsystem = "apm" ] && zzz exit 0 ==== //depot/projects/mips/games/fortune/datfiles/fortunes#12 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.121 2003/12/07 10:03:20 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.122 2003/12/26 21:32:46 schweikh Exp $ % -- Gifts for Children -- @@ -429,7 +429,7 @@ feel interested. "No, you don't understand," the Knight said, looking a little vexed. "That's what the name is called. The name really is, 'The Aged -Aged Man.'" +Man.'" "Then I ought to have said "That's what the song is called'?" Alice corrected herself. "No, you oughtn't: that's quite another thing! The song is @@ -5106,7 +5106,7 @@ below your address label. (d) Then print on your 3x5 card, above your computer-printed name and address the words "CARTER & VAN PEEL SWEEPSTAKES" (Use all capital letters.) (e) Finally place 3x5 card -(without bending) into a plain envelope [NOTE: do NOT use the the +(without bending) into a plain envelope [NOTE: do NOT use the Official Prize Claim and CVP Perfume Reply Envelope or you may be disqualified], and mail to: CVP, Box 1320, Westbury, NY 11595. Print this address correctly. Comply with above instructions carefully and @@ -7877,7 +7877,7 @@ % If you throw a New Year's Party, the worst thing that you can do would be to throw the kind of party where your guests wake up today, and call -you to say they had a nice time. Now you'll be be expected to throw +you to say they had a nice time. Now you'll be expected to throw another party next year. What you should do is throw the kind of party where your guest wake up @@ -9600,7 +9600,7 @@ Manual, n.: A unit of documentation. There are always three or more on a given item. One is on the shelf; someone has the others. The -information you need in in the others. +information you need is in the others. -- Ray Simard % Many years ago in a period commonly know as Next Friday Afternoon, @@ -11913,7 +11913,7 @@ RY THURSDAY DUE TO EMERGENCY COG REPLACEMENT - PLEASE ENSURE RY RY THAT YOUR PROGRAM DOES NOT ATTEMPT TO DIVIDE BY ZERO AS RY RY THIS CAN CAUSE SEVERE DAMAGE (INCLUDING SHAFT BREAKAGES). RY -RY RY +RY RY RYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRYRY . . @@ -15280,7 +15280,7 @@ Well, I would -- if they realized that we -- again if -- if we led them back to that stalemate only because our retaliatory power, our seconds, or strike at them after our first strike, would be so destructive they -they couldn't afford it, that would hold them off. +couldn't afford it, that would hold them off. -- President Ronald Reagan, on the MX missile % "Well, if you can't believe what you read in a comic book, what *___can* ==== //depot/projects/mips/games/fortune/datfiles/fortunes2#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.62 2003/11/10 23:08:39 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.63 2003/12/26 21:32:46 schweikh Exp $ % ======================================================================= || || @@ -630,7 +630,7 @@ After being reported missing a day or two later, rangers found two bears, one a male, one a female, looking suspiciously overstuffed. They killed the female, autopsied her, and sure enough, found the German and the Pole. - "What do you think?" said the the first ranger. + "What do you think?" said the first ranger. "The Czech is in the male," replied the second. % A group of soldiers being prepared for a practice landing on a tropical @@ -2991,7 +2991,7 @@ attacked the men. He continued to trample them until they were nothing but bloody lumps of flesh. Then, strolling away, the elephant remarked, "It just goes to show that you can't depend on first impressions. When I first saw -them I didn't think they they'd be any fun at all." +them I didn't think they'd be any fun at all." % Once upon a time there were three brothers who were knights in a certain kingdom. And, there was a Princess in a neighboring kingdom @@ -3807,7 +3807,7 @@ feel interested. "No, you don't understand," the Knight said, looking a little vexed. "That's what the name is called. The name really is, 'The Aged -Aged Man.'" +Man.'" "Then I ought to have said "That's what the song is called'?" Alice corrected herself. "No, you oughtn't: that's quite another thing! The song is @@ -7686,7 +7686,7 @@ plus the weight of the banana, is one forth as much as the weight of the weight and the weight of the rope. The monkey's mother is half as old as the monkey will be when it is three times as old as its mother was when she -she was half as old as the monkey will be when when it is as old as its mother +was half as old as the monkey will be when it is as old as its mother will be when she is four times as old as the monkey was when it was twice as its mother was when she was one third as old as the monkey was when it was old as is mother was when she was three times as old as the monkey was @@ -14047,7 +14047,7 @@ there, and a "comp" group will propagate your article further.) You may also find it is more fun to post the article once in each group. If you list all the newsgroups in the same article, some newsreaders -will only show the the article to the reader once! Don't tolerate this. +will only show the article to the reader once! Don't tolerate this. -- Emily Postnews Answers Your Questions on Netiquette % Dear Emily: @@ -15180,7 +15180,7 @@ Double Bucky, I'd like a whole word of, Double Bucky, I'm happy I heard of, Double Bucky, I'd like a whole word of you! - -- to Nicholas Wirth, who suggested that an extra bit + -- to Niklaus Wirth, who suggested that an extra bit be added to terminal codes on 36-bit machines for use by screen editors. [to the tune of "Rubber Ducky"] % @@ -16340,7 +16340,7 @@ -- Martin Gardner, "Irving Kristol and the Facts of Life". % Examinations are formidable even to the best prepared, for -even the greatest fool may ask more the the wisest man can answer. +even the greatest fool may ask more than the wisest man can answer. -- C.C. Colton % Example is not the main thing in influencing others. @@ -18376,7 +18376,7 @@ exceptions for which I beg your indulgence. Unfortunately the sum of one shilling and ninepence remains unaccounted for in one infantry battalion's petty cash and there has been a hideous -confusion as the the number of jars of raspberry jam issued to one cavalry +confusion as the number of jars of raspberry jam issued to one cavalry regiment during a sandstorm in western Spain. This reprehensible carelessness may be related to the pressure of circumstance, since we are war with France, a fact which may come as a bit of a surprise to you gentlemen in Whitehall. @@ -24010,7 +24010,7 @@ If at first you don't succeed, try, try again. -- W.E. Hickson % -If at first you don't succeed, try try again. Then quit. +If at first you don't succeed, try again. Then quit. No use being a damn fool about it. % If at first you don't succeed, try, try again. @@ -24643,7 +24643,7 @@ -- Rene de Visme Williamson % >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 4 17:43:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA93F16A4D0; Sun, 4 Jan 2004 17:43:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC38016A4CE for ; Sun, 4 Jan 2004 17:43:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 782FC43D1F for ; Sun, 4 Jan 2004 17:43:00 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i051h00B066186 for ; Sun, 4 Jan 2004 17:43:00 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i051h0BC066183 for perforce@freebsd.org; Sun, 4 Jan 2004 17:43:00 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 17:43:00 -0800 (PST) Message-Id: <200401050143.i051h0BC066183@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 44796 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, 05 Jan 2004 01:43:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=44796 Change 44796 by jmallett@jmallett_oingo on 2004/01/04 17:42:37 Handle page sizing/masking appropriately, along with all the fun bit shifting that goes along with that. Did this on a hunch, due to bad things happening with allocated memory... And now I see SI_SUB_VFS scroll by. Affected files ... .. //depot/projects/mips/sys/mips/include/pte.h#19 edit .. //depot/projects/mips/sys/mips/mips/tlb.c#18 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pte.h#19 (text+ko) ==== @@ -67,13 +67,11 @@ #define MIPS_HI_FILL_MASK ((0x7FFFFFUL) << MIPS_HI_FILL_SHIFT) #define MIPS_HI_VA_FILL(va) ((((va) & (1UL << 63)) != 0 ? MIPS_HI_FILL_MASK : 0)) #define MIPS_HI_VPN2_SHIFT (PAGE_SHIFT + 1) -/* XXX VPN2 masking is wrong. Should trim off below VPN2_SHIFT, and from FILL_SHIFT up. */ #ifdef LOCORE -#define MIPS_HI_VPN2_BMASK 0xFFFFFFF +#define MIPS_HI_VPN2_MASK (((~((1 << MIPS_HI_VPN2_SHIFT) - 1)) << (63 - MIPS_HI_FILL_SHIFT)) >> (63 - MIPS_HI_FILL_SHIFT)) #else -#define MIPS_HI_VPN2_BMASK 0xFFFFFFFUL +#define MIPS_HI_VPN2_MASK (((~((1UL << MIPS_HI_VPN2_SHIFT) - 1)) << (63 - MIPS_HI_FILL_SHIFT)) >> (63 - MIPS_HI_FILL_SHIFT)) #endif -#define MIPS_HI_VPN2_MASK (MIPS_HI_VPN2_BMASK << MIPS_HI_VPN2_SHIFT) #define MIPS_HI_VA_TO_VPN2(va) ((va) & MIPS_HI_VPN2_MASK) #define MIPS_HI_ENTRY(va, asid) ((MIPS_HI_VA_R((va))) /* Region. */ | \ (MIPS_HI_VA_FILL((va))) /* Fill. */ | \ ==== //depot/projects/mips/sys/mips/mips/tlb.c#18 (text+ko) ==== @@ -66,12 +66,32 @@ static int tlb_maxasid = MIPS_TLB_NUM_ASIDS; #endif +/* + * Set up the page size, chop off the low PAGE_SHIFT bits, + * and then shift off the upper bits. + */ +static u_long +tlb_pagemask(vm_size_t pageshift) +{ + u_long pm; + + pm = ~0UL; + pm >>= PAGE_SHIFT + 1; + pm <<= PAGE_SHIFT + 1; + pm <<= 7; + pm >>= 7; + + return (pm); +} + void tlb_bootstrap(vm_size_t pages, vm_offset_t (*ptalloc)(vm_size_t)) { pt_entry_t *pte; vm_size_t i; + mips_wr_pagemask(tlb_pagemask(PAGE_SHIFT)); + /* * Set up KPT. */ @@ -166,6 +186,7 @@ mips_wr_entrylo0(pte0); mips_wr_entrylo1(pte1); mips_wr_entryhi(ehi); + mips_wr_pagemask(tlb_pagemask(PAGE_SHIFT)); if (i < 0) mips_tlbwr(); else From owner-p4-projects@FreeBSD.ORG Sun Jan 4 21:20:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B66AA16A4D5; Sun, 4 Jan 2004 21:20:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F51216A4CE for ; Sun, 4 Jan 2004 21:20:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F16A043D39 for ; Sun, 4 Jan 2004 21:20:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i055KQ0B018960 for ; Sun, 4 Jan 2004 21:20:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i055KQI9018957 for perforce@freebsd.org; Sun, 4 Jan 2004 21:20:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 4 Jan 2004 21:20:26 -0800 (PST) Message-Id: <200401050520.i055KQI9018957@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 44804 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, 05 Jan 2004 05:20:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=44804 Change 44804 by jmallett@jmallett_oingo on 2004/01/04 21:19:53 Or, y'know, I could have had no clue what I was doing and made a mistake due to not reading docs carefully. Affected files ... .. //depot/projects/mips/sys/mips/mips/tlb.c#19 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/tlb.c#19 (text+ko) ==== @@ -66,32 +66,12 @@ static int tlb_maxasid = MIPS_TLB_NUM_ASIDS; #endif -/* - * Set up the page size, chop off the low PAGE_SHIFT bits, - * and then shift off the upper bits. - */ -static u_long -tlb_pagemask(vm_size_t pageshift) -{ - u_long pm; - - pm = ~0UL; - pm >>= PAGE_SHIFT + 1; - pm <<= PAGE_SHIFT + 1; - pm <<= 7; - pm >>= 7; - - return (pm); -} - void tlb_bootstrap(vm_size_t pages, vm_offset_t (*ptalloc)(vm_size_t)) { pt_entry_t *pte; vm_size_t i; - mips_wr_pagemask(tlb_pagemask(PAGE_SHIFT)); - /* * Set up KPT. */ @@ -109,10 +89,11 @@ } /* - * Initialise ASID and clear TLB. + * Initialise ASID and clear TLB and set up for 4K pages. */ mips_wr_entryhi(0); tlb_invalidate_all(); + mips_wr_pagemask(0); /* XXX 4K */ /* * Just one wired TLB entry. @@ -186,7 +167,6 @@ mips_wr_entrylo0(pte0); mips_wr_entrylo1(pte1); mips_wr_entryhi(ehi); - mips_wr_pagemask(tlb_pagemask(PAGE_SHIFT)); if (i < 0) mips_tlbwr(); else From owner-p4-projects@FreeBSD.ORG Sun Jan 4 21:39:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 905DC16A4D0; Sun, 4 Jan 2004 21:39:55 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 687FB16A4CE for ; Sun, 4 Jan 2004 21:39:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98DF043D2F for ; Sun, 4 Jan 2004 21:39:51 -0800 (PST) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i055dp0B022892 for ; Sun, 4 Jan 2004 21:39:51 -0800 (PST) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i055dot3022889 for perforce@freebsd.org; Sun, 4 Jan 2004 21:39:50 -0800 (PST) (envelope-from imp@freebsd.org) Date: Sun, 4 Jan 2004 21:39:50 -0800 (PST) Message-Id: <200401050539.i055dot3022889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 44805 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, 05 Jan 2004 05:39:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=44805 Change 44805 by imp@imp_pacopaco on 2004/01/04 21:39:17 power tree IFC @44803 Affected files ... .. //depot/projects/power/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/power/sys/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/power/sys/alpha/alpha/machdep.c#4 integrate .. //depot/projects/power/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/power/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/power/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/power/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/power/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/abort.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/arcconsole.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/delay.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/devicename.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/setjmperr.c#2 integrate .. //depot/projects/power/sys/boot/arc/lib/time.c#2 integrate .. //depot/projects/power/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/power/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/power/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/power/sys/boot/efi/libefi/devicename.c#2 integrate .. //depot/projects/power/sys/boot/efi/libefi/efifpswa.c#2 integrate .. //depot/projects/power/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/power/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/power/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/power/sys/boot/ofw/libofw/devicename.c#3 integrate .. //depot/projects/power/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/power/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/power/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/power/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/power/sys/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/power/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/power/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/power/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/power/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/power/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/power/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/power/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/power/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/power/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/power/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/power/sys/conf/kern.post.mk#5 integrate .. //depot/projects/power/sys/contrib/dev/acpica/dsmthdat.c#4 integrate .. //depot/projects/power/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/power/sys/dev/fb/creator.c#3 integrate .. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/power/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/power/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/power/sys/dev/pccbb/pccbbdevid.h#3 integrate .. //depot/projects/power/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/power/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/power/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/power/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/power/sys/dev/usb/umass.c#4 integrate .. //depot/projects/power/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/power/sys/dev/usb/usbdevs.h#5 integrate .. //depot/projects/power/sys/dev/usb/usbdevs_data.h#5 integrate .. //depot/projects/power/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/power/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/power/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/power/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/power/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/power/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/power/sys/i386/conf/NOTES#6 integrate .. //depot/projects/power/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/power/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/power/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/power/sys/kern/kern_fork.c#3 integrate .. //depot/projects/power/sys/kern/kern_sig.c#6 integrate .. //depot/projects/power/sys/kern/subr_power.c#2 integrate .. //depot/projects/power/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/power/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/power/sys/net/if_vlan.c#4 integrate .. //depot/projects/power/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/power/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/power/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/power/sys/netsmb/smb_crypt.c#2 integrate .. //depot/projects/power/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/power/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/power/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/power/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/power/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/power/sys/pc98/i386/machdep.c#4 integrate .. //depot/projects/power/sys/pci/if_rl.c#5 integrate .. //depot/projects/power/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/power/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/power/sys/sys/mbuf.h#7 integrate .. //depot/projects/power/sys/sys/proc.h#6 integrate .. //depot/projects/power/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/power/sys/vm/device_pager.c#3 integrate .. //depot/projects/power/sys/vm/phys_pager.c#2 integrate .. //depot/projects/power/sys/vm/swap_pager.c#6 integrate .. //depot/projects/power/sys/vm/vm_meter.c#2 integrate .. //depot/projects/power/sys/vm/vm_object.c#6 integrate .. //depot/projects/power/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/power/sys/alpha/alpha/db_instruction.h#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -25,6 +24,8 @@ * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. + * + * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.6 2004/01/04 23:30:47 obrien Exp $ */ /* ==== //depot/projects/power/sys/alpha/alpha/db_trace.c#4 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -42,8 +41,8 @@ */ #include /* RCS ID & Copyright macro defns */ - /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.18 2004/01/04 23:30:47 obrien Exp $"); #include #include ==== //depot/projects/power/sys/alpha/alpha/machdep.c#4 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.215 2003/11/14 04:04:14 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1163,12 +1163,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); @@ -1263,8 +1263,8 @@ /* save user context */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1287,12 +1287,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe4 *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe4 *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize); @@ -1386,8 +1386,8 @@ /* save user context */ bzero(&sf, sizeof(struct sigframe)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1411,12 +1411,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); @@ -1535,9 +1535,9 @@ * Restore the user-supplied information */ if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif /* @@ -1622,9 +1622,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; @@ -1698,9 +1698,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; ==== //depot/projects/power/sys/alpha/osf1/osf1_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.35 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.36 2004/01/03 23:36:31 davidxu Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 @@ -485,11 +485,11 @@ * and the useracc() check will fail if the process has not already * allocated the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); - p->p_sigstk.ss_flags |= SS_ONSTACK; + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); + td->td_sigstk.ss_flags |= SS_ONSTACK; } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); mtx_unlock(&psp->ps_mtx); @@ -588,9 +588,9 @@ */ PROC_LOCK(p); if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; /* * longjmp is still implemented by calling osigreturn. The new ==== //depot/projects/power/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.601 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.602 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -246,8 +246,8 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; bcopy(regs, &sf.sf_uc.uc_mcontext.mc_rdi, sizeof(*regs)); @@ -256,12 +256,12 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(struct sigframe); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(struct sigframe); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128; @@ -403,9 +403,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (ucp->uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = ucp->uc_sigmask; ==== //depot/projects/power/sys/amd64/ia32/ia32_signal.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.7 2003/12/03 07:00:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.8 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" @@ -194,9 +194,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -220,10 +220,10 @@ sf.sf_uc.uc_mcontext.mc_ss = regs->tf_ss; /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct ia32_sigframe4 *)(p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf)); + sfp = (struct ia32_sigframe4 *)(td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf)); } else sfp = (struct ia32_sigframe4 *)regs->tf_rsp - 1; PROC_UNLOCK(p); @@ -308,9 +308,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -337,10 +337,10 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf); } else sp = (char *)regs->tf_rsp - sizeof(sf); /* Align to 16 bytes. */ ==== //depot/projects/power/sys/boot/alpha/common/conf.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include "libalpha/libalpha.h" #ifdef LOADER_NET_SUPPORT ==== //depot/projects/power/sys/boot/alpha/common/main.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/common/main.c,v 1.13 2000/10/25 23:36:01 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/main.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/OSFpal.c#2 (text+ko) ==== @@ -1,8 +1,6 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.3 2000/06/03 08:24:37 dfr Exp $ - * From $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ + * $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ */ - /* * Copyright (c) 1994, 1996 Carnegie-Mellon University. * All rights reserved. @@ -30,6 +28,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/alpha_copy.c#2 (text+ko) ==== @@ -22,9 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.5 2000/08/03 09:49:44 jhb Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.6 2004/01/04 23:21:01 obrien Exp $"); + /* * MD primitives supporting placement of module data * ==== //depot/projects/power/sys/boot/alpha/libalpha/alpha_module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.3 1999/08/28 00:39:26 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + /* * alpha-specific module functionality. * ==== //depot/projects/power/sys/boot/alpha/libalpha/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.13 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.2 1999/08/28 00:39:27 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.4 1999/08/28 00:39:27 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.12 2003/05/01 03:56:28 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/getsecs.c#2 (text+ko) ==== @@ -1,8 +1,10 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.2 1999/08/28 00:39:27 peter Exp $ - * From: $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ + * $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/prom.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.3 1999/08/28 00:39:28 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/reboot.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.2 1999/08/28 00:39:29 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/srmdisk.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.12 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + /* * SRM disk device handling. * @@ -34,7 +35,6 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include ==== //depot/projects/power/sys/boot/alpha/libalpha/srmnet.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.4 1999/09/06 18:32:40 dfr Exp $ - * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ + * $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ */ /* @@ -35,6 +34,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/power/sys/boot/alpha/libalpha/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.2 1999/08/28 00:39:30 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include /* ==== //depot/projects/power/sys/boot/arc/lib/abort.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.2 1999/08/28 00:39:35 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/power/sys/boot/arc/lib/arcconsole.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.2 1999/08/28 00:39:36 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include "bootstrap.h" ==== //depot/projects/power/sys/boot/arc/lib/arcdisk.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.6 2003/04/16 21:09:41 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.7 2004/01/04 23:28:01 obrien Exp $"); + /* * ARC disk device handling. * @@ -34,12 +35,10 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include - #include #include "bootstrap.h" ==== //depot/projects/power/sys/boot/arc/lib/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.6 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include ==== //depot/projects/power/sys/boot/arc/lib/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.2 1999/08/28 00:39:37 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/power/sys/boot/arc/lib/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.3 2003/04/16 21:09:41 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.4 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "bootstrap.h" ==== //depot/projects/power/sys/boot/arc/lib/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.4 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); + #include #include ==== //depot/projects/power/sys/boot/arc/lib/module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/module.c,v 1.2 1999/08/28 00:39:38 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/module.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + /* * alpha-specific module functionality. * ==== //depot/projects/power/sys/boot/arc/lib/prom.c#2 (text+ko) ==== @@ -22,11 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/prom.c,v 1.2 1999/08/28 00:39:38 peter Exp $ - * */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/prom.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #define PROM_E_BOOTED_DEV "XXX1" #define PROM_E_BOOTED_FILE "XXX2" #define PROM_E_BOOTED_OSFLAGS "XXX3" ==== //depot/projects/power/sys/boot/arc/lib/setjmperr.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/setjmperr.c,v 1.2 1999/08/28 00:39:39 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/setjmperr.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/power/sys/boot/arc/lib/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/time.c,v 1.2 1999/08/28 00:39:39 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/time.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/power/sys/boot/arc/loader/conf.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ - * From $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ + * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ /* @@ -34,6 +33,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); #include #include "libarc.h" ==== //depot/projects/power/sys/boot/arc/loader/main.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/loader/main.c,v 1.3 1999/08/28 00:39:42 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/loader/main.c,v 1.4 2004/01/04 23:28:01 obrien Exp $"); #include #include ==== //depot/projects/power/sys/boot/efi/libefi/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.9 2003/02/20 06:47:54 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $"); + #include #include #include ==== //depot/projects/power/sys/boot/efi/libefi/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/efi/libefi/devicename.c,v 1.2 2001/09/07 08:49:47 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/devicename.c,v 1.3 2004/01/04 23:28:16 obrien Exp $"); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 4 22:04:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4CE016A4D1; Sun, 4 Jan 2004 22:04:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9753C16A4CE for ; Sun, 4 Jan 2004 22:04:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 530C043D46 for ; Sun, 4 Jan 2004 22:04:22 -0800 (PST) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0564M0B029588 for ; Sun, 4 Jan 2004 22:04:22 -0800 (PST) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0564LbR029585 for perforce@freebsd.org; Sun, 4 Jan 2004 22:04:21 -0800 (PST) (envelope-from imp@freebsd.org) Date: Sun, 4 Jan 2004 22:04:21 -0800 (PST) Message-Id: <200401050604.i0564LbR029585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 44806 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, 05 Jan 2004 06:04:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=44806 Change 44806 by imp@imp_pacopaco on 2004/01/04 22:03:23 Integrate from newcard @44803. Affected files ... .. //depot/projects/power/sys/dev/firewire/00README#2 integrate .. //depot/projects/power/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/power/sys/dev/firewire/firewire.h#4 integrate .. //depot/projects/power/sys/dev/firewire/firewire_phy.h#2 integrate .. //depot/projects/power/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/power/sys/dev/firewire/fwcrom.c#3 integrate .. //depot/projects/power/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/power/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/power/sys/dev/firewire/fwdma.h#2 integrate .. //depot/projects/power/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/power/sys/dev/firewire/fwmem.h#3 integrate .. //depot/projects/power/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/power/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/power/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/power/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/power/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/power/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/power/sys/dev/firewire/iec68113.h#2 integrate .. //depot/projects/power/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/power/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/power/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/power/sys/dev/firewire/sbp.h#4 integrate .. //depot/projects/power/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/power/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/power/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/power/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/power/sys/dev/fxp/rcvbundl.h#2 integrate .. //depot/projects/power/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/power/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/power/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/power/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/power/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/power/sys/dev/pccbb/pccbbdevid.h#4 integrate .. //depot/projects/power/sys/dev/pci/pci.c#8 integrate .. //depot/projects/power/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/power/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/power/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/power/sys/dev/txp/3c990img.h#2 integrate .. //depot/projects/power/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/power/sys/dev/txp/if_txpreg.h#2 integrate .. //depot/projects/power/sys/pci/agp.c#4 integrate .. //depot/projects/power/sys/pci/agp_ali.c#3 integrate .. //depot/projects/power/sys/pci/agp_amd.c#2 integrate .. //depot/projects/power/sys/pci/agp_i810.c#4 integrate .. //depot/projects/power/sys/pci/agp_if.m#2 integrate .. //depot/projects/power/sys/pci/agp_intel.c#3 integrate .. //depot/projects/power/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/power/sys/pci/agp_sis.c#2 integrate .. //depot/projects/power/sys/pci/agp_via.c#2 integrate .. //depot/projects/power/sys/pci/agppriv.h#2 integrate .. //depot/projects/power/sys/pci/agpreg.h#2 integrate .. //depot/projects/power/sys/pci/agpvar.h#2 integrate .. //depot/projects/power/sys/pci/alpm.c#2 integrate .. //depot/projects/power/sys/pci/amdpm.c#2 integrate .. //depot/projects/power/sys/pci/dc21040reg.h#2 integrate .. //depot/projects/power/sys/pci/if_dc.c#7 integrate .. //depot/projects/power/sys/pci/if_dcreg.h#5 integrate .. //depot/projects/power/sys/pci/if_de.c#3 integrate .. //depot/projects/power/sys/pci/if_devar.h#3 integrate .. //depot/projects/power/sys/pci/if_mn.c#2 integrate .. //depot/projects/power/sys/pci/if_pcn.c#4 integrate .. //depot/projects/power/sys/pci/if_pcnreg.h#3 integrate .. //depot/projects/power/sys/pci/if_rl.c#6 integrate .. //depot/projects/power/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/power/sys/pci/if_sf.c#4 integrate .. //depot/projects/power/sys/pci/if_sfreg.h#3 integrate .. //depot/projects/power/sys/pci/if_sis.c#6 integrate .. //depot/projects/power/sys/pci/if_sisreg.h#4 integrate .. //depot/projects/power/sys/pci/if_sk.c#6 integrate .. //depot/projects/power/sys/pci/if_skreg.h#4 integrate .. //depot/projects/power/sys/pci/if_ste.c#4 integrate .. //depot/projects/power/sys/pci/if_stereg.h#3 integrate .. //depot/projects/power/sys/pci/if_ti.c#4 integrate .. //depot/projects/power/sys/pci/if_tireg.h#3 integrate .. //depot/projects/power/sys/pci/if_tl.c#4 integrate .. //depot/projects/power/sys/pci/if_tlreg.h#3 integrate .. //depot/projects/power/sys/pci/if_vr.c#4 integrate .. //depot/projects/power/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/power/sys/pci/if_wb.c#4 integrate .. //depot/projects/power/sys/pci/if_wbreg.h#3 integrate .. //depot/projects/power/sys/pci/if_xl.c#6 integrate .. //depot/projects/power/sys/pci/if_xlreg.h#4 integrate .. //depot/projects/power/sys/pci/intpm.c#2 integrate .. //depot/projects/power/sys/pci/intpmreg.h#2 integrate .. //depot/projects/power/sys/pci/locate.pl#2 integrate .. //depot/projects/power/sys/pci/ncr.c#2 integrate .. //depot/projects/power/sys/pci/ncrreg.h#2 integrate .. //depot/projects/power/sys/pci/ti_fw.h#2 integrate .. //depot/projects/power/sys/pci/ti_fw2.h#2 integrate .. //depot/projects/power/sys/pci/viapm.c#2 integrate .. //depot/projects/power/sys/pci/xmaciireg.h#2 integrate .. //depot/projects/power/sys/pci/xrpu.c#3 integrate .. //depot/projects/power/sys/pci/yukonreg.h#2 integrate Differences ... ==== //depot/projects/power/sys/dev/firewire/00README#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/firewire.c#5 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/firewire.h#4 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/firewire_phy.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/firewirereg.h#4 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwcrom.c#3 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwdev.c#5 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwdma.c#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwdma.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwmem.c#5 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwmem.h#3 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwohci.c#5 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwohci_pci.c#5 (text+ko) ==== @@ -418,11 +418,6 @@ { fwohci_softc_t *sc = device_get_softc(dev); -#ifndef BURN_BRIDGES - device_printf(dev, "fwohci_pci_resume: power_state = 0x%08x\n", - pci_get_powerstate(dev)); - pci_set_powerstate(dev, PCI_POWERSTATE_D0); -#endif fwohci_pci_init(dev); fwohci_resume(sc, dev); return 0; ==== //depot/projects/power/sys/dev/firewire/fwohcireg.h#3 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwohcivar.h#3 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwphyreg.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/iec13213.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/iec68113.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/if_fwe.c#4 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/if_fwevar.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/sbp.c#4 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/sbp.h#4 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/sbp_targ.c#4 (text+ko) ==== ==== //depot/projects/power/sys/dev/fxp/if_fxp.c#5 (text+ko) ==== @@ -211,9 +211,6 @@ static void fxp_init(void *xsc); static void fxp_init_body(struct fxp_softc *sc); static void fxp_tick(void *xsc); -#ifndef BURN_BRIDGES -static void fxp_powerstate_d0(device_t dev); -#endif static void fxp_start(struct ifnet *ifp); static void fxp_start_body(struct ifnet *ifp); static void fxp_stop(struct fxp_softc *sc); @@ -358,34 +355,6 @@ return (ENXIO); } -#ifndef BURN_BRIDGES -static void -fxp_powerstate_d0(device_t dev) -{ -#if __FreeBSD_version >= 430002 - u_int32_t iobase, membase, irq; - - if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { - /* Save important PCI config data. */ - iobase = pci_read_config(dev, FXP_PCI_IOBA, 4); - membase = pci_read_config(dev, FXP_PCI_MMBA, 4); - irq = pci_read_config(dev, PCIR_INTLINE, 4); - - /* Reset the power state. */ - device_printf(dev, "chip is in D%d power mode " - "-- setting to D0\n", pci_get_powerstate(dev)); - - pci_set_powerstate(dev, PCI_POWERSTATE_D0); - - /* Restore PCI config data. */ - pci_write_config(dev, FXP_PCI_IOBA, iobase, 4); - pci_write_config(dev, FXP_PCI_MMBA, membase, 4); - pci_write_config(dev, PCIR_INTLINE, irq, 4); - } -#endif -} -#endif - static void fxp_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nseg, int error) { @@ -426,9 +395,7 @@ */ pci_enable_busmaster(dev); val = pci_read_config(dev, PCIR_COMMAND, 2); -#ifndef BURN_BRIDGES - fxp_powerstate_d0(dev); -#endif + /* * Figure out which we should try first - memory mapping or i/o mapping? * We default to memory mapping. Then we accept an override from the @@ -1021,9 +988,7 @@ FXP_LOCK(sc); s = splimp(); -#ifndef BURN_BRIDGES - fxp_powerstate_d0(dev); -#endif + /* better way to do this? */ for (i = 0; i < 5; i++) pci_write_config(dev, PCIR_BAR(i), sc->saved_maps[i], 4); @@ -1554,6 +1519,9 @@ struct ifnet *ifp = &sc->sc_if; u_int8_t statack; + if (sc->gone) + return; + FXP_LOCK(sc); if (sc->suspended) { FXP_UNLOCK(sc); ==== //depot/projects/power/sys/dev/fxp/if_fxpreg.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/fxp/if_fxpvar.h#3 (text+ko) ==== @@ -189,6 +189,7 @@ int cu_resume_bug; int revision; int flags; + int gone; u_int32_t saved_maps[5]; /* pci data */ u_int32_t saved_biosaddr; u_int8_t saved_intline; ==== //depot/projects/power/sys/dev/fxp/rcvbundl.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/lge/if_lge.c#4 (text+ko) ==== @@ -498,30 +498,7 @@ sc = device_get_softc(dev); unit = device_get_unit(dev); bzero(sc, sizeof(struct lge_softc)); -#ifndef BURN_BRIDGES - /* - * Handle power management nonsense. - */ - if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { - u_int32_t iobase, membase, irq; - /* Save important PCI config data. */ - iobase = pci_read_config(dev, LGE_PCI_LOIO, 4); - membase = pci_read_config(dev, LGE_PCI_LOMEM, 4); - irq = pci_read_config(dev, LGE_PCI_INTLINE, 4); - - /* Reset the power state. */ - printf("lge%d: chip is in D%d power mode " - "-- setting to D0\n", unit, - pci_get_powerstate(dev)); - pci_set_powerstate(dev, PCI_POWERSTATE_D0); - - /* Restore PCI config data. */ - pci_write_config(dev, LGE_PCI_LOIO, iobase, 4); - pci_write_config(dev, LGE_PCI_LOMEM, membase, 4); - pci_write_config(dev, LGE_PCI_INTLINE, irq, 4); - } -#endif /* * Map control/status registers. */ ==== //depot/projects/power/sys/dev/lge/if_lgereg.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/nge/if_nge.c#4 (text+ko) ==== @@ -832,30 +832,7 @@ mtx_init(&sc->nge_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#ifndef BURN_BRIDGES - /* - * Handle power management nonsense. - */ - if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { - u_int32_t iobase, membase, irq; - /* Save important PCI config data. */ - iobase = pci_read_config(dev, NGE_PCI_LOIO, 4); - membase = pci_read_config(dev, NGE_PCI_LOMEM, 4); - irq = pci_read_config(dev, NGE_PCI_INTLINE, 4); - - /* Reset the power state. */ - printf("nge%d: chip is in D%d power mode " - "-- setting to D0\n", unit, - pci_get_powerstate(dev)); - pci_set_powerstate(dev, PCI_POWERSTATE_D0); - - /* Restore PCI config data. */ - pci_write_config(dev, NGE_PCI_LOIO, iobase, 4); - pci_write_config(dev, NGE_PCI_LOMEM, membase, 4); - pci_write_config(dev, NGE_PCI_INTLINE, irq, 4); - } -#endif /* * Map control/status registers. */ ==== //depot/projects/power/sys/dev/nge/if_ngereg.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pccbb/pccbb.c#7 (text+ko) ==== @@ -640,6 +640,10 @@ } #ifndef BURN_BRIDGES +/* + * Still need this because the pci code only does power for type 0 + * header devices. + */ static void cbb_powerstate_d0(device_t dev) { ==== //depot/projects/power/sys/dev/pccbb/pccbbdevid.h#4 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/pci.c#8 (text+ko) ==== @@ -1704,6 +1704,7 @@ pci_set_powerstate(dev, PCI_POWERSTATE_D0); for (i = 0; i < dinfo->cfg.nummaps; i++) pci_write_config(dev, PCIR_MAPS + i * 4, dinfo->cfg.bar[i], 4); + pci_write_config(dev, PCIR_BIOS, dinfo->cfg.bios, 4); pci_write_config(dev, PCIR_COMMAND, dinfo->cfg.cmdreg, 2); pci_write_config(dev, PCIR_INTLINE, dinfo->cfg.intline, 1); pci_write_config(dev, PCIR_INTPIN, dinfo->cfg.intpin, 1); @@ -1730,6 +1731,7 @@ return; for (i = 0; i < dinfo->cfg.nummaps; i++) dinfo->cfg.bar[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4); + dinfo->cfg.bios = pci_read_config(dev, PCIR_BIOS, 4); /* * Some drivers apparently write to these registers w/o ==== //depot/projects/power/sys/dev/pci/pci_pci.c#5 (text+ko) ==== @@ -92,18 +92,6 @@ DRIVER_MODULE(pcib, pci, pcib_driver, pcib_devclass, 0, 0); /* - * sysctl and tunable vars - */ -static int pci_allow_unsupported_io_range = 0; -TUNABLE_INT("hw.pci.allow_unsupported_io_range", - (int *)&pci_allow_unsupported_io_range); -SYSCTL_DECL(_hw_pci); -SYSCTL_INT(_hw_pci, OID_AUTO, allow_unsupported_io_range, CTLFLAG_RDTUN, - &pci_allow_unsupported_io_range, 0, - "Allows the PCI Bridge to pass through an unsupported memory range " - "assigned by the BIOS."); - -/* * Generic device interface */ static int @@ -173,7 +161,7 @@ * Quirk handling. */ switch (pci_get_devid(dev)) { - case 0x12258086: /* Intel 82454KX/GX (Orion) */ + case 0x12258086: /* Intel 82454KX/GX (Orion) */ { uint8_t supbus; @@ -182,16 +170,42 @@ sc->secbus = supbus + 1; sc->subbus = supbus + 1; } + break; } + + /* + * The i82380FB mobile docking controller is a PCI-PCI bridge, + * and it is a subtractive bridge. However, the ProgIf is wrong + * so the normal setting of PCIB_SUBTRACTIVE bit doesn't + * happen. There's also a Toshiba bridge that behaves this + * way. + */ + case 0x124b8086: /* Intel 82380FB Mobile */ + case 0x060513d7: /* Toshiba ???? */ + sc->flags |= PCIB_SUBTRACTIVE; break; } + /* + * Intel 815, 845 and other chipsets say they are PCI-PCI bridges, + * but have a ProgIF of 0x80. The 82801 family (AA, AB, BAM/CAM, + * BA/CA/DB and E) PCI bridges are HUB-PCI bridges, in Intelese. + * This means they act as if they were subtractively decoding + * bridges and pass all transactions. Mark them and real ProgIf 1 + * parts as subtractive. + */ + if ((pci_get_devid(dev) & 0xff00ffff) == 0x24008086 || + pci_read_config(dev, PCIR_PROGIF, 1) == 1) + sc->flags |= PCIB_SUBTRACTIVE; + if (bootverbose) { device_printf(dev, " secondary bus %d\n", sc->secbus); device_printf(dev, " subordinate bus %d\n", sc->subbus); device_printf(dev, " I/O decode 0x%x-0x%x\n", sc->iobase, sc->iolimit); device_printf(dev, " memory decode 0x%x-0x%x\n", sc->membase, sc->memlimit); device_printf(dev, " prefetched decode 0x%x-0x%x\n", sc->pmembase, sc->pmemlimit); + if (sc->flags & PCIB_SUBTRACTIVE) + device_printf(dev, " Subtractively decoded bridge.\n"); } /* @@ -252,37 +266,12 @@ } /* - * Is this a decoded ISA I/O port address? Note, we need to do the mask that - * we do below because of the ISA alias addresses. I'm not 100% sure that - * this is correct. Maybe the bridge needs to be subtractive decode for - * this to work? - */ -static int -pcib_is_isa_io(u_long start) -{ - if ((start & 0xfffUL) > 0x3ffUL || start == 0) - return (0); - return (1); -} - -/* - * Is this a decoded ISA memory address? - */ -static int -pcib_is_isa_mem(u_long start) -{ - if (start > 0xfffffUL || start == 0) - return (0); - return (1); -} - -/* * Is the prefetch window open (eg, can we allocate memory in it?) */ static int pcib_is_prefetch_open(struct pcib_softc *sc) { - return (sc->pmembase > 0 && sc->pmembase < sc->pmemlimit); + return (sc->pmembase > 0 && sc->pmembase < sc->pmemlimit); } /* @@ -291,7 +280,7 @@ static int pcib_is_nonprefetch_open(struct pcib_softc *sc) { - return (sc->membase > 0 && sc->membase < sc->memlimit); + return (sc->membase > 0 && sc->membase < sc->memlimit); } /* @@ -300,7 +289,7 @@ static int pcib_is_io_open(struct pcib_softc *sc) { - return (sc->iobase > 0 && sc->iobase < sc->iolimit); + return (sc->iobase > 0 && sc->iobase < sc->iolimit); } /* @@ -319,116 +308,105 @@ */ switch (type) { case SYS_RES_IOPORT: - ok = 1; - if (!pcib_is_isa_io(start)) { - ok = 0; - if (pcib_is_io_open(sc)) - ok = (start >= sc->iobase && end <= sc->iolimit); - if (!pci_allow_unsupported_io_range) { - if (!ok) { - if (start < sc->iobase) - start = sc->iobase; - if (end > sc->iolimit) - end = sc->iolimit; - } - } else { + ok = 0; + if (!pcib_is_io_open(sc)) + break; + ok = (start >= sc->iobase && end <= sc->iolimit); + if ((sc->flags & PCIB_SUBTRACTIVE) == 0) { + if (!ok) { if (start < sc->iobase) - printf("start (%lx) < sc->iobase (%x)\n", start, - sc->iobase); + start = sc->iobase; if (end > sc->iolimit) - printf("end (%lx) > sc->iolimit (%x)\n", - end, sc->iolimit); - if (end < start) - printf("end (%lx) < start (%lx)\n", end, start); + end = sc->iolimit; + } + } else { + ok = 1; + if (start < sc->iobase && end > sc->iolimit) { + start = sc->iobase; + end = sc->iolimit; } + } if (end < start) { + device_printf(dev, "ioport: end (%lx) < start (%lx)\n", end, start); start = 0; end = 0; ok = 0; } if (!ok) { - device_printf(dev, "device %s%d requested unsupported I/O " + device_printf(dev, "device %s requested unsupported I/O " "range 0x%lx-0x%lx (decoding 0x%x-0x%x)\n", - device_get_name(child), device_get_unit(child), start, end, + device_get_nameunit(child), start, end, sc->iobase, sc->iolimit); return (NULL); } if (bootverbose) - device_printf(sc->dev, "device %s%d requested decoded I/O range 0x%lx-0x%lx\n", - device_get_name(child), device_get_unit(child), start, end); + device_printf(dev, "device %s requested decoded I/O range 0x%lx-0x%lx\n", + device_get_nameunit(child), start, end); break; case SYS_RES_MEMORY: - ok = 1; - if (!pcib_is_isa_mem(start)) { - ok = 0; - if (pcib_is_nonprefetch_open(sc)) - ok = ok || (start >= sc->membase && end <= sc->memlimit); - if (pcib_is_prefetch_open(sc)) - ok = ok || (start >= sc->pmembase && end <= sc->pmemlimit); - if (!pci_allow_unsupported_io_range) { - if (!ok) { - ok = 1; - if (flags & RF_PREFETCHABLE) { - if (pcib_is_prefetch_open(sc)) { - if (start < sc->pmembase) - start = sc->pmembase; - if (end > sc->pmemlimit) - end = sc->pmemlimit; - } else { - ok = 0; - } - } else { /* non-prefetchable */ - if (pcib_is_nonprefetch_open(sc)) { - if (start < sc->membase) - start = sc->membase; - if (end > sc->memlimit) - end = sc->memlimit; - } else { - ok = 0; - } + ok = 0; + if (pcib_is_nonprefetch_open(sc)) + ok = ok || (start >= sc->membase && end <= sc->memlimit); + if (pcib_is_prefetch_open(sc)) + ok = ok || (start >= sc->pmembase && end <= sc->pmemlimit); + if ((sc->flags & PCIB_SUBTRACTIVE) == 0) { + if (!ok) { + ok = 1; + if (flags & RF_PREFETCHABLE) { + if (pcib_is_prefetch_open(sc)) { + if (start < sc->pmembase) + start = sc->pmembase; + if (end > sc->pmemlimit) + end = sc->pmemlimit; + } else { + ok = 0; + } + } else { /* non-prefetchable */ + if (pcib_is_nonprefetch_open(sc)) { + if (start < sc->membase) + start = sc->membase; + if (end > sc->memlimit) + end = sc->memlimit; + } else { + ok = 0; } } - } else if (!ok) { - ok = 1; /* pci_allow_unsupported_ranges -> always ok */ - if (pcib_is_nonprefetch_open(sc)) { - if (start < sc->membase) - printf("start (%lx) < sc->membase (%x)\n", - start, sc->membase); - if (end > sc->memlimit) - printf("end (%lx) > sc->memlimit (%x)\n", - end, sc->memlimit); + } + } else if (!ok) { + ok = 1; /* subtractive bridge: always ok */ + if (pcib_is_nonprefetch_open(sc)) { + if (start < sc->membase && end > sc->memlimit) { + start = sc->membase; + end = sc->memlimit; } - if (pcib_is_prefetch_open(sc)) { - if (start < sc->pmembase) - printf("start (%lx) < sc->pmembase (%x)\n", - start, sc->pmembase); - if (end > sc->pmemlimit) - printf("end (%lx) > sc->pmemlimit (%x)\n", - end, sc->memlimit); + } + if (pcib_is_prefetch_open(sc)) { + if (start < sc->pmembase && end > sc->pmemlimit) { + start = sc->pmembase; + end = sc->pmemlimit; } - if (end < start) - printf("end (%lx) < start (%lx)\n", end, start); } } if (end < start) { + device_printf(dev, "memory: end (%lx) < start (%lx)\n", end, start); start = 0; end = 0; ok = 0; } if (!ok && bootverbose) device_printf(dev, - "device %s%d requested unsupported memory range " + "device %s requested unsupported memory range " "0x%lx-0x%lx (decoding 0x%x-0x%x, 0x%x-0x%x)\n", - device_get_name(child), device_get_unit(child), start, - end, sc->membase, sc->memlimit, sc->pmembase, + device_get_nameunit(child), start, end, + sc->membase, sc->memlimit, sc->pmembase, sc->pmemlimit); if (!ok) return (NULL); if (bootverbose) - device_printf(sc->dev,"device %s%d requested decoded memory range 0x%lx-0x%lx\n", - device_get_name(child), device_get_unit(child), start, end); + device_printf(dev,"device %s requested decoded memory range 0x%lx-0x%lx\n", + device_get_nameunit(child), start, end); break; default: ==== //depot/projects/power/sys/dev/pci/pcib_private.h#3 (text+ko) ==== @@ -44,6 +44,8 @@ struct pcib_softc { device_t dev; + uint32_t flags; /* flags */ +#define PCIB_SUBTRACTIVE 0x1 uint16_t command; /* command register */ uint8_t secbus; /* secondary bus number */ uint8_t subbus; /* subordinate bus number */ ==== //depot/projects/power/sys/dev/pci/pcivar.h#5 (text+ko) ==== @@ -71,6 +71,7 @@ struct device *dev; /* device which owns this */ uint32_t bar[PCI_MAXMAPS_0]; /* BARs */ + uint32_t bios; /* BIOS mapping */ uint16_t subvendor; /* card vendor ID */ uint16_t subdevice; /* card device ID, assigned by card vendor */ ==== //depot/projects/power/sys/dev/txp/3c990img.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/txp/if_txp.c#3 (text+ko) ==== @@ -226,29 +226,7 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#ifndef BURN_BRIDGES - /* - * Handle power management nonsense. - */ - if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { - u_int32_t iobase, membase, irq; - - /* Save important PCI config data. */ - iobase = pci_read_config(dev, TXP_PCI_LOIO, 4); - membase = pci_read_config(dev, TXP_PCI_LOMEM, 4); - irq = pci_read_config(dev, TXP_PCI_INTLINE, 4); - /* Reset the power state. */ - device_printf(dev, "chip is in D%d power mode " - "-- setting to D0\n", pci_get_powerstate(dev)); - pci_set_powerstate(dev, PCI_POWERSTATE_D0); - - /* Restore PCI config data. */ - pci_write_config(dev, TXP_PCI_LOIO, iobase, 4); - pci_write_config(dev, TXP_PCI_LOMEM, membase, 4); - pci_write_config(dev, TXP_PCI_INTLINE, irq, 4); - } -#endif /* * Map control/status registers. */ ==== //depot/projects/power/sys/dev/txp/if_txpreg.h#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp.c#4 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp_ali.c#3 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp_amd.c#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp_i810.c#4 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp_if.m#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp_intel.c#3 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp_nvidia.c#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp_sis.c#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/agp_via.c#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/agppriv.h#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/agpreg.h#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/agpvar.h#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/alpm.c#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/amdpm.c#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/dc21040reg.h#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/if_dc.c#7 (text+ko) ==== @@ -220,9 +220,6 @@ static int dc_detach (device_t); static int dc_suspend (device_t); static int dc_resume (device_t); -#ifndef BURN_BRIDGES -static void dc_acpi (device_t); -#endif static struct dc_type *dc_devtype (device_t); static int dc_newbuf (struct dc_softc *, int, int); static int dc_encap (struct dc_softc *, struct mbuf **); @@ -1644,35 +1641,6 @@ return (ENXIO); } -#ifndef BURN_BRIDGES -static void -dc_acpi(device_t dev) -{ - int unit; - u_int32_t iobase, membase, irq; - - unit = device_get_unit(dev); - - if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { - /* Save important PCI config data. */ - iobase = pci_read_config(dev, DC_PCI_CFBIO, 4); - membase = pci_read_config(dev, DC_PCI_CFBMA, 4); - irq = pci_read_config(dev, DC_PCI_CFIT, 4); - - /* Reset the power state. */ - printf("dc%d: chip is in D%d power mode " - "-- setting to D0\n", unit, - pci_get_powerstate(dev)); - pci_set_powerstate(dev, PCI_POWERSTATE_D0); - - /* Restore PCI config data. */ - pci_write_config(dev, DC_PCI_CFBIO, iobase, 4); - pci_write_config(dev, DC_PCI_CFBMA, membase, 4); - pci_write_config(dev, DC_PCI_CFIT, irq, 4); - } -} -#endif - static void dc_apply_fixup(struct dc_softc *sc, int media) { @@ -1890,13 +1858,8 @@ mtx_init(&sc->dc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#ifndef BURN_BRIDGES + /* - * Handle power management nonsense. - */ - dc_acpi(dev); -#endif - /* * Map control/status registers. */ pci_enable_busmaster(dev); @@ -3799,13 +3762,6 @@ dc_stop(sc); - for (i = 0; i < 5; i++) - sc->saved_maps[i] = pci_read_config(dev, PCIR_BAR(i), 4); - sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4); - sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1); - sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1); - sc->saved_lattimer = pci_read_config(dev, PCIR_LATTIMER, 1); - sc->suspended = 1; splx(s); @@ -3828,20 +3784,6 @@ sc = device_get_softc(dev); ifp = &sc->arpcom.ac_if; -#ifndef BURN_BRIDGES - dc_acpi(dev); -#endif - /* better way to do this? */ - for (i = 0; i < 5; i++) - pci_write_config(dev, PCIR_BAR(i), sc->saved_maps[i], 4); - pci_write_config(dev, PCIR_BIOS, sc->saved_biosaddr, 4); - pci_write_config(dev, PCIR_INTLINE, sc->saved_intline, 1); - pci_write_config(dev, PCIR_CACHELNSZ, sc->saved_cachelnsz, 1); - pci_write_config(dev, PCIR_LATTIMER, sc->saved_lattimer, 1); - - /* reenable busmastering */ - pci_enable_busmaster(dev); - pci_enable_io(dev, DC_RES); /* reinitialize interface if necessary */ if (ifp->if_flags & IFF_UP) ==== //depot/projects/power/sys/pci/if_dcreg.h#5 (text+ko) ==== @@ -756,11 +756,6 @@ int rxcycles; /* ... when polling */ #endif int suspended; /* 0 = normal 1 = suspended */ - u_int32_t saved_maps[5]; /* pci data */ - u_int32_t saved_biosaddr; - u_int8_t saved_intline; - u_int8_t saved_cachelnsz; - u_int8_t saved_lattimer; }; ==== //depot/projects/power/sys/pci/if_de.c#3 (text+ko) ==== ==== //depot/projects/power/sys/pci/if_devar.h#3 (text+ko) ==== ==== //depot/projects/power/sys/pci/if_mn.c#2 (text+ko) ==== ==== //depot/projects/power/sys/pci/if_pcn.c#4 (text+ko) ==== @@ -517,30 +517,7 @@ /* Initialize our mutex. */ mtx_init(&sc->pcn_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#ifndef BURN_BRIDGES - /* - * Handle power management nonsense. - */ - if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { - u_int32_t iobase, membase, irq; - /* Save important PCI config data. */ - iobase = pci_read_config(dev, PCN_PCI_LOIO, 4); - membase = pci_read_config(dev, PCN_PCI_LOMEM, 4); - irq = pci_read_config(dev, PCN_PCI_INTLINE, 4); - - /* Reset the power state. */ - printf("pcn%d: chip is in D%d power mode " - "-- setting to D0\n", unit, - pci_get_powerstate(dev)); - pci_set_powerstate(dev, PCI_POWERSTATE_D0); - - /* Restore PCI config data. */ - pci_write_config(dev, PCN_PCI_LOIO, iobase, 4); - pci_write_config(dev, PCN_PCI_LOMEM, membase, 4); - pci_write_config(dev, PCN_PCI_INTLINE, irq, 4); - } -#endif /* * Map control/status registers. */ ==== //depot/projects/power/sys/pci/if_pcnreg.h#3 (text+ko) ==== ==== //depot/projects/power/sys/pci/if_rl.c#6 (text+ko) ==== @@ -915,32 +915,7 @@ mtx_init(&sc->rl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#ifndef BURN_BRIDGES - /* - * Handle power management nonsense. - */ - - if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { - u_int32_t iobase, membase, irq; - /* Save important PCI config data. */ - iobase = pci_read_config(dev, RL_PCI_LOIO, 4); - membase = pci_read_config(dev, RL_PCI_LOMEM, 4); - irq = pci_read_config(dev, RL_PCI_INTLINE, 4); - - /* Reset the power state. */ - printf("rl%d: chip is is in D%d power mode " - "-- setting to D0\n", unit, - pci_get_powerstate(dev)); - - pci_set_powerstate(dev, PCI_POWERSTATE_D0); - - /* Restore PCI config data. */ - pci_write_config(dev, RL_PCI_LOIO, iobase, 4); - pci_write_config(dev, RL_PCI_LOMEM, membase, 4); - pci_write_config(dev, RL_PCI_INTLINE, irq, 4); - } -#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 5 13:36:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B20616A4D1; Mon, 5 Jan 2004 13:36:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C29916A4CE for ; Mon, 5 Jan 2004 13:36:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6577E43D31 for ; Mon, 5 Jan 2004 13:36:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i05LaH0B058972 for ; Mon, 5 Jan 2004 13:36:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i05LaC4O058969 for perforce@freebsd.org; Mon, 5 Jan 2004 13:36:12 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 5 Jan 2004 13:36:12 -0800 (PST) Message-Id: <200401052136.i05LaC4O058969@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 44821 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, 05 Jan 2004 21:36:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=44821 Change 44821 by peter@peter_daintree on 2004/01/05 13:35:50 IFC @44820 Affected files ... .. //depot/projects/hammer/COPYRIGHT#2 integrate .. //depot/projects/hammer/bin/rm/rm.c#6 integrate .. //depot/projects/hammer/bin/sh/eval.c#4 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#4 integrate .. //depot/projects/hammer/contrib/gcc/c-lex.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/alpha/linux-ecoff.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/alpha/osf12.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/alpha/osf2or3.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/arm/arm-wince-pe.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/arm/riscix.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/arm/riscix1-1.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/arm/rix-gas.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/arm/t-riscix#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-c4x.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-i128.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-i32.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-i386.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-i64.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-m68k.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-sh.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-sparc.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/float-vax.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/386bsd.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/aix386.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/aix386ng.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/bsd386.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/dgux.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/djgpp-rtems.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/interix.c#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/isc.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/isccoff.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/iscdbx.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/linux-oldld.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/next.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/osf1-ci.asm#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/osf1-cn.asm#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/osf1elf.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/osf1elfgdb.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/osfelf.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/osfrose.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/rtems.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/seq-gas.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/seq-sysv3.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/seq2-sysv3.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/sequent.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/sol2gas.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/sun.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/sun386.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/t-dgux#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/t-next#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/t-osf#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/t-osf1elf#2 delete .. //depot/projects/hammer/contrib/gcc/config/i386/t-sco5gas#3 delete .. //depot/projects/hammer/contrib/gcc/config/i386/v3gas.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/nextstep-protos.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/nextstep.c#2 delete .. //depot/projects/hammer/contrib/gcc/config/nextstep.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/nextstep21.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/rs6000/softfloat.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/s390/t-linux#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/rtems.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2-g1.asm#2 delete .. //depot/projects/hammer/contrib/gcc/config/sparc/sol27-sld.h#2 delete .. //depot/projects/hammer/contrib/gcc/config/t-install-cpp#2 delete .. //depot/projects/hammer/contrib/gcc/cp/mpw-config.in#2 delete .. //depot/projects/hammer/contrib/gcc/cp/mpw-make.sed#2 delete .. //depot/projects/hammer/contrib/gcc/dependence.c#2 delete .. //depot/projects/hammer/contrib/gcc/doc/vms.texi#2 delete .. //depot/projects/hammer/contrib/gcc/enquire.c#2 delete .. //depot/projects/hammer/contrib/gcc/f/version.c#6 delete .. //depot/projects/hammer/contrib/gcc/f/version.h#2 delete .. //depot/projects/hammer/contrib/gcc/ggc-callbacks.c#2 delete .. //depot/projects/hammer/contrib/gcc/halfpic.c#2 delete .. //depot/projects/hammer/contrib/gcc/halfpic.h#2 delete .. //depot/projects/hammer/contrib/gcc/hash.c#2 delete .. //depot/projects/hammer/contrib/gcc/hash.h#2 delete .. //depot/projects/hammer/contrib/gcc/tradcif.y#2 delete .. //depot/projects/hammer/contrib/gcc/tradcpp.c#4 delete .. //depot/projects/hammer/contrib/gcc/tradcpp.h#2 delete .. //depot/projects/hammer/contrib/ipfilter/ipmon.c#4 integrate .. //depot/projects/hammer/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/hammer/contrib/tcp_wrappers/socket.c#2 integrate .. //depot/projects/hammer/etc/apmd.conf#2 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#19 integrate .. //depot/projects/hammer/etc/periodic/daily/150.clean-hoststat#4 integrate .. //depot/projects/hammer/etc/rc.d/cron#3 integrate .. //depot/projects/hammer/etc/rc.d/diskless#8 integrate .. //depot/projects/hammer/etc/rc.resume#2 integrate .. //depot/projects/hammer/etc/rc.suspend#2 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.mc#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#16 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#10 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/murphy#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/startrek#6 integrate .. //depot/projects/hammer/games/fortune/fortune/fortune.c#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/f77/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/f771/Makefile#2 integrate .. //depot/projects/hammer/include/paths.h#7 integrate .. //depot/projects/hammer/lib/libc/gen/opendir.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/sysconf.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.c#7 integrate .. //depot/projects/hammer/lib/libc/sys/accept.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/getpeername.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/getsockname.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#5 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_init.3#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_join.c#3 integrate .. //depot/projects/hammer/lib/libpthread/man/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_attr.3#3 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_equal.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_exit.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_getspecific.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_join.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_key_create.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_key_delete.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_kill.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_init.3#3 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_mutexattr.3#3 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_once.3#3 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_wrlock.3#3 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_schedparam.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_self.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_setspecific.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_sigmask.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_testcancel.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/sem_destroy.3#3 integrate .. //depot/projects/hammer/lib/libpthread/man/sem_getvalue.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/sem_init.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/sem_post.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/sem_wait.3#2 integrate .. //depot/projects/hammer/lib/libpthread/man/sigwait.3#3 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#22 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#19 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigaltstack.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#14 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#11 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#14 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#6 integrate .. //depot/projects/hammer/release/scripts/mkpkgindex.sh#1 branch .. //depot/projects/hammer/rescue/rescue/Makefile#12 integrate .. //depot/projects/hammer/sbin/comcontrol/comcontrol.8#2 integrate .. //depot/projects/hammer/sbin/dump/main.c#11 integrate .. //depot/projects/hammer/sbin/fsck/fsutil.c#2 integrate .. //depot/projects/hammer/sbin/fsck/fsutil.h#3 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/boot.c#3 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/check.c#4 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/dir.c#2 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/dosfs.h#3 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/ext.h#4 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/fat.c#3 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/main.c#3 integrate .. //depot/projects/hammer/sbin/growfs/growfs.8#5 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.8#5 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#16 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#18 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#9 integrate .. //depot/projects/hammer/sbin/mknod/mknod.8#5 integrate .. //depot/projects/hammer/share/man/man3/Makefile#3 integrate .. //depot/projects/hammer/share/man/man3/pthread.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_mutex_timedlock.3#1 branch .. //depot/projects/hammer/share/man/man4/Makefile#32 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#16 integrate .. //depot/projects/hammer/share/man/man4/acpi_thermal.4#1 branch .. //depot/projects/hammer/share/man/man4/amr.4#6 integrate .. //depot/projects/hammer/share/man/man4/crypto.4#3 integrate .. //depot/projects/hammer/share/man/man4/dcons.4#2 integrate .. //depot/projects/hammer/share/man/man4/dcons_crom.4#2 integrate .. //depot/projects/hammer/share/man/man4/digi.4#2 integrate .. //depot/projects/hammer/share/man/man4/ef.4#2 integrate .. //depot/projects/hammer/share/man/man4/gdb.4#1 branch .. //depot/projects/hammer/share/man/man4/harp.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_stub.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/hammer/share/man/man4/matcd.4#3 integrate .. //depot/projects/hammer/share/man/man4/meteor.4#2 integrate .. //depot/projects/hammer/share/man/man4/miibus.4#5 integrate .. //depot/projects/hammer/share/man/man4/ng_atm.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_atmpif.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_sscfu.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_sscop.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_uni.4#2 integrate .. //depot/projects/hammer/share/man/man4/rndtest.4#3 integrate .. //depot/projects/hammer/share/man/man4/safe.4#2 integrate .. //depot/projects/hammer/share/man/man4/ste.4#3 integrate .. //depot/projects/hammer/share/man/man4/utopia.4#4 integrate .. //depot/projects/hammer/share/man/man4/vinumdebug.4#1 branch .. //depot/projects/hammer/share/man/man4/vpo.4#4 integrate .. //depot/projects/hammer/share/man/man4/xe.4#3 integrate .. //depot/projects/hammer/share/man/man5/devfs.5#3 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#18 integrate .. //depot/projects/hammer/share/man/man7/release.7#15 integrate .. //depot/projects/hammer/share/man/man9/mutex.9#7 integrate .. //depot/projects/hammer/share/man/man9/sx.9#4 integrate .. //depot/projects/hammer/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.obj.mk#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#20 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#12 integrate .. //depot/projects/hammer/sys/alpha/include/kse.h#2 delete .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#4 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#4 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#4 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.conf#2 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#4 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_proto.h#3 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#12 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_syscall.h#3 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_sysent.c#3 integrate .. //depot/projects/hammer/sys/alpha/osf1/syscalls.conf#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/syscalls.master#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#77 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#51 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#11 integrate .. //depot/projects/hammer/sys/amd64/include/kse.h#6 delete .. //depot/projects/hammer/sys/boot/alpha/common/conf.c#3 integrate .. //depot/projects/hammer/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/bootinfo.c#3 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#4 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/srmdisk.c#3 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/abort.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/arcconsole.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/arcdisk.c#4 integrate .. //depot/projects/hammer/sys/boot/arc/lib/bootinfo.c#3 integrate .. //depot/projects/hammer/sys/boot/arc/lib/delay.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/devicename.c#3 integrate .. //depot/projects/hammer/sys/boot/arc/lib/elf_freebsd.c#4 integrate .. //depot/projects/hammer/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/setjmperr.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/lib/time.c#2 integrate .. //depot/projects/hammer/sys/boot/arc/loader/conf.c#3 integrate .. //depot/projects/hammer/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/bootinfo.c#4 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/devicename.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/efifpswa.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#6 integrate .. //depot/projects/hammer/sys/boot/ofw/common/main.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/devicename.c#6 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#5 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/conf.c#4 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#7 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/start.c#3 integrate .. //depot/projects/hammer/sys/boot/sparc64/boot1/boot1.c#4 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/hammer/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/hammer/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/hammer/sys/conf/Makefile.alpha#4 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#17 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#16 integrate .. //depot/projects/hammer/sys/conf/options.i386#21 integrate .. //depot/projects/hammer/sys/conf/options.pc98#17 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#19 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#15 integrate .. //depot/projects/hammer/sys/dev/an/if_aironet_ieee.h#5 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#13 integrate .. //depot/projects/hammer/sys/dev/an/if_an_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/an/if_anreg.h#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#14 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_dma.h#6 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#6 integrate .. //depot/projects/hammer/sys/dev/fb/creator.c#3 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#21 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#12 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#12 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#18 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#25 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_intr.c#6 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#8 integrate .. //depot/projects/hammer/sys/dev/idt/idt.c#5 integrate .. //depot/projects/hammer/sys/dev/idt/idt_harp.c#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#7 integrate .. //depot/projects/hammer/sys/dev/ips/ips_commands.c#8 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#19 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#19 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#21 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#6 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#17 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#12 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_freebsdkintf.c#7 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#8 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#25 integrate .. //depot/projects/hammer/sys/dev/sio/sio_ebus.c#3 integrate .. //depot/projects/hammer/sys/dev/sio/sio_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/sio/sio_puc.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ufm.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#22 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#22 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#7 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#24 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#17 integrate .. //depot/projects/hammer/sys/dev/wi/if_wireg.h#7 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/msdosfs/bootsect.h#3 integrate .. //depot/projects/hammer/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/hammer/sys/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/hammer/sys/fs/msdosfs/fat.h#2 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#6 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#10 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#15 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#4 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#15 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakecode.S#6 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#26 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#26 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/hammer/sys/i386/include/elan_mmcr.h#1 branch .. //depot/projects/hammer/sys/i386/include/kse.h#2 delete .. //depot/projects/hammer/sys/i386/include/md_var.h#10 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#8 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#14 integrate .. //depot/projects/hammer/sys/i386/svr4/svr4_machdep.c#7 integrate .. //depot/projects/hammer/sys/ia64/acpica/OsdEnvironment.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#33 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#18 integrate .. //depot/projects/hammer/sys/ia64/include/kse.h#2 delete .. //depot/projects/hammer/sys/kern/init_sysent.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#8 integrate .. //depot/projects/hammer/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_power.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#13 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#16 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#23 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#23 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#30 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#19 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#1 branch .. //depot/projects/hammer/sys/modules/cam/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/raidframe/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sio/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bpf.c#14 integrate .. //depot/projects/hammer/sys/net/bpf.h#6 integrate .. //depot/projects/hammer/sys/net/bridge.c#10 integrate .. //depot/projects/hammer/sys/net/if.c#13 integrate .. //depot/projects/hammer/sys/net/if_disc.c#7 integrate .. //depot/projects/hammer/sys/net/if_ef.c#7 integrate .. //depot/projects/hammer/sys/net/if_faith.c#8 integrate .. //depot/projects/hammer/sys/net/if_gif.c#9 integrate .. //depot/projects/hammer/sys/net/if_gre.c#10 integrate .. //depot/projects/hammer/sys/net/if_gre.h#4 integrate .. //depot/projects/hammer/sys/net/if_loop.c#14 integrate .. //depot/projects/hammer/sys/net/if_stf.c#9 integrate .. //depot/projects/hammer/sys/net/if_tun.c#10 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#11 integrate .. //depot/projects/hammer/sys/net/if_vlan_var.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#6 integrate .. //depot/projects/hammer/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#7 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#7 integrate .. //depot/projects/hammer/sys/netinet/in.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#18 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#24 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#7 integrate .. //depot/projects/hammer/sys/netinet6/ip6_fw.c#7 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#18 integrate .. //depot/projects/hammer/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/hammer/sys/netsmb/smb_conn.h#5 integrate .. //depot/projects/hammer/sys/netsmb/smb_crypt.c#4 integrate .. //depot/projects/hammer/sys/netsmb/smb_iod.c#7 integrate .. //depot/projects/hammer/sys/netsmb/smb_rq.c#6 integrate .. //depot/projects/hammer/sys/netsmb/smb_rq.h#2 integrate .. //depot/projects/hammer/sys/netsmb/smb_smb.c#5 integrate .. //depot/projects/hammer/sys/netsmb/smb_subr.h#6 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#24 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#14 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio_cbus.c#3 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#26 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#21 integrate .. //depot/projects/hammer/sys/pci/if_sisreg.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/kse.h#2 delete .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#22 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#11 integrate .. //depot/projects/hammer/sys/sparc64/include/kse.h#2 delete .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#15 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#13 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/dump_machdep.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#26 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/ofw_machdep.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#11 integrate .. //depot/projects/hammer/sys/sys/_null.h#3 integrate .. //depot/projects/hammer/sys/sys/copyright.h#3 integrate .. //depot/projects/hammer/sys/sys/kse.h#15 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#18 integrate .. //depot/projects/hammer/sys/sys/proc.h#41 integrate .. //depot/projects/hammer/sys/sys/sf_buf.h#2 integrate .. //depot/projects/hammer/sys/sys/socket.h#7 integrate .. //depot/projects/hammer/sys/sys/syscall.h#23 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#23 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#23 integrate .. //depot/projects/hammer/sys/sys/systm.h#13 integrate .. //depot/projects/hammer/sys/sys/uio.h#5 integrate .. //depot/projects/hammer/sys/sys/vnode.h#20 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#17 integrate .. //depot/projects/hammer/sys/vm/device_pager.c#7 integrate .. //depot/projects/hammer/sys/vm/phys_pager.c#6 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#19 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#15 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#29 integrate .. //depot/projects/hammer/sys/vm/vm_meter.c#7 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#33 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#20 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#17 integrate .. //depot/projects/hammer/tools/debugscripts/dot.gdbinit#3 integrate .. //depot/projects/hammer/tools/debugscripts/gdbinit.i386#2 integrate .. //depot/projects/hammer/tools/debugscripts/gdbinit.kernel#2 integrate .. //depot/projects/hammer/tools/debugscripts/gdbinit.vinum#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.birthday#7 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#3 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan#2 integrate .. //depot/projects/hammer/usr.bin/netstat/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.1#6 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#5 integrate .. //depot/projects/hammer/usr.bin/sed/sed.1#4 integrate .. //depot/projects/hammer/usr.bin/systat/netstat.c#3 integrate .. //depot/projects/hammer/usr.bin/truss/main.c#6 integrate .. //depot/projects/hammer/usr.bin/usbhidctl/usbhidctl.1#2 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#11 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.8#6 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#5 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi.c#7 integrate .. //depot/projects/hammer/usr.sbin/apmd/apmd.8#4 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.c#6 integrate .. //depot/projects/hammer/usr.sbin/devinfo/devinfo.c#4 integrate .. //depot/projects/hammer/usr.sbin/ip6addrctl/ip6addrctl.c#3 integrate .. //depot/projects/hammer/usr.sbin/ip6addrctl/ip6addrctl.conf.sample#2 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#7 integrate .. //depot/projects/hammer/usr.sbin/mountd/exports.5#4 integrate .. //depot/projects/hammer/usr.sbin/mrouted/mtrace.c#3 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf-parse.y#2 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf-token.l#2 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#2 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/pccard/pccardd/pccardd.c#3 integrate .. //depot/projects/hammer/usr.sbin/pciconf/pciconf.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/match.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#12 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/doc.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/index.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/package.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#14 integrate Differences ... ==== //depot/projects/hammer/COPYRIGHT#2 (text+ko) ==== @@ -1,6 +1,35 @@ -# $FreeBSD: src/COPYRIGHT,v 1.4 1999/09/05 21:33:47 obrien Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.5 2003/12/31 22:35:22 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 +The compilation of software known as FreeBSD is distributed under the +following terms: + +Copyright (C) 1992-2004 The FreeBSD Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +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. + +THIS SOFTWARE IS PROVIDED BY 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 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. + +The 4.4BSD and 4.4BSD-Lite software is distributed under the following +terms: + All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite Releases is copyrighted by The Regents of the University of California. ==== //depot/projects/hammer/bin/rm/rm.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.45 2003/11/10 09:40:18 guido Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.46 2004/01/01 10:26:43 kuriyama Exp $"); #include #include @@ -199,8 +199,8 @@ errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno)); case FTS_NS: /* - * FTS_NS: assume that if can't stat the file, it - * can't be unlinked. + * Assume that since fts_read() couldn't stat the + * file, it can't be unlinked. */ if (!needstat) break; @@ -269,6 +269,14 @@ } break; + case FTS_NS: + /* + * Assume that since fts_read() couldn't stat + * the file, it can't be unlinked. + */ + if (fflag) + continue; + /* FALLTHROUGH */ default: if (Pflag) if (!rm_overwrite(p->fts_accpath, NULL)) ==== //depot/projects/hammer/bin/sh/eval.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.37 2003/01/21 10:06:04 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.39 2003/12/30 15:39:33 maxim Exp $"); #include #include @@ -205,7 +205,6 @@ case NAND: evaltree(n->nbinary.ch1, EV_TESTED); if (evalskip || exitstatus != 0) { - flags |= EV_TESTED; goto out; } evaltree(n->nbinary.ch2, flags); @@ -246,25 +245,9 @@ break; case NFOR: evalfor(n); - /* - * The 'for' command does not set exitstatus, so the value - * now in exitstatus is from the last command executed in - * the 'for' loop. That exit value had been tested (wrt - * 'sh -e' checking) while processing that command, and - * it should not be re-tested here. - */ - flags |= EV_TESTED; break; case NCASE: evalcase(n, flags); - /* - * The 'case' command does not set exitstatus, so the value - * now in exitstatus is from the last command executed in - * the 'case' block. That exit value had been tested (wrt - * 'sh -e' checking) while processing that command, and - * it should not be re-tested here. - */ - flags |= EV_TESTED; break; case NDEFUN: defun(n->narg.text, n->narg.next); @@ -289,14 +272,8 @@ out: if (pendingsigs) dotrap(); - /* - * XXX - Like "!(n->type == NSEMI)", more types will probably - * need to be excluded from this test. It's probably better - * to set or unset EV_TESTED in the loop above than to bloat - * the conditional here. - */ if ((flags & EV_EXIT) || (eflag && exitstatus - && !(flags & EV_TESTED) && !(n->type == NSEMI))) + && !(flags & EV_TESTED) && (n->type == NCMD))) exitshell(exitstatus); } @@ -711,7 +688,7 @@ * the command runs. Partly deleting like * changepatch() does doesn't seem worth the * bookinging effort, since most such runs add - * diretories in front of the new PATH. + * directories in front of the new PATH. */ clearcmdentry(0); do_clearcmdentry = 1; ==== //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 .\" $Id: fsinfo.8,v 1.3.2.4 2003/03/31 20:09:02 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.8 2003/09/02 15:42:56 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.9 2004/01/04 10:56:22 charnier Exp $ .\" .Dd June 26, 1999 .Dt FSINFO 8 @@ -68,7 +68,7 @@ , .I mount and -.Xr mountd +.Xr mountd 8 configuration files. .Pp The following options are available: ==== //depot/projects/hammer/contrib/ipfilter/ipmon.c#4 (text+ko) ==== @@ -70,7 +70,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.12.2.13 2001/07/19 12:24:59 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.16 2003/02/15 06:32:47 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.17 2004/01/02 13:10:47 guido Exp $"; #endif @@ -922,6 +922,7 @@ } #if (SOLARIS || \ (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \ (defined(OpenBSD) && (OpenBSD >= 199603))) || defined(linux) { char ifname[sizeof(ipf->fl_ifname) + 1]; ==== //depot/projects/hammer/contrib/pnpinfo/pnpinfo.c#2 (text+ko) ==== @@ -22,12 +22,14 @@ * 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. - * - * $FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.8 2002/08/09 22:04:54 iedowse Exp $ */ +#include +__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.9 2004/01/04 11:11:02 charnier Exp $"); + #include +#include #include #include #include @@ -588,10 +590,8 @@ #ifdef __i386__ /* Hey what about a i386_iopl() call :) */ - if (open("/dev/io", O_RDONLY) < 0) { - fprintf (stderr, "pnpinfo: Can't get I/O privilege.\n"); - exit (1); - } + if (open("/dev/io", O_RDONLY) < 0) + errx(1, "can't get I/O privilege"); #endif #ifdef __alpha__ ioperm(0x203, 0x400 - 0x203, 1); @@ -608,6 +608,7 @@ } if (!num_pnp_devs) { printf("No Plug-n-Play devices were found\n"); - return 0; + return (0); } + return (0); } ==== //depot/projects/hammer/contrib/tcp_wrappers/socket.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * - * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.6 2001/07/04 20:16:18 kris Exp $ + * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.7 2003/12/27 14:58:00 ceri Exp $ */ #ifndef lint @@ -114,7 +114,7 @@ return; /* give up */ } #ifdef really_paranoid - memset(buf, 0 sizeof(buf)); + memset(buf, 0, sizeof(buf)); #endif } #ifdef INET6 ==== //depot/projects/hammer/etc/apmd.conf#2 (text+ko) ==== @@ -1,10 +1,10 @@ # apmd Configuration File # -# $FreeBSD: src/etc/apmd.conf,v 1.7 2001/08/06 15:52:42 nsayer Exp $ +# $FreeBSD: src/etc/apmd.conf,v 1.9 2003/12/30 17:40:28 njl Exp $ # apm_event SUSPENDREQ { - exec "/etc/rc.suspend"; + exec "/etc/rc.suspend apm suspend"; } apm_event USERSUSPENDREQ { @@ -13,8 +13,12 @@ exec "apm -z"; } -apm_event NORMRESUME, STANDBYRESUME { - exec "/etc/rc.resume"; +apm_event NORMRESUME { + exec "/etc/rc.resume apm suspend"; +} + +apm_event STANDBYRESUME { + exec "/etc/rc.resume apm standby"; } # resume event configuration for serial mouse users by ==== //depot/projects/hammer/etc/defaults/rc.conf#19 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.194 2003/12/18 04:39:57 njl Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.195 2003/12/25 23:29:19 babkin Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -398,6 +398,7 @@ cron_enable="YES" # Run the periodic job daemon. cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). +cron_dst="YES" # Handle DST transitions intelligently (YES/NO) cron_flags="" # Which options to pass to the cron daemon. lpd_enable="NO" # Run the line printer daemon. lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one. ==== //depot/projects/hammer/etc/periodic/daily/150.clean-hoststat#4 (text+ko) ==== @@ -1,8 +1,8 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.7 2003/01/08 18:51:45 wollman Exp $ +# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.8 2004/01/02 18:50:22 gshapiro Exp $ # -# Remove stale files in /var/spool/.hoststat +# Remove stale persistent host status files # # If there is a global system configuration file, suck it in. @@ -14,13 +14,13 @@ case "$daily_clean_hoststat_enable" in [Yy][Ee][Ss]) - if [ -z "$(sendmail -bh 2>&1)" ]; then + if [ -z "$(hoststat 2>&1)" ]; then rc=2 else echo "" echo "Removing stale entries from sendmail host status cache:" rc=0 - sendmail -bH || rc=1 + purgestat || rc=1 fi;; *) rc=0;; ==== //depot/projects/hammer/etc/rc.d/cron#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.4 2003/12/25 23:29:19 babkin Exp $ # # PROVIDE: cron @@ -17,4 +17,8 @@ pidfile="/var/run/${name}.pid" load_rc_config $name +if checkyesno cron_dst +then + cron_flags="$cron_flags -s" +fi run_rc_command "$1" ==== //depot/projects/hammer/etc/rc.d/diskless#8 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/diskless,v 1.29 2003/10/13 08:18:05 dougb Exp $ +# $FreeBSD: src/etc/rc.d/diskless,v 1.30 2004/01/05 19:14:47 brooks Exp $ # # PROVIDE: diskless @@ -107,7 +107,13 @@ # Make sure our aliases database is uptodate, the aliases may have # been overriden in /conf. # -/usr/bin/newaliases +case ${sendmail_enable} in +[Nn][Oo][Nn][Ee]) + ;; +*) + /usr/bin/newaliases + ;; +esac # XXX make sure to create one dir for each printer as requested by lpd # ==== //depot/projects/hammer/etc/rc.resume#2 (text+ko) ==== @@ -24,15 +24,23 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.resume,v 1.5 2000/12/17 08:15:57 dougb Exp $ +# $FreeBSD: src/etc/rc.resume,v 1.7 2003/12/30 17:30:39 njl Exp $ # # sample run command file for APM Resume Event +if [ $# -ne 2 ]; then + echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + exit 1 +fi + +subsystem=$1 +state=$2 + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 5 14:30:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76B6C16A4D2; Mon, 5 Jan 2004 14:30:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AA3216A4D1 for ; Mon, 5 Jan 2004 14:30:25 -0800 (PST) Received: from mail3.speakeasy.net (mail3.speakeasy.net [216.254.0.203]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF64743D46 for ; Mon, 5 Jan 2004 14:30:12 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 11146 invoked from network); 5 Jan 2004 22:30:12 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 5 Jan 2004 22:30:12 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i05MU6M0021597; Mon, 5 Jan 2004 17:30:06 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20040102231149.GA69929@FreeBSD.org> Date: Mon, 05 Jan 2004 17:30:09 -0500 (EST) From: John Baldwin To: Juli Mallett X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: Sam Leffler cc: Perforce Change Reviews Subject: Re: PERFORCE change 44709 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, 05 Jan 2004 22:30:26 -0000 On 02-Jan-2004 Juli Mallett wrote: > * Sam Leffler [ Date: 2004-01-02 ] > [ w.r.t. Re: PERFORCE change 44709 for review ] >> On Friday 02 January 2004 02:04 pm, John Baldwin wrote: >> > http://perforce.freebsd.org/chv.cgi?CH=44709 >> > >> > Change 44709 by jhb@jhb_blue on 2004/01/02 14:04:27 >> > >> > Bah, stupid bug. >> > >> > Affected files ... >> > >> > .. //depot/projects/smpng/sys/modules/crash/crash.c#8 edit >> > >> > Differences ... >> > >> > ==== //depot/projects/smpng/sys/modules/crash/crash.c#8 (text+ko) ==== >> > >> > @@ -234,9 +234,9 @@ >> > break; >> > case 18: >> > bzero(&test1_mtx, sizeof(test1_mtx)); >> > - bzero(&test1_mtx, sizeof(test2_mtx)); >> > + bzero(&test2_mtx, sizeof(test2_mtx)); >> > mtx_init(&test1_mtx, "test1", NULL, MTX_DEF); >> > - mtx_init(&test1_mtx, "test2", NULL, MTX_DEF | >> > + mtx_init(&test2_mtx, "test2", NULL, MTX_DEF | >> > MTX_RECURSE); >> > #define TRYLOCK_TEST(lock, descr) do { \ >> > status = mtx_trylock((lock)); \ >> >> Bah bah, bogus assertions. > > Agreed. I want something to *initialize* these things. I hate one bit > of code I have at work: > > sc->[all fields] = [appropriate values for fields] > bzero(&sc->mtx, sizeof sc->mtx); > mtx_init(&sc->mtx, "blah", NULL, MTX_DEF); > > *shrug* My bug was a real one up there that the assertion caught. I had double-init'd test1 and never init'd test2. Perhaps I should break down and add a MTX_FRESH or MTX_NEW flag that skips the assertion. Of course, it just means that when someone does forget to init a mutex or dose a double init they just have a really hard to track down bug. :-/ -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Mon Jan 5 17:32:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3728B16A4D1; Mon, 5 Jan 2004 17:32:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E9E8C16A4CE for ; Mon, 5 Jan 2004 17:32:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BD1243D3F for ; Mon, 5 Jan 2004 17:32:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i061W90B017813 for ; Mon, 5 Jan 2004 17:32:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i061W8C0017807 for perforce@freebsd.org; Mon, 5 Jan 2004 17:32:08 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 5 Jan 2004 17:32:08 -0800 (PST) Message-Id: <200401060132.i061W8C0017807@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 44830 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, 06 Jan 2004 01:32:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=44830 Change 44830 by peter@peter_daintree on 2004/01/05 17:31:30 add getitimer implementation and regen Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#8 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#8 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#8 edit .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#8 edit .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#11 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#8 (text+ko) ==== @@ -57,6 +57,10 @@ char itv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * itv; char itv_r_[PADR_(struct itimerval32 *)]; char oitv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * oitv; char oitv_r_[PADR_(struct itimerval32 *)]; }; +struct freebsd32_getitimer_args { + char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)]; + char itv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * itv; char itv_r_[PADR_(struct itimerval32 *)]; +}; struct freebsd32_select_args { char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)]; char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)]; @@ -219,6 +223,7 @@ int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); +int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *); int freebsd32_select(struct thread *, struct freebsd32_select_args *); int freebsd32_gettimeofday(struct thread *, struct freebsd32_gettimeofday_args *); int freebsd32_getrusage(struct thread *, struct freebsd32_getrusage_args *); ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#8 (text+ko) ==== @@ -87,7 +87,7 @@ #define FREEBSD32_SYS_freebsd32_setitimer 83 /* 84 is obsolete owait */ /* 85 is obsolete oswapon */ - /* 86 is obsolete ogetitimer */ +#define FREEBSD32_SYS_freebsd32_getitimer 86 /* 87 is obsolete ogethostname */ /* 88 is obsolete osethostname */ #define FREEBSD32_SYS_getdtablesize 89 ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#8 (text+ko) ==== @@ -93,7 +93,7 @@ "freebsd32_setitimer", /* 83 = freebsd32_setitimer */ "obs_owait", /* 84 = obsolete owait */ "obs_oswapon", /* 85 = obsolete oswapon */ - "obs_ogetitimer", /* 86 = obsolete ogetitimer */ + "freebsd32_getitimer", /* 86 = freebsd32_getitimer */ "obs_ogethostname", /* 87 = obsolete ogethostname */ "obs_osethostname", /* 88 = obsolete osethostname */ "getdtablesize", /* 89 = getdtablesize */ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#8 (text+ko) ==== @@ -111,7 +111,7 @@ { AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer }, /* 83 = freebsd32_setitimer */ { 0, (sy_call_t *)nosys }, /* 84 = obsolete owait */ { 0, (sy_call_t *)nosys }, /* 85 = obsolete oswapon */ - { 0, (sy_call_t *)nosys }, /* 86 = obsolete ogetitimer */ + { AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer }, /* 86 = freebsd32_getitimer */ { 0, (sy_call_t *)nosys }, /* 87 = obsolete ogethostname */ { 0, (sy_call_t *)nosys }, /* 88 = obsolete osethostname */ { SYF_MPSAFE | 0, (sy_call_t *)getdtablesize }, /* 89 = getdtablesize */ ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#11 (text+ko) ==== @@ -142,8 +142,8 @@ 84 OBSOL owait ; XXX implement 85 OBSOL oswapon -; XXX implement -86 OBSOL ogetitimer +86 STD { int freebsd32_getitimer(u_int which, \ + struct itimerval32 *itv); } 87 OBSOL ogethostname 88 OBSOL osethostname 89 MNOPROTO { int getdtablesize(void); } From owner-p4-projects@FreeBSD.ORG Mon Jan 5 18:02:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7243216A4D1; Mon, 5 Jan 2004 18:02:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D3F916A4CE for ; Mon, 5 Jan 2004 18:02:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A36843D39 for ; Mon, 5 Jan 2004 18:02:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0622m0B024093 for ; Mon, 5 Jan 2004 18:02:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0622mH5024090 for perforce@freebsd.org; Mon, 5 Jan 2004 18:02:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Mon, 5 Jan 2004 18:02:48 -0800 (PST) Message-Id: <200401060202.i0622mH5024090@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 44833 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, 06 Jan 2004 02:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=44833 Change 44833 by jmallett@jmallett_oingo on 2004/01/05 18:02:10 Reformat to something I mind less. Affected files ... .. //depot/projects/mips/sys/mips/mips/db_interface.c#12 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/db_interface.c#12 (text+ko) ==== @@ -290,19 +290,18 @@ lo[1] = mips_rd_entrylo1(); pm = mips_rd_pagemask(); - db_printf("TLB %c %2d Hi 0x%016lx ", - (lo[0] | lo[1]) & PG_V ? 'V' : '*', i, hi); - db_printf("Lo0=0x%016lx %c%c attr %lx ", - MIPS_PFN_TO_PA(lo[0]), + printf("=== TLB Entry %02d === ", i); + printf("(%svalid) ", (lo[0] | lo[1]) & PG_V ? " " : "in"); + printf("EntryHi=0x%016lx ", hi); + printf("PageMask=%#lx\n", pm); + if (*modif != 'a' && (((lo[0] | lo[1]) & PG_V) == 0)) + continue; + printf("\tEntryLo0 = 0x%016lx (%c%c)\n", lo[0], (lo[0] & PG_D) ? 'D' : ' ', - (lo[0] & PG_G) ? 'G' : ' ', - (lo[0] >> 3) & 7); - db_printf("Lo1=0x%016lx %c%c attr %lx ", - MIPS_PFN_TO_PA(lo[1]), + (lo[0] & PG_G) ? 'G' : ' '); + printf("\tEntryLo1 = 0x%016lx (%c%c)\n", lo[1], (lo[1] & PG_D) ? 'D' : ' ', - (lo[1] & PG_G) ? 'G' : ' ', - (lo[1] >> 3) & 7); - db_printf("sz=%#lx\n", pm); + (lo[1] & PG_G) ? 'G' : ' '); } } From owner-p4-projects@FreeBSD.ORG Mon Jan 5 18:03:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6945516A4D1; Mon, 5 Jan 2004 18:03:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 446F416A4CE for ; Mon, 5 Jan 2004 18:03:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 463E543D2D for ; Mon, 5 Jan 2004 18:03:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0623o0B024981 for ; Mon, 5 Jan 2004 18:03:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0623n57024978 for perforce@freebsd.org; Mon, 5 Jan 2004 18:03:49 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Mon, 5 Jan 2004 18:03:49 -0800 (PST) Message-Id: <200401060203.i0623n57024978@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 44834 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, 06 Jan 2004 02:03:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=44834 Change 44834 by jmallett@jmallett_oingo on 2004/01/05 18:03:23 Consistency is all I ask. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#27 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#27 (text+ko) ==== @@ -142,7 +142,7 @@ #define pmap_pte_ro(pte) ((*(pte) & PG_RO) != 0) #define pmap_pte_w(pte) ((*(pte) & PG_W) != 0) #define pmap_pte_v(pte) ((*(pte) & PG_V) != 0) -#define pmap_pte_pa(pte) MIPS_PTE_TO_PA(*(pte)) +#define pmap_pte_pa(pte) (MIPS_PTE_TO_PA(*(pte))) #define pmap_pte_prot(pte) (*(pte) & PG_PROT) #define pmap_pte_set_prot(pte, v) ((*pte &= ~PG_PROT), (*pte |= (v))) @@ -166,21 +166,6 @@ #define PTMASK ((1 << MIPS_PTSHIFT) - 1) /* - * Given a physical address, construct a pte - */ -#define pmap_phys_to_pte(pa) MIPS_PA_TO_PFN(pa) - -/* - * Given a page frame number, construct a k0seg va - */ -#define pmap_k0seg_to_pfn(va) btop(MIPS_KSEG0_TO_PHYS(va)) - -/* - * Given a pte, construct a k0seg va - */ -#define pmap_k0seg_to_pte(va) MIPS_PA_TO_PFN(pmap_k0seg_to_pfn(va)) - -/* * Statically allocated kernel pmap */ struct pmap kernel_pmap_store; @@ -568,7 +553,7 @@ { pt_entry_t* pte = pmap_pte(pmap, va); if (pte) - return MIPS_PTE_TO_PA(*pte) | (va & PAGE_MASK); + return pmap_pte_pa(pte) | (va & PAGE_MASK); else return 0; } @@ -1126,7 +1111,7 @@ pa = VM_PAGE_TO_PHYS(m) & ~PAGE_MASK; - if (pte_valid(pte) && (opa = MIPS_PTE_TO_PA(*pte)) == pa) { + if (pte_valid(pte) && (opa = pmap_pte_pa(pte)) == pa) { if (pte_wired(pte)) { if (!wired) pmap->pm_stats.wired_count--; From owner-p4-projects@FreeBSD.ORG Tue Jan 6 07:43:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DFC916A4D1; Tue, 6 Jan 2004 07:43:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30EE916A4CE for ; Tue, 6 Jan 2004 07:43:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F163E43D78 for ; Tue, 6 Jan 2004 07:43:30 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i06FhU0B021963 for ; Tue, 6 Jan 2004 07:43:30 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i06FhUWj021960 for perforce@freebsd.org; Tue, 6 Jan 2004 07:43:30 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 6 Jan 2004 07:43:30 -0800 (PST) Message-Id: <200401061543.i06FhUWj021960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 44848 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, 06 Jan 2004 15:43:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=44848 Change 44848 by jhb@jhb_blue on 2004/01/06 07:42:41 Stick loadav() in its own thread since it uses allproc_lock. Affected files ... .. //depot/projects/smpng/sys/kern/kern_synch.c#60 edit .. //depot/projects/smpng/sys/notes#2 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_synch.c#60 (text+ko) ==== @@ -76,7 +76,6 @@ int hogticks; int lbolt; -static struct callout loadav_callout; static struct callout lbolt_callout; struct loadavg averunnable = @@ -96,7 +95,8 @@ SYSCTL_INT(_kern, OID_AUTO, fscale, CTLFLAG_RD, 0, FSCALE, ""); static void endtsleep(void *); -static void loadav(void *arg); +static void loadav(void); +static void loadav_thread(void *dummy); static void lboltcb(void *arg); /* @@ -577,7 +577,7 @@ * Completely Bogus.. only works with 1:1 (but compiles ok now :-) */ static void -loadav(void *arg) +loadav(void) { int i, nrun; struct loadavg *avg; @@ -606,14 +606,31 @@ for (i = 0; i < 3; i++) avg->ldavg[i] = (cexp[i] * avg->ldavg[i] + nrun * FSCALE * (FSCALE - cexp[i])) >> FSHIFT; +} - /* - * Schedule the next update to occur after 5 seconds, but add a - * random variation to avoid synchronisation with processes that - * run at regular intervals. - */ - callout_reset(&loadav_callout, hz * 4 + (int)(random() % (hz * 2 + 1)), - loadav, NULL); +/* + * Main loop for a kthread that executes loadav() periodically. + */ +static void +loadav_thread(void *dummy) +{ + struct proc *p; + int nowake; + + p = curthread->td_proc; + PROC_LOCK(p); + p->p_flag |= P_NOLOAD; + PROC_UNLOCK(p); + for (;;) { + loadav(); + /* + * Schedule the next update to occur after 5 seconds, but + * add a random variation to avoid synchronisation with + * processes that run at regular intervals. + */ + tsleep(&nowake, curthread->td_priority, "-", hz * 4 + + (int)(random() % (hz * 2 + 1))); + } } static void @@ -632,8 +649,10 @@ callout_init(&lbolt_callout, CALLOUT_MPSAFE); /* Kick off timeout driven events by calling first time. */ - loadav(NULL); lboltcb(NULL); + + /* Kick off loadav kernel process. */ + kthread_create(loadav_thread, NULL, NULL, 0, 0, "loadav"); } /* ==== //depot/projects/smpng/sys/notes#2 (text+ko) ==== @@ -43,6 +43,7 @@ - Untested + Move schedcpu() into its own kthread. + Committed +- Move loadav() into the schedcpu kthread. - Remove some bogus atomic_load_acq()'s and add ia32_pause()'s to stop_cpus() and restart_cpus(). - Untested From owner-p4-projects@FreeBSD.ORG Tue Jan 6 11:48:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED20C16A4D2; Tue, 6 Jan 2004 11:48:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF86316A4D0 for ; Tue, 6 Jan 2004 11:48:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6635E43D41 for ; Tue, 6 Jan 2004 11:47:42 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i06Jlg0B082492 for ; Tue, 6 Jan 2004 11:47:42 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i06JlfNw082489 for perforce@freebsd.org; Tue, 6 Jan 2004 11:47:41 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 6 Jan 2004 11:47:41 -0800 (PST) Message-Id: <200401061947.i06JlfNw082489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 44872 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, 06 Jan 2004 19:48:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=44872 Change 44872 by jhb@jhb_blue on 2004/01/06 11:46:46 IFC @44869. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#65 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#19 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#8 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/smpng/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/smpng/sys/boot/alpha/common/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/elf_freebsd.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#3 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/abort.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/arcconsole.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#4 integrate .. //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#3 integrate .. //depot/projects/smpng/sys/boot/arc/lib/delay.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/devicename.c#3 integrate .. //depot/projects/smpng/sys/boot/arc/lib/elf_freebsd.c#3 integrate .. //depot/projects/smpng/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/setjmperr.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/time.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/loader/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#8 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/devicename.c#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efifpswa.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#11 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0sio.s#2 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#8 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#9 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_net.c#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_time.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#7 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/conf.c#5 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/metadata.c#4 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/start.c#4 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#7 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#16 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#11 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#30 integrate .. //depot/projects/smpng/sys/conf/options.pc98#36 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#23 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#14 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/r128.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/radeon.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#28 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#15 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#15 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#27 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#11 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#19 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#30 integrate .. //depot/projects/smpng/sys/dev/ic/i8259.h#1 branch .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#39 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#43 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#43 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#43 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#9 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#13 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#72 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#71 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#47 integrate .. //depot/projects/smpng/sys/i386/include/elan_mmcr.h#1 branch .. //depot/projects/smpng/sys/i386/include/md_var.h#24 integrate .. //depot/projects/smpng/sys/i386/include/profile.h#8 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/icu.h#9 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#37 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#80 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#66 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#24 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#9 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.h#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_crypt.c#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#13 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.c#12 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.h#3 integrate .. //depot/projects/smpng/sys/netsmb/smb_smb.c#9 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#13 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#18 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#63 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#46 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#61 integrate .. //depot/projects/smpng/sys/sys/proc.h#108 integrate .. //depot/projects/smpng/sys/sys/vnode.h#41 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#34 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#13 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#11 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#38 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#38 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -25,6 +24,8 @@ * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. + * + * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.6 2004/01/04 23:30:47 obrien Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#9 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -42,8 +41,8 @@ */ #include /* RCS ID & Copyright macro defns */ - /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.18 2004/01/04 23:30:47 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#65 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.215 2003/11/14 04:04:14 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1163,12 +1163,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); @@ -1263,8 +1263,8 @@ /* save user context */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1287,12 +1287,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe4 *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe4 *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize); @@ -1386,8 +1386,8 @@ /* save user context */ bzero(&sf, sizeof(struct sigframe)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; @@ -1411,12 +1411,12 @@ * will fail if the process has not already allocated * the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); + sfp = (struct sigframe *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); @@ -1535,9 +1535,9 @@ * Restore the user-supplied information */ if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif /* @@ -1622,9 +1622,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; @@ -1698,9 +1698,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (uc.uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = uc.uc_sigmask; ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#23 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.35 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.36 2004/01/03 23:36:31 davidxu Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 @@ -485,11 +485,11 @@ * and the useracc() check will fail if the process has not already * allocated the space with a `brk'. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sip = (osiginfo_t *)((caddr_t)p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - rndfsize); - p->p_sigstk.ss_flags |= SS_ONSTACK; + sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - rndfsize); + td->td_sigstk.ss_flags |= SS_ONSTACK; } else sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); mtx_unlock(&psp->ps_mtx); @@ -588,9 +588,9 @@ */ PROC_LOCK(p); if (ksc.sc_onstack) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; /* * longjmp is still implemented by calling osigreturn. The new ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#19 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.601 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.602 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -246,8 +246,8 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack = p->p_sigstk; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack = td->td_sigstk; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; bcopy(regs, &sf.sf_uc.uc_mcontext.mc_rdi, sizeof(*regs)); @@ -256,12 +256,12 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(struct sigframe); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(struct sigframe); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128; @@ -403,9 +403,9 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) if (ucp->uc_mcontext.mc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; + td->td_sigstk.ss_flags |= SS_ONSTACK; else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; + td->td_sigstk.ss_flags &= ~SS_ONSTACK; #endif td->td_sigmask = ucp->uc_sigmask; ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.7 2003/12/03 07:00:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.8 2004/01/03 02:02:24 davidxu Exp $"); #include "opt_compat.h" @@ -194,9 +194,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -220,10 +220,10 @@ sf.sf_uc.uc_mcontext.mc_ss = regs->tf_ss; /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct ia32_sigframe4 *)(p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf)); + sfp = (struct ia32_sigframe4 *)(td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf)); } else sfp = (struct ia32_sigframe4 *)regs->tf_rsp - 1; PROC_UNLOCK(p); @@ -308,9 +308,9 @@ /* Save user context. */ bzero(&sf, sizeof(sf)); sf.sf_uc.uc_sigmask = *mask; - sf.sf_uc.uc_stack.ss_sp = (uintptr_t)p->p_sigstk.ss_sp; - sf.sf_uc.uc_stack.ss_size = p->p_sigstk.ss_size; - sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + sf.sf_uc.uc_stack.ss_sp = (uintptr_t)td->td_sigstk.ss_sp; + sf.sf_uc.uc_stack.ss_size = td->td_sigstk.ss_size; + sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); @@ -337,10 +337,10 @@ fpstate_drop(td); /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(sf); + sp = td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(sf); } else sp = (char *)regs->tf_rsp - sizeof(sf); /* Align to 16 bytes. */ ==== //depot/projects/smpng/sys/amd64/isa/atpic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.7 2003/11/21 02:58:26 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.8 2004/01/06 19:05:25 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -53,6 +53,7 @@ #include #include +#include #include #include ==== //depot/projects/smpng/sys/amd64/isa/icu.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.31 2003/11/17 09:19:12 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.32 2004/01/06 19:05:25 jhb Exp $ */ /* @@ -42,8 +42,8 @@ * W. Jolitz 8/89 */ -#ifndef _I386_ISA_ICU_H_ -#define _I386_ISA_ICU_H_ +#ifndef _AMD64_ISA_ICU_H_ +#define _AMD64_ISA_ICU_H_ /* * Interrupt enable bits - in normal order of priority (which we change) @@ -66,57 +66,7 @@ #define IRQ6 0x0040 #define IRQ7 0x0080 /* lowest - parallel printer */ -/* Initialization control word 1. Written to even address. */ -#define ICW1_IC4 0x01 /* ICW4 present */ -#define ICW1_SNGL 0x02 /* 1 = single, 0 = cascaded */ -#define ICW1_ADI 0x04 /* 1 = 4, 0 = 8 byte vectors */ -#define ICW1_LTIM 0x08 /* 1 = level trigger, 0 = edge */ -#define ICW1_RESET 0x10 /* must be 1 */ -/* 0x20 - 0x80 - in 8080/8085 mode only */ - -/* Initialization control word 2. Written to the odd address. */ -/* No definitions, it is the base vector of the IDT for 8086 mode */ - -/* Initialization control word 3. Written to the odd address. */ -/* For a master PIC, bitfield indicating a slave 8259 on given input */ -/* For slave, lower 3 bits are the slave's ID binary id on master */ - -/* Initialization control word 4. Written to the odd address. */ -#define ICW4_8086 0x01 /* 1 = 8086, 0 = 8080 */ -#define ICW4_AEOI 0x02 /* 1 = Auto EOI */ -#define ICW4_MS 0x04 /* 1 = buffered master, 0 = slave */ -#define ICW4_BUF 0x08 /* 1 = enable buffer mode */ -#define ICW4_SFNM 0x10 /* 1 = special fully nested mode */ - -/* Operation control words. Written after initialization. */ - -/* Operation control word type 1 */ /* - * No definitions. Written to the odd address. Bitmask for interrupts. - * 1 = disabled. - */ - -/* Operation control word type 2. Bit 3 (0x08) must be zero. Even address. */ -#define OCW2_L0 0x01 /* Level */ -#define OCW2_L1 0x02 -#define OCW2_L2 0x04 -/* 0x08 must be 0 to select OCW2 vs OCW3 */ -/* 0x10 must be 0 to select OCW2 vs ICW1 */ -#define OCW2_EOI 0x20 /* 1 = EOI */ -#define OCW2_SL 0x40 /* EOI mode */ -#define OCW2_R 0x80 /* EOI mode */ - -/* Operation control word type 3. Bit 3 (0x08) must be set. Even address. */ -#define OCW3_RIS 0x01 /* 1 = read IS, 0 = read IR */ -#define OCW3_RR 0x02 /* register read */ -#define OCW3_P 0x04 /* poll mode command */ -/* 0x08 must be 1 to select OCW3 vs OCW2 */ -#define OCW3_SEL 0x08 /* must be 1 */ -/* 0x10 must be 0 to select OCW3 vs ICW1 */ -#define OCW3_SMM 0x20 /* special mode mask */ -#define OCW3_ESMM 0x40 /* enable SMM */ - -/* * Interrupt Control offset into Interrupt descriptor table (IDT) */ #define ICU_OFFSET 32 /* 0-31 are processor exceptions */ @@ -130,4 +80,4 @@ void atpic_startup(void); #endif -#endif /* !_I386_ISA_ICU_H_ */ +#endif /* !_AMD64_ISA_ICU_H_ */ ==== //depot/projects/smpng/sys/boot/alpha/common/conf.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include "libalpha/libalpha.h" #ifdef LOADER_NET_SUPPORT ==== //depot/projects/smpng/sys/boot/alpha/common/main.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/common/main.c,v 1.13 2000/10/25 23:36:01 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/common/main.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/OSFpal.c#2 (text+ko) ==== @@ -1,8 +1,6 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.3 2000/06/03 08:24:37 dfr Exp $ - * From $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ + * $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ */ - /* * Copyright (c) 1994, 1996 Carnegie-Mellon University. * All rights reserved. @@ -30,6 +28,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_copy.c#2 (text+ko) ==== @@ -22,9 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.5 2000/08/03 09:49:44 jhb Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.6 2004/01/04 23:21:01 obrien Exp $"); + /* * MD primitives supporting placement of module data * ==== //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.3 1999/08/28 00:39:26 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + /* * alpha-specific module functionality. * ==== //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.13 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.14 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.2 1999/08/28 00:39:27 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.4 1999/08/28 00:39:27 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/elf_freebsd.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.12 2003/05/01 03:56:28 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/getsecs.c#2 (text+ko) ==== @@ -1,8 +1,10 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.2 1999/08/28 00:39:27 peter Exp $ - * From: $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ + * $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/prom.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.3 1999/08/28 00:39:28 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.4 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/reboot.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.2 1999/08/28 00:39:29 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#3 (text+ko) ==== @@ -23,10 +23,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.12 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.13 2004/01/04 23:21:01 obrien Exp $"); + /* * SRM disk device handling. * @@ -34,7 +35,6 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/srmnet.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.4 1999/09/06 18:32:40 dfr Exp $ - * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ + * $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ */ /* @@ -35,6 +34,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.5 2004/01/04 23:21:01 obrien Exp $"); + #include #include ==== //depot/projects/smpng/sys/boot/alpha/libalpha/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.2 1999/08/28 00:39:30 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.3 2004/01/04 23:21:01 obrien Exp $"); + #include /* ==== //depot/projects/smpng/sys/boot/arc/lib/abort.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.2 1999/08/28 00:39:35 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/abort.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/smpng/sys/boot/arc/lib/arcconsole.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.2 1999/08/28 00:39:36 peter Exp $ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcconsole.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include "bootstrap.h" ==== //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#4 (text+ko) ==== @@ -23,10 +23,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.6 2003/04/16 21:09:41 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/arcdisk.c,v 1.7 2004/01/04 23:28:01 obrien Exp $"); + /* * ARC disk device handling. * @@ -34,12 +35,10 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include - #include #include "bootstrap.h" ==== //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.5 2003/04/04 16:35:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/bootinfo.c,v 1.6 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/boot/arc/lib/delay.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.2 1999/08/28 00:39:37 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/delay.c,v 1.3 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "arctypes.h" ==== //depot/projects/smpng/sys/boot/arc/lib/devicename.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.3 2003/04/16 21:09:41 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/devicename.c,v 1.4 2004/01/04 23:28:01 obrien Exp $"); + #include #include #include "bootstrap.h" ==== //depot/projects/smpng/sys/boot/arc/lib/elf_freebsd.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.4 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.5 2004/01/04 23:28:01 obrien Exp $"); + #include #include ==== //depot/projects/smpng/sys/boot/arc/lib/module.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 6 12:09:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B57C16A4D1; Tue, 6 Jan 2004 12:09:46 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8C8316A4CE for ; Tue, 6 Jan 2004 12:09:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8507D43D54 for ; Tue, 6 Jan 2004 12:09:22 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i06K9M0B087587 for ; Tue, 6 Jan 2004 12:09:22 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i06K9Lwl087584 for perforce@freebsd.org; Tue, 6 Jan 2004 12:09:21 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 6 Jan 2004 12:09:21 -0800 (PST) Message-Id: <200401062009.i06K9Lwl087584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44878 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, 06 Jan 2004 20:09:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=44878 Change 44878 by sam@sam_ebb on 2004/01/06 12:08:33 IFC Affected files ... .. //depot/projects/netperf/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/netperf/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/netperf/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/netperf/sys/boot/i386/boot0/boot0sio.s#3 integrate .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/netperf/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/netperf/sys/conf/options.pc98#7 integrate .. //depot/projects/netperf/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/netperf/sys/dev/drm/drm_bufs.h#6 integrate .. //depot/projects/netperf/sys/dev/drm/drm_drv.h#6 integrate .. //depot/projects/netperf/sys/dev/drm/drm_sysctl.h#5 integrate .. //depot/projects/netperf/sys/dev/drm/mga_dma.c#5 integrate .. //depot/projects/netperf/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/netperf/sys/dev/drm/r128.h#4 integrate .. //depot/projects/netperf/sys/dev/drm/r128_cce.c#5 integrate .. //depot/projects/netperf/sys/dev/drm/r128_drv.h#4 integrate .. //depot/projects/netperf/sys/dev/drm/radeon.h#6 integrate .. //depot/projects/netperf/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/netperf/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/netperf/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/netperf/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/netperf/sys/dev/firewire/fwmem.c#6 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci.c#9 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohcireg.h#5 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/netperf/sys/dev/firewire/if_fwe.c#10 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.c#12 integrate .. //depot/projects/netperf/sys/dev/ic/i8259.h#1 branch .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs.h#11 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#11 integrate .. //depot/projects/netperf/sys/i386/i386/elan-mmcr.c#7 integrate .. //depot/projects/netperf/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/netperf/sys/i386/include/elan_mmcr.h#1 branch .. //depot/projects/netperf/sys/i386/include/md_var.h#5 integrate .. //depot/projects/netperf/sys/i386/include/profile.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/atpic.c#5 integrate .. //depot/projects/netperf/sys/i386/isa/icu.h#5 integrate .. //depot/projects/netperf/sys/kern/kern_lock.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/netperf/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/netperf/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/netperf/sys/sys/vnode.h#8 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/isa/atpic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.7 2003/11/21 02:58:26 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.8 2004/01/06 19:05:25 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -53,6 +53,7 @@ #include #include +#include #include #include ==== //depot/projects/netperf/sys/amd64/isa/icu.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.31 2003/11/17 09:19:12 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.32 2004/01/06 19:05:25 jhb Exp $ */ /* @@ -42,8 +42,8 @@ * W. Jolitz 8/89 */ -#ifndef _I386_ISA_ICU_H_ -#define _I386_ISA_ICU_H_ +#ifndef _AMD64_ISA_ICU_H_ +#define _AMD64_ISA_ICU_H_ /* * Interrupt enable bits - in normal order of priority (which we change) @@ -66,57 +66,7 @@ #define IRQ6 0x0040 #define IRQ7 0x0080 /* lowest - parallel printer */ -/* Initialization control word 1. Written to even address. */ -#define ICW1_IC4 0x01 /* ICW4 present */ -#define ICW1_SNGL 0x02 /* 1 = single, 0 = cascaded */ -#define ICW1_ADI 0x04 /* 1 = 4, 0 = 8 byte vectors */ -#define ICW1_LTIM 0x08 /* 1 = level trigger, 0 = edge */ -#define ICW1_RESET 0x10 /* must be 1 */ -/* 0x20 - 0x80 - in 8080/8085 mode only */ - -/* Initialization control word 2. Written to the odd address. */ -/* No definitions, it is the base vector of the IDT for 8086 mode */ - -/* Initialization control word 3. Written to the odd address. */ -/* For a master PIC, bitfield indicating a slave 8259 on given input */ -/* For slave, lower 3 bits are the slave's ID binary id on master */ - -/* Initialization control word 4. Written to the odd address. */ -#define ICW4_8086 0x01 /* 1 = 8086, 0 = 8080 */ -#define ICW4_AEOI 0x02 /* 1 = Auto EOI */ -#define ICW4_MS 0x04 /* 1 = buffered master, 0 = slave */ -#define ICW4_BUF 0x08 /* 1 = enable buffer mode */ -#define ICW4_SFNM 0x10 /* 1 = special fully nested mode */ - -/* Operation control words. Written after initialization. */ - -/* Operation control word type 1 */ /* - * No definitions. Written to the odd address. Bitmask for interrupts. - * 1 = disabled. - */ - -/* Operation control word type 2. Bit 3 (0x08) must be zero. Even address. */ -#define OCW2_L0 0x01 /* Level */ -#define OCW2_L1 0x02 -#define OCW2_L2 0x04 -/* 0x08 must be 0 to select OCW2 vs OCW3 */ -/* 0x10 must be 0 to select OCW2 vs ICW1 */ -#define OCW2_EOI 0x20 /* 1 = EOI */ -#define OCW2_SL 0x40 /* EOI mode */ -#define OCW2_R 0x80 /* EOI mode */ - -/* Operation control word type 3. Bit 3 (0x08) must be set. Even address. */ -#define OCW3_RIS 0x01 /* 1 = read IS, 0 = read IR */ -#define OCW3_RR 0x02 /* register read */ -#define OCW3_P 0x04 /* poll mode command */ -/* 0x08 must be 1 to select OCW3 vs OCW2 */ -#define OCW3_SEL 0x08 /* must be 1 */ -/* 0x10 must be 0 to select OCW3 vs ICW1 */ -#define OCW3_SMM 0x20 /* special mode mask */ -#define OCW3_ESMM 0x40 /* enable SMM */ - -/* * Interrupt Control offset into Interrupt descriptor table (IDT) */ #define ICU_OFFSET 32 /* 0-31 are processor exceptions */ @@ -130,4 +80,4 @@ void atpic_startup(void); #endif -#endif /* !_I386_ISA_ICU_H_ */ +#endif /* !_AMD64_ISA_ICU_H_ */ ==== //depot/projects/netperf/sys/boot/i386/boot0/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.19 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.20 2004/01/06 18:46:35 obrien Exp $ PROG?= boot0 NOMAN= @@ -23,13 +23,21 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x600 +# Comm settings for boot0sio. 0xE3 => 9600 8-N-1 +# XXX: We should create a build-tool or something to convert BOOT_CONSOLE_SPEED +# and BOOT_COMCONSOLE_PORT into the correct values to define on the build +# command line +BOOT_BOOT0_COMCONSOLE_SPEED?= 0xE3 + ${PROG}: ${PROG}.o ${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o ${PROG}.out ${PROG}.o objcopy -S -O binary ${PROG}.out ${.TARGET} ${PROG}.o: ${PROG}.s ${AS} ${AFLAGS} --defsym FLAGS=${BOOT_BOOT0_FLAGS} \ - --defsym TICKS=${BOOT_BOOT0_TICKS} ${.IMPSRC} -o ${.TARGET} + --defsym TICKS=${BOOT_BOOT0_TICKS} \ + --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED} \ + ${.IMPSRC} -o ${.TARGET} CLEANFILES+= ${PROG}.out ${PROG}.o ==== //depot/projects/netperf/sys/boot/i386/boot0/boot0sio.s#3 (text+ko) ==== @@ -14,7 +14,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.2 2003/12/09 05:40:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.3 2004/01/06 18:46:35 obrien Exp $ # A 512-byte boot manager which uses a serial console on COM1. @@ -95,8 +95,7 @@ # main: pushw %dx # Save xorw %dx,%dx # Port: COM1 - movb $0xE3,%al # 9600 8-N-1 - + movb COMSPEED,%al # defined by Makefile movb $0x00,%ah # BIOS: Set COM Port int $0x14 # Parameters popw %dx # Restore ==== //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.21 2004/01/04 21:22:25 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.22 2004/01/06 07:09:26 wpaul Exp $"); #include #include @@ -1179,6 +1179,7 @@ block->nmb_ifp = &sc->arpcom.ac_if; block->nmb_dev = sc->ndis_dev; + block->nmb_img = img; return(0); } ==== //depot/projects/netperf/sys/compat/ndis/ndis_var.h#8 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.11 2004/01/04 07:47:33 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.12 2004/01/06 07:09:26 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1280,6 +1280,7 @@ ndis_status nmb_getstat; ndis_status nmb_setstat; struct nte_head nmb_timerlist; + vm_offset_t nmb_img; }; typedef ndis_status (*ndis_init_handler)(ndis_status *, uint32_t *, ==== //depot/projects/netperf/sys/compat/ndis/pe_var.h#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/sys/compat/ndis/pe_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.3 2004/01/06 18:06:54 wpaul Exp $ */ #ifndef _PE_VAR_H_ @@ -230,6 +230,29 @@ #define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 #define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 +/* Resource types */ + +#define RT_CURSOR 1 +#define RT_BITMAP 2 +#define RT_ICON 3 +#define RT_MENU 4 +#define RT_DIALOG 5 +#define RT_STRING 6 +#define RT_FONTDIR 7 +#define RT_FONT 8 +#define RT_ACCELERATOR 9 +#define RT_RCDATA 10 +#define RT_MESSAGETABLE 11 +#define RT_GROUP_CURSOR 12 +#define RT_GROUP_ICON 14 +#define RT_VERSION 16 +#define RT_DLGINCLUDE 17 +#define RT_PLUGPLAY 19 +#define RT_VXD 20 +#define RT_ANICURSOR 21 +#define RT_ANIICON 22 +#define RT_HTML 23 + /* * Section header format. */ @@ -303,7 +326,81 @@ #define IMAGE_REL_BASED_DIR64 10 #define IMAGE_REL_BASED_HIGH3ADJ 11 +struct image_resource_directory_entry { + uint32_t irde_name; + uint32_t irde_dataoff; +}; +typedef struct image_resource_directory_entry image_resource_directory_entry; + +#define RESOURCE_NAME_STR 0x80000000 +#define RESOURCE_DIR_FLAG 0x80000000 + +struct image_resource_directory { + uint32_t ird_characteristics; + uint32_t ird_timestamp; + uint16_t ird_majorver; + uint16_t ird_minorver; + uint16_t ird_named_entries; + uint16_t ird_id_entries; +#ifdef notdef + image_resource_directory_entry ird_entries[1]; +#endif +}; + +typedef struct image_resource_directory image_resource_directory; + +struct image_resource_directory_string { + uint16_t irds_len; + char irds_name[1]; +}; + +typedef struct image_resource_directory_string image_resource_directory_string; + +struct image_resource_directory_string_u { + uint16_t irds_len; + char irds_name[1]; +}; + +typedef struct image_resource_directory_string_u + image_resource_directory_string_u; + +struct image_resource_data_entry { + uint32_t irde_offset; + uint32_t irde_size; + uint32_t irde_codepage; + uint32_t irde_rsvd; +}; + +typedef struct image_resource_data_entry image_resource_data_entry; + +struct message_resource_data { + uint32_t mrd_numblocks; +#ifdef notdef + message_resource_block mrd_blocks[1]; +#endif +}; + +typedef struct message_resource_data message_resource_data; + +struct message_resource_block { + uint32_t mrb_lowid; + uint32_t mrb_highid; + uint32_t mrb_entryoff; +}; + +typedef struct message_resource_block message_resource_block; + +struct message_resource_entry { + uint16_t mre_len; + uint16_t mre_flags; + char mre_text[]; +}; + +typedef struct message_resource_entry message_resource_entry; + +#define MESSAGE_RESOURCE_UNICODE 0x0001 + struct image_patch_table { char *ipt_name; void (*ipt_func)(void); @@ -325,6 +422,8 @@ extern int pe_relocate(vm_offset_t); extern int pe_get_import_descriptor(vm_offset_t, image_import_descriptor *, char *); extern int pe_patch_imports(vm_offset_t, char *, image_patch_table *); +extern int pe_get_messagetable(vm_offset_t, message_resource_data **); +extern int pe_get_message(vm_offset_t, uint32_t, char **, int *, uint16_t *); __END_DECLS #endif /* _PE_VAR_H_ */ ==== //depot/projects/netperf/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.25 2004/01/04 21:22:25 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.27 2004/01/06 18:06:54 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -795,11 +795,19 @@ { ndis_miniport_block *block; va_list ap; - int i; + int i, error; + char *str = NULL, *ustr = NULL; + uint16_t flags; block = (ndis_miniport_block *)adapter; - device_printf (block->nmb_dev, "NDIS ERROR: %x\n", code); + error = pe_get_message(block->nmb_img, code, &str, &i, &flags); + if (error == 0 && flags & MESSAGE_RESOURCE_UNICODE) { + ndis_unicode_to_ascii((uint16_t *)str, i, &ustr); + str = ustr; + } + device_printf (block->nmb_dev, "NDIS ERROR: %x (%s)\n", code, + str == NULL ? "unknown error" : str); device_printf (block->nmb_dev, "NDIS NUMERRORS: %x\n", numerrors); va_start(ap, numerrors); @@ -808,6 +816,8 @@ va_arg(ap, void *)); va_end(ap); + if (ustr != NULL) + free(ustr, M_DEVBUF); return; } @@ -1894,7 +1904,14 @@ uint8_t shared; ndis_interrupt_mode imode; { + ndis_miniport_block *block; + + block = adapter; + intr->ni_block = adapter; + intr->ni_isrreq = reqisr; + intr->ni_shared = shared; + block->nmb_interrupt = intr; return(NDIS_STATUS_SUCCESS); } ==== //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.7 2004/01/04 07:47:33 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.8 2004/01/06 07:09:26 wpaul Exp $"); #include #include @@ -59,6 +59,8 @@ #include #define __stdcall __attribute__((__stdcall__)) +#define __regparm __attribute__((regparm(3))) + #define FUNC void(*)(void) __stdcall static uint32_t ntoskrnl_unicode_equal(ndis_unicode_string *, @@ -82,13 +84,13 @@ __stdcall static int64_t _allmul(int64_t, int64_t); __stdcall static int64_t _alldiv(int64_t, int64_t); __stdcall static int64_t _allrem(int64_t, int64_t); -__stdcall static int64_t _allshr(int64_t, int); -__stdcall static int64_t _allshl(int64_t, int); +__regparm static int64_t _allshr(int64_t, uint8_t); +__regparm static int64_t _allshl(int64_t, uint8_t); __stdcall static uint64_t _aullmul(uint64_t, uint64_t); __stdcall static uint64_t _aulldiv(uint64_t, uint64_t); __stdcall static uint64_t _aullrem(uint64_t, uint64_t); -__stdcall static uint64_t _aullshr(uint64_t, int); -__stdcall static uint64_t _aullshl(uint64_t, int); +__regparm static uint64_t _aullshr(uint64_t, uint8_t); +__regparm static uint64_t _aullshl(uint64_t, uint8_t); __stdcall static void *ntoskrnl_allocfunc(uint32_t, size_t, uint32_t); __stdcall static void ntoskrnl_freefunc(void *); __stdcall static void ntoskrnl_init_lookaside(paged_lookaside_list *, @@ -108,11 +110,13 @@ kspin_lock * */void); __stdcall static void ntoskrnl_lock_dpc(/*kspin_lock * */ void); __stdcall static void ntoskrnl_unlock_dpc(/*kspin_lock * */ void); -__stdcall static void ntoskrnl_interlock_inc(/*volatile uint32_t * */ void); -__stdcall static void ntoskrnl_interlock_dec(/*volatile uint32_t * */ void); +__stdcall static uint32_t + ntoskrnl_interlock_inc(/*volatile uint32_t * */ void); +__stdcall static uint32_t + ntoskrnl_interlock_dec(/*volatile uint32_t * */ void); __stdcall static void ntoskrnl_freemdl(ndis_buffer *); __stdcall static void *ntoskrnl_mmaplockedpages(ndis_buffer *, uint8_t); -__stdcall static void ntoskrnl_create_lock(kspin_lock *); +__stdcall static void ntoskrnl_init_lock(kspin_lock *); __stdcall static void dummy(void); __stdcall static size_t ntoskrnl_memcmp(const void *, const void *, size_t); @@ -121,7 +125,7 @@ int ntoskrnl_libinit() { - mtx_init(&ntoskrnl_interlock, "ntoskrnllock", MTX_NETWORK_LOCK, + mtx_init(&ntoskrnl_interlock, "ntoskrnllock", "ntoskrnl interlock", MTX_DEF | MTX_RECURSE); return(0); @@ -333,34 +337,34 @@ return (a % b); } -__stdcall static int64_t +__regparm static int64_t _allshl(a, b) int64_t a; - int b; + uint8_t b; { return (a << b); } -__stdcall static uint64_t +__regparm static uint64_t _aullshl(a, b) uint64_t a; - int b; + uint8_t b; { return (a << b); } -__stdcall static int64_t +__regparm static int64_t _allshr(a, b) int64_t a; - int b; + uint8_t b; { return (a >> b); } -__stdcall static uint64_t +__regparm static uint64_t _aullshr(a, b) uint64_t a; - int b; + uint8_t b; { return (a >> b); } @@ -567,7 +571,7 @@ return; } -__stdcall static void +__stdcall static uint32_t ntoskrnl_interlock_inc(/*addend*/ void) { volatile uint32_t *addend; @@ -578,10 +582,10 @@ (*addend)++; mtx_unlock(&ntoskrnl_interlock); - return; + return(*addend); } -__stdcall static void +__stdcall static uint32_t ntoskrnl_interlock_dec(/*addend*/ void) { volatile uint32_t *addend; @@ -592,7 +596,7 @@ (*addend)--; mtx_unlock(&ntoskrnl_interlock); - return; + return(*addend); } __stdcall static void @@ -623,20 +627,20 @@ return(MDL_VA(buf)); } +/* + * The KeInitializeSpinLock(), KefAcquireSpinLockAtDpcLevel() + * and KefReleaseSpinLockFromDpcLevel() appear to be analagous + * to splnet()/splx() in their use. We can't create a new mutex + * lock here because there is no complimentary KeFreeSpinLock() + * function. For now, what we do is initialize the lock with + * a pointer to the ntoskrnl interlock mutex. + */ __stdcall static void -ntoskrnl_create_lock(lock) +ntoskrnl_init_lock(lock) kspin_lock *lock; { - struct mtx *mtx; + *lock = (kspin_lock)&ntoskrnl_interlock; - mtx = malloc(sizeof(struct mtx), M_DEVBUF, M_NOWAIT|M_ZERO); - if (mtx == NULL) - return; - mtx_init(mtx, "ntoslock", "ntoskrnl spinlock", - MTX_DEF | MTX_RECURSE | MTX_DUPOK); - - *lock = (kspin_lock)mtx; - return; } @@ -715,7 +719,7 @@ { "InterlockedDecrement", (FUNC)ntoskrnl_interlock_dec }, { "IoFreeMdl", (FUNC)ntoskrnl_freemdl }, { "MmMapLockedPages", (FUNC)ntoskrnl_mmaplockedpages }, - { "KeInitializeSpinLock", (FUNC)ntoskrnl_create_lock }, + { "KeInitializeSpinLock", (FUNC)ntoskrnl_init_lock }, /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/netperf/sys/compat/ndis/subr_pe.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.3 2003/12/26 03:31:34 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.5 2004/01/06 18:06:54 wpaul Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -456,6 +456,91 @@ return (ENOENT); } +int +pe_get_messagetable(imgbase, md) + vm_offset_t imgbase; + message_resource_data **md; +{ + image_resource_directory *rdir, *rtype; + image_resource_directory_entry *dent, *dent2; + image_resource_data_entry *rent; + vm_offset_t offset; + int i; + + if (imgbase == 0) + return(EINVAL); + + offset = pe_directory_offset(imgbase, IMAGE_DIRECTORY_ENTRY_RESOURCE); + if (offset == 0) + return (ENOENT); + + rdir = (image_resource_directory *)offset; + + dent = (image_resource_directory_entry *)(offset + + sizeof(image_resource_directory)); + + for (i = 0; i < rdir->ird_id_entries; i++){ + if (dent->irde_name != RT_MESSAGETABLE) { + dent++; + continue; + } + dent2 = dent; + while (dent2->irde_dataoff & RESOURCE_DIR_FLAG) { + rtype = (image_resource_directory *)(offset + + (dent2->irde_dataoff & ~RESOURCE_DIR_FLAG)); + dent2 = (image_resource_directory_entry *) + ((uintptr_t)rtype + + sizeof(image_resource_directory)); + } + rent = (image_resource_data_entry *)(offset + + dent2->irde_dataoff); + *md = (message_resource_data *)pe_translate_addr(imgbase, + rent->irde_offset); + return(0); + } + + return(ENOENT); +} + +int +pe_get_message(imgbase, id, str, len, flags) + vm_offset_t imgbase; + uint32_t id; + char **str; + int *len; + uint16_t *flags; +{ + message_resource_data *md = NULL; + message_resource_block *mb; + message_resource_entry *me; + uint32_t i; + + pe_get_messagetable(imgbase, &md); + + if (md == NULL) + return(ENOENT); + + mb = (message_resource_block *)((uintptr_t)md + + sizeof(message_resource_data)); + + for (i = 0; i < md->mrd_numblocks; i++) { + if (id >= mb->mrb_lowid && id <= mb->mrb_highid) { + me = (message_resource_entry *)((uintptr_t)md + + mb->mrb_entryoff); + for (i = id - mb->mrb_lowid; i > 0; i--) + me = (message_resource_entry *)((uintptr_t)me + + me->mre_len); + *str = me->mre_text; + *len = me->mre_len; + *flags = me->mre_flags; + return(0); + } + mb++; + } + + return(ENOENT); +} + /* * Find the function that matches a particular name. This doesn't * need to be particularly speedy since it's only run when loading ==== //depot/projects/netperf/sys/conf/options.pc98#7 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.172 2003/12/30 07:28:54 bde Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.173 2004/01/06 18:51:14 jhb Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h -AUTO_EOI_2 opt_auto_eoi.h BROKEN_KEYBOARD_RESET opt_reset.h COMPAT_OLDISA I586_PMC_GUPROF opt_i586_guprof.h ==== //depot/projects/netperf/sys/dev/drm/drmP.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.8 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.9 2004/01/06 04:34:52 anholt Exp $ */ #ifndef _DRM_P_H_ @@ -268,7 +268,7 @@ int enabled; int acquired; unsigned long base; - int agp_mtrr; + int mtrr; int cant_use_aperture; unsigned long page_mask; } drm_agp_head_t; @@ -288,7 +288,7 @@ drm_map_flags_t flags; /* Flags */ void *handle; /* User-space: "Handle" to pass to mmap */ /* Kernel-space: kernel-virtual address */ - int mtrr; /* MTRR slot used */ + int mtrr; /* Boolean: MTRR used */ /* Private data */ bus_space_tag_t iot; bus_space_handle_t ioh; ==== //depot/projects/netperf/sys/dev/drm/drm_bufs.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.9 2003/12/23 14:38:42 se Exp $ + * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.10 2004/01/06 04:34:52 anholt Exp $ */ #include "dev/drm/drmP.h" @@ -88,7 +88,7 @@ map->size = request.size; map->type = request.type; map->flags = request.flags; - map->mtrr = -1; + map->mtrr = 0; map->handle = 0; /* Only allow shared memory to be removable since we only keep enough @@ -105,28 +105,23 @@ DRM(free)( map, sizeof(*map), DRM_MEM_MAPS ); return DRM_ERR(EINVAL); } + if (map->offset + map->size < map->offset) { + DRM(free)(map, sizeof(*map), DRM_MEM_MAPS); + return DRM_ERR(EINVAL); + } switch ( map->type ) { case _DRM_REGISTERS: + DRM_IOREMAP(map, dev); + if (!(map->flags & _DRM_WRITE_COMBINING)) + break; + /* FALLTHROUGH */ case _DRM_FRAME_BUFFER: - if ( map->offset + map->size < map->offset ) { - DRM(free)( map, sizeof(*map), DRM_MEM_MAPS ); - return DRM_ERR(EINVAL); - } #if __REALLY_HAVE_MTRR - if ( map->type == _DRM_FRAME_BUFFER || - (map->flags & _DRM_WRITE_COMBINING) ) { - int mtrr; - - mtrr = DRM(mtrr_add)(map->offset, map->size, - DRM_MTRR_WC); - if (mtrr == 0) - map->mtrr = 1; - } -#endif /* __REALLY_HAVE_MTRR */ - DRM_IOREMAP(map, dev); + if (DRM(mtrr_add)(map->offset, map->size, DRM_MTRR_WC) == 0) + map->mtrr = 1; +#endif break; - case _DRM_SHM: map->handle = (void *)DRM(alloc)(map->size, DRM_MEM_SAREA); DRM_DEBUG( "%lu %d %p\n", @@ -153,7 +148,7 @@ #if __REALLY_HAVE_AGP case _DRM_AGP: map->offset += dev->agp->base; - map->mtrr = dev->agp->agp_mtrr; /* for getmap */ + map->mtrr = dev->agp->mtrr; /* for getmap */ break; #endif case _DRM_SCATTER_GATHER: @@ -232,12 +227,12 @@ case _DRM_REGISTERS: case _DRM_FRAME_BUFFER: #if __REALLY_HAVE_MTRR - if (map->mtrr >= 0) { - int __unused mtrr; + if (map->mtrr) { + int __unused retcode; - mtrr = DRM(mtrr_del)(map->offset, map->size, + retcode = DRM(mtrr_del)(map->offset, map->size, DRM_MTRR_WC); - DRM_DEBUG("mtrr_del = %d\n", mtrr); + DRM_DEBUG("mtrr_del = %d\n", retcode); } #endif DRM(ioremapfree)(map); ==== //depot/projects/netperf/sys/dev/drm/drm_drv.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.17 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.18 2004/01/06 04:34:52 anholt Exp $ */ /* @@ -566,17 +566,18 @@ map = list->map; switch ( map->type ) { case _DRM_REGISTERS: + DRM(ioremapfree)(map); + /* FALLTHROUGH */ case _DRM_FRAME_BUFFER: #if __REALLY_HAVE_MTRR - if ( map->mtrr >= 0 ) { - int __unused mtrr; + if (map->mtrr) { + int __unused retcode; - mtrr = DRM(mtrr_del)(map->offset, + retcode = DRM(mtrr_del)(map->offset, map->size, DRM_MTRR_WC); - DRM_DEBUG("mtrr_del=%d\n", mtrr); + DRM_DEBUG("mtrr_del = %d", retcode); } #endif - DRM(ioremapfree)( map ); break; case _DRM_SHM: DRM(free)(map->handle, @@ -680,12 +681,9 @@ #endif /* __MUST_HAVE_AGP */ #if __REALLY_HAVE_MTRR if (dev->agp) { - int retcode; - - retcode = DRM(mtrr_add)(dev->agp->info.ai_aperture_base, - dev->agp->info.ai_aperture_size, DRM_MTRR_WC); - if (retcode == 0) - dev->agp->agp_mtrr=1; + if (DRM(mtrr_add)(dev->agp->info.ai_aperture_base, + dev->agp->info.ai_aperture_size, DRM_MTRR_WC) == 0) + dev->agp->mtrr = 1; } #endif /* __REALLY_HAVE_MTRR */ #endif /* __REALLY_HAVE_AGP */ @@ -743,12 +741,12 @@ #endif #if __REALLY_HAVE_AGP && __REALLY_HAVE_MTRR - if ( dev->agp && dev->agp->agp_mtrr >= 0) { - int __unused mtrr; + if (dev->agp && dev->agp->mtrr) { + int __unused retcode; - mtrr = DRM(mtrr_del)(dev->agp->info.ai_aperture_base, + retcode = DRM(mtrr_del)(dev->agp->info.ai_aperture_base, dev->agp->info.ai_aperture_size, DRM_MTRR_WC); - DRM_DEBUG("mtrr_del=%d\n", mtrr); + DRM_DEBUG("mtrr_del = %d", retcode); } #endif ==== //depot/projects/netperf/sys/dev/drm/drm_sysctl.h#5 (text+ko) ==== @@ -21,7 +21,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.6 2003/10/24 21:45:21 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.7 2004/01/06 04:34:52 anholt Exp $ */ #ifdef __FreeBSD__ @@ -194,7 +194,7 @@ else type = types[map->type]; - if (map->mtrr <= 0) + if (!map->mtrr) yesno = "no"; else yesno = "yes"; ==== //depot/projects/netperf/sys/dev/drm/mga_dma.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ * Rewritten by: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.9 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.10 2004/01/06 04:34:53 anholt Exp $ */ #include "dev/drm/mga.h" @@ -502,14 +502,6 @@ return DRM_ERR(EINVAL); } - DRM_FIND_MAP( dev_priv->fb, init->fb_offset ); - if(!dev_priv->fb) { - DRM_ERROR( "failed to find framebuffer!\n" ); - /* Assign dev_private so we can do cleanup. */ - dev->dev_private = (void *)dev_priv; - mga_do_cleanup_dma( dev ); - return DRM_ERR(EINVAL); - } DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset ); if(!dev_priv->mmio) { DRM_ERROR( "failed to find mmio region!\n" ); ==== //depot/projects/netperf/sys/dev/drm/mga_drv.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * Authors: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/mga_drv.h,v 1.6 2003/08/19 02:57:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/mga_drv.h,v 1.7 2004/01/06 04:34:53 anholt Exp $ */ #ifndef __MGA_DRV_H__ @@ -93,7 +93,6 @@ unsigned int texture_size; drm_local_map_t *sarea; - drm_local_map_t *fb; drm_local_map_t *mmio; drm_local_map_t *status; drm_local_map_t *warp; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 6 12:10:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16EBA16A4D1; Tue, 6 Jan 2004 12:10:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3E7316A4CE for ; Tue, 6 Jan 2004 12:10:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECA5743D46 for ; Tue, 6 Jan 2004 12:10:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i06KAO0B087666 for ; Tue, 6 Jan 2004 12:10:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i06KANB0087663 for perforce@freebsd.org; Tue, 6 Jan 2004 12:10:23 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 6 Jan 2004 12:10:23 -0800 (PST) Message-Id: <200401062010.i06KANB0087663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44879 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, 06 Jan 2004 20:10:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=44879 Change 44879 by sam@sam_ebb on 2004/01/06 12:09:43 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0sio.s#3 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#5 integrate .. //depot/projects/netperf+sockets/sys/conf/options.pc98#4 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_bufs.h#4 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_drv.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_sysctl.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/r128.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/radeon.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ic/i8259.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#6 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#6 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/netperf+sockets/sys/i386/include/elan_mmcr.h#1 branch .. //depot/projects/netperf+sockets/sys/i386/include/md_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/i386/include/profile.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/icu.h#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_lock.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/netperf+sockets/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/netperf+sockets/sys/sys/vnode.h#4 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/amd64/isa/atpic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.7 2003/11/21 02:58:26 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.8 2004/01/06 19:05:25 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -53,6 +53,7 @@ #include #include +#include #include #include ==== //depot/projects/netperf+sockets/sys/amd64/isa/icu.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.31 2003/11/17 09:19:12 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.32 2004/01/06 19:05:25 jhb Exp $ */ /* @@ -42,8 +42,8 @@ * W. Jolitz 8/89 */ -#ifndef _I386_ISA_ICU_H_ -#define _I386_ISA_ICU_H_ +#ifndef _AMD64_ISA_ICU_H_ +#define _AMD64_ISA_ICU_H_ /* * Interrupt enable bits - in normal order of priority (which we change) @@ -66,57 +66,7 @@ #define IRQ6 0x0040 #define IRQ7 0x0080 /* lowest - parallel printer */ -/* Initialization control word 1. Written to even address. */ -#define ICW1_IC4 0x01 /* ICW4 present */ -#define ICW1_SNGL 0x02 /* 1 = single, 0 = cascaded */ -#define ICW1_ADI 0x04 /* 1 = 4, 0 = 8 byte vectors */ -#define ICW1_LTIM 0x08 /* 1 = level trigger, 0 = edge */ -#define ICW1_RESET 0x10 /* must be 1 */ -/* 0x20 - 0x80 - in 8080/8085 mode only */ - -/* Initialization control word 2. Written to the odd address. */ -/* No definitions, it is the base vector of the IDT for 8086 mode */ - -/* Initialization control word 3. Written to the odd address. */ -/* For a master PIC, bitfield indicating a slave 8259 on given input */ -/* For slave, lower 3 bits are the slave's ID binary id on master */ - -/* Initialization control word 4. Written to the odd address. */ -#define ICW4_8086 0x01 /* 1 = 8086, 0 = 8080 */ -#define ICW4_AEOI 0x02 /* 1 = Auto EOI */ -#define ICW4_MS 0x04 /* 1 = buffered master, 0 = slave */ -#define ICW4_BUF 0x08 /* 1 = enable buffer mode */ -#define ICW4_SFNM 0x10 /* 1 = special fully nested mode */ - -/* Operation control words. Written after initialization. */ - -/* Operation control word type 1 */ /* - * No definitions. Written to the odd address. Bitmask for interrupts. - * 1 = disabled. - */ - -/* Operation control word type 2. Bit 3 (0x08) must be zero. Even address. */ -#define OCW2_L0 0x01 /* Level */ -#define OCW2_L1 0x02 -#define OCW2_L2 0x04 -/* 0x08 must be 0 to select OCW2 vs OCW3 */ -/* 0x10 must be 0 to select OCW2 vs ICW1 */ -#define OCW2_EOI 0x20 /* 1 = EOI */ -#define OCW2_SL 0x40 /* EOI mode */ -#define OCW2_R 0x80 /* EOI mode */ - -/* Operation control word type 3. Bit 3 (0x08) must be set. Even address. */ -#define OCW3_RIS 0x01 /* 1 = read IS, 0 = read IR */ -#define OCW3_RR 0x02 /* register read */ -#define OCW3_P 0x04 /* poll mode command */ -/* 0x08 must be 1 to select OCW3 vs OCW2 */ -#define OCW3_SEL 0x08 /* must be 1 */ -/* 0x10 must be 0 to select OCW3 vs ICW1 */ -#define OCW3_SMM 0x20 /* special mode mask */ -#define OCW3_ESMM 0x40 /* enable SMM */ - -/* * Interrupt Control offset into Interrupt descriptor table (IDT) */ #define ICU_OFFSET 32 /* 0-31 are processor exceptions */ @@ -130,4 +80,4 @@ void atpic_startup(void); #endif -#endif /* !_I386_ISA_ICU_H_ */ +#endif /* !_AMD64_ISA_ICU_H_ */ ==== //depot/projects/netperf+sockets/sys/boot/i386/boot0/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.19 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.20 2004/01/06 18:46:35 obrien Exp $ PROG?= boot0 NOMAN= @@ -23,13 +23,21 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x600 +# Comm settings for boot0sio. 0xE3 => 9600 8-N-1 +# XXX: We should create a build-tool or something to convert BOOT_CONSOLE_SPEED +# and BOOT_COMCONSOLE_PORT into the correct values to define on the build +# command line +BOOT_BOOT0_COMCONSOLE_SPEED?= 0xE3 + ${PROG}: ${PROG}.o ${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o ${PROG}.out ${PROG}.o objcopy -S -O binary ${PROG}.out ${.TARGET} ${PROG}.o: ${PROG}.s ${AS} ${AFLAGS} --defsym FLAGS=${BOOT_BOOT0_FLAGS} \ - --defsym TICKS=${BOOT_BOOT0_TICKS} ${.IMPSRC} -o ${.TARGET} + --defsym TICKS=${BOOT_BOOT0_TICKS} \ + --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED} \ + ${.IMPSRC} -o ${.TARGET} CLEANFILES+= ${PROG}.out ${PROG}.o ==== //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0sio.s#3 (text+ko) ==== @@ -14,7 +14,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.2 2003/12/09 05:40:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.3 2004/01/06 18:46:35 obrien Exp $ # A 512-byte boot manager which uses a serial console on COM1. @@ -95,8 +95,7 @@ # main: pushw %dx # Save xorw %dx,%dx # Port: COM1 - movb $0xE3,%al # 9600 8-N-1 - + movb COMSPEED,%al # defined by Makefile movb $0x00,%ah # BIOS: Set COM Port int $0x14 # Parameters popw %dx # Restore ==== //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.21 2004/01/04 21:22:25 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.22 2004/01/06 07:09:26 wpaul Exp $"); #include #include @@ -1179,6 +1179,7 @@ block->nmb_ifp = &sc->arpcom.ac_if; block->nmb_dev = sc->ndis_dev; + block->nmb_img = img; return(0); } ==== //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#8 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.11 2004/01/04 07:47:33 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.12 2004/01/06 07:09:26 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1280,6 +1280,7 @@ ndis_status nmb_getstat; ndis_status nmb_setstat; struct nte_head nmb_timerlist; + vm_offset_t nmb_img; }; typedef ndis_status (*ndis_init_handler)(ndis_status *, uint32_t *, ==== //depot/projects/netperf+sockets/sys/compat/ndis/pe_var.h#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/sys/compat/ndis/pe_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.3 2004/01/06 18:06:54 wpaul Exp $ */ #ifndef _PE_VAR_H_ @@ -230,6 +230,29 @@ #define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 #define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 +/* Resource types */ + +#define RT_CURSOR 1 +#define RT_BITMAP 2 +#define RT_ICON 3 +#define RT_MENU 4 +#define RT_DIALOG 5 +#define RT_STRING 6 +#define RT_FONTDIR 7 +#define RT_FONT 8 +#define RT_ACCELERATOR 9 +#define RT_RCDATA 10 +#define RT_MESSAGETABLE 11 +#define RT_GROUP_CURSOR 12 +#define RT_GROUP_ICON 14 +#define RT_VERSION 16 +#define RT_DLGINCLUDE 17 +#define RT_PLUGPLAY 19 +#define RT_VXD 20 +#define RT_ANICURSOR 21 +#define RT_ANIICON 22 +#define RT_HTML 23 + /* * Section header format. */ @@ -303,7 +326,81 @@ #define IMAGE_REL_BASED_DIR64 10 #define IMAGE_REL_BASED_HIGH3ADJ 11 +struct image_resource_directory_entry { + uint32_t irde_name; + uint32_t irde_dataoff; +}; +typedef struct image_resource_directory_entry image_resource_directory_entry; + +#define RESOURCE_NAME_STR 0x80000000 +#define RESOURCE_DIR_FLAG 0x80000000 + +struct image_resource_directory { + uint32_t ird_characteristics; + uint32_t ird_timestamp; + uint16_t ird_majorver; + uint16_t ird_minorver; + uint16_t ird_named_entries; + uint16_t ird_id_entries; +#ifdef notdef + image_resource_directory_entry ird_entries[1]; +#endif +}; + +typedef struct image_resource_directory image_resource_directory; + +struct image_resource_directory_string { + uint16_t irds_len; + char irds_name[1]; +}; + +typedef struct image_resource_directory_string image_resource_directory_string; + +struct image_resource_directory_string_u { + uint16_t irds_len; + char irds_name[1]; +}; + +typedef struct image_resource_directory_string_u + image_resource_directory_string_u; + +struct image_resource_data_entry { + uint32_t irde_offset; + uint32_t irde_size; + uint32_t irde_codepage; + uint32_t irde_rsvd; +}; + +typedef struct image_resource_data_entry image_resource_data_entry; + +struct message_resource_data { + uint32_t mrd_numblocks; +#ifdef notdef + message_resource_block mrd_blocks[1]; +#endif +}; + +typedef struct message_resource_data message_resource_data; + +struct message_resource_block { + uint32_t mrb_lowid; + uint32_t mrb_highid; + uint32_t mrb_entryoff; +}; + +typedef struct message_resource_block message_resource_block; + +struct message_resource_entry { + uint16_t mre_len; + uint16_t mre_flags; + char mre_text[]; +}; + +typedef struct message_resource_entry message_resource_entry; + +#define MESSAGE_RESOURCE_UNICODE 0x0001 + struct image_patch_table { char *ipt_name; void (*ipt_func)(void); @@ -325,6 +422,8 @@ extern int pe_relocate(vm_offset_t); extern int pe_get_import_descriptor(vm_offset_t, image_import_descriptor *, char *); extern int pe_patch_imports(vm_offset_t, char *, image_patch_table *); +extern int pe_get_messagetable(vm_offset_t, message_resource_data **); +extern int pe_get_message(vm_offset_t, uint32_t, char **, int *, uint16_t *); __END_DECLS #endif /* _PE_VAR_H_ */ ==== //depot/projects/netperf+sockets/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.25 2004/01/04 21:22:25 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.27 2004/01/06 18:06:54 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -795,11 +795,19 @@ { ndis_miniport_block *block; va_list ap; - int i; + int i, error; + char *str = NULL, *ustr = NULL; + uint16_t flags; block = (ndis_miniport_block *)adapter; - device_printf (block->nmb_dev, "NDIS ERROR: %x\n", code); + error = pe_get_message(block->nmb_img, code, &str, &i, &flags); + if (error == 0 && flags & MESSAGE_RESOURCE_UNICODE) { + ndis_unicode_to_ascii((uint16_t *)str, i, &ustr); + str = ustr; + } + device_printf (block->nmb_dev, "NDIS ERROR: %x (%s)\n", code, + str == NULL ? "unknown error" : str); device_printf (block->nmb_dev, "NDIS NUMERRORS: %x\n", numerrors); va_start(ap, numerrors); @@ -808,6 +816,8 @@ va_arg(ap, void *)); va_end(ap); + if (ustr != NULL) + free(ustr, M_DEVBUF); return; } @@ -1894,7 +1904,14 @@ uint8_t shared; ndis_interrupt_mode imode; { + ndis_miniport_block *block; + + block = adapter; + intr->ni_block = adapter; + intr->ni_isrreq = reqisr; + intr->ni_shared = shared; + block->nmb_interrupt = intr; return(NDIS_STATUS_SUCCESS); } ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.7 2004/01/04 07:47:33 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.8 2004/01/06 07:09:26 wpaul Exp $"); #include #include @@ -59,6 +59,8 @@ #include #define __stdcall __attribute__((__stdcall__)) +#define __regparm __attribute__((regparm(3))) + #define FUNC void(*)(void) __stdcall static uint32_t ntoskrnl_unicode_equal(ndis_unicode_string *, @@ -82,13 +84,13 @@ __stdcall static int64_t _allmul(int64_t, int64_t); __stdcall static int64_t _alldiv(int64_t, int64_t); __stdcall static int64_t _allrem(int64_t, int64_t); -__stdcall static int64_t _allshr(int64_t, int); -__stdcall static int64_t _allshl(int64_t, int); +__regparm static int64_t _allshr(int64_t, uint8_t); +__regparm static int64_t _allshl(int64_t, uint8_t); __stdcall static uint64_t _aullmul(uint64_t, uint64_t); __stdcall static uint64_t _aulldiv(uint64_t, uint64_t); __stdcall static uint64_t _aullrem(uint64_t, uint64_t); -__stdcall static uint64_t _aullshr(uint64_t, int); -__stdcall static uint64_t _aullshl(uint64_t, int); +__regparm static uint64_t _aullshr(uint64_t, uint8_t); +__regparm static uint64_t _aullshl(uint64_t, uint8_t); __stdcall static void *ntoskrnl_allocfunc(uint32_t, size_t, uint32_t); __stdcall static void ntoskrnl_freefunc(void *); __stdcall static void ntoskrnl_init_lookaside(paged_lookaside_list *, @@ -108,11 +110,13 @@ kspin_lock * */void); __stdcall static void ntoskrnl_lock_dpc(/*kspin_lock * */ void); __stdcall static void ntoskrnl_unlock_dpc(/*kspin_lock * */ void); -__stdcall static void ntoskrnl_interlock_inc(/*volatile uint32_t * */ void); -__stdcall static void ntoskrnl_interlock_dec(/*volatile uint32_t * */ void); +__stdcall static uint32_t + ntoskrnl_interlock_inc(/*volatile uint32_t * */ void); +__stdcall static uint32_t + ntoskrnl_interlock_dec(/*volatile uint32_t * */ void); __stdcall static void ntoskrnl_freemdl(ndis_buffer *); __stdcall static void *ntoskrnl_mmaplockedpages(ndis_buffer *, uint8_t); -__stdcall static void ntoskrnl_create_lock(kspin_lock *); +__stdcall static void ntoskrnl_init_lock(kspin_lock *); __stdcall static void dummy(void); __stdcall static size_t ntoskrnl_memcmp(const void *, const void *, size_t); @@ -121,7 +125,7 @@ int ntoskrnl_libinit() { - mtx_init(&ntoskrnl_interlock, "ntoskrnllock", MTX_NETWORK_LOCK, + mtx_init(&ntoskrnl_interlock, "ntoskrnllock", "ntoskrnl interlock", MTX_DEF | MTX_RECURSE); return(0); @@ -333,34 +337,34 @@ return (a % b); } -__stdcall static int64_t +__regparm static int64_t _allshl(a, b) int64_t a; - int b; + uint8_t b; { return (a << b); } -__stdcall static uint64_t +__regparm static uint64_t _aullshl(a, b) uint64_t a; - int b; + uint8_t b; { return (a << b); } -__stdcall static int64_t +__regparm static int64_t _allshr(a, b) int64_t a; - int b; + uint8_t b; { return (a >> b); } -__stdcall static uint64_t +__regparm static uint64_t _aullshr(a, b) uint64_t a; - int b; + uint8_t b; { return (a >> b); } @@ -567,7 +571,7 @@ return; } -__stdcall static void +__stdcall static uint32_t ntoskrnl_interlock_inc(/*addend*/ void) { volatile uint32_t *addend; @@ -578,10 +582,10 @@ (*addend)++; mtx_unlock(&ntoskrnl_interlock); - return; + return(*addend); } -__stdcall static void +__stdcall static uint32_t ntoskrnl_interlock_dec(/*addend*/ void) { volatile uint32_t *addend; @@ -592,7 +596,7 @@ (*addend)--; mtx_unlock(&ntoskrnl_interlock); - return; + return(*addend); } __stdcall static void @@ -623,20 +627,20 @@ return(MDL_VA(buf)); } +/* + * The KeInitializeSpinLock(), KefAcquireSpinLockAtDpcLevel() + * and KefReleaseSpinLockFromDpcLevel() appear to be analagous + * to splnet()/splx() in their use. We can't create a new mutex + * lock here because there is no complimentary KeFreeSpinLock() + * function. For now, what we do is initialize the lock with + * a pointer to the ntoskrnl interlock mutex. + */ __stdcall static void -ntoskrnl_create_lock(lock) +ntoskrnl_init_lock(lock) kspin_lock *lock; { - struct mtx *mtx; + *lock = (kspin_lock)&ntoskrnl_interlock; - mtx = malloc(sizeof(struct mtx), M_DEVBUF, M_NOWAIT|M_ZERO); - if (mtx == NULL) - return; - mtx_init(mtx, "ntoslock", "ntoskrnl spinlock", - MTX_DEF | MTX_RECURSE | MTX_DUPOK); - - *lock = (kspin_lock)mtx; - return; } @@ -715,7 +719,7 @@ { "InterlockedDecrement", (FUNC)ntoskrnl_interlock_dec }, { "IoFreeMdl", (FUNC)ntoskrnl_freemdl }, { "MmMapLockedPages", (FUNC)ntoskrnl_mmaplockedpages }, - { "KeInitializeSpinLock", (FUNC)ntoskrnl_create_lock }, + { "KeInitializeSpinLock", (FUNC)ntoskrnl_init_lock }, /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.3 2003/12/26 03:31:34 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.5 2004/01/06 18:06:54 wpaul Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -456,6 +456,91 @@ return (ENOENT); } +int +pe_get_messagetable(imgbase, md) + vm_offset_t imgbase; + message_resource_data **md; +{ + image_resource_directory *rdir, *rtype; + image_resource_directory_entry *dent, *dent2; + image_resource_data_entry *rent; + vm_offset_t offset; + int i; + + if (imgbase == 0) + return(EINVAL); + + offset = pe_directory_offset(imgbase, IMAGE_DIRECTORY_ENTRY_RESOURCE); + if (offset == 0) + return (ENOENT); + + rdir = (image_resource_directory *)offset; + + dent = (image_resource_directory_entry *)(offset + + sizeof(image_resource_directory)); + + for (i = 0; i < rdir->ird_id_entries; i++){ + if (dent->irde_name != RT_MESSAGETABLE) { + dent++; + continue; + } + dent2 = dent; + while (dent2->irde_dataoff & RESOURCE_DIR_FLAG) { + rtype = (image_resource_directory *)(offset + + (dent2->irde_dataoff & ~RESOURCE_DIR_FLAG)); + dent2 = (image_resource_directory_entry *) + ((uintptr_t)rtype + + sizeof(image_resource_directory)); + } + rent = (image_resource_data_entry *)(offset + + dent2->irde_dataoff); + *md = (message_resource_data *)pe_translate_addr(imgbase, + rent->irde_offset); + return(0); + } + + return(ENOENT); +} + +int +pe_get_message(imgbase, id, str, len, flags) + vm_offset_t imgbase; + uint32_t id; + char **str; + int *len; + uint16_t *flags; +{ + message_resource_data *md = NULL; + message_resource_block *mb; + message_resource_entry *me; + uint32_t i; + + pe_get_messagetable(imgbase, &md); + + if (md == NULL) + return(ENOENT); + + mb = (message_resource_block *)((uintptr_t)md + + sizeof(message_resource_data)); + + for (i = 0; i < md->mrd_numblocks; i++) { + if (id >= mb->mrb_lowid && id <= mb->mrb_highid) { + me = (message_resource_entry *)((uintptr_t)md + + mb->mrb_entryoff); + for (i = id - mb->mrb_lowid; i > 0; i--) + me = (message_resource_entry *)((uintptr_t)me + + me->mre_len); + *str = me->mre_text; + *len = me->mre_len; + *flags = me->mre_flags; + return(0); + } + mb++; + } + + return(ENOENT); +} + /* * Find the function that matches a particular name. This doesn't * need to be particularly speedy since it's only run when loading ==== //depot/projects/netperf+sockets/sys/conf/options.pc98#4 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.172 2003/12/30 07:28:54 bde Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.173 2004/01/06 18:51:14 jhb Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h -AUTO_EOI_2 opt_auto_eoi.h BROKEN_KEYBOARD_RESET opt_reset.h COMPAT_OLDISA I586_PMC_GUPROF opt_i586_guprof.h ==== //depot/projects/netperf+sockets/sys/dev/drm/drmP.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.8 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.9 2004/01/06 04:34:52 anholt Exp $ */ #ifndef _DRM_P_H_ @@ -268,7 +268,7 @@ int enabled; int acquired; unsigned long base; - int agp_mtrr; + int mtrr; int cant_use_aperture; unsigned long page_mask; } drm_agp_head_t; @@ -288,7 +288,7 @@ drm_map_flags_t flags; /* Flags */ void *handle; /* User-space: "Handle" to pass to mmap */ /* Kernel-space: kernel-virtual address */ - int mtrr; /* MTRR slot used */ + int mtrr; /* Boolean: MTRR used */ /* Private data */ bus_space_tag_t iot; bus_space_handle_t ioh; ==== //depot/projects/netperf+sockets/sys/dev/drm/drm_bufs.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.9 2003/12/23 14:38:42 se Exp $ + * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.10 2004/01/06 04:34:52 anholt Exp $ */ #include "dev/drm/drmP.h" @@ -88,7 +88,7 @@ map->size = request.size; map->type = request.type; map->flags = request.flags; - map->mtrr = -1; + map->mtrr = 0; map->handle = 0; /* Only allow shared memory to be removable since we only keep enough @@ -105,28 +105,23 @@ DRM(free)( map, sizeof(*map), DRM_MEM_MAPS ); return DRM_ERR(EINVAL); } + if (map->offset + map->size < map->offset) { + DRM(free)(map, sizeof(*map), DRM_MEM_MAPS); + return DRM_ERR(EINVAL); + } switch ( map->type ) { case _DRM_REGISTERS: + DRM_IOREMAP(map, dev); + if (!(map->flags & _DRM_WRITE_COMBINING)) + break; + /* FALLTHROUGH */ case _DRM_FRAME_BUFFER: - if ( map->offset + map->size < map->offset ) { - DRM(free)( map, sizeof(*map), DRM_MEM_MAPS ); - return DRM_ERR(EINVAL); - } #if __REALLY_HAVE_MTRR - if ( map->type == _DRM_FRAME_BUFFER || - (map->flags & _DRM_WRITE_COMBINING) ) { - int mtrr; - - mtrr = DRM(mtrr_add)(map->offset, map->size, - DRM_MTRR_WC); - if (mtrr == 0) - map->mtrr = 1; - } -#endif /* __REALLY_HAVE_MTRR */ - DRM_IOREMAP(map, dev); + if (DRM(mtrr_add)(map->offset, map->size, DRM_MTRR_WC) == 0) + map->mtrr = 1; +#endif break; - case _DRM_SHM: map->handle = (void *)DRM(alloc)(map->size, DRM_MEM_SAREA); DRM_DEBUG( "%lu %d %p\n", @@ -153,7 +148,7 @@ #if __REALLY_HAVE_AGP case _DRM_AGP: map->offset += dev->agp->base; - map->mtrr = dev->agp->agp_mtrr; /* for getmap */ + map->mtrr = dev->agp->mtrr; /* for getmap */ break; #endif case _DRM_SCATTER_GATHER: @@ -232,12 +227,12 @@ case _DRM_REGISTERS: case _DRM_FRAME_BUFFER: #if __REALLY_HAVE_MTRR - if (map->mtrr >= 0) { - int __unused mtrr; + if (map->mtrr) { + int __unused retcode; - mtrr = DRM(mtrr_del)(map->offset, map->size, + retcode = DRM(mtrr_del)(map->offset, map->size, DRM_MTRR_WC); - DRM_DEBUG("mtrr_del = %d\n", mtrr); + DRM_DEBUG("mtrr_del = %d\n", retcode); } #endif DRM(ioremapfree)(map); ==== //depot/projects/netperf+sockets/sys/dev/drm/drm_drv.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.17 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.18 2004/01/06 04:34:52 anholt Exp $ */ /* @@ -566,17 +566,18 @@ map = list->map; switch ( map->type ) { case _DRM_REGISTERS: + DRM(ioremapfree)(map); + /* FALLTHROUGH */ case _DRM_FRAME_BUFFER: #if __REALLY_HAVE_MTRR - if ( map->mtrr >= 0 ) { - int __unused mtrr; + if (map->mtrr) { + int __unused retcode; - mtrr = DRM(mtrr_del)(map->offset, + retcode = DRM(mtrr_del)(map->offset, map->size, DRM_MTRR_WC); - DRM_DEBUG("mtrr_del=%d\n", mtrr); + DRM_DEBUG("mtrr_del = %d", retcode); } #endif - DRM(ioremapfree)( map ); break; case _DRM_SHM: DRM(free)(map->handle, @@ -680,12 +681,9 @@ #endif /* __MUST_HAVE_AGP */ #if __REALLY_HAVE_MTRR if (dev->agp) { - int retcode; - - retcode = DRM(mtrr_add)(dev->agp->info.ai_aperture_base, - dev->agp->info.ai_aperture_size, DRM_MTRR_WC); - if (retcode == 0) - dev->agp->agp_mtrr=1; + if (DRM(mtrr_add)(dev->agp->info.ai_aperture_base, + dev->agp->info.ai_aperture_size, DRM_MTRR_WC) == 0) + dev->agp->mtrr = 1; } #endif /* __REALLY_HAVE_MTRR */ #endif /* __REALLY_HAVE_AGP */ @@ -743,12 +741,12 @@ #endif #if __REALLY_HAVE_AGP && __REALLY_HAVE_MTRR - if ( dev->agp && dev->agp->agp_mtrr >= 0) { - int __unused mtrr; + if (dev->agp && dev->agp->mtrr) { + int __unused retcode; - mtrr = DRM(mtrr_del)(dev->agp->info.ai_aperture_base, + retcode = DRM(mtrr_del)(dev->agp->info.ai_aperture_base, dev->agp->info.ai_aperture_size, DRM_MTRR_WC); - DRM_DEBUG("mtrr_del=%d\n", mtrr); + DRM_DEBUG("mtrr_del = %d", retcode); } #endif ==== //depot/projects/netperf+sockets/sys/dev/drm/drm_sysctl.h#3 (text+ko) ==== @@ -21,7 +21,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.6 2003/10/24 21:45:21 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.7 2004/01/06 04:34:52 anholt Exp $ */ #ifdef __FreeBSD__ @@ -194,7 +194,7 @@ else type = types[map->type]; - if (map->mtrr <= 0) + if (!map->mtrr) yesno = "no"; else yesno = "yes"; ==== //depot/projects/netperf+sockets/sys/dev/drm/mga_dma.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * Rewritten by: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.9 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.10 2004/01/06 04:34:53 anholt Exp $ */ #include "dev/drm/mga.h" @@ -502,14 +502,6 @@ return DRM_ERR(EINVAL); } - DRM_FIND_MAP( dev_priv->fb, init->fb_offset ); - if(!dev_priv->fb) { - DRM_ERROR( "failed to find framebuffer!\n" ); - /* Assign dev_private so we can do cleanup. */ - dev->dev_private = (void *)dev_priv; - mga_do_cleanup_dma( dev ); - return DRM_ERR(EINVAL); - } DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset ); if(!dev_priv->mmio) { DRM_ERROR( "failed to find mmio region!\n" ); ==== //depot/projects/netperf+sockets/sys/dev/drm/mga_drv.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Authors: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/mga_drv.h,v 1.6 2003/08/19 02:57:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/mga_drv.h,v 1.7 2004/01/06 04:34:53 anholt Exp $ */ #ifndef __MGA_DRV_H__ @@ -93,7 +93,6 @@ unsigned int texture_size; drm_local_map_t *sarea; - drm_local_map_t *fb; drm_local_map_t *mmio; drm_local_map_t *status; drm_local_map_t *warp; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 6 12:58:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72BEF16A4D1; Tue, 6 Jan 2004 12:58:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3667616A4CE for ; Tue, 6 Jan 2004 12:58:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE0E543D1F for ; Tue, 6 Jan 2004 12:58:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i06KwO0B003918 for ; Tue, 6 Jan 2004 12:58:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i06KwOvD003915 for perforce@freebsd.org; Tue, 6 Jan 2004 12:58:24 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 6 Jan 2004 12:58:24 -0800 (PST) Message-Id: <200401062058.i06KwOvD003915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44882 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, 06 Jan 2004 20:58:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=44882 Change 44882 by sam@sam_ebb on 2004/01/06 12:58:14 track forthcoming hal changes Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#6 edit .. //depot/projects/netperf+sockets/sys/dev/ath/if_athvar.h#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#6 (text+ko) ==== @@ -130,7 +130,8 @@ static int ath_newstate(struct ieee80211com *, enum ieee80211_state, int); static void ath_newassoc(struct ieee80211com *, struct ieee80211_node *, int); -static int ath_getchannels(struct ath_softc *, u_int cc, HAL_BOOL outdoor); +static int ath_getchannels(struct ath_softc *, u_int cc, + HAL_BOOL outdoor, HAL_BOOL xchans); static int ath_rate_setup(struct ath_softc *sc, u_int mode); static void ath_setcurmode(struct ath_softc *, enum ieee80211_phymode); @@ -151,6 +152,9 @@ static int ath_outdoor = AH_TRUE; /* outdoor operation */ SYSCTL_INT(_hw_ath, OID_AUTO, outdoor, CTLFLAG_RD, &ath_outdoor, 0, "enable/disable outdoor operation"); +static int ath_xchanmode = AH_TRUE; /* extended channels */ +SYSCTL_INT(_hw_ath, OID_AUTO, xchans, CTLFLAG_RD, &ath_xchanmode, + 0, "enable/disable extended channels"); static int ath_countrycode = CTRY_DEFAULT; /* country code */ SYSCTL_INT(_hw_ath, OID_AUTO, countrycode, CTLFLAG_RD, &ath_countrycode, 0, "country code"); @@ -238,7 +242,8 @@ * is resposible for filtering this list based on settings * like the phy mode. */ - error = ath_getchannels(sc, ath_countrycode, ath_outdoor); + error = ath_getchannels(sc, ath_countrycode, + ath_outdoor, ath_xchanmode); if (error != 0) goto bad; /* @@ -1033,7 +1038,7 @@ ath_hal_setrxfilter(ah, rfilt); /* configure operational mode */ - ath_hal_setopmode(ah, ic->ic_opmode); + ath_hal_setopmode(ah); /* calculate and install multicast filter */ if ((ifp->if_flags & IFF_ALLMULTI) == 0) { @@ -1363,8 +1368,7 @@ DPRINTF(ATH_DEBUG_BEACON, ("%s: intval %u nexttbtt %u\n", __func__, ni->ni_intval, nexttbtt)); ath_hal_intrset(ah, 0); - ath_hal_beaconinit(ah, ic->ic_opmode, - nexttbtt, ni->ni_intval); + ath_hal_beaconinit(ah, nexttbtt, ni->ni_intval); if (ic->ic_opmode != IEEE80211_M_MONITOR) sc->sc_imask |= HAL_INT_SWBA; /* beacon prepare */ ath_hal_intrset(ah, sc->sc_imask); @@ -2653,7 +2657,7 @@ } static int -ath_getchannels(struct ath_softc *sc, u_int cc, HAL_BOOL outdoor) +ath_getchannels(struct ath_softc *sc, u_int cc, HAL_BOOL outdoor, HAL_BOOL xchans) { struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = &ic->ic_if; @@ -2668,7 +2672,7 @@ return ENOMEM; } if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan, - cc, HAL_MODE_ALL, outdoor)) { + cc, HAL_MODE_ALL, outdoor, xchans)) { if_printf(ifp, "unable to collect channel list from hal\n"); free(chans, M_TEMP); return EINVAL; ==== //depot/projects/netperf+sockets/sys/dev/ath/if_athvar.h#3 (text+ko) ==== @@ -264,8 +264,8 @@ ((*(_ah)->ah_perCalibration)((_ah), (_chan))) #define ath_hal_setledstate(_ah, _state) \ ((*(_ah)->ah_setLedState)((_ah), (_state))) -#define ath_hal_beaconinit(_ah, _opmode, _nextb, _bperiod) \ - ((*(_ah)->ah_beaconInit)((_ah), (_opmode), (_nextb), (_bperiod))) +#define ath_hal_beaconinit(_ah, _nextb, _bperiod) \ + ((*(_ah)->ah_beaconInit)((_ah), (_nextb), (_bperiod))) #define ath_hal_beaconreset(_ah) \ ((*(_ah)->ah_resetStationBeaconTimers)((_ah))) #define ath_hal_beacontimers(_ah, _bs, _tsf, _dc, _cc) \ @@ -273,8 +273,8 @@ (_dc), (_cc))) #define ath_hal_setassocid(_ah, _bss, _associd) \ ((*(_ah)->ah_writeAssocid)((_ah), (_bss), (_associd), 0)) -#define ath_hal_setopmode(_ah, _opmode) \ - ((*(_ah)->ah_setPCUConfig)((_ah), (_opmode))) +#define ath_hal_setopmode(_ah) \ + ((*(_ah)->ah_setPCUConfig)((_ah))) #define ath_hal_stoptxdma(_ah, _qnum) \ ((*(_ah)->ah_stopTxDma)((_ah), (_qnum))) #define ath_hal_stoppcurecv(_ah) \ From owner-p4-projects@FreeBSD.ORG Tue Jan 6 14:51:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68E4416A4D1; Tue, 6 Jan 2004 14:51:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EAB916A4CE for ; Tue, 6 Jan 2004 14:51:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D60C43D39 for ; Tue, 6 Jan 2004 14:51:43 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i06Mpg0B029067 for ; Tue, 6 Jan 2004 14:51:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i06Mpg4K029058 for perforce@freebsd.org; Tue, 6 Jan 2004 14:51:42 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 6 Jan 2004 14:51:42 -0800 (PST) Message-Id: <200401062251.i06Mpg4K029058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44885 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, 06 Jan 2004 22:51:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=44885 Change 44885 by sam@sam_ebb on 2004/01/06 14:50:46 make various mib vars also tunables Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#7 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#7 (text+ko) ==== @@ -152,12 +152,15 @@ static int ath_outdoor = AH_TRUE; /* outdoor operation */ SYSCTL_INT(_hw_ath, OID_AUTO, outdoor, CTLFLAG_RD, &ath_outdoor, 0, "enable/disable outdoor operation"); +TUNABLE_INT("hw.ath.outdoor", &ath_outdoor); static int ath_xchanmode = AH_TRUE; /* extended channels */ SYSCTL_INT(_hw_ath, OID_AUTO, xchans, CTLFLAG_RD, &ath_xchanmode, 0, "enable/disable extended channels"); +TUNABLE_INT("hw.ath.xchans", &ath_xchanmode); static int ath_countrycode = CTRY_DEFAULT; /* country code */ SYSCTL_INT(_hw_ath, OID_AUTO, countrycode, CTLFLAG_RD, &ath_countrycode, 0, "country code"); +TUNABLE_INT("hw.ath.countrycode", &ath_countrycode); static int ath_regdomain = 0; /* regulatory domain */ SYSCTL_INT(_hw_ath, OID_AUTO, regdomain, CTLFLAG_RD, &ath_regdomain, 0, "regulatory domain"); @@ -166,6 +169,7 @@ int ath_debug = 0; SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, 0, "control debugging printfs"); +TUNABLE_INT("hw.ath.debug", &ath_debug); #define IFF_DUMPPKTS(_ifp, _m) \ ((ath_debug & _m) || \ ((_ifp)->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) From owner-p4-projects@FreeBSD.ORG Wed Jan 7 15:45:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1A0C16A4D1; Wed, 7 Jan 2004 15:45:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A98E616A4CE for ; Wed, 7 Jan 2004 15:45:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89C6943DA0 for ; Wed, 7 Jan 2004 15:42:39 -0800 (PST) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i07Ng30B094958 for ; Wed, 7 Jan 2004 15:42:03 -0800 (PST) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i07Ng1AL094916 for perforce@freebsd.org; Wed, 7 Jan 2004 15:42:01 -0800 (PST) (envelope-from imp@freebsd.org) Date: Wed, 7 Jan 2004 15:42:01 -0800 (PST) Message-Id: <200401072342.i07Ng1AL094916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 44923 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, 07 Jan 2004 23:45:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=44923 Change 44923 by imp@imp_pacopaco on 2004/01/07 15:41:46 IFC @44918 Affected files ... .. //depot/projects/power/sys/amd64/include/profile.h#2 integrate .. //depot/projects/power/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/power/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/power/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/boot0/boot0sio.s#2 integrate .. //depot/projects/power/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/power/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/power/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/power/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/power/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/power/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/power/sys/conf/options.pc98#4 integrate .. //depot/projects/power/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/power/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/power/sys/dev/drm/drm_bufs.h#5 integrate .. //depot/projects/power/sys/dev/drm/drm_drv.h#4 integrate .. //depot/projects/power/sys/dev/drm/drm_sysctl.h#3 integrate .. //depot/projects/power/sys/dev/drm/mga_dma.c#4 integrate .. //depot/projects/power/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/power/sys/dev/drm/r128.h#3 integrate .. //depot/projects/power/sys/dev/drm/r128_cce.c#4 integrate .. //depot/projects/power/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/power/sys/dev/drm/radeon.h#4 integrate .. //depot/projects/power/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/power/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/power/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/power/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/power/sys/dev/firewire/fwmem.c#6 integrate .. //depot/projects/power/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/power/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/power/sys/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/power/sys/dev/firewire/fwohcivar.h#4 integrate .. //depot/projects/power/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/power/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/power/sys/dev/ic/i8259.h#1 branch .. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/power/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/power/sys/dev/usb/usbdevs.h#6 integrate .. //depot/projects/power/sys/dev/usb/usbdevs_data.h#6 integrate .. //depot/projects/power/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/power/sys/i386/i386/elan-mmcr.c#5 integrate .. //depot/projects/power/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/power/sys/i386/include/elan_mmcr.h#1 branch .. //depot/projects/power/sys/i386/include/md_var.h#4 integrate .. //depot/projects/power/sys/i386/include/profile.h#2 integrate .. //depot/projects/power/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/power/sys/i386/isa/icu.h#3 integrate .. //depot/projects/power/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate .. //depot/projects/power/sys/kern/kern_lock.c#2 integrate .. //depot/projects/power/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/power/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/power/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/power/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/power/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/power/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/power/sys/sys/vnode.h#6 integrate .. //depot/projects/power/sys/vm/vm_contig.c#3 integrate .. //depot/projects/power/sys/vm/vm_kern.c#5 integrate Differences ... ==== //depot/projects/power/sys/amd64/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/profile.h,v 1.32 2003/06/02 00:28:39 obrien Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.33 2004/01/06 20:36:21 nectar Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -148,7 +148,6 @@ #ifdef __GNUC__ void mcount(void) __asm(".mcount"); #endif -static void _mcount(uintfptr_t frompc, uintfptr_t selfpc); __END_DECLS #endif /* _KERNEL */ ==== //depot/projects/power/sys/amd64/isa/atpic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.7 2003/11/21 02:58:26 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.8 2004/01/06 19:05:25 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -53,6 +53,7 @@ #include #include +#include #include #include ==== //depot/projects/power/sys/amd64/isa/icu.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.31 2003/11/17 09:19:12 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.32 2004/01/06 19:05:25 jhb Exp $ */ /* @@ -42,8 +42,8 @@ * W. Jolitz 8/89 */ -#ifndef _I386_ISA_ICU_H_ -#define _I386_ISA_ICU_H_ +#ifndef _AMD64_ISA_ICU_H_ +#define _AMD64_ISA_ICU_H_ /* * Interrupt enable bits - in normal order of priority (which we change) @@ -66,57 +66,7 @@ #define IRQ6 0x0040 #define IRQ7 0x0080 /* lowest - parallel printer */ -/* Initialization control word 1. Written to even address. */ -#define ICW1_IC4 0x01 /* ICW4 present */ -#define ICW1_SNGL 0x02 /* 1 = single, 0 = cascaded */ -#define ICW1_ADI 0x04 /* 1 = 4, 0 = 8 byte vectors */ -#define ICW1_LTIM 0x08 /* 1 = level trigger, 0 = edge */ -#define ICW1_RESET 0x10 /* must be 1 */ -/* 0x20 - 0x80 - in 8080/8085 mode only */ - -/* Initialization control word 2. Written to the odd address. */ -/* No definitions, it is the base vector of the IDT for 8086 mode */ - -/* Initialization control word 3. Written to the odd address. */ -/* For a master PIC, bitfield indicating a slave 8259 on given input */ -/* For slave, lower 3 bits are the slave's ID binary id on master */ - -/* Initialization control word 4. Written to the odd address. */ -#define ICW4_8086 0x01 /* 1 = 8086, 0 = 8080 */ -#define ICW4_AEOI 0x02 /* 1 = Auto EOI */ -#define ICW4_MS 0x04 /* 1 = buffered master, 0 = slave */ -#define ICW4_BUF 0x08 /* 1 = enable buffer mode */ -#define ICW4_SFNM 0x10 /* 1 = special fully nested mode */ - -/* Operation control words. Written after initialization. */ - -/* Operation control word type 1 */ /* - * No definitions. Written to the odd address. Bitmask for interrupts. - * 1 = disabled. - */ - -/* Operation control word type 2. Bit 3 (0x08) must be zero. Even address. */ -#define OCW2_L0 0x01 /* Level */ -#define OCW2_L1 0x02 -#define OCW2_L2 0x04 -/* 0x08 must be 0 to select OCW2 vs OCW3 */ -/* 0x10 must be 0 to select OCW2 vs ICW1 */ -#define OCW2_EOI 0x20 /* 1 = EOI */ -#define OCW2_SL 0x40 /* EOI mode */ -#define OCW2_R 0x80 /* EOI mode */ - -/* Operation control word type 3. Bit 3 (0x08) must be set. Even address. */ -#define OCW3_RIS 0x01 /* 1 = read IS, 0 = read IR */ -#define OCW3_RR 0x02 /* register read */ -#define OCW3_P 0x04 /* poll mode command */ -/* 0x08 must be 1 to select OCW3 vs OCW2 */ -#define OCW3_SEL 0x08 /* must be 1 */ -/* 0x10 must be 0 to select OCW3 vs ICW1 */ -#define OCW3_SMM 0x20 /* special mode mask */ -#define OCW3_ESMM 0x40 /* enable SMM */ - -/* * Interrupt Control offset into Interrupt descriptor table (IDT) */ #define ICU_OFFSET 32 /* 0-31 are processor exceptions */ @@ -130,4 +80,4 @@ void atpic_startup(void); #endif -#endif /* !_I386_ISA_ICU_H_ */ +#endif /* !_AMD64_ISA_ICU_H_ */ ==== //depot/projects/power/sys/boot/i386/boot0/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.19 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.20 2004/01/06 18:46:35 obrien Exp $ PROG?= boot0 NOMAN= @@ -23,13 +23,21 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x600 +# Comm settings for boot0sio. 0xE3 => 9600 8-N-1 +# XXX: We should create a build-tool or something to convert BOOT_CONSOLE_SPEED +# and BOOT_COMCONSOLE_PORT into the correct values to define on the build +# command line +BOOT_BOOT0_COMCONSOLE_SPEED?= 0xE3 + ${PROG}: ${PROG}.o ${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o ${PROG}.out ${PROG}.o objcopy -S -O binary ${PROG}.out ${.TARGET} ${PROG}.o: ${PROG}.s ${AS} ${AFLAGS} --defsym FLAGS=${BOOT_BOOT0_FLAGS} \ - --defsym TICKS=${BOOT_BOOT0_TICKS} ${.IMPSRC} -o ${.TARGET} + --defsym TICKS=${BOOT_BOOT0_TICKS} \ + --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED} \ + ${.IMPSRC} -o ${.TARGET} CLEANFILES+= ${PROG}.out ${PROG}.o ==== //depot/projects/power/sys/boot/i386/boot0/boot0sio.s#2 (text+ko) ==== @@ -14,7 +14,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.2 2003/12/09 05:40:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.3 2004/01/06 18:46:35 obrien Exp $ # A 512-byte boot manager which uses a serial console on COM1. @@ -95,8 +95,7 @@ # main: pushw %dx # Save xorw %dx,%dx # Port: COM1 - movb $0xE3,%al # 9600 8-N-1 - + movb COMSPEED,%al # defined by Makefile movb $0x00,%ah # BIOS: Set COM Port int $0x14 # Parameters popw %dx # Restore ==== //depot/projects/power/sys/compat/ndis/kern_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.21 2004/01/04 21:22:25 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.23 2004/01/07 06:15:56 wpaul Exp $"); #include #include @@ -704,6 +704,8 @@ return(0); } +typedef void (*ndis_senddone_func)(ndis_handle, ndis_packet *, ndis_status); + int ndis_send_packets(arg, packets, cnt) void *arg; @@ -713,14 +715,14 @@ struct ndis_softc *sc; ndis_handle adapter; __stdcall ndis_sendmulti_handler sendfunc; - int i, idx; - struct ifnet *ifp; - struct mbuf *m; + __stdcall ndis_senddone_func senddonefunc; + int i; ndis_packet *p; sc = arg; adapter = sc->ndis_block.nmb_miniportadapterctx; sendfunc = sc->ndis_chars.nmc_sendmulti_func; + senddonefunc = sc->ndis_block.nmb_senddone_func; sendfunc(adapter, packets, cnt); for (i = 0; i < cnt; i++) { @@ -733,21 +735,7 @@ */ if (p == NULL || p->np_oob.npo_status == NDIS_STATUS_PENDING) continue; - idx = p->np_txidx; - m = p->np_m0; - ifp = &sc->arpcom.ac_if; - if (sc->ndis_sc) - bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]); - sc->ndis_txarray[idx] = NULL; - sc->ndis_txpending++; - m_freem(m); - ndis_free_packet(p); - if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS) - ifp->if_opackets++; - else - ifp->if_oerrors++; - ifp->if_timer = 0; - ifp->if_flags &= ~IFF_OACTIVE; + senddonefunc(&sc->ndis_block, p, p->np_oob.npo_status); } return(0); @@ -1179,6 +1167,7 @@ block->nmb_ifp = &sc->arpcom.ac_if; block->nmb_dev = sc->ndis_dev; + block->nmb_img = img; return(0); } ==== //depot/projects/power/sys/compat/ndis/ndis_var.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.11 2004/01/04 07:47:33 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.12 2004/01/06 07:09:26 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1280,6 +1280,7 @@ ndis_status nmb_getstat; ndis_status nmb_setstat; struct nte_head nmb_timerlist; + vm_offset_t nmb_img; }; typedef ndis_status (*ndis_init_handler)(ndis_status *, uint32_t *, ==== //depot/projects/power/sys/compat/ndis/pe_var.h#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/sys/compat/ndis/pe_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.3 2004/01/06 18:06:54 wpaul Exp $ */ #ifndef _PE_VAR_H_ @@ -230,6 +230,29 @@ #define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 #define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 +/* Resource types */ + +#define RT_CURSOR 1 +#define RT_BITMAP 2 +#define RT_ICON 3 +#define RT_MENU 4 +#define RT_DIALOG 5 +#define RT_STRING 6 +#define RT_FONTDIR 7 +#define RT_FONT 8 +#define RT_ACCELERATOR 9 +#define RT_RCDATA 10 +#define RT_MESSAGETABLE 11 +#define RT_GROUP_CURSOR 12 +#define RT_GROUP_ICON 14 +#define RT_VERSION 16 +#define RT_DLGINCLUDE 17 +#define RT_PLUGPLAY 19 +#define RT_VXD 20 +#define RT_ANICURSOR 21 +#define RT_ANIICON 22 +#define RT_HTML 23 + /* * Section header format. */ @@ -303,7 +326,81 @@ #define IMAGE_REL_BASED_DIR64 10 #define IMAGE_REL_BASED_HIGH3ADJ 11 +struct image_resource_directory_entry { + uint32_t irde_name; + uint32_t irde_dataoff; +}; +typedef struct image_resource_directory_entry image_resource_directory_entry; + +#define RESOURCE_NAME_STR 0x80000000 +#define RESOURCE_DIR_FLAG 0x80000000 + +struct image_resource_directory { + uint32_t ird_characteristics; + uint32_t ird_timestamp; + uint16_t ird_majorver; + uint16_t ird_minorver; + uint16_t ird_named_entries; + uint16_t ird_id_entries; +#ifdef notdef + image_resource_directory_entry ird_entries[1]; +#endif +}; + +typedef struct image_resource_directory image_resource_directory; + +struct image_resource_directory_string { + uint16_t irds_len; + char irds_name[1]; +}; + +typedef struct image_resource_directory_string image_resource_directory_string; + +struct image_resource_directory_string_u { + uint16_t irds_len; + char irds_name[1]; +}; + +typedef struct image_resource_directory_string_u + image_resource_directory_string_u; + +struct image_resource_data_entry { + uint32_t irde_offset; + uint32_t irde_size; + uint32_t irde_codepage; + uint32_t irde_rsvd; +}; + +typedef struct image_resource_data_entry image_resource_data_entry; + +struct message_resource_data { + uint32_t mrd_numblocks; +#ifdef notdef + message_resource_block mrd_blocks[1]; +#endif +}; + +typedef struct message_resource_data message_resource_data; + +struct message_resource_block { + uint32_t mrb_lowid; + uint32_t mrb_highid; + uint32_t mrb_entryoff; +}; + +typedef struct message_resource_block message_resource_block; + +struct message_resource_entry { + uint16_t mre_len; + uint16_t mre_flags; + char mre_text[]; +}; + +typedef struct message_resource_entry message_resource_entry; + +#define MESSAGE_RESOURCE_UNICODE 0x0001 + struct image_patch_table { char *ipt_name; void (*ipt_func)(void); @@ -325,6 +422,8 @@ extern int pe_relocate(vm_offset_t); extern int pe_get_import_descriptor(vm_offset_t, image_import_descriptor *, char *); extern int pe_patch_imports(vm_offset_t, char *, image_patch_table *); +extern int pe_get_messagetable(vm_offset_t, message_resource_data **); +extern int pe_get_message(vm_offset_t, uint32_t, char **, int *, uint16_t *); __END_DECLS #endif /* _PE_VAR_H_ */ ==== //depot/projects/power/sys/compat/ndis/subr_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.25 2004/01/04 21:22:25 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.30 2004/01/07 19:26:47 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -72,6 +72,7 @@ #include #include +#include #include #include #include @@ -789,17 +790,29 @@ * The errorlog routine uses a variable argument list, so we * have to declare it this way. */ +#define ERRMSGLEN 512 static void ndis_syslog(ndis_handle adapter, ndis_error_code code, uint32_t numerrors, ...) { ndis_miniport_block *block; va_list ap; - int i; + int i, error; + char *str = NULL, *ustr = NULL; + uint16_t flags; + char msgbuf[ERRMSGLEN]; block = (ndis_miniport_block *)adapter; - device_printf (block->nmb_dev, "NDIS ERROR: %x\n", code); + error = pe_get_message(block->nmb_img, code, &str, &i, &flags); + if (error == 0 && flags & MESSAGE_RESOURCE_UNICODE) { + ustr = msgbuf; + ndis_unicode_to_ascii((uint16_t *)str, + ((i / 2)) > (ERRMSGLEN - 1) ? ERRMSGLEN : i, &ustr); + str = ustr; + } + device_printf (block->nmb_dev, "NDIS ERROR: %x (%s)\n", code, + str == NULL ? "unknown error" : str); device_printf (block->nmb_dev, "NDIS NUMERRORS: %x\n", numerrors); va_start(ap, numerrors); @@ -1770,9 +1783,7 @@ ndis_interlock_inc(addend) uint32_t *addend; { - mtx_lock(&ndis_interlock); - *addend++; - mtx_unlock(&ndis_interlock); + atomic_add_long((u_long *)addend, 1); return(*addend); } @@ -1780,9 +1791,7 @@ ndis_interlock_dec(addend) uint32_t *addend; { - mtx_lock(&ndis_interlock); - *addend--; - mtx_unlock(&ndis_interlock); + atomic_subtract_long((u_long *)addend, 1); return(*addend); } @@ -1894,7 +1903,14 @@ uint8_t shared; ndis_interrupt_mode imode; { + ndis_miniport_block *block; + + block = adapter; + intr->ni_block = adapter; + intr->ni_isrreq = reqisr; + intr->ni_shared = shared; + block->nmb_interrupt = intr; return(NDIS_STATUS_SUCCESS); } @@ -2070,13 +2086,13 @@ { ndis_list_entry *flink; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); flink = head->nle_flink; entry->nle_flink = flink; entry->nle_blink = head; flink->nle_blink = entry; head->nle_flink = entry; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(flink); } @@ -2089,12 +2105,12 @@ ndis_list_entry *flink; ndis_list_entry *entry; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); entry = head->nle_flink; flink = entry->nle_flink; head->nle_flink = flink; flink->nle_blink = head; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(entry); } @@ -2107,13 +2123,13 @@ { ndis_list_entry *blink; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); blink = head->nle_blink; entry->nle_flink = head; entry->nle_blink = blink; blink->nle_flink = entry; head->nle_blink = entry; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(blink); } ==== //depot/projects/power/sys/compat/ndis/subr_ntoskrnl.c#3 (text+ko) ==== @@ -31,8 +31,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.7 2004/01/04 07:47:33 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.10 2004/01/07 20:31:51 wpaul Exp $"); +#include #include #include #include @@ -44,6 +45,7 @@ #include #include +#include #include #include #include @@ -59,10 +61,12 @@ #include #define __stdcall __attribute__((__stdcall__)) +#define __regparm __attribute__((regparm(3))) + #define FUNC void(*)(void) -__stdcall static uint32_t ntoskrnl_unicode_equal(ndis_unicode_string *, - ndis_unicode_string *, uint32_t); +__stdcall static uint8_t ntoskrnl_unicode_equal(ndis_unicode_string *, + ndis_unicode_string *, uint8_t); __stdcall static void ntoskrnl_unicode_copy(ndis_unicode_string *, ndis_unicode_string *); __stdcall static uint32_t ntoskrnl_unicode_to_ansi(ndis_ansi_string *, @@ -82,13 +86,13 @@ __stdcall static int64_t _allmul(int64_t, int64_t); __stdcall static int64_t _alldiv(int64_t, int64_t); __stdcall static int64_t _allrem(int64_t, int64_t); -__stdcall static int64_t _allshr(int64_t, int); -__stdcall static int64_t _allshl(int64_t, int); +__regparm static int64_t _allshr(int64_t, uint8_t); +__regparm static int64_t _allshl(int64_t, uint8_t); __stdcall static uint64_t _aullmul(uint64_t, uint64_t); __stdcall static uint64_t _aulldiv(uint64_t, uint64_t); __stdcall static uint64_t _aullrem(uint64_t, uint64_t); -__stdcall static uint64_t _aullshr(uint64_t, int); -__stdcall static uint64_t _aullshl(uint64_t, int); +__regparm static uint64_t _aullshr(uint64_t, uint8_t); +__regparm static uint64_t _aullshl(uint64_t, uint8_t); __stdcall static void *ntoskrnl_allocfunc(uint32_t, size_t, uint32_t); __stdcall static void ntoskrnl_freefunc(void *); __stdcall static void ntoskrnl_init_lookaside(paged_lookaside_list *, @@ -108,11 +112,13 @@ kspin_lock * */void); __stdcall static void ntoskrnl_lock_dpc(/*kspin_lock * */ void); __stdcall static void ntoskrnl_unlock_dpc(/*kspin_lock * */ void); -__stdcall static void ntoskrnl_interlock_inc(/*volatile uint32_t * */ void); -__stdcall static void ntoskrnl_interlock_dec(/*volatile uint32_t * */ void); +__stdcall static uint32_t + ntoskrnl_interlock_inc(/*volatile uint32_t * */ void); +__stdcall static uint32_t + ntoskrnl_interlock_dec(/*volatile uint32_t * */ void); __stdcall static void ntoskrnl_freemdl(ndis_buffer *); __stdcall static void *ntoskrnl_mmaplockedpages(ndis_buffer *, uint8_t); -__stdcall static void ntoskrnl_create_lock(kspin_lock *); +__stdcall static void ntoskrnl_init_lock(kspin_lock *); __stdcall static void dummy(void); __stdcall static size_t ntoskrnl_memcmp(const void *, const void *, size_t); @@ -121,7 +127,7 @@ int ntoskrnl_libinit() { - mtx_init(&ntoskrnl_interlock, "ntoskrnllock", MTX_NETWORK_LOCK, + mtx_init(&ntoskrnl_interlock, "ntoskrnllock", "ntoskrnl interlock", MTX_DEF | MTX_RECURSE); return(0); @@ -135,29 +141,29 @@ return(0); } -__stdcall static uint32_t -ntoskrnl_unicode_equal(str1, str2, casesensitive) +__stdcall static uint8_t +ntoskrnl_unicode_equal(str1, str2, caseinsensitive) ndis_unicode_string *str1; ndis_unicode_string *str2; - uint32_t casesensitive; + uint8_t caseinsensitive; { - char *astr1 = NULL, *astr2 = NULL; - int rval = 1; + int i; - ndis_unicode_to_ascii(str1->nus_buf, str2->nus_len, &astr1); - ndis_unicode_to_ascii(str2->nus_buf, str2->nus_len, &astr2); + if (str1->nus_len != str2->nus_len) + return(FALSE); - if (casesensitive) - rval = strcmp(astr1, astr2); -#ifdef notdef - else - rval = strcasecmp(astr1, astr2); -#endif + for (i = 0; i < str1->nus_len; i++) { + if (caseinsensitive == TRUE) { + if (toupper((char)(str1->nus_buf[i] & 0xFF)) != + toupper((char)(str2->nus_buf[i] & 0xFF))) + return(FALSE); + } else { + if (str1->nus_buf[i] != str2->nus_buf[i]) + return(FALSE); + } + } - free(astr1, M_DEVBUF); - free(astr2, M_DEVBUF); - - return(rval); + return(TRUE); } __stdcall static void @@ -333,34 +339,34 @@ return (a % b); } -__stdcall static int64_t +__regparm static int64_t _allshl(a, b) int64_t a; - int b; + uint8_t b; { return (a << b); } -__stdcall static uint64_t +__regparm static uint64_t _aullshl(a, b) uint64_t a; - int b; + uint8_t b; { return (a << b); } -__stdcall static int64_t +__regparm static int64_t _allshr(a, b) int64_t a; - int b; + uint8_t b; { return (a >> b); } -__stdcall static uint64_t +__regparm static uint64_t _aullshr(a, b) uint64_t a; - int b; + uint8_t b; { return (a >> b); } @@ -567,32 +573,26 @@ return; } -__stdcall static void +__stdcall static uint32_t ntoskrnl_interlock_inc(/*addend*/ void) { volatile uint32_t *addend; __asm__ __volatile__ ("" : "=c" (addend)); - mtx_lock(&ntoskrnl_interlock); - (*addend)++; - mtx_unlock(&ntoskrnl_interlock); - - return; + atomic_add_long((volatile u_long *)addend, 1); + return(*addend); } -__stdcall static void +__stdcall static uint32_t ntoskrnl_interlock_dec(/*addend*/ void) { volatile uint32_t *addend; __asm__ __volatile__ ("" : "=c" (addend)); - mtx_lock(&ntoskrnl_interlock); - (*addend)--; - mtx_unlock(&ntoskrnl_interlock); - - return; + atomic_subtract_long((volatile u_long *)addend, 1); + return(*addend); } __stdcall static void @@ -623,20 +623,20 @@ return(MDL_VA(buf)); } +/* + * The KeInitializeSpinLock(), KefAcquireSpinLockAtDpcLevel() + * and KefReleaseSpinLockFromDpcLevel() appear to be analagous + * to splnet()/splx() in their use. We can't create a new mutex + * lock here because there is no complimentary KeFreeSpinLock() + * function. For now, what we do is initialize the lock with + * a pointer to the ntoskrnl interlock mutex. + */ __stdcall static void -ntoskrnl_create_lock(lock) +ntoskrnl_init_lock(lock) kspin_lock *lock; { - struct mtx *mtx; - - mtx = malloc(sizeof(struct mtx), M_DEVBUF, M_NOWAIT|M_ZERO); - if (mtx == NULL) - return; - mtx_init(mtx, "ntoslock", "ntoskrnl spinlock", - MTX_DEF | MTX_RECURSE | MTX_DUPOK); + *lock = (kspin_lock)&ntoskrnl_interlock; - *lock = (kspin_lock)mtx; - return; } @@ -715,7 +715,7 @@ { "InterlockedDecrement", (FUNC)ntoskrnl_interlock_dec }, { "IoFreeMdl", (FUNC)ntoskrnl_freemdl }, { "MmMapLockedPages", (FUNC)ntoskrnl_mmaplockedpages }, - { "KeInitializeSpinLock", (FUNC)ntoskrnl_create_lock }, + { "KeInitializeSpinLock", (FUNC)ntoskrnl_init_lock }, /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/power/sys/compat/ndis/subr_pe.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.3 2003/12/26 03:31:34 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.5 2004/01/06 18:06:54 wpaul Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -456,6 +456,91 @@ return (ENOENT); } +int +pe_get_messagetable(imgbase, md) + vm_offset_t imgbase; + message_resource_data **md; +{ + image_resource_directory *rdir, *rtype; + image_resource_directory_entry *dent, *dent2; + image_resource_data_entry *rent; + vm_offset_t offset; + int i; + + if (imgbase == 0) + return(EINVAL); + + offset = pe_directory_offset(imgbase, IMAGE_DIRECTORY_ENTRY_RESOURCE); + if (offset == 0) + return (ENOENT); + + rdir = (image_resource_directory *)offset; + + dent = (image_resource_directory_entry *)(offset + + sizeof(image_resource_directory)); + + for (i = 0; i < rdir->ird_id_entries; i++){ + if (dent->irde_name != RT_MESSAGETABLE) { + dent++; + continue; + } + dent2 = dent; + while (dent2->irde_dataoff & RESOURCE_DIR_FLAG) { + rtype = (image_resource_directory *)(offset + + (dent2->irde_dataoff & ~RESOURCE_DIR_FLAG)); + dent2 = (image_resource_directory_entry *) + ((uintptr_t)rtype + + sizeof(image_resource_directory)); + } + rent = (image_resource_data_entry *)(offset + + dent2->irde_dataoff); + *md = (message_resource_data *)pe_translate_addr(imgbase, + rent->irde_offset); + return(0); + } + + return(ENOENT); +} + +int +pe_get_message(imgbase, id, str, len, flags) + vm_offset_t imgbase; + uint32_t id; + char **str; + int *len; + uint16_t *flags; +{ + message_resource_data *md = NULL; + message_resource_block *mb; + message_resource_entry *me; + uint32_t i; + + pe_get_messagetable(imgbase, &md); + + if (md == NULL) + return(ENOENT); + + mb = (message_resource_block *)((uintptr_t)md + + sizeof(message_resource_data)); + + for (i = 0; i < md->mrd_numblocks; i++) { + if (id >= mb->mrb_lowid && id <= mb->mrb_highid) { + me = (message_resource_entry *)((uintptr_t)md + + mb->mrb_entryoff); + for (i = id - mb->mrb_lowid; i > 0; i--) + me = (message_resource_entry *)((uintptr_t)me + + me->mre_len); + *str = me->mre_text; + *len = me->mre_len; + *flags = me->mre_flags; + return(0); + } + mb++; + } + + return(ENOENT); +} + /* * Find the function that matches a particular name. This doesn't * need to be particularly speedy since it's only run when loading ==== //depot/projects/power/sys/conf/options.pc98#4 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.172 2003/12/30 07:28:54 bde Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.173 2004/01/06 18:51:14 jhb Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h -AUTO_EOI_2 opt_auto_eoi.h BROKEN_KEYBOARD_RESET opt_reset.h COMPAT_OLDISA I586_PMC_GUPROF opt_i586_guprof.h ==== //depot/projects/power/sys/dev/ath/if_ath.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.38 2003/12/28 07:00:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.44 2004/01/07 19:16:49 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -149,9 +149,11 @@ static int ath_outdoor = AH_TRUE; /* outdoor operation */ SYSCTL_INT(_hw_ath, OID_AUTO, outdoor, CTLFLAG_RD, &ath_outdoor, 0, "enable/disable outdoor operation"); +TUNABLE_INT("hw.ath.outdoor", &ath_outdoor); static int ath_countrycode = CTRY_DEFAULT; /* country code */ SYSCTL_INT(_hw_ath, OID_AUTO, countrycode, CTLFLAG_RD, &ath_countrycode, 0, "country code"); +TUNABLE_INT("hw.ath.countrycode", &ath_countrycode); static int ath_regdomain = 0; /* regulatory domain */ SYSCTL_INT(_hw_ath, OID_AUTO, regdomain, CTLFLAG_RD, &ath_regdomain, 0, "regulatory domain"); @@ -160,18 +162,34 @@ int ath_debug = 0; SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 7 15:47:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2B5316A4D1; Wed, 7 Jan 2004 15:47:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCB8316A4CE for ; Wed, 7 Jan 2004 15:47:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD75F43D68 for ; Wed, 7 Jan 2004 15:47:10 -0800 (PST) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i07NlA0B095576 for ; Wed, 7 Jan 2004 15:47:10 -0800 (PST) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i07NlAsi095573 for perforce@freebsd.org; Wed, 7 Jan 2004 15:47:10 -0800 (PST) (envelope-from imp@freebsd.org) Date: Wed, 7 Jan 2004 15:47:10 -0800 (PST) Message-Id: <200401072347.i07NlAsi095573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 44925 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, 07 Jan 2004 23:47:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=44925 Change 44925 by imp@imp_pacopaco on 2004/01/07 15:46:38 integrate from newcard. Affected files ... .. //depot/projects/power/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/power/sys/dev/firewire/firewirereg.h#6 integrate .. //depot/projects/power/sys/dev/firewire/fwmem.c#7 integrate .. //depot/projects/power/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/power/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/power/sys/dev/firewire/fwohcireg.h#5 integrate .. //depot/projects/power/sys/dev/firewire/fwohcivar.h#5 integrate .. //depot/projects/power/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/power/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/power/sys/pci/cy_pci.c#3 delete Differences ... ==== //depot/projects/power/sys/dev/firewire/firewire.c#7 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/firewirereg.h#6 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwmem.c#7 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwohci.c#7 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwohci_pci.c#7 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwohcireg.h#5 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/fwohcivar.h#5 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/if_fwe.c#6 (text+ko) ==== ==== //depot/projects/power/sys/dev/firewire/sbp.c#6 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jan 7 15:52:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4038816A4D2; Wed, 7 Jan 2004 15:52:16 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1567016A4CE for ; Wed, 7 Jan 2004 15:52:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C54E43D7B for ; Wed, 7 Jan 2004 15:50:15 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i07NoF0B095652 for ; Wed, 7 Jan 2004 15:50:15 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i07NoEo4095649 for perforce@freebsd.org; Wed, 7 Jan 2004 15:50:14 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 7 Jan 2004 15:50:14 -0800 (PST) Message-Id: <200401072350.i07NoEo4095649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44926 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, 07 Jan 2004 23:52:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=44926 Change 44926 by sam@sam_ebb on 2004/01/07 15:49:30 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#7 integrate .. //depot/projects/netperf/sys/amd64/include/profile.h#2 integrate .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#11 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath.c#55 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/netperf/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate .. //depot/projects/netperf/sys/net/route.c#32 integrate .. //depot/projects/netperf/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/netperf/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/netperf/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/netperf/sys/vm/vm_contig.c#5 integrate .. //depot/projects/netperf/sys/vm/vm_kern.c#11 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $"); #include "opt_kstack_pages.h" @@ -351,7 +351,7 @@ boot_cpu_id = PCPU_GET(cpuid); KASSERT(boot_cpu_id == hwrpb->rpb_primary_cpu_id, ("cpu_mp_probe() called on non-primary CPU")); - all_cpus = 1 << boot_cpu_id; + all_cpus = PCPU_GET(cpumask); mp_ncpus = 1; @@ -413,12 +413,12 @@ all_cpus |= (1 << i); mp_ncpus++; } - PCPU_SET(other_cpus, all_cpus & ~(1 << boot_cpu_id)); + PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask)); for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { if (i == boot_cpu_id) continue; - if (all_cpus & (1 << i)) + if (!CPU_ABSENT(i)) smp_start_secondary(i); } } @@ -476,7 +476,7 @@ void ipi_self(u_int64_t ipi) { - ipi_selected(1 << PCPU_GET(cpuid), ipi); + ipi_selected(PCPU_GET(cpumask), ipi); } /* @@ -489,7 +489,7 @@ u_int64_t ipi; int cpumask; - cpumask = 1 << PCPU_GET(cpuid); + cpumask = PCPU_GET(cpumask); CTR1(KTR_SMP, "smp_handle_ipi(), ipis=%lx", ipis); while (ipis) { ==== //depot/projects/netperf/sys/amd64/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/profile.h,v 1.32 2003/06/02 00:28:39 obrien Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.33 2004/01/06 20:36:21 nectar Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -148,7 +148,6 @@ #ifdef __GNUC__ void mcount(void) __asm(".mcount"); #endif -static void _mcount(uintfptr_t frompc, uintfptr_t selfpc); __END_DECLS #endif /* _KERNEL */ ==== //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.22 2004/01/06 07:09:26 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.23 2004/01/07 06:15:56 wpaul Exp $"); #include #include @@ -704,6 +704,8 @@ return(0); } +typedef void (*ndis_senddone_func)(ndis_handle, ndis_packet *, ndis_status); + int ndis_send_packets(arg, packets, cnt) void *arg; @@ -713,14 +715,14 @@ struct ndis_softc *sc; ndis_handle adapter; __stdcall ndis_sendmulti_handler sendfunc; - int i, idx; - struct ifnet *ifp; - struct mbuf *m; + __stdcall ndis_senddone_func senddonefunc; + int i; ndis_packet *p; sc = arg; adapter = sc->ndis_block.nmb_miniportadapterctx; sendfunc = sc->ndis_chars.nmc_sendmulti_func; + senddonefunc = sc->ndis_block.nmb_senddone_func; sendfunc(adapter, packets, cnt); for (i = 0; i < cnt; i++) { @@ -733,21 +735,7 @@ */ if (p == NULL || p->np_oob.npo_status == NDIS_STATUS_PENDING) continue; - idx = p->np_txidx; - m = p->np_m0; - ifp = &sc->arpcom.ac_if; - if (sc->ndis_sc) - bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]); - sc->ndis_txarray[idx] = NULL; - sc->ndis_txpending++; - m_freem(m); - ndis_free_packet(p); - if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS) - ifp->if_opackets++; - else - ifp->if_oerrors++; - ifp->if_timer = 0; - ifp->if_flags &= ~IFF_OACTIVE; + senddonefunc(&sc->ndis_block, p, p->np_oob.npo_status); } return(0); ==== //depot/projects/netperf/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.27 2004/01/06 18:06:54 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.30 2004/01/07 19:26:47 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -72,6 +72,7 @@ #include #include +#include #include #include #include @@ -789,6 +790,7 @@ * The errorlog routine uses a variable argument list, so we * have to declare it this way. */ +#define ERRMSGLEN 512 static void ndis_syslog(ndis_handle adapter, ndis_error_code code, uint32_t numerrors, ...) @@ -798,12 +800,15 @@ int i, error; char *str = NULL, *ustr = NULL; uint16_t flags; + char msgbuf[ERRMSGLEN]; block = (ndis_miniport_block *)adapter; error = pe_get_message(block->nmb_img, code, &str, &i, &flags); if (error == 0 && flags & MESSAGE_RESOURCE_UNICODE) { - ndis_unicode_to_ascii((uint16_t *)str, i, &ustr); + ustr = msgbuf; + ndis_unicode_to_ascii((uint16_t *)str, + ((i / 2)) > (ERRMSGLEN - 1) ? ERRMSGLEN : i, &ustr); str = ustr; } device_printf (block->nmb_dev, "NDIS ERROR: %x (%s)\n", code, @@ -816,8 +821,6 @@ va_arg(ap, void *)); va_end(ap); - if (ustr != NULL) - free(ustr, M_DEVBUF); return; } @@ -1780,9 +1783,7 @@ ndis_interlock_inc(addend) uint32_t *addend; { - mtx_lock(&ndis_interlock); - *addend++; - mtx_unlock(&ndis_interlock); + atomic_add_long((u_long *)addend, 1); return(*addend); } @@ -1790,9 +1791,7 @@ ndis_interlock_dec(addend) uint32_t *addend; { - mtx_lock(&ndis_interlock); - *addend--; - mtx_unlock(&ndis_interlock); + atomic_subtract_long((u_long *)addend, 1); return(*addend); } @@ -2087,13 +2086,13 @@ { ndis_list_entry *flink; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); flink = head->nle_flink; entry->nle_flink = flink; entry->nle_blink = head; flink->nle_blink = entry; head->nle_flink = entry; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(flink); } @@ -2106,12 +2105,12 @@ ndis_list_entry *flink; ndis_list_entry *entry; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); entry = head->nle_flink; flink = entry->nle_flink; head->nle_flink = flink; flink->nle_blink = head; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(entry); } @@ -2124,13 +2123,13 @@ { ndis_list_entry *blink; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); blink = head->nle_blink; entry->nle_flink = head; entry->nle_blink = blink; blink->nle_flink = entry; head->nle_blink = entry; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(blink); } ==== //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#7 (text+ko) ==== @@ -31,8 +31,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.8 2004/01/06 07:09:26 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.10 2004/01/07 20:31:51 wpaul Exp $"); +#include #include #include #include @@ -44,6 +45,7 @@ #include #include +#include #include #include #include @@ -63,8 +65,8 @@ #define FUNC void(*)(void) -__stdcall static uint32_t ntoskrnl_unicode_equal(ndis_unicode_string *, - ndis_unicode_string *, uint32_t); +__stdcall static uint8_t ntoskrnl_unicode_equal(ndis_unicode_string *, + ndis_unicode_string *, uint8_t); __stdcall static void ntoskrnl_unicode_copy(ndis_unicode_string *, ndis_unicode_string *); __stdcall static uint32_t ntoskrnl_unicode_to_ansi(ndis_ansi_string *, @@ -139,29 +141,29 @@ return(0); } -__stdcall static uint32_t -ntoskrnl_unicode_equal(str1, str2, casesensitive) +__stdcall static uint8_t +ntoskrnl_unicode_equal(str1, str2, caseinsensitive) ndis_unicode_string *str1; ndis_unicode_string *str2; - uint32_t casesensitive; + uint8_t caseinsensitive; { - char *astr1 = NULL, *astr2 = NULL; - int rval = 1; + int i; - ndis_unicode_to_ascii(str1->nus_buf, str2->nus_len, &astr1); - ndis_unicode_to_ascii(str2->nus_buf, str2->nus_len, &astr2); + if (str1->nus_len != str2->nus_len) + return(FALSE); - if (casesensitive) - rval = strcmp(astr1, astr2); -#ifdef notdef - else - rval = strcasecmp(astr1, astr2); -#endif + for (i = 0; i < str1->nus_len; i++) { + if (caseinsensitive == TRUE) { + if (toupper((char)(str1->nus_buf[i] & 0xFF)) != + toupper((char)(str2->nus_buf[i] & 0xFF))) + return(FALSE); + } else { + if (str1->nus_buf[i] != str2->nus_buf[i]) + return(FALSE); + } + } - free(astr1, M_DEVBUF); - free(astr2, M_DEVBUF); - - return(rval); + return(TRUE); } __stdcall static void @@ -578,10 +580,7 @@ __asm__ __volatile__ ("" : "=c" (addend)); - mtx_lock(&ntoskrnl_interlock); - (*addend)++; - mtx_unlock(&ntoskrnl_interlock); - + atomic_add_long((volatile u_long *)addend, 1); return(*addend); } @@ -592,10 +591,7 @@ __asm__ __volatile__ ("" : "=c" (addend)); - mtx_lock(&ntoskrnl_interlock); - (*addend)--; - mtx_unlock(&ntoskrnl_interlock); - + atomic_subtract_long((volatile u_long *)addend, 1); return(*addend); } ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#55 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.38 2003/12/28 07:00:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.44 2004/01/07 19:16:49 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -151,9 +151,11 @@ static int ath_outdoor = AH_TRUE; /* outdoor operation */ SYSCTL_INT(_hw_ath, OID_AUTO, outdoor, CTLFLAG_RD, &ath_outdoor, 0, "enable/disable outdoor operation"); +TUNABLE_INT("hw.ath.outdoor", &ath_outdoor); static int ath_countrycode = CTRY_DEFAULT; /* country code */ SYSCTL_INT(_hw_ath, OID_AUTO, countrycode, CTLFLAG_RD, &ath_countrycode, 0, "country code"); +TUNABLE_INT("hw.ath.countrycode", &ath_countrycode); static int ath_regdomain = 0; /* regulatory domain */ SYSCTL_INT(_hw_ath, OID_AUTO, regdomain, CTLFLAG_RD, &ath_regdomain, 0, "regulatory domain"); @@ -162,6 +164,7 @@ int ath_debug = 0; SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, 0, "control debugging printfs"); +TUNABLE_INT("hw.ath.debug", &ath_debug); #define IFF_DUMPPKTS(_ifp, _m) \ ((ath_debug & _m) || \ ((_ifp)->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) @@ -200,7 +203,7 @@ HAL_STATUS status; int error = 0; - DPRINTF(ATH_DEBUG_ANY, ("ath_attach: devid 0x%x\n", devid)); + DPRINTF(ATH_DEBUG_ANY, ("%s: devid 0x%x\n", __func__, devid)); /* set these up early for if_printf use */ if_initname(ifp, device_get_name(sc->sc_dev), @@ -365,7 +368,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(ATH_DEBUG_ANY, ("ath_detach: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags %x\n", __func__, ifp->if_flags)); ath_stop(ifp); bpfdetach(ifp); @@ -384,7 +387,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(ATH_DEBUG_ANY, ("ath_suspend: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags %x\n", __func__, ifp->if_flags)); ath_stop(ifp); } @@ -394,7 +397,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(ATH_DEBUG_ANY, ("ath_resume: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags %x\n", __func__, ifp->if_flags)); if (ifp->if_flags & IFF_UP) { ath_init(ifp); @@ -408,7 +411,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(ATH_DEBUG_ANY, ("ath_shutdown: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags %x\n", __func__, ifp->if_flags)); ath_stop(ifp); } @@ -427,18 +430,18 @@ * The hardware is not ready/present, don't touch anything. * Note this can happen early on if the IRQ is shared. */ - DPRINTF(ATH_DEBUG_ANY, ("ath_intr: invalid; ignored\n")); + DPRINTF(ATH_DEBUG_ANY, ("%s: invalid; ignored\n", __func__)); return; } if ((ifp->if_flags & (IFF_RUNNING|IFF_UP)) != (IFF_RUNNING|IFF_UP)) { - DPRINTF(ATH_DEBUG_ANY, - ("ath_intr: if_flags 0x%x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags 0x%x\n", + __func__, ifp->if_flags)); ath_hal_getisr(ah, &status); /* clear ISR */ ath_hal_intrset(ah, 0); /* disable further intr's */ return; } ath_hal_getisr(ah, &status); /* NB: clears ISR too */ - DPRINTF(ATH_DEBUG_INTR, ("ath_intr: status 0x%x\n", status)); + DPRINTF(ATH_DEBUG_INTR, ("%s: status 0x%x\n", __func__, status)); #ifdef AR_DEBUG if (ath_debug && (status & (HAL_INT_FATAL|HAL_INT_RXORN|HAL_INT_BMISS))) { @@ -507,7 +510,7 @@ struct ath_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; - DPRINTF(ATH_DEBUG_ANY, ("ath_bmiss_proc: pending %u\n", pending)); + DPRINTF(ATH_DEBUG_ANY, ("%s: pending %u\n", __func__, pending)); KASSERT(ic->ic_opmode == IEEE80211_M_STA, ("unexpect operating mode %u", ic->ic_opmode)); if (ic->ic_state == IEEE80211_S_RUN) { @@ -546,7 +549,8 @@ HAL_STATUS status; HAL_CHANNEL hchan; - DPRINTF(ATH_DEBUG_ANY, ("ath_init: if_flags 0x%x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags 0x%x\n", + __func__, ifp->if_flags)); ATH_LOCK(sc); /* @@ -620,8 +624,8 @@ struct ath_softc *sc = ifp->if_softc; struct ath_hal *ah = sc->sc_ah; - DPRINTF(ATH_DEBUG_ANY, ("ath_stop: invalid %u if_flags 0x%x\n", - sc->sc_invalid, ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: invalid %u if_flags 0x%x\n", + __func__, sc->sc_invalid, ifp->if_flags)); ATH_LOCK(sc); if (ifp->if_flags & IFF_RUNNING) { @@ -723,8 +727,8 @@ TAILQ_REMOVE(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); if (bf == NULL) { - DPRINTF(ATH_DEBUG_ANY, - ("ath_start: out of xmit buffers\n")); + DPRINTF(ATH_DEBUG_ANY, ("%s: out of xmit buffers\n", + __func__)); sc->sc_stats.ast_tx_qstop++; ifp->if_flags |= IFF_OACTIVE; break; @@ -740,8 +744,8 @@ */ if (ic->ic_state != IEEE80211_S_RUN) { DPRINTF(ATH_DEBUG_ANY, - ("ath_start: ignore data packet, " - "state %u\n", ic->ic_state)); + ("%s: ignore data packet, state %u\n", + __func__, ic->ic_state)); sc->sc_stats.ast_tx_discard++; ATH_TXBUF_LOCK(sc); TAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); @@ -763,7 +767,8 @@ m = ieee80211_encap(ifp, m, &ni); if (m == NULL) { DPRINTF(ATH_DEBUG_ANY, - ("ath_start: encapsulation failure\n")); + ("%s: encapsulation failure\n", + __func__)); sc->sc_stats.ast_tx_encap++; goto bad; } @@ -1054,9 +1059,8 @@ mfilt[0] = mfilt[1] = ~0; } ath_hal_setmcastfilter(ah, mfilt[0], mfilt[1]); - DPRINTF(ATH_DEBUG_MODE, - ("ath_mode_init: RX filter 0x%x, MC filter %08x:%08x\n", - rfilt, mfilt[0], mfilt[1])); + DPRINTF(ATH_DEBUG_MODE, ("%s: RX filter 0x%x, MC filter %08x:%08x\n", + __func__, rfilt, mfilt[0], mfilt[1])); } static void ==== //depot/projects/netperf/sys/fs/procfs/procfs.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * - * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.10 2003/12/07 17:40:00 des Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.11 2004/01/07 17:58:51 rwatson Exp $ */ #include @@ -70,7 +70,9 @@ char *fullpath = "unknown"; char *freepath = NULL; + vn_lock(p->p_textvp, LK_EXCLUSIVE | LK_RETRY, td); vn_fullpath(td, p->p_textvp, &fullpath, &freepath); + VOP_UNLOCK(p->p_textvp, 0, td); sbuf_printf(sb, "%s", fullpath); if (freepath) free(freepath, M_TEMP); ==== //depot/projects/netperf/sys/i386/isa/pcvt/pcvt_ext.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ * * Last Edit-Date: [Fri Mar 8 19:57:55 2002] * - * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.29 2003/03/02 16:54:36 des Exp $ + * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.30 2004/01/07 10:12:59 joerg Exp $ * *---------------------------------------------------------------------------*/ @@ -2397,7 +2397,7 @@ int usl_vt_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct thread *td) { - struct proc *p = td->td_proc; + struct proc *p; int i, j, error, opri; struct vt_mode newmode; @@ -2406,6 +2406,7 @@ case VT_SETMODE: newmode = *(struct vt_mode *)data; + p = td->td_proc; opri = spltty(); @@ -2479,6 +2480,8 @@ return 0; case VT_RELDISP: + p = td->td_proc; + if (minor(dev) != current_video_screen) return EPERM; if (vsp->smode.mode != VT_PROCESS) ==== //depot/projects/netperf/sys/net/route.c#32 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.3.1.1 (Berkeley) 2/23/95 - * $FreeBSD: src/sys/net/route.c,v 1.93 2003/12/07 21:44:14 sam Exp $ + * $FreeBSD: src/sys/net/route.c,v 1.94 2004/01/07 23:42:21 sam Exp $ */ #include "opt_inet.h" @@ -1277,7 +1277,7 @@ rt = rtalloc1(dst, 1, 0UL); if (rt != NULL) { RT_REMREF(rt); - RT_UNLOCK(rt); + /* XXX what about if change? */ } else senderr(EHOSTUNREACH); rt0 = rt; ==== //depot/projects/netperf/sys/netinet/ip_icmp.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.85 2003/11/20 20:07:37 andre Exp $ + * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.86 2004/01/06 23:20:07 andre Exp $ */ #include "opt_ipsec.h" @@ -546,7 +546,11 @@ (int)(gw >> 24), (int)((gw >> 16) & 0xff), (int)((gw >> 8) & 0xff), (int)(gw & 0xff)); } - if (drop_redirect) + /* + * RFC1812 says we must ignore ICMP redirects if we + * are acting as router. + */ + if (drop_redirect || ipforwarding) break; if (code > 3) goto badcode; ==== //depot/projects/netperf/sys/netinet/tcp_input.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.217 2003/11/25 20:58:59 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.218 2004/01/06 23:29:46 andre Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -125,11 +125,11 @@ &drop_synfin, 0, "Drop TCP packets with SYN+FIN set"); #endif -static int tcp_do_rfc3042 = 0; +static int tcp_do_rfc3042 = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, rfc3042, CTLFLAG_RW, &tcp_do_rfc3042, 0, "Enable RFC 3042 (Limited Transmit)"); -static int tcp_do_rfc3390 = 0; +static int tcp_do_rfc3390 = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, rfc3390, CTLFLAG_RW, &tcp_do_rfc3390, 0, "Enable RFC 3390 (Increasing TCP's Initial Congestion Window)"); ==== //depot/projects/netperf/sys/netinet/tcp_subr.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.171 2003/12/17 16:12:01 jhb Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.172 2004/01/06 23:29:46 andre Exp $ */ #include "opt_compat.h" @@ -159,7 +159,7 @@ * 1024 exists only for debugging. A good production default would be * something like 6100. */ -static int tcp_inflight_enable = 0; +static int tcp_inflight_enable = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, inflight_enable, CTLFLAG_RW, &tcp_inflight_enable, 0, "Enable automatic TCP inflight data limiting"); ==== //depot/projects/netperf/sys/vm/vm_contig.c#5 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.25 2003/10/18 21:09:21 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.26 2004/01/06 20:52:55 alc Exp $"); #include #include @@ -269,7 +269,6 @@ OFF_TO_IDX(tmp_addr - VM_MIN_KERNEL_ADDRESS)); if ((flags & M_ZERO) && !(m->flags & PG_ZERO)) pmap_zero_page(m); - m->flags = 0; tmp_addr += PAGE_SIZE; } VM_OBJECT_UNLOCK(kernel_object); ==== //depot/projects/netperf/sys/vm/vm_kern.c#11 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.110 2004/01/01 19:48:56 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.111 2004/01/06 20:52:55 alc Exp $"); #include #include @@ -206,7 +206,6 @@ pmap_zero_page(mem); mem->valid = VM_PAGE_BITS_ALL; vm_page_lock_queues(); - vm_page_flag_clear(mem, PG_ZERO); vm_page_wakeup(mem); vm_page_unlock_queues(); } @@ -406,7 +405,6 @@ pmap_zero_page(m); m->valid = VM_PAGE_BITS_ALL; vm_page_lock_queues(); - vm_page_flag_clear(m, PG_ZERO); vm_page_unmanage(m); vm_page_unlock_queues(); } From owner-p4-projects@FreeBSD.ORG Wed Jan 7 15:52:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8608516A4D1; Wed, 7 Jan 2004 15:52:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49E5916A4CE for ; Wed, 7 Jan 2004 15:52:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 617C543D96 for ; Wed, 7 Jan 2004 15:51:34 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i07NpH0B096489 for ; Wed, 7 Jan 2004 15:51:17 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i07NpGYe096480 for perforce@freebsd.org; Wed, 7 Jan 2004 15:51:16 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 7 Jan 2004 15:51:16 -0800 (PST) Message-Id: <200401072351.i07NpGYe096480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44927 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, 07 Jan 2004 23:52:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=44927 Change 44927 by sam@sam_ebb on 2004/01/07 15:50:49 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/profile.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/netperf+sockets/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/route.c#4 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_contig.c#2 integrate .. //depot/projects/netperf+sockets/sys/vm/vm_kern.c#5 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/alpha/alpha/mp_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $"); #include "opt_kstack_pages.h" @@ -351,7 +351,7 @@ boot_cpu_id = PCPU_GET(cpuid); KASSERT(boot_cpu_id == hwrpb->rpb_primary_cpu_id, ("cpu_mp_probe() called on non-primary CPU")); - all_cpus = 1 << boot_cpu_id; + all_cpus = PCPU_GET(cpumask); mp_ncpus = 1; @@ -413,12 +413,12 @@ all_cpus |= (1 << i); mp_ncpus++; } - PCPU_SET(other_cpus, all_cpus & ~(1 << boot_cpu_id)); + PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask)); for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { if (i == boot_cpu_id) continue; - if (all_cpus & (1 << i)) + if (!CPU_ABSENT(i)) smp_start_secondary(i); } } @@ -476,7 +476,7 @@ void ipi_self(u_int64_t ipi) { - ipi_selected(1 << PCPU_GET(cpuid), ipi); + ipi_selected(PCPU_GET(cpumask), ipi); } /* @@ -489,7 +489,7 @@ u_int64_t ipi; int cpumask; - cpumask = 1 << PCPU_GET(cpuid); + cpumask = PCPU_GET(cpumask); CTR1(KTR_SMP, "smp_handle_ipi(), ipis=%lx", ipis); while (ipis) { ==== //depot/projects/netperf+sockets/sys/amd64/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/profile.h,v 1.32 2003/06/02 00:28:39 obrien Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.33 2004/01/06 20:36:21 nectar Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -148,7 +148,6 @@ #ifdef __GNUC__ void mcount(void) __asm(".mcount"); #endif -static void _mcount(uintfptr_t frompc, uintfptr_t selfpc); __END_DECLS #endif /* _KERNEL */ ==== //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.22 2004/01/06 07:09:26 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.23 2004/01/07 06:15:56 wpaul Exp $"); #include #include @@ -704,6 +704,8 @@ return(0); } +typedef void (*ndis_senddone_func)(ndis_handle, ndis_packet *, ndis_status); + int ndis_send_packets(arg, packets, cnt) void *arg; @@ -713,14 +715,14 @@ struct ndis_softc *sc; ndis_handle adapter; __stdcall ndis_sendmulti_handler sendfunc; - int i, idx; - struct ifnet *ifp; - struct mbuf *m; + __stdcall ndis_senddone_func senddonefunc; + int i; ndis_packet *p; sc = arg; adapter = sc->ndis_block.nmb_miniportadapterctx; sendfunc = sc->ndis_chars.nmc_sendmulti_func; + senddonefunc = sc->ndis_block.nmb_senddone_func; sendfunc(adapter, packets, cnt); for (i = 0; i < cnt; i++) { @@ -733,21 +735,7 @@ */ if (p == NULL || p->np_oob.npo_status == NDIS_STATUS_PENDING) continue; - idx = p->np_txidx; - m = p->np_m0; - ifp = &sc->arpcom.ac_if; - if (sc->ndis_sc) - bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]); - sc->ndis_txarray[idx] = NULL; - sc->ndis_txpending++; - m_freem(m); - ndis_free_packet(p); - if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS) - ifp->if_opackets++; - else - ifp->if_oerrors++; - ifp->if_timer = 0; - ifp->if_flags &= ~IFF_OACTIVE; + senddonefunc(&sc->ndis_block, p, p->np_oob.npo_status); } return(0); ==== //depot/projects/netperf+sockets/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.27 2004/01/06 18:06:54 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.30 2004/01/07 19:26:47 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -72,6 +72,7 @@ #include #include +#include #include #include #include @@ -789,6 +790,7 @@ * The errorlog routine uses a variable argument list, so we * have to declare it this way. */ +#define ERRMSGLEN 512 static void ndis_syslog(ndis_handle adapter, ndis_error_code code, uint32_t numerrors, ...) @@ -798,12 +800,15 @@ int i, error; char *str = NULL, *ustr = NULL; uint16_t flags; + char msgbuf[ERRMSGLEN]; block = (ndis_miniport_block *)adapter; error = pe_get_message(block->nmb_img, code, &str, &i, &flags); if (error == 0 && flags & MESSAGE_RESOURCE_UNICODE) { - ndis_unicode_to_ascii((uint16_t *)str, i, &ustr); + ustr = msgbuf; + ndis_unicode_to_ascii((uint16_t *)str, + ((i / 2)) > (ERRMSGLEN - 1) ? ERRMSGLEN : i, &ustr); str = ustr; } device_printf (block->nmb_dev, "NDIS ERROR: %x (%s)\n", code, @@ -816,8 +821,6 @@ va_arg(ap, void *)); va_end(ap); - if (ustr != NULL) - free(ustr, M_DEVBUF); return; } @@ -1780,9 +1783,7 @@ ndis_interlock_inc(addend) uint32_t *addend; { - mtx_lock(&ndis_interlock); - *addend++; - mtx_unlock(&ndis_interlock); + atomic_add_long((u_long *)addend, 1); return(*addend); } @@ -1790,9 +1791,7 @@ ndis_interlock_dec(addend) uint32_t *addend; { - mtx_lock(&ndis_interlock); - *addend--; - mtx_unlock(&ndis_interlock); + atomic_subtract_long((u_long *)addend, 1); return(*addend); } @@ -2087,13 +2086,13 @@ { ndis_list_entry *flink; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); flink = head->nle_flink; entry->nle_flink = flink; entry->nle_blink = head; flink->nle_blink = entry; head->nle_flink = entry; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(flink); } @@ -2106,12 +2105,12 @@ ndis_list_entry *flink; ndis_list_entry *entry; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); entry = head->nle_flink; flink = entry->nle_flink; head->nle_flink = flink; flink->nle_blink = head; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(entry); } @@ -2124,13 +2123,13 @@ { ndis_list_entry *blink; - mtx_lock_spin((struct mtx *)lock->nsl_spinlock); + mtx_lock((struct mtx *)lock->nsl_spinlock); blink = head->nle_blink; entry->nle_flink = head; entry->nle_blink = blink; blink->nle_flink = entry; head->nle_blink = entry; - mtx_unlock_spin((struct mtx *)lock->nsl_spinlock); + mtx_unlock((struct mtx *)lock->nsl_spinlock); return(blink); } ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#7 (text+ko) ==== @@ -31,8 +31,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.8 2004/01/06 07:09:26 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.10 2004/01/07 20:31:51 wpaul Exp $"); +#include #include #include #include @@ -44,6 +45,7 @@ #include #include +#include #include #include #include @@ -63,8 +65,8 @@ #define FUNC void(*)(void) -__stdcall static uint32_t ntoskrnl_unicode_equal(ndis_unicode_string *, - ndis_unicode_string *, uint32_t); +__stdcall static uint8_t ntoskrnl_unicode_equal(ndis_unicode_string *, + ndis_unicode_string *, uint8_t); __stdcall static void ntoskrnl_unicode_copy(ndis_unicode_string *, ndis_unicode_string *); __stdcall static uint32_t ntoskrnl_unicode_to_ansi(ndis_ansi_string *, @@ -139,29 +141,29 @@ return(0); } -__stdcall static uint32_t -ntoskrnl_unicode_equal(str1, str2, casesensitive) +__stdcall static uint8_t +ntoskrnl_unicode_equal(str1, str2, caseinsensitive) ndis_unicode_string *str1; ndis_unicode_string *str2; - uint32_t casesensitive; + uint8_t caseinsensitive; { - char *astr1 = NULL, *astr2 = NULL; - int rval = 1; + int i; - ndis_unicode_to_ascii(str1->nus_buf, str2->nus_len, &astr1); - ndis_unicode_to_ascii(str2->nus_buf, str2->nus_len, &astr2); + if (str1->nus_len != str2->nus_len) + return(FALSE); - if (casesensitive) - rval = strcmp(astr1, astr2); -#ifdef notdef - else - rval = strcasecmp(astr1, astr2); -#endif + for (i = 0; i < str1->nus_len; i++) { + if (caseinsensitive == TRUE) { + if (toupper((char)(str1->nus_buf[i] & 0xFF)) != + toupper((char)(str2->nus_buf[i] & 0xFF))) + return(FALSE); + } else { + if (str1->nus_buf[i] != str2->nus_buf[i]) + return(FALSE); + } + } - free(astr1, M_DEVBUF); - free(astr2, M_DEVBUF); - - return(rval); + return(TRUE); } __stdcall static void @@ -578,10 +580,7 @@ __asm__ __volatile__ ("" : "=c" (addend)); - mtx_lock(&ntoskrnl_interlock); - (*addend)++; - mtx_unlock(&ntoskrnl_interlock); - + atomic_add_long((volatile u_long *)addend, 1); return(*addend); } @@ -592,10 +591,7 @@ __asm__ __volatile__ ("" : "=c" (addend)); - mtx_lock(&ntoskrnl_interlock); - (*addend)--; - mtx_unlock(&ntoskrnl_interlock); - + atomic_subtract_long((volatile u_long *)addend, 1); return(*addend); } ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.38 2003/12/28 07:00:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.44 2004/01/07 19:16:49 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -208,7 +208,7 @@ HAL_STATUS status; int error = 0; - DPRINTF(ATH_DEBUG_ANY, ("ath_attach: devid 0x%x\n", devid)); + DPRINTF(ATH_DEBUG_ANY, ("%s: devid 0x%x\n", __func__, devid)); /* set these up early for if_printf use */ if_initname(ifp, device_get_name(sc->sc_dev), @@ -374,7 +374,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(ATH_DEBUG_ANY, ("ath_detach: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags %x\n", __func__, ifp->if_flags)); ath_stop(ifp); bpfdetach(ifp); @@ -393,7 +393,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(ATH_DEBUG_ANY, ("ath_suspend: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags %x\n", __func__, ifp->if_flags)); ath_stop(ifp); } @@ -403,7 +403,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(ATH_DEBUG_ANY, ("ath_resume: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags %x\n", __func__, ifp->if_flags)); if (ifp->if_flags & IFF_UP) { ath_init(ifp); @@ -417,7 +417,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(ATH_DEBUG_ANY, ("ath_shutdown: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags %x\n", __func__, ifp->if_flags)); ath_stop(ifp); } @@ -436,18 +436,18 @@ * The hardware is not ready/present, don't touch anything. * Note this can happen early on if the IRQ is shared. */ - DPRINTF(ATH_DEBUG_ANY, ("ath_intr: invalid; ignored\n")); + DPRINTF(ATH_DEBUG_ANY, ("%s: invalid; ignored\n", __func__)); return; } if ((ifp->if_flags & (IFF_RUNNING|IFF_UP)) != (IFF_RUNNING|IFF_UP)) { - DPRINTF(ATH_DEBUG_ANY, - ("ath_intr: if_flags 0x%x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags 0x%x\n", + __func__, ifp->if_flags)); ath_hal_getisr(ah, &status); /* clear ISR */ ath_hal_intrset(ah, 0); /* disable further intr's */ return; } ath_hal_getisr(ah, &status); /* NB: clears ISR too */ - DPRINTF(ATH_DEBUG_INTR, ("ath_intr: status 0x%x\n", status)); + DPRINTF(ATH_DEBUG_INTR, ("%s: status 0x%x\n", __func__, status)); #ifdef AR_DEBUG if (ath_debug && (status & (HAL_INT_FATAL|HAL_INT_RXORN|HAL_INT_BMISS))) { @@ -516,7 +516,7 @@ struct ath_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; - DPRINTF(ATH_DEBUG_ANY, ("ath_bmiss_proc: pending %u\n", pending)); + DPRINTF(ATH_DEBUG_ANY, ("%s: pending %u\n", __func__, pending)); KASSERT(ic->ic_opmode == IEEE80211_M_STA, ("unexpect operating mode %u", ic->ic_opmode)); if (ic->ic_state == IEEE80211_S_RUN) { @@ -555,7 +555,8 @@ HAL_STATUS status; HAL_CHANNEL hchan; - DPRINTF(ATH_DEBUG_ANY, ("ath_init: if_flags 0x%x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: if_flags 0x%x\n", + __func__, ifp->if_flags)); ATH_LOCK(sc); /* @@ -629,8 +630,8 @@ struct ath_softc *sc = ifp->if_softc; struct ath_hal *ah = sc->sc_ah; - DPRINTF(ATH_DEBUG_ANY, ("ath_stop: invalid %u if_flags 0x%x\n", - sc->sc_invalid, ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("%s: invalid %u if_flags 0x%x\n", + __func__, sc->sc_invalid, ifp->if_flags)); ATH_LOCK(sc); if (ifp->if_flags & IFF_RUNNING) { @@ -732,8 +733,8 @@ TAILQ_REMOVE(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); if (bf == NULL) { - DPRINTF(ATH_DEBUG_ANY, - ("ath_start: out of xmit buffers\n")); + DPRINTF(ATH_DEBUG_ANY, ("%s: out of xmit buffers\n", + __func__)); sc->sc_stats.ast_tx_qstop++; ifp->if_flags |= IFF_OACTIVE; break; @@ -749,8 +750,8 @@ */ if (ic->ic_state != IEEE80211_S_RUN) { DPRINTF(ATH_DEBUG_ANY, - ("ath_start: ignore data packet, " - "state %u\n", ic->ic_state)); + ("%s: ignore data packet, state %u\n", + __func__, ic->ic_state)); sc->sc_stats.ast_tx_discard++; ATH_TXBUF_LOCK(sc); TAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); @@ -772,7 +773,8 @@ m = ieee80211_encap(ifp, m, &ni); if (m == NULL) { DPRINTF(ATH_DEBUG_ANY, - ("ath_start: encapsulation failure\n")); + ("%s: encapsulation failure\n", + __func__)); sc->sc_stats.ast_tx_encap++; goto bad; } @@ -1063,9 +1065,8 @@ mfilt[0] = mfilt[1] = ~0; } ath_hal_setmcastfilter(ah, mfilt[0], mfilt[1]); - DPRINTF(ATH_DEBUG_MODE, - ("ath_mode_init: RX filter 0x%x, MC filter %08x:%08x\n", - rfilt, mfilt[0], mfilt[1])); + DPRINTF(ATH_DEBUG_MODE, ("%s: RX filter 0x%x, MC filter %08x:%08x\n", + __func__, rfilt, mfilt[0], mfilt[1])); } static void ==== //depot/projects/netperf+sockets/sys/fs/procfs/procfs.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * - * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.10 2003/12/07 17:40:00 des Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.11 2004/01/07 17:58:51 rwatson Exp $ */ #include @@ -70,7 +70,9 @@ char *fullpath = "unknown"; char *freepath = NULL; + vn_lock(p->p_textvp, LK_EXCLUSIVE | LK_RETRY, td); vn_fullpath(td, p->p_textvp, &fullpath, &freepath); + VOP_UNLOCK(p->p_textvp, 0, td); sbuf_printf(sb, "%s", fullpath); if (freepath) free(freepath, M_TEMP); ==== //depot/projects/netperf+sockets/sys/i386/isa/pcvt/pcvt_ext.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ * * Last Edit-Date: [Fri Mar 8 19:57:55 2002] * - * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.29 2003/03/02 16:54:36 des Exp $ + * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.30 2004/01/07 10:12:59 joerg Exp $ * *---------------------------------------------------------------------------*/ @@ -2397,7 +2397,7 @@ int usl_vt_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct thread *td) { - struct proc *p = td->td_proc; + struct proc *p; int i, j, error, opri; struct vt_mode newmode; @@ -2406,6 +2406,7 @@ case VT_SETMODE: newmode = *(struct vt_mode *)data; + p = td->td_proc; opri = spltty(); @@ -2479,6 +2480,8 @@ return 0; case VT_RELDISP: + p = td->td_proc; + if (minor(dev) != current_video_screen) return EPERM; if (vsp->smode.mode != VT_PROCESS) ==== //depot/projects/netperf+sockets/sys/net/route.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.3.1.1 (Berkeley) 2/23/95 - * $FreeBSD: src/sys/net/route.c,v 1.93 2003/12/07 21:44:14 sam Exp $ + * $FreeBSD: src/sys/net/route.c,v 1.94 2004/01/07 23:42:21 sam Exp $ */ #include "opt_inet.h" @@ -1277,7 +1277,7 @@ rt = rtalloc1(dst, 1, 0UL); if (rt != NULL) { RT_REMREF(rt); - RT_UNLOCK(rt); + /* XXX what about if change? */ } else senderr(EHOSTUNREACH); rt0 = rt; ==== //depot/projects/netperf+sockets/sys/netinet/ip_icmp.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.85 2003/11/20 20:07:37 andre Exp $ + * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.86 2004/01/06 23:20:07 andre Exp $ */ #include "opt_ipsec.h" @@ -546,7 +546,11 @@ (int)(gw >> 24), (int)((gw >> 16) & 0xff), (int)((gw >> 8) & 0xff), (int)(gw & 0xff)); } - if (drop_redirect) + /* + * RFC1812 says we must ignore ICMP redirects if we + * are acting as router. + */ + if (drop_redirect || ipforwarding) break; if (code > 3) goto badcode; ==== //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.217 2003/11/25 20:58:59 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.218 2004/01/06 23:29:46 andre Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -125,11 +125,11 @@ &drop_synfin, 0, "Drop TCP packets with SYN+FIN set"); #endif -static int tcp_do_rfc3042 = 0; +static int tcp_do_rfc3042 = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, rfc3042, CTLFLAG_RW, &tcp_do_rfc3042, 0, "Enable RFC 3042 (Limited Transmit)"); -static int tcp_do_rfc3390 = 0; +static int tcp_do_rfc3390 = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, rfc3390, CTLFLAG_RW, &tcp_do_rfc3390, 0, "Enable RFC 3390 (Increasing TCP's Initial Congestion Window)"); ==== //depot/projects/netperf+sockets/sys/netinet/tcp_subr.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.171 2003/12/17 16:12:01 jhb Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.172 2004/01/06 23:29:46 andre Exp $ */ #include "opt_compat.h" @@ -159,7 +159,7 @@ * 1024 exists only for debugging. A good production default would be * something like 6100. */ -static int tcp_inflight_enable = 0; +static int tcp_inflight_enable = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, inflight_enable, CTLFLAG_RW, &tcp_inflight_enable, 0, "Enable automatic TCP inflight data limiting"); ==== //depot/projects/netperf+sockets/sys/vm/vm_contig.c#2 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.25 2003/10/18 21:09:21 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.26 2004/01/06 20:52:55 alc Exp $"); #include #include @@ -269,7 +269,6 @@ OFF_TO_IDX(tmp_addr - VM_MIN_KERNEL_ADDRESS)); if ((flags & M_ZERO) && !(m->flags & PG_ZERO)) pmap_zero_page(m); - m->flags = 0; tmp_addr += PAGE_SIZE; } VM_OBJECT_UNLOCK(kernel_object); ==== //depot/projects/netperf+sockets/sys/vm/vm_kern.c#5 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.110 2004/01/01 19:48:56 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.111 2004/01/06 20:52:55 alc Exp $"); #include #include @@ -206,7 +206,6 @@ pmap_zero_page(mem); mem->valid = VM_PAGE_BITS_ALL; vm_page_lock_queues(); - vm_page_flag_clear(mem, PG_ZERO); vm_page_wakeup(mem); vm_page_unlock_queues(); } @@ -406,7 +405,6 @@ pmap_zero_page(m); m->valid = VM_PAGE_BITS_ALL; vm_page_lock_queues(); - vm_page_flag_clear(m, PG_ZERO); vm_page_unmanage(m); vm_page_unlock_queues(); } From owner-p4-projects@FreeBSD.ORG Wed Jan 7 16:36:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD96D16A4D1; Wed, 7 Jan 2004 16:36:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B79A616A4CE for ; Wed, 7 Jan 2004 16:36:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0324F43D48 for ; Wed, 7 Jan 2004 16:36:12 -0800 (PST) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i080aB0B007431 for ; Wed, 7 Jan 2004 16:36:11 -0800 (PST) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i080aBuO007428 for perforce@freebsd.org; Wed, 7 Jan 2004 16:36:11 -0800 (PST) (envelope-from imp@freebsd.org) Date: Wed, 7 Jan 2004 16:36:11 -0800 (PST) Message-Id: <200401080036.i080aBuO007428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 44928 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, 08 Jan 2004 00:36:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=44928 Change 44928 by imp@imp_pacopaco on 2004/01/07 16:35:53 fix mismerge botch Affected files ... .. //depot/projects/power/sys/pci/if_ste.c#5 edit .. //depot/user/imp/newcard/pci/if_ste.c#27 edit Differences ... ==== //depot/projects/power/sys/pci/if_ste.c#5 (text+ko) ==== @@ -923,7 +923,7 @@ mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#ifndef BURN_BRIDGES + /* * Only use one PHY since this chip reports multiple * Note on the DFE-550 the PHY is at 1 on the DFE-580 ==== //depot/user/imp/newcard/pci/if_ste.c#27 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jan 7 17:13:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BC6D16A4D1; Wed, 7 Jan 2004 17:13:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D307316A4CE for ; Wed, 7 Jan 2004 17:13:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 078CA43D46 for ; Wed, 7 Jan 2004 17:13:58 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i081Dv0B022322 for ; Wed, 7 Jan 2004 17:13:57 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i081DvrB022319 for perforce@freebsd.org; Wed, 7 Jan 2004 17:13:57 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Jan 2004 17:13:57 -0800 (PST) Message-Id: <200401080113.i081DvrB022319@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 44929 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, 08 Jan 2004 01:13:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=44929 Change 44929 by rwatson@rwatson_tislabs on 2004/01/07 17:13:04 Don't automatically flag pseudofs file systems as multi-label, as they won't necessarily be. If a pseudofs file system doesn't know how to label vnodes, you end up with incomplete labels resulting in a panic. If a pseudofs file system is multilabel, it should set the mount flag itself. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#10 (text+ko) ==== @@ -255,9 +255,6 @@ return (EOPNOTSUPP); mp->mnt_flag |= MNT_LOCAL; -#ifdef MAC - mp->mnt_flag |= MNT_MULTILABEL; -#endif mp->mnt_data = (qaddr_t)pi; vfs_getnewfsid(mp); From owner-p4-projects@FreeBSD.ORG Thu Jan 8 06:18:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0912216A4D1; Thu, 8 Jan 2004 06:18:55 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD99C16A4CE for ; Thu, 8 Jan 2004 06:18:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 954B143D55 for ; Thu, 8 Jan 2004 06:18:52 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08EIq0B012514 for ; Thu, 8 Jan 2004 06:18:52 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08EIq4u012509 for perforce@freebsd.org; Thu, 8 Jan 2004 06:18:52 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Thu, 8 Jan 2004 06:18:52 -0800 (PST) Message-Id: <200401081418.i08EIq4u012509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 44941 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, 08 Jan 2004 14:18:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=44941 Change 44941 by areisse@areisse_ibook on 2004/01/08 06:18:20 need to change migcom for message trailers. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/alloc.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/error.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/error.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/global.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/global.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/header.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/i386/mig_machine.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/lexxer.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/mig.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/mig.sh#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/mig_machine.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/parser.y#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/ppc/mig_machine.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/server.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/statement.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/statement.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/strdefs.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/string.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/user.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/utils.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/utils.h#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/write.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 8 08:15:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 875E016A4D2; Thu, 8 Jan 2004 08:15:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E1A816A4CE for ; Thu, 8 Jan 2004 08:15:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7B0543D3F for ; Thu, 8 Jan 2004 08:15:18 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08GFI0B039532 for ; Thu, 8 Jan 2004 08:15:18 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08GFIqI039529 for perforce@freebsd.org; Thu, 8 Jan 2004 08:15:18 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 8 Jan 2004 08:15:18 -0800 (PST) Message-Id: <200401081615.i08GFIqI039529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44949 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, 08 Jan 2004 16:15:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44949 Change 44949 by cvance@cvance_sony on 2004/01/08 08:15:13 Fix Makefile install targets so they work with release building. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#12 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#12 (text+ko) ==== @@ -25,6 +25,7 @@ POLICYVER := policy.16 INSTALLCMD = install -c -o root -g wheel -m 400 INSTALLDIR = $(DESTDIR)/etc/security/sebsd +APPCONFDIR = $(DESTDIR)/etc/security LOADPATH = $(INSTALLDIR)/$(POLICYVER) SRCINSTALLDIR = $(INSTALLDIR)/src POLICYCONF = $(SRCINSTALLDIR)/policy.conf @@ -62,9 +63,9 @@ install: $(POLICYVER) $(INSTALLCMD) $(POLICYVER) $(INSTALLDIR) - $(INSTALLCMD) appconfig/default_type /etc/security - $(INSTALLCMD) appconfig/default_contexts /etc/security - $(INSTALLCMD) appconfig/initrc_context /etc/security + $(INSTALLCMD) appconfig/default_type $(APPCONFDIR) + $(INSTALLCMD) appconfig/default_contexts $(APPCONFDIR) + $(INSTALLCMD) appconfig/initrc_context $(APPCONFDIR) policy.conf: $(FLASKFILES) tmp/te-rbac.m4 users tmp/constraints-contexts.m4 cat $> > $@ From owner-p4-projects@FreeBSD.ORG Thu Jan 8 08:16:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B202816A4D1; Thu, 8 Jan 2004 08:16:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BED616A4CE for ; Thu, 8 Jan 2004 08:16:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6CC443D2F for ; Thu, 8 Jan 2004 08:16:20 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08GGK0B039649 for ; Thu, 8 Jan 2004 08:16:20 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08GGKmL039646 for perforce@freebsd.org; Thu, 8 Jan 2004 08:16:20 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 8 Jan 2004 08:16:20 -0800 (PST) Message-Id: <200401081616.i08GGKmL039646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44950 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, 08 Jan 2004 16:16:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=44950 Change 44950 by cvance@cvance_sony on 2004/01/08 08:16:13 Make it easier for users to enable SEBSD enforcing mode. Affected files ... .. //depot/projects/trustedbsd/sebsd/etc/sysctl.conf#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/etc/sysctl.conf#4 (text+ko) ==== @@ -7,3 +7,6 @@ # Uncomment this to prevent users from seeing information about processes that # are being run under another UID. #security.bsd.see_other_uids=0 + +# Uncomment the following line to configure SEBSD to boot in enforcing mode +#security.mac.sebsd.enforcing=1 From owner-p4-projects@FreeBSD.ORG Thu Jan 8 08:20:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCA8916A4D2; Thu, 8 Jan 2004 08:20:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D08F16A4CE for ; Thu, 8 Jan 2004 08:20:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CE0643D1F for ; Thu, 8 Jan 2004 08:20:57 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08GKu0B039770 for ; Thu, 8 Jan 2004 08:20:56 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08GKumn039767 for perforce@freebsd.org; Thu, 8 Jan 2004 08:20:56 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 8 Jan 2004 08:20:56 -0800 (PST) Message-Id: <200401081620.i08GKumn039767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44951 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, 08 Jan 2004 16:20:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=44951 Change 44951 by cvance@cvance_sony on 2004/01/08 08:19:56 The SEBSD policy doesn't permit login to follow symlinks, and since FreeBSD seems to make /home a link to /usr/home, just create new user account home dirs in /usr/home. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/user.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/user.c#2 (text+ko) ==== @@ -713,7 +713,7 @@ /* Prevent this from being irritating if user really means NO */ if (filled < 3) { if ((uname[0]) && !homedir[0]) { - SAFE_STRCPY(homedir,"/home/"); + SAFE_STRCPY(homedir,"/usr/home/"); strcat(homedir,uname); RefreshStringObj(userLayout[LAYOUT_HOMEDIR].obj); ++filled; From owner-p4-projects@FreeBSD.ORG Thu Jan 8 11:01:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75A5A16A4D1; Thu, 8 Jan 2004 11:01:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B2AD16A4CE for ; Thu, 8 Jan 2004 11:01:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32F1643D4C for ; Thu, 8 Jan 2004 11:01:19 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08J1J0B080578 for ; Thu, 8 Jan 2004 11:01:19 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08J1I43080575 for perforce@freebsd.org; Thu, 8 Jan 2004 11:01:18 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Thu, 8 Jan 2004 11:01:18 -0800 (PST) Message-Id: <200401081901.i08J1I43080575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 44963 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, 08 Jan 2004 19:01:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=44963 Change 44963 by areisse@areisse_ibook on 2004/01/08 11:00:56 Support for reading message labels from the trailer. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/parser.y#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.c#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.h#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.c#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#2 (text+ko) ==== @@ -138,6 +138,10 @@ [Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(sySecToken); [Ss][Ee][Rr][Vv][Ee][Rr][Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(syServerSecToken); [Uu][Ss][Ee][Rr][Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(syUserSecToken); +[Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syMsgLabels); +[Ss][Ee][Rr][Vv][Ee][Rr][Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syServerMsgLabels); +[Uu][Ss][Ee][Rr][Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syUserMsgLabels); + [Ii][Nn][Oo][Uu][Tt] RETURN(syInOut); [Rr][Ee][Qq][Uu][Ee][Ss][Tt][Pp][Oo][Rr][Tt] RETURN(syRequestPort); [Rr][Ee][Pp][Ll][Yy][Pp][Oo][Rr][Tt] RETURN(syReplyPort); ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/parser.y#2 (text+ko) ==== @@ -100,9 +100,13 @@ %token syValueOf %token syCString + %token sySecToken %token syUserSecToken %token syServerSecToken +%token syMsgLabels +%token syUserMsgLabels +%token syServerMsgLabels %token syColon %token sySemi @@ -681,6 +685,9 @@ | sySecToken { $$ = akSecToken; } | syServerSecToken { $$ = akServerSecToken; } | syUserSecToken { $$ = akUserSecToken; } + | syMsgLabels { $$ = akMsgLabels; } + | syServerMsgLabels { $$ = akServerMsgLabels; } + | syUserMsgLabels { $$ = akUserMsgLabels; } | syMsgSeqno { $$ = akMsgSeqno; } ; ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.c#2 (text+ko) ==== @@ -216,6 +216,9 @@ case akeSecToken: printf("SecToken\t"); break; + case akeMsgLabels: + printf("MsgLabels\t"); + break; case akeImplicit: printf("Implicit\t"); break; @@ -928,6 +931,9 @@ case akeSecToken: arg->argMsgField = "msgh_sender"; break; + case akeMsgLabels: + arg->argMsgField = "msgh_labels"; + break; case akeMsgSeqno: arg->argMsgField = "msgh_seqno"; break; @@ -1192,6 +1198,9 @@ if (akIdent(arg->argKind) == akeSecToken) itCheckSecTokenType(arg->argVarName, arg->argType); + if (akIdent(arg->argKind) == akeMsgLabels) + itCheckMsgLabelsType(arg->argVarName, arg->argType); + if (akIdent(arg->argKind) == akeMsgSeqno) itCheckIntType(arg->argVarName, arg->argType); /* @@ -1450,6 +1459,10 @@ if (akIdent(arg->argKind) == akeSecToken) msgop->argVarName = strconcat(msgop->argVarName, "|MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_SENDER)"); + else if (akIdent(arg->argKind) == akeMsgLabels) + msgop->argVarName = strconcat(msgop->argVarName, + "|MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_LABELS)"); + /* other implicit data received by the user will be handled here */ } } ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/routine.h#2 (text+ko) ==== @@ -76,6 +76,7 @@ #define akeImplicit (16) /* an implicit argument, from the trailer */ #define akeSecToken (17) /* an argument from the trailer: the security token */ #define akeSendTime (18) /* pointed at by rtWaitTime */ +#define akeMsgLabels (19) /* an argument from the trailer: message labels */ #define akeBITS (0x0000003f) #define akbRequest (0x00000040) /* has a msg_type in request */ @@ -233,6 +234,14 @@ akbServerArg|akbServerImplicit|akbSend|akbSendRcv| \ akbUserArg|akbUserImplicit|akbReturn|akbReturnRcv) +#define akServerMsgLabels akAddFeature(akeMsgLabels, \ + akbServerArg|akbServerImplicit|akbSend|akbSendRcv) +#define akUserMsgLabels akAddFeature(akeMsgLabels, \ + akbUserArg|akbUserImplicit|akbReturn|akbReturnRcv) +#define akMsgLabels akAddFeature(akeMsgLabels, \ + akbServerArg|akbServerImplicit|akbSend|akbSendRcv| \ + akbUserArg|akbUserImplicit|akbReturn|akbReturnRcv) + #define akMsgSeqno akAddFeature(akeMsgSeqno, \ akbServerArg|akbServerImplicit|akbSend|akbSendRcv) ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.c#2 (text+ko) ==== @@ -946,3 +946,14 @@ it->itVarArray || it->itPortType) error("argument %s isn't a proper SecToken", name); } + +void +itCheckMsgLabelsType(name, it) + identifier_t name; + ipc_type_t *it; +{ + if (it->itMigInLine || it->itNoOptArray || it->itString || + it->itTypeSize != 64 || !it->itInLine || !it->itStruct || + it->itVarArray || it->itPortType) + error("argument %s isn't a proper msg_labels_t", name); +} ==== //depot/projects/trustedbsd/sedarwin/apsl/bootstrap_cmds/migcom.tproj/type.h#2 (text+ko) ==== @@ -260,5 +260,6 @@ extern void itCheckReplyPortType(/* identifier_t name, ipc_type_t *it */); extern void itCheckIntType(/* identifier_t name, ipc_type_t *it */); extern void itCheckSecTokenType(/* identifier_t name, ipc_type_t *it */); +extern void itCheckMsgLabelsType(/* identifier_t name, ipc_type_t *it */); #endif /* _TYPE_H */ From owner-p4-projects@FreeBSD.ORG Thu Jan 8 13:51:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4349616A4D1; Thu, 8 Jan 2004 13:51:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D4A516A4CE for ; Thu, 8 Jan 2004 13:51:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6D2D43D49 for ; Thu, 8 Jan 2004 13:51:50 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08Lpo0B024962 for ; Thu, 8 Jan 2004 13:51:50 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08LpofG024956 for perforce@freebsd.org; Thu, 8 Jan 2004 13:51:50 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 8 Jan 2004 13:51:50 -0800 (PST) Message-Id: <200401082151.i08LpofG024956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44973 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, 08 Jan 2004 21:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=44973 Change 44973 by sam@sam_ebb on 2004/01/08 13:51:11 Eliminate gratuitous calls to if_init when setting the interface address. This is especially important for 802.11 devices where the init method kicks the 802.11 state machine. Affected files ... .. //depot/projects/netperf+sockets/sys/net/if_ethersubr.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net/if_ethersubr.c#3 (text+ko) ==== @@ -873,12 +873,21 @@ switch (command) { case SIOCSIFADDR: - ifp->if_flags |= IFF_UP; - + /* + * NB: don't reset the interface unless it's + * being marked up for the first time. Calling + * the init method unncessarily can cause some + * devices to do lots of work (e.g. 802.11 where + * the station may reassociate). + */ switch (ifa->ifa_addr->sa_family) { #ifdef INET case AF_INET: - ifp->if_init(ifp->if_softc); /* before arpwhohas */ + if ((ifp->if_flags & IFF_UP) == 0) { + /* bring the interface up before arpwhohas */ + ifp->if_flags |= IFF_UP; + ifp->if_init(ifp->if_softc); + } arp_ifinit(ifp, ifa); break; #endif @@ -886,8 +895,7 @@ /* * XXX - This code is probably wrong */ - case AF_IPX: - { + case AF_IPX: { struct ipx_addr *ina = &(IA_SIPX(ifa)->sipx_addr); struct arpcom *ac = IFP2AC(ifp); @@ -900,16 +908,14 @@ (caddr_t) ac->ac_enaddr, sizeof(ac->ac_enaddr)); } - - /* - * Set new address - */ - ifp->if_init(ifp->if_softc); - break; - } + /* fall thru... */ + } #endif default: - ifp->if_init(ifp->if_softc); + if ((ifp->if_flags & IFF_UP) == 0) { + ifp->if_flags |= IFF_UP; + ifp->if_init(ifp->if_softc); + } break; } break; From owner-p4-projects@FreeBSD.ORG Thu Jan 8 14:28:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B80F216A4D1; Thu, 8 Jan 2004 14:28:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92F7816A4CE for ; Thu, 8 Jan 2004 14:28:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C465643D41 for ; Thu, 8 Jan 2004 14:28:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08MSb0B033577 for ; Thu, 8 Jan 2004 14:28:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08MSb02033574 for perforce@freebsd.org; Thu, 8 Jan 2004 14:28:37 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 8 Jan 2004 14:28:37 -0800 (PST) Message-Id: <200401082228.i08MSb02033574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44977 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, 08 Jan 2004 22:28:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=44977 Change 44977 by sam@sam_ebb on 2004/01/08 14:28:09 The 802.11 mtu is different from Ethernet so handle mtu changes directly. Still need to raise the max mtu above the default 1500 that's set for ethernet compatibility. Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#4 (text+ko) ==== @@ -1037,6 +1037,13 @@ error = copyout(&ic->ic_stats, ifr->ifr_data, sizeof (ic->ic_stats)); break; + case SIOCSIFMTU: + ifr = (struct ifreq *)data; + if (ifr->ifr_mtu > IEEE80211_MTU) + error = EINVAL; + else + ifp->if_mtu = ifr->ifr_mtu; + break; default: error = ether_ioctl(ifp, cmd, data); break; From owner-p4-projects@FreeBSD.ORG Thu Jan 8 14:54:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 499AF16A4D2; Thu, 8 Jan 2004 14:54:22 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 032AB16A4CE for ; Thu, 8 Jan 2004 14:54:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C974743D53 for ; Thu, 8 Jan 2004 14:54:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08MsD0B039766 for ; Thu, 8 Jan 2004 14:54:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08MsDEL039763 for perforce@freebsd.org; Thu, 8 Jan 2004 14:54:13 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 8 Jan 2004 14:54:13 -0800 (PST) Message-Id: <200401082254.i08MsDEL039763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 44985 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, 08 Jan 2004 22:54:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=44985 Change 44985 by sam@sam_ebb on 2004/01/08 14:53:27 Overhaul multi-rate retry code in preparation for commit to HEAD: o use a hal trick to deduce if a card supports multi-rate retry o add ATH_TXMAXTRY to define the max # of xmits we request o handle cards w/o multi-rate retry correctly o track hal change to eliminate short preamble parameter from ath_hal_setuptxdesc (eliminates if in xmit path) o consolidate logic to set the starting xmit rate o change multi-rate retry setup to add the lowest xmit rate as a last-chance rate o set 11a/g starting xmit rate to the sweet spot (24/36 Mb) rather than the max negotiated rate o retard rate raising; must be seeing good statistics for 5 seconds instead of 2 (need to do this differently but it's an interim compromise) o purge some unused cruft from if_athvar.h Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#9 edit .. //depot/projects/netperf+sockets/sys/dev/ath/if_athvar.h#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#9 (text+ko) ==== @@ -137,6 +137,7 @@ static void ath_setcurmode(struct ath_softc *, enum ieee80211_phymode); static void ath_rate_update(struct ath_softc *, struct ieee80211_node *, int rate); +static void ath_rate_ctl_start(struct ath_softc *, struct ieee80211_node *); static void ath_rate_ctl_reset(struct ath_softc *, enum ieee80211_state); static void ath_rate_ctl(void *, struct ieee80211_node *); @@ -241,6 +242,15 @@ sc->sc_invalid = 0; /* ready to go, enable interrupt handling */ /* + * Check if the MAC has multi-rate retry support. + * We do this by trying to setup a fake extended + * descriptor. MAC's that don't have support will + * return false w/o doing anything. MAC's that do + * support it will return true w/o doing anything. + */ + sc->sc_mrretry = ath_hal_setupxtxdesc(ah, NULL, 0,0, 0,0, 0,0); + + /* * Collect the channel list using the default country * code and including outdoor channels. The 802.11 layer * is resposible for filtering this list based on settings @@ -1840,7 +1850,7 @@ struct ieee80211com *ic = &sc->sc_ic; struct ath_hal *ah = sc->sc_ah; struct ifnet *ifp = &sc->sc_ic.ic_if; - int i, error, iswep, hdrlen, pktlen; + int i, error, iswep, hdrlen, pktlen, try0; u_int8_t rix, cix, txrate, ctsrate; struct ath_desc *ds; struct mbuf *m; @@ -1996,6 +2006,7 @@ else if (subtype == IEEE80211_FC0_SUBTYPE_ATIM) atype = HAL_PKT_TYPE_ATIM; rix = 0; /* XXX lowest rate */ + try0 = ATH_TXMAXTRY; if (shortPreamble) txrate = an->an_tx_mgtrate; else @@ -2006,6 +2017,7 @@ if (subtype == IEEE80211_FC0_SUBTYPE_PS_POLL) atype = HAL_PKT_TYPE_PSPOLL; rix = 0; /* XXX lowest rate */ + try0 = ATH_TXMAXTRY; if (shortPreamble) txrate = an->an_tx_mgtrate; else @@ -2013,6 +2025,7 @@ break; default: rix = an->an_tx_rix0; + try0 = an->an_tx_try0; if (rix == 0xff) { if_printf(ifp, "bogus xmit rate 0x%x\n", ni->ni_rates.rs_rates[ni->ni_txrate]); @@ -2124,30 +2137,26 @@ , hdrlen /* header length */ , atype /* Atheros packet type */ , 60 /* txpower XXX */ - , txrate, 1+3 /* series 0 rate/tries */ + , txrate, try0 /* series 0 rate/tries */ , iswep ? sc->sc_ic.ic_wep_txkey : HAL_TXKEYIX_INVALID , antenna /* antenna mode */ , flags /* flags */ , ctsrate /* rts/cts rate */ , ctsduration /* rts/cts duration */ ); - if (rix != 0) { - if (shortPreamble) { - ath_hal_setupxtxdesc(ah, ds - , AH_TRUE /* short preamble */ - , an->an_tx_rate1sp, 2 /* series 1 */ - , an->an_tx_rate2sp, 2 /* series 2 */ - , an->an_tx_rate3sp, 2 /* series 3 */ - ); - } else { - ath_hal_setupxtxdesc(ah, ds - , AH_FALSE /* no short preamble */ - , an->an_tx_rate1, 2 /* series 1 */ - , an->an_tx_rate2, 2 /* series 2 */ - , an->an_tx_rate3, 2 /* series 3 */ - ); - } - } + /* + * Setup the multi-rate retry state only when we're + * going to use it. This assumes ath_hal_setuptxdesc + * initializes the descriptors (so we don't have to) + * when the hardware supports multi-rate retry and + * we don't use it. + */ + if (try0 != ATH_TXMAXTRY) + ath_hal_setupxtxdesc(ah, ds + , an->an_tx_rate1sp, 2 /* series 1 */ + , an->an_tx_rate2sp, 2 /* series 2 */ + , an->an_tx_rate3sp, 2 /* series 3 */ + ); /* * Fillin the remainder of the descriptor info. @@ -2648,17 +2657,8 @@ static void ath_newassoc(struct ieee80211com *ic, struct ieee80211_node *ni, int isnew) { - if (isnew) { - /* start with highest negotiated rate */ - /* - * XXX should do otherwise but only when - * the rate control algorithm is better. - */ - KASSERT(ni->ni_rates.rs_nrates > 0, - ("new association w/ no rates!")); - ath_rate_update((struct ath_softc *)ic, ni, - ni->ni_rates.rs_nrates - 1); - } + if (isnew) + ath_rate_ctl_start((struct ath_softc *)ic, ni); } static int @@ -2793,43 +2793,78 @@ /* XXX management/control frames always go at the lowest speed */ an->an_tx_mgtrate = rt->info[0].rateCode; an->an_tx_mgtratesp = an->an_tx_mgtrate | rt->info[0].shortPreamble; - /* - * Setup two step-down retry rates. - */ - if (--rate >= 0) { - rix = sc->sc_rixmap[ - ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; - an->an_tx_rate1 = rt->info[rix].rateCode; - an->an_tx_rate1sp = an->an_tx_rate1 | - rt->info[rix].shortPreamble; - } else - an->an_tx_rate1 = 0; - if (--rate >= 0) { - rix = sc->sc_rixmap[ - ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; - an->an_tx_rate2 = rt->info[rix].rateCode; - an->an_tx_rate2sp = an->an_tx_rate2 | - rt->info[rix].shortPreamble; - } else - an->an_tx_rate2 = 0; -#if 0 - if (--rate >= 0) { - rix = sc->sc_rixmap[ - ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; - an->an_tx_rate3 = rt->info[rix].rateCode; - an->an_tx_rate3sp = an->an_tx_rate3 | - rt->info[rix].shortPreamble; - } else - an->an_tx_rate3 = 0; - an->an_tx_rate2 = an->an_tx_mgtrate; - an->an_tx_rate2sp = an->an_tx_mgtratesp; -#else - an->an_tx_rate3 = an->an_tx_rate3sp = 0; -#endif + if (sc->sc_mrretry) { + /* + * Hardware supports multi-rate retry; setup two + * step-down retry rates and make the lowest rate + * be the ``last chance''. We use 4, 2, 2, 2 tries + * respectively (4 is set here, the rest are fixed + * in the xmit routine). + */ + an->an_tx_try0 = 1 + 3; /* 4 tries at rate 0 */ + if (--rate >= 0) { + rix = sc->sc_rixmap[ + ni->ni_rates.rs_rates[rate]&IEEE80211_RATE_VAL]; + an->an_tx_rate1 = rt->info[rix].rateCode; + an->an_tx_rate1sp = an->an_tx_rate1 | + rt->info[rix].shortPreamble; + } else { + an->an_tx_rate1 = an->an_tx_rate1sp = 0; + } + if (--rate >= 0) { + rix = sc->sc_rixmap[ + ni->ni_rates.rs_rates[rate]&IEEE80211_RATE_VAL]; + an->an_tx_rate2 = rt->info[rix].rateCode; + an->an_tx_rate2sp = an->an_tx_rate2 | + rt->info[rix].shortPreamble; + } else { + an->an_tx_rate2 = an->an_tx_rate2sp = 0; + } + if (rate > 0) { + /* NB: only do this if we didn't already do it above */ + an->an_tx_rate3 = rt->info[0].rateCode; + an->an_tx_rate3sp = + an->an_tx_mgtrate | rt->info[0].shortPreamble; + } else { + an->an_tx_rate3 = an->an_tx_rate3sp = 0; + } + } else { + an->an_tx_try0 = ATH_TXMAXTRY; /* max tries at rate 0 */ + an->an_tx_rate1 = an->an_tx_rate1sp = 0; + an->an_tx_rate2 = an->an_tx_rate2sp = 0; + an->an_tx_rate3 = an->an_tx_rate3sp = 0; + } an->an_tx_ok = an->an_tx_err = an->an_tx_retr = an->an_tx_upper = 0; } /* + * Set the starting transmit rate for a node. + */ +static void +ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) +{ +#define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) + int srate; + + KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); + /* start with highest negotiated rate */ + srate = ni->ni_rates.rs_nrates - 1; + if (sc->sc_curmode != IEEE80211_MODE_11B) { + /* + * 11a and 11g work better if you start at 24Mb + * or 36Mb and raise the rate. Scan the negotiated + * rate set to find the closest rate. + */ + /* NB: rate set assumed sorted */ + for (; srate >= 0 && RATE(srate) > 72; srate--) + ; + KASSERT(srate >= 0, ("bogus rate set")); + } + ath_rate_update(sc, ni, srate); +#undef RATE +} + +/* * Reset the rate control state for each 802.11 state transition. */ static void @@ -2845,10 +2880,7 @@ */ ni = ic->ic_bss; if (state == IEEE80211_S_RUN) { - /* start with highest negotiated rate */ - KASSERT(ni->ni_rates.rs_nrates > 0, - ("transition to RUN state w/ no rates!")); - ath_rate_update(sc, ni, ni->ni_rates.rs_nrates - 1); + ath_rate_ctl_start(sc, ni); } else { ath_rate_update(sc, ni, 0); } @@ -2878,7 +2910,7 @@ /* * Rate control - * XXX: very primitive version. + * XXX: very primitive version; need to at least consider rssi */ sc->sc_stats.ast_rate_calls++; @@ -2910,7 +2942,7 @@ an->an_tx_upper = 0; break; case 1: - if (++an->an_tx_upper < 2) + if (++an->an_tx_upper < 5) break; an->an_tx_upper = 0; if (nrate + 1 < rs->rs_nrates) { ==== //depot/projects/netperf+sockets/sys/dev/ath/if_athvar.h#4 (text+ko) ==== @@ -53,6 +53,7 @@ #define ATH_RXBUF 40 /* number of RX buffers */ #define ATH_TXBUF 60 /* number of TX buffers */ #define ATH_TXDESC 8 /* number of descriptors per buffer */ +#define ATH_TXMAXTRY 11 /* max number of transmit attempts */ struct ath_recv_hist { int arh_ticks; /* sample time by system clock */ @@ -71,6 +72,7 @@ int an_tx_upper; /* tx upper rate req cnt */ u_int an_tx_antenna; /* antenna for last good frame */ u_int8_t an_tx_rix0; /* series 0 rate index */ + u_int8_t an_tx_try0; /* series 0 try count */ u_int8_t an_tx_mgtrate; /* h/w rate for management/ctl frames */ u_int8_t an_tx_mgtratesp;/* short preamble h/w rate for " " */ u_int8_t an_tx_rate0; /* series 0 h/w rate */ @@ -111,8 +113,7 @@ struct mtx sc_mtx; /* master lock (recursive) */ struct ath_hal *sc_ah; /* Atheros HAL */ unsigned int sc_invalid : 1,/* disable hardware accesses */ - sc_doani : 1,/* dynamic noise immunity */ - sc_probing : 1;/* probing AP on beacon miss */ + sc_mrretry : 1;/* multi-rate retry support */ /* rate tables */ const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX]; const HAL_RATE_TABLE *sc_currates; /* current rate table */ @@ -300,10 +301,6 @@ #define ath_hal_rxmonitor(_ah) \ ((*(_ah)->ah_rxMonitor)((_ah))) -#define ath_hal_setupbeacondesc(_ah, _ds, _opmode, _flen, _hlen, \ - _rate, _antmode) \ - ((*(_ah)->ah_setupBeaconDesc)((_ah), (_ds), (_opmode), \ - (_flen), (_hlen), (_rate), (_antmode))) #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq))) #define ath_hal_rxprocdesc(_ah, _ds, _dspa, _dsnext) \ @@ -314,9 +311,9 @@ ((*(_ah)->ah_setupTxDesc)((_ah), (_ds), (_plen), (_hlen), (_atype), \ (_txpow), (_txr0), (_txtr0), (_keyix), (_ant), \ (_flags), (_rtsrate), (_rtsdura))) -#define ath_hal_setupxtxdesc(_ah, _ds, _short, \ +#define ath_hal_setupxtxdesc(_ah, _ds, \ _txr1, _txtr1, _txr2, _txtr2, _txr3, _txtr3) \ - ((*(_ah)->ah_setupXTxDesc)((_ah), (_ds), (_short), \ + ((*(_ah)->ah_setupXTxDesc)((_ah), (_ds), \ (_txr1), (_txtr1), (_txr2), (_txtr2), (_txr3), (_txtr3))) #define ath_hal_filltxdesc(_ah, _ds, _l, _first, _last) \ ((*(_ah)->ah_fillTxDesc)((_ah), (_ds), (_l), (_first), (_last))) From owner-p4-projects@FreeBSD.ORG Thu Jan 8 16:32:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44E6E16A4D1; Thu, 8 Jan 2004 16:32:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A0D516A4CE for ; Thu, 8 Jan 2004 16:32:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C17D43D73 for ; Thu, 8 Jan 2004 16:32:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i090WE0B061665 for ; Thu, 8 Jan 2004 16:32:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i090WEui061659 for perforce@freebsd.org; Thu, 8 Jan 2004 16:32:14 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 8 Jan 2004 16:32:14 -0800 (PST) Message-Id: <200401090032.i090WEui061659@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 44990 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, 09 Jan 2004 00:32:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=44990 Change 44990 by peter@peter_daintree on 2004/01/08 16:31:52 Ok, this is a hack, but save it before I lose it. Affected files ... .. //depot/projects/hammer/usr.sbin/Makefile#38 edit .. //depot/projects/hammer/usr.sbin/pcvt/ispcvt/Makefile#2 edit Differences ... ==== //depot/projects/hammer/usr.sbin/Makefile#38 (text+ko) ==== @@ -251,6 +251,10 @@ SUBDIR+=ofwdump .endif +.if ${MACHINE_ARCH} != "i386" +SUBDIR+=pcvt/ispcvt +.endif + .if !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+=keyserv .endif ==== //depot/projects/hammer/usr.sbin/pcvt/ispcvt/Makefile#2 (text+ko) ==== @@ -1,6 +1,12 @@ # $FreeBSD: src/usr.sbin/pcvt/ispcvt/Makefile,v 1.8 2001/03/26 14:41:07 ru Exp $ +.if ${MACHINE_ARCH} == "i386" PROG= ispcvt MAN= ispcvt.8 +.else +NOOBJ= stub only +NOMAN= stub only +LINKS+= /usr/bin/false /usr/sbin/ispcvt +.endif .include From owner-p4-projects@FreeBSD.ORG Thu Jan 8 16:48:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D88C316A4D1; Thu, 8 Jan 2004 16:48:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF59116A4CE for ; Thu, 8 Jan 2004 16:48:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97DAB43D39 for ; Thu, 8 Jan 2004 16:48:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i090mb0B069982 for ; Thu, 8 Jan 2004 16:48:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i090mZbS069979 for perforce@freebsd.org; Thu, 8 Jan 2004 16:48:35 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 8 Jan 2004 16:48:35 -0800 (PST) Message-Id: <200401090048.i090mZbS069979@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 44992 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, 09 Jan 2004 00:48:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=44992 Change 44992 by peter@peter_daintree on 2004/01/08 16:48:13 IFC @44988 Affected files ... .. //depot/projects/hammer/bin/date/date.1#4 integrate .. //depot/projects/hammer/contrib/gcc/function.c#6 integrate .. //depot/projects/hammer/contrib/libf2c/ChangeLog.egcs#2 delete .. //depot/projects/hammer/contrib/libf2c/libI77/rawio.h#2 delete .. //depot/projects/hammer/contrib/libobjc/objc-features.texi#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/generic/bits/limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/aix/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/aix/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/aix/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/generic/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/generic/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#4 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/hpux/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/newlib/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#3 delete .. //depot/projects/hammer/contrib/libstdc++/configure.host#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/backward/strstream.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/bits/generic_shadow.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/bits/slice.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/assert.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_climits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/ctype.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/errno.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/fcntl.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/features.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/float.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/iconv.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/iolibio.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/langinfo.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/libio.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/libioP.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/limits.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/locale.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/math.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/pthread.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/setjmp.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/signal.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/stdarg.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/stddef.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/stdio.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/stdlib.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/string.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/sys/cdefs.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/time.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/unistd.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/wchar.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/c_shadow/wctype.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/mkcshadow#2 delete .. //depot/projects/hammer/contrib/libstdc++/mkinclosure#2 delete .. //depot/projects/hammer/crypto/openssh/CREDITS#3 integrate .. //depot/projects/hammer/crypto/openssh/ChangeLog#4 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#5 integrate .. //depot/projects/hammer/crypto/openssh/INSTALL#3 integrate .. //depot/projects/hammer/crypto/openssh/LICENCE#2 integrate .. //depot/projects/hammer/crypto/openssh/Makefile.in#4 integrate .. //depot/projects/hammer/crypto/openssh/README.dns#1 branch .. //depot/projects/hammer/crypto/openssh/README.privsep#3 integrate .. //depot/projects/hammer/crypto/openssh/README.smartcard#2 integrate .. //depot/projects/hammer/crypto/openssh/TODO#4 integrate .. //depot/projects/hammer/crypto/openssh/acconfig.h#5 integrate .. //depot/projects/hammer/crypto/openssh/atomicio.c#2 integrate .. //depot/projects/hammer/crypto/openssh/atomicio.h#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb4.c#5 delete .. //depot/projects/hammer/crypto/openssh/auth-krb5.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.h#4 integrate .. //depot/projects/hammer/crypto/openssh/auth-passwd.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth-rh-rsa.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-rhosts.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-sia.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth-sia.h#3 integrate .. //depot/projects/hammer/crypto/openssh/auth.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth.h#4 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth2-chall.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2-gss.c#1 branch .. //depot/projects/hammer/crypto/openssh/auth2-hostbased.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-none.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pam-freebsd.c#7 delete .. //depot/projects/hammer/crypto/openssh/auth2-pam.c#5 delete .. //depot/projects/hammer/crypto/openssh/auth2-pam.h#2 delete .. //depot/projects/hammer/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#5 integrate .. //depot/projects/hammer/crypto/openssh/authfd.c#5 integrate .. //depot/projects/hammer/crypto/openssh/authfd.h#4 integrate .. //depot/projects/hammer/crypto/openssh/authfile.c#4 integrate .. //depot/projects/hammer/crypto/openssh/bufaux.c#3 integrate .. //depot/projects/hammer/crypto/openssh/bufaux.h#2 integrate .. //depot/projects/hammer/crypto/openssh/buffer.c#3 integrate .. //depot/projects/hammer/crypto/openssh/canohost.c#5 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#6 integrate .. //depot/projects/hammer/crypto/openssh/cipher-3des1.c#1 branch .. //depot/projects/hammer/crypto/openssh/cipher-aes.c#1 branch .. //depot/projects/hammer/crypto/openssh/cipher-bf1.c#1 branch .. //depot/projects/hammer/crypto/openssh/cipher-ctr.c#1 branch .. //depot/projects/hammer/crypto/openssh/cipher.c#5 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/hammer/crypto/openssh/compat.c#4 integrate .. //depot/projects/hammer/crypto/openssh/compat.h#5 integrate .. //depot/projects/hammer/crypto/openssh/config.h#4 integrate .. //depot/projects/hammer/crypto/openssh/configure.ac#4 integrate .. //depot/projects/hammer/crypto/openssh/deattack.c#3 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#4 integrate .. //depot/projects/hammer/crypto/openssh/dh.c#4 integrate .. //depot/projects/hammer/crypto/openssh/dispatch.c#2 integrate .. //depot/projects/hammer/crypto/openssh/dns.c#1 branch .. //depot/projects/hammer/crypto/openssh/dns.h#1 branch .. //depot/projects/hammer/crypto/openssh/entropy.c#2 integrate .. //depot/projects/hammer/crypto/openssh/groupaccess.c#2 integrate .. //depot/projects/hammer/crypto/openssh/gss-genr.c#1 branch .. //depot/projects/hammer/crypto/openssh/gss-serv-krb5.c#1 branch .. //depot/projects/hammer/crypto/openssh/gss-serv.c#1 branch .. //depot/projects/hammer/crypto/openssh/hostfile.c#4 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#4 integrate .. //depot/projects/hammer/crypto/openssh/key.c#5 integrate .. //depot/projects/hammer/crypto/openssh/key.h#3 integrate .. //depot/projects/hammer/crypto/openssh/log.c#4 integrate .. //depot/projects/hammer/crypto/openssh/log.h#5 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#4 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.h#2 integrate .. //depot/projects/hammer/crypto/openssh/logintest.c#2 integrate .. //depot/projects/hammer/crypto/openssh/md5crypt.c#2 integrate .. //depot/projects/hammer/crypto/openssh/md5crypt.h#2 integrate .. //depot/projects/hammer/crypto/openssh/mdoc2man.awk#1 branch .. //depot/projects/hammer/crypto/openssh/mdoc2man.pl#2 delete .. //depot/projects/hammer/crypto/openssh/misc.c#4 integrate .. //depot/projects/hammer/crypto/openssh/misc.h#2 integrate .. //depot/projects/hammer/crypto/openssh/moduli.c#1 branch .. //depot/projects/hammer/crypto/openssh/moduli.h#1 branch .. //depot/projects/hammer/crypto/openssh/monitor.c#6 integrate .. //depot/projects/hammer/crypto/openssh/monitor.h#3 integrate .. //depot/projects/hammer/crypto/openssh/monitor_fdpass.c#3 integrate .. //depot/projects/hammer/crypto/openssh/monitor_mm.c#3 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#4 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/hammer/crypto/openssh/msg.c#4 integrate .. //depot/projects/hammer/crypto/openssh/myproposal.h#2 integrate .. //depot/projects/hammer/crypto/openssh/nchan.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/Makefile.in#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/base64.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/basename.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/basename.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bindresvport.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-arc4random.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-getpeereid.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-nextstep.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-snprintf.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-waitpid.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/daemon.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/dirname.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/dirname.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-gai-errnos.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#3 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#3 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-getnameinfo.c#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-getnameinfo.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-socket.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getcwd.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getcwd.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getgrouplist.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getopt.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getopt.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.h#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/glob.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/glob.h#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_aton.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntoa.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntoa.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntop.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/mktemp.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/mktemp.h#3 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-irix.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-irix.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/realpath.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/realpath.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/rresvport.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/rresvport.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/setenv.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/setenv.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/setproctitle.h#3 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcat.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcat.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcpy.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcpy.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strmode.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strmode.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strsep.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strsep.h#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/vis.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/vis.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xcrypt.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xmmap.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xmmap.h#2 delete .. //depot/projects/hammer/crypto/openssh/packet.c#5 integrate .. //depot/projects/hammer/crypto/openssh/packet.h#3 integrate .. //depot/projects/hammer/crypto/openssh/progressmeter.c#2 integrate .. //depot/projects/hammer/crypto/openssh/radix.c#3 delete .. //depot/projects/hammer/crypto/openssh/radix.h#2 delete .. //depot/projects/hammer/crypto/openssh/readconf.c#4 integrate .. //depot/projects/hammer/crypto/openssh/readconf.h#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/Makefile#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/README.regress#1 branch .. //depot/projects/hammer/crypto/openssh/regress/agent-getpeereid.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/agent-ptrace.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/agent-timeout.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/agent.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/authorized_keys_root#2 delete .. //depot/projects/hammer/crypto/openssh/regress/dynamic-forward.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/forwarding.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/proto-version.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/reconfigure.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/rekey.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/sftp-badcmds.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/sftp-batch.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/sftp-cmds.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/sftp.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/ssh-com-client.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/ssh-com-keygen.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/ssh-com-sftp.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/ssh-com.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/stderr-after-eof.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/stderr-data.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/test-exec.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/transfer.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/try-ciphers.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/yes-head.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/scard-opensc.c#2 integrate .. //depot/projects/hammer/crypto/openssh/scard.c#2 integrate .. //depot/projects/hammer/crypto/openssh/scard.h#3 integrate .. //depot/projects/hammer/crypto/openssh/scp.1#3 integrate .. //depot/projects/hammer/crypto/openssh/scp.c#5 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#4 integrate .. //depot/projects/hammer/crypto/openssh/servconf.h#3 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#5 integrate .. //depot/projects/hammer/crypto/openssh/session.c#7 integrate .. //depot/projects/hammer/crypto/openssh/session.h#4 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sftp-common.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sftp-int.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sftp.1#4 integrate .. //depot/projects/hammer/crypto/openssh/sftp.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.1#3 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-dss.h#3 delete .. //depot/projects/hammer/crypto/openssh/ssh-gss.h#1 branch .. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#3 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.8#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rsa.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rsa.h#3 delete .. //depot/projects/hammer/crypto/openssh/ssh.1#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh.h#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh2.h#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#6 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect1.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#5 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#6 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#6 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#7 integrate .. //depot/projects/hammer/crypto/openssh/sshlogin.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sshtty.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ttymodes.c#2 integrate .. //depot/projects/hammer/crypto/openssh/uidswap.c#3 integrate .. //depot/projects/hammer/crypto/openssh/version.h#7 integrate .. //depot/projects/hammer/etc/Makefile#21 integrate .. //depot/projects/hammer/etc/moduli#2 delete .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#7 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#15 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/fpgetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/makecontext.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/ttyname.c#3 integrate .. //depot/projects/hammer/lib/libc/gmon/mcount.c#2 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/makecontext.c#3 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/signalcontext.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/srune.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcstold.c#3 integrate .. //depot/projects/hammer/lib/libc/net/res_send.c#2 integrate .. //depot/projects/hammer/lib/libc/posix1e/acl_delete_entry.c#2 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.c#7 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_time.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_qp.c#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/signalcontext.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap_install.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap_setup.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#8 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#10 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#6 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#10 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_rwlock.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#13 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#23 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_rwlock.c#6 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#10 integrate .. //depot/projects/hammer/sbin/Makefile#20 integrate .. //depot/projects/hammer/sbin/mount/mount.c#10 integrate .. //depot/projects/hammer/sbin/mount_nullfs/mount_nullfs.8#4 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#6 integrate .. //depot/projects/hammer/secure/libexec/sftp-server/Makefile#4 integrate .. //depot/projects/hammer/secure/libexec/ssh-keysign/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/scp/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/sftp/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-add/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-agent/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-keygen/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-keyscan/Makefile#2 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#7 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#7 integrate .. //depot/projects/hammer/share/man/man4/ath.4#10 integrate .. //depot/projects/hammer/share/man/man4/ath_hal.4#7 integrate .. //depot/projects/hammer/share/man/man4/gdb.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ndis.4#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#11 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#8 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#32 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#16 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0sio.s#3 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/hammer/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/hammer/sys/conf/options.i386#22 integrate .. //depot/projects/hammer/sys/conf/options.pc98#18 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#13 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#15 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#10 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/mga_dma.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/r128.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/r128_cce.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/radeon.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#6 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#22 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#13 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#19 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcireg.h#8 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#6 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#15 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#26 integrate .. //depot/projects/hammer/sys/dev/ic/i8259.h#1 branch .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs.c#5 integrate .. //depot/projects/hammer/sys/i386/include/profile.h#5 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#7 integrate .. //depot/projects/hammer/sys/i386/isa/icu.h#5 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_ext.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#29 integrate .. //depot/projects/hammer/sys/kern/tty.c#10 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#31 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/hammer/sys/net/route.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#24 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#3 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#15 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#29 integrate .. //depot/projects/hammer/sys/pci/if_dcreg.h#14 integrate .. //depot/projects/hammer/sys/sparc64/include/ofw_machdep.h#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/ofw_machdep.c#5 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#12 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#21 integrate .. //depot/projects/hammer/tools/tools/pirtool/Makefile#1 branch .. //depot/projects/hammer/tools/tools/pirtool/pirtable.h#1 branch .. //depot/projects/hammer/tools/tools/pirtool/pirtool.c#1 branch .. //depot/projects/hammer/usr.bin/lex/flex.skl#3 integrate .. //depot/projects/hammer/usr.bin/lex/gen.c#2 integrate .. //depot/projects/hammer/usr.bin/su/su.c#11 integrate .. //depot/projects/hammer/usr.bin/truss/alpha-fbsd.c#4 integrate .. //depot/projects/hammer/usr.bin/truss/extern.h#4 integrate .. //depot/projects/hammer/usr.bin/truss/i386-fbsd.c#5 integrate .. //depot/projects/hammer/usr.bin/truss/i386-linux.c#4 integrate .. //depot/projects/hammer/usr.bin/truss/ia64-fbsd.c#6 integrate .. //depot/projects/hammer/usr.bin/truss/setup.c#3 integrate .. //depot/projects/hammer/usr.bin/truss/sparc64-fbsd.c#4 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#9 integrate .. //depot/projects/hammer/usr.sbin/fdformat/fdformat.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/create.c#7 integrate .. //depot/projects/hammer/usr.sbin/ndp/ndp.c#5 integrate .. //depot/projects/hammer/usr.sbin/pciconf/pciconf.8#6 integrate Differences ... ==== //depot/projects/hammer/bin/date/date.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.60 2003/02/23 01:47:47 ru Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.61 2004/01/06 19:01:34 obrien Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -316,6 +316,7 @@ .Pp may be used on one machine to print out the date suitable for setting on another. +("+%m%d%H%M%Y.%S" for use on Linux) .Pp The command: .Pp ==== //depot/projects/hammer/contrib/gcc/function.c#6 (text+ko) ==== @@ -19,6 +19,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc/function.c,v 1.20 2004/01/06 10:38:48 bde Exp $ */ + /* This file handles the generation of rtl code from tree structure at the level of the function as a whole. It creates the rtl expressions for parameters and auto variables @@ -6995,6 +6997,21 @@ Pmode); } +#ifdef TARGET_PROFILER_EPILOGUE + if (current_function_profile && TARGET_PROFILER_EPILOGUE) + { + static rtx mexitcount_libfunc; + static int initialized; + + if (!initialized) + { + mexitcount_libfunc = init_one_libfunc (".mexitcount"); + initialized = 1; + } + emit_library_call (mexitcount_libfunc, LCT_NORMAL, VOIDmode, 0); + } +#endif + /* Let except.c know where it should emit the call to unregister the function context for sjlj exceptions. */ if (flag_exceptions && USING_SJLJ_EXCEPTIONS) ==== //depot/projects/hammer/crypto/openssh/CREDITS#3 (text+ko) ==== @@ -5,7 +5,7 @@ Alain St-Denis - Irix fix Alexandre Oliva - AIX fixes -Andre Lucas - new login code, many fixes +Andre Lucas - new login code, many fixes Andreas Steinmetz - Shadow password expiry support Andrew McGill - SCO fixes Andrew Morgan - PAM bugfixes @@ -23,7 +23,7 @@ Chris, the Young One - Password auth fixes Christos Zoulas - Autoconf fixes Chun-Chung Chen - RPM fixes -Corinna Vinschen - Cygwin support +Corinna Vinschen - Cygwin support Dan Brosemer - Autoconf support, build fixes Darren Hall - AIX patches Darren Tucker - AIX BFF package scripts @@ -49,6 +49,7 @@ KAMAHARA Junzo - Configure fixes Kees Cook - scp fixes Kenji Miyake - Configure fixes +Kevin Cawlfield - AIX fixes. Kevin O'Connor - RSAless operation Kevin Steves - HP support, bugfixes, improvements Kiyokazu SUTO - Bugfixes @@ -69,11 +70,13 @@ Pavel Troller - Bugfixes Pekka Savola - Bugfixes Peter Kocks - Makefile fixes +Peter Stuge - mdoc2man.awk script Phil Hands - Debian scripts, assorted patches Phil Karn - Autoconf fixes Philippe WILLEM - Bugfixes Phill Camp - login code fix Rip Loomis - Solaris package support, fixes +Roumen Petrov - Compile & configure fixes SAKAI Kiyotaka - Multiple bugfixes Simon Wilkinson - PAM fixes, Compat with MIT KrbV Solar Designer - many patches and technical assistance @@ -91,5 +94,5 @@ Damien Miller -$Id: CREDITS,v 1.67 2002/07/28 20:31:19 stevesk Exp $ +$Id: CREDITS,v 1.74 2003/09/07 02:34:54 dtucker Exp $ ==== //depot/projects/hammer/crypto/openssh/ChangeLog#4 (text+ko) ==== @@ -1,1298 +1,1191 @@ -20030401 - - (djm) OpenBSD CVS Sync - - jmc@cvs.openbsd.org 2003/03/28 10:11:43 - [scp.1 sftp.1 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5 sshd_config.5] - [ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8] - - killed whitespace - - new sentence new line - - .Bk for arguments - ok markus@ - - markus@cvs.openbsd.org 2003/04/01 10:10:23 - [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c] - [readconf.h serverloop.c sshconnect2.c] - rekeying bugfixes and automatic rekeying: - * both client and server rekey _automatically_ - (a) after 2^31 packets, because after 2^32 packets - the sequence number for packets wraps - (b) after 2^(blocksize_in_bits/4) blocks - (see: draft-ietf-secsh-newmodes-00.txt) - (a) and (b) are _enabled_ by default, and only disabled for known - openssh versions, that don't support rekeying properly. - * client option 'RekeyLimit' - * do not reply to requests during rekeying - - markus@cvs.openbsd.org 2003/04/01 10:22:21 - [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c] - [readconf.h serverloop.c sshconnect2.c] - backout rekeying changes (for 3.6.1) - - markus@cvs.openbsd.org 2003/04/01 10:31:26 - [compat.c compat.h kex.c] - bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@; - tested by ho@ and myself - - markus@cvs.openbsd.org 2003/04/01 10:56:46 - [version.h] - 3.6.1 - - (djm) Crank spec file versions - - (djm) Release 3.6.1p1 +20030923 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2003/09/18 07:52:54 + [sshconnect.c] + missing {}; bug #656; jclonguet at free.fr + - markus@cvs.openbsd.org 2003/09/18 07:54:48 + [buffer.c] + protect against double free; #660; zardoz at users.sf.net + - markus@cvs.openbsd.org 2003/09/18 08:49:45 + [deattack.c misc.c session.c ssh-agent.c] + more buffer allocation fixes; from Solar Designer; CAN-2003-0682; + ok millert@ + - markus@cvs.openbsd.org 2003/09/19 09:02:02 + [packet.c] + buffer_dump only if PACKET_DEBUG is defined; Jedi/Sector One; pr 3471 + - (djm) Fix SSH1 challenge kludge + - (djm) Bug #671: Fix builds on OpenBSD + - (djm) Bug #676: Fix PAM stack corruption + - (djm) Fix bad free() in PAM code + - (djm) Don't call pam_end before pam_init + - (djm) Enable build with old OpenSSL again + - (djm) Trim deprecated options from INSTALL. Mention UsePAM + - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu + - (djm) Crank version.h and spec version numbers + - (djm) Release 3.7.1p2 -20030326 - - (djm) OpenBSD CVS Sync - - deraadt@cvs.openbsd.org 2003/03/26 04:02:51 - [sftp-server.c] - one last fix to the tree: race fix broke stuff; pr 3169; - srp@srparish.net, help from djm +20030922 + - (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree + builds. Portability corrections from tim@. + - (dtucker) [configure.ac] Bug #665: uid swapping issues on Mac OS X. + Patch from max at quendi.de. + - (dtucker) [configure.ac] Bug #657: uid swapping issues on BSDi. + - (dtucker) [configure.ac] Bug #653: uid swapping issues on Tru64. + - (dtucker) [configure.ac] Bug #693: uid swapping issues on NCR MP-RAS. + Patch from david.haughton at ncr.com + - (dtucker) [configure.ac] Bug #659: uid swapping issues on IRIX 6. + Part of patch supplied by bugzilla-openssh at thewrittenword.com + - (dtucker) [configure.ac openbsd-compat/fake-rfc2553.c + openbsd-compat/fake-rfc2553.h] Bug #659: Test for and handle systems with + where gai_strerror is defined as "const char *". Part of patch supplied + by bugzilla-openssh at thewrittenword.com + - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config] Update + ssh-host-config to match current defaults, bump README version. Patch from + vinschen at redhat.com. + - (dtucker) [uidswap.c] Don't test restoration of uid on Cygwin since the + OS does not support permanently dropping privileges. Patch from + vinschen at redhat.com. + - (dtucker) [openbsd-compat/port-aix.c] Use correct include for xmalloc.h, + add canohost.h to stop warning. Based on patch from openssh-unix-dev at + thewrittenword.com + - (dtucker) [INSTALL] Bug #686: Document requirement for zlib 1.1.4 or + higher. + - (tim) Fix typo. s/SETEIUD_BREAKS_SETUID/SETEUID_BREAKS_SETUID/ + - (tim) [configure.ac] Bug 665: move 3 new AC_DEFINES outside of AC_TRY_RUN. + Report by distler AT golem ph utexas edu. + - (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from + article by genty at austin.ibm.com, included with the author's permission. + - (tim) [configure.ac] add --disable-etc-default-login option. ok djm -20030325 - - (djm) Fix getpeerid support for 64 bit BE systems. From - Arnd Bergmann +20030919 + - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; + djast AT cs.toronto.edu + - (djm) Bug #680: Remove missing inet_ntoa.h header reference + - (djm) Bug #646: Fix location of x11-ssh-askpass; Jim + - (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h + unless required. Reorder to reduce warnings. + - (dtucker) [session.c] Bug #643: Fix size_t -> u_int and fix null deref + when /etc/default/login doesn't exist or isn't readable. Fixes from + jparsons-lists at saffron.net and georg.oppenberg at deu mci com. -20030324 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/03/23 19:02:00 - [monitor.c] - unbreak rekeying for privsep; ok millert@ - - Release 3.6p1 - - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Report from murple@murple.net, diagnosis from dtucker@zip.com.au +20030918 + - (djm) Bug #652: Fix empty password auth -20030320 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/03/17 10:38:38 - [progressmeter.c] - don't print \n if backgrounded; from ho@ - - markus@cvs.openbsd.org 2003/03/17 11:43:47 - [version.h] - enter 3.6 - - (bal) The days of lack of int64_t support are over. Sorry kids. - - (bal) scp.c 'limit' conflicts with Cray. Rename to 'limitbw' - - (bal) Collection of Cray patches (bsd-cray.h fix for CRAYT3E and improved - guessing rules) - - (bal) Disable Privsep for Tru64 after pre-authentication due to issues - with SIA. Also, clean up of tru64 support patch by Chris Adams - - - (tim) [contrib/caldera/openssh.spec] workaround RPM quirk. Fix %files +20030917 + - (djm) OpenBSD Sync + - markus@cvs.openbsd.org 2003/09/16 21:02:40 + [buffer.c channels.c version.h] + more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU + - (djm) Crank RPM spec versions + - (djm) Release 3.7.1p1 -20030318 - - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] - add nanosleep(). testing/corrections by Darren Tucker +20030916 + - (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve + PATH (or SUPATH) and UMASK from /etc/default/login on platforms that have it + (eg Solaris, Reliant Unix). Patch from Robert.Dahlem at siemens.com. + ok djm@ + - (bal) OpenBSD Sync + - deraadt@cvs.openbsd.org 2003/09/16 03:03:47 + [buffer.c] + do not expand buffer before attempting to reallocate it; markus ok + - (djm) Crank spec versions + - (djm) Banish (safe) sprintf from auth-pam.c. Patch from bal + - (tim) [configure.ac] Fix portability issues. + - (djm) Release 3.7p1 -20030317 - - (djm) Fix return value checks for RAND_bytes. Report from - Steve G +20030914 + - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing + the regression tests from running with Solaris' make. Patch from Brian + Poole (raj at cerias.purdue.edu). + - (dtucker) [regress/Makefile] AIX's make doesn't like " +=", so replace + with vanilla "=". -20030315 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/03/13 11:42:19 - [authfile.c ssh-keysign.c] - move RSA_blinding_on to generic key load method - - markus@cvs.openbsd.org 2003/03/13 11:44:50 - [ssh-agent.c] - ssh-agent is similar to ssh-keysign (allows other processes to use - private rsa keys). however, it gets key over socket and not from - a file, so we have to do blinding here as well. +20030913 + - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for + slower hosts, increase to 10 sec. + - (dtucker) [auth-passwd.c] On AIX, call setauthdb() before loginsuccess(), + required to correctly reset failed login count when using a password + registry other than "files" (eg LDAP, see bug #543). + - (tim) [configure.ac] define WITH_ABBREV_NO_TTY for SCO. + Report by Roger Cornelius. + - (dtucker) [auth-pam.c] Use SSHD_PAM_SERVICE for PAM service name, patch + from cjwatson at debian.org. -20030310 -- (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/03/05 22:33:43 - [channels.c monitor.c scp.c session.c sftp-client.c sftp-int.c] - [sftp-server.c ssh-add.c sshconnect2.c] - fix memory leaks; from dlheine@suif.Stanford.EDU/CLOUSEAU; ok djm@ - - (djm) One more portable-specific one from dlheine@suif.Stanford.EDU/ - CLOUSEAU - - (djm) Bug #245: TTY problems on Solaris. Fix by stevesk@ and - dtucker@zip.com.au - - (djm) AIX package builder update from dtucker@zip.com.au +20030912 + - (tim) [regress/agent-ptrace.sh] sh doesn't like "if ! shell_function; then". + - (tim) [Makefile.in] only mkdir regress if it does not exist. + - (tim) [regress/yes-head.sh] shell portability fix. -20030225 - - (djm) Fix some compile errors spotted by dtucker and his fabulous - tinderbox +20030911 + - (dtucker) [configure.ac] Bug #588, #615: Move other libgen tests to after + the dirname test, to allow a broken dirname to be detected correctly. + Based partially on patch supplied by alex.kiernan at thus.net. ok djm@ + - (tim) [configure.ac] Move libgen tests to before libwrap to unbreak + UnixWare 2.03 using --with-tcp-wrappers. + - (tim) [configure.ac] Prefer setuid/setgid on UnixWare and Open Server. + - (tim) [regress/agent-ptrace.sh regress/dynamic-forward.sh + regress/sftp-cmds.sh regress/stderr-after-eof.sh regress/test-exec.sh] + no longer depends on which(1). patch by dtucker@ -20030224 - - (djm) Tweak gnome-ssh-askpass2: - - Retry kb and mouse grab a couple of times, so passphrase dialog doesn't - immediately fail if you are doing something else when it appears (e.g. - dragging a window) - - Perform server grab after we have the keyboard and/or pointer to avoid - races. - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/01/27 17:06:31 - [sshd.c] - more specific error message when /var/empty has wrong permissions; - bug #46, map@appgate.com; ok henning@, provos@, stevesk@ - - markus@cvs.openbsd.org 2003/01/28 16:11:52 - [scp.1] - document -l; pekkas@netcore.fi - - stevesk@cvs.openbsd.org 2003/01/28 17:24:51 - [scp.1] - remove example not pertinent with -1 addition; ok markus@ - - jmc@cvs.openbsd.org 2003/01/31 21:54:40 - [sshd.8] - typos; sshd(8): help and ok markus@ - help and ok millert@ - - markus@cvs.openbsd.org 2003/02/02 10:51:13 - [scp.c] - call okname() only when using system(3) for remote-remote copy; - fixes bugs #483, #472; ok deraadt@, mouring@ - - markus@cvs.openbsd.org 2003/02/02 10:56:08 - [kex.c] - add support for key exchange guesses; based on work by - avraham.fraenkel@commatch.com; fixes bug #148; ok deraadt@ - - markus@cvs.openbsd.org 2003/02/03 08:56:16 - [sshpty.c] - don't call error() for readonly /dev; from soekris list; ok mcbride, - henning, deraadt. - - markus@cvs.openbsd.org 2003/02/04 09:32:08 - [key.c] - better debug3 message - - markus@cvs.openbsd.org 2003/02/04 09:33:22 - [monitor.c monitor_wrap.c] - skey/bsdauth: use 0 to indicate failure instead of -1, because - the buffer API only supports unsigned ints. - - markus@cvs.openbsd.org 2003/02/05 09:02:28 - [readconf.c] - simplify ProxyCommand parsing, remove strcat/xrealloc; ok henning@, djm@ - - markus@cvs.openbsd.org 2003/02/06 09:26:23 - [session.c] - missing call to setproctitle() after authentication; ok provos@ - - markus@cvs.openbsd.org 2003/02/06 09:27:29 - [ssh.c ssh_config.5] - support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@ - - markus@cvs.openbsd.org 2003/02/06 09:29:18 - [sftp-server.c] - fix races in rename/symlink; from Tony Finch; ok djm@ - - markus@cvs.openbsd.org 2003/02/06 21:22:43 - [auth1.c auth2.c] - undo broken fix for #387, fixes #486 - - markus@cvs.openbsd.org 2003/02/10 11:51:47 - [ssh-add.1] - xref sshd_config.5 (not sshd.8); mark@summersault.com; bug #490 - - markus@cvs.openbsd.org 2003/02/12 09:33:04 - [key.c key.h ssh-dss.c ssh-rsa.c] - merge ssh-dss.h ssh-rsa.h into key.h; ok deraadt@ - - markus@cvs.openbsd.org 2003/02/12 21:39:50 - [crc32.c crc32.h] - replace crc32.c with a BSD licensed version; noted by David Turner - - markus@cvs.openbsd.org 2003/02/16 17:09:57 - [kex.c kexdh.c kexgex.c kex.h sshconnect2.c sshd.c ssh-keyscan.c] - split kex into client and server code, no need to link - server code into the client; ok provos@ - - markus@cvs.openbsd.org 2003/02/16 17:30:33 - [monitor.c monitor_wrap.c] - fix permitrootlogin forced-commands-only for privsep; bux #387; - ok provos@ - - markus@cvs.openbsd.org 2003/02/21 09:05:53 - [servconf.c] - print sshd_config filename in debug2 mode. - - mpech@cvs.openbsd.org 2003/02/21 10:34:48 - [auth-krb4.c] - ...sizeof(&adat.session) is not good here. - henning@, deraadt@, millert@ - - (djm) Add new object files to Makefile and reorder - - (djm) Bug #501: gai_strerror should return char*; - fix from dtucker@zip.com.au - - (djm) Most of Bug #499: Cygwin compile fixes for new progressmeter; - From vinschen@redhat.com - - (djm) Rest of Bug #499: Import a basename() function from OpenBSD libc - - (djm) Bug #494: Allow multiple accounts on Windows 9x/Me; - From vinschen@redhat.com - - (djm) Bug #456: Support for NEC SX6 with Unicos; from wendyp@cray.com +20030910 + - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine. + Patch from wendyp at cray.com. + - (dtucker) [configure.ac] Part of bug #615: tcsendbreak might be a macro. + - (dtucker) [regressh/yes-head.sh] Some platforms (eg Solaris) don't have + "yes". -20030211 - - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com +20030909 + - (tim) [regress/Makefile] Fixes for building outside of a read-only + source tree. + - (tim) [regress/agent-timeout.sh] s/TIMEOUT/SSHAGENT_TIMEOUT/ Fixes conflict + with shell read-only variable. + - (tim) [regress/sftp-badcmds.sh regress/sftp-cmds.sh] Fix errors like + UX:rm: ERROR: Cannot remove '.' or '..' -20030206 - - (djm) Teach fake-getaddrinfo to use getservbyname() when provided a - string service name. Suggested by markus@, review by itojun@ +20030908 + - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 8 22:53:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 769B116A4D1; Thu, 8 Jan 2004 22:53:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51D5C16A4CE for ; Thu, 8 Jan 2004 22:53:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 776A443D48 for ; Thu, 8 Jan 2004 22:53:01 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i096r10B056968 for ; Thu, 8 Jan 2004 22:53:01 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i096r0AR056965 for perforce@freebsd.org; Thu, 8 Jan 2004 22:53:00 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 8 Jan 2004 22:53:00 -0800 (PST) Message-Id: <200401090653.i096r0AR056965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45000 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, 09 Jan 2004 06:53:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=45000 Change 45000 by sam@sam_ebb on 2004/01/08 22:52:44 correct check for use of an alternate xmit rate Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#10 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#10 (text+ko) ==== @@ -2246,7 +2246,7 @@ if (ds->ds_txstat.ts_status == 0) { an->an_tx_ok++; an->an_tx_antenna = ds->ds_txstat.ts_antenna; - if (ds->ds_txstat.ts_rate != 0) + if (ds->ds_txstat.ts_rate & HAL_TXSTAT_ALTRATE) sc->sc_stats.ast_tx_altrate++; } else { an->an_tx_err++; From owner-p4-projects@FreeBSD.ORG Fri Jan 9 11:01:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B870616A4D2; Fri, 9 Jan 2004 11:01:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7556916A4CE for ; Fri, 9 Jan 2004 11:01:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E643B43D3F for ; Fri, 9 Jan 2004 11:01:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i09J1p0B039837 for ; Fri, 9 Jan 2004 11:01:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09J1p5T039831 for perforce@freebsd.org; Fri, 9 Jan 2004 11:01:51 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 9 Jan 2004 11:01:51 -0800 (PST) Message-Id: <200401091901.i09J1p5T039831@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 45020 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, 09 Jan 2004 19:01:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=45020 Change 45020 by jhb@jhb_slimer on 2004/01/09 11:01:31 Update todo lists. Affected files ... .. //depot/projects/smpng/sys/notes#3 edit .. //depot/user/jhb/acpipci/notes#78 edit Differences ... ==== //depot/projects/smpng/sys/notes#3 (text+ko) ==== @@ -36,14 +36,11 @@ - Remove sched_lock from lockmgr TDF_DEADLKTREAT flag check. Perhaps we can move this flag to TDP_DEADLKTREAT even. - Mostly untested -- Allow mtx_trylock() to recurse on a recursive mutex. - - Needs strict testing - Use panic_thread pointer instead of panic_cpu to allow for migration of the panic'ing thread - Untested -+ Move schedcpu() into its own kthread. - + Committed -- Move loadav() into the schedcpu kthread. +- Move loadav() into its own thread. + - Untested - Remove some bogus atomic_load_acq()'s and add ia32_pause()'s to stop_cpus() and restart_cpus(). - Untested ==== //depot/user/jhb/acpipci/notes#78 (text+ko) ==== @@ -5,12 +5,14 @@ + Allow loader tunables to override the IRQ for each link device. + Test routing of an unrouted link. - Trim includes in sys/i386/pci/pci_*. + - Only parse the PIR and create link devices if a PCIBIOS host-pci bridge + attaches. - Export PA's of APICs for vmware + Handle MADT and IRQ 9 special case - This is gross, we might want a redirection layer in nexus(4) - - Linux does this. We just need to read the SCI int out of the FADT + + Linux does this. We just need to read the SCI int out of the FADT instead of hard-coding 9. - - Use level/low if SCI routed to IRQ 9 as active/hi or if routed to + + Use level/low if SCI routed to IRQ 9 as active/hi or if routed to PCI interrupt + Add dev/ic/i8259A.h + Make acpi_cpu_c1() MD. @@ -21,9 +23,11 @@ - Allow SCI to be routed via mixed-mode? - Add a MI interrupt source abstraction and move handlers out of ithd and into that + - Have suspend/resume operate on pics, not individual sources - Defer creation of ithreads until a non-fast handler is added to an interrupt source - Kill isa_irq_pending() (maybe, is this an MI function?) + - Lazily allocate PCI lapic interrupt vectors. - DDB - Add 'show ithread' + Add 'show irqs' @@ -42,8 +46,8 @@ + Implement mixed-mode and use it for IRQ0 unless no ExtINT pin or NO_MIXED_MODE + Add NO_MIXED_MODE option + - Make NO_MIXED_MODE a loader tunable as well. (hw.apic.mixed_mode) - Add runtime decision for IRQ0 mixed mode? - - Don't use mixed mode with MADT? - Add handling of local APIC ERROR lvt. - Use the local apic timer to drive hard/stat/profclock (maybe too hard) - Do we need to be able to renumber I/O APICs? @@ -52,7 +56,6 @@ - Renumber I/O APIC IDs. Ugh. Not sure if this will have to be done for the general case or just for the mptable case. Update: may not have to, it was a BIOS bug. May have to bump NAPICID to 256 though. -- Flesh out cpu topology map - Suspend/resume support for I/O APICs - reimplement lazy masking of interrupts for critical sections w/o bitmasks?? - Support bus_config_intr()? @@ -65,3 +68,6 @@ Unrelated to this branch: - Work on cleaning up nested includes in sys/* headers. According to Bruce, the only nested sys/* headers should be _*.h and queue.h. +- Add commands to the loader to allow one to set hints via an intuitive + inteface, like 'disable apic0' sets 'hint.apic.0.disabled=1' or maybe + 'devcfg disable apic0' 'devcfg set sio0 irq 4', 'devcfg delete foo0' From owner-p4-projects@FreeBSD.ORG Fri Jan 9 11:05:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 929E716A4D1; Fri, 9 Jan 2004 11:05:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CC8816A4CE for ; Fri, 9 Jan 2004 11:05:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 704B543D49 for ; Fri, 9 Jan 2004 11:05:57 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i09J5v0B041580 for ; Fri, 9 Jan 2004 11:05:57 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09J5vwq041575 for perforce@freebsd.org; Fri, 9 Jan 2004 11:05:57 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 9 Jan 2004 11:05:57 -0800 (PST) Message-Id: <200401091905.i09J5vwq041575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45021 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, 09 Jan 2004 19:05:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=45021 Change 45021 by sam@sam_ebb on 2004/01/09 11:05:28 revert change to suppress if_init calls; must do this in the 802.11 layer as there are too many assumptions elsewhere that ether_ioctl will call if_init each time Affected files ... .. //depot/projects/netperf+sockets/sys/net/if_ethersubr.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net/if_ethersubr.c#4 (text+ko) ==== @@ -873,21 +873,12 @@ switch (command) { case SIOCSIFADDR: - /* - * NB: don't reset the interface unless it's - * being marked up for the first time. Calling - * the init method unncessarily can cause some - * devices to do lots of work (e.g. 802.11 where - * the station may reassociate). - */ + ifp->if_flags |= IFF_UP; + switch (ifa->ifa_addr->sa_family) { #ifdef INET case AF_INET: - if ((ifp->if_flags & IFF_UP) == 0) { - /* bring the interface up before arpwhohas */ - ifp->if_flags |= IFF_UP; - ifp->if_init(ifp->if_softc); - } + ifp->if_init(ifp->if_softc); /* before arpwhohas */ arp_ifinit(ifp, ifa); break; #endif @@ -895,7 +886,8 @@ /* * XXX - This code is probably wrong */ - case AF_IPX: { + case AF_IPX: + { struct ipx_addr *ina = &(IA_SIPX(ifa)->sipx_addr); struct arpcom *ac = IFP2AC(ifp); @@ -908,14 +900,16 @@ (caddr_t) ac->ac_enaddr, sizeof(ac->ac_enaddr)); } - /* fall thru... */ - } + + /* + * Set new address + */ + ifp->if_init(ifp->if_softc); + break; + } #endif default: - if ((ifp->if_flags & IFF_UP) == 0) { - ifp->if_flags |= IFF_UP; - ifp->if_init(ifp->if_softc); - } + ifp->if_init(ifp->if_softc); break; } break; From owner-p4-projects@FreeBSD.ORG Fri Jan 9 11:39:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F0E916A4D1; Fri, 9 Jan 2004 11:39:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A2D216A4CE for ; Fri, 9 Jan 2004 11:39:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F38943D49 for ; Fri, 9 Jan 2004 11:39:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i09Jdm0B047973 for ; Fri, 9 Jan 2004 11:39:48 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09JdmbV047970 for perforce@freebsd.org; Fri, 9 Jan 2004 11:39:48 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 9 Jan 2004 11:39:48 -0800 (PST) Message-Id: <200401091939.i09JdmbV047970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45026 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, 09 Jan 2004 19:39:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=45026 Change 45026 by sam@sam_ebb on 2004/01/09 11:39:01 Do if_init suppression for SIOCSIFADDR. Setting the higher level address on an 802.11 interface should not have any effect in the driver. But since IFF_UP is set as a side-effect of this ioctl we need to call the driver at least once. This change eliminates 1-N channel scans when operating in station or ibss/adhoc mode as each call to if_init typically causes the driver to initiate a scan. The 1-N number varies depending on how many address families are configured for use on the interface. Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#5 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#5 (text+ko) ==== @@ -38,6 +38,9 @@ * IEEE 802.11 ioctl support (FreeBSD-specific) */ +#include "opt_inet.h" +#include "opt_ipx.h" + #include #include #include @@ -50,6 +53,16 @@ #include #include +#ifdef INET +#include +#include +#endif + +#ifdef IPX +#include +#include +#endif + #include #include @@ -762,6 +775,7 @@ u_int8_t tmpkey[IEEE80211_KEYBUF_SIZE]; char tmpssid[IEEE80211_NWID_LEN]; struct ieee80211_channel *chan; + struct ifaddr *ifa; /* XXX */ switch (cmd) { case SIOCSIFMEDIA: @@ -1037,6 +1051,51 @@ error = copyout(&ic->ic_stats, ifr->ifr_data, sizeof (ic->ic_stats)); break; + case SIOCSIFADDR: + /* + * XXX Handle this directly so we can supress if_init calls. + * XXX This should be done in ether_ioctl but for the moment + * XXX there are too many other parts of the system that + * XXX set IFF_UP and so supress if_init being called when + * XXX it should be. + */ + ifa = (struct ifaddr *) data; + switch (ifa->ifa_addr->sa_family) { +#ifdef INET + case AF_INET: + if ((ifp->if_flags & IFF_UP) == 0) { + ifp->if_flags |= IFF_UP; + ifp->if_init(ifp->if_softc); + } + arp_ifinit(ifp, ifa); + break; +#endif +#ifdef IPX + /* + * XXX - This code is probably wrong, + * but has been copied many times. + */ + case AF_IPX: { + struct ipx_addr *ina = &(IA_SIPX(ifa)->sipx_addr); + struct arpcom *ac = (struct arpcom *)ifp; + + if (ipx_nullhost(*ina)) + ina->x_host = *(union ipx_host *) ac->ac_enaddr; + else + bcopy((caddr_t) ina->x_host.c_host, + (caddr_t) ac->ac_enaddr, + sizeof(ac->ac_enaddr)); + /* fall thru... */ + } +#endif + default: + if ((ifp->if_flags & IFF_UP) == 0) { + ifp->if_flags |= IFF_UP; + ifp->if_init(ifp->if_softc); + } + break; + } + break; case SIOCSIFMTU: ifr = (struct ifreq *)data; if (ifr->ifr_mtu > IEEE80211_MTU) From owner-p4-projects@FreeBSD.ORG Fri Jan 9 12:01:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B62D016A4D3; Fri, 9 Jan 2004 12:01:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62C1A16A4D0 for ; Fri, 9 Jan 2004 12:01:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70D2D43D46 for ; Fri, 9 Jan 2004 12:01:15 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i09K1F0B052256 for ; Fri, 9 Jan 2004 12:01:15 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09K1E6O052253 for perforce@freebsd.org; Fri, 9 Jan 2004 12:01:15 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 9 Jan 2004 12:01:15 -0800 (PST) Message-Id: <200401092001.i09K1E6O052253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45027 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, 09 Jan 2004 20:01:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=45027 Change 45027 by sam@sam_ebb on 2004/01/09 12:01:07 trust the xmit retry counts that are returned for the xmit descriptors; this makes the rate control algorithm do a better job of tracking rssi (but should be using rssi directly anyway) Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#11 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#11 (text+ko) ==== @@ -2263,8 +2263,7 @@ lr = ds->ds_txstat.ts_longretry; sc->sc_stats.ast_tx_shortretry += sr; sc->sc_stats.ast_tx_longretry += lr; - if (sr + lr) - an->an_tx_retr++; + an->an_tx_retr += sr + lr; /* * Reclaim reference to node. * From owner-p4-projects@FreeBSD.ORG Fri Jan 9 13:22:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89B5616A4D1; Fri, 9 Jan 2004 13:22:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6408716A4CE for ; Fri, 9 Jan 2004 13:22:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5997843D3F for ; Fri, 9 Jan 2004 13:22:57 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i09LMv0B078499 for ; Fri, 9 Jan 2004 13:22:57 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09LMu4W078496 for perforce@freebsd.org; Fri, 9 Jan 2004 13:22:56 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 9 Jan 2004 13:22:56 -0800 (PST) Message-Id: <200401092122.i09LMu4W078496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 45033 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, 09 Jan 2004 21:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=45033 Change 45033 by jhb@jhb_slimer on 2004/01/09 13:22:53 Add notes about kthread/kproc cleanup. Affected files ... .. //depot/projects/smpng/sys/notes#4 edit Differences ... ==== //depot/projects/smpng/sys/notes#4 (text+ko) ==== @@ -50,5 +50,13 @@ - Minor fixes to taskqueue locking including making the locking for the taskqueue thread queeu actually work. - Untested +- Add a kproc API that does what kthread does right now +- Add a real kthread API that creates just another thread inside of a kproc + - Figure out what needs to be done to make a new kthread.. should each + kproc have one ksegroup and one kse per cpu? + - Do I just add the kse's when the first new thread is created? + - Consolidate most of the kernel procs into a 'system' kernel proc that + would be pid 0. + - Stick all the 'idle threads' in a single 'idle' kernel proc. Space reserved for child branches: From owner-p4-projects@FreeBSD.ORG Fri Jan 9 15:27:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFE4E16A4D1; Fri, 9 Jan 2004 15:27:46 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9517216A4CE for ; Fri, 9 Jan 2004 15:27:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BA5143D41 for ; Fri, 9 Jan 2004 15:27:32 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i09NRW0B006548 for ; Fri, 9 Jan 2004 15:27:32 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09NRVJc006545 for perforce@freebsd.org; Fri, 9 Jan 2004 15:27:31 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 9 Jan 2004 15:27:31 -0800 (PST) Message-Id: <200401092327.i09NRVJc006545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45041 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, 09 Jan 2004 23:27:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=45041 Change 45041 by sam@sam_ebb on 2004/01/09 15:26:52 workaround h/w limitation Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#12 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#12 (text+ko) ==== @@ -2177,6 +2177,24 @@ __func__, i, ds->ds_link, ds->ds_data, ds->ds_ctl0, ds->ds_ctl1, ds->ds_hw[0], ds->ds_hw[1])); } + if (try0 != ATH_TXMAXTRY && bf->bf_nseg > 1) { + /* + * Copy the try counts to the final descriptor if + * we're doing multi-rate retry and multiple descriptors + * are being used. This permits the hal to properly + * calculate the retry count. Otherwise it doesn't + * have the information available because it only gets + * the last descriptor and this info is in the first. + * The driver can't calculate this because it doesn't + * know about the format of the xmit descriptor. Sigh, + * would've been nice for the hardware to do this for us. + */ + ath_hal_setupxtxdesc(ah, --ds + , an->an_tx_rate1sp, 2 /* series 1 */ + , an->an_tx_rate2sp, 2 /* series 2 */ + , an->an_tx_rate3sp, 2 /* series 3 */ + ); + } /* * Insert the frame on the outbound list and From owner-p4-projects@FreeBSD.ORG Fri Jan 9 15:45:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9475316A4D1; Fri, 9 Jan 2004 15:45:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6152716A4D0 for ; Fri, 9 Jan 2004 15:45:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 050C443D45 for ; Fri, 9 Jan 2004 15:45:57 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i09Nju0B010784 for ; Fri, 9 Jan 2004 15:45:56 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09NjuaA010781 for perforce@freebsd.org; Fri, 9 Jan 2004 15:45:56 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 9 Jan 2004 15:45:56 -0800 (PST) Message-Id: <200401092345.i09NjuaA010781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45045 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, 09 Jan 2004 23:45:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=45045 Change 45045 by sam@sam_ebb on 2004/01/09 15:45:48 disable outdoor channels by default Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#13 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#13 (text+ko) ==== @@ -150,7 +150,7 @@ static int ath_calinterval = 30; /* calibrate every 30 secs */ SYSCTL_INT(_hw_ath, OID_AUTO, calibrate, CTLFLAG_RW, &ath_calinterval, 0, "chip calibration interval (secs)"); -static int ath_outdoor = AH_TRUE; /* outdoor operation */ +static int ath_outdoor = AH_FALSE; /* outdoor operation */ SYSCTL_INT(_hw_ath, OID_AUTO, outdoor, CTLFLAG_RD, &ath_outdoor, 0, "enable/disable outdoor operation"); TUNABLE_INT("hw.ath.outdoor", &ath_outdoor); From owner-p4-projects@FreeBSD.ORG Sat Jan 10 07:04:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B16616A4D1; Sat, 10 Jan 2004 07:04:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E9E016A4CE for ; Sat, 10 Jan 2004 07:04:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88B4443D39 for ; Sat, 10 Jan 2004 07:04:39 -0800 (PST) (envelope-from simon@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0AF4d0B048508 for ; Sat, 10 Jan 2004 07:04:39 -0800 (PST) (envelope-from simon@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0AF4cuk048505 for perforce@freebsd.org; Sat, 10 Jan 2004 07:04:38 -0800 (PST) (envelope-from simon@freebsd.org) Date: Sat, 10 Jan 2004 07:04:38 -0800 (PST) Message-Id: <200401101504.i0AF4cuk048505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to simon@freebsd.org using -f From: "Simon L. Nielsen" To: Perforce Change Reviews Subject: PERFORCE change 45070 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, 10 Jan 2004 15:04:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=45070 Change 45070 by simon@simon_eddie on 2004/01/10 07:04:04 Update URL for the perforce web interface to point the the current location (http://perforce.freebsd.org). Affected files ... .. //depot/doc/p4cookbook.txt#5 edit Differences ... ==== //depot/doc/p4cookbook.txt#5 (text+ko) ==== @@ -445,7 +445,7 @@ - "Is there a cvsweb-like thing?" -Yes, see http://people.freebsd.org/~peter/p4db/ +Yes, see http://perforce.freebsd.org/ - "Can I quickly see what's in a branch?" From owner-p4-projects@FreeBSD.ORG Sat Jan 10 18:06:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DA3716A4D1; Sat, 10 Jan 2004 18:06:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 82D7416A4CE for ; Sat, 10 Jan 2004 18:06:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEDD443D1D for ; Sat, 10 Jan 2004 18:06:42 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B26d0B015473 for ; Sat, 10 Jan 2004 18:06:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B26av8015467 for perforce@freebsd.org; Sat, 10 Jan 2004 18:06:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 18:06:36 -0800 (PST) Message-Id: <200401110206.i0B26av8015467@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 45093 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, 11 Jan 2004 02:06:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=45093 Change 45093 by rwatson@rwatson_paprika on 2004/01/10 18:05:03 Integrate a new TrustedBSD branch to hold the port of Apple's Darwin audit support, as developed by McAfee Research under contract. Affected files ... .. //depot/projects/trustedbsd/audit2/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/audit2/MAINTAINERS#1 branch .. //depot/projects/trustedbsd/audit2/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/Makefile.inc1#1 branch .. //depot/projects/trustedbsd/audit2/README#1 branch .. //depot/projects/trustedbsd/audit2/UPDATING#1 branch .. //depot/projects/trustedbsd/audit2/bin/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit2/bin/cat/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/cat/cat.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/cat/cat.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/chflags/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/chflags/chflags.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/chflags/chflags.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/chio/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/chio/chio.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/chio/chio.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/chio/defs.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/chio/pathnames.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/chmod/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/chmod/chmod.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/chmod/chmod.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/cp/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/cp/cp.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/cp/cp.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/cp/extern.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/cp/utils.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/config.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/csh/host.defs#1 branch .. //depot/projects/trustedbsd/audit2/bin/date/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/date/date.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/date/date.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/date/extern.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/date/netdate.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/date/vary.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/date/vary.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/args.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/conv.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/conv_tab.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/dd.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/dd.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/dd.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/extern.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/misc.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/dd/position.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/df/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/df/df.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/df/df.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/domainname/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/domainname/domainname.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/domainname/domainname.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/echo/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/echo/echo.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/echo/echo.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/POSIX#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/README#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/buf.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/cbc.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/ed.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/ed.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/glbl.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/io.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/main.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/re.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/sub.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/=.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/README#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/TODO#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/a.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/a.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/a.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/a1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/a2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/addr.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/addr.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/addr.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/addr1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/addr2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/ascii.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/bang1.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/bang1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/bang1.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/bang1.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/bang2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/c.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/c.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/c.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/c1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/c2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/d.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/d.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/d.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/d.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e1.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e1.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e1.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e2.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e2.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e2.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e3.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e3.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e3.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e3.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e4.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e4.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/e4.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/f1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/f2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g1.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g1.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g1.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g2.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g2.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g2.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g3.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g3.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g3.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g3.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g4.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g4.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g4.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g5.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g5.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/g5.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/h.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/i.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/i.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/i.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/i1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/i2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/i3.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/j.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/j.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/j.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/k.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/k.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/k.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/k1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/k2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/k3.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/k4.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/l.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/l.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/l.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/m.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/m.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/m.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/m.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/n.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/n.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/n.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/nl.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/nl1.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/nl1.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/nl1.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/nl2.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/nl2.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/nl2.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/p.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/p.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/p.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/q.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/q.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/q.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/q1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r1.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r1.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r1.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r2.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r2.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r2.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r3.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r3.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/r3.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s1.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s1.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s1.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s10.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s2.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s2.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s2.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s3.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s3.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s3.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s3.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s4.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s5.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s6.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s7.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s8.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/s9.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t1.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t1.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t1.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t2.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t2.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/t2.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/u.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/u.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/u.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/u.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/v.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/v.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/v.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/w.d#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/w.r#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/w.t#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/w1.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/w2.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/w3.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/x.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/test/z.err#1 branch .. //depot/projects/trustedbsd/audit2/bin/ed/undo.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/expr/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/expr/expr.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/expr/expr.y#1 branch .. //depot/projects/trustedbsd/audit2/bin/getfacl/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/getfacl/getfacl.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/getfacl/getfacl.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/hostname/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/hostname/hostname.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/hostname/hostname.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/kenv/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/kenv/kenv.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/kenv/kenv.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/kill/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/kill/kill.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/kill/kill.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ln/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/ln/ln.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/ln/ln.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ln/symlink.7#1 branch .. //depot/projects/trustedbsd/audit2/bin/ls/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/ls/cmp.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ls/extern.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/ls/ls.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/ls/ls.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ls/ls.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/ls/print.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ls/util.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/mkdir/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/mkdir/mkdir.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/mkdir/mkdir.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/mv/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/mv/mv.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/mv/mv.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/ar_io.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/ar_subs.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/buf_subs.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/cache.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/cache.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/cpio.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/cpio.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/cpio.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/extern.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/file_subs.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/ftree.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/ftree.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/gen_subs.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/getoldopt.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/options.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/options.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/pat_rep.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/pat_rep.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/pax.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/pax.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/pax.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/sel_subs.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/sel_subs.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/tables.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/tables.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/tar.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/tar.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/tar.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pax/tty_subs.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/extern.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/fmt.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/keyword.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/nlist.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/print.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/ps.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/ps.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/ps/ps.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/pwd/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/pwd/pwd.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/pwd/pwd.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/rcp/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/rcp/extern.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/rcp/rcp.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/rcp/rcp.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/rcp/util.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/realpath/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/realpath/realpath.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/realpath/realpath.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/rm/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/rm/rm.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/rm/rm.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/rmail/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/rmdir/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/rmdir/rmdir.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/rmdir/rmdir.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/file.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/mask.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/merge.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/remove.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/setfacl.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/setfacl.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/setfacl.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/setfacl/util.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/TOUR#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/alias.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/alias.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/arith.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/arith.y#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/arith_lex.l#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/bltin/echo.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/bltin/echo.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/builtins.def#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/cd.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/cd.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/error.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/error.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/eval.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/eval.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/exec.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/exec.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/expand.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/expand.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/funcs/cmv#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/funcs/dirs#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/funcs/kill#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/funcs/login#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/funcs/newgrp#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/funcs/popd#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/funcs/pushd#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/funcs/suspend#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/histedit.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/init.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/input.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/input.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/jobs.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/jobs.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mail.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mail.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/main.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/main.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/memalloc.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/memalloc.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/miscbltin.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mkbuiltins#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mkinit.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mknodes.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mksyntax.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mktokens#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/myhistedit.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mystring.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/mystring.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/nodes.c.pat#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/nodetypes#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/options.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/options.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/output.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/output.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/parser.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/parser.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/redir.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/redir.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/sh.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/shell.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/show.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/show.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/trap.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/trap.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/var.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sh/var.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/sleep/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/sleep/sleep.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/sleep/sleep.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/cchar.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/extern.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/gfmt.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/key.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/modes.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/print.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/stty.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/stty.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/stty.h#1 branch .. //depot/projects/trustedbsd/audit2/bin/stty/util.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/sync/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/sync/sync.8#1 branch .. //depot/projects/trustedbsd/audit2/bin/sync/sync.c#1 branch .. //depot/projects/trustedbsd/audit2/bin/test/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/bin/test/TEST.README#1 branch .. //depot/projects/trustedbsd/audit2/bin/test/TEST.csh#1 branch .. //depot/projects/trustedbsd/audit2/bin/test/TEST.sh#1 branch .. //depot/projects/trustedbsd/audit2/bin/test/test.1#1 branch .. //depot/projects/trustedbsd/audit2/bin/test/test.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/AUTHORS#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/BUGS#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/COPYING#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/INSTALL#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/MIRRORS#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/NEWS#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/README#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/README.ldap#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/README.y2k#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amd.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amd.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amd.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/autil.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/clock.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/conf.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/map.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/opts.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/restart.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/sched.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amq/amq.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amq/amq.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amq/amq.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/bootstrap#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/commit#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/hn_dref/hn_dref_default.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/mount/mount_default.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/config.guess#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/config.guess.long#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/config.sub#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/configure.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/cvs-server.txt#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/depcomp#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/doc/mdate-sh#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/doc/version.texi#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/install-sh#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/util.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/ltmain.sh#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/amindent#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/autopat#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/c_void_p.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_amu_fs.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_extern.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_fhandle.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_field.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_fs_headers.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_lib2.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_map_funcs.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mount_style.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mount_trap.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mount_type.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_mtype_type.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_os_libs.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_umount_style.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_unmount_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/check_unmount_call.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/expand_run_string.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/extern_optarg.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/header_templates.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/host_macros.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/linux_headers.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/localconfig.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/mount_headers.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/name_package.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/name_version.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/opt_cppflags.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/opt_debug.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/opt_ldflags.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/opt_libs.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/os_cflags.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/os_cppflags.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/os_ldflags.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/package_bugreport.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/package_name.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/package_version.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/save_state.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/struct_mntent.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/struct_mnttab.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_efs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_lofs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_mfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_rfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_time_t.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_ufs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_xfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/macros/with_addon.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/mkconf#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/missing#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/lostaltmail.conf-sample#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/lostaltmail.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/tasks#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/AUTHORS#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/FAQ#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/INSTALL#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/NEWS#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/README#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/array.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/atan.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/div.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/exp.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/fact.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/jn.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/ln.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/mul.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/raise.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/signum#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/sine.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/Test/timetest#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/acconfig.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/aclocal.m4#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/bc.y#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/const.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/execute.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/global.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/global.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/load.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/main.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/proto.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/scan.l#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/storage.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/bc/util.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/config.h.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/configure#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/configure.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/array.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/dc.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/dc.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/eval.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/misc.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/stack.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/dc/string.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/doc/bc.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/doc/dc.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/h/getopt.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/h/number.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/install-sh#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/lib/getopt.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/lib/getopt1.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/lib/number.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/missing#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bc/stamp-h.in#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/CHANGES#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/DNSSEC#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/INSTALL#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/LICENSE#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/README#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/SUPPORT#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/TODO#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/Version#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/addr/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/addr/addr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/dig/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/dig/dig.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/dnskeygen/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/dnskeygen/dnskeygen.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/dnsquery/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/dnsquery/dnsquery.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/host/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/host/host.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/irpd/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/irpd/irpd.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/irpd/irs-irpd.conf#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/irpd/version.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/mkservdb/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/mkservdb/mkservdb.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named-bootconf/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named-bootconf/named-bootconf.sh#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named-bootconf/test.boot#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named-xfer/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named-xfer/named-xfer.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_defs.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_dump.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_func.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_glob.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_glue.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_ixfr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_load.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_lookup.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_save.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_sec.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_tsig.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/db_update.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/named.conf#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/named.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_config.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_ctl.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_defs.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_forw.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_func.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_glob.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_glue.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_init.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_ixfr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_lexer.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_lexer.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_main.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_maint.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_ncache.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_notify.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_parser.y#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_parseutil.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_parseutil.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_req.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_resp.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_signal.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_sort.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_stats.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_udp.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_update.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/ns_xfr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/pathtemplate.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/test/127.0.0.zone#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/test/localhost.zone#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/test/named.conf#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/test/root.hint#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/named/version.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/ndc/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/ndc/ndc.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/commands.l#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/debug.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/getinfo.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/list.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/main.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/nslookup.help#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/pathnames.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/res.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/send.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/skip.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nslookup/subr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nsupdate/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/acl.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/address_list.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/comments.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/config.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/controls.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/docdef.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/example.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/include.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/index.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/key.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/logging.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/master.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/options.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/server.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/trusted-keys.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/html/zone.html#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/dig.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/dnskeygen.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/dnsquery.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/getaddrinfo.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/gethostbyname.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/getipnodebyname.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/getnameinfo.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/getnetent.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/hesiod.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/host.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/hostname.7#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/inet_cidr.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/irs.conf.5#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/mailaddr.7#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/mkdep.1#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/named-bootconf.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/named-xfer.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/named.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/named.conf.5#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/ndc.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/nslookup.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/nsupdate.8#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/resolver.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/resolver.5#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/man/tsig.3#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/misc/DynamicUpdate#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/misc/FAQ.1of2#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/misc/FAQ.2of2#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/doc/misc/style.txt#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/arpa/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/arpa/inet.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/fd_setsize.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/hesiod.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/irp.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/irs.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/assertions.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/ctl.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/dst.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/eventlib.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/heap.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/irpmarshall.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/logging.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/memcluster.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/misc.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/isc/tree.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/netdb.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/netgroup.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/res_update.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/include/resolv.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/README#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/bsafe_link.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/cylink_link.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/dst_api.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/dst_internal.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/eay_dss_link.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/hmac_link.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/md5.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/md5_dgst.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/md5_locl.h#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/prandom.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/rsaref_link.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/dst/support.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/inet/Makefile#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/inet/inet_addr.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/inet/inet_cidr_pton.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/inet/inet_data.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/inet/inet_lnaof.c#1 branch .. //depot/projects/trustedbsd/audit2/contrib/bind/lib/inet/inet_makeaddr.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 10 19:16:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81F6516A4D1; Sat, 10 Jan 2004 19:16:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D6BB16A4CE for ; Sat, 10 Jan 2004 19:16:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4487543D4C for ; Sat, 10 Jan 2004 19:16:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B3G80B030751 for ; Sat, 10 Jan 2004 19:16:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B3G7iV030748 for perforce@freebsd.org; Sat, 10 Jan 2004 19:16:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 19:16:07 -0800 (PST) Message-Id: <200401110316.i0B3G7iV030748@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 45096 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, 11 Jan 2004 03:16:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=45096 Change 45096 by rwatson@rwatson_paprika on 2004/01/10 19:15:12 Import Apple Mac OS X kernel audit implementation, as found in XNU-517.3.7 (Mac OS X 10.3.2). This code falls under the APSL 2.0 license. Add "options AUDIT". Hook up C files to the build (won't compile as they stand since they're literally the Darwin import.) Affected files ... .. //depot/projects/trustedbsd/audit2/sys/conf/NOTES#2 edit .. //depot/projects/trustedbsd/audit2/sys/conf/files#2 edit .. //depot/projects/trustedbsd/audit2/sys/conf/majors#2 edit .. //depot/projects/trustedbsd/audit2/sys/conf/options#2 edit .. //depot/projects/trustedbsd/audit2/sys/i386/conf/AUDIT#1 add .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#1 add .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.h#1 add .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#1 add .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#1 add .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#1 add .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#1 add .. //depot/projects/trustedbsd/audit2/sys/sys/bsm_kevents.h#1 add .. //depot/projects/trustedbsd/audit2/sys/sys/bsm_token.h#1 add .. //depot/projects/trustedbsd/audit2/sys/sys/bsm_uevents.h#1 add Differences ... ==== //depot/projects/trustedbsd/audit2/sys/conf/NOTES#2 (text+ko) ==== @@ -814,6 +814,9 @@ ##################################################################### # SECURITY POLICY PARAMETERS +# Support for BSM Audit +options AUDIT + # Support for Mandatory Access Control (MAC): options MAC options MAC_BIBA ==== //depot/projects/trustedbsd/audit2/sys/conf/files#2 (text+ko) ==== @@ -1629,6 +1629,11 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores +security/audit/audit.c optional audit +security/audit/bsm_audit.c optional audit +security/audit/bsm_kevents.c optional audit +security/audit/bsm_klib.c optional audit +security/audit/bsm_token.c optional audit security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac ==== //depot/projects/trustedbsd/audit2/sys/conf/majors#2 (text+ko) ==== @@ -119,7 +119,6 @@ 115 dag University of Waikato DAG network capture boards 117 *acd ATAPI CDROM 119 *ast ATAPI tape -120 aud Audit Device 121 onew Dallas Semiconductor One-Wire bus 122 *uhid USB HID devices 123 *fb frame buffer ==== //depot/projects/trustedbsd/audit2/sys/conf/options#2 (text+ko) ==== @@ -74,6 +74,7 @@ # Miscellaneous options. ADAPTIVE_MUTEXES ALQ +AUDIT CODA_COMPAT_5 opt_coda.h COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h From owner-p4-projects@FreeBSD.ORG Sat Jan 10 19:51:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B0F816A4D1; Sat, 10 Jan 2004 19:51:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9AF416A4CE for ; Sat, 10 Jan 2004 19:51:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 142D243D31 for ; Sat, 10 Jan 2004 19:51:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B3pq0B038126 for ; Sat, 10 Jan 2004 19:51:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B3pqBN038117 for perforce@freebsd.org; Sat, 10 Jan 2004 19:51:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 19:51:52 -0800 (PST) Message-Id: <200401110351.i0B3pqBN038117@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 45098 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, 11 Jan 2004 03:51:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=45098 Change 45098 by rwatson@rwatson_paprika on 2004/01/10 19:51:46 Remove extra line (it's kevents.h, not .c). Affected files ... .. //depot/projects/trustedbsd/audit2/sys/conf/files#3 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/conf/files#3 (text+ko) ==== @@ -1631,7 +1631,6 @@ kern/uipc_sem.c optional p1003_1b_semaphores security/audit/audit.c optional audit security/audit/bsm_audit.c optional audit -security/audit/bsm_kevents.c optional audit security/audit/bsm_klib.c optional audit security/audit/bsm_token.c optional audit security/mac/mac_label.c optional mac From owner-p4-projects@FreeBSD.ORG Sat Jan 10 19:53:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0161F16A4D1; Sat, 10 Jan 2004 19:53:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D035616A4CE for ; Sat, 10 Jan 2004 19:53:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A1F343D1D for ; Sat, 10 Jan 2004 19:53:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B3rt0B038691 for ; Sat, 10 Jan 2004 19:53:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B3rtlt038688 for perforce@freebsd.org; Sat, 10 Jan 2004 19:53:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 19:53:55 -0800 (PST) Message-Id: <200401110353.i0B3rtlt038688@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 45099 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, 11 Jan 2004 03:53:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=45099 Change 45099 by rwatson@rwatson_paprika on 2004/01/10 19:53:29 Another include file imported from Darwin XNU-517.3.7 (10.3.2). Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 10 19:57:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE5B116A4D1; Sat, 10 Jan 2004 19:57:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B88C716A4CE for ; Sat, 10 Jan 2004 19:57:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5547643D1D for ; Sat, 10 Jan 2004 19:57:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B3v00B038799 for ; Sat, 10 Jan 2004 19:57:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B3uxmP038795 for perforce@freebsd.org; Sat, 10 Jan 2004 19:56:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 19:56:59 -0800 (PST) Message-Id: <200401110356.i0B3uxmP038795@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 45100 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, 11 Jan 2004 03:57:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=45100 Change 45100 by rwatson@rwatson_paprika on 2004/01/10 19:56:31 Kernel-internal include files in slightly different places on FreeBSD. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#2 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#2 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#2 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#2 (text+ko) ==== @@ -35,11 +35,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include @@ -62,6 +62,7 @@ #define AUDIT_PRINTF(X) #endif +#if 0 #if DIAGNOSTIC #if defined(assert) #undef assert() @@ -71,6 +72,8 @@ #else #include #endif /* DIAGNOSTIC */ +#endif +#define assert KASSERT /* * Define the audit control flags. ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#2 (text+ko) ==== @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include #include -#include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Jan 10 20:18:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 465B516A4D1; Sat, 10 Jan 2004 20:18:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2257A16A4CE for ; Sat, 10 Jan 2004 20:18:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9632E43D2D for ; Sat, 10 Jan 2004 20:18:26 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B4IQ0B043719 for ; Sat, 10 Jan 2004 20:18:26 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B4IQnT043716 for perforce@freebsd.org; Sat, 10 Jan 2004 20:18:26 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 20:18:26 -0800 (PST) Message-Id: <200401110418.i0B4IQnT043716@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 45101 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, 11 Jan 2004 04:18:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=45101 Change 45101 by rwatson@rwatson_paprika on 2004/01/10 20:18:21 More include files. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#3 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#3 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#3 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#3 (text+ko) ==== @@ -23,6 +23,9 @@ * @APPLE_LICENSE_HEADER_END@ */ #include +#include +#include +#include #include #include #include @@ -35,17 +38,15 @@ #include #include #include -#include -#include #include #include -#include #include #include #include -#include -#include +#include +#include +#include #ifdef AUDIT ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#3 (text+ko) ==== @@ -30,17 +30,19 @@ #include #include #include -#include -#include +#include +#include #include #include -#include #include + #include #include #include -#include +#include +#include +#include /* The number of BSM records allocated. */ static int bsm_rec_count = 0; ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#3 (text+ko) ==== @@ -28,10 +28,11 @@ #include #include #include +#include + #include #include -#include -#include +#include /* * Initialize the system call to audit event mapping table. This table ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#3 (text+ko) ==== @@ -24,9 +24,9 @@ */ #include #include -#include #include -#include + +#include #define GET_TOKEN_AREA(tok, dptr, length) \ do {\ From owner-p4-projects@FreeBSD.ORG Sat Jan 10 20:36:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F46E16A4D1; Sat, 10 Jan 2004 20:36:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2370116A4CE for ; Sat, 10 Jan 2004 20:36:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67EBA43D1D for ; Sat, 10 Jan 2004 20:36:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B4an0B047999 for ; Sat, 10 Jan 2004 20:36:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B4amvG047996 for perforce@freebsd.org; Sat, 10 Jan 2004 20:36:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 20:36:48 -0800 (PST) Message-Id: <200401110436.i0B4amvG047996@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 45102 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, 11 Jan 2004 04:36:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=45102 Change 45102 by rwatson@rwatson_paprika on 2004/01/10 20:36:10 Audit-related system calls. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#2 edit .. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#2 edit .. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#2 edit .. //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#2 edit .. //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#2 edit .. //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.161 2003/11/14 03:49:41 jeff Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.158 2003/11/14 03:48:37 jeff Exp */ @@ -468,4 +468,14 @@ { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd }, /* 437 = extattr_list_fd */ { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file }, /* 438 = extattr_list_file */ { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link }, /* 439 = extattr_list_link */ + { SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit }, /* 440 = audit */ + { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon }, /* 441 = auditon */ + { SYF_MPSAFE | AS(auditsvc_args), (sy_call_t *)auditsvc }, /* 442 = auditsvc */ + { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid }, /* 443 = getauid */ + { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)setauid }, /* 444 = setauid */ + { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)getaudit }, /* 445 = getaudit */ + { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)setaudit }, /* 446 = setaudit */ + { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)getaudit_addr }, /* 447 = getaudit_addr */ + { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)setaudit_addr }, /* 448 = setaudit_addr */ + { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl }, /* 449 = auditctl */ }; ==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.147 2003/11/14 03:49:41 jeff Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.158 2003/11/14 03:48:37 jeff Exp */ @@ -447,4 +447,14 @@ "extattr_list_fd", /* 437 = extattr_list_fd */ "extattr_list_file", /* 438 = extattr_list_file */ "extattr_list_link", /* 439 = extattr_list_link */ + "audit", /* 440 = audit */ + "auditon", /* 441 = auditon */ + "auditsvc", /* 442 = auditsvc */ + "getauid", /* 443 = getauid */ + "setauid", /* 444 = setauid */ + "getaudit", /* 445 = getaudit */ + "setaudit", /* 446 = setaudit */ + "getaudit_addr", /* 447 = getaudit_addr */ + "setaudit_addr", /* 448 = setaudit_addr */ + "auditctl", /* 449 = auditctl */ }; ==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#2 (text+ko) ==== @@ -639,6 +639,18 @@ int attrnamespace, void *data, size_t nbytes); } 439 STD BSD { ssize_t extattr_list_link(const char *path, \ int attrnamespace, void *data, size_t nbytes); } +440 MSTD BSD { int audit(const void *ar, int len); } +441 MSTD BSD { int auditon(int cmd, void *data, int len); } +442 MSTD BSD { int auditsvc(int fd, int limit); } +443 MSTD BSD { int getauid(uid_t *auid); } +444 MSTD BSD { int setauid(uid_t *auid); } +445 MSTD BSD { int getaudit(struct auditinfo *auditinfo); } +446 MSTD BSD { int setaudit(struct auditinfo *auditinfo); } +447 MSTD BSD { int getaudit_addr(struct auditinfo_addr \ + *auditinfo_addr, int len); } +448 MSTD BSD { int setaudit_addr(struct auditinfo_addr \ + *auditinfo_addr, int len); } +449 MSTD BSD { int auditctl(char *path); } ; Please copy any additions and changes to the following compatability tables: ; sys/ia64/ia32/syscalls.master (take a best guess) ==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.145 2003/11/14 03:49:41 jeff Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.158 2003/11/14 03:48:37 jeff Exp */ @@ -351,4 +351,14 @@ #define SYS_extattr_list_fd 437 #define SYS_extattr_list_file 438 #define SYS_extattr_list_link 439 -#define SYS_MAXSYSCALL 440 +#define SYS_audit 440 +#define SYS_auditon 441 +#define SYS_auditsvc 442 +#define SYS_getauid 443 +#define SYS_setauid 444 +#define SYS_getaudit 445 +#define SYS_setaudit 446 +#define SYS_getaudit_addr 447 +#define SYS_setaudit_addr 448 +#define SYS_auditctl 449 +#define SYS_MAXSYSCALL 450 ==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#2 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.100 2003/11/14 03:49:41 jeff Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.158 2003/11/14 03:48:37 jeff Exp MIASM = \ syscall.o \ @@ -292,4 +292,14 @@ jail_attach.o \ extattr_list_fd.o \ extattr_list_file.o \ - extattr_list_link.o + extattr_list_link.o \ + audit.o \ + auditon.o \ + auditsvc.o \ + getauid.o \ + setauid.o \ + getaudit.o \ + setaudit.o \ + getaudit_addr.o \ + setaudit_addr.o \ + auditctl.o ==== //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.141 2003/11/14 03:49:41 jeff Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.158 2003/11/14 03:48:37 jeff Exp */ @@ -1284,6 +1284,42 @@ char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)]; }; +struct audit_args { + char ar_l_[PADL_(const void *)]; const void * ar; char ar_r_[PADR_(const void *)]; + char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; +}; +struct auditon_args { + char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; + char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; +}; +struct auditsvc_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char limit_l_[PADL_(int)]; int limit; char limit_r_[PADR_(int)]; +}; +struct getauid_args { + char auid_l_[PADL_(uid_t *)]; uid_t * auid; char auid_r_[PADR_(uid_t *)]; +}; +struct setauid_args { + char auid_l_[PADL_(uid_t *)]; uid_t * auid; char auid_r_[PADR_(uid_t *)]; +}; +struct getaudit_args { + char auditinfo_l_[PADL_(struct auditinfo *)]; struct auditinfo * auditinfo; char auditinfo_r_[PADR_(struct auditinfo *)]; +}; +struct setaudit_args { + char auditinfo_l_[PADL_(struct auditinfo *)]; struct auditinfo * auditinfo; char auditinfo_r_[PADR_(struct auditinfo *)]; +}; +struct getaudit_addr_args { + char auditinfo_addr_l_[PADL_(struct auditinfo_addr *)]; struct auditinfo_addr * auditinfo_addr; char auditinfo_addr_r_[PADR_(struct auditinfo_addr *)]; + char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; +}; +struct setaudit_addr_args { + char auditinfo_addr_l_[PADL_(struct auditinfo_addr *)]; struct auditinfo_addr * auditinfo_addr; char auditinfo_addr_r_[PADR_(struct auditinfo_addr *)]; + char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; +}; +struct auditctl_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1573,6 +1609,16 @@ int extattr_list_fd(struct thread *, struct extattr_list_fd_args *); int extattr_list_file(struct thread *, struct extattr_list_file_args *); int extattr_list_link(struct thread *, struct extattr_list_link_args *); +int audit(struct thread *, struct audit_args *); +int auditon(struct thread *, struct auditon_args *); +int auditsvc(struct thread *, struct auditsvc_args *); +int getauid(struct thread *, struct getauid_args *); +int setauid(struct thread *, struct setauid_args *); +int getaudit(struct thread *, struct getaudit_args *); +int setaudit(struct thread *, struct setaudit_args *); +int getaudit_addr(struct thread *, struct getaudit_addr_args *); +int setaudit_addr(struct thread *, struct setaudit_addr_args *); +int auditctl(struct thread *, struct auditctl_args *); #ifdef COMPAT_43 From owner-p4-projects@FreeBSD.ORG Sat Jan 10 20:43:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEC6416A4D1; Sat, 10 Jan 2004 20:43:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A2A316A4CE for ; Sat, 10 Jan 2004 20:43:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF20143D31 for ; Sat, 10 Jan 2004 20:43:58 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B4hw0B049949 for ; Sat, 10 Jan 2004 20:43:58 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B4hwUD049946 for perforce@freebsd.org; Sat, 10 Jan 2004 20:43:58 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 20:43:58 -0800 (PST) Message-Id: <200401110443.i0B4hwUD049946@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 45103 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, 11 Jan 2004 04:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=45103 Change 45103 by rwatson@rwatson_paprika on 2004/01/10 20:43:25 Don't nested include kernel include files in an include file included from userspace. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/sys/bsm_token.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/sys/bsm_token.h#2 (text+ko) ==== @@ -26,13 +26,6 @@ #ifndef _BSM_TOKEN_H_ #define _BSM_TOKEN_H_ -#include -#include -#include -#include -#include -#include - /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. From owner-p4-projects@FreeBSD.ORG Sat Jan 10 20:45:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7749016A4D1; Sat, 10 Jan 2004 20:45:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D7DB16A4CE for ; Sat, 10 Jan 2004 20:45:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 745F443D48 for ; Sat, 10 Jan 2004 20:45:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B4j00B049982 for ; Sat, 10 Jan 2004 20:45:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B4j0FV049971 for perforce@freebsd.org; Sat, 10 Jan 2004 20:45:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 20:45:00 -0800 (PST) Message-Id: <200401110445.i0B4j0FV049971@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 45104 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, 11 Jan 2004 04:45:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=45104 Change 45104 by rwatson@rwatson_paprika on 2004/01/10 20:44:24 Omit nested includes. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.h#2 (text+ko) ==== @@ -27,10 +27,6 @@ #define _SYS_AUDIT_H #include -#include -#include -#include -#include #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 @@ -192,7 +188,6 @@ typedef struct au_record au_record_t; #ifndef KERNEL -#include __BEGIN_DECLS int audit (const void *, int); From owner-p4-projects@FreeBSD.ORG Sat Jan 10 20:46:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7644A16A4D1; Sat, 10 Jan 2004 20:46:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51EB216A4CE for ; Sat, 10 Jan 2004 20:46:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A92443D1F for ; Sat, 10 Jan 2004 20:46:02 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B4k20B050078 for ; Sat, 10 Jan 2004 20:46:02 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B4k1mG050074 for perforce@freebsd.org; Sat, 10 Jan 2004 20:46:01 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 20:46:01 -0800 (PST) Message-Id: <200401110446.i0B4k1mG050074@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 45105 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, 11 Jan 2004 04:46:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=45105 Change 45105 by rwatson@rwatson_paprika on 2004/01/10 20:45:27 Oops, audit.h is used from userspace as well, and contains critical defines. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.h#3 delete .. //depot/projects/trustedbsd/audit2/sys/sys/audit.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 10 21:08:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B7EC16A4D1; Sat, 10 Jan 2004 21:08:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C03516A4CE for ; Sat, 10 Jan 2004 21:08:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E94E43D1F for ; Sat, 10 Jan 2004 21:08:30 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B58U0B060810 for ; Sat, 10 Jan 2004 21:08:30 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B58TEF060807 for perforce@freebsd.org; Sat, 10 Jan 2004 21:08:29 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 21:08:29 -0800 (PST) Message-Id: <200401110508.i0B58TEF060807@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 45106 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, 11 Jan 2004 05:08:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=45106 Change 45106 by rwatson@rwatson_paprika on 2004/01/10 21:07:56 More include files: security/audit/audit.h -> sys/audit.h #ifdef KERNEL -> #ifdef _KERNEL Forward declare various tructures used in bsm_token.h to reduce dependencies. Make bsm_token.c compile: fix includes, provide dummy kmem_alloc() and kmem_free() for now. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#4 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#4 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#4 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#2 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#4 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#2 edit .. //depot/projects/trustedbsd/audit2/sys/sys/audit.h#2 edit .. //depot/projects/trustedbsd/audit2/sys/sys/bsm_token.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#4 (text+ko) ==== @@ -43,8 +43,8 @@ #include #include #include +#include -#include #include #include ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#4 (text+ko) ==== @@ -35,12 +35,12 @@ #include #include #include +#include #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#4 (text+ko) ==== @@ -23,14 +23,10 @@ * @APPLE_LICENSE_HEADER_END@ */ -#include -#include -#include -#include -#include +#include +#include #include -#include #include #include ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ #define AU_PRS_FAILURE 2 #define AU_PRS_BOTH (AU_PRS_SUCCESS|AU_PRS_FAILURE) -#ifdef KERNEL +#ifdef _KERNEL int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf); au_event_t flags_to_openevent(int oflags); void fill_vattr(struct vattr *v, struct vnode_au_info *vn_info); @@ -41,6 +41,6 @@ extern au_event_t sys_au_event[]; extern int nsys_au_event; /* number of entries in this table */ -#endif /*KERNEL*/ +#endif /*_KERNEL*/ #endif /* ! _BSM_KLIB_H_ */ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#4 (text+ko) ==== @@ -22,11 +22,22 @@ * * @APPLE_LICENSE_HEADER_END@ */ -#include + +#include +#include #include +#include +#include +#include #include +#include -#include +#include +#include +#include + +#define kmem_alloc(map, ptrref, size) +#define kmem_free(map, ptr, size) #define GET_TOKEN_AREA(tok, dptr, length) \ do {\ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ #ifndef _SYS_KERN_AUDIT_H #define _SYS_KERN_AUDIT_H -#ifdef KERNEL +#ifdef _KERNEL /* * Audit subsystem condition flags. The audit_enabled flag is set and @@ -283,6 +283,6 @@ #endif /* AUDIT */ -#endif /* KERNEL */ +#endif /* _KERNEL */ #endif /* !_SYS_KERN_AUDIT_H */ ==== //depot/projects/trustedbsd/audit2/sys/sys/audit.h#2 (text+ko) ==== @@ -187,7 +187,7 @@ }; typedef struct au_record au_record_t; -#ifndef KERNEL +#ifndef _KERNEL __BEGIN_DECLS int audit (const void *, int); @@ -201,6 +201,6 @@ int getaudit_addr (struct auditinfo_addr *, int); int setaudit_addr (const struct auditinfo_addr *, int); __END_DECLS -#endif /* !KERNEL */ +#endif /* !_KERNEL */ #endif /* !_SYS_AUDIT_H */ ==== //depot/projects/trustedbsd/audit2/sys/sys/bsm_token.h#3 (text+ko) ==== @@ -26,6 +26,16 @@ #ifndef _BSM_TOKEN_H_ #define _BSM_TOKEN_H_ +struct vattr; +struct in_addr; +struct in6_addr; +struct ip; +struct ipc_perm; +struct socket; +struct sockaddr_in; +struct sockaddr_in6; +struct sockaddr_un; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. From owner-p4-projects@FreeBSD.ORG Sat Jan 10 21:20:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3958E16A4D1; Sat, 10 Jan 2004 21:20:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14A8616A4CE for ; Sat, 10 Jan 2004 21:20:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F42C43D4C for ; Sat, 10 Jan 2004 21:20:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B5Kj0B062926 for ; Sat, 10 Jan 2004 21:20:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B5Kj8K062923 for perforce@freebsd.org; Sat, 10 Jan 2004 21:20:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 21:20:45 -0800 (PST) Message-Id: <200401110520.i0B5Kj8K062923@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 45107 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, 11 Jan 2004 05:20:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=45107 Change 45107 by rwatson@rwatson_paprika on 2004/01/10 21:19:46 Get bsm_klib.c to almost entirely build: - Fix many includes. - Use udev_t rather than dev_t, since dev_t in the FreeBSD kernel is "special". This might require revisiting. - Comment out vn_getpath(), we don't have one of those yet. - Function prototypes for msgctl_to_event() and semctl_to_event() since they're declared in one place and used in another. - More forward structure definitions. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#5 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#3 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#5 (text+ko) ==== @@ -26,6 +26,15 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -740,7 +749,10 @@ } if (vnp != NULL) { len = MAXPATHLEN; +#error DARWIN_FOO +#ifdef DARWIN_FOO vn_getpath(vnp, cpath, &len); +#endif /* The length returned by vn_getpath() is two greater than the * number of characters in the string. */ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#3 (text+ko) ==== @@ -30,17 +30,19 @@ #define AU_PRS_FAILURE 2 #define AU_PRS_BOTH (AU_PRS_SUCCESS|AU_PRS_FAILURE) -#ifdef _KERNEL +struct vattr; int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf); au_event_t flags_to_openevent(int oflags); void fill_vattr(struct vattr *v, struct vnode_au_info *vn_info); void canon_path(struct proc *p, char *path, char *cpath); + +int msgctl_to_event(int cmd); +int semctl_to_event(int cmd); + /* * Define a system call to audit event mapping table. */ extern au_event_t sys_au_event[]; extern int nsys_au_event; /* number of entries in this table */ -#endif /*_KERNEL*/ - #endif /* ! _BSM_KLIB_H_ */ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#3 (text+ko) ==== @@ -89,7 +89,7 @@ mode_t vn_mode; uid_t vn_uid; gid_t vn_gid; - dev_t vn_dev; + udev_t vn_dev; long vn_fsid; long vn_fileid; long vn_gen; @@ -106,6 +106,9 @@ int soprotocol; }; +struct xucred; +struct sockaddr; +struct ipc_perm; struct audit_record { /* Audit record header. */ u_int32_t ar_magic; From owner-p4-projects@FreeBSD.ORG Sat Jan 10 21:32:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC37B16A4D2; Sat, 10 Jan 2004 21:32:00 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5BE216A4D0 for ; Sat, 10 Jan 2004 21:32:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF30243D2F for ; Sat, 10 Jan 2004 21:31:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B5Vx0B066343 for ; Sat, 10 Jan 2004 21:31:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B5Vxgp066335 for perforce@freebsd.org; Sat, 10 Jan 2004 21:31:59 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 10 Jan 2004 21:31:59 -0800 (PST) Message-Id: <200401110531.i0B5Vxgp066335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 45108 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, 11 Jan 2004 05:32:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=45108 Change 45108 by sam@sam_ebb on 2004/01/10 21:31:47 correct bounds checking of 802.11 mtu Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#4 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#6 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#4 (text+ko) ==== @@ -427,7 +427,16 @@ #define IEEE80211_CRC_LEN 4 -#define IEEE80211_MTU 1500 +/* + * Maximum acceptable MTU is: + * IEEE80211_MAX_LEN - WEP overhead - CRC - + * QoS overhead - RSN/WPA overhead + * Min is arbitrarily chosen > IEEE80211_MIN_LEN. The default + * mtu is Ethernet-compatible; it's set by ether_ifattach. + */ +#define IEEE80211_MTU_MAX 2290 +#define IEEE80211_MTU_MIN 32 + #define IEEE80211_MAX_LEN (2300 + IEEE80211_CRC_LEN + \ (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN)) #define IEEE80211_MIN_LEN \ ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#6 (text+ko) ==== @@ -1098,7 +1098,8 @@ break; case SIOCSIFMTU: ifr = (struct ifreq *)data; - if (ifr->ifr_mtu > IEEE80211_MTU) + if (!(IEEE80211_MTU_MIN >= ifr->ifr_mtu && + ifr->ifr_mtu <= IEEE80211_MTU_MAX)) error = EINVAL; else ifp->if_mtu = ifr->ifr_mtu; From owner-p4-projects@FreeBSD.ORG Sat Jan 10 21:36:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 657DB16A4D2; Sat, 10 Jan 2004 21:36:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3ED6616A4D0 for ; Sat, 10 Jan 2004 21:36:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3EE543D41 for ; Sat, 10 Jan 2004 21:36:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B5a50B066811 for ; Sat, 10 Jan 2004 21:36:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B5a5q3066808 for perforce@freebsd.org; Sat, 10 Jan 2004 21:36:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 10 Jan 2004 21:36:05 -0800 (PST) Message-Id: <200401110536.i0B5a5q3066808@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 45109 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, 11 Jan 2004 05:36:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=45109 Change 45109 by jmallett@jmallett_oingo on 2004/01/10 21:35:35 Little things I should have gone back and checked, I never took the time. Consistently get to SI_SUB_VFS and whatnot - when indexing to do a TLB service, account for even/odd. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#10 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#10 (text+ko) ==== @@ -178,10 +178,11 @@ subu k0, k1 /* * Shift right logical to get a page index, but leaving - * enough bits to index an array of 64 bit values. + * enough bits to index an array of 64 bit values, plus + * align for the even/odd TLB stuff. */ - dsrl k0, PAGE_SHIFT - dsll k0, 3 + dsrl k0, PAGE_SHIFT + 1 + dsll k0, 3 + 1 dla k1, kptmap /* * Find the page table, and index it. From owner-p4-projects@FreeBSD.ORG Sat Jan 10 21:40:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 650CC16A4D1; Sat, 10 Jan 2004 21:40:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4127116A4CE for ; Sat, 10 Jan 2004 21:40:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2607143D2F for ; Sat, 10 Jan 2004 21:40:11 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B5eA0B066956 for ; Sat, 10 Jan 2004 21:40:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B5eAVb066953 for perforce@freebsd.org; Sat, 10 Jan 2004 21:40:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 21:40:10 -0800 (PST) Message-Id: <200401110540.i0B5eAVb066953@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 45110 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, 11 Jan 2004 05:40:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=45110 Change 45110 by rwatson@rwatson_paprika on 2004/01/10 21:39:15 Make bsm_audit.c compile: - Includes - Dummy mach functions - Unneeded local variable - Do return a value if we define a return value. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#5 (text+ko) ==== @@ -22,20 +22,19 @@ * * @APPLE_LICENSE_HEADER_END@ */ -#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 @@ -44,6 +43,14 @@ #include #include +/* XXXDARWIN */ +typedef struct mutex mutex_t; +#define kmem_alloc(map, ptrref, size) +#define kmem_free(map, ptr, size) +#define mutex_alloc(x) (NULL) +#define mutex_lock(x) +#define mutex_unlock(x) + /* The number of BSM records allocated. */ static int bsm_rec_count = 0; @@ -160,7 +167,6 @@ u_char *dptr; size_t tot_rec_size; token_t *cur, *hdr, *trail; - int retval = 0; tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; if(tot_rec_size <= MAX_AUDIT_RECORD_SIZE) { @@ -185,6 +191,7 @@ dptr += cur->len; } } + return (0); } /* From owner-p4-projects@FreeBSD.ORG Sat Jan 10 22:19:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 562D616A4D1; Sat, 10 Jan 2004 22:19:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F88C16A4CE for ; Sat, 10 Jan 2004 22:19:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC09443D4C for ; Sat, 10 Jan 2004 22:18:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B6Ix0B075944 for ; Sat, 10 Jan 2004 22:18:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B6IxtC075941 for perforce@freebsd.org; Sat, 10 Jan 2004 22:18:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 22:18:59 -0800 (PST) Message-Id: <200401110618.i0B6IxtC075941@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 45113 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, 11 Jan 2004 06:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=45113 Change 45113 by rwatson@rwatson_paprika on 2004/01/10 22:17:59 Steps towards audit.c building on FreeBSD: - Fix up include files. - Lots of Darwin/FreeBSD-isms (synchronization, allocation, asserts..) - FreeBSD uses threads as arguments to system calls, and doesn't pass *retval. - In fact, FreeBSD uses threads most places. - FreeBSD requires C99. - FreeBSD uses Giant not funnels for VFS. Not there yet. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#5 (text+ko) ==== @@ -22,32 +22,38 @@ * * @APPLE_LICENSE_HEADER_END@ */ + #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 #include +typedef struct mutex mutex_t; +typedef struct cv wait_queue_t; + +#define kmem_alloc(map, ptrref, size) +#define kmem_free(map, ptr, size) + +#define vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, resid, td) \ + vn_rdwr((rw), (vp), (base), (len), (offset), (segflg), (ioflg), \ + (cred), NULL, (resid), (td)) + +#define mutex_lock(x) mtx_lock(x) +#define mutex_unlock(x) mtx_unlock(x) + #ifdef AUDIT /* @@ -74,7 +80,7 @@ #include #endif /* DIAGNOSTIC */ #endif -#define assert KASSERT +#define assert(x) KASSERT(x, x) /* * Define the audit control flags. @@ -131,7 +137,7 @@ * XXX: Couldn't find the include file for this, so copied kern_exec.c's * behavior. */ -extern task_t kernel_task; +// extern task_t kernel_task; static void audit_free(struct kaudit_record *ar) @@ -159,7 +165,7 @@ static int audit_write(struct vnode *vp, struct kaudit_record *ar, struct ucred *cred, - struct proc *p) + struct thread *td) { int ret; struct au_record *bsm; @@ -176,7 +182,7 @@ */ if (ar->k_udata != NULL) { vn_rdwr(UIO_WRITE, vp, (void *)ar->k_udata, ar->k_ulen, - (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, p); + (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, td); } /* @@ -199,7 +205,7 @@ * take the BSM record as a parameter. */ ret = (vn_rdwr(UIO_WRITE, vp, (void *)bsm->data, bsm->len, - (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, p)); + (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, td)); kau_free(bsm); @@ -207,27 +213,29 @@ } static void -audit_worker() +audit_worker(void) { int do_replacement_signal, error, release_funnel; TAILQ_HEAD(, kaudit_record) ar_worklist; struct kaudit_record *ar, *ar_start, *ar_stop; struct vnode *audit_vp, *old_vp; struct ucred *audit_cred, *old_cred; - struct proc *audit_p; + struct thread *audit_td; AUDIT_PRINTF(("audit_worker starting\n")); TAILQ_INIT(&ar_worklist); audit_cred = NULL; - audit_p = current_proc(); + audit_td = curthread; audit_vp = NULL; /* * XXX: Presumably we can assume Mach threads are started without * holding the BSD kernel funnel? */ +#ifdef DARWIN_FOO thread_funnel_set(kernel_flock, FALSE); +#endif mutex_lock(audit_mtx); while (1) { @@ -256,7 +264,11 @@ if (old_vp != NULL || audit_vp != NULL) { mutex_unlock(audit_mtx); +#ifdef DARWIN_FOO thread_funnel_set(kernel_flock, TRUE); +#else + mtx_lock(&Giant); +#endif release_funnel = 1; } else release_funnel = 0; @@ -266,7 +278,7 @@ if (old_vp != NULL) { AUDIT_PRINTF(("Closing old audit file\n")); vn_close(old_vp, audit_close_flags, old_cred, - audit_p); + audit_td); crfree(old_cred); old_cred = NULL; old_vp = NULL; @@ -276,7 +288,11 @@ AUDIT_PRINTF(("Opening new audit file\n")); } if (release_funnel) { +#ifdef DARWIN_FOO thread_funnel_set(kernel_flock, FALSE); +#else + mtx_unlock(&Giant); +#endif mutex_lock(audit_mtx); } do_replacement_signal = 1; @@ -369,13 +385,17 @@ * error here? */ if (!release_funnel) { +#ifdef DARWIN_FOO thread_funnel_set(kernel_flock, TRUE); +#else + mtx_lock(&Giant); +#endif release_funnel = 1; } - VOP_LEASE(audit_vp, audit_p, audit_cred, + VOP_LEASE(audit_vp, audit_td, audit_cred, LEASE_WRITE); error = audit_write(audit_vp, ar, audit_cred, - audit_p); + audit_td); if (error) printf("audit_worker: write error %d\n", error); @@ -383,7 +403,11 @@ audit_free(ar); } if (release_funnel) +#ifdef DARWIN_FOO thread_funnel_set(kernel_flock, FALSE); +#else + mtx_unlock(&Giant); +#endif mutex_lock(audit_mtx); } } @@ -482,18 +506,11 @@ audit_rotate_vnode(NULL, NULL); } -static __inline__ struct uthread * -curuthread(void) -{ - - return (get_bsdthread_info(current_act())); -} - static __inline__ struct kaudit_record * currecord(void) { - return (curuthread()->uu_ar); + return (curthread->td_ar); } /********************************** @@ -508,13 +525,9 @@ * work, since we pre-select only based on the AUE_audit event type, * not the event type submitted as part of the user audit data. */ -struct audit_args { - void * record; - int length; -}; /* ARGSUSED */ int -audit(struct proc *p, struct audit_args *uap, register_t *retval) +audit(struct thread *td, struct audit_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -573,7 +586,7 @@ }; /* ARGSUSED */ int -auditon(struct proc *p, struct auditon_args *uap, register_t *retval) +auditon(struct thread *td, struct auditon_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -593,7 +606,7 @@ }; /* ARGSUSED */ int -auditsvc(struct proc *p, struct auditsvc_args *uap, register_t *retval) +auditsvc(struct thread *td, struct auditsvc_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -613,7 +626,7 @@ }; /* ARGSUSED */ int -getauid(struct proc *p, struct getauid_args *uap, register_t *retval) +getauid(struct thread *td, struct getauid_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -635,7 +648,7 @@ }; /* ARGSUSED */ int -setauid(struct proc *p, struct setauid_args *uap, register_t *retval) +setauid(struct thread *td, struct setauid_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -661,7 +674,7 @@ }; /* ARGSUSED */ int -getaudit(struct proc *p, struct getaudit_args *uap, register_t *retval) +getaudit(struct thread *td, struct getaudit_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -682,7 +695,7 @@ }; /* ARGSUSED */ int -setaudit(struct proc *p, struct setaudit_args *uap, register_t *retval) +setaudit(struct thread *td, struct setaudit_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -704,7 +717,7 @@ }; /* ARGSUSED */ int -getaudit_addr(struct proc *p, struct getaudit_addr_args *uap, register_t *retval) +getaudit_addr(struct thread *td, struct getaudit_addr_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -721,7 +734,7 @@ }; /* ARGSUSED */ int -setaudit_addr(struct proc *p, struct setaudit_addr_args *uap, register_t *retval) +setaudit_addr(struct thread *td, struct setaudit_addr_args *uap) { register struct pcred *pc = p->p_cred; int error; @@ -742,7 +755,7 @@ }; /* ARGSUSED */ int -auditctl(struct proc *p, struct auditctl_args *uap) +auditctl(struct thread *td, struct auditctl_args *uap) { struct kaudit_record *ar; struct nameidata nd; @@ -1516,61 +1529,61 @@ } int -audit(struct proc *p, struct audit_args *uap, register_t *retval) +audit(struct thread *td, struct audit_args *uap) { return (ENOSYS); } int -auditon(struct proc *p, struct auditon_args *uap, register_t *retval) +auditon(struct thread *td, struct auditon_args *uap) { return (ENOSYS); } int -auditsvc(struct proc *p, struct auditsvc_args *uap, register_t *retval) +auditsvc(struct thread *td, struct auditsvc_args *uap) { return (ENOSYS); } int -getauid(struct proc *p, struct getauid_args *uap, register_t *retval) +getauid(struct thread *td, struct getauid_args *uap) { return (ENOSYS); } int -setauid(struct proc *p, struct setauid_args *uap, register_t *retval) +setauid(struct thread *td, struct setauid_args *uap) { return (ENOSYS); } int -getaudit(struct proc *p, struct getaudit_args *uap, register_t *retval) +getaudit(struct thread *td, struct getaudit_args *uap) { return (ENOSYS); } int -setaudit(struct proc *p, struct setaudit_args *uap, register_t *retval) +setaudit(struct thread *td, struct setaudit_args *uap) { return (ENOSYS); } int -getaudit_addr(struct proc *p, struct getaudit_addr_args *uap, register_t *retval) +getaudit_addr(struct thread *td, struct getaudit_addr_args *uap) { return (ENOSYS); } int -setaudit_addr(struct proc *p, struct setaudit_addr_args *uap, register_t *retval) +setaudit_addr(struct thread *td, struct setaudit_addr_args *uap) { return (ENOSYS); } int -auditctl(struct proc *p, struct auditctl_args *uap, register_t *retval) +auditctl(struct thread *td, struct auditctl_args *uap) { return (ENOSYS); } From owner-p4-projects@FreeBSD.ORG Sat Jan 10 22:30:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6E6716A4D1; Sat, 10 Jan 2004 22:30:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0A1516A4CE for ; Sat, 10 Jan 2004 22:30:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE2CE43D5C for ; Sat, 10 Jan 2004 22:30:14 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B6UE0B078116 for ; Sat, 10 Jan 2004 22:30:14 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B6UELd078086 for perforce@freebsd.org; Sat, 10 Jan 2004 22:30:14 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 10 Jan 2004 22:30:14 -0800 (PST) Message-Id: <200401110630.i0B6UELd078086@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 45115 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, 11 Jan 2004 06:30:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=45115 Change 45115 by rwatson@rwatson_paprika on 2004/01/10 22:29:54 Since a lot of things will depend on the AUDIT ifdef, add it to opt_global.h. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/conf/options#3 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/conf/options#3 (text+ko) ==== @@ -74,7 +74,7 @@ # Miscellaneous options. ADAPTIVE_MUTEXES ALQ -AUDIT +AUDIT opt_global.h CODA_COMPAT_5 opt_coda.h COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h From owner-p4-projects@FreeBSD.ORG Sat Jan 10 22:41:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBD7D16A4D1; Sat, 10 Jan 2004 22:41:30 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F53816A4CE for ; Sat, 10 Jan 2004 22:41:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E80E243D2D for ; Sat, 10 Jan 2004 22:41:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B6fS0B081157 for ; Sat, 10 Jan 2004 22:41:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B6fSwK081148 for perforce@freebsd.org; Sat, 10 Jan 2004 22:41:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 10 Jan 2004 22:41:28 -0800 (PST) Message-Id: <200401110641.i0B6fSwK081148@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 45116 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, 11 Jan 2004 06:41:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=45116 Change 45116 by jmallett@jmallett_oingo on 2004/01/10 22:40:51 Clean up some cruft, unused stuff, etc., Affected files ... .. //depot/projects/mips/sys/mips/include/param.h#15 edit .. //depot/projects/mips/sys/mips/include/proc.h#3 edit .. //depot/projects/mips/sys/mips/include/vmparam.h#10 edit .. //depot/projects/mips/sys/mips/mips/genassym.c#10 edit Differences ... ==== //depot/projects/mips/sys/mips/include/param.h#15 (text+ko) ==== @@ -28,18 +28,6 @@ #define UAREA_PAGES 1 /* pages of u-area */ /* - * On mips, UPAGES is fixed by sys/arch/mips/mips/locore code - * to be the number of per-process-wired kernel-stack pages/PTES. - */ - -#define UPAGES 2 /* pages of u-area */ -#define USPACE (UPAGES*NBPG) /* size of u-area in bytes */ - -#ifndef MSGBUFSIZE -#define MSGBUFSIZE NBPG /* default message buffer size */ -#endif - -/* * Define the architecture. If no platform has been defined, fall back * to the architecture name, but warn. */ @@ -69,8 +57,6 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) -#define NBPG (PAGE_SIZE) - #define atop(x) ((unsigned long)(x) >> PAGE_SHIFT) #define ptoa(x) ((unsigned long)(x) << PAGE_SHIFT) #define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) @@ -79,14 +65,8 @@ #define ctob(x) ((x) << PAGE_SHIFT) #define btoc(x) (((x) + PAGE_MASK) >> PAGE_SHIFT) -/* bytes to disk blocks */ -#define btodb(x) ((x) >> DEV_BSHIFT) -#define dbtob(x) ((x) << DEV_BSHIFT) - /* * Mach derived conversion macros */ -#define round_page(x) ((((unsigned long)(x)) + NBPG - 1) & ~(NBPG-1)) -#define trunc_page(x) ((unsigned long)(x) & ~(NBPG-1)) -#define btop(x) ((unsigned long)(x) >> PGSHIFT) -#define ptob(x) ((unsigned long)(x) << PGSHIFT) +#define round_page(x) ((((unsigned long)(x)) + PAGE_SIZE - 1) & ~(PAGE_SIZE-1)) +#define trunc_page(x) ((unsigned long)(x) & ~(PAGE_SIZE-1)) ==== //depot/projects/mips/sys/mips/include/proc.h#3 (text+ko) ==== @@ -35,7 +35,6 @@ struct mdthread { void *md_regs; /* registers on current frame */ int md_flags; /* machine-dependent flags */ - int md_upte[UPAGES]; /* ptes for mapping u page */ }; #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/mips/sys/mips/include/vmparam.h#10 (text+ko) ==== @@ -51,19 +51,12 @@ #include /* - * USRTEXT is the start of the user text/data space, while USRSTACK - * is the top (end) of the user stack. - * * USRSTACK needs to start a little below 0x8000000 because the R8000 * and some QED CPUs perform some virtual address checks before the * offset is calculated. */ -#define USRTEXT 0x00001000 /* Start of user text */ #define USRSTACK 0x7ffff000 /* Start of user stack */ -/* alignment requirement for u-area space in bytes */ -#define USPACE_ALIGN USPACE - /* * Virtual memory related constants, all in bytes */ @@ -87,22 +80,6 @@ #endif /* - * PTEs for mapping user space into the kernel for phyio operations. - * The default PTE number is enough to cover 8 disks * MAXBSIZE. - */ -#ifndef USRIOSIZE -#define USRIOSIZE (MAXBSIZE/NBPG * 8) -#endif - -/* - * PTEs for system V style shared memory. - * This is basically slop for kmempt which we actually allocate (malloc) from. - */ -#ifndef SHMMAXPGS -#define SHMMAXPGS 1024 /* 4mb */ -#endif - -/* * The time for a process to be blocked before being very swappable. * This is a number of seconds which the system takes as being a non-trivial * amount of real time. You probably shouldn't change this; @@ -136,6 +113,5 @@ /* virtual sizes (bytes) for various kernel submaps */ #define VM_KMEM_SIZE (16*1024*1024) /* XXX ??? */ -#define VM_PHYS_SIZE (USRIOSIZE*NBPG) #endif /* ! _MIPS_VMPARAM_H_ */ ==== //depot/projects/mips/sys/mips/mips/genassym.c#10 (text+ko) ==== @@ -56,8 +56,6 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_MD_REGS, offsetof(struct thread, td_md.md_regs)); -ASSYM(TD_MD_UPTE_0, offsetof(struct thread, td_md.md_upte[0])); -ASSYM(TD_MD_UPTE_1, offsetof(struct thread, td_md.md_upte[1])); ASSYM(P_UAREA, offsetof(struct proc, p_uarea));