From owner-p4-projects@FreeBSD.ORG Sun Dec 28 01:42:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FAFF16A4D0; Sun, 28 Dec 2003 01:42: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 2570D16A4CE for ; Sun, 28 Dec 2003 01:42:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4DC543D39 for ; Sun, 28 Dec 2003 01:42: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 hBS9go0B084445 for ; Sun, 28 Dec 2003 01:42:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBS9goBe084442 for perforce@freebsd.org; Sun, 28 Dec 2003 01:42:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 01:42:50 -0800 (PST) Message-Id: <200312280942.hBS9goBe084442@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 44435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 09:42:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=44435 Change 44435 by jmallett@jmallett_oingo on 2003/12/28 01:42:50 DWIM. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#25 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#25 (text+ko) ==== @@ -616,7 +616,7 @@ i = 0; va = sva; while (count-- > 0) { - pmap_kenter(va, (vm_offset_t)m[i]); + pmap_kenter(va, VM_PAGE_TO_PHYS(m[i])); va += PAGE_SIZE; } } From owner-p4-projects@FreeBSD.ORG Sun Dec 28 01:43:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B545616A4D0; Sun, 28 Dec 2003 01:43: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 8FD9A16A4CE for ; Sun, 28 Dec 2003 01:43:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD51743D48 for ; Sun, 28 Dec 2003 01:43:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBS9hq0B084521 for ; Sun, 28 Dec 2003 01:43:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBS9hqHF084518 for perforce@freebsd.org; Sun, 28 Dec 2003 01:43:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 01:43:52 -0800 (PST) Message-Id: <200312280943.hBS9hqHF084518@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 44436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 09:43:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=44436 Change 44436 by jmallett@jmallett_oingo on 2003/12/28 01:43:03 Some XXX. Affected files ... .. //depot/projects/mips/sys/dev/arcbios/arcbios.c#11 edit Differences ... ==== //depot/projects/mips/sys/dev/arcbios/arcbios.c#11 (text+ko) ==== @@ -139,6 +139,7 @@ static void arcbios_fill_vector(struct arcbios *A, const struct arcbios_fv *V) { + /* XXX not ARCBIOS64 safe. */ #define ARCSET(Func) A->Func = (void *)(intptr_t)(int) V->Func ARCSET(Load); ARCSET(Invoke); From owner-p4-projects@FreeBSD.ORG Sun Dec 28 02:05:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03DB816A4D0; Sun, 28 Dec 2003 02:05: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 C205C16A4CE for ; Sun, 28 Dec 2003 02:05:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 472FC43D46 for ; Sun, 28 Dec 2003 02:05:19 -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 hBSA5I0B089470 for ; Sun, 28 Dec 2003 02:05:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSA5Ii7089467 for perforce@freebsd.org; Sun, 28 Dec 2003 02:05:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 02:05:18 -0800 (PST) Message-Id: <200312281005.hBSA5Ii7089467@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 44437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 10:05:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44437 Change 44437 by jmallett@jmallett_oingo on 2003/12/28 02:04:22 Temporarily override ABI while I get together a new bit of ARCS code. Affected files ... .. //depot/projects/mips/sys/conf/Makefile.mips#10 edit Differences ... ==== //depot/projects/mips/sys/conf/Makefile.mips#10 (text+ko) ==== @@ -41,7 +41,7 @@ .include "$S/conf/kern.pre.mk" MIPSOPTS?= -mips3 -COPTS+= ${MIPSOPTS} -mno-abicalls -fno-pic -msoft-float +COPTS+= ${MIPSOPTS} -mno-abicalls -fno-pic -msoft-float -mabi=o64 -mlong64 CFLAGS+= -D${PLATFORM} From owner-p4-projects@FreeBSD.ORG Sun Dec 28 04:13:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0755116A4D2; Sun, 28 Dec 2003 04:13: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 9EDE216A4CF for ; Sun, 28 Dec 2003 04:13:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C029C43D53 for ; Sun, 28 Dec 2003 04:13:09 -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 hBSCD90B019686 for ; Sun, 28 Dec 2003 04:13:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSCD9c1019683 for perforce@freebsd.org; Sun, 28 Dec 2003 04:13:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 04:13:09 -0800 (PST) Message-Id: <200312281213.hBSCD9c1019683@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 44440 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 12:13:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=44440 Change 44440 by jmallett@jmallett_oingo on 2003/12/28 04:12:46 A quick ARCS frontend to provide console and other basic things. Still *need* to add the tree walking stuff to get the system ID crap. This is good enough for what I need right at this moment, and works with the new ABI by way of nasty contortions that would make bde blush and full of me sticking my fingers in my ears and yelling "la la la I can't use a packed structure" twice as loud as phk ever has done. I feel dirty. Affected files ... .. //depot/projects/mips/sys/conf/Makefile.mips#11 edit .. //depot/projects/mips/sys/conf/files.mips#23 edit .. //depot/projects/mips/sys/conf/options.mips#11 edit .. //depot/projects/mips/sys/dev/arcs/arcs.c#1 add .. //depot/projects/mips/sys/dev/arcs/arcs.h#1 add .. //depot/projects/mips/sys/dev/arcs/arcs_console.c#1 add .. //depot/projects/mips/sys/mips/conf/INDY#3 edit .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#25 edit Differences ... ==== //depot/projects/mips/sys/conf/Makefile.mips#11 (text+ko) ==== @@ -41,7 +41,7 @@ .include "$S/conf/kern.pre.mk" MIPSOPTS?= -mips3 -COPTS+= ${MIPSOPTS} -mno-abicalls -fno-pic -msoft-float -mabi=o64 -mlong64 +COPTS+= ${MIPSOPTS} -mno-abicalls -fno-pic -msoft-float CFLAGS+= -D${PLATFORM} ==== //depot/projects/mips/sys/conf/files.mips#23 (text+ko) ==== @@ -50,6 +50,9 @@ dev/arcbios/arcbios.c optional arcbios dev/arcbios/arcbios_tty.c optional arcbios +dev/arcs/arcs.c optional arcs +dev/arcs/arcs_console.c optional arcs + libkern/bcmp.c standard libkern/divdi3.c standard libkern/ffs.c standard ==== //depot/projects/mips/sys/conf/options.mips#11 (text+ko) ==== ==== //depot/projects/mips/sys/mips/conf/INDY#3 (text+ko) ==== @@ -17,9 +17,7 @@ options IP22 #IP22 (Indy, Indigo2, ...) # Hardware support -device arcbios #ARCBIOS -#options ARCBIOS64 #ARCBIOS uses 64-bit pointers in - #structures. Disable for IP22. +device arcs #ARCS Firmware + Console # Debugging for use in -current options DDB #Enable the kernel debugger ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#25 (text+ko) ==== @@ -43,8 +43,7 @@ #include #include -#include -#include +#include #include "opt_model.h" @@ -67,19 +66,19 @@ void platform_halt(void) { - ARCBIOS->EnterInteractiveMode(); + ARCS_EnterInteractiveMode(); } void platform_reset(void) { - ARCBIOS->Reboot(); + ARCS_Reboot(); } void platform_start(int argc, char **argv) { - struct arcbios_mem *mem; + struct ARCS_Mem *mem; struct machine_type *mtp; const char *cpufreq; int first, i, j, last, size; @@ -88,16 +87,14 @@ kend = 0; /* - * Initialise the ARCBIOS stuff. + * Initialise the ARCS stuff. */ - arcbios_init(MIPS_PHYS_TO_KSEG1(0x00001000)); - arcbios_cnattach(); + arcs_attach((void *)MIPS_PHYS_TO_KSEG1(0x00001000)); + arcs_cnattach(); bootverbose = 1; /* XXX */ - ARCBIOS->FlushAllCaches(); - - cpufreq = ARCBIOS->GetEnvironmentVariable("cpufreq"); + cpufreq = ARCS_GetEnvironmentVariable("cpufreq"); if (cpufreq == NULL) panic("$cpufreq not set"); @@ -105,7 +102,7 @@ init_param1(); for (mtp = machines; mtp->identifier != NULL; mtp++) { - if (strcmp(mtp->identifier, arcbios_system_identifier) == 0) + if (strcmp(mtp->identifier, arcs_systemid()) == 0) break; } if (mtp->identifier == NULL) @@ -116,26 +113,26 @@ } printf("%s (IP%d), subtype %x, board rev. %x at %sMHz\n", - arcbios_system_identifier, mach_type, mach_subtype, mach_boardrev, cpufreq); + arcs_systemid(), mach_type, mach_subtype, mach_boardrev, cpufreq); mem = NULL; j = 0; for (i = 0;; i++) { - mem = ARCBIOS->GetMemoryDescriptor(mem); + mem = ARCS_GetMemoryDescriptor(mem); if (mem == NULL) break; - first = round_page(mem->BasePage * ARCBIOS_PAGESIZE); - last = trunc_page(first + mem->PageCount * ARCBIOS_PAGESIZE); + first = round_page(mem->BasePage << ARCS_PAGESHIFT); + last = trunc_page(first + (mem->PageCount << ARCS_PAGESHIFT)); size = last - first; switch (mem->Type) { - case ARCBIOS_MEM_FirmwareTemporary: - case ARCBIOS_MEM_FirmwarePermanent: + case ARCS_Mem_Type_FirmwareTemporary: + case ARCS_Mem_Type_FirmwarePermanent: arcsmem += btoc(size); break; - case ARCBIOS_MEM_LoadedProgram: + case ARCS_Mem_Type_LoadedProgram: /* XXX does not allow for kernels loaded * at the very end of the available space. * XXX assumes sorted memory, but it is? @@ -150,13 +147,13 @@ kend = MIPS_PHYS_TO_KSEG0(last); lpmem += btoc(size); break; - case ARCBIOS_MEM_FreeContiguous: - case ARCBIOS_MEM_FreeMemory: + case ARCS_Mem_Type_FreeContiguous: + case ARCS_Mem_Type_FreeMemory: availmem += btoc(size); phys_avail[j + 0] = first; phys_avail[j + 1] = last; if (bootverbose) - printf("ARCBIOS MEM %#x -> %#x\n", first, last); + printf("ARCS MEM %#x -> %#x\n", first, last); j += 2; break; default: @@ -174,7 +171,7 @@ void platform_identify(void) { - printf("machine: %s\n", arcbios_system_identifier); + printf("machine: %s\n", arcs_systemid()); printf("ARCS memory = %d (%d KB)\n", ctob(arcsmem), ctob(arcsmem) / 1024); printf("Loaded program memory = %d (%d KB)\n", ctob(lpmem), From owner-p4-projects@FreeBSD.ORG Sun Dec 28 04:15:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 744F216A4D2; Sun, 28 Dec 2003 04:15:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D8C916A4CF for ; Sun, 28 Dec 2003 04:15:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0AF643D2D for ; Sun, 28 Dec 2003 04:15:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBSCFC0B019769 for ; Sun, 28 Dec 2003 04:15:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSCFCKO019766 for perforce@freebsd.org; Sun, 28 Dec 2003 04:15:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 04:15:12 -0800 (PST) Message-Id: <200312281215.hBSCFCKO019766@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 44441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 12:15:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=44441 Change 44441 by jmallett@jmallett_oingo on 2003/12/28 04:14:48 Reduce diffs with INDY: use my new ARCS code, turn on -Werror. Affected files ... .. //depot/projects/mips/sys/mips/conf/GENERIC#15 edit Differences ... ==== //depot/projects/mips/sys/mips/conf/GENERIC#15 (text+ko) ==== @@ -8,7 +8,6 @@ ident GENERIC maxusers 0 -makeoptions WERROR=-Wno-error #XXX: We don't want -Werror just now makeoptions MIPSOPTS=-mips3 #Build for a MIPS III #makeoptions TEXTADDR=0x88069000 #Indy @@ -18,9 +17,7 @@ options IP22 #IP22 (Indy, Indigo2, ...) # Hardware support -device arcbios #ARCBIOS -options ARCBIOS64 #ARCBIOS uses 64-bit pointers in - #structures. Disable for IP22. +device arcs #ARCS Firmware + Console # Debugging for use in -current options DDB #Enable the kernel debugger From owner-p4-projects@FreeBSD.ORG Sun Dec 28 04:15:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B428C16A4EF; Sun, 28 Dec 2003 04:15:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DD5116A4D0 for ; Sun, 28 Dec 2003 04:15:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CEF543D49 for ; Sun, 28 Dec 2003 04:15:13 -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 hBSCFD0B019789 for ; Sun, 28 Dec 2003 04:15:13 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSCFCiH019772 for perforce@freebsd.org; Sun, 28 Dec 2003 04:15:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 04:15:12 -0800 (PST) Message-Id: <200312281215.hBSCFCiH019772@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 44442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 12:15:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=44442 Change 44442 by jmallett@jmallett_oingo on 2003/12/28 04:15:06 Remove arcbios hooks here. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#24 edit .. //depot/projects/mips/sys/conf/options.mips#12 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#24 (text+ko) ==== @@ -47,9 +47,6 @@ mips/sgimips/ip22_cache.S optional sgimips ip22 # This stanza is device files. -dev/arcbios/arcbios.c optional arcbios -dev/arcbios/arcbios_tty.c optional arcbios - dev/arcs/arcs.c optional arcs dev/arcs/arcs_console.c optional arcs ==== //depot/projects/mips/sys/conf/options.mips#12 (text+ko) ==== @@ -12,4 +12,3 @@ SGIMIPS opt_platform.h _BYTE_ORDER opt_endian.h -ARCBIOS64 opt_arcbios.h From owner-p4-projects@FreeBSD.ORG Sun Dec 28 04:19:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABC8B16A4E2; Sun, 28 Dec 2003 04:19:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BC6C16A502 for ; Sun, 28 Dec 2003 04:19:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAD3043D41 for ; Sun, 28 Dec 2003 04:19:18 -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 hBSCJI0B020047 for ; Sun, 28 Dec 2003 04:19:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSCJIp4020044 for perforce@freebsd.org; Sun, 28 Dec 2003 04:19:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 04:19:18 -0800 (PST) Message-Id: <200312281219.hBSCJIp4020044@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 44443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 12:19:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=44443 Change 44443 by jmallett@jmallett_oingo on 2003/12/28 04:18:52 Delete NetBSD's much "nicer" and much more complete ARCBIOS code in favor of my ARCS code which "mostly does the job." The NetBSD way of using packed structures is nice, and certainly easy to code, but makes dealing with ABI issues difficult. If it were trivial to say "switch to the o64 ABI for calling this" then I might not mind it so much, but it'd end up very, very full of macros before function pointers, and I'm sure GCC would get argument translation wrong anyway. Not to mention having to use my ArcPointer_t stuff anyway for structure sizing. NetBSD code is still a good reference for functions, etc. Note this also gets rid of their (surely nicer) TTY code. Affected files ... .. //depot/projects/mips/sys/dev/arcbios/arcbios.c#12 delete .. //depot/projects/mips/sys/dev/arcbios/arcbios.h#5 delete .. //depot/projects/mips/sys/dev/arcbios/arcbios_tty.c#5 delete .. //depot/projects/mips/sys/dev/arcbios/arcbiosvar.h#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 28 04:20:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 151E216A4D2; Sun, 28 Dec 2003 04:20: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 C0A7316A4CF for ; Sun, 28 Dec 2003 04:20:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B24F843D48 for ; Sun, 28 Dec 2003 04:20:20 -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 hBSCKK0B020157 for ; Sun, 28 Dec 2003 04:20:20 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSCKKso020154 for perforce@freebsd.org; Sun, 28 Dec 2003 04:20:20 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 04:20:20 -0800 (PST) Message-Id: <200312281220.hBSCKKso020154@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 44444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 12:20:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=44444 Change 44444 by jmallett@jmallett_oingo on 2003/12/28 04:20:09 Remove #if maybenever stuff which is indeed for never. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/ip22.c#6 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/ip22.c#6 (text+ko) ==== @@ -141,13 +141,6 @@ platform.intr_establish = ip22_intr_establish; platform.watchdog = ip22_watchdog; -#if maybenever - biomask = 0x0700; - netmask = 0x0700; - ttymask = 0x0f00; - clockmask = 0xbf00; -#endif - /* Hardcode interrupts 7, 11 to mappable interrupt 0,1 handlers */ intrtab[7].ih_fun = ip22_mappable_intr; intrtab[7].ih_arg = (void*) 0; From owner-p4-projects@FreeBSD.ORG Sun Dec 28 05:30:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7164316A4D0; Sun, 28 Dec 2003 05:30: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 2CE0E16A4CE for ; Sun, 28 Dec 2003 05:30:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55F5643D2F for ; Sun, 28 Dec 2003 05:30:47 -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 hBSDUl0B041131 for ; Sun, 28 Dec 2003 05:30:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSDUkUZ041128 for perforce@freebsd.org; Sun, 28 Dec 2003 05:30:46 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 05:30:46 -0800 (PST) Message-Id: <200312281330.hBSDUkUZ041128@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 44447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 13:30:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=44447 Change 44447 by jmallett@jmallett_oingo on 2003/12/28 05:30:15 Maybe dirty PTEs coming in TLBMod is OK after all... Affected files ... .. //depot/projects/mips/sys/mips/mips/tlb.c#17 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/tlb.c#17 (text+ko) ==== @@ -237,8 +237,19 @@ panic("write to invalid page"); if (pte_ro(pte)) panic("write to ro page"); + + /* + * XXX I don't like these, but it looks like the fact of the + * matter is that they happen, for example I have something in + * front of me right now where the even side of the buffer is + * dirty, and so is the odd side, but in the buffer, the left + * side is marked, and there's some reason why a reload didn't + * happen, so just let it go... let it go... + */ +#if 0 if (pte_dirty(pte)) panic("dirty page caused a TLBMod"); +#endif /* * Mark the page dirty. From owner-p4-projects@FreeBSD.ORG Sun Dec 28 12:06:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 244C216A4D0; Sun, 28 Dec 2003 12:06: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 DAD6D16A4CE for ; Sun, 28 Dec 2003 12:06:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48A6743D54 for ; Sun, 28 Dec 2003 12:04:48 -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 hBSK4S0B034075 for ; Sun, 28 Dec 2003 12:04:28 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSK4SNe034072 for perforce@freebsd.org; Sun, 28 Dec 2003 12:04:28 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sun, 28 Dec 2003 12:04:28 -0800 (PST) Message-Id: <200312282004.hBSK4SNe034072@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 44464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 20:06:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44464 Change 44464 by sam@sam_ebb on 2003/12/28 12:03:56 purge debug_mpsafenet Affected files ... .. //depot/projects/netperf+sockets/sys/kern/subr_bus.c#4 edit .. //depot/projects/netperf+sockets/sys/net/netisr.c#3 edit .. //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.c#6 edit .. //depot/projects/netperf+sockets/sys/netinet/ip_fw2.c#6 edit .. //depot/projects/netperf+sockets/sys/netinet/tcp_syncache.c#4 edit .. //depot/projects/netperf+sockets/sys/sys/mutex.h#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/subr_bus.c#4 (text+ko) ==== @@ -2140,9 +2140,6 @@ int error; if (dev->parent != 0) { - if ((flags &~ INTR_ENTROPY) == (INTR_TYPE_NET | INTR_MPSAFE) && - !debug_mpsafenet) - flags &= ~INTR_MPSAFE; error = BUS_SETUP_INTR(dev->parent, dev, r, flags, handler, arg, cookiep); if (error == 0) { ==== //depot/projects/netperf+sockets/sys/net/netisr.c#3 (text+ko) ==== @@ -53,16 +53,6 @@ #include #include -/* - * XXX this is a temporary measure to allow folks to - * XXX disable Giant locking in the network code without - * XXX recompiling--in case of problems. - */ -int debug_mpsafenet = 1; -TUNABLE_INT("debug.mpsafenet", &debug_mpsafenet); -SYSCTL_INT(_debug, OID_AUTO, mpsafenet, CTLFLAG_RD, &debug_mpsafenet, 0, - "Enable/disable MPSAFE network support"); - volatile unsigned int netisr; /* scheduling bits for network */ struct netisr { @@ -87,8 +77,6 @@ ("bad isr %d", num)); netisrs[num].ni_handler = handler; netisrs[num].ni_queue = inq; - if ((flags & NETISR_MPSAFE) && !debug_mpsafenet) - flags &= ~NETISR_MPSAFE; netisrs[num].ni_flags = flags; } ==== //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.c#6 (text+ko) ==== @@ -2029,7 +2029,7 @@ ip_dn_io_ptr = dummynet_io; ip_dn_ruledel_ptr = dn_rule_delete; - callout_init(&dn_timeout, debug_mpsafenet ? CALLOUT_MPSAFE : 0); + callout_init(&dn_timeout, CALLOUT_MPSAFE); callout_reset(&dn_timeout, 1, dummynet, NULL); } ==== //depot/projects/netperf+sockets/sys/netinet/ip_fw2.c#6 (text+ko) ==== @@ -2947,7 +2947,7 @@ layer3_chain.rules = NULL; IPFW_LOCK_INIT(&layer3_chain); IPFW_DYN_LOCK_INIT(); - callout_init(&ipfw_timeout, debug_mpsafenet ? CALLOUT_MPSAFE : 0); + callout_init(&ipfw_timeout, CALLOUT_MPSAFE); bzero(&default_rule, sizeof default_rule); ==== //depot/projects/netperf+sockets/sys/netinet/tcp_syncache.c#4 (text+ko) ==== @@ -248,8 +248,7 @@ /* Initialize the timer queues. */ for (i = 0; i <= SYNCACHE_MAXREXMTS; i++) { TAILQ_INIT(&tcp_syncache.timerq[i]); - callout_init(&tcp_syncache.tt_timerq[i], - debug_mpsafenet ? CALLOUT_MPSAFE : 0); + callout_init(&tcp_syncache.tt_timerq[i], CALLOUT_MPSAFE); } /* ==== //depot/projects/netperf+sockets/sys/sys/mutex.h#3 (text+ko) ==== @@ -339,27 +339,6 @@ WITNESS_RESTORE(&Giant.mtx_object, Giant) #endif -/* - * Network MPSAFE temporary workarounds. When debug_mpsafenet - * is 1 the network is assumed to operate without Giant on the - * input path and protocols that require Giant must collect it - * on entry. When 0 Giant is grabbed in the network interface - * ISR's and in the netisr path and there is no need to grab - * the Giant lock. - * - * This mechanism is intended as temporary until everything of - * importance is properly locked. - */ -extern int debug_mpsafenet; /* defined in net/netisr.c */ -#define NET_PICKUP_GIANT() do { \ - if (debug_mpsafenet) \ - mtx_lock(&Giant); \ -} while (0) -#define NET_DROP_GIANT() do { \ - if (debug_mpsafenet) \ - mtx_unlock(&Giant); \ -} while (0) - #define UGAR(rval) do { \ int _val = (rval); \ mtx_unlock(&Giant); \ From owner-p4-projects@FreeBSD.ORG Sun Dec 28 12:06:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79DE616A4D2; Sun, 28 Dec 2003 12:06: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 5495A16A4CF for ; Sun, 28 Dec 2003 12:06:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4EAF43D5D for ; Sun, 28 Dec 2003 12:05: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 hBSK5U0B034134 for ; Sun, 28 Dec 2003 12:05:30 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSK5UkH034131 for perforce@freebsd.org; Sun, 28 Dec 2003 12:05:30 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sun, 28 Dec 2003 12:05:30 -0800 (PST) Message-Id: <200312282005.hBSK5UkH034131@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 44465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 20:06:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=44465 Change 44465 by sam@sam_ebb on 2003/12/28 12:04:38 default netisr_enable to 1 Affected files ... .. //depot/projects/netperf+sockets/sys/net/netisr.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net/netisr.c#4 (text+ko) ==== @@ -105,7 +105,7 @@ SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG_RW, 0, "netisr counters"); -static int netisr_enable = 0; +static int netisr_enable = 1; SYSCTL_INT(_net_isr, OID_AUTO, enable, CTLFLAG_RW, &netisr_enable, 0, "enable direct dispatch"); TUNABLE_INT("net.isr.enable", &netisr_enable); From owner-p4-projects@FreeBSD.ORG Sun Dec 28 13:22:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF1B716A4D1; Sun, 28 Dec 2003 13:22: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 9F4E716A4CE for ; Sun, 28 Dec 2003 13:22:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1AC943D2D for ; Sun, 28 Dec 2003 13:22: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 hBSLM50B056416 for ; Sun, 28 Dec 2003 13:22:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSLM59E056407 for perforce@freebsd.org; Sun, 28 Dec 2003 13:22:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 13:22:05 -0800 (PST) Message-Id: <200312282122.hBSLM59E056407@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 44469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 21:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=44469 Change 44469 by jmallett@jmallett_oingo on 2003/12/28 13:21:07 Add some ARCS Component stuff, quick trampoline into GetChild, make arcs_systemid() honest. Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs.c#2 edit .. //depot/projects/mips/sys/dev/arcs/arcs.h#2 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#1 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#2 $ */ #include "opt_model.h" @@ -35,11 +35,6 @@ #include -/* List these not in #else's, etc., to blow up if there's a problem. */ -#if defined(IP22) -typedef int32_t ARCS_Pointer_t; -#endif - static char *ARCS_SPB; static char *ARCS_FV; @@ -56,6 +51,7 @@ #define ARCS_FV_Reboot_Offset (6 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_EnterInteractiveMode_Offset (7 * sizeof (ARCS_Pointer_t)) +#define ARCS_FV_GetChild_Offset (10 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_GetMemoryDescriptor_Offset (18 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_Read_Offset (25 * sizeof (ARCS_Pointer_t)) #define ARCS_FV_GetReadStatus_Offset (26 * sizeof (ARCS_Pointer_t)) @@ -82,10 +78,15 @@ const char * arcs_systemid(void) { - /* XXX Need all that groovy tree-walking code. */ - /* XXX This is so badly hackish. */ - /* XXX So badly hackish it makes me almost want to fix dev/arcbios. */ - return "SGI-IP22"; + struct ARCS_Component *root; + const char *systemid; + + root = ARCS_GetChild(NULL); + if (root != NULL) + systemid = (const char *)(intptr_t)root->Identifier; + else + systemid = "SGI-IP27"; + return (systemid); } struct ARCS_Mem * @@ -192,3 +193,18 @@ len = (size_t)lend; return (len); } + +struct ARCS_Component * +ARCS_GetChild(const struct ARCS_Component *component) +{ + ARCS_Pointer_t (*GetChild)(ARCS_Pointer_t); + struct ARCS_Component *next; + ARCS_Pointer_t componentd; + ARCS_Pointer_t nextd; + + GetChild = (ARCS_Pointer_t (*)(ARCS_Pointer_t))(intptr_t)*(ARCS_Pointer_t *)&ARCS_FV[ARCS_FV_GetChild_Offset]; + componentd = (ARCS_Pointer_t)(intptr_t)component; + nextd = (*GetChild)(componentd); + next = (struct ARCS_Component *)(intptr_t)nextd; + return (next); +} ==== //depot/projects/mips/sys/dev/arcs/arcs.h#2 (text+ko) ==== @@ -23,12 +23,22 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#1 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#2 $ */ #ifndef _DEV_ARCS_ARCS_H_ #define _DEV_ARCS_ARCS_H_ +#ifdef sgimips +#include "opt_model.h" + +#if defined (IP22) +typedef int32_t ARCS_Pointer_t; +#endif +#else +#error "ARCS not supported." +#endif + /* * Simple ARCS firmware interaction code for the SGI MIPS machines. It * is initially being written for 64-bit kernels running with a 32-bit @@ -76,6 +86,20 @@ uint32_t PageCount; } __packed; +/* Used to enumerate system components. */ +struct ARCS_Component { + uint32_t Class; + uint32_t Type; + uint32_t Flags; + uint16_t Version; + uint16_t Revision; + uint32_t Key; + uint32_t AffinityMask; + uint32_t ConfigurationDataSize; + uint32_t IdentifierLength; + ARCS_Pointer_t Identifier; +} __packed; + /* * Firmware hooks. */ @@ -86,5 +110,6 @@ size_t ARCS_Read(int, char *, size_t); int ARCS_GetReadStatus(int); size_t ARCS_Write(int, const char *, size_t); +struct ARCS_Component *ARCS_GetChild(const struct ARCS_Component *); #endif /* _DEV_ARCS_ARCS_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Dec 28 13:27:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A47216A4D0; Sun, 28 Dec 2003 13:27:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60F1616A4CE for ; Sun, 28 Dec 2003 13:27:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 937D143D45 for ; Sun, 28 Dec 2003 13:27:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBSLRC0B056755 for ; Sun, 28 Dec 2003 13:27:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBSLRC9e056752 for perforce@freebsd.org; Sun, 28 Dec 2003 13:27:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 13:27:12 -0800 (PST) Message-Id: <200312282127.hBSLRC9e056752@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 44470 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2003 21:27:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=44470 Change 44470 by jmallett@jmallett_oingo on 2003/12/28 13:26:39 Previous submit removed need for opt_model here. Affected files ... .. //depot/projects/mips/sys/dev/arcs/arcs.c#3 edit Differences ... ==== //depot/projects/mips/sys/dev/arcs/arcs.c#3 (text+ko) ==== @@ -23,11 +23,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#2 $ + * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#3 $ */ -#include "opt_model.h" - #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Dec 28 23:59:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A95A16A4D0; Sun, 28 Dec 2003 23:59: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 E560C16A4CE for ; Sun, 28 Dec 2003 23:59:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 796BD43D5A for ; Sun, 28 Dec 2003 23:59:09 -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 hBT7x90B007362 for ; Sun, 28 Dec 2003 23:59:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBT7x9tG007359 for perforce@freebsd.org; Sun, 28 Dec 2003 23:59:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 28 Dec 2003 23:59:09 -0800 (PST) Message-Id: <200312290759.hBT7x9tG007359@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 44495 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, 29 Dec 2003 07:59:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=44495 Change 44495 by jmallett@jmallett_oingo on 2003/12/28 23:58:30 Shuffle some things, nuke some unused stuff... Affected files ... .. //depot/projects/mips/sys/mips/mips/db_trace.c#5 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/db_trace.c#5 (text+ko) ==== @@ -41,37 +41,6 @@ #include #include -int start(void); /* lowest kernel code address */ -vm_offset_t getreg_val(db_expr_t regno); - -#define REG_ARG(i) (4+i) -#define SAVES_RA(x) isa_spill((x),31) - -#define KERN_SAVE_REG_IDX(vp) ( \ - ((vp)->valuep >= (int *)(&((struct mips_saved_state *)0)->s0) && \ - (vp)->valuep <= (int *)(&((struct mips_saved_state *)0)->s7))? \ - vp->valuep - (int *)(&((struct mips_saved_state *)0)->s0): \ - ((vp)->valuep >= (int *)(&((struct mips_saved_state *)0)->sp) && \ - (vp)->valuep <= (int *)(&((struct mips_saved_state *)0)->ra))? \ - ((vp)->valuep-(int *)(&((struct mips_saved_state *)0)->sp)) + \ - ((int *)(&((struct mips_kernel_state *)0)->sp) - (int *)0): \ - -1) - -db_sym_t localsym(db_sym_t sym, boolean_t isreg, int *lex_level); - -/* - * Machine register set. - */ -struct mips_saved_state *db_cur_exc_frame = 0; - -/* - * Stack trace helper. - */ -void db_mips_stack_trace(int, vm_offset_t, vm_offset_t, vm_offset_t, int, vm_offset_t); -int db_mips_variable_func(const struct db_variable *, db_expr_t *, int); - -#define DBREGS_REG() - struct db_variable db_regs[] = { { "at", (db_expr_t *)&ddb_regs.f_regs[AST], FCN_NULL }, { "v0", (db_expr_t *)&ddb_regs.f_regs[V0], FCN_NULL }, @@ -137,6 +106,8 @@ ra = ddb_regs.f_regs[RA]; do { va = pc; + if (va <= (register_t)btext) + break; do { va -= sizeof(int); insn = *(int *)va; @@ -151,30 +122,50 @@ func = va; stacksize = 0; do { + if (va >= pc) + break; i.word = *(int *)va; - if (i.IType.op == OP_SW - && i.IType.rs == SP - && i.IType.rt == RA) + switch (i.IType.op) { + case OP_SW: + case OP_SD: + if (i.IType.rs != sp || i.IType.rt != RA) + break; ra = *(int *)(sp + (short)i.IType.imm); - if (i.IType.op == OP_ADDIU - && i.IType.rs == SP - && i.IType.rt == SP) + break; + case OP_ADDI: + case OP_ADDIU: + case OP_DADDI: + case OP_DADDIU: + if (i.IType.rs != SP || i.IType.rt != SP) + break; stacksize = -(short)i.IType.imm; + break; + default: + break; + } va += sizeof(int); } while (va < pc); db_find_sym_and_offset(func, &name, &offset); - if (name == 0) - name = "?"; - db_printf("%s()+0x%lx, called by %p, stack size %d\n", - name, (u_long)(pc - func), (void *)ra, stacksize); + if (name != NULL) + db_printf("%s()+0x%lx", name, (u_long)(pc - func)); + else + db_printf("%p", (void *)pc); + db_printf(" called by "); + db_find_sym_and_offset(ra, &name, &offset); + if (name != NULL) + db_printf("%s", name); + else + db_printf("%p", (void *)ra); + db_printf(" stack size %d\n", stacksize); - if (ra == pc) { + if (ra == pc && stacksize == 0) { db_printf("-- loop? --\n"); - return; + break; } + pc = ra; sp += stacksize; - pc = ra; + ra = 0; } while (pc > (register_t)btext); if (pc < 0x80000000) db_printf("-- user process --\n"); @@ -183,15 +174,6 @@ } void -db_mips_stack_trace(int count, vm_offset_t stackp, vm_offset_t the_pc, vm_offset_t the_ra, - int flags, vm_offset_t kstackp) -{ - - /* nothing... */ -} - - -void db_print_backtrace(void) { u_long *sp; From owner-p4-projects@FreeBSD.ORG Mon Dec 29 03:12:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9279F16A4D0; Mon, 29 Dec 2003 03:12:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37DC716A4CE for ; Mon, 29 Dec 2003 03:12:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10D6F43D1D for ; Mon, 29 Dec 2003 03:12:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBTBCB0B057299 for ; Mon, 29 Dec 2003 03:12:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBTBCBUb057290 for perforce@freebsd.org; Mon, 29 Dec 2003 03:12:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Mon, 29 Dec 2003 03:12:11 -0800 (PST) Message-Id: <200312291112.hBTBCBUb057290@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 44508 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, 29 Dec 2003 11:12:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=44508 Change 44508 by jmallett@jmallett_oingo on 2003/12/29 03:11:34 Quick sketch of bad things I intend to do to db_trace... I'd love to do it right instead, though ;) TODO soonly: Scroll back backwards and forwards through the code to try to try to find what value we're returning to. I think I can do this... Affected files ... .. //depot/projects/mips/sys/mips/mips/db_trace.c#6 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/db_trace.c#6 (text+ko) ==== @@ -84,93 +84,80 @@ extern char btext[]; +static register_t +db_stack_register_fetch(register_t sp, register_t stacksize, register_t r) +{ + if (sp == ddb_regs.f_regs[SP]) { + return (ddb_regs.f_regs[r]); + } else { + db_printf("\n*** don't know how to read registers from stack ***\n"); + return (0); + } +} + void db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif) { -/* - * Incomplete but practically useful stack backtrace. - */ -#define MIPS_JR_RA 0x03e00008 /* instruction code for jr ra */ -#define MIPS_JR_K0 0x03400008 /* instruction code for jr k0 */ -#define MIPS_ERET 0x42000018 /* instruction code for eret */ - register_t va, pc, ra, sp, func; - int insn; - InstFmt i; - int stacksize; - db_addr_t offset; - const char *name; + register_t sp, ra, pc, i, stacksize, func; + InstFmt insn; - pc = ddb_regs.f_regs[PC]; sp = ddb_regs.f_regs[SP]; ra = ddb_regs.f_regs[RA]; - do { - va = pc; - if (va <= (register_t)btext) + pc = ddb_regs.f_regs[PC]; + + for (;;) { + stacksize = 0; + if (pc <= (register_t)btext) break; - do { - va -= sizeof(int); - insn = *(int *)va; - if (insn == MIPS_ERET) - goto mips3_eret; - } while (insn != MIPS_JR_RA && insn != MIPS_JR_K0); - va += sizeof(int); - mips3_eret: - va += sizeof(int); - while (*(int *)va == 0x00000000) - va += sizeof(int); - func = va; - stacksize = 0; - do { - if (va >= pc) - break; - i.word = *(int *)va; - switch (i.IType.op) { - case OP_SW: - case OP_SD: - if (i.IType.rs != sp || i.IType.rt != RA) - break; - ra = *(int *)(sp + (short)i.IType.imm); - break; + db_printf("%p", (void *)pc); + for (i = pc; i >= (register_t)btext; i -= sizeof (insn)) { + bcopy((void *)i, &insn, sizeof insn); + switch (insn.IType.op) { case OP_ADDI: case OP_ADDIU: case OP_DADDI: case OP_DADDIU: - if (i.IType.rs != SP || i.IType.rt != SP) - break; - stacksize = -(short)i.IType.imm; + stacksize = -(short)insn.IType.imm; break; default: break; } - va += sizeof(int); - } while (va < pc); + if (stacksize) { + func = i; + break; + } + } + + db_printf(" in %p\n", (void *)func); - db_find_sym_and_offset(func, &name, &offset); - if (name != NULL) - db_printf("%s()+0x%lx", name, (u_long)(pc - func)); - else - db_printf("%p", (void *)pc); - db_printf(" called by "); - db_find_sym_and_offset(ra, &name, &offset); - if (name != NULL) - db_printf("%s", name); - else - db_printf("%p", (void *)ra); - db_printf(" stack size %d\n", stacksize); + sp += stacksize; - if (ra == pc && stacksize == 0) { - db_printf("-- loop? --\n"); + for (i = pc; !ra; i += sizeof (insn)) { + bcopy((void *)i, &insn, sizeof insn); + switch (insn.IType.op) { + case OP_JR: + case OP_JALR: + if (ra <= (register_t)btext) + break; + ra = db_stack_register_fetch(sp, stacksize, insn.RType.rs); + break; + default: + break; + } + if (insn.word == 0x42000018) { /* eret. */ + db_printf("--- exception handler ---\n"); + goto done; + } + } + if (pc == ra && stacksize == 0) { + db_printf("--- loop? ----\n"); break; } pc = ra; - sp += stacksize; ra = 0; - } while (pc > (register_t)btext); - if (pc < 0x80000000) - db_printf("-- user process --\n"); - else - db_printf("-- kernel entry --\n"); + } +done: return; } void From owner-p4-projects@FreeBSD.ORG Mon Dec 29 03:27:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62F2216A4D0; Mon, 29 Dec 2003 03:27: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 3DF9216A4CE for ; Mon, 29 Dec 2003 03:27:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CA6943D45 for ; Mon, 29 Dec 2003 03:27:31 -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 hBTBRU0B059681 for ; Mon, 29 Dec 2003 03:27:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBTBRU4t059678 for perforce@freebsd.org; Mon, 29 Dec 2003 03:27:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Mon, 29 Dec 2003 03:27:30 -0800 (PST) Message-Id: <200312291127.hBTBRU4t059678@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 44509 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, 29 Dec 2003 11:27:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=44509 Change 44509 by jmallett@jmallett_oingo on 2003/12/29 03:26:32 Use unsigned register_t where that's what I meant... How did I think register_t was unsigned for *so long*?! :( Fail if we can't read the return address from stack. Find the top of the function based on operating on sp, not on doing any *addi*. I think those lines got deleted accidentally on the way to the submit :( Affected files ... .. //depot/projects/mips/sys/mips/mips/db_trace.c#7 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/db_trace.c#7 (text+ko) ==== @@ -84,8 +84,8 @@ extern char btext[]; -static register_t -db_stack_register_fetch(register_t sp, register_t stacksize, register_t r) +static u_register_t +db_stack_register_fetch(u_register_t sp, u_register_t stacksize, u_register_t r) { if (sp == ddb_regs.f_regs[SP]) { return (ddb_regs.f_regs[r]); @@ -99,7 +99,7 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif) { - register_t sp, ra, pc, i, stacksize, func; + u_register_t sp, ra, pc, i, stacksize, func; InstFmt insn; sp = ddb_regs.f_regs[SP]; @@ -108,16 +108,18 @@ for (;;) { stacksize = 0; - if (pc <= (register_t)btext) + if (pc <= (u_register_t)btext) break; db_printf("%p", (void *)pc); - for (i = pc; i >= (register_t)btext; i -= sizeof (insn)) { + for (i = pc; i >= (u_register_t)btext; i -= sizeof (insn)) { bcopy((void *)i, &insn, sizeof insn); switch (insn.IType.op) { case OP_ADDI: case OP_ADDIU: case OP_DADDI: case OP_DADDIU: + if (insn.IType.rs != SP || insn.IType.rt != SP) + break; stacksize = -(short)insn.IType.imm; break; default: @@ -138,9 +140,11 @@ switch (insn.IType.op) { case OP_JR: case OP_JALR: - if (ra <= (register_t)btext) + if (ra >= (u_register_t)btext) break; ra = db_stack_register_fetch(sp, stacksize, insn.RType.rs); + if (!ra) + goto done; break; default: break; From owner-p4-projects@FreeBSD.ORG Mon Dec 29 12:55:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7B1A16A4D0; Mon, 29 Dec 2003 12:55:04 -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 B419016A4CE for ; Mon, 29 Dec 2003 12:55:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6238843D48 for ; Mon, 29 Dec 2003 12:55:03 -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 hBTKt30B002092 for ; Mon, 29 Dec 2003 12:55:03 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBTKt3nj002088 for perforce@freebsd.org; Mon, 29 Dec 2003 12:55:03 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 29 Dec 2003 12:55:03 -0800 (PST) Message-Id: <200312292055.hBTKt3nj002088@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 44524 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, 29 Dec 2003 20:55:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=44524 Change 44524 by jhb@jhb_blue on 2003/12/29 12:55:02 Add a notes file for this branch. Affected files ... .. //depot/projects/smpng/sys/notes#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 29 13:57:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5987116A4D0; Mon, 29 Dec 2003 13:57: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 F0BA816A4CE for ; Mon, 29 Dec 2003 13:57:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E18F43D39 for ; Mon, 29 Dec 2003 13:56:21 -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 hBTLuL0B015080 for ; Mon, 29 Dec 2003 13:56:21 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBTLuJY1015077 for perforce@freebsd.org; Mon, 29 Dec 2003 13:56:19 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 29 Dec 2003 13:56:19 -0800 (PST) Message-Id: <200312292156.hBTLuJY1015077@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 44528 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, 29 Dec 2003 21:57:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=44528 Change 44528 by jhb@jhb_blue on 2003/12/29 13:55:56 IFC @44525. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#8 integrate .. //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#12 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#30 integrate .. //depot/projects/smpng/sys/alpha/include/kse.h#2 delete .. //depot/projects/smpng/sys/alpha/linux/linux_proto.h#9 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#7 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#7 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#17 integrate .. //depot/projects/smpng/sys/alpha/linux/syscalls.conf#2 integrate .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#8 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#5 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#4 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysent.c#4 integrate .. //depot/projects/smpng/sys/alpha/osf1/syscalls.conf#2 integrate .. //depot/projects/smpng/sys/alpha/osf1/syscalls.master#4 integrate .. //depot/projects/smpng/sys/alpha/pci/apecs.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#13 integrate .. //depot/projects/smpng/sys/amd64/include/kse.h#2 delete .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#14 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#15 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#3 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#18 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#28 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#26 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#26 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#55 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#33 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_dma.h#7 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#26 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#8 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#13 integrate .. //depot/projects/smpng/sys/dev/idt/idt.c#6 integrate .. //depot/projects/smpng/sys/dev/idt/idt_harp.c#4 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#10 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#36 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#9 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#11 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#11 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#37 integrate .. //depot/projects/smpng/sys/dev/sio/sio_ebus.c#4 integrate .. //depot/projects/smpng/sys/dev/sio/sio_isa.c#13 integrate .. //depot/projects/smpng/sys/dev/sio/sio_puc.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#17 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#60 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#26 integrate .. //depot/projects/smpng/sys/dev/wi/if_wireg.h#20 integrate .. //depot/projects/smpng/sys/fs/msdosfs/bootsect.h#4 integrate .. //depot/projects/smpng/sys/fs/msdosfs/bpb.h#3 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/smpng/sys/fs/msdosfs/direntry.h#4 integrate .. //depot/projects/smpng/sys/fs/msdosfs/fat.h#4 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#7 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#14 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#7 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#25 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#22 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#7 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#54 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#46 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.h#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_sysent.c#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/smpng/sys/i386/include/kse.h#2 delete .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#13 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#12 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#13 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#36 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#12 integrate .. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#37 integrate .. //depot/projects/smpng/sys/ia64/include/kse.h#2 delete .. //depot/projects/smpng/sys/kern/imgact_elf.c#30 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#48 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#15 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#40 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#26 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#38 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#39 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#38 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#65 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#65 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#42 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#18 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#1 branch .. //depot/projects/smpng/sys/modules/cam/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/raidframe/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/sio/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ukbd/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf.c#30 integrate .. //depot/projects/smpng/sys/net/bpf.h#9 integrate .. //depot/projects/smpng/sys/net/bridge.c#22 integrate .. //depot/projects/smpng/sys/net/if.c#39 integrate .. //depot/projects/smpng/sys/net/if_disc.c#10 integrate .. //depot/projects/smpng/sys/net/if_ef.c#14 integrate .. //depot/projects/smpng/sys/net/if_faith.c#18 integrate .. //depot/projects/smpng/sys/net/if_gif.c#18 integrate .. //depot/projects/smpng/sys/net/if_gre.c#11 integrate .. //depot/projects/smpng/sys/net/if_loop.c#26 integrate .. //depot/projects/smpng/sys/net/if_stf.c#22 integrate .. //depot/projects/smpng/sys/net/if_tun.c#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#6 integrate .. //depot/projects/smpng/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#9 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#10 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#21 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#26 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#28 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#8 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#16 integrate .. //depot/projects/smpng/sys/netinet6/ip6_fw.c#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#16 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#27 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#34 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio_cbus.c#5 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#42 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#37 integrate .. //depot/projects/smpng/sys/pci/if_sisreg.h#11 integrate .. //depot/projects/smpng/sys/powerpc/include/kse.h#2 delete .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#31 integrate .. //depot/projects/smpng/sys/sparc64/include/kse.h#2 delete .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#27 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#38 integrate .. //depot/projects/smpng/sys/sys/_null.h#3 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#7 integrate .. //depot/projects/smpng/sys/sys/kse.h#15 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#31 integrate .. //depot/projects/smpng/sys/sys/sf_buf.h#2 integrate .. //depot/projects/smpng/sys/sys/socket.h#15 integrate .. //depot/projects/smpng/sys/sys/syscall.h#39 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#39 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#41 integrate .. //depot/projects/smpng/sys/sys/systm.h#46 integrate .. //depot/projects/smpng/sys/sys/uio.h#13 integrate .. //depot/projects/smpng/sys/sys/umtx.h#3 integrate .. //depot/projects/smpng/sys/sys/vnode.h#40 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#37 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#31 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#22 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#51 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.16 2003/11/29 11:57:02 jeff Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -99,7 +99,7 @@ { (uintptr_t)&XentSys, "syscall" }, { (uintptr_t)&XentUna, "unaligned access fault" }, { (uintptr_t)&XentRestart, "console restart" }, - { NULL } + { 0, NULL } }; @@ -180,7 +180,7 @@ { int i; - for (i = 0; special_symbols[i].ss_val != NULL; ++i) + for (i = 0; special_symbols[i].ss_val != 0; ++i) if (v == special_symbols[i].ss_val) return 1; return 0; @@ -339,7 +339,7 @@ if (sym_is_trapsymbol(symval)) { tf = (struct trapframe *)frame; - for (i = 0; special_symbols[i].ss_val != NULL; ++i) + for (i = 0; special_symbols[i].ss_val != 0; ++i) if (symval == special_symbols[i].ss_val) db_printf("--- %s", special_symbols[i].ss_note); ==== //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.5 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.6 2003/12/23 02:36:41 peter Exp $"); #include #include @@ -88,7 +88,7 @@ dumplo = di->mediaoffset + di->mediasize - Maxmem * (off_t)PAGE_SIZE; dumplo -= sizeof kdh * 2; - i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh); + i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh); if (i) printf("\nDump failed writing header (%d)\n", i); dumplo += sizeof kdh; @@ -111,7 +111,7 @@ printf(" %d", count / (1024 * 1024 / PAGE_SIZE)); mb = i; } - i = di->dumper(di->priv, va, NULL, dumplo, left * PAGE_SIZE); + i = di->dumper(di->priv, va, 0, dumplo, left * PAGE_SIZE); if (i) break; count += left; @@ -120,10 +120,10 @@ } if (i) printf("\nDump failed writing data (%d)\n", i); - i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh); + i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh); if (i) printf("\nDump failed writing trailer (%d)\n", i); - di->dumper(di->priv, NULL, NULL, 0, 0); /* tell them we are done */ + di->dumper(di->priv, NULL, 0, 0, 0); /* tell them we are done */ printf("\nDump complete\n"); return; } ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.16 2003/09/25 01:10:22 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.17 2003/12/23 02:42:38 peter Exp $"); #include #include @@ -81,15 +81,31 @@ ELFOSABI_FREEBSD, EM_ALPHA, "FreeBSD", - "", + NULL, "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec + &elf64_freebsd_sysvec, + NULL, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); +static Elf64_Brandinfo freebsd_brand_oinfo = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + NULL, + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec, + NULL, + }; + +SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_oinfo); + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#30 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.96 2003/11/16 23:40:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.99 2003/12/28 08:57:08 silby Exp $"); #include "opt_kstack_pages.h" @@ -415,6 +415,7 @@ mtx_lock(&sf_freelist.sf_lock); while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { sf_buf_alloc_want++; + mbstat.sf_allocwait++; error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, "sfbufa", 0); sf_buf_alloc_want--; @@ -428,6 +429,8 @@ if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; + nsfbufsused++; + nsfbufspeak = imax(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); @@ -457,6 +460,7 @@ sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + nsfbufsused--; if (sf_buf_alloc_want > 0) wakeup_one(&sf_freelist); mtx_unlock(&sf_freelist.sf_lock); ==== //depot/projects/smpng/sys/alpha/linux/linux_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.13 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.14 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.11 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.12 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.11 2003/11/07 21:13:08 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.12 2003/12/23 03:53:50 peter Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.91 2003/09/25 01:10:22 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.92 2003/12/23 02:42:38 peter Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -204,7 +204,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.1", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; static Elf64_Brandinfo linux_glibc2brand = { @@ -213,7 +214,8 @@ "Linux", "/compat/linux", "/lib/ld-linux.so.2", - &elf_linux_sysvec + &elf_linux_sysvec, + NULL, }; Elf64_Brandinfo *linux_brandlist[] = { ==== //depot/projects/smpng/sys/alpha/linux/syscalls.conf#2 (text+ko) ==== @@ -1,11 +1,10 @@ -# $FreeBSD: src/sys/alpha/linux/syscalls.conf,v 1.5 1999/08/28 00:45:25 peter Exp $ +# $FreeBSD: src/sys/alpha/linux/syscalls.conf,v 1.6 2003/12/24 00:32:07 peter Exp $ sysnames="/dev/null" sysproto="linux_proto.h" sysproto_h=_LINUX_SYSPROTO_H_ syshdr="linux_syscall.h" syssw="linux_sysent.c" sysmk="/dev/null" -syshide="/dev/null" syscallprefix="LINUX_SYS_" switchname="linux_sysent" namesname="linux_syscallnames" ==== //depot/projects/smpng/sys/alpha/linux/syscalls.master#8 (text+ko) ==== @@ -1,14 +1,13 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.53 2003/11/07 21:09:19 jhb Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.54 2003/12/23 03:53:21 peter Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to created linux_sysent.c, linux_syscalls.c and linux_syscall.h. -; Columns: number type nargs namespc name alt{name,tag,rtyp}/comments +; Columns: number type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, ; NODEF, NOARGS, NOPROTO -; namespc one of POSIX, BSD, STD, NOHIDE (I dont care :-) -Peter ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -37,467 +36,426 @@ ; #ifdef's, etc. may be included, and are copied to the output files. -0 UNIMPL LINUX -1 MNOPROTO LINUX { void sys_exit(int rval); } exit sys_exit_args void -2 MSTD LINUX { int linux_fork(void); } -3 MNOPROTO LINUX { int read(int fd, char *buf, u_int nbyte); } -4 MNOPROTO LINUX { int write(int fd, char *buf, u_int nbyte); } -5 UNIMPL LINUX -6 MNOPROTO LINUX { int close(int fd); } -7 STD OSF1 { int osf1_wait4(int pid, int *status, int options, \ +0 UNIMPL +1 MNOPROTO { void sys_exit(int rval); } exit sys_exit_args void +2 MSTD { int linux_fork(void); } +3 MNOPROTO { int read(int fd, char *buf, u_int nbyte); } +4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); } +5 UNIMPL +6 MNOPROTO { int close(int fd); } +7 STD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } -8 UNIMPL LINUX -9 STD LINUX { int linux_link(char *path, char *to); } -10 STD LINUX { int linux_unlink(char *path); } -11 UNIMPL LINUX -12 STD LINUX { int linux_chdir(char *path); } -13 NOPROTO LINUX { int fchdir(int fd); } -14 STD LINUX { int linux_mknod(char *path, l_int mode, \ - l_dev_t dev); } -15 STD LINUX { int linux_chmod(char *path, l_mode_t mode); } -16 STD LINUX { int linux_chown(char *path, l_uid_t uid, \ - l_gid_t gid); } -17 STD OSF1 { int linux_brk(l_ulong dsend); } -18 UNIMPL LINUX -19 STD LINUX { int linux_lseek(l_uint fdes, l_off_t off, \ - l_int whence); } -20 NOPROTO BSD { int getpid(void); } -21 UNIMPL OSF1 osf1_mount -22 STD LINUX { int linux_umount(char *path, l_int flags); } -23 MNOPROTO LINUX { int setuid(uid_t uid); } -24 MNOPROTO BSD { int getuid(void); } -25 UNIMPL LINUX -26 MSTD LINUX { int linux_ptrace(void); } -27 UNIMPL LINUX -28 UNIMPL LINUX -29 UNIMPL LINUX -30 UNIMPL LINUX -31 UNIMPL LINUX -32 UNIMPL LINUX -33 STD LINUX { int linux_access(char *path, l_int flags); } -34 UNIMPL LINUX -35 UNIMPL LINUX -36 NOPROTO LINUX { int sync(void); } -37 MSTD LINUX { int linux_kill(l_int pid, l_int signum); } -38 UNIMPL LINUX -39 MNOPROTO LINUX { int setpgid(int pid, int pgid); } -40 UNIMPL LINUX -41 MNOPROTO LINUX { int dup(u_int fd); } -42 MNOPROTO BSD { int pipe(void); } -43 UNIMPL OSF1 osf_set_program_attributes -44 UNIMPL LINUX -45 STD LINUX { int linux_open(char *path, l_int flags, \ - l_int mode); } -46 UNIMPL LINUX -47 MNOPROTO BSD { int getgid(void); } -48 MSTD OSF1 { int osf1_sigprocmask(int how, u_long mask); } -49 UNIMPL LINUX -50 UNIMPL LINUX -51 NOPROTO LINUX { int acct(char *path); } -52 MSTD LINUX { int linux_sigpending(void); } -53 UNIMPL LINUX -54 STD LINUX { int linux_ioctl(l_uint fd, l_uint cmd, \ - l_ulong arg); } -55 UNIMPL LINUX -56 UNIMPL LINUX -57 STD LINUX { int linux_symlink(char *path, char *to); } -58 STD LINUX { int linux_readlink(char *name, char *buf, \ - l_int count); } -59 STD LINUX { int linux_execve(char *path, char **argp, \ - char **envp); } -60 MNOPROTO LINUX { int umask(int newmask); } -61 NOPROTO LINUX { int chroot(char *path); } -62 UNIMPL LINUX -63 MNOPROTO LINUX { int getpgrp(void); } -64 STD LINUX { int linux_getpagesize(void); } -65 UNIMPL LINUX -66 MSTD LINUX { int linux_vfork(void); } -67 STD LINUX { int linux_newstat(char *path, \ - struct l_newstat *buf); } -68 STD LINUX { int linux_newlstat(char *path, \ - struct l_newstat *buf); } -69 UNIMPL LINUX -70 UNIMPL LINUX -71 STD OSF1 { int linux_mmap(l_ulong addr, l_ulong len, \ - l_ulong prot, l_ulong flags, l_ulong fd, \ - l_ulong pos); } -72 UNIMPL LINUX -73 STD LINUX { int linux_munmap(l_ulong addr, l_size_t len); } -74 STD LINUX { int linux_mprotect(l_ulong addr, l_size_t len, \ +8 UNIMPL +9 STD { int linux_link(char *path, char *to); } +10 STD { int linux_unlink(char *path); } +11 UNIMPL +12 STD { int linux_chdir(char *path); } +13 NOPROTO { int fchdir(int fd); } +14 STD { int linux_mknod(char *path, l_int mode, l_dev_t dev); } +15 STD { int linux_chmod(char *path, l_mode_t mode); } +16 STD { int linux_chown(char *path, l_uid_t uid, l_gid_t gid); } +17 STD { int linux_brk(l_ulong dsend); } +18 UNIMPL +19 STD { int linux_lseek(l_uint fdes, l_off_t off, l_int whence); } +20 NOPROTO { int getpid(void); } +21 UNIMPL osf1_mount +22 STD { int linux_umount(char *path, l_int flags); } +23 MNOPROTO { int setuid(uid_t uid); } +24 MNOPROTO { int getuid(void); } +25 UNIMPL +26 MSTD { int linux_ptrace(void); } +27 UNIMPL +28 UNIMPL +29 UNIMPL +30 UNIMPL +31 UNIMPL +32 UNIMPL +33 STD { int linux_access(char *path, l_int flags); } +34 UNIMPL +35 UNIMPL +36 NOPROTO { int sync(void); } +37 MSTD { int linux_kill(l_int pid, l_int signum); } +38 UNIMPL +39 MNOPROTO { int setpgid(int pid, int pgid); } +40 UNIMPL +41 MNOPROTO { int dup(u_int fd); } +42 MNOPROTO { int pipe(void); } +43 UNIMPL osf_set_program_attributes +44 UNIMPL +45 STD { int linux_open(char *path, l_int flags, l_int mode); } +46 UNIMPL +47 MNOPROTO { int getgid(void); } +48 MSTD { int osf1_sigprocmask(int how, u_long mask); } +49 UNIMPL +50 UNIMPL +51 NOPROTO { int acct(char *path); } +52 MSTD { int linux_sigpending(void); } +53 UNIMPL +54 STD { int linux_ioctl(l_uint fd, l_uint cmd, l_ulong arg); } +55 UNIMPL +56 UNIMPL +57 STD { int linux_symlink(char *path, char *to); } +58 STD { int linux_readlink(char *name, char *buf, l_int count); } +59 STD { int linux_execve(char *path, char **argp, char **envp); } +60 MNOPROTO { int umask(int newmask); } +61 NOPROTO { int chroot(char *path); } +62 UNIMPL +63 MNOPROTO { int getpgrp(void); } +64 STD { int linux_getpagesize(void); } +65 UNIMPL +66 MSTD { int linux_vfork(void); } +67 STD { int linux_newstat(char *path, struct l_newstat *buf); } +68 STD { int linux_newlstat(char *path, struct l_newstat *buf); } +69 UNIMPL +70 UNIMPL +71 STD { int linux_mmap(l_ulong addr, l_ulong len, l_ulong prot, \ + l_ulong flags, l_ulong fd, l_ulong pos); } +72 UNIMPL +73 STD { int linux_munmap(l_ulong addr, l_size_t len); } +74 STD { int linux_mprotect(l_ulong addr, l_size_t len, \ l_ulong prot); } -75 STD LINUX { int linux_madvise(void); } -76 STD LINUX { int linux_vhangup(void); } -77 UNIMPL LINUX -78 UNIMPL LINUX -79 MSTD LINUX { int linux_setgroups(l_int gidsetsize, \ - l_gid_t *grouplist); } -80 MSTD LINUX { int linux_getgroups(l_int gidsetsize, \ - l_gid_t *grouplist); } -81 UNIMPL LINUX -82 MNODEF LINUX setpgid setpgid setpgid_args int -83 STD OSF1 { int osf1_setitimer(u_int which, \ - struct itimerval *itv, \ +75 STD { int linux_madvise(void); } +76 STD { int linux_vhangup(void); } +77 UNIMPL +78 UNIMPL +79 MSTD { int linux_setgroups(l_int gidsetsize, l_gid_t *grouplist); } +80 MSTD { int linux_getgroups(l_int gidsetsize, l_gid_t *grouplist); } +81 UNIMPL +82 MNODEF setpgid setpgid setpgid_args int +83 STD { int osf1_setitimer(u_int which, struct itimerval *itv, \ struct itimerval *oitv); } -84 UNIMPL LINUX -85 UNIMPL LINUX -86 UNIMPL OSF1 osf_getitimer -87 STD LINUX { int linux_gethostname(void); } -88 MNOPROTO LINUX { int osethostname(char *hostname, u_int len); } \ +84 UNIMPL +85 UNIMPL +86 UNIMPL osf_getitimer +87 STD { int linux_gethostname(void); } +88 MNOPROTO { int osethostname(char *hostname, u_int len); } \ osethostname sethostname_args int -89 STD LINUX { int linux_getdtablesize(void); } -90 MNOPROTO LINUX { int dup2(u_int from, u_int to); } -91 STD LINUX { int linux_newfstat(l_uint fd, \ - struct l_newstat *buf); } -92 STD LINUX { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } -93 STD OSF1 { int osf1_select(u_int nd, fd_set *in, fd_set *ou, \ +89 STD { int linux_getdtablesize(void); } +90 MNOPROTO { int dup2(u_int from, u_int to); } +91 STD { int linux_newfstat(l_uint fd, struct l_newstat *buf); } +92 STD { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } +93 STD { int osf1_select(u_int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval *tv); } -94 NOPROTO LINUX { int poll(struct pollfd*, unsigned int nfds, \ - long timeout); } -95 NOPROTO LINUX { int fsync(int fd); } -96 MNOPROTO LINUX { int setpriority(int which, int who, int prio); } -97 STD LINUX { int osf1_socket(int domain, int type, \ - int protocol); } -98 STD LINUX { int linux_connect(l_int s, struct l_sockaddr *name, \ +94 NOPROTO { int poll(struct pollfd*, unsigned int nfds, long timeout); } +95 NOPROTO { int fsync(int fd); } +96 MNOPROTO { int setpriority(int which, int who, int prio); } +97 STD { int osf1_socket(int domain, int type, int protocol); } +98 STD { int linux_connect(l_int s, struct l_sockaddr *name, \ l_int namelen); } -99 NOPROTO LINUX { int oaccept(int s, caddr_t name, int *anamelen); } \ +99 NOPROTO { int oaccept(int s, caddr_t name, int *anamelen); } \ accept accept_args int -100 UNIMPL OSF1 osf_getpriority -101 NOPROTO LINUX { int osend(int s, caddr_t buf, int len, int flags); } -102 NOPROTO LINUX { int orecv(int s, caddr_t buf, int len, int flags); } -103 MSTD LINUX { int osf1_sigreturn(struct osigcontext *sigcntxp); } -104 NOPROTO LINUX { int bind(int s, caddr_t name, int namelen); } -105 NOPROTO LINUX { int setsockopt(int s, int level, int name, \ - caddr_t val, int valsize); } -106 NOPROTO LINUX { int listen(int s, int backlog); } -107 UNIMPL LINUX -108 UNIMPL LINUX -109 UNIMPL LINUX -110 UNIMPL LINUX -111 MSTD LINUX { int osf1_sigsuspend(unsigned long ss); } -112 UNIMPL OSF1 osf_sigstack -113 STD LINUX { int linux_recvmsg(void); } -114 STD LINUX { int linux_sendmsg(void); } -115 UNIMPL LINUX -116 MSTD OSF1 { int osf1_gettimeofday(struct timeval *tp, \ +100 UNIMPL osf_getpriority +101 NOPROTO { int osend(int s, caddr_t buf, int len, int flags); } +102 NOPROTO { int orecv(int s, caddr_t buf, int len, int flags); } +103 MSTD { int osf1_sigreturn(struct osigcontext *sigcntxp); } +104 NOPROTO { int bind(int s, caddr_t name, int namelen); } +105 NOPROTO { int setsockopt(int s, int level, int name, caddr_t val, \ + int valsize); } +106 NOPROTO { int listen(int s, int backlog); } +107 UNIMPL +108 UNIMPL +109 UNIMPL +110 UNIMPL +111 MSTD { int osf1_sigsuspend(unsigned long ss); } +112 UNIMPL osf_sigstack +113 STD { int linux_recvmsg(void); } +114 STD { int linux_sendmsg(void); } +115 UNIMPL +116 MSTD { int osf1_gettimeofday(struct timeval *tp, \ struct timezone *tzp); } -117 STD OSF1 { int osf1_getrusage(long who, void *rusage); } -118 NOPROTO LINUX { int getsockopt(int s, int level, int name, \ - caddr_t val, int *avalsize); } -119 UNIMPL LINUX -120 NOPROTO LINUX { int readv(int fd, struct iovec *iovp, \ - u_int iovcnt); } -121 NOPROTO LINUX { int writev(int fd, struct iovec *iovp, \ - u_int iovcnt); } -122 UNIMPL OSF1 osf_settimeofday -123 NOPROTO LINUX { int fchown(int fd, int uid, int gid); } -124 NOPROTO LINUX { int fchmod(int fd, int mode); } -125 NOPROTO LINUX { int orecvfrom(int s, caddr_t buf, size_t len, \ - int flags, caddr_t from, int *fromlenaddr); } \ +117 STD { int osf1_getrusage(long who, void *rusage); } +118 NOPROTO { int getsockopt(int s, int level, int name, caddr_t val, \ + int *avalsize); } +119 UNIMPL +120 NOPROTO { int readv(int fd, struct iovec *iovp, u_int iovcnt); } +121 NOPROTO { int writev(int fd, struct iovec *iovp, u_int iovcnt); } +122 UNIMPL osf_settimeofday +123 NOPROTO { int fchown(int fd, int uid, int gid); } +124 NOPROTO { int fchmod(int fd, int mode); } +125 NOPROTO { int orecvfrom(int s, caddr_t buf, size_t len, int flags, \ + caddr_t from, int *fromlenaddr); } \ recvfrom recvfrom_args int -126 MNOPROTO LINUX { int setreuid(int ruid, int euid); } -127 MNOPROTO LINUX { int setregid(int rgid, int egid); } -128 STD LINUX { int linux_rename(char *from, char *to); } -129 STD LINUX { int linux_truncate(char *path, l_ulong length); } -130 NOPROTO LINUX { int oftruncate(int fd, long length); } -131 NOPROTO LINUX { int flock(int fd, int how); } -132 MNOPROTO LINUX { int setgid(gid_t gid); } -133 STD LINUX { int osf1_sendto(int s, caddr_t buf, size_t len, \ - int flags, struct sockaddr *to, int tolen); } -134 NOPROTO LINUX { int shutdown(int s, int how); } -135 STD LINUX { int linux_socketpair(void); } -136 STD LINUX { int linux_mkdir(char *path, l_int mode); } -137 STD LINUX { int linux_rmdir(char *path); } -138 NOPROTO OSF1 { int utimes(char *path, struct timeval *tptr); } -139 UNIMPL LINUX -140 UNIMPL LINUX -141 NOPROTO LINUX { int ogetpeername(int fdes, caddr_t asa, int *alen); } -142 UNIMPL LINUX -143 UNIMPL LINUX -144 STD LINUX { int linux_getrlimit(l_uint resource, \ +126 MNOPROTO { int setreuid(int ruid, int euid); } +127 MNOPROTO { int setregid(int rgid, int egid); } +128 STD { int linux_rename(char *from, char *to); } +129 STD { int linux_truncate(char *path, l_ulong length); } +130 NOPROTO { int oftruncate(int fd, long length); } +131 NOPROTO { int flock(int fd, int how); } +132 MNOPROTO { int setgid(gid_t gid); } +133 STD { int osf1_sendto(int s, caddr_t buf, size_t len, int flags, \ + struct sockaddr *to, int tolen); } +134 NOPROTO { int shutdown(int s, int how); } +135 STD { int linux_socketpair(void); } +136 STD { int linux_mkdir(char *path, l_int mode); } +137 STD { int linux_rmdir(char *path); } +138 NOPROTO { int utimes(char *path, struct timeval *tptr); } +139 UNIMPL +140 UNIMPL +141 NOPROTO { int ogetpeername(int fdes, caddr_t asa, int *alen); } +142 UNIMPL +143 UNIMPL +144 STD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -145 STD LINUX { int linux_setrlimit(l_uint resource, \ +145 STD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } -146 UNIMPL LINUX -147 MNOPROTO LINUX { int setsid(void); } -148 STD LINUX { int linux_quotactl(void); } -149 UNIMPL LINUX -150 NOPROTO LINUX { int ogetsockname(int fdec, caddr_t asa, int *alen);} \ +146 UNIMPL +147 MNOPROTO { int setsid(void); } +148 STD { int linux_quotactl(void); } +149 UNIMPL +150 NOPROTO { int ogetsockname(int fdec, caddr_t asa, int *alen);} \ getsockname getsockname_args int -151 UNIMPL LINUX -152 UNIMPL LINUX -153 UNIMPL LINUX -154 UNIMPL LINUX -155 UNIMPL LINUX -156 MSTD OSF1 { int osf1_sigaction(int sig, \ - struct osf1_sigaction *nsa, \ +151 UNIMPL +152 UNIMPL +153 UNIMPL +154 UNIMPL +155 UNIMPL +156 MSTD { int osf1_sigaction(int sig, struct osf1_sigaction *nsa, \ struct osf1_sigaction *osa); } -157 UNIMPL LINUX -158 UNIMPL LINUX -159 UNIMPL OSF1 osf_getdirentries -160 UNIMPL OSF1 osf_statfs -161 UNIMPL OSF1 osf_fstatfs -162 UNIMPL LINUX -163 UNIMPL LINUX -164 UNIMPL LINUX -165 UNIMPL OSF1 osf_getdomainname -166 MNOPROTO LINUX { int setdomainname(char *name, int len); } -167 UNIMPL LINUX -168 UNIMPL LINUX -169 UNIMPL LINUX -170 UNIMPL LINUX -171 UNIMPL LINUX -172 UNIMPL LINUX -173 UNIMPL LINUX -174 UNIMPL LINUX -175 UNIMPL LINUX -176 UNIMPL LINUX -177 UNIMPL LINUX -178 UNIMPL LINUX -179 UNIMPL LINUX -180 UNIMPL LINUX -181 UNIMPL LINUX -182 UNIMPL LINUX -183 UNIMPL LINUX -184 UNIMPL LINUX -185 UNIMPL LINUX -186 UNIMPL LINUX -187 UNIMPL LINUX -188 UNIMPL LINUX -189 UNIMPL LINUX -190 UNIMPL LINUX -191 UNIMPL LINUX -192 UNIMPL LINUX -193 UNIMPL LINUX -194 UNIMPL LINUX -195 UNIMPL LINUX -196 UNIMPL LINUX -197 UNIMPL LINUX -198 UNIMPL LINUX -199 UNIMPL OSF1 osf_swapon -200 STD LINUX { int linux_msgctl(l_int msqid, l_int cmd, \ +157 UNIMPL +158 UNIMPL +159 UNIMPL osf_getdirentries +160 UNIMPL osf_statfs +161 UNIMPL osf_fstatfs +162 UNIMPL +163 UNIMPL +164 UNIMPL +165 UNIMPL osf_getdomainname +166 MNOPROTO { int setdomainname(char *name, int len); } +167 UNIMPL +168 UNIMPL +169 UNIMPL +170 UNIMPL +171 UNIMPL +172 UNIMPL +173 UNIMPL +174 UNIMPL +175 UNIMPL +176 UNIMPL +177 UNIMPL +178 UNIMPL +179 UNIMPL +180 UNIMPL +181 UNIMPL +182 UNIMPL +183 UNIMPL +184 UNIMPL +185 UNIMPL +186 UNIMPL +187 UNIMPL +188 UNIMPL +189 UNIMPL +190 UNIMPL +191 UNIMPL +192 UNIMPL +193 UNIMPL +194 UNIMPL +195 UNIMPL +196 UNIMPL +197 UNIMPL +198 UNIMPL +199 UNIMPL osf_swapon +200 STD { int linux_msgctl(l_int msqid, l_int cmd, \ struct l_msqid_ds *buf); } -201 STD LINUX { int linux_msgget(l_key_t key, l_int msgflg); } -202 STD LINUX { int linux_msgrcv(l_int msqid, struct l_msgbuf *msgp, \ +201 STD { int linux_msgget(l_key_t key, l_int msgflg); } +202 STD { int linux_msgrcv(l_int msqid, struct l_msgbuf *msgp, \ l_size_t msgsz, l_long msgtyp, l_int msgflg); } -203 STD LINUX { int linux_msgsnd(l_int msqid, struct l_msgbuf *msgp, \ +203 STD { int linux_msgsnd(l_int msqid, struct l_msgbuf *msgp, \ l_size_t msgsz, l_int msgflg); } -204 STD LINUX { int linux_semctl(l_int semid, l_int semnum, \ +204 STD { int linux_semctl(l_int semid, l_int semnum, \ l_int cmd, union l_semun arg); } -205 STD LINUX { int linux_semget(l_key_t key, l_int nsems, \ +205 STD { int linux_semget(l_key_t key, l_int nsems, \ l_int semflg); } -206 STD LINUX { int linux_semop(l_int semid, struct l_sembuf *tsops, \ +206 STD { int linux_semop(l_int semid, struct l_sembuf *tsops, \ l_uint nsops); } -207 UNIMPL OSF1 osf_utsname -208 STD LINUX { int linux_lchown(char *path, l_uid_t uid, \ - l_gid_t gid); } -209 STD OSF1 { int linux_shmat(l_int shmid, char *shmaddr, \ - l_int shmflg); } -210 STD LINUX { int linux_shmctl(l_int shmid, l_int cmd, \ +207 UNIMPL osf_utsname +208 STD { int linux_lchown(char *path, l_uid_t uid, l_gid_t gid); } +209 STD { int linux_shmat(l_int shmid, char *shmaddr, l_int shmflg); } +210 STD { int linux_shmctl(l_int shmid, l_int cmd, \ struct l_shmid_ds *buf); } -211 STD LINUX { int linux_shmdt(char *shmaddr); } -212 STD LINUX { int linux_shmget(l_key_t key, l_size_t size, \ - l_int shmflg); } -213 UNIMPL LINUX -214 UNIMPL LINUX -215 UNIMPL LINUX -216 UNIMPL LINUX -217 STD LINUX { int linux_msync(l_ulong addr, l_size_t len, \ - l_int fl); } -218 UNIMPL LINUX -219 UNIMPL LINUX -220 UNIMPL LINUX -221 UNIMPL LINUX -222 UNIMPL LINUX -223 UNIMPL LINUX -224 UNIMPL LINUX -225 UNIMPL LINUX -226 UNIMPL LINUX -227 UNIMPL LINUX -228 UNIMPL LINUX -229 UNIMPL LINUX -230 UNIMPL LINUX -231 UNIMPL LINUX -232 UNIMPL LINUX -233 MNOPROTO LINUX { int getpgid(int pid); } -234 MSTD LINUX { int linux_getsid(l_pid_t pid); } -235 STD LINUX { int linux_sigaltstack(void); } -236 UNIMPL LINUX -237 UNIMPL LINUX -238 UNIMPL LINUX >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 30 08:58:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20CEB16A4D0; Tue, 30 Dec 2003 08:58:45 -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 E859716A4CE for ; Tue, 30 Dec 2003 08:58:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E7B343D49 for ; Tue, 30 Dec 2003 08:58:41 -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 hBUGwf0B092761 for ; Tue, 30 Dec 2003 08:58:41 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBUGweX7092758 for perforce@freebsd.org; Tue, 30 Dec 2003 08:58:40 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 30 Dec 2003 08:58:40 -0800 (PST) Message-Id: <200312301658.hBUGweX7092758@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 44557 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, 30 Dec 2003 16:58:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=44557 Change 44557 by sam@sam_ebb on 2003/12/30 08:57:57 IFC @ 44556 Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#9 integrate .. //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#11 integrate .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/netperf/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/netperf/sys/conf/kern.post.mk#6 integrate .. //depot/projects/netperf/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/netperf/sys/conf/options.i386#9 integrate .. //depot/projects/netperf/sys/conf/options.pc98#6 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#12 integrate .. //depot/projects/netperf/sys/dev/an/if_aironet_ieee.h#4 integrate .. //depot/projects/netperf/sys/dev/an/if_an.c#7 integrate .. //depot/projects/netperf/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/netperf/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/netperf/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/an/if_anreg.h#6 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath.c#54 integrate .. //depot/projects/netperf/sys/dev/ath/if_athioctl.h#10 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/netperf/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/netperf/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi.c#21 integrate .. //depot/projects/netperf/sys/dev/wi/if_wireg.h#7 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/netperf/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/netperf/sys/i386/conf/NOTES#12 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#26 integrate .. //depot/projects/netperf/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/netperf/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#11 integrate .. //depot/projects/netperf/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/netperf/sys/kern/kern_exec.c#10 integrate .. //depot/projects/netperf/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/netperf/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/netperf/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/netperf/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/cam/Makefile#3 integrate .. //depot/projects/netperf/sys/modules/raidframe/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/sio/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/netperf/sys/net/bpf.c#12 integrate .. //depot/projects/netperf/sys/net/bpf.h#5 integrate .. //depot/projects/netperf/sys/net/if_disc.c#7 integrate .. //depot/projects/netperf/sys/net/if_ef.c#7 integrate .. //depot/projects/netperf/sys/net/if_faith.c#10 integrate .. //depot/projects/netperf/sys/net/if_gif.c#4 integrate .. //depot/projects/netperf/sys/net/if_gre.c#6 integrate .. //depot/projects/netperf/sys/net/if_gre.h#2 integrate .. //depot/projects/netperf/sys/net/if_loop.c#16 integrate .. //depot/projects/netperf/sys/net/if_stf.c#7 integrate .. //depot/projects/netperf/sys/net/if_tun.c#7 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_radiotap.h#7 integrate .. //depot/projects/netperf/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/netperf/sys/netinet/in.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/netperf/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/netperf/sys/pc98/pc98/sio_cbus.c#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/vm_machdep.c#7 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/netperf/sys/sys/mbuf.h#11 integrate .. //depot/projects/netperf/sys/sys/sf_buf.h#2 integrate .. //depot/projects/netperf/sys/sys/vnode.h#7 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#13 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#9 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.97 2003/12/27 07:52:46 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.99 2003/12/28 08:57:08 silby Exp $"); #include "opt_kstack_pages.h" @@ -116,7 +116,6 @@ } sf_freelist; static u_int sf_buf_alloc_want; -extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -416,6 +415,7 @@ mtx_lock(&sf_freelist.sf_lock); while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { sf_buf_alloc_want++; + mbstat.sf_allocwait++; error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, "sfbufa", 0); sf_buf_alloc_want--; @@ -430,7 +430,7 @@ SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; nsfbufsused++; - nsfbufspeak = max(nsfbufspeak, nsfbufsused); + nsfbufspeak = imax(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); ==== //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#11 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.225 2003/12/27 07:52:46 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.227 2003/12/28 08:57:08 silby Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -99,7 +99,6 @@ } sf_freelist; static u_int sf_buf_alloc_want; -extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -461,6 +460,7 @@ mtx_lock(&sf_freelist.sf_lock); while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { sf_buf_alloc_want++; + mbstat.sf_allocwait++; error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, "sfbufa", 0); sf_buf_alloc_want--; @@ -475,7 +475,7 @@ SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; nsfbufsused++; - nsfbufspeak = max(nsfbufspeak, nsfbufsused); + nsfbufspeak = imax(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); ==== //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.15 2003/12/26 07:01:05 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.16 2003/12/29 23:51:58 wpaul Exp $"); #include #include @@ -397,9 +397,13 @@ ndis_resource_list *rl = NULL; cm_partial_resource_desc *prd = NULL; ndis_miniport_block *block; + device_t dev; + struct resource_list *brl; + struct resource_list_entry *brle; sc = arg; block = &sc->ndis_block; + dev = sc->ndis_dev; rl = malloc(sizeof(ndis_resource_list) + (sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1)), @@ -411,33 +415,35 @@ rl->cprl_version = 5; rl->cprl_version = 1; rl->cprl_count = sc->ndis_rescnt; - prd = rl->cprl_partial_descs; - if (sc->ndis_res_io) { - prd->cprd_type = CmResourceTypePort; - prd->u.cprd_port.cprd_start.np_quad = - rman_get_start(sc->ndis_res_io); - prd->u.cprd_port.cprd_len = - rman_get_size(sc->ndis_res_io); - prd++; - } - if (sc->ndis_res_mem) { - prd->cprd_type = CmResourceTypeMemory; - prd->u.cprd_mem.cprd_start.np_quad = - rman_get_start(sc->ndis_res_mem); - prd->u.cprd_mem.cprd_len = - rman_get_size(sc->ndis_res_mem); - prd++; - } - - if (sc->ndis_irq) { - prd->cprd_type = CmResourceTypeInterrupt; - prd->u.cprd_intr.cprd_level = - rman_get_start(sc->ndis_irq); - prd->u.cprd_intr.cprd_vector = - rman_get_start(sc->ndis_irq); - prd->u.cprd_intr.cprd_affinity = 0; + brl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev); + if (brl != NULL) { + SLIST_FOREACH(brle, brl, link) { + switch (brle->type) { + case SYS_RES_IOPORT: + prd->cprd_type = CmResourceTypePort; + prd->u.cprd_port.cprd_start.np_quad = + brle->start; + prd->u.cprd_port.cprd_len = brle->count; + break; + case SYS_RES_MEMORY: + prd->cprd_type = CmResourceTypeMemory; + prd->u.cprd_port.cprd_start.np_quad = + brle->start; + prd->u.cprd_port.cprd_len = brle->count; + break; + case SYS_RES_IRQ: + prd->cprd_type = CmResourceTypeInterrupt; + prd->u.cprd_intr.cprd_level = brle->start; + prd->u.cprd_intr.cprd_vector = brle->start; + prd->u.cprd_intr.cprd_affinity = 0; + break; + default: + break; + } + prd++; + } } block->nmb_rlist = rl; ==== //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.16 2003/12/26 03:31:34 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.18 2003/12/28 21:36:03 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -230,6 +230,8 @@ __stdcall static void ndis_uptime(uint32_t *); __stdcall static void ndis_init_string(ndis_unicode_string **, char *); __stdcall static void ndis_init_ansi_string(ndis_ansi_string *, char *); +__stdcall static void ndis_init_unicode_string(ndis_unicode_string *, + uint16_t *); __stdcall static void ndis_free_string(ndis_unicode_string *); __stdcall static ndis_status ndis_remove_miniport(ndis_handle *); __stdcall static void ndis_termwrap(ndis_handle, void *); @@ -1707,8 +1709,6 @@ ndis_buffer *buf; int len; { - if (len > buf->nb_size) - return; buf->nb_bytecount = len; return; @@ -2168,6 +2168,31 @@ return; } +__stdcall static void +ndis_init_unicode_string(dst, src) + ndis_unicode_string *dst; + uint16_t *src; +{ + ndis_unicode_string *u; + int i; + + u = dst; + if (u == NULL) + return; + if (src == NULL) { + u->nus_len = u->nus_maxlen = 0; + u->nus_buf = NULL; + } else { + i = 0; + while(src[i] != 0) + i++; + u->nus_buf = src; + u->nus_len = u->nus_maxlen = i * 2; + } + + return; +} + __stdcall static void ndis_get_devprop(adapter, phydevobj, funcdevobj, nextdevobj, resources, transresources) ndis_handle adapter; @@ -2286,6 +2311,7 @@ { "NdisGetBufferPhysicalArraySize", (FUNC)ndis_buf_physpages }, { "NdisMGetDeviceProperty", (FUNC)ndis_get_devprop }, { "NdisInitAnsiString", (FUNC)ndis_init_ansi_string }, + { "NdisInitUnicodeString", (FUNC)ndis_init_unicode_string }, { "NdisWriteConfiguration", (FUNC)ndis_write_cfg }, { "NdisAnsiStringToUnicodeString", (FUNC)ndis_ansi2unicode }, { "NdisTerminateWrapper", (FUNC)ndis_termwrap }, ==== //depot/projects/netperf/sys/conf/Makefile.alpha#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.127 2003/04/15 21:29:11 phk Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.128 2003/12/29 11:34:33 bde Exp $ # # Makefile for FreeBSD # @@ -28,7 +28,7 @@ .endif .include "$S/conf/kern.pre.mk" -SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -e locorestart \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o ==== //depot/projects/netperf/sys/conf/kern.post.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.53 2003/11/25 04:12:43 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.57 2003/12/30 07:54:39 bde Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -54,13 +54,14 @@ install.debug reinstall.debug: gdbinit cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG ${.TARGET:R} +# Install gdbinit files for kernel debugging. gdbinit: - sed < ${S}/../tools/debugscripts/dot.gdbinit > .gdbinit \ - "s:MODPATH:${.OBJDIR}/modules:" + grep -v '# XXX' ${S}/../tools/debugscripts/dot.gdbinit | \ + sed "s:MODPATH:${.OBJDIR}/modules:" > .gdbinit cp ${S}/../tools/debugscripts/gdbinit.kernel \ - ${S}/../tools/debugscripts/gdbinit.vinum ${.CURDIR} + ${S}/../tools/debugscripts/gdbinit.vinum ${.CURDIR} cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH} \ - ${.CURDIR}/gdbinit.machine + ${.CURDIR}/gdbinit.machine .endif ${FULLKERNEL}: ${SYSTEM_DEP} vers.o @@ -87,14 +88,14 @@ kernel-clean: rm -f *.o *.so *.So *.ko *.s eddep errs \ - ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags \ - vers.c vnode_if.c vnode_if.h majors.c \ - ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ - ${CLEAN} + ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags \ + vers.c vnode_if.c vnode_if.h majors.c \ + ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ + ${CLEAN} lint: ${LNFILES} - ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} \ - 2>&1 | tee -a linterrs + ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} 2>&1 | \ + tee -a linterrs # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like @@ -102,19 +103,17 @@ HACK_EXTRA_FLAGS?= -shared hack.So: Makefile touch hack.c - ${CC} ${FMT} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So + ${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So rm -f hack.c -# this rule stops ./assym.s in .depend from causing problems +# This rule stops ./assym.s in .depend from causing problems. ./assym.s: assym.s assym.s: $S/kern/genassym.sh genassym.o NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET} -# XXX used to force -elf after CFLAGS to work around breakage of cc -aout -# (genassym.sh makes some assumptions and cc stopped satisfying them). genassym.o: $S/$M/$M/genassym.c - ${CC} -c ${CFLAGS:N-fno-common} -Wno-inline $S/$M/$M/genassym.c + ${CC} -c ${CFLAGS:N-fno-common} $S/$M/$M/genassym.c ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h @@ -148,10 +147,10 @@ links: egrep '#if' ${CFILES} | sed -f $S/conf/defines | \ - sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink + sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink ${MAKE} -V CFILES | tr -s ' ' '\12' | sed 's/\.c/.o/' | \ - sort -u | comm -23 - dontlink | \ - sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks + sort -u | comm -23 - dontlink | \ + sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks; rm -f dontlink kernel-tags: ==== //depot/projects/netperf/sys/conf/kern.pre.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.37 2003/11/05 12:20:16 bde Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.39 2003/12/30 09:01:29 bde Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -47,8 +47,7 @@ CFLAGS+= -DGPROF -falign-functions=16 .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF -# XXX -Wno-inline is to break some warnings. -PROF= -finstrument-functions -Wno-inline +PROF= -finstrument-functions .else PROF= -pg .endif @@ -78,11 +77,11 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_OBJS+= hack.So -SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ - ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} + ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+= $S/conf/ldscript.$M # MKMODULESENV is set here so that port makefiles can augment ==== //depot/projects/netperf/sys/conf/options.i386#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.205 2003/12/10 19:30:42 jhb Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.206 2003/12/30 07:28:53 bde Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -36,7 +36,6 @@ CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_TSC_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h CPU_ATHLON_SSE_HACK opt_cpu.h ==== //depot/projects/netperf/sys/conf/options.pc98#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.171 2003/11/15 12:31:02 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.172 2003/12/30 07:28:54 bde Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -33,7 +33,6 @@ CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_TSC_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h CPU_BLUELIGHTNING_3X opt_cpu.h ==== //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.28 2003/12/23 18:26:53 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.29 2003/12/28 22:15:24 njl Exp $"); #include "opt_acpi.h" #include @@ -395,7 +395,7 @@ /* If _PTC not present or other failure, try the P_BLK. */ if (sc->cpu_p_cnt == NULL) { /* The spec says P_BLK must be at least 6 bytes long. */ - if (sc->cpu_p_blk_len != 6) + if (sc->cpu_p_blk == 0 || sc->cpu_p_blk_len != 6) return (ENXIO); gas.Address = sc->cpu_p_blk; gas.AddressSpaceId = ACPI_ADR_SPACE_SYSTEM_IO; ==== //depot/projects/netperf/sys/dev/an/if_aironet_ieee.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/an/if_aironet_ieee.h,v 1.13 2003/08/24 17:48:04 obrien Exp $ + * $FreeBSD: src/sys/dev/an/if_aironet_ieee.h,v 1.14 2003/12/30 01:07:12 ambrisko Exp $ */ #ifndef _IF_AIRONET_IEEE_H @@ -337,7 +337,7 @@ u_int8_t an_magic_packet_action; /* 0x98 */ u_int8_t an_magic_packet_ctl; /* 0x99 */ u_int16_t an_rsvd9; - u_int16_t an_spare[13]; + u_int16_t an_spare[19]; }; #define AN_OPMODE_IBSS_ADHOC 0x0000 @@ -593,7 +593,7 @@ u_int8_t an_avg_noise_prev_min_db; /* 0x7D */ u_int8_t an_max_noise_prev_min_pc; /* 0x7E */ u_int8_t an_max_noise_prev_min_db; /* 0x7F */ - u_int16_t an_spare[8]; + u_int16_t an_spare[18]; }; #define AN_STATUS_OPMODE_CONFIGURED 0x0001 ==== //depot/projects/netperf/sys/dev/an/if_an.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.56 2003/11/14 19:00:29 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.57 2003/12/30 01:07:12 ambrisko Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -503,6 +503,7 @@ { bus_dmamap_unload(sc->an_dtag, dma->an_dma_map); bus_dmamem_free(sc->an_dtag, dma->an_dma_vaddr, dma->an_dma_map); + dma->an_dma_vaddr = 0; bus_dmamap_destroy(sc->an_dtag, dma->an_dma_map); } @@ -816,6 +817,29 @@ return(error); } +int +an_detach(device_t dev) +{ + struct an_softc *sc = device_get_softc(dev); + struct ifnet *ifp = &sc->arpcom.ac_if; + + if (sc->an_gone) { + device_printf(dev,"already unloaded\n"); + return(0); + } + AN_LOCK(sc); + an_stop(sc); + ifmedia_removeall(&sc->an_ifmedia); + ifp->if_flags &= ~IFF_RUNNING; + ether_ifdetach(ifp); + sc->an_gone = 1; + AN_UNLOCK(sc); + bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); + an_release_resources(dev); + mtx_destroy(&sc->an_mtx); + return (0); +} + static void an_rxeof(sc) struct an_softc *sc; @@ -1417,6 +1441,8 @@ *ptr2 = CSR_READ_1(sc, AN_DATA1); } } else { /* MPI-350 */ + if (!sc->an_rid_buffer.an_dma_vaddr) + return(EIO); an_rid_desc.an_valid = 1; an_rid_desc.an_len = AN_RID_BUFFER_SIZE; an_rid_desc.an_rid = 0; @@ -1449,11 +1475,18 @@ an_rid_desc.an_len = an_ltv->an_len; } - if (an_rid_desc.an_len > 2) - bcopy(&an_ltv->an_type, - <v->an_val, - an_rid_desc.an_len - 2); - ltv->an_len = an_rid_desc.an_len + 2; + len = an_rid_desc.an_len; + if (len > (ltv->an_len - 2)) { + printf("an%d: record length mismatch -- expected %d, " + "got %d for Rid %x\n", sc->an_unit, + ltv->an_len - 2, len, ltv->an_type); + len = ltv->an_len - 2; + } else { + ltv->an_len = len + 2; + } + bcopy(&an_ltv->an_type, + <v->an_val, + len); } if (an_dump) @@ -3376,9 +3409,8 @@ * Linux driver */ -#define FLASH_DELAY(_sc, x) AN_UNLOCK(_sc) ; \ - tsleep(ifp, PZERO, "flash", ((x) / hz) + 1); \ - AN_LOCK(_sc) ; +#define FLASH_DELAY(_sc, x) msleep(ifp, &(_sc)->an_mtx, PZERO, \ + "flash", ((x) / hz) + 1); #define FLASH_COMMAND 0x7e7e #define FLASH_SIZE 32 * 1024 ==== //depot/projects/netperf/sys/dev/an/if_an_isa.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.13 2003/08/24 17:48:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.14 2003/12/30 01:07:12 ambrisko Exp $"); #include "opt_inet.h" @@ -79,7 +79,6 @@ static int an_probe_isa (device_t); static int an_attach_isa (device_t); -static int an_detach_isa (device_t); static int an_probe_isa(dev) @@ -133,26 +132,11 @@ return (0); } -static int -an_detach_isa(device_t dev) -{ - struct an_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->arpcom.ac_if; - - an_stop(sc); - ifmedia_removeall(&sc->an_ifmedia); - ether_ifdetach(ifp); - bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); - an_release_resources(dev); - - return (0); -} - static device_method_t an_isa_methods[] = { /* Device interface */ DEVMETHOD(device_probe, an_probe_isa), DEVMETHOD(device_attach, an_attach_isa), - DEVMETHOD(device_detach, an_detach_isa), + DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), { 0, 0 } }; ==== //depot/projects/netperf/sys/dev/an/if_an_pccard.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.22 2003/10/08 01:20:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.23 2003/12/30 01:07:12 ambrisko Exp $"); #include "opt_inet.h" @@ -79,13 +79,12 @@ static int an_pccard_match(device_t); static int an_pccard_probe(device_t); static int an_pccard_attach(device_t); -static int an_pccard_detach(device_t); static device_method_t an_pccard_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pccard_compat_probe), DEVMETHOD(device_attach, pccard_compat_attach), - DEVMETHOD(device_detach, an_pccard_detach), + DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), /* Card interface */ @@ -131,27 +130,6 @@ } static int -an_pccard_detach(device_t dev) -{ - struct an_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->arpcom.ac_if; - - if (sc->an_gone) { - device_printf(dev,"already unloaded\n"); - return(0); - } - an_stop(sc); - ifmedia_removeall(&sc->an_ifmedia); - ifp->if_flags &= ~IFF_RUNNING; - ether_ifdetach(ifp); - sc->an_gone = 1; - bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); - an_release_resources(dev); - mtx_destroy(&sc->an_mtx); - return (0); -} - -static int an_pccard_probe(device_t dev) { int error; ==== //depot/projects/netperf/sys/dev/an/if_an_pci.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.25 2003/09/02 17:30:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.26 2003/12/30 01:07:12 ambrisko Exp $"); /* * This is a PCI shim for the Aironet PC4500/4800 wireless network @@ -111,7 +111,6 @@ static int an_probe_pci (device_t); static int an_attach_pci (device_t); -static int an_detach_pci (device_t); static int an_suspend_pci (device_t); static int an_resume_pci (device_t); @@ -250,21 +249,6 @@ } static int -an_detach_pci(device_t dev) -{ - struct an_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->arpcom.ac_if; - - an_stop(sc); - ifmedia_removeall(&sc->an_ifmedia); - ether_ifdetach(ifp); - bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); - an_release_resources(dev); - - return (0); -} - -static int an_suspend_pci(device_t dev) { an_shutdown(dev); @@ -284,7 +268,7 @@ /* Device interface */ DEVMETHOD(device_probe, an_probe_pci), DEVMETHOD(device_attach, an_attach_pci), - DEVMETHOD(device_detach, an_detach_pci), + DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), DEVMETHOD(device_suspend, an_suspend_pci), DEVMETHOD(device_resume, an_resume_pci), ==== //depot/projects/netperf/sys/dev/an/if_anreg.h#6 (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/dev/an/if_anreg.h,v 1.20 2003/11/14 19:00:30 sam Exp $ + * $FreeBSD: src/sys/dev/an/if_anreg.h,v 1.21 2003/12/30 01:07:12 ambrisko Exp $ */ #define AN_TIMEOUT 65536 @@ -513,6 +513,7 @@ void an_shutdown (device_t); void an_resume (device_t); int an_attach (struct an_softc *, int, int); +int an_detach (device_t); void an_stop (struct an_softc *); driver_intr_t an_intr; ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#54 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.36 2003/11/29 01:23:59 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.38 2003/12/28 07:00:32 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -799,6 +799,7 @@ } sc->sc_stats.ast_tx_mgmt++; } + if (ath_tx_start(sc, ni, bf, m)) { bad: ATH_TXBUF_LOCK(sc); ==== //depot/projects/netperf/sys/dev/ath/if_athioctl.h#10 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.4 2003/11/29 01:23:59 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.5 2003/12/28 07:00:32 sam Exp $ */ /* @@ -70,7 +70,6 @@ u_int32_t ast_tx_rts; /* tx frames with rts enabled */ u_int32_t ast_tx_cts; /* tx frames with cts enabled */ u_int32_t ast_tx_shortpre;/* tx frames with short preamble */ - u_int32_t ast_tx_altrate; /* tx frames with alternate rate */ u_int32_t ast_rx_nombuf; /* rx setup failed 'cuz no mbuf */ u_int32_t ast_rx_busdma; /* rx setup failed for dma resrcs */ u_int32_t ast_rx_orn; /* rx failed 'cuz of desc overrun */ @@ -108,8 +107,8 @@ (1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ (1 << IEEE80211_RADIOTAP_CHANNEL) | \ + (1 << IEEE80211_RADIOTAP_ANTENNA) | \ (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \ - (1 << IEEE80211_RADIOTAP_ANTENNA) | \ 0) struct ath_rx_radiotap_header { @@ -118,14 +117,15 @@ u_int8_t wr_rate; u_int16_t wr_chan_freq; u_int16_t wr_chan_flags; + u_int8_t wr_antenna; u_int8_t wr_antsignal; - u_int8_t wr_antenna; }; #define ATH_TX_RADIOTAP_PRESENT ( \ (1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ (1 << IEEE80211_RADIOTAP_CHANNEL) | \ + (1 << IEEE80211_RADIOTAP_DBM_TX_POWER) | \ (1 << IEEE80211_RADIOTAP_ANTENNA) | \ 0) ==== //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.15 2003/12/26 07:01:05 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.16 2003/12/29 23:51:59 wpaul Exp $"); #include "opt_bdg.h" @@ -215,10 +215,13 @@ void *img; struct ndis_type *t; int i, devidx = 0, defidx = 0; + struct resource_list *rl; + struct resource_list_entry *rle; sc = device_get_softc(dev); unit = device_get_unit(dev); + sc->ndis_dev = dev; mtx_init(&sc->ndis_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); @@ -228,67 +231,76 @@ */ pci_enable_busmaster(dev); - /* Try to map iospace */ - - sc->ndis_io_rid = NDIS_PCI_LOIO; - sc->ndis_res_io = bus_alloc_resource(dev, SYS_RES_IOPORT, - &sc->ndis_io_rid, 0, ~0, 1, RF_ACTIVE); - - /* - * Sometimes the iospace and memspace BARs are swapped. - * Make one more try to map I/O space using a different - * RID. - */ - if (sc->ndis_res_io == NULL) { - sc->ndis_io_rid = NDIS_PCI_LOMEM; - sc->ndis_res_io = bus_alloc_resource(dev, SYS_RES_IOPORT, - &sc->ndis_io_rid, 0, ~0, 1, RF_ACTIVE); - } - - if (sc->ndis_res_io != NULL) - sc->ndis_rescnt++; - - /* Now try to mem memory space */ - sc->ndis_mem_rid = NDIS_PCI_LOMEM; - sc->ndis_res_mem = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->ndis_mem_rid, 0, ~0, 1, RF_ACTIVE); - - /* - * If the first attempt fails, try again with another - * BAR. - */ - if (sc->ndis_res_mem == NULL) { - sc->ndis_mem_rid = NDIS_PCI_LOIO; - sc->ndis_res_mem = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->ndis_mem_rid, 0, ~0, 1, RF_ACTIVE); - } - - if (sc->ndis_res_mem != NULL) - sc->ndis_rescnt++; - - if (!sc->ndis_rescnt) { - printf("ndis%d: couldn't map ports/memory\n", unit); - error = ENXIO; - goto fail; - } -#ifdef notdef - sc->ndis_btag = rman_get_bustag(sc->ndis_res); - sc->ndis_bhandle = rman_get_bushandle(sc->ndis_res); -#endif - - /* Allocate interrupt */ - rid = 0; - sc->ndis_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE); - - if (sc->ndis_irq == NULL) { - printf("ndis%d: couldn't map interrupt\n", unit); - error = ENXIO; - goto fail; + rl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev); + if (rl != NULL) { + SLIST_FOREACH(rle, rl, link) { + switch (rle->type) { + case SYS_RES_IOPORT: + sc->ndis_io_rid = rle->rid; + sc->ndis_res_io = bus_alloc_resource(dev, + SYS_RES_IOPORT, &sc->ndis_io_rid, + 0, ~0, 1, RF_ACTIVE); + if (sc->ndis_res_io == NULL) { + printf("ndis%d: couldn't map " + "iospace\n", unit); + error = ENXIO; + goto fail; + } + break; + case SYS_RES_MEMORY: + if (sc->ndis_res_altmem != NULL) { + printf ("ndis%d: too many memory " + "resources", sc->ndis_unit); + error = ENXIO; + goto fail; + } + if (sc->ndis_res_mem == NULL) { + sc->ndis_mem_rid = rle->rid; + sc->ndis_res_mem = + bus_alloc_resource(dev, + SYS_RES_MEMORY, + &sc->ndis_mem_rid, + 0, ~0, 1, RF_ACTIVE); + if (sc->ndis_res_mem == NULL) { + printf("ndis%d: couldn't map " + "memory\n", unit); + error = ENXIO; + goto fail; + } + } else { + sc->ndis_altmem_rid = rle->rid; + sc->ndis_res_altmem = + bus_alloc_resource(dev, + SYS_RES_MEMORY, + &sc->ndis_altmem_rid, + 0, ~0, 1, RF_ACTIVE); + if (sc->ndis_res_altmem == NULL) { + printf("ndis%d: couldn't map " + "alt memory\n", unit); + error = ENXIO; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 30 09:34:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81DAE16A4D1; Tue, 30 Dec 2003 09:34: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 5934F16A4CF for ; Tue, 30 Dec 2003 09:34:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E3AE43D54 for ; Tue, 30 Dec 2003 09:34:25 -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 hBUHYP0B001794 for ; Tue, 30 Dec 2003 09:34:25 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBUHYOHv001791 for perforce@freebsd.org; Tue, 30 Dec 2003 09:34:24 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 30 Dec 2003 09:34:24 -0800 (PST) Message-Id: <200312301734.hBUHYOHv001791@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 44558 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, 30 Dec 2003 17:34:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=44558 Change 44558 by sam@sam_ebb on 2003/12/30 09:34:02 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/alpha/alpha/vm_machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/netperf+sockets/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/netperf+sockets/sys/conf/files#5 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.post.mk#3 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/netperf+sockets/sys/conf/options.i386#4 integrate .. //depot/projects/netperf+sockets/sys/conf/options.pc98#3 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/netperf+sockets/sys/dev/an/if_aironet_ieee.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/an/if_an.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/netperf+sockets/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/wi/if_wireg.h#3 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/netperf+sockets/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/conf/NOTES#4 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_exec.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/cam/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/raidframe/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/sio/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/net/bpf.c#4 integrate .. //depot/projects/netperf+sockets/sys/net/bpf.h#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_disc.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_ef.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_faith.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_gif.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_gre.c#4 integrate .. //depot/projects/netperf+sockets/sys/net/if_gre.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_loop.c#4 integrate .. //depot/projects/netperf+sockets/sys/net/if_stf.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_tun.c#3 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/in.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/netperf+sockets/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/netperf+sockets/sys/pc98/pc98/sio_cbus.c#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/sys/mbuf.h#4 integrate .. //depot/projects/netperf+sockets/sys/sys/sf_buf.h#2 integrate .. //depot/projects/netperf+sockets/sys/sys/vnode.h#3 integrate .. //depot/projects/netperf+sockets/sys/vm/swap_pager.c#4 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/alpha/alpha/vm_machdep.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.97 2003/12/27 07:52:46 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.99 2003/12/28 08:57:08 silby Exp $"); #include "opt_kstack_pages.h" @@ -116,7 +116,6 @@ } sf_freelist; static u_int sf_buf_alloc_want; -extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -416,6 +415,7 @@ mtx_lock(&sf_freelist.sf_lock); while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { sf_buf_alloc_want++; + mbstat.sf_allocwait++; error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, "sfbufa", 0); sf_buf_alloc_want--; @@ -430,7 +430,7 @@ SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; nsfbufsused++; - nsfbufspeak = max(nsfbufspeak, nsfbufsused); + nsfbufspeak = imax(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); ==== //depot/projects/netperf+sockets/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.225 2003/12/27 07:52:46 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.227 2003/12/28 08:57:08 silby Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -99,7 +99,6 @@ } sf_freelist; static u_int sf_buf_alloc_want; -extern int nsfbufspeak, nsfbufsused; /* * Finish a fork operation, with process p2 nearly set up. @@ -461,6 +460,7 @@ mtx_lock(&sf_freelist.sf_lock); while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { sf_buf_alloc_want++; + mbstat.sf_allocwait++; error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, "sfbufa", 0); sf_buf_alloc_want--; @@ -475,7 +475,7 @@ SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; nsfbufsused++; - nsfbufspeak = max(nsfbufspeak, nsfbufsused); + nsfbufspeak = imax(nsfbufspeak, nsfbufsused); } mtx_unlock(&sf_freelist.sf_lock); return (sf); ==== //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.15 2003/12/26 07:01:05 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.16 2003/12/29 23:51:58 wpaul Exp $"); #include #include @@ -397,9 +397,13 @@ ndis_resource_list *rl = NULL; cm_partial_resource_desc *prd = NULL; ndis_miniport_block *block; + device_t dev; + struct resource_list *brl; + struct resource_list_entry *brle; sc = arg; block = &sc->ndis_block; + dev = sc->ndis_dev; rl = malloc(sizeof(ndis_resource_list) + (sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1)), @@ -411,33 +415,35 @@ rl->cprl_version = 5; rl->cprl_version = 1; rl->cprl_count = sc->ndis_rescnt; - prd = rl->cprl_partial_descs; - if (sc->ndis_res_io) { - prd->cprd_type = CmResourceTypePort; - prd->u.cprd_port.cprd_start.np_quad = - rman_get_start(sc->ndis_res_io); - prd->u.cprd_port.cprd_len = - rman_get_size(sc->ndis_res_io); - prd++; - } - if (sc->ndis_res_mem) { - prd->cprd_type = CmResourceTypeMemory; - prd->u.cprd_mem.cprd_start.np_quad = - rman_get_start(sc->ndis_res_mem); - prd->u.cprd_mem.cprd_len = - rman_get_size(sc->ndis_res_mem); - prd++; - } - - if (sc->ndis_irq) { - prd->cprd_type = CmResourceTypeInterrupt; - prd->u.cprd_intr.cprd_level = - rman_get_start(sc->ndis_irq); - prd->u.cprd_intr.cprd_vector = - rman_get_start(sc->ndis_irq); - prd->u.cprd_intr.cprd_affinity = 0; + brl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev); + if (brl != NULL) { + SLIST_FOREACH(brle, brl, link) { + switch (brle->type) { + case SYS_RES_IOPORT: + prd->cprd_type = CmResourceTypePort; + prd->u.cprd_port.cprd_start.np_quad = + brle->start; + prd->u.cprd_port.cprd_len = brle->count; + break; + case SYS_RES_MEMORY: + prd->cprd_type = CmResourceTypeMemory; + prd->u.cprd_port.cprd_start.np_quad = + brle->start; + prd->u.cprd_port.cprd_len = brle->count; + break; + case SYS_RES_IRQ: + prd->cprd_type = CmResourceTypeInterrupt; + prd->u.cprd_intr.cprd_level = brle->start; + prd->u.cprd_intr.cprd_vector = brle->start; + prd->u.cprd_intr.cprd_affinity = 0; + break; + default: + break; + } + prd++; + } } block->nmb_rlist = rl; ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.16 2003/12/26 03:31:34 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.18 2003/12/28 21:36:03 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -230,6 +230,8 @@ __stdcall static void ndis_uptime(uint32_t *); __stdcall static void ndis_init_string(ndis_unicode_string **, char *); __stdcall static void ndis_init_ansi_string(ndis_ansi_string *, char *); +__stdcall static void ndis_init_unicode_string(ndis_unicode_string *, + uint16_t *); __stdcall static void ndis_free_string(ndis_unicode_string *); __stdcall static ndis_status ndis_remove_miniport(ndis_handle *); __stdcall static void ndis_termwrap(ndis_handle, void *); @@ -1707,8 +1709,6 @@ ndis_buffer *buf; int len; { - if (len > buf->nb_size) - return; buf->nb_bytecount = len; return; @@ -2168,6 +2168,31 @@ return; } +__stdcall static void +ndis_init_unicode_string(dst, src) + ndis_unicode_string *dst; + uint16_t *src; +{ + ndis_unicode_string *u; + int i; + + u = dst; + if (u == NULL) + return; + if (src == NULL) { + u->nus_len = u->nus_maxlen = 0; + u->nus_buf = NULL; + } else { + i = 0; + while(src[i] != 0) + i++; + u->nus_buf = src; + u->nus_len = u->nus_maxlen = i * 2; + } + + return; +} + __stdcall static void ndis_get_devprop(adapter, phydevobj, funcdevobj, nextdevobj, resources, transresources) ndis_handle adapter; @@ -2286,6 +2311,7 @@ { "NdisGetBufferPhysicalArraySize", (FUNC)ndis_buf_physpages }, { "NdisMGetDeviceProperty", (FUNC)ndis_get_devprop }, { "NdisInitAnsiString", (FUNC)ndis_init_ansi_string }, + { "NdisInitUnicodeString", (FUNC)ndis_init_unicode_string }, { "NdisWriteConfiguration", (FUNC)ndis_write_cfg }, { "NdisAnsiStringToUnicodeString", (FUNC)ndis_ansi2unicode }, { "NdisTerminateWrapper", (FUNC)ndis_termwrap }, ==== //depot/projects/netperf+sockets/sys/conf/Makefile.alpha#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.127 2003/04/15 21:29:11 phk Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.128 2003/12/29 11:34:33 bde Exp $ # # Makefile for FreeBSD # @@ -28,7 +28,7 @@ .endif .include "$S/conf/kern.pre.mk" -SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -e locorestart \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o ==== //depot/projects/netperf+sockets/sys/conf/files#5 (text+ko) ==== @@ -485,7 +485,6 @@ dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard -dev/kttcp/kttcp.c optional kttcp dev/led/led.c optional cpu_soekris dev/lge/if_lge.c optional lge dev/lnc/if_lnc.c optional lnc ==== //depot/projects/netperf+sockets/sys/conf/kern.post.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.53 2003/11/25 04:12:43 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.57 2003/12/30 07:54:39 bde Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -54,13 +54,14 @@ install.debug reinstall.debug: gdbinit cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG ${.TARGET:R} +# Install gdbinit files for kernel debugging. gdbinit: - sed < ${S}/../tools/debugscripts/dot.gdbinit > .gdbinit \ - "s:MODPATH:${.OBJDIR}/modules:" + grep -v '# XXX' ${S}/../tools/debugscripts/dot.gdbinit | \ + sed "s:MODPATH:${.OBJDIR}/modules:" > .gdbinit cp ${S}/../tools/debugscripts/gdbinit.kernel \ - ${S}/../tools/debugscripts/gdbinit.vinum ${.CURDIR} + ${S}/../tools/debugscripts/gdbinit.vinum ${.CURDIR} cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH} \ - ${.CURDIR}/gdbinit.machine + ${.CURDIR}/gdbinit.machine .endif ${FULLKERNEL}: ${SYSTEM_DEP} vers.o @@ -87,14 +88,14 @@ kernel-clean: rm -f *.o *.so *.So *.ko *.s eddep errs \ - ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags \ - vers.c vnode_if.c vnode_if.h majors.c \ - ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ - ${CLEAN} + ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags \ + vers.c vnode_if.c vnode_if.h majors.c \ + ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ + ${CLEAN} lint: ${LNFILES} - ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} \ - 2>&1 | tee -a linterrs + ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} 2>&1 | \ + tee -a linterrs # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like @@ -102,19 +103,17 @@ HACK_EXTRA_FLAGS?= -shared hack.So: Makefile touch hack.c - ${CC} ${FMT} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So + ${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So rm -f hack.c -# this rule stops ./assym.s in .depend from causing problems +# This rule stops ./assym.s in .depend from causing problems. ./assym.s: assym.s assym.s: $S/kern/genassym.sh genassym.o NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET} -# XXX used to force -elf after CFLAGS to work around breakage of cc -aout -# (genassym.sh makes some assumptions and cc stopped satisfying them). genassym.o: $S/$M/$M/genassym.c - ${CC} -c ${CFLAGS:N-fno-common} -Wno-inline $S/$M/$M/genassym.c + ${CC} -c ${CFLAGS:N-fno-common} $S/$M/$M/genassym.c ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h @@ -148,10 +147,10 @@ links: egrep '#if' ${CFILES} | sed -f $S/conf/defines | \ - sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink + sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink ${MAKE} -V CFILES | tr -s ' ' '\12' | sed 's/\.c/.o/' | \ - sort -u | comm -23 - dontlink | \ - sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks + sort -u | comm -23 - dontlink | \ + sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks; rm -f dontlink kernel-tags: ==== //depot/projects/netperf+sockets/sys/conf/kern.pre.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.37 2003/11/05 12:20:16 bde Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.39 2003/12/30 09:01:29 bde Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -47,8 +47,7 @@ CFLAGS+= -DGPROF -falign-functions=16 .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF -# XXX -Wno-inline is to break some warnings. -PROF= -finstrument-functions -Wno-inline +PROF= -finstrument-functions .else PROF= -pg .endif @@ -78,11 +77,11 @@ SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_OBJS+= hack.So -SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ - ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} + ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+= $S/conf/ldscript.$M # MKMODULESENV is set here so that port makefiles can augment ==== //depot/projects/netperf+sockets/sys/conf/options.i386#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.205 2003/12/10 19:30:42 jhb Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.206 2003/12/30 07:28:53 bde Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -36,7 +36,6 @@ CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_TSC_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h CPU_ATHLON_SSE_HACK opt_cpu.h ==== //depot/projects/netperf+sockets/sys/conf/options.pc98#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.171 2003/11/15 12:31:02 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.172 2003/12/30 07:28:54 bde Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -33,7 +33,6 @@ CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_TSC_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h CPU_BLUELIGHTNING_3X opt_cpu.h ==== //depot/projects/netperf+sockets/sys/dev/acpica/acpi_cpu.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.28 2003/12/23 18:26:53 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.29 2003/12/28 22:15:24 njl Exp $"); #include "opt_acpi.h" #include @@ -395,7 +395,7 @@ /* If _PTC not present or other failure, try the P_BLK. */ if (sc->cpu_p_cnt == NULL) { /* The spec says P_BLK must be at least 6 bytes long. */ - if (sc->cpu_p_blk_len != 6) + if (sc->cpu_p_blk == 0 || sc->cpu_p_blk_len != 6) return (ENXIO); gas.Address = sc->cpu_p_blk; gas.AddressSpaceId = ACPI_ADR_SPACE_SYSTEM_IO; ==== //depot/projects/netperf+sockets/sys/dev/an/if_aironet_ieee.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/dev/an/if_aironet_ieee.h,v 1.13 2003/08/24 17:48:04 obrien Exp $ + * $FreeBSD: src/sys/dev/an/if_aironet_ieee.h,v 1.14 2003/12/30 01:07:12 ambrisko Exp $ */ #ifndef _IF_AIRONET_IEEE_H @@ -337,7 +337,7 @@ u_int8_t an_magic_packet_action; /* 0x98 */ u_int8_t an_magic_packet_ctl; /* 0x99 */ u_int16_t an_rsvd9; - u_int16_t an_spare[13]; + u_int16_t an_spare[19]; }; #define AN_OPMODE_IBSS_ADHOC 0x0000 @@ -593,7 +593,7 @@ u_int8_t an_avg_noise_prev_min_db; /* 0x7D */ u_int8_t an_max_noise_prev_min_pc; /* 0x7E */ u_int8_t an_max_noise_prev_min_db; /* 0x7F */ - u_int16_t an_spare[8]; + u_int16_t an_spare[18]; }; #define AN_STATUS_OPMODE_CONFIGURED 0x0001 ==== //depot/projects/netperf+sockets/sys/dev/an/if_an.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.56 2003/11/14 19:00:29 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.57 2003/12/30 01:07:12 ambrisko Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -503,6 +503,7 @@ { bus_dmamap_unload(sc->an_dtag, dma->an_dma_map); bus_dmamem_free(sc->an_dtag, dma->an_dma_vaddr, dma->an_dma_map); + dma->an_dma_vaddr = 0; bus_dmamap_destroy(sc->an_dtag, dma->an_dma_map); } @@ -816,6 +817,29 @@ return(error); } +int +an_detach(device_t dev) +{ + struct an_softc *sc = device_get_softc(dev); + struct ifnet *ifp = &sc->arpcom.ac_if; + + if (sc->an_gone) { + device_printf(dev,"already unloaded\n"); + return(0); + } + AN_LOCK(sc); + an_stop(sc); + ifmedia_removeall(&sc->an_ifmedia); + ifp->if_flags &= ~IFF_RUNNING; + ether_ifdetach(ifp); + sc->an_gone = 1; + AN_UNLOCK(sc); + bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); + an_release_resources(dev); + mtx_destroy(&sc->an_mtx); + return (0); +} + static void an_rxeof(sc) struct an_softc *sc; @@ -1417,6 +1441,8 @@ *ptr2 = CSR_READ_1(sc, AN_DATA1); } } else { /* MPI-350 */ + if (!sc->an_rid_buffer.an_dma_vaddr) + return(EIO); an_rid_desc.an_valid = 1; an_rid_desc.an_len = AN_RID_BUFFER_SIZE; an_rid_desc.an_rid = 0; @@ -1449,11 +1475,18 @@ an_rid_desc.an_len = an_ltv->an_len; } - if (an_rid_desc.an_len > 2) - bcopy(&an_ltv->an_type, - <v->an_val, - an_rid_desc.an_len - 2); - ltv->an_len = an_rid_desc.an_len + 2; + len = an_rid_desc.an_len; + if (len > (ltv->an_len - 2)) { + printf("an%d: record length mismatch -- expected %d, " + "got %d for Rid %x\n", sc->an_unit, + ltv->an_len - 2, len, ltv->an_type); + len = ltv->an_len - 2; + } else { + ltv->an_len = len + 2; + } + bcopy(&an_ltv->an_type, + <v->an_val, + len); } if (an_dump) @@ -3376,9 +3409,8 @@ * Linux driver */ -#define FLASH_DELAY(_sc, x) AN_UNLOCK(_sc) ; \ - tsleep(ifp, PZERO, "flash", ((x) / hz) + 1); \ - AN_LOCK(_sc) ; +#define FLASH_DELAY(_sc, x) msleep(ifp, &(_sc)->an_mtx, PZERO, \ + "flash", ((x) / hz) + 1); #define FLASH_COMMAND 0x7e7e #define FLASH_SIZE 32 * 1024 ==== //depot/projects/netperf+sockets/sys/dev/an/if_an_isa.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.13 2003/08/24 17:48:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.14 2003/12/30 01:07:12 ambrisko Exp $"); #include "opt_inet.h" @@ -79,7 +79,6 @@ static int an_probe_isa (device_t); static int an_attach_isa (device_t); -static int an_detach_isa (device_t); static int an_probe_isa(dev) @@ -133,26 +132,11 @@ return (0); } -static int -an_detach_isa(device_t dev) -{ - struct an_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->arpcom.ac_if; - - an_stop(sc); - ifmedia_removeall(&sc->an_ifmedia); - ether_ifdetach(ifp); - bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); - an_release_resources(dev); - - return (0); -} - static device_method_t an_isa_methods[] = { /* Device interface */ DEVMETHOD(device_probe, an_probe_isa), DEVMETHOD(device_attach, an_attach_isa), - DEVMETHOD(device_detach, an_detach_isa), + DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), { 0, 0 } }; ==== //depot/projects/netperf+sockets/sys/dev/an/if_an_pccard.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.22 2003/10/08 01:20:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.23 2003/12/30 01:07:12 ambrisko Exp $"); #include "opt_inet.h" @@ -79,13 +79,12 @@ static int an_pccard_match(device_t); static int an_pccard_probe(device_t); static int an_pccard_attach(device_t); -static int an_pccard_detach(device_t); static device_method_t an_pccard_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pccard_compat_probe), DEVMETHOD(device_attach, pccard_compat_attach), - DEVMETHOD(device_detach, an_pccard_detach), + DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), /* Card interface */ @@ -131,27 +130,6 @@ } static int -an_pccard_detach(device_t dev) -{ - struct an_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->arpcom.ac_if; - - if (sc->an_gone) { - device_printf(dev,"already unloaded\n"); - return(0); - } - an_stop(sc); - ifmedia_removeall(&sc->an_ifmedia); - ifp->if_flags &= ~IFF_RUNNING; - ether_ifdetach(ifp); - sc->an_gone = 1; - bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); - an_release_resources(dev); - mtx_destroy(&sc->an_mtx); - return (0); -} - -static int an_pccard_probe(device_t dev) { int error; ==== //depot/projects/netperf+sockets/sys/dev/an/if_an_pci.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.25 2003/09/02 17:30:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.26 2003/12/30 01:07:12 ambrisko Exp $"); /* * This is a PCI shim for the Aironet PC4500/4800 wireless network @@ -111,7 +111,6 @@ static int an_probe_pci (device_t); static int an_attach_pci (device_t); -static int an_detach_pci (device_t); static int an_suspend_pci (device_t); static int an_resume_pci (device_t); @@ -250,21 +249,6 @@ } static int -an_detach_pci(device_t dev) -{ - struct an_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->arpcom.ac_if; - - an_stop(sc); - ifmedia_removeall(&sc->an_ifmedia); - ether_ifdetach(ifp); - bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); - an_release_resources(dev); - - return (0); -} - -static int an_suspend_pci(device_t dev) { an_shutdown(dev); @@ -284,7 +268,7 @@ /* Device interface */ DEVMETHOD(device_probe, an_probe_pci), DEVMETHOD(device_attach, an_attach_pci), - DEVMETHOD(device_detach, an_detach_pci), + DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), DEVMETHOD(device_suspend, an_suspend_pci), DEVMETHOD(device_resume, an_resume_pci), ==== //depot/projects/netperf+sockets/sys/dev/an/if_anreg.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/dev/an/if_anreg.h,v 1.20 2003/11/14 19:00:30 sam Exp $ + * $FreeBSD: src/sys/dev/an/if_anreg.h,v 1.21 2003/12/30 01:07:12 ambrisko Exp $ */ #define AN_TIMEOUT 65536 @@ -513,6 +513,7 @@ void an_shutdown (device_t); void an_resume (device_t); int an_attach (struct an_softc *, int, int); +int an_detach (device_t); void an_stop (struct an_softc *); driver_intr_t an_intr; ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.36 2003/11/29 01:23:59 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.38 2003/12/28 07:00:32 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -799,6 +799,7 @@ } sc->sc_stats.ast_tx_mgmt++; } + if (ath_tx_start(sc, ni, bf, m)) { bad: ATH_TXBUF_LOCK(sc); ==== //depot/projects/netperf+sockets/sys/dev/ath/if_athioctl.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.4 2003/11/29 01:23:59 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.5 2003/12/28 07:00:32 sam Exp $ */ /* @@ -70,7 +70,6 @@ u_int32_t ast_tx_rts; /* tx frames with rts enabled */ u_int32_t ast_tx_cts; /* tx frames with cts enabled */ u_int32_t ast_tx_shortpre;/* tx frames with short preamble */ - u_int32_t ast_tx_altrate; /* tx frames with alternate rate */ u_int32_t ast_rx_nombuf; /* rx setup failed 'cuz no mbuf */ u_int32_t ast_rx_busdma; /* rx setup failed for dma resrcs */ u_int32_t ast_rx_orn; /* rx failed 'cuz of desc overrun */ @@ -108,8 +107,8 @@ (1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ (1 << IEEE80211_RADIOTAP_CHANNEL) | \ + (1 << IEEE80211_RADIOTAP_ANTENNA) | \ (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \ - (1 << IEEE80211_RADIOTAP_ANTENNA) | \ 0) struct ath_rx_radiotap_header { @@ -118,14 +117,15 @@ u_int8_t wr_rate; u_int16_t wr_chan_freq; u_int16_t wr_chan_flags; + u_int8_t wr_antenna; u_int8_t wr_antsignal; - u_int8_t wr_antenna; }; #define ATH_TX_RADIOTAP_PRESENT ( \ (1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ (1 << IEEE80211_RADIOTAP_CHANNEL) | \ + (1 << IEEE80211_RADIOTAP_DBM_TX_POWER) | \ (1 << IEEE80211_RADIOTAP_ANTENNA) | \ 0) ==== //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.15 2003/12/26 07:01:05 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.16 2003/12/29 23:51:59 wpaul Exp $"); #include "opt_bdg.h" @@ -215,10 +215,13 @@ void *img; struct ndis_type *t; int i, devidx = 0, defidx = 0; + struct resource_list *rl; + struct resource_list_entry *rle; sc = device_get_softc(dev); unit = device_get_unit(dev); + sc->ndis_dev = dev; mtx_init(&sc->ndis_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); @@ -228,67 +231,76 @@ */ pci_enable_busmaster(dev); - /* Try to map iospace */ - - sc->ndis_io_rid = NDIS_PCI_LOIO; - sc->ndis_res_io = bus_alloc_resource(dev, SYS_RES_IOPORT, - &sc->ndis_io_rid, 0, ~0, 1, RF_ACTIVE); - - /* - * Sometimes the iospace and memspace BARs are swapped. - * Make one more try to map I/O space using a different - * RID. - */ - if (sc->ndis_res_io == NULL) { - sc->ndis_io_rid = NDIS_PCI_LOMEM; - sc->ndis_res_io = bus_alloc_resource(dev, SYS_RES_IOPORT, - &sc->ndis_io_rid, 0, ~0, 1, RF_ACTIVE); - } - - if (sc->ndis_res_io != NULL) - sc->ndis_rescnt++; - - /* Now try to mem memory space */ - sc->ndis_mem_rid = NDIS_PCI_LOMEM; - sc->ndis_res_mem = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->ndis_mem_rid, 0, ~0, 1, RF_ACTIVE); - - /* - * If the first attempt fails, try again with another - * BAR. - */ - if (sc->ndis_res_mem == NULL) { - sc->ndis_mem_rid = NDIS_PCI_LOIO; - sc->ndis_res_mem = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->ndis_mem_rid, 0, ~0, 1, RF_ACTIVE); - } - - if (sc->ndis_res_mem != NULL) - sc->ndis_rescnt++; - - if (!sc->ndis_rescnt) { - printf("ndis%d: couldn't map ports/memory\n", unit); - error = ENXIO; - goto fail; - } -#ifdef notdef - sc->ndis_btag = rman_get_bustag(sc->ndis_res); - sc->ndis_bhandle = rman_get_bushandle(sc->ndis_res); -#endif - - /* Allocate interrupt */ - rid = 0; - sc->ndis_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE); - - if (sc->ndis_irq == NULL) { - printf("ndis%d: couldn't map interrupt\n", unit); - error = ENXIO; - goto fail; + rl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev); + if (rl != NULL) { + SLIST_FOREACH(rle, rl, link) { + switch (rle->type) { + case SYS_RES_IOPORT: + sc->ndis_io_rid = rle->rid; + sc->ndis_res_io = bus_alloc_resource(dev, + SYS_RES_IOPORT, &sc->ndis_io_rid, + 0, ~0, 1, RF_ACTIVE); + if (sc->ndis_res_io == NULL) { + printf("ndis%d: couldn't map " + "iospace\n", unit); + error = ENXIO; + goto fail; + } + break; + case SYS_RES_MEMORY: + if (sc->ndis_res_altmem != NULL) { + printf ("ndis%d: too many memory " + "resources", sc->ndis_unit); + error = ENXIO; + goto fail; + } + if (sc->ndis_res_mem == NULL) { + sc->ndis_mem_rid = rle->rid; + sc->ndis_res_mem = + bus_alloc_resource(dev, + SYS_RES_MEMORY, + &sc->ndis_mem_rid, + 0, ~0, 1, RF_ACTIVE); + if (sc->ndis_res_mem == NULL) { + printf("ndis%d: couldn't map " + "memory\n", unit); + error = ENXIO; + goto fail; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 30 12:13:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 122E816A4D1; Tue, 30 Dec 2003 12:13: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 C41F816A4CF for ; Tue, 30 Dec 2003 12:13:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AE2B43D62 for ; Tue, 30 Dec 2003 12:13:40 -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 hBUKDe0B036928 for ; Tue, 30 Dec 2003 12:13:40 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBUKDdB7036925 for perforce@freebsd.org; Tue, 30 Dec 2003 12:13:39 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 30 Dec 2003 12:13:39 -0800 (PST) Message-Id: <200312302013.hBUKDdB7036925@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 44562 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, 30 Dec 2003 20:13:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=44562 Change 44562 by cvance@cvance_sony on 2003/12/30 12:13:26 Install default_type and default_contexts along with the policy Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#11 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#11 (text+ko) ==== @@ -20,9 +20,10 @@ CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy LOADPOLICY = $(DESTDIR)/sbin/sebsd_loadpolicy SETFILES = $(DESTDIR)/sbin/sebsd_setfiles -M4 = $(DESTDIR)/usr/bin/m4 -Imacros -s +M4 = $(REALDESTDIR)/usr/bin/m4 -Imacros -s POLICYVER := policy.16 +INSTALLCMD = install -c -o root -g wheel -m 400 INSTALLDIR = $(DESTDIR)/etc/security/sebsd LOADPATH = $(INSTALLDIR)/$(POLICYVER) SRCINSTALLDIR = $(INSTALLDIR)/src @@ -60,7 +61,10 @@ $(CHECKPOLICY) -o $@ policy.conf install: $(POLICYVER) - install -c -o root -g wheel -m 400 $> $(INSTALLDIR) + $(INSTALLCMD) $(POLICYVER) $(INSTALLDIR) + $(INSTALLCMD) appconfig/default_type /etc/security + $(INSTALLCMD) appconfig/default_contexts /etc/security + $(INSTALLCMD) appconfig/initrc_context /etc/security policy.conf: $(FLASKFILES) tmp/te-rbac.m4 users tmp/constraints-contexts.m4 cat $> > $@ From owner-p4-projects@FreeBSD.ORG Tue Dec 30 12:15:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FB7716A4D0; Tue, 30 Dec 2003 12:15: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 16A4F16A4CE for ; Tue, 30 Dec 2003 12:15:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5753243D2D for ; Tue, 30 Dec 2003 12:15:43 -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 hBUKFh0B037080 for ; Tue, 30 Dec 2003 12:15:43 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBUKFgCk037077 for perforce@freebsd.org; Tue, 30 Dec 2003 12:15:42 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 30 Dec 2003 12:15:42 -0800 (PST) Message-Id: <200312302015.hBUKFgCk037077@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 44563 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, 30 Dec 2003 20:15:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=44563 Change 44563 by cvance@cvance_sony on 2003/12/30 12:14:48 Make the jump and boot the SEBSD module after installation Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf.sebsd#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf.sebsd#2 (text+ko) ==== @@ -1,11 +1,12 @@ # uncomment the next line enable the MAC framework -#kernel="MAC" # /boot sub-directory containing kernel and modules +kernel="MAC" # /boot sub-directory containing kernel and modules # uncomment the next line enable the sebsd module -# sebsd_load="YES" # Security-Enhanced BSD module +sebsd_load="YES" # Security-Enhanced BSD module # uncomment the next line to allow the bootloader to load the SEBSD policy # This is required for the SEBSD module to boot -#sebsdpolicy_load="YES" -sebsdpolicy_type="sebsd_policy" -sebsdpolicy_name="/etc/security/sebsd/policy.16" +sebsdpolicy_load="YES" + +# Default SEBSD policy location: +#sebsdpolicy_name="/etc/security/sebsd/policy.16" From owner-p4-projects@FreeBSD.ORG Tue Dec 30 12:16:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 298FD16A4D1; Tue, 30 Dec 2003 12:16: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 EFA8416A4CF for ; Tue, 30 Dec 2003 12:16:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3013A43D4C for ; Tue, 30 Dec 2003 12:16:45 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBUKGj0B037174 for ; Tue, 30 Dec 2003 12:16:45 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBUKGi5R037171 for perforce@freebsd.org; Tue, 30 Dec 2003 12:16:44 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 30 Dec 2003 12:16:44 -0800 (PST) Message-Id: <200312302016.hBUKGi5R037171@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 44564 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, 30 Dec 2003 20:16:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=44564 Change 44564 by cvance@cvance_sony on 2003/12/30 12:16:00 Move the sebsd default_types file to /etc/security, which is consistent with the location on SELinux Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/sebsd.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/libsebsd/sebsd.h#4 (text+ko) ==== @@ -77,7 +77,7 @@ * Caller must free via free(). * Return 0 on success or -1 otherwise. */ -#define _DEFTYPE_PATH "/etc/security/sebsd/default_type" +#define _DEFTYPE_PATH "/etc/security/default_type" int get_default_type (const char* role, char** type); #endif /* _SEBSD_H */ From owner-p4-projects@FreeBSD.ORG Tue Dec 30 13:46:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1061916A4D0; Tue, 30 Dec 2003 13:46: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 DEAC316A4CE for ; Tue, 30 Dec 2003 13:46:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD85343D39 for ; Tue, 30 Dec 2003 13:46:36 -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 hBULka0B062162 for ; Tue, 30 Dec 2003 13:46:36 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBULkaSJ062159 for perforce@freebsd.org; Tue, 30 Dec 2003 13:46:36 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 30 Dec 2003 13:46:36 -0800 (PST) Message-Id: <200312302146.hBULkaSJ062159@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 44569 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, 30 Dec 2003 21:46:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=44569 Change 44569 by jhb@jhb_laptop on 2003/12/30 13:46:24 Add another test case for try lock and recursive mutexes. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#6 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#6 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include -#define MAX_EVENT 17 +#define MAX_EVENT 18 static struct sx foo, bar, bar2; static struct cv event_cv; @@ -76,7 +76,8 @@ "assert that Giant is locked while it is unlocked", "assert that foo is slocked while it is xlocked", "lock test, slock foo, sunlock foo, unlock test", - "use test1 and test2 mutexes to test witness removal" + "use test1 and test2 mutexes to test witness removal", + "try lock tests including recursion test" }; static int mod_event(struct module *module, int cmd, void *arg); @@ -111,7 +112,7 @@ static void crash_thread(void *arg) { - int ev; + int ev, status; while (1) { mtx_lock(&event_mtx); @@ -231,6 +232,35 @@ mtx_destroy(&test2_mtx); Debugger("test1 and test2 should be gone"); break; + case 18: + bzero(&test1_mtx, sizeof(test1_mtx)); + bzero(&test1_mtx, sizeof(test2_mtx)); + mtx_init(&test1_mtx, "test1", NULL, MTX_DEF); + mtx_init(&test1_mtx, "test2", NULL, MTX_DEF | + MTX_RECURSE); + status = mtx_trylock(&test1_mtx); + printf("Try lock of unlocked test1: %d\n", status); + if (status) + mtx_unlock(&test1_mtx); + mtx_lock(&test1_mtx); + status = mtx_trylock(&test1_mtx); + printf("Try lock of non-recursive locked test1: %d\n", + status); + if (status) + mtx_unlock(&test1_mtx); + mtx_unlock(&test1_mtx); + status = mtx_trylock(&test2_mtx); + printf("Try lock of unlocked test2: %d\n", status); + if (status) + mtx_unlock(&test2_mtx); + mtx_lock(&test2_mtx); + status = mtx_trylock(&test2_mtx); + printf("Try lock of recursive locked test2: %d\n", + status); + if (status) + mtx_unlock(&test2_mtx); + mtx_unlock(&test2_mtx); + break; default: panic("event %d is bogus\n", event); } From owner-p4-projects@FreeBSD.ORG Tue Dec 30 17:25:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38A3516A4D0; Tue, 30 Dec 2003 17:25:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EF7C16A4CE for ; Tue, 30 Dec 2003 17:25:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BB0643D2F for ; Tue, 30 Dec 2003 17:25:03 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBV1P30B016217 for ; Tue, 30 Dec 2003 17:25:03 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBV1P3Me016214 for perforce@freebsd.org; Tue, 30 Dec 2003 17:25:03 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 30 Dec 2003 17:25:03 -0800 (PST) Message-Id: <200312310125.hBV1P3Me016214@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 44575 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, 31 Dec 2003 01:25:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=44575 Change 44575 by sam@sam_ebb on 2003/12/30 17:25:02 return alternate rate stat lost in recent IFC Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_athioctl.h#5 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_athioctl.h#5 (text+ko) ==== @@ -70,6 +70,7 @@ u_int32_t ast_tx_rts; /* tx frames with rts enabled */ u_int32_t ast_tx_cts; /* tx frames with cts enabled */ u_int32_t ast_tx_shortpre;/* tx frames with short preamble */ + u_int32_t ast_tx_altrate; /* tx frames with alternate rate */ u_int32_t ast_rx_nombuf; /* rx setup failed 'cuz no mbuf */ u_int32_t ast_rx_busdma; /* rx setup failed for dma resrcs */ u_int32_t ast_rx_orn; /* rx failed 'cuz of desc overrun */ From owner-p4-projects@FreeBSD.ORG Wed Dec 31 05:54:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67A3B16A4D0; Wed, 31 Dec 2003 05:54: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 4310816A4CE for ; Wed, 31 Dec 2003 05:54:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D6A343D49 for ; Wed, 31 Dec 2003 05:54: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 hBVDsK0B094557 for ; Wed, 31 Dec 2003 05:54:20 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBVDsKuD094554 for perforce@freebsd.org; Wed, 31 Dec 2003 05:54:20 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 31 Dec 2003 05:54:20 -0800 (PST) Message-Id: <200312311354.hBVDsKuD094554@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 44587 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, 31 Dec 2003 13:54:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44587 Change 44587 by cvance@cvance_sony on 2003/12/31 05:53:40 It's possible that the user default_contexts file isn't readable, (EPERM, no ENOENT). This isn't a critical failure. Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/get_ordered_context_list.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/libsebsd/get_ordered_context_list.c#3 (text+ko) ==== @@ -246,12 +246,12 @@ error = move_matching_contexts(path, user, my_context, context_list, kernel_context_list, ncontexts); free(path); - if (error == -1 && errno != ENOENT) + if (error == -1 && errno == EINVAL) goto out; } error = move_matching_contexts(_DEFCONTEXT_PATH, user, my_context, context_list, kernel_context_list, ncontexts); - if (error == -1 && errno != ENOENT) + if (error == -1 && errno == EINVAL) goto out; error = 0; /* From owner-p4-projects@FreeBSD.ORG Wed Dec 31 07:49:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1F5E16A4D0; Wed, 31 Dec 2003 07:49: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 7426F16A4CE for ; Wed, 31 Dec 2003 07:49:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DB5843D2D for ; Wed, 31 Dec 2003 07:49:52 -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 hBVFnp0B020034 for ; Wed, 31 Dec 2003 07:49:51 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBVFnpT3020031 for perforce@freebsd.org; Wed, 31 Dec 2003 07:49:51 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 31 Dec 2003 07:49:51 -0800 (PST) Message-Id: <200312311549.hBVFnpT3020031@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 44593 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, 31 Dec 2003 15:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=44593 Change 44593 by cvance@cvance_sony on 2003/12/31 07:49:30 Test out some changes to allow -Z to print MAC labels without requiring long format Affected files ... .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#4 edit .. //depot/projects/trustedbsd/sebsd/bin/ls/print.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#4 (text+ko) ==== @@ -367,7 +367,7 @@ * information, unless in color mode in which case we do * need this to determine which colors to display. */ - if (!f_inode && !f_longform && !f_size && !f_timesort && !f_type + if (!f_inode && !f_longform && !f_size && !f_timesort && !f_type && !f_label #ifdef COLORLS && !f_color #endif @@ -420,7 +420,7 @@ } /* Select a print function. */ - if (f_singlecol) + if (f_singlecol || (f_label && !f_longform)) printfcn = printscol; else if (f_longform) printfcn = printlong; @@ -546,7 +546,7 @@ if (list == NULL) return; - needstats = f_inode || f_longform || f_size; + needstats = f_inode || f_longform || f_size || f_label; flen = 0; btotal = 0; initmax = getenv("LS_COLWIDTHS"); @@ -672,7 +672,7 @@ maxsize = sp->st_size; btotal += sp->st_blocks; - if (f_longform) { + if (f_longform || f_label) { if (f_numericonly) { (void)snprintf(nuser, sizeof(nuser), "%u", sp->st_uid); @@ -811,7 +811,7 @@ printfcn(&d); output = 1; - if (f_longform) + if (f_longform || f_label) for (cur = list; cur; cur = cur->fts_link) free(cur->fts_pointer); } ==== //depot/projects/trustedbsd/sebsd/bin/ls/print.c#5 (text+ko) ==== @@ -65,7 +65,7 @@ #include "ls.h" #include "extern.h" -static int printaname(const FTSENT *, u_long, u_long); +static int printaname(const FTSENT *, u_long, u_long, u_long); static void printlink(const FTSENT *); static void printtime(time_t); static int printtype(u_int); @@ -135,7 +135,7 @@ for (p = dp->list; p; p = p->fts_link) { if (IS_NOPRINT(p)) continue; - (void)printaname(p, dp->s_inode, dp->s_block); + (void)printaname(p, dp->s_label, dp->s_inode, dp->s_block); (void)putchar('\n'); } } @@ -248,7 +248,7 @@ putchar('\n'); chcnt = 0; } - chcnt += printaname(p, dp->s_inode, dp->s_block); + chcnt += printaname(p, dp->s_label, dp->s_inode, dp->s_block); if (p->fts_link) { printf(", "); chcnt += 2; @@ -327,8 +327,8 @@ if (!f_sortacross) base = row; for (col = 0, chcnt = 0; col < numcols; ++col) { - chcnt += printaname(array[base], dp->s_inode, - dp->s_block); + chcnt += printaname(array[base], dp->s_label, + dp->s_inode, dp->s_block); if (f_sortacross) base++; else @@ -353,9 +353,11 @@ * return # of characters printed, no trailing characters. */ static int -printaname(const FTSENT *p, u_long inodefield, u_long sizefield) +printaname(const FTSENT *p, u_long labelfield, u_long inodefield, + u_long sizefield) { struct stat *sp; + NAMES *np; int chcnt; #ifdef COLORLS int color_printed = 0; @@ -363,6 +365,10 @@ sp = p->fts_statp; chcnt = 0; + if (f_label) { + np = p->fts_pointer; + chcnt += printf("%-*s ", (int)labelfield, np->label); + } if (f_inode) chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino); if (f_size) From owner-p4-projects@FreeBSD.ORG Wed Dec 31 10:27:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 876AD16A4D0; Wed, 31 Dec 2003 10:27:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6176A16A4CE for ; Wed, 31 Dec 2003 10:27:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2566543D41 for ; Wed, 31 Dec 2003 10:27:07 -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 hBVIR60B060961 for ; Wed, 31 Dec 2003 10:27:06 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBVIR62d060958 for perforce@freebsd.org; Wed, 31 Dec 2003 10:27:06 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Wed, 31 Dec 2003 10:27:06 -0800 (PST) Message-Id: <200312311827.hBVIR62d060958@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 44601 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, 31 Dec 2003 18:27:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=44601 Change 44601 by areisse@areisse_tislabs on 2003/12/31 10:26:54 Support roles supplied after the username, as "andrew/user_r". Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#6 (text+ko) ==== @@ -138,6 +138,8 @@ static char *username; /* user name */ static char *olduser; /* previous user name */ +static char *user_role; /* role/type specified with username */ + /* * Prompts */ @@ -292,6 +294,13 @@ badlogin(olduser); } + char *rp = username; + while (*rp && *rp != '/') + rp++; + if (*rp == '/') { + *rp = 0; + user_role = rp+1; + } /* * Load the PAM policy and set some variables */ @@ -504,7 +513,7 @@ * according to what the security server reports. */ if (sebsd_enabled()) { - char *labeltext, *queried, *oldttylabeltext, *tty_queried, + char *labeltext, *queried, *oldttylabeltext, *tty_queried=NULL, **contexts; size_t ncontexts; mac_t newttylabel; @@ -513,9 +522,40 @@ if (get_ordered_context_list(username, NULL, &contexts, &ncontexts) != 0 || ncontexts == 0) goto nosebsd; + + queried = NULL; + if (user_role) { + int i; + char *p = user_role; + while (*p) { + if (*p == '|' || *p == '/') + *p = ':'; + p++; + } + for (i = 0; i < ncontexts; i++) { + p = contexts[i] + strlen(username)+1; + if (!strcmp (p, user_role)) { + queried = contexts[i]; + break; + } + char *pt = strchr (p, ':'); + if (pt-p == strlen(user_role) && + !strncmp (p, user_role, pt-p)) { + queried = contexts[i]; + break; + } + } + } + + if (!queried) if (query_user_context(pamh, contexts, ncontexts, - &queried) != 0 || - asprintf(&labeltext, "sebsd/%s", queried) == -1 || + &queried) != 0) { + + syslog(LOG_ERR, "Reading SEBSD domain from user:" + " %m"); + bail(NO_SLEEP_EXIT, 1); + } + if (asprintf(&labeltext, "sebsd/%s", queried) == -1 || mac_from_text(&execlabel, labeltext) != 0) { syslog(LOG_ERR, "Determining SEBSD domain transition:" " %m"); From owner-p4-projects@FreeBSD.ORG Wed Dec 31 11:43:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCDC216A4D0; Wed, 31 Dec 2003 11:43: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 A3A9716A4CE for ; Wed, 31 Dec 2003 11:43:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A980043D45 for ; Wed, 31 Dec 2003 11:43:46 -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 hBVJhk0B078573 for ; Wed, 31 Dec 2003 11:43:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBVJhkrV078570 for perforce@freebsd.org; Wed, 31 Dec 2003 11:43:46 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 31 Dec 2003 11:43:46 -0800 (PST) Message-Id: <200312311943.hBVJhkrV078570@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 44608 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, 31 Dec 2003 19:43:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=44608 Change 44608 by jhb@jhb_blue on 2003/12/31 11:43:15 Use a macro to simplify the trylock stuff and make it print out the recursion count each time as well. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#7 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#7 (text+ko) ==== @@ -238,28 +238,22 @@ mtx_init(&test1_mtx, "test1", NULL, MTX_DEF); mtx_init(&test1_mtx, "test2", NULL, MTX_DEF | MTX_RECURSE); - status = mtx_trylock(&test1_mtx); - printf("Try lock of unlocked test1: %d\n", status); - if (status) - mtx_unlock(&test1_mtx); +#define TRYLOCK_TEST(lock, descr) do { \ + status = mtx_trylock((lock)); \ + printf("Try lock of " descr ": %d; recurse = %d\n", \ + status, (lock)->mtx_recurse); \ + if (status) \ + mtx_unlock((lock)); \ +} while(0) + TRYLOCK_TEST(&test1_mtx, "unlocked test1"); mtx_lock(&test1_mtx); - status = mtx_trylock(&test1_mtx); - printf("Try lock of non-recursive locked test1: %d\n", - status); - if (status) - mtx_unlock(&test1_mtx); + TRYLOCK_TEST(&test1_mtx, "non-recursive locked test1"); mtx_unlock(&test1_mtx); - status = mtx_trylock(&test2_mtx); - printf("Try lock of unlocked test2: %d\n", status); - if (status) - mtx_unlock(&test2_mtx); + TRYLOCK_TEST(&test2_mtx, "unlocked test2"); mtx_lock(&test2_mtx); - status = mtx_trylock(&test2_mtx); - printf("Try lock of recursive locked test2: %d\n", - status); - if (status) - mtx_unlock(&test2_mtx); + TRYLOCK_TEST(&test2_mtx, "recursive locked test2"); mtx_unlock(&test2_mtx); +#undef TRYLOCK_TEST break; default: panic("event %d is bogus\n", event);